[Antiright-devel] antiright ACE-desktop/ACE doc/TODO gtkshell/lab...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/26 16:39:42

Modified files:
        ACE-desktop    : ACE 
        doc            : TODO 
        gtkshell       : label.c option_options.c updated.c 

Log message:
        Reindented various functions.  Fixed horizontal labels (again).
        Fixed crash on linux involving updaters.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/doc/TODO?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.c?cvsroot=antiright&r1=1.8&r2=1.9

Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ACE-desktop/ACE     26 Feb 2007 15:30:19 -0000      1.13
+++ ACE-desktop/ACE     26 Feb 2007 16:39:42 -0000      1.14
@@ -67,10 +67,9 @@
 }
 ACE_Check_Configuration_File()
 {
-    # This probably should be replaced with a for loop.
-    # In such the likely prefixes are what will be processed.
     if [ ! -f ~/.antiright ]; then
-                       cp $PREFIX/share/ACE-desktop/system.antiright 
~/.antiright
+               cp $PREFIX/share/ACE-desktop/system.antiright\
+                       ~/.antiright
     fi
 }
 ACE_record_titles()
@@ -189,7 +188,8 @@
                fi
 
          for item in $(ACE Panel_Items); do
-                 echo ' -aI '"'"ACE $item"'" $icon/$item.png "\\" >> $TMP
+                       echo ' -aI '"'"ACE $item"'" $icon/$item.png "\\"\
+                               >> $TMP
          done
 
     if [ "$UPDATER" = "TRUE" ]; then

Index: doc/TODO
===================================================================
RCS file: /sources/antiright/antiright/doc/TODO,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- doc/TODO    7 Feb 2007 16:44:23 -0000       1.13
+++ doc/TODO    26 Feb 2007 16:39:42 -0000      1.14
@@ -3,7 +3,12 @@
 
 Write gtkshell manual page, such that it reflects actual API.  
 
-Review ACE, verifying functionality of all facilities.  If a feature
-would only work under a specific configuration or if a feature is defunct,
-remove it.  
+Implement button selection support, where a regular expression can be
+applied to button titles for selection.  Test if it is possible to
+drag this entire selection, else compile the titles into a string for passing.
+Drag and drop of any selected widget should perform this compilation.
+Any unselected widget dragged when others are selected should unset the
+selection, though this may be reconsidered, as it is useful to have a selection
+preserved when doing other operations--keep selection until it is explicitly
+changed.
 

Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/label.c    24 Feb 2007 08:49:27 -0000      1.10
+++ gtkshell/label.c    26 Feb 2007 16:39:42 -0000      1.11
@@ -28,12 +28,13 @@
 {
        gtk_label_set_single_line_mode (GTK_LABEL (label), FALSE);
 
-  if (gsh->flags.horizontal_labels == TRUE)
-    gtk_label_set_angle (GTK_LABEL (label), 270.0);
+       ARIFB(gsh->flags.horizontal_labels)
+               gtk_label_set_angle (GTK_LABEL (label), 90.0);
   else
+       {
     gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-
        gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+       }
 
        gsh_widget_set_font_mono(label);
 }
@@ -42,27 +43,27 @@
 gsh_add_label (struct GSH * gsh, char *text)
 {
   GtkWidget *label;
-       GtkWidget *frame;
        GtkWidget *to_be_managed;
 
        ARPASSERT(gsh);
 
   label = gtk_label_new (text);
 
+       ARPASSERT(label);
+
        set_options(gsh, label);
 
        if(gsh->flags.framed_labels)
                {
+                       GtkWidget *frame;
+
                        frame=gtk_frame_new(NULL);
                        gtk_container_add(GTK_CONTAINER(frame), label);
                        gtk_widget_show(label);
                        to_be_managed=frame;
                }
        else
-               {
-                       UNUSED(frame);
                        to_be_managed=label;
-               }
 
   /* This uses expanded management, as the label may be displaying a large
      text area.  */

Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/option_options.c   23 Feb 2007 19:15:05 -0000      1.9
+++ gtkshell/option_options.c   26 Feb 2007 16:39:42 -0000      1.10
@@ -1,6 +1,6 @@
 /*
   AntiRight
-  (c) 2002-2006 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
 
   This file is part of AntiRight.
@@ -40,22 +40,28 @@
   case 'g':
     gsh_count (argc, counter);
 
-    if (gsh->geometry)
+                       ARIFP(gsh->geometry)
       free (gsh->geometry);
 
-    asprintf (&gsh->geometry, "%s", argv[(*counter)]);
+                       ar_asprintf (&gsh->geometry, "%s", argv[(*counter)]);
+
     break;
   case 'h':
     gsh->flags.horizontal_labels = TRUE;
     break;
   case 'n':
+
     gtk_window_set_decorated (GTK_WINDOW (gsh->window),
                              FALSE);
-    gtk_window_set_skip_taskbar_hint (GTK_WINDOW (gsh->window), TRUE);
+
+                       gtk_window_set_skip_taskbar_hint 
+                               (GTK_WINDOW (gsh->window), TRUE);
+
     break;
   case 'r':
     gsh_count (argc, counter);
-    gsh->rows.rows = (unsigned int) atoi (argv[(*counter)]);
+                       gsh->rows.rows = 
+                               (unsigned int) atoi (argv[(*counter)]);
     break;
   case 'u':
     gsh_count (argc, counter);

Index: gtkshell/updated.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/updated.c  23 Feb 2007 03:11:52 -0000      1.8
+++ gtkshell/updated.c  26 Feb 2007 16:39:42 -0000      1.9
@@ -74,18 +74,18 @@
 static void 
 gsh_update_each (gpointer data, gpointer user_data)
 {
-  gsh_updater_data *item;
-
-
   UNUSED (user_data);          /* USER_DATA is unused.  */
 
   /* Ensure that the argument containing the structure is not empty.  */
 
        ARIFP(data)
                {
+                       gsh_updater_data *item;
+
                /* Assign data to structure and call 
                         * function pointer with parameters.  */
                item = (gsh_updater_data *) data;
+                       ARPASSERT(item->function);
                item->function (item->command, item->widget);
                }
        else
@@ -127,7 +127,8 @@
        if(gsh != NULL)
                {
                (void)gsh_perform_updates (gsh);
-               (void)g_timeout_add (gsh->update.period, gsh_perform_updates, 
gsh);
+               (void)g_timeout_add (gsh->update.period, gsh_perform_updates, 
+                                    gsh);
                }
        else
                {