[Antiright-devel] antiright ./configure lib/app.c lib/app.h lib/g...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 06/03/27 00:33:02

Modified files:
        .              : configure 
        lib            : app.c app.h graph.c library.h list.c 
        src/arshell    : arshell.c 
Removed files:
        yaclib         : COPYING algo.c algo.h date.c date.h defs.h 
                         hash.c hash.h list.c list.h parse.c parse.h 
                         pred.h sort.c sort.h stamp-h.in vector.c 
                         vector.h yaclib.h 

Log message:
        Version number bumped to 2.14.  Yaclib was removed in order to ensure 
license purity of package and to reduce package size.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/configure.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/lib/app.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/lib/app.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/lib/graph.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/lib/library.h.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/lib/list.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/src/arshell/arshell.c.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: antiright/configure
diff -u antiright/configure:1.63 antiright/configure:1.64
--- antiright/configure:1.63    Mon Mar 13 03:38:17 2006
+++ antiright/configure Mon Mar 27 00:33:02 2006
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=2.13
+VERSION=2.14
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 
 ICONDIR=$PREFIX/include/X11/bitmaps/antiright
Index: antiright/lib/app.c
diff -u antiright/lib/app.c:1.3 antiright/lib/app.c:1.4
--- antiright/lib/app.c:1.3     Sat Jul 23 17:10:09 2005
+++ antiright/lib/app.c Mon Mar 27 00:33:02 2006
@@ -33,7 +33,7 @@
                                            NULL, NULL);
 }
 void
-antiright_initialize_antiright_data()
+antiright_initialize_app_data()
 {
   antiright.display=XtDisplay(antiright.parent_widget);
   antiright.screen=DefaultScreen(antiright.display);
@@ -50,7 +50,7 @@
                                 const char* name)
 {
   antiright_setup_xt(argc, argv);
-  antiright_initialize_antiright_data();
+  antiright_initialize_app_data();
   antiright_set_title(name);
   antiright_system("ACE -c &");
 }
Index: antiright/lib/app.h
diff -u antiright/lib/app.h:1.3 antiright/lib/app.h:1.4
--- antiright/lib/app.h:1.3     Sat Jul 23 17:10:09 2005
+++ antiright/lib/app.h Mon Mar 27 00:33:02 2006
@@ -33,7 +33,7 @@
    ANTIRIGHT.DISPLAY, ANTIRIGHT.SCREEN, and ANTIRIGHT.ROOT_WINDOW are
    initialized.  */
 void
-antiright_initialize_antiright_data();
+antiright_initialize_app_data();
 
 /* This sets up the application and handles the command line.  */
 void
Index: antiright/lib/graph.c
diff -u antiright/lib/graph.c:1.6 antiright/lib/graph.c:1.7
--- antiright/lib/graph.c:1.6   Mon Jan 30 02:13:29 2006
+++ antiright/lib/graph.c       Mon Mar 27 00:33:02 2006
@@ -22,14 +22,19 @@
 
 #include "library.h"
 
+#define AR_WHITE 255,255,255
+#define AR_GREY0 192,192,192
+#define AR_GREY1 96,96,96
+#define AR_RED 192,0,0
+#define AR_BLACK 0,0,0
+
 void
 antiright_draw_grid()
 {
   unsigned int counter;
 
-  antiright_widget_background(antiright.graph.widget, 255, 255, 255);
-  
-  antiright_draw_foreground(&antiright.graph.drawing,250,100,100);
+  antiright_widget_background(antiright.graph.widget, AR_WHITE);
+  antiright_draw_foreground(&antiright.graph.drawing,AR_GREY1);
   
   for(counter=antiright.graph.width/2; 
       counter<antiright.graph.width;
@@ -67,7 +72,7 @@
                          antiright.graph.width, counter);
     }
   
-  antiright_draw_foreground(&antiright.graph.drawing,0,25,100);
+  antiright_draw_foreground(&antiright.graph.drawing,AR_RED);
   
   
   antiright_draw_line(&antiright.graph.drawing, 
Index: antiright/lib/library.h
diff -u antiright/lib/library.h:1.18 antiright/lib/library.h:1.19
--- antiright/lib/library.h:1.18        Thu Nov 24 01:36:06 2005
+++ antiright/lib/library.h     Mon Mar 27 00:33:02 2006
@@ -58,6 +58,7 @@
 #include "util.h"
 #include "window.h"
 #include "xmstring.h"
+#include "linked-list.h"
 
 #ifdef HAVE_XLT
 #include <Xlt/Xlt.h>
Index: antiright/lib/list.c
diff -u antiright/lib/list.c:1.4 antiright/lib/list.c:1.5
--- antiright/lib/list.c:1.4    Sat Jul 23 17:10:09 2005
+++ antiright/lib/list.c        Mon Mar 27 00:33:02 2006
@@ -1,6 +1,6 @@
 /*
    AntiRight
-   (c) 2003-2004 Jeffrey Bedard
+   (c) 2003-2006 Jeffrey Bedard
    address@hidden
  
    This file is part of AntiRight.
Index: antiright/src/arshell/arshell.c
diff -u antiright/src/arshell/arshell.c:1.18 
antiright/src/arshell/arshell.c:1.19
--- antiright/src/arshell/arshell.c:1.18        Mon Jan 30 02:13:29 2006
+++ antiright/src/arshell/arshell.c     Mon Mar 27 00:33:02 2006
@@ -81,7 +81,6 @@
        antiright_create_graph (arshell.gui.widgets.mainwindow);
       arshell_setup_work_window ();
     }
-  /*arshell_handle_panel_override(); */
   arshell_check_if_lowered ();
 }
 
@@ -93,26 +92,33 @@
 }
 
 void
-arshell_setup_work_row ()
+arshell_setup_desktop_menu()
 {
+       /* The following implements a popup menu on the ACE desktop.  */
+
        Widget menu;
+
+       menu = antiright_popup_menu (arshell.gui.widgets.row);
+ 
+        antiright_button (menu, "Terminal", antiright_system_cb, 
+               "ACE Terminal");
+        antiright_separator (menu);
+        antiright_button (menu, "Restart",
+                antiright_system_cb, "ACE -A restart_desktop");
+        antiright_button (menu, "Quit Desktop",
+                antiright_system_cb, "ACE -A killdesk");
+        antiright_button (menu, "Logout", antiright_system_cb, "ACE -A 
killwm");
+}
+
+void
+arshell_setup_work_row ()
+{
   ARCLARG;
   antiright_set (XmNmarginHeight, 0);
   antiright_set (XmNmarginWidth, 0);
   arshell.gui.widgets.row = antiright_row (arshell.gui.widgets.mainwindow);
 
-  /* The following implements a popup menu on the ACE desktop.  */
-  /*  if ( arshell_override_is_set() && arshell.flags.lowered ) */
-/*     { */
-  menu = antiright_popup_menu (arshell.gui.widgets.row);
-  antiright_button (menu, "Terminal", antiright_system_cb, "ACE Terminal");
-  antiright_separator (menu);
-  antiright_button (menu, "Restart",
-                   antiright_system_cb, "ACE -A restart_desktop");
-  antiright_button (menu, "Quit Desktop",
-                   antiright_system_cb, "ACE -A killdesk");
-  antiright_button (menu, "Logout", antiright_system_cb, "ACE -A killwm");
-  /*    } */
+       arshell_setup_desktop_menu();
 }
 
 void
@@ -127,25 +133,45 @@
 }
 
 void
+arshell_setup_work_window_with_text()
+{
+       ARCLARG;
+        antiright_set(XmNworkWindow, (XtArgVal)arshell.gui.widgets.work);
+        antiright_set(XmNcommandWindow, (XtArgVal)arshell.gui.widgets.row);
+        antiright_set_values(arshell.gui.widgets.mainwindow);
+}
+
+void
+arshell_setup_work_window_without_text()
+{
+       ARCLARG;
+        antiright_set(XmNworkWindow, (XtArgVal)arshell.gui.widgets.row);
+        antiright_set_values(arshell.gui.widgets.mainwindow); 
+}
+
+void
+arshell_setup_graph()
+{
+       ARCLARG;
+       antiright_set(XmNheight, (XtArgVal)(antiright.graph.height+10));
+       antiright_set(XmNwidth, (XtArgVal)(antiright.graph.width+10));
+       antiright_set_values(arshell.gui.widgets.mainwindow);
+}
+
+void
 arshell_setup_work_window ()
 {
   if (arshell.gui.widgets.work != NULL)
     {
-      XtVaSetValues (arshell.gui.widgets.mainwindow,
-                    XmNworkWindow, arshell.gui.widgets.work,
-                    XmNcommandWindow, arshell.gui.widgets.row, NULL);
+       arshell_setup_work_window_with_text();
     }
   else
     {
-      XtVaSetValues (arshell.gui.widgets.mainwindow,
-                    XmNworkWindow, arshell.gui.widgets.row, NULL);
+       arshell_setup_work_window_without_text();
     }
   if (arshell.use_graph)
     {
-
-      XtVaSetValues (antiright.parent_widget,
-                    XmNheight, antiright.graph.height + 10,
-                    XmNwidth, antiright.graph.width + 10, NULL);
+       arshell_setup_graph();
     }
 }
 
@@ -154,7 +180,9 @@
 {
   if (antiright.status_widget != NULL)
     {
-      XtVaSetValues (arshell.gui.widgets.mainwindow,
-                    XmNmessageWindow, antiright.status_widget, NULL);
+       ARCLARG;
+       antiright_set(XmNmessageWindow, (XtArgVal)antiright.status_widget);
+       antiright_set_values(arshell.gui.widgets.mainwindow);
     }
 }
+