[Antiright-devel] antiright/gtkshell add_options.c containers.c g...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 10/08/17 15:21:47

Modified files:
        gtkshell       : add_options.c containers.c gsh.h gtkshell.c 
                         gtkshell.h image_button.c main.c row.c 

Log message:
        Begin removing methods rarely used.  Simplified layout code.  Fixed
        row management bug yet again.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gsh.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.c?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.28&r2=1.29

Patches:
Index: add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- add_options.c       16 Aug 2010 11:51:21 -0000      1.62
+++ add_options.c       17 Aug 2010 15:21:47 -0000      1.63
@@ -31,7 +31,6 @@
      done with '---' argument.  */
   $ (gsh, add.window);
   gsh->rows->current = 1;
-  $ (gsh, init);
   GSH_SET (GSH_IN_SECONDARY_WIN);
 }
 

Index: containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- containers.c        16 Aug 2010 11:51:21 -0000      1.26
+++ containers.c        17 Aug 2010 15:21:47 -0000      1.27
@@ -26,81 +26,42 @@
 #define GSWS(item, window, ...)\
        gtk_scrolled_window_set_##item(GTK_SCROLLED_WINDOW(window),\
                __VA_ARGS__)
-
-static void
-set_scrolled_window_options (GtkWidget * win)
-{
-#define GSWSW(item, ...) GSWS(item, win, __VA_ARGS__)
-  GSWSW (shadow_type, GTK_SHADOW_OUT);
-/* Shortened name.  */
-#define GTKPA GTK_POLICY_AUTOMATIC
-  GSWSW (policy, GTKPA, GTKPA);
-}
-
-static void
-setup_scrolled_window_containers (GtkWidget * scrolled_window,
-                                 GtkWidget * window, GtkWidget * hrow)
-{
-  GSHCA (window, scrolled_window);
-  /* Add the main row manager to the scrolled window.  */
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW
-                                        (scrolled_window), hrow);
-}
-
 static void
 gsh_setup_scrolled_window (struct GSH *gsh)
 {
   GtkWidget *scrolled_window;
+  GtkWidget *window=gsh->widgets.window;
 
   scrolled_window = gsh->widgets.scrolled_window
     = gtk_scrolled_window_new (NULL, NULL);
-  set_scrolled_window_options (gsh->widgets.scrolled_window);
-  setup_scrolled_window_containers (scrolled_window, gsh->widgets.window,
-                                   gsh->rows->h);
+  GSWS(shadow_type, scrolled_window, GTK_SHADOW_OUT);
+  GSWS(policy, scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  GSHCA(window, scrolled_window);
+  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW
+                                        (scrolled_window), gsh->rows->h);
   gtk_widget_show (scrolled_window);
 }
 
 static void
-setup_framed_containers (GtkWidget * frame, GtkWidget * window,
-                        GtkWidget * hrow)
-{
-  GSHCA (window, frame);
-  GSHCA (frame, hrow);
-}
-
-static void
 setup_framed (struct GSH *gsh)
 {
   GtkWidget *frame;
 
   frame = gtk_frame_new (NULL);
-  setup_framed_containers (frame, gsh->widgets.window, gsh->rows->h);
+  GSHCA (gsh->widgets.window, frame);
+  GSHCA (frame, gsh->rows->h);
   gtk_widget_show (frame);
 }
 
 void
-gsh_setup_containers (struct GSH *gsh)
+gsh_setup_base_container (struct GSH *gsh)
 {
-  gtk_widget_show (gsh->rows->h = gtk_hbox_new (FALSE, 2));
-  $ (gsh->rows, new);
-}
-
 #define GWA gsh->widgets.app
-
-static void
-setup_app_mode_frame (struct GSH *gsh)
-{
+  if (GWA.frame)
+    { /* setup app mode frame */
   GSHCA (GWA.frame, gsh->rows->h);
-/*     gtk_container_add(GTK_CONTAINER(GWA.frame), 
-               gsh->rows->h); */
   gsh->rows->h = GWA.row;
-}
-
-void
-gsh_setup_base_container (struct GSH *gsh)
-{
-  if (GWA.frame)
-    setup_app_mode_frame (gsh);
+    }
   if (GSH_FLAG (GSH_SCROLL))
     gsh_setup_scrolled_window (gsh);
   else if (!GSH_FLAG (GSH_NO_BASE_FRAME))
@@ -109,7 +70,6 @@
     {
       GtkWidget *window = gsh->widgets.window;
       GtkWidget *row = gsh->rows->h;
-
       GSHCA (window, row);
     }
 }

Index: gsh.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gsh.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gsh.h       16 Aug 2010 11:51:21 -0000      1.4
+++ gsh.h       17 Aug 2010 15:21:47 -0000      1.5
@@ -72,7 +72,6 @@
   /* methods */
   void (*delete) (struct GSH *);
   void (*parse) (struct GSH *, const gint, const gchar **);
-  void (*init) (struct GSH *);
   void (*finalize) (struct GSH *);
   void (*manage) (struct GSH *, GtkWidget *);
 

Index: gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gtkshell.c  16 Aug 2010 11:51:21 -0000      1.52
+++ gtkshell.c  17 Aug 2010 15:21:47 -0000      1.53
@@ -34,108 +34,57 @@
   ARDELETE (gsh->update);
 }
 
-static void
-setup_add_methods (GSH * gsh)
+void
+gsh_GSH (GSH * gsh)
 {
-  gsh->add.window = &gsh_GSH_add_window;
-  gsh->add.button = &gsh_add_button;
-  gsh->add.label = &gsh_add_label;
-}
+//  struct GSH *gsh;
 
-static void
-setup_methods (GSH * gsh)
-{
+ // gsh = (struct GSH *) armalloc (sizeof (struct GSH));
+  /* setup child classes */
+  gsh->update = ARNEW (gsh, GSHUpdateManager);
+  gsh->rows = ARNEW (gsh, GSHRows);
+  gsh->terminal = ARNEW (gsh, GSH_Terminal, gsh);
+  /* setup methods */
   gsh->delete = &gsh_delete_GSH;
   gsh->parse = &gsh_parse_arguments;
   gsh->finalize = &gsh_GSH_finalize;
-  gsh->init = &gsh_setup_containers;
   gsh->manage = &gsh_manage;
-  setup_add_methods (gsh);
-}
-
-static void
-setup_child_classes (GSH * gsh)
-{
-  gsh->update = ARNEW (gsh, GSHUpdateManager);
-  gsh->rows = ARNEW (gsh, GSHRows);
-  gsh->terminal = ARNEW (gsh, GSH_Terminal, gsh);
-}
-
+  gsh->add.window = &gsh_GSH_add_window;
+  gsh->add.button = &gsh_add_button;
+  gsh->add.label = &gsh_add_label;
+  /* setup app mode fields */
 #define GWA gsh->widgets.app
-
-static void
-setup_app_menus (GSH * gsh)
-{
 #define GWAM GWA.menus
+  gsh->widgets.last_managed = GWA.menubar = GWA.toolbar =NULL;
   GWAM.file = NULL;
   GWAM.edit = NULL;
   GWAM.view = NULL;
   GWAM.tools = NULL;
   GWAM.help = NULL;
-}
-
-static void
-setup_widget_app_member_fields (GSH * gsh)
-{
-  GWA.menubar = NULL;
-  GWA.toolbar = NULL;
-  setup_app_menus (gsh);
   GWA.frame = NULL;
   GWA.status = NULL;
-}
-
-static void
-setup_widget_member_fields (GSH * gsh)
-{
-  gsh->widgets.last_managed = NULL;
-  setup_widget_app_member_fields (gsh);
-}
-
-static void
-setup_editor_member_fields (GSH * gsh)
-{
   gsh->editor.widget = NULL;
   gsh->editor.filename = NULL;
   gsh->editor.fgcolor = NULL;
   gsh->editor.bgcolor = NULL;
-}
-
-static void
-setup_main_member_fields (GSH * gsh)
-{
   gsh->geometry = (gchar *) NULL;
   gsh->bflags = 0;
-#ifdef USE_GTK
   gsh->icon_size = GTK_ICON_SIZE_DND;
-#endif /* USE_GTK */
   gsh->command_dictionary = NULL;
-}
-
-static void
-setup_member_fields (GSH * gsh)
-{
-  setup_widget_member_fields (gsh);
-  setup_editor_member_fields (gsh);
-  setup_main_member_fields (gsh);
-}
-
-static void
-setup_gsh (GSH * gsh)
-{
-  setup_child_classes (gsh);
-  setup_methods (gsh);
-  setup_member_fields (gsh);
   /* Add initial window.  */
   $ (gsh, add.window);
+
+//  return gsh;
 }
 
-struct GSH *
-gsh_new_GSH ()
+GSH *
+gsh_new_GSH()
 {
-  struct GSH *gsh;
+  GSH * gsh;
 
-  gsh = (struct GSH *) armalloc (sizeof (struct GSH));
-  setup_gsh (gsh);
+  gsh=(GSH*)armalloc(sizeof(GSH));
+  gsh_GSH(gsh);
 
   return gsh;
 }
+

Index: gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- gtkshell.h  16 Aug 2010 11:51:21 -0000      1.61
+++ gtkshell.h  17 Aug 2010 15:21:47 -0000      1.62
@@ -56,6 +56,9 @@
 
 #include "module_includes.h"
 
-struct GSH *gsh_new_GSH ();
+void
+gsh_GSH (GSH * gsh);
+
+GSH *gsh_new_GSH ();
 
 #endif /* ! GSH_GTKSHELL_H */

Index: image_button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- image_button.c      17 Aug 2010 12:57:12 -0000      1.24
+++ image_button.c      17 Aug 2010 15:21:47 -0000      1.25
@@ -49,7 +49,7 @@
 GtkWidget *
 gsh_get_image (const gchar * name, const guint icon_size)
 {
-  const guint8 sz=gsh_icon_size_to_pixels(icon_size);
+  const guint sz=gsh_icon_size_to_pixels(icon_size);
   GtkWidget *image=NULL;
     {
       GdkPixbuf *pix;

Index: main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- main.c      16 Aug 2010 11:51:21 -0000      1.35
+++ main.c      17 Aug 2010 15:21:47 -0000      1.36
@@ -22,33 +22,12 @@
 
 #include "gtkshell.h"
 
-static void
-setup_gui (struct GSH *gsh, const gint argc, const gchar ** argv)
-{
-  $ (gsh, init);
-  $ (gsh, parse, argc, argv);  /* Setup GUI.  */
-  $ (gsh, finalize);
-}
-
-static GSH *
-make_window_for_args (const gint argc, const gchar ** argv)
-{
-  GSH *gsh = ARNEW (gsh, GSH);
-
-  setup_gui (gsh, argc, argv);
-#ifdef LIBGC
-  GC_gcollect ();
-#endif /* LIBGC */
-
-  return gsh;
-}
-
 int
 main (int argc, char **argv)
 {
   gint counter;
   struct ARArguments *argset;
-  GSH *gsh;
+  GSH *gsh=alloca(sizeof(GSH));
 
   gtk_init (&argc, &argv);
 
@@ -60,8 +39,9 @@
       /* Use '---' as thread separator.  */
       if (!strncmp (argv[counter], "---", 3))
        {
-         gsh = make_window_for_args ((const gint) argset->argc,
-                                     (const gchar **) argset->argv);
+          gsh_GSH(gsh);
+          $ (gsh, parse, (const gint)argc, (const gchar **)argv);
+          $ (gsh, finalize);
          $ (argset, delete_options);
          argset = ARNEW (ar, ARArguments);
          $ (argset, add, argv[0]);
@@ -71,8 +51,9 @@
          $ (argset, add, argv[counter]);
        }
     }
-  gsh = make_window_for_args ((const gint) argset->argc,
-                             (const gchar **) argset->argv);
+    gsh_GSH(gsh);
+    $ (gsh, parse, (const gint)argc, (const gchar **)argv);
+    $ (gsh, finalize);
   $ (argset, delete_options);
   if (gsh->command_dictionary)
     $ (gsh->command_dictionary, delete);

Index: row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- row.c       16 Aug 2010 11:51:22 -0000      1.28
+++ row.c       17 Aug 2010 15:21:47 -0000      1.29
@@ -22,21 +22,32 @@
 
 #include "gtkshell.h"
 
+#define NEWROW GSH_ADD_WIDGET (this->h, this->v, vbox, FALSE, 2)
+
 static void
 gsh_GSHRows_new (struct GSHRows *this)
 {
-  this->current = (this->v) ? 1 : 2;
-  GSH_ADD_WIDGET (this->h, this->v, vbox, FALSE, 2);
+//  this->current=(this->v)?0:1;
+  this->current=0;
+  NEWROW;
 }
 
 static void
 gsh_GSHRows_check (struct GSHRows *this)
 {
-  if (this->current > this->total)
+  if ((this->current >= this->total)||!(this->v))
     $ (this, new);
 }
 
 static inline void
+delete(struct GSHRows * rows)
+{
+   gtk_widget_destroy(rows->v);
+   gtk_widget_destroy(rows->h);
+   g_free(rows);
+}
+
+static inline void
 setup_methods (struct GSHRows *rows)
 {
   rows->delete = (void (*)(struct GSHRows *)) &g_free;
@@ -45,13 +56,13 @@
 }
 
 static inline void
-setup_member_fields (struct GSHRows *rows)
+setup_member_fields (struct GSHRows *this)
 {
 /* Use an arbitrary, though reasonable, initial number of rows.  */
-  rows->current = 1;
-  rows->total = 8;
-  rows->h = NULL;
-  rows->v = NULL;
+  //rows->current = 1;
+  this->total = 8;
+  GSH_SHOW_CREATE(this->h, hbox, FALSE, 2);
+  NEWROW;
 }
 
 struct GSHRows *
@@ -90,16 +101,14 @@
 void
 gsh_manage (struct GSH *gsh, GtkWidget * widget)
 {
-  if (GSH_FLAG (GSH_PANE_NEXT))
-    {
-      gsh_pane_previous (gsh, widget);
-    }
-  else
+  if (!GSH_FLAG (GSH_PANE_NEXT))
     {
       struct GSHRows *rows = gsh->rows;
       GtkWidget *vert = rows->v;
+
       if (test_manage_menu_item (vert, widget))
        return;
+      gsh_manage_generic (gsh, widget);
       $ (rows, check);
       if (GSH_FLAG (GSH_NO_EXPAND))
        {
@@ -109,13 +118,10 @@
        {
          GSHCA (vert, widget);
        }
-#if 0
-      /* Test for unexpanded addition of a child.  */
-      if (GSH_FLAG (GSH_NO_EXPAND))
-       gtk_box_pack_start (GTK_BOX (vert), widget, FALSE, FALSE, 0);
+    }
       else
-       gtk_container_add (GTK_CONTAINER (vert), widget);
-#endif
+    {
+      gsh_pane_previous (gsh, widget);
       gsh_manage_generic (gsh, widget);
     }
 }