[Antiright-devel] antiright ./configure lib/frame.c lib/menubar.h...

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/16 23:55:48

Modified files:
        .              : configure 
        lib            : frame.c menubar.h 
        src            : ACE AR system.antiright 
        src/arshell    : arguments.c arshell.c arshell.h file.c layout.c 
                         layout.h main.c textedit.c 

Log message:
        Final checkin for release 2.4 of AntiRight.  Window lowering was fixed, 
so that all nonmanaged panels are not lowered, but, rather, arshell started 
with -l lowers itself.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/configure.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/frame.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/menubar.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/ACE.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/AR.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/system.antiright.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arguments.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell.h.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/file.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/layout.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/layout.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/main.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/textedit.c.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: antiright/configure
diff -u antiright/configure:1.46 antiright/configure:1.47
--- antiright/configure:1.46    Sat Nov  6 23:02:32 2004
+++ antiright/configure Thu Dec 16 23:55:46 2004
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=2.3
+VERSION=2.4
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 
 ICONDIR=/usr/X11R6/include/X11/bitmaps/antiright
Index: antiright/lib/frame.c
diff -u antiright/lib/frame.c:1.2 antiright/lib/frame.c:1.3
--- antiright/lib/frame.c:1.2   Sat Aug  7 17:13:41 2004
+++ antiright/lib/frame.c       Thu Dec 16 23:55:47 2004
@@ -29,11 +29,9 @@
   Widget frame_widget;
   
   antiright_set(XmNshadowType, shadow_type);
-  frame_widget=XmCreateFrame(parent,
-                            "frame_widget",
-                            antiright.arguments,
-                            antiright.arguments_int);
+  frame_widget=XmCreateFrame(parent, "frame_widget",
+                            antiright.arguments, antiright.arguments_int);
+  assert(frame_widget!=NULL);
   XtManageChild(frame_widget);
-  
   return(frame_widget);
 }
Index: antiright/lib/menubar.h
diff -u antiright/lib/menubar.h:1.1 antiright/lib/menubar.h:1.2
--- antiright/lib/menubar.h:1.1 Thu Jul  8 18:58:06 2004
+++ antiright/lib/menubar.h     Thu Dec 16 23:55:47 2004
@@ -66,3 +66,7 @@
                                                  pasted.  Set to NULL
                                                  if not used.  */
 
+void
+antiright_license_cb(Widget parent_widget,
+                    XtPointer client_data,
+                    XtPointer call_data);
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.27 antiright/src/ACE:1.28
--- antiright/src/ACE:1.27      Sun Dec 12 01:16:38 2004
+++ antiright/src/ACE   Thu Dec 16 23:55:47 2004
@@ -81,7 +81,7 @@
            -Ab 'ACE File_Manager' $bmdir/antiright/files.xbm\
            -Ab 'ACE Note' $bmdir/antiright/notes.xbm\
            -Ab 'ACE Lock' $bmdir/antiright/lock.xbm\
-           -Ab 'ACE Desk_Bar' $bmdir/antiright/panel.xbm\
+           -Ab 'ACE Desktop' $bmdir/antiright/panel.xbm\
            -Ab 'ACE Editor' $bmdir/antiright/text.xbm\
            -Ab 'ACE Load_Meter' $bmdir/antiright/load.xbm\
            -Ab 'ACE Terminal' $bmdir/antiright/terminal.xbm\
@@ -94,13 +94,16 @@
            -Ab 'ACE -A File_System_Panel File_Systems'\
            $bmdir/antiright/files.xbm
     else
-       $ARSHELL -Am -r 5\
+       $ARSHELL -Am -r 6\
+           -AL\
+           'ACE Chat'\
+           'ACE Alarm'\
            'ACE Calculator'\
            'ACE CD_Player'\
            'ACE File_Manager'\
            'ACE Note'\
            'ACE Lock'\
-           'ACE Desk_Bar'\
+           'ACE -A Desktop'\
            'ACE Editor'\
            'ACE Load_Meter'\
            'ACE Terminal'\
@@ -143,7 +146,7 @@
        -geometry +0+0\
        -xrm '*marginHeight: 0' -xrm '*marginWidth: 0' -xrm '*spacing: 0'\
        -xrm '*XmPushButton.marginWidth: 2' \
-       -xrm 'AntiRight.borderWidth: 1' -xrm "*overrideRedirect: True" &
+       -xrm 'AntiRight.borderWidth: 1' -xrm "*overrideRedirect: True" -l &
 }
 return_pseudorandom_color()
 {
Index: antiright/src/AR
diff -u antiright/src/AR:1.5 antiright/src/AR:1.6
--- antiright/src/AR:1.5        Thu Aug 19 21:51:11 2004
+++ antiright/src/AR    Thu Dec 16 23:55:47 2004
@@ -38,10 +38,8 @@
 chmod +x ~/.antirightrc
 # Run custom session.
 ~/.antirightrc
-# Start the pager. 
-ACE -A Pager &
-# Start the desktop icons.
-ACE -A Desktop_Lite &
+# Start the desktop panel.
+ACE -A Desktop
 # Start the window manager.
 if [ "$WINDOWMANAGER" != "" ]; then
     exec $WINDOWMANAGER
Index: antiright/src/arshell/arguments.c
diff -u antiright/src/arshell/arguments.c:1.12 
antiright/src/arshell/arguments.c:1.13
--- antiright/src/arshell/arguments.c:1.12      Sun Dec 12 02:39:16 2004
+++ antiright/src/arshell/arguments.c   Thu Dec 16 23:55:47 2004
@@ -170,6 +170,9 @@
       arshell_parse_interface_file(argv[(*counter_int)]);
       break;
 #endif /* HAVE_YACLIB  */
+    case 'l': /* Start up lowered.  */
+      arshell.flags.lowered=True;
+      break;
     case 'p': /* Input pipe operations.  */
       arshell_set_work_area_from_stdin();
       break;
Index: antiright/src/arshell/arshell.c
diff -u antiright/src/arshell/arshell.c:1.9 antiright/src/arshell/arshell.c:1.10
--- antiright/src/arshell/arshell.c:1.9 Sun Oct 24 00:28:49 2004
+++ antiright/src/arshell/arshell.c     Thu Dec 16 23:55:48 2004
@@ -34,10 +34,42 @@
   XtManageChild(arshell.gui.widgets.mainwindow);
 }
 
+Boolean
+arshell_override_is_set()
+{
+  Boolean override_is_set;
+  ARCLARG;
+  antiright_set(XmNoverrideRedirect, (XtArgVal)&override_is_set);
+  XtGetValues(antiright.parent_widget,
+             antiright.arguments,
+             antiright.arguments_int);
+  ARCLARG;
+  return(override_is_set);
+}
+
+void
+arshell_handle_panel_override()
+{
+#ifdef XmNtoolTipEnable
+  if(!arshell_override_is_set() || arshell.flags.force_tooltips)
+    {
+      XtVaSetValues(antiright.parent_widget,
+                   XmNtoolTipEnable, True,
+                   NULL);
+    }
+#endif /* XmNtoolTipEnable  */
+}
+
+
 void
 arshell_start_event_loop()
 {
   XtRealizeWidget(antiright.parent_widget);
+  arshell_handle_panel_override();
+  if(arshell.flags.lowered)
+    {
+      XLowerWindow(antiright.display, XtWindow(antiright.parent_widget));
+    }
   XtAppMainLoop(antiright.app_context);
 }
 
@@ -89,28 +121,4 @@
                    NULL);
     }
 }
-Boolean
-arshell_override_is_set()
-{
-  Boolean override_is_set;
-  ARCLARG;
-  antiright_set(XmNoverrideRedirect, (XtArgVal)&override_is_set);
-  XtGetValues(antiright.parent_widget,
-             antiright.arguments,
-             antiright.arguments_int);
-  ARCLARG;
-  return(override_is_set);
-}
-void
-arshell_handle_panel_override()
-{
-#ifdef XmNtoolTipEnable
-  if(!arshell_override_is_set() || arshell.flags.force_tooltips)
-    {
-      XtVaSetValues(antiright.parent_widget,
-                   XmNtoolTipEnable, True,
-                   NULL);
-    }
-#endif /* XmNtoolTipEnable  */
-}
 
Index: antiright/src/arshell/arshell.h
diff -u antiright/src/arshell/arshell.h:1.12 
antiright/src/arshell/arshell.h:1.13
--- antiright/src/arshell/arshell.h:1.12        Fri Oct 22 17:13:36 2004
+++ antiright/src/arshell/arshell.h     Thu Dec 16 23:55:48 2004
@@ -50,6 +50,7 @@
   Boolean file_open;
   Boolean updating;
   Boolean force_tooltips;
+  Boolean lowered;
 };
 
 struct arshell_widgets_struct
Index: antiright/src/arshell/file.c
diff -u antiright/src/arshell/file.c:1.4 antiright/src/arshell/file.c:1.5
--- antiright/src/arshell/file.c:1.4    Wed Aug 25 23:50:18 2004
+++ antiright/src/arshell/file.c        Thu Dec 16 23:55:48 2004
@@ -82,27 +82,31 @@
 {
   XmFileSelectionBoxCallbackStruct *call_pointer=call_data;
   char *c_string;
- 
+
   if(arshell.flags.file_open)
     { 
       arshell_save_work_area();
     }
+
   c_string=antiright_c_string(call_pointer->value);
   strncpy(arshell.edit.filename, c_string, ARSHELL_MAX_STRLEN);
   XtFree(c_string);
   XtDestroyWidget(widget);
+
   if(arshell.flags.saving)
-    {     
+    {
       arshell.flags.file_open=True;
       arshell_save_work_area();
       arshell.flags.saving=False;
     }
+
   if(arshell.flags.opening)
     { 
       arshell.flags.file_open=True;
       arshell_open_file();
       arshell.flags.opening=False;
     }
+
    client_data=NULL;
 }
 
@@ -162,7 +166,6 @@
       arshell_get_rid_of_modified_status();
       antiright_set_title(arshell.edit.filename);
     }
-  arshell.flags.saving=False;
 }
 
 void
Index: antiright/src/arshell/layout.c
diff -u antiright/src/arshell/layout.c:1.2 antiright/src/arshell/layout.c:1.3
--- antiright/src/arshell/layout.c:1.2  Fri Aug 13 18:18:18 2004
+++ antiright/src/arshell/layout.c      Thu Dec 16 23:55:48 2004
@@ -23,6 +23,12 @@
 #include "arshell.h"
 
 void
+arshell_lower_mainwindow_cb()
+{
+  XLowerWindow(antiright.display, XtWindow(antiright.parent_widget));
+}
+
+void
 arshell_layout_mainwindow()
 {
   arshell_setup_work_window();
@@ -70,6 +76,7 @@
   antiright_set(XmNmarginHeight, 0);
   antiright_set(XmNpacking, XmPACK_TIGHT);
   antiright_set(XmNspacing, 0);
+  assert(arshell.gui.layout.row_manager_widget);
   arshell.gui.layout.row_widget=
     antiright_row(arshell.gui.layout.row_manager_widget);
   arshell.gui.layout.row_counter_int=arshell.gui.layout.rows_int;
Index: antiright/src/arshell/layout.h
diff -u antiright/src/arshell/layout.h:1.2 antiright/src/arshell/layout.h:1.3
--- antiright/src/arshell/layout.h:1.2  Fri Aug 13 18:18:18 2004
+++ antiright/src/arshell/layout.h      Thu Dec 16 23:55:48 2004
@@ -32,6 +32,9 @@
 };
 
 void
+arshell_lower_mainwindow_cb();
+
+void
 arshell_layout_mainwindow();
 
 void
Index: antiright/src/arshell/main.c
diff -u antiright/src/arshell/main.c:1.2 antiright/src/arshell/main.c:1.3
--- antiright/src/arshell/main.c:1.2    Mon Aug 16 17:27:05 2004
+++ antiright/src/arshell/main.c        Thu Dec 16 23:55:48 2004
@@ -33,7 +33,6 @@
   arshell_initialize_application_data();
   arshell_handle_command_line_arguments(&argc, argv);
   arshell_layout_mainwindow();
-  arshell_handle_panel_override();
   arshell_start_event_loop();
   return(0);
 }
Index: antiright/src/arshell/textedit.c
diff -u antiright/src/arshell/textedit.c:1.17 
antiright/src/arshell/textedit.c:1.18
--- antiright/src/arshell/textedit.c:1.17       Mon Nov  1 22:22:04 2004
+++ antiright/src/arshell/textedit.c    Thu Dec 16 23:55:48 2004
@@ -54,7 +54,8 @@
   free(spell_checker);
   system(command);
   free(command);
-  arshell_revert_file_cb();
+  if(arshell.flags.file_open)
+    arshell_revert_file_cb();
 }
 
 void
Index: antiright/src/system.antiright
diff -u antiright/src/system.antiright:1.3 antiright/src/system.antiright:1.4
--- antiright/src/system.antiright:1.3  Tue Aug 31 01:20:35 2004
+++ antiright/src/system.antiright      Thu Dec 16 23:55:47 2004
@@ -47,8 +47,6 @@
 No,_do_not_do_that.:echo -n 0
 File_Manager: ACE -A File_Manager
 Calculator: ACE -A Calculate
-Pager: ACE -A Pager
-Desk_Bar: ACE -A Pager
 Text_Editor: ACE -A Text_Editor
 Run_Command: ACE -L Run
 CD_Player:ACE -A CD_Player