[Antiright-devel] antiright ACE-desktop/ACE gtkshell/Makefile gtk...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/12/20 00:21:12

Modified files:
        ACE-desktop    : ACE 
        gtkshell       : Makefile button.c dragdrop.c gshterm gtkshell.c 
                         main.c menu.c 
        libantiright   : macros.h tuple.c 
Added files:
        ACE-desktop/hacks: deskbar.sh 

Log message:
        Split deskbar into a separate script.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/hacks/deskbar.sh?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gshterm?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/macros.h?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/tuple.c?cvsroot=antiright&r1=1.2&r2=1.3

Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- ACE-desktop/ACE     11 Dec 2007 22:20:32 -0000      1.56
+++ ACE-desktop/ACE     20 Dec 2007 00:21:11 -0000      1.57
@@ -96,6 +96,14 @@
                fi
        done
        rm -f $TMPDIR/ARO.*
+       # This allows external programs to 
+       # use antiright resourcedirectories.  
+       if [ "$1" = "-e" ]; then
+               echo "export sysconfigdir=$sysconfigdir"
+               echo "export datadir=$datadir"
+               echo "export icon=$icon"
+               echo "export ARCONF=$ARCONF"
+       fi
 }
 
 Undefined()
@@ -257,6 +265,12 @@
                fi
        fi
 }
+
+Deskbar()
+{
+       Hack deskbar
+}
+
 AR()
 {
        AR_Prepare_Environment
@@ -372,32 +386,6 @@
        nice $ARSHELL -oT 'Note' -aT -og 175x200 
 }
 
-Deskbar_Icon_Arguments()
-{
-       echo "--- 'Exit___ ,gtk-quit' -al Exit"
-}
-
-Deskbar()
-{
-       local STYLE="$(ACE deskbar_style)"
-
-       if [ "$STYLE" = "0" ]; then
-               GUIDL Old_Deskbar
-       else 
-           if [ "$(ACE Desk_Icons)" = "1" ]; then
-               gtkshell -f $datadir/Horizontal_Deskbar.gdl\
-                       --- -on -og -24+48 'ACE ,ACE_32.png'\
-                       --- -on -og -24+96 'ACE File_Manager ,gtk-directory'\
-                       --- -on -og -24+144\
-                               'ACE -A GUIDL File_System_Panel ,gtk-harddisk'\
-                       --- -on -og -24+192\
-                               'ACE -A GUIDL Network_Panel ,gtk-network'\
-                       --- -on -og -24-48 'rm -rf ,gtk-delete'
-           else
-               GUIDL Horizontal_Deskbar
-           fi
-       fi
-}
 Read_Man_Page()
 {
        ACE Terminal -e man $1 $2
@@ -422,6 +410,7 @@
 {
        $ARSHELL -di 'FIXME No OS specific functionality available.'
 }
+
 Command()
 {
        exec $(Prompt_User command) $@

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gtkshell/Makefile   19 Dec 2007 18:44:45 -0000      1.51
+++ gtkshell/Makefile   20 Dec 2007 00:21:11 -0000      1.52
@@ -64,6 +64,6 @@
        rm -f gtkshell *.o libgtkshell.a 
 
 install:
-       install gtkshell $(PREFIX)/bin
+       install -s gtkshell $(PREFIX)/bin
        install gshterm $(PREFIX)/bin
 

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- gtkshell/button.c   18 Dec 2007 02:19:38 -0000      1.57
+++ gtkshell/button.c   20 Dec 2007 00:21:11 -0000      1.58
@@ -127,7 +127,9 @@
                        gtk_widget_show(image=gtk_image_new_from_stock(
                                mapping[mapping_count].icon, 
                                GTK_ICON_SIZE_SMALL_TOOLBAR));
+#if GTK_MINOR_VERSION >= 12
                        gtk_widget_set_tooltip_text(image, label);
+#endif
                }
        }
 

Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/dragdrop.c 11 Jun 2007 21:32:39 -0000      1.15
+++ gtkshell/dragdrop.c 20 Dec 2007 00:21:11 -0000      1.16
@@ -35,53 +35,6 @@
        {(gchar *)"text/plain", 0, TARGET_STRING}
 };
 
-static guint n_targets = G_N_ELEMENTS(target_list);
-
-static void
-drag_received(GtkWidget *widget, GdkDragContext * context, gint x,
-             gint y, GtkSelectionData * selection, guint target_type,
-             guint time, gpointer data);
-
-static gboolean
-drag_drop(GtkWidget *widget, GdkDragContext * context, gint x,
-         gint y, guint time, gpointer data);
-
-static void
-drag_data_get(GtkWidget *widget, GdkDragContext * context,
-             GtkSelectionData * selection, guint target_type,
-             guint time, gpointer data);
-
-/*static void
-     drag_begin(GtkWidget *widget, GdkDragContext * context, gpointer data);
-
-static void
-     drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data);*/
-
-#define DND_SIGNAL(sig, func) \
-       (void) g_signal_connect(widget, sig, G_CALLBACK(func), NULL)
-
-#define SETUP_DRAG_DROP_SIGNALS(widget)\
-{\
-       DND_SIGNAL("drag-data-received", drag_received);\
-       DND_SIGNAL("drag-drop", drag_drop);\
-       DND_SIGNAL("drag-data-get", drag_data_get);\
-}
-
-void
-gsh_setup_drag_drop(struct GSH * gsh, GtkWidget *widget)
-{
-       gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_MOTION
-                | GTK_DEST_DEFAULT_HIGHLIGHT, target_list, n_targets,
-                GDK_ACTION_COPY);
-
-       gtk_drag_source_set(widget, GDK_BUTTON1_MASK, target_list, n_targets,
-                           GDK_ACTION_COPY);
-
-       SETUP_DRAG_DROP_SIGNALS(widget);
-
-       if (GSH_FLAG(GSH_CBEXIT))
-               DND_SIGNAL("drag-end", gtk_main_quit);
-}
 
 static void
 drag_received(GtkWidget *widget, GdkDragContext * context, gint x,
@@ -123,7 +76,7 @@
                GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets,
                                                    TARGET_STRING));
 
-       ARIFP(context->targets)
+       if(context->targets)
        {
                gtk_drag_get_data(widget, context, target_type, time);
                return TRUE;
@@ -149,6 +102,7 @@
 }
 
 /* Use to set icon.  */
+#if 0 /* Unused */
 /*static void
 drag_begin(GtkWidget *widget, GdkDragContext * context, gpointer data)
 {
@@ -158,3 +112,28 @@
 drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data)
 {
 }*/
+#endif /* 0 */
+
+void
+gsh_setup_drag_drop(struct GSH * gsh, GtkWidget *widget)
+{
+       const guint n_targets = G_N_ELEMENTS(target_list);
+
+       gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_MOTION
+                | GTK_DEST_DEFAULT_HIGHLIGHT, target_list, n_targets,
+                GDK_ACTION_COPY);
+
+       gtk_drag_source_set(widget, GDK_BUTTON1_MASK, target_list, n_targets,
+                           GDK_ACTION_COPY);
+
+#define DND_SIGNAL(sig, func) \
+       (void) g_signal_connect(widget, sig, G_CALLBACK(func), NULL)
+
+       DND_SIGNAL("drag-data-received", drag_received);
+       DND_SIGNAL("drag-drop", drag_drop);
+       DND_SIGNAL("drag-data-get", drag_data_get);
+
+       if (GSH_FLAG(GSH_CBEXIT))
+               DND_SIGNAL("drag-end", gtk_main_quit);
+}
+

Index: gtkshell/gshterm
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gshterm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/gshterm    3 Aug 2007 20:13:26 -0000       1.8
+++ gtkshell/gshterm    20 Dec 2007 00:21:11 -0000      1.9
@@ -10,7 +10,7 @@
 COMMAND=""
 DEBUG="FALSE"
 APP_MODE=""
-TRANSPARENT="-ott"
+TRANSPARENT=""
 
 while [ $# -gt 0 ]; do
        case "$1" in
@@ -39,8 +39,7 @@
                shift
                ;;
        -t)
-               #TRANSPARENT="-ott"
-               TRANSPARENT=""
+               TRANSPARENT="-ott"
                break
                ;;
        esac

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- gtkshell/gtkshell.c 11 Dec 2007 20:31:32 -0000      1.49
+++ gtkshell/gtkshell.c 20 Dec 2007 00:21:11 -0000      1.50
@@ -24,27 +24,22 @@
 #include "gtkshell.h"
 
 static void
-delete_child_classes(GSH * gsh)
+gsh_delete_GSH(GSH * gsh)
 {
+       /* Delete atomic members.  */
+       GSH_FREE_IF(gsh->geometry);
+       /* Delete child classes.  */
        ARDELETE(gsh->rows);
        ARDELETE(gsh->terminal);
        ARDELETE(gsh->update);
 }
 
 static void
-gsh_delete_GSH(struct GSH * gsh)
-{
-       delete_child_classes(gsh);
-       GSH_FREE_IF(gsh->geometry);
-}
-
-static void
 setup_add_methods(GSH * gsh)
 {
-#define GSHA gsh->add
-       GSHA.window=&gsh_GSH_add_window;
-       GSHA.button=&gsh_add_button;
-       GSHA.label=&gsh_add_label;
+       gsh->add.window=&gsh_GSH_add_window;
+       gsh->add.button=&gsh_add_button;
+       gsh->add.label=&gsh_add_label;
 }
 
 static void
@@ -54,7 +49,7 @@
        gsh->parse = &gsh_parse_arguments;
        gsh->finalize = &gsh_GSH_finalize;
        gsh->init = &gsh_setup_containers;
-       gsh->manage=&gsh_manage;
+       gsh->manage = &gsh_manage;
        setup_add_methods(gsh);
 }
 

Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gtkshell/main.c     15 Dec 2007 02:55:35 -0000      1.33
+++ gtkshell/main.c     20 Dec 2007 00:21:12 -0000      1.34
@@ -55,8 +55,6 @@
        argset=ARNEW(ar, ARArguments);
        $(argset, add, argv[0]);
 
-       //threads=malloc(sizeof(pthread_t));
-
        for(counter=1; (int)counter<argc; counter++)
        {
                /* Use '---' as thread separator.  */

Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gtkshell/menu.c     19 Dec 2007 18:44:45 -0000      1.29
+++ gtkshell/menu.c     20 Dec 2007 00:21:12 -0000      1.30
@@ -109,15 +109,22 @@
 begin_submenu(GSH * gsh, GtkWidget ** submenus, 
        guint *submenu_count, guint * i, gchar ** tokens)
 {
-       GtkWidget * label;
 
        GSH_UNSET(GSH_MENU_BUTTON);
        submenus[(*submenu_count)++]=gsh->rows->v;
-       gtk_widget_show(gsh->rows->v = gtk_menu_new());
+       {
+               GtkWidget * submenu;
+
+               gtk_widget_show(submenu=gsh->rows->v = gtk_menu_new());
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(
-               gsh->widgets.button), gsh->rows->v);
+                       gsh->widgets.button), submenu);
+       }
+       {
+               GtkWidget * label;
+
        label=gtk_bin_get_child(GTK_BIN(gsh->widgets.button));
        find_and_set_label_widget(label, tokens[++(*i)]);
+       }
 }
 
 static void

Index: libantiright/macros.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/macros.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libantiright/macros.h       6 Sep 2007 14:38:09 -0000       1.9
+++ libantiright/macros.h       20 Dec 2007 00:21:12 -0000      1.10
@@ -83,7 +83,7 @@
        (package##_new_##class(__VA_ARGS__))
 
 #define ARDELETE(class)\
-       $(class, delete)
+       { if(class) { $(class, delete); } }
 
 #define $$(...) $(this, __VA_ARGS__)
 

Index: libantiright/tuple.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/tuple.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libantiright/tuple.c        28 Apr 2007 22:26:23 -0000      1.2
+++ libantiright/tuple.c        20 Dec 2007 00:21:12 -0000      1.3
@@ -39,6 +39,7 @@
 void
 ar_delete_ARTupleVector(struct ARTupleVector * vector)
 {
+       g_hash_table_remove_all(vector->__hash);
        g_hash_table_destroy(vector->__hash);
        g_free(vector);
 }

Index: ACE-desktop/hacks/deskbar.sh
===================================================================
RCS file: ACE-desktop/hacks/deskbar.sh
diff -N ACE-desktop/hacks/deskbar.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/hacks/deskbar.sh        20 Dec 2007 00:21:11 -0000      1.1
@@ -0,0 +1,43 @@
+#!/bin/sh
+#    AntiRight (c) 2002-2007 Jeffrey Bedard address@hidden
+
+#    This file is part of AntiRight.
+
+#     AntiRight is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU General Public License as
+#     published by the Free Software Foundation; either version 2 of
+#     the License, or (at your option) any later version.  AntiRight
+#     is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.  You should have
+#     received a copy of the GNU General Public License along with
+#     AntiRight; if not, write to the Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ARSHELL=gtkshell
+AWK=awk
+
+# Import ACE environment.
+eval "$(ACE -A Setup_Dirs -e)"
+
+# Get current deskbar style.  
+STYLE="$(ACE deskbar_style)"
+
+if [ "$STYLE" = "0" ]; then
+       ACE -A GUIDL Old_Deskbar
+else 
+    if [ "$(ACE Desk_Icons)" = "1" ]; then
+       gtkshell -f $datadir/Horizontal_Deskbar.gdl\
+               --- -on -og -24+48 'ACE ,ACE_32.png'\
+               --- -on -og -24+96 'ACE File_Manager ,gtk-directory'\
+               --- -on -og -24+144\
+                       'ACE -A GUIDL File_System_Panel ,gtk-harddisk'\
+               --- -on -og -24+192\
+                       'ACE -A GUIDL Network_Panel ,gtk-network'\
+               --- -on -og -24-48 'rm -rf ,gtk-delete'
+    else
+       GUIDL Horizontal_Deskbar
+    fi
+fi
+