[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure gtkshell/Makefile gtkshell/...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright configure gtkshell/Makefile gtkshell/... |
|
Date: |
Wed, 19 Dec 2007 18:44:46 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/12/19 18:44:46
Modified files:
. : configure
gtkshell : Makefile add_options.c add_options.h clock.c
color.c guidl_dialog.c guidl_widgets.c menu.c
options.c swallow.c undo.c update_manager.c
Log message:
Code cleanup and consolidations. Use unframed clock by default.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.h?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/color.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_dialog.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_widgets.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/swallow.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/undo.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/update_manager.c?cvsroot=antiright&r1=1.10&r2=1.11
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- configure 18 Dec 2007 02:19:37 -0000 1.112
+++ configure 19 Dec 2007 18:44:45 -0000 1.113
@@ -62,6 +62,8 @@
USE_THREADS=NO
elif [ "$ARG" = "--enable-quickstart-toolbar" ]; then
DEFS="$DEFS -DGSH_USE_QUICKSTART"
+ elif [ "$ARG" = "--enable-clock-frame" ]; then
+ DEFS="$DEFS -DGSH_FRAMED_CLOCK"
else
echo WARNING: Unknown configure option passed: "$ARG"
fi
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- gtkshell/Makefile 13 Dec 2007 17:20:24 -0000 1.50
+++ gtkshell/Makefile 19 Dec 2007 18:44:45 -0000 1.51
@@ -39,7 +39,7 @@
guidl_util.o about_dialog.o init.o guidl_dialog.o guidl_dictionary.o\
guidl_options.o guidl_widgets.o update_manager.o pane.o\
command_shell.o app_mode.o clock.o tree.o form.o dialog.o swallow.o\
- GSHWidget.o quickstart.o undo.o color.o
+ GSHWidget.o quickstart.o undo.o color.o add_options.o
program=main.o
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gtkshell/add_options.c 13 Dec 2007 17:20:24 -0000 1.55
+++ gtkshell/add_options.c 19 Dec 2007 18:44:45 -0000 1.56
@@ -22,121 +22,190 @@
#include "gtkshell.h"
-static void
-add_piped_label(GSH * gsh, const gchar * output)
+void
+gsh_add_window_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- $(gsh, add.label, output);
+ /* This is duplicate functionlity, as same can be
+ done with '---' argument. */
+ $(gsh, add.window);
+ gsh->rows->current=1;
+ $(gsh, init);
+ GSH_SET(GSH_IN_SECONDARY_WIN);
}
-static void
-add_piped_text(GSH * gsh, const gchar * output)
+void
+gsh_add_applet_clock_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ $(gsh, manage, gsh_clock_new(gsh));
+}
+
+void
+gsh_add_pane_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- GtkWidget * text_area;
+ gsh_setup_hpaned(gsh, argv[++(*counter)]);
+}
+
+void
+gsh_add_command_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ GSHCommandShell * shell;
- text_area=gsh_text_area(gsh);
- (void)gsh_text_area_set_text(text_area, output);
+ shell=ARNEW(gsh, GSHCommandShell);
+ $(gsh, manage, $(shell, get));
+ if(argv[++(*counter)])
+ $(shell, run, argv[*counter]);
+ /* The command instance is not freed here,
+ as it is accessed by callbacks. */
}
-#define GENERIC_FILE_CONTENTS(gsh, add, input)\
-{\
- add(gsh, input);\
- g_free(input);\
+void
+gsh_add_editor_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ GSH_SET(GSH_APP_MODE);
+ gsh_text_editor(gsh, argv[++(*counter)]);
}
-#define ADD_PIPED_GENERIC(gsh, add)\
- GENERIC_FILE_CONTENTS(gsh, add, antiright_read_file(stdin))
+void
+gsh_add_form_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ gsh_add_form(gsh, argv[++(*counter)]);
+}
-#define GENERIC_COMMANDED_ADD(gsh, command, add)\
- GENERIC_FILE_CONTENTS(gsh, add, antiright_pipe_read(command))
+void
+gsh_add_list_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ $(gsh, manage, gsh_tree_view_new(gsh, argv[++(*counter)]));
+}
-static void
-add_new_window(GSH * gsh)
+void
+gsh_add_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- $(gsh, add.window);
- gsh->rows->current=1;
- $(gsh, init);
- GSH_SET(GSH_IN_SECONDARY_WIN);
+ $(gsh, add.label, argv[++(*counter)]);
}
-static void
-add_separator(GSH * gsh)
+void
+gsh_add_piped_text_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- GtkWidget * separator;
+ gchar * piped;
- /* Create a separator widget. If GSH has one row per column,
- use a vertical separator, else use a horizontal separator.
- This allows the separator to be used for ACE's Deskbar. */
- separator = (gsh->rows->total == 1) ?
- gtk_vseparator_new() : gtk_hseparator_new();
- /* Show and manage the separator. */
- $(gsh, manage, separator);
+ piped=antiright_read_file(stdin);
+ gsh_text_area_set_text(gsh_text_area(gsh), piped);
+ g_free(piped);
}
-#define GCA_WIDGET(func) \
- GENERIC_COMMANDED_ADD(gsh, argv[*counter], func)
+void
+gsh_add_piped_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ gchar * piped;
-static void
-handle_commanded_add_arguments(GSH * gsh, const gint argc, const gchar **argv,
- gint *counter)
+ piped=antiright_read_file(stdin);
+ $(gsh, add.label, piped);
+ g_free(piped);
+}
+
+void
+gsh_add_quickstart_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- if(!argv[*counter] || !argv[(*counter)+1])
- return;
- GSH_COUNT(argc, counter);
- switch(argv[(*counter)-1][3])
- {
- case 'b':
- GCA_WIDGET(gsh->add.button);
- break;
- case 'l':
- GCA_WIDGET(gsh->add.label);
- break;
- }
+#ifdef GSH_USE_QUICKSTART
+ GSHQuickStart * quickstart;
+
+ quickstart=ARNEW(gsh, GSHQuickStart);
+ (*counter)++;
+ $(quickstart, add ,gsh, argv[*counter], argv[(*counter)+1]);
+ (*counter)++;
+ $(gsh, manage, $(quickstart, getColumn));
+#else /* ! GSH_USE_QUICKSTART */
+#endif /* GSH_USE_QUICKSTART */
+}
+
+void
+gsh_add_row_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ $(gsh->rows, new);
+}
+
+void
+gsh_add_separator_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ $(gsh, manage, ((gsh->rows->total==1)
+ ? gtk_vseparator_new() : gtk_hseparator_new()));
}
-#ifdef HAVE_VTE
static void
-add_shell(GSH * gsh, const gchar * command)
+add_commanded(GSH * gsh, gint * counter, const gchar ** argv,
+ GtkWidget *(*function)(GSH *, const gchar *))
+{
+ gchar * text;
+
+ text=antiright_pipe_read(argv[*counter]);
+ function(gsh, text);
+ g_free(text);
+}
+
+void
+gsh_add_commanded_button_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
+ add_commanded(gsh, counter, argv, gsh->add.button);
+}
+
+void
+gsh_add_commanded_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ add_commanded(gsh, counter, argv, gsh->add.label);
+}
+
+void
+gsh_add_shell_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+#ifdef HAVE_VTE
GtkWidget * terminal;
+
+ /* Ensure that the terminal manager object exists. */
if(!gsh->terminal)
gsh->terminal=ARNEW(gsh, GSH_Terminal, gsh);
- /* Create a terminal widget that is running COMMAND. */
- terminal = $(gsh->terminal, add, command);
- if(terminal) /* NULL if terminal is a tab. */
+ /* Set counter to argument containing command. */
+ (*counter)++;
+ /* Create a terminal widget to run the passed command. */
+ terminal=$(gsh->terminal, add, argv[*counter]);
+ if(terminal) /* This is NULL if terminal is tabbed. */
{
/* Let GSH manage the terminal widget. */
- $(gsh, manage, (GtkWidget *)terminal);
+ $(gsh, manage, terminal);
}
-}
+#else /* ! HAVE_VTE */
+ add_command_cb(gsh, counter, argv);
#endif /* HAVE_VTE */
+}
-static void
-add_command_shell(GSH * gsh, const gchar * command)
+void
+gsh_add_entry_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- GSHCommandShell * shell;
+ (*counter)++;
+ gsh_setup_command_entry(gsh, argv[*counter]);
+}
- shell = ARNEW(gsh, GSHCommandShell);
- $(gsh, manage, $(shell, get));
- if(command)
- $(shell, run, command);
- /* The command instance is not freed here,
- * as it is accessed by callbacks. */
+void
+gsh_add_text_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ gsh_text_area(gsh);
}
-static void
-handle_applet_arguments(GSH * gsh, const gchar ** argv,
- gint * counter)
+void
+gsh_add_updating_progress_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- const gchar * current_arg = argv[*counter];
- g_assert(strlen(current_arg) > 2);
- switch(current_arg[3])
- {
- case 'c': /* Add clock. */
- $(gsh, manage, gsh_clock_new(gsh));
- break;
- default:
- ARWARN("invalid applet argument");
- }
+ gsh_add_updated_progress(gsh, argv[++(*counter)]);
+}
+
+void
+gsh_add_updating_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ gsh_add_updated_label(gsh, argv[++(*counter)]);
+}
+
+void
+gsh_add_embedded_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ gsh_add_embedded(gsh, (char *)argv[++(*counter)]);
}
Index: gtkshell/add_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/add_options.h 11 Jun 2007 21:32:37 -0000 1.8
+++ gtkshell/add_options.h 19 Dec 2007 18:44:45 -0000 1.9
@@ -26,7 +26,66 @@
#include "gtkshell.h"
void
-gsh_handle_add_arguments(GSH * gsh, const gint argc, const gchar **argv,
- gint *counter);
+gsh_add_window_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_applet_clock_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_pane_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_command_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_editor_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_form_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_list_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_label_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_piped_text_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_piped_label_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_quickstart_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_row_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_separator_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_commanded_button_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_commanded_label_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_shell_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_entry_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_text_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_updating_progress_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_updating_label_cb(GSH * gsh, gint * counter, const gchar ** argv);
+
+void
+gsh_add_embedded_cb(GSH * gsh, gint * counter, const gchar ** argv);
#endif
Index: gtkshell/clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/clock.c 6 Dec 2007 14:40:50 -0000 1.8
+++ gtkshell/clock.c 19 Dec 2007 18:44:45 -0000 1.9
@@ -23,7 +23,7 @@
#include "gtkshell.h"
#include <time.h>
-#define GSH_CLOCK_TIME_STRING_SIZE 20
+#define GSH_CLOCK_TIME_STRING_SIZE 21
struct
GSHClockData
@@ -45,7 +45,7 @@
#define GSHTM(element) split_time.tm_##element
(void)snprintf(time_string,
GSH_CLOCK_TIME_STRING_SIZE,
- "%.2d/%.2d/%.2d%c%.2d:%.2d:%.2d",
+ "%.2d/%.2d/%.2d %c%.2d:%.2d:%.2d",
GSHTM(mon)+1, GSHTM(mday), GSHTM(year)%100,
(GSH_FLAG(GSH_HORIZ_CLOCK) ? ' ' : '\n'),
GSHTM(hour), GSHTM(min), GSHTM(sec));
@@ -62,6 +62,7 @@
gtk_label_set_text(GTK_LABEL(clock->clock_widget), time_string);
}
+#ifdef GSH_FRAMED_CLOCK
static GtkWidget *
setup_containers(GtkWidget * clock)
{
@@ -77,12 +78,13 @@
GSHCA(frame, event_box);
GSHCA(event_box, clock);
/* Set clock colors. */
- gsh_widget_set_color(event_box, "#223", FALSE);
+ //gsh_widget_set_color(event_box, "#223", FALSE);
}
gsh_widget_set_color(clock, "#dde", TRUE);
return frame;
}
+#endif /* GSH_FRAMED_CLOCK */
GtkWidget *
gsh_clock_new(GSH * gsh)
@@ -97,6 +99,10 @@
GSH_NEW_UPDATER(gsh, update_clock, (gpointer)clock_data);
gtk_widget_show(clock);
+#ifdef GSH_FRAMED_CLOCK
return setup_containers(clock);
+#else /* ! GSH_FRAMED_CLOCK */
+ return clock;
+#endif /* GSH_FRAMED_CLOCK */
}
Index: gtkshell/color.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/color.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/color.c 10 Dec 2007 15:14:05 -0000 1.1
+++ gtkshell/color.c 19 Dec 2007 18:44:45 -0000 1.2
@@ -1,3 +1,25 @@
+/*
+ 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
+*/
+
#include "gtkshell.h"
Index: gtkshell/guidl_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_dialog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/guidl_dialog.c 11 Jun 2007 21:32:41 -0000 1.11
+++ gtkshell/guidl_dialog.c 19 Dec 2007 18:44:45 -0000 1.12
@@ -37,7 +37,7 @@
DEF("font", "-dF");
DEF("about", "-da");
DEF("folder", "-dd");
- DEF( "create folder", "-dD");
+ DEF("create folder", "-dD");
DEF("save", "-ds");
DEF("color", "-dc");
DEF("info", "-di");
Index: gtkshell/guidl_widgets.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_widgets.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/guidl_widgets.c 11 Jun 2007 21:32:42 -0000 1.12
+++ gtkshell/guidl_widgets.c 19 Dec 2007 18:44:45 -0000 1.13
@@ -48,6 +48,7 @@
DEF("vertical pane", "-ab");
DEF("command shell", "-aC");
DEF("clock applet", "-aAc");
+ DEF("embedded", "-aX");
}
GSH_GUIDL_ITEM_FUNC(widget, DICT);
Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gtkshell/menu.c 18 Dec 2007 02:19:38 -0000 1.28
+++ gtkshell/menu.c 19 Dec 2007 18:44:45 -0000 1.29
@@ -25,7 +25,7 @@
#define SPLIT_ALL -1
-static void
+static inline void
setup_separator_menu_item(GSH * gsh)
{
GtkWidget * separator;
@@ -177,23 +177,16 @@
GSHR->v=(GtkWidget *)old_row;
}
-#define GW gsh->widgets
-#define GWA GW.app
-
-static void
-manage_menu_bar(GSH * gsh)
-{
- GSH_FLAG(GSH_APP_MODE) ? gsh_setup_app_mode(gsh)
- : $(gsh, manage, GWA.menubar);
-}
static GtkWidget *
add_menu_bar(struct GSH * gsh)
{
+#define GWA gsh->widgets.app
if(!GWA.menubar)
{
GSH_SHOW_CREATE(GWA.menubar, menu_bar);
- manage_menu_bar(gsh);
+ GSH_FLAG(GSH_APP_MODE) ? gsh_setup_app_mode(gsh)
+ : $(gsh, manage, GWA.menubar);
}
return GWA.menubar;
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gtkshell/options.c 13 Dec 2007 17:20:25 -0000 1.38
+++ gtkshell/options.c 19 Dec 2007 18:44:46 -0000 1.39
@@ -95,173 +95,7 @@
{
}
-static void
-add_applet_clock_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- $(gsh, manage, gsh_clock_new(gsh));
-}
-
-static void
-add_pane_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gsh_setup_hpaned(gsh, argv[++(*counter)]);
-}
-
-static void
-add_command_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- GSHCommandShell * shell;
-
- shell=ARNEW(gsh, GSHCommandShell);
- $(gsh, manage, $(shell, get));
- if(argv[++(*counter)])
- $(shell, run, argv[*counter]);
- /* The command instance is not freed here,
- as it is accessed by callbacks. */
-}
-
-static void
-add_editor_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- GSH_SET(GSH_APP_MODE);
- gsh_text_editor(gsh, argv[++(*counter)]);
-}
-
-static void
-add_form_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gsh_add_form(gsh, argv[++(*counter)]);
-}
-
-static void
-add_list_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- $(gsh, manage, gsh_tree_view_new(gsh, argv[++(*counter)]));
-}
-
-static void
-add_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- $(gsh, add.label, argv[++(*counter)]);
-}
-
-static void
-add_piped_text_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gchar * piped;
-
- piped=antiright_read_file(stdin);
- gsh_text_area_set_text(gsh_text_area(gsh), piped);
- g_free(piped);
-}
-
-static void
-add_piped_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gchar * piped;
-
- piped=antiright_read_file(stdin);
- $(gsh, add.label, piped);
- g_free(piped);
-}
-
-static void
-add_quickstart_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
-#ifdef GSH_USE_QUICKSTART
- GSHQuickStart * quickstart;
-
- quickstart=ARNEW(gsh, GSHQuickStart);
- (*counter)++;
- $(quickstart, add ,gsh, argv[*counter], argv[(*counter)+1]);
- (*counter)++;
- $(gsh, manage, $(quickstart, getColumn));
-#else /* ! GSH_USE_QUICKSTART */
-#endif /* GSH_USE_QUICKSTART */
-}
-
-static void
-add_row_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- $(gsh->rows, new);
-}
-
-static void
-add_separator_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- $(gsh, manage, ((gsh->rows->total==1)
- ? gtk_vseparator_new() : gtk_hseparator_new()));
-}
-
-static void
-add_commanded(GSH * gsh, gint * counter, const gchar ** argv,
- GtkWidget *(*function)(GSH *, const gchar *))
-{
- gchar * text;
- text=antiright_pipe_read(argv[*counter]);
- function(gsh, text);
- g_free(text);
-}
-
-static void
-add_commanded_button_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- add_commanded(gsh, counter, argv, gsh->add.button);
-}
-
-static void
-add_commanded_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- add_commanded(gsh, counter, argv, gsh->add.label);
-}
-
-static void
-add_shell_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
-#ifdef HAVE_VTE
- GtkWidget * terminal;
-
- /* Ensure that the terminal manager object exists. */
- if(!gsh->terminal)
- gsh->terminal=ARNEW(gsh, GSH_Terminal, gsh);
- /* Set counter to argument containing command. */
- (*counter)++;
- /* Create a terminal widget to run the passed command. */
- terminal=$(gsh->terminal, add, argv[*counter]);
- if(terminal) /* This is NULL if terminal is tabbed. */
- {
- /* Let GSH manage the terminal widget. */
- $(gsh, manage, terminal);
- }
-#else /* ! HAVE_VTE */
- add_command_cb(gsh, counter, argv);
-#endif /* HAVE_VTE */
-}
-static void
-add_entry_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- (*counter)++;
- gsh_setup_command_entry(gsh, argv[*counter]);
-}
-
-static void
-add_text_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gsh_text_area(gsh);
-}
-
-static void
-add_updating_progress_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gsh_add_updated_progress(gsh, argv[++(*counter)]);
-}
-
-static void
-add_updating_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gsh_add_updated_label(gsh, argv[++(*counter)]);
-}
static void
option_terminal_width_cb(GSH * gsh, gint * counter, const gchar ** argv)
@@ -301,23 +135,6 @@
}
-static void
-add_window_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- /* This is duplicate functionlity, as same can be
- done with '---' argument. */
- $(gsh, add.window);
- gsh->rows->current=1;
- $(gsh, init);
- GSH_SET(GSH_IN_SECONDARY_WIN);
-}
-
-static void
-add_embedded_cb(GSH * gsh, gint * counter, const gchar ** argv)
-{
- gsh_add_embedded(gsh, (char *)argv[++(*counter)]);
-}
-
@@ -400,19 +217,19 @@
Note, only the first three characters are used. */
#define GISCMP(text) !strncmp(text, argv[*counter], 3)
#define IFGISCMP(str, icon_size)\
- { if(GISCMP(str)) { GIS=icon_size; return; } }
+ { if(GISCMP(str)) { GIS=GTK_ICON_SIZE##icon_size; return; } }
GSH_SET(GSH_ICON_SIZE_IS_CUSTOM);
- IFGISCMP("menu", GTK_ICON_SIZE_MENU);
- IFGISCMP("small toolbar", GTK_ICON_SIZE_SMALL_TOOLBAR);
- IFGISCMP("large toolbar", GTK_ICON_SIZE_LARGE_TOOLBAR);
- IFGISCMP("toolbar", GTK_ICON_SIZE_SMALL_TOOLBAR);
- IFGISCMP("medium", GTK_ICON_SIZE_SMALL_TOOLBAR);
- IFGISCMP("button", GTK_ICON_SIZE_BUTTON);
- IFGISCMP("dialog", GTK_ICON_SIZE_DIALOG);
- IFGISCMP("DND", GTK_ICON_SIZE_DND);
- IFGISCMP("dnd", GTK_ICON_SIZE_DND);
+ IFGISCMP("menu", _MENU);
+ IFGISCMP("small toolbar", _SMALL_TOOLBAR);
+ IFGISCMP("large toolbar", _LARGE_TOOLBAR);
+ IFGISCMP("toolbar", _SMALL_TOOLBAR);
+ IFGISCMP("medium", _BUTTON);
+ IFGISCMP("button", _BUTTON);
+ IFGISCMP("dialog", _DIALOG);
+ IFGISCMP("DND", _DND);
+ IFGISCMP("dnd", _DND);
/* Default */
GIS=GTK_ICON_SIZE_BUTTON;
}
@@ -491,29 +308,29 @@
dictionary=ARNEW(ar, ARTupleVector);
/* Widgets */
- ARTDEF("-aAc", add_applet_clock_cb);
- ARTDEF("-ab", add_pane_cb);
- ARTDEF("-acb", add_commanded_button_cb);
- ARTDEF("-acl", add_commanded_label_cb);
- ARTDEF("-aC", add_command_cb);
- ARTDEF("-ae", add_editor_cb);
- ARTDEF("-af", add_form_cb);
- ARTDEF("-aL", add_list_cb);
- ARTDEF("-al", add_label_cb);
- ARTDEF("-aP", add_piped_text_cb);
- ARTDEF("-ap", add_piped_label_cb);
- ARTDEF("-aQ", add_quickstart_cb);
- ARTDEF("-ar", add_row_cb);
- ARTDEF("-aS", add_separator_cb);
- ARTDEF("-as", add_shell_cb);
- ARTDEF("-at", add_entry_cb);
- ARTDEF("-aT", add_text_cb);
- ARTDEF("-aw", add_window_cb);
- ARTDEF("-aX", add_embedded_cb);
+ ARTDEF("-aAc", gsh_add_applet_clock_cb);
+ ARTDEF("-ab", gsh_add_pane_cb);
+ ARTDEF("-acb", gsh_add_commanded_button_cb);
+ ARTDEF("-acl", gsh_add_commanded_label_cb);
+ ARTDEF("-aC", gsh_add_command_cb);
+ ARTDEF("-ae", gsh_add_editor_cb);
+ ARTDEF("-af", gsh_add_form_cb);
+ ARTDEF("-aL", gsh_add_list_cb);
+ ARTDEF("-al", gsh_add_label_cb);
+ ARTDEF("-aP", gsh_add_piped_text_cb);
+ ARTDEF("-ap", gsh_add_piped_label_cb);
+ ARTDEF("-aQ", gsh_add_quickstart_cb);
+ ARTDEF("-ar", gsh_add_row_cb);
+ ARTDEF("-aS", gsh_add_separator_cb);
+ ARTDEF("-as", gsh_add_shell_cb);
+ ARTDEF("-at", gsh_add_entry_cb);
+ ARTDEF("-aT", gsh_add_text_cb);
+ ARTDEF("-aw", gsh_add_window_cb);
+ ARTDEF("-aX", gsh_add_embedded_cb);
/* Updating widgets */
- ARTDEF("-aul", add_updating_label_cb);
- ARTDEF("-aup", add_updating_progress_cb);
+ ARTDEF("-aul", gsh_add_updating_label_cb);
+ ARTDEF("-aup", gsh_add_updating_progress_cb);
/* Options */
ARTDEF("-oa", option_app_mode_cb);
Index: gtkshell/swallow.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/swallow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/swallow.c 7 Dec 2007 20:00:25 -0000 1.4
+++ gtkshell/swallow.c 19 Dec 2007 18:44:46 -0000 1.5
@@ -24,13 +24,14 @@
*/
#include "gtkshell.h"
+
+#if 0 /* This is the previous code by Peter Amstutz.
+ It is preserved for reference. */
#include <gdk/gdkx.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#if 0
-
static gboolean
swallow(char* wantedWindow, Display* display, Screen* screen, Window hunger,
unsigned int* width, unsigned int* height)
Index: gtkshell/undo.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/undo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/undo.c 11 Dec 2007 18:05:37 -0000 1.3
+++ gtkshell/undo.c 19 Dec 2007 18:44:46 -0000 1.4
@@ -23,19 +23,21 @@
#include <gdk/gdkkeysyms.h>
#include "undo.h"
+#ifndef DEBUG
#define DV(x)
+#else /* DEBUG */
+#define DV(x) x
+#endif /* ! DEBUG */
static GtkTextView * gsh_undo_text_view;
/* BEGIN -- view.c extracts */
static gint keyval;
-void scroll_to_cursor(GtkTextBuffer *buffer, gdouble within_margin)
-{
- gtk_text_view_scroll_to_mark(gsh_undo_text_view,
- gtk_text_buffer_get_insert(buffer),
+#define SCROLL_TO_CURSOR(buffer, within_margin)\
+ gtk_text_view_scroll_to_mark(gsh_undo_text_view,\
+ gtk_text_buffer_get_insert(buffer),\
within_margin, FALSE, 0, 0);
-}
/* END - view.c extracts */
@@ -97,6 +99,8 @@
DV(g_print("undo_cb: %d %s (%d-%d)\n", command, str, start, end));
}
+
+
static void
undo_set_sequency(gboolean seq)
{
@@ -352,7 +356,7 @@
gtk_text_buffer_get_iter_at_offset(buffer,
&start_iter, ui->start);
gtk_text_buffer_place_cursor(buffer, &start_iter);
- scroll_to_cursor(buffer, 0.05);
+ SCROLL_TO_CURSOR(buffer, 0.05);
}
}
if(!sentinel)
@@ -406,7 +410,7 @@
gtk_widget_set_sensitive(undo_w, TRUE);
gtk_text_buffer_place_cursor(buffer,
&start_iter);
- scroll_to_cursor(buffer, 0.05);
+ SCROLL_TO_CURSOR(buffer, 0.05);
}
}
if(!sentinel)
Index: gtkshell/update_manager.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/update_manager.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/update_manager.c 25 Nov 2007 01:55:07 -0000 1.10
+++ gtkshell/update_manager.c 19 Dec 2007 18:44:46 -0000 1.11
@@ -138,7 +138,7 @@
}
/* Setup method function pointer assignments. */
-static void
+static inline void
assign_methods(struct GSHUpdateManager * update)
{
update->delete=&gsh_delete_GSHUpdateManager;
@@ -146,7 +146,7 @@
}
/* Setup member data fields. */
-static void
+static inline void
initialize_fields(struct GSHUpdateManager * update)
{
update->period = 1000;
@@ -154,11 +154,11 @@
update->updating=FALSE;
}
-static void
-setup(struct GSHUpdateManager * update)
+static inline void
+setup_updater(struct GSHUpdateManager * updater)
{
- assign_methods(update);
- initialize_fields(update);
+ assign_methods(updater);
+ initialize_fields(updater);
}
struct GSHUpdateManager *
@@ -167,7 +167,7 @@
struct GSHUpdateManager * updater;
updater=xmalloc(sizeof(struct GSHUpdateManager));
- setup(updater);
+ setup_updater(updater);
return updater;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright configure gtkshell/Makefile gtkshell/...,
Jeffrey Bedard <=