[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright/gtkshell add_options.c button.c conta...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright/gtkshell add_options.c button.c conta... |
|
Date: |
Thu, 03 May 2007 22:55:10 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/03 22:55:10
Modified files:
gtkshell : add_options.c button.c containers.c gtkshell.c
gtkshell.h guidl_dialog.c guidl_options.c
guidl_util.c guidl_widgets.c label.c terminal.c
updated_label.c updated_progress.c
Log message:
Continued combination of singly used and/or minimally sized functions.
Used DICT define to make DEF and selected dictionary easily modifiable.
Simplified button creation logic steps, particularly for image buttons.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_dialog.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_options.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_widgets.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.12&r2=1.13
Patches:
Index: add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- add_options.c 3 May 2007 21:23:07 -0000 1.26
+++ add_options.c 3 May 2007 22:55:10 -0000 1.27
@@ -22,60 +22,40 @@
#include "gtkshell.h"
-static void
-add_new_window(struct GSH * gsh)
-{
- gsh->window=$(gsh, new_window);
- gsh->rows->current=1;
- $(gsh, init);
-}
-static GtkWidget *
-add_piped_label(struct GSH * gsh, const gchar * output)
-{
- gsh_add_label(gsh, output);
+#define ADD_PIPED_LABEL(gsh, output)\
+ $(gsh, add_label, output)
- return NULL;
-}
+#define ADD_PIPED_TEXT(gsh, output)\
+ gsh_text_area_set_text(gsh_text_area(gsh), output)
-static GtkWidget *
-add_piped_text(struct GSH * gsh, const gchar * output)
-{
- gsh_text_area_set_text(gsh_text_area(gsh), output);
-
- return NULL;
+#define GENERIC_FILE_CONTENTS(gsh, add, input)\
+{\
+ add(gsh, input);\
+ g_free(input);\
}
-static void
-generic_file_contents(struct GSH * gsh,
- GtkWidget * (*add)(struct GSH *, const gchar *),
- gchar * input)
-{
- (*add)(gsh, input);
- g_free(input);
-}
+#define ADD_PIPED_GENERIC(gsh, add)\
+ GENERIC_FILE_CONTENTS(gsh, add, antiright_read_file(stdin))
+
+#define GENERIC_COMMANDED_ADD(gsh, command, add)\
+ GENERIC_FILE_CONTENTS(gsh, add, antiright_pipe_read(command))
static void
-add_piped_generic(struct GSH * gsh,
- GtkWidget * (*add)(struct GSH *, const gchar *))
+add_new_window(struct GSH * gsh)
{
- generic_file_contents(gsh, add, antiright_read_file(stdin));
+ $(gsh, new_window);
+ gsh->rows->current=1;
+ $(gsh, init);
}
static void
add_separator(struct GSH * gsh)
{
- gsh_manage(gsh, (gsh->rows->total == 1)
+ $(gsh, manage, (gsh->rows->total == 1)
? gtk_vseparator_new() : gtk_hseparator_new());
}
-static void
-generic_commanded_add(struct GSH * gsh, const gchar * command,
- GtkWidget * (*add)(struct GSH *, const gchar * ))
-{
- generic_file_contents(gsh, add, antiright_pipe_read(command));
-}
-
void
gsh_handle_add_arguments(struct GSH * gsh, int argc, char **argv, int *counter)
{
@@ -89,11 +69,11 @@
switch(argv[(*counter)-1][3])
{
case 'b':
- generic_commanded_add(gsh, argv[*counter],
+ GENERIC_COMMANDED_ADD(gsh, argv[*counter],
gsh->add_button);
break;
case 'l':
- generic_commanded_add(gsh, argv[*counter],
+ GENERIC_COMMANDED_ADD(gsh, argv[*counter],
gsh->add_label);
}
break;
@@ -104,15 +84,15 @@
case 'l':
gsh_count(argc, counter);
- gsh_add_label(gsh, argv[(*counter)]);
+ $(gsh, add_label, argv[(*counter)]);
break;
case 'P':
- add_piped_generic(gsh, &add_piped_text);
+ ADD_PIPED_GENERIC(gsh, ADD_PIPED_TEXT);
break;
case 'p':
- add_piped_generic(gsh, &add_piped_label);
+ ADD_PIPED_GENERIC(gsh, ADD_PIPED_LABEL);
break;
case 'r': /* Force creation of a new row. */
@@ -125,7 +105,7 @@
case 's': /* Add a shell. */
gsh_count(argc, counter);
- gsh_manage(gsh, $(gsh->terminal, add, argv[*counter]));
+ $(gsh, manage, $(gsh->terminal, add, argv[*counter]));
break;
case 't':
Index: button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- button.c 3 May 2007 20:49:20 -0000 1.33
+++ button.c 3 May 2007 22:55:10 -0000 1.34
@@ -38,11 +38,9 @@
gchar *formatted;
formatted = antiright_beautified_label(command);
- if(GTK_IS_MENU_ITEM(widget))
- create_label_in_menu_item(widget, formatted);
- else
- gtk_button_set_label(GTK_BUTTON(widget), formatted);
- free(formatted);
+ GTK_IS_MENU_ITEM(widget) ? create_label_in_menu_item(widget, formatted)
+ : gtk_button_set_label(GTK_BUTTON(widget), formatted);
+ g_free(formatted);
}
static void
@@ -60,9 +58,9 @@
static void
create_button(struct GSH * gsh)
{
- gtk_widget_show(gsh->button=(!GTK_IS_MENU(gsh->rows->v)
+ gsh->button=(!GTK_IS_MENU(gsh->rows->v)
&& !GTK_IS_MENU_BAR(gsh->rows->v)) ?
- gtk_button_new() : gtk_menu_item_new());
+ gtk_button_new() : gtk_menu_item_new();
}
static void
@@ -73,18 +71,6 @@
setup_callback(gsh, command);
}
-
-static gboolean
-test_pair(struct GSH * gsh, gchar **pair)
-{
- if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
- gsh_image_button(gsh, pair[0], pair[1]);
- else
- return FALSE;
-
- return TRUE;
-}
-
static gboolean
test_image_button(struct GSH * gsh, const gchar * string)
{
@@ -93,22 +79,16 @@
pair=g_strsplit(string, ",", 2);
#ifdef DEBUG
ARPASSERT(pair);
+ ARPASSERT(pair[0]);
#endif /* DEBUG */
+ if(pair[1])
{
- gboolean return_value;
-
- return_value=test_pair(gsh, pair);
+ gsh_image_button(gsh, pair[0], pair[1]);
g_strfreev(pair);
-
- return return_value;
+ return TRUE;
}
-}
-
-static void
-gsh_new_button(struct GSH * gsh, const gchar * string)
-{
- if(!test_image_button(gsh, string))
- gsh_command_button(gsh, string);
+ g_strfreev(pair);
+ return FALSE;
}
void
@@ -128,7 +108,9 @@
GtkWidget *
gsh_add_button(struct GSH * gsh, const gchar * string)
{
- gsh_new_button(gsh, string);
+ if(!test_image_button(gsh, string))
+ gsh_command_button(gsh, string);
+
return gsh->button;
}
Index: containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- containers.c 3 May 2007 21:23:07 -0000 1.12
+++ containers.c 3 May 2007 22:55:10 -0000 1.13
@@ -61,8 +61,7 @@
void
gsh_setup_containers(struct GSH * gsh)
{
- gsh->rows->h = gtk_hbox_new(FALSE, 2);
- gtk_widget_show(gsh->rows->h);
+ gtk_widget_show(gsh->rows->h = gtk_hbox_new(FALSE, 2));
$(gsh->rows, new);
}
Index: gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gtkshell.c 3 May 2007 21:23:07 -0000 1.30
+++ gtkshell.c 3 May 2007 22:55:10 -0000 1.31
@@ -23,8 +23,6 @@
#include "gtkshell.h"
-
-
static void
gsh_delete_GSH(struct GSH * gsh)
{
@@ -37,8 +35,7 @@
static GtkWidget *
gsh_GSH_new_window(struct GSH * gsh)
{
- UNUSED(gsh);
- return gsh_create_main_window();
+ return gsh->window=gsh_create_main_window();
}
static void
@@ -56,6 +53,7 @@
gsh->window = (*(gsh->new_window = &gsh_GSH_new_window))(gsh);
gsh->add_button=&gsh_add_button;
gsh->add_label=&gsh_add_label;
+ gsh->manage=&gsh_manage;
}
struct GSH *
Index: gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gtkshell.h 3 May 2007 21:23:07 -0000 1.39
+++ gtkshell.h 3 May 2007 22:55:10 -0000 1.40
@@ -60,6 +60,7 @@
void (*parse)(struct GSH *, gint, gchar **);
void (*init)(struct GSH *);
void (*finalize)(struct GSH *);
+ void (*manage)(struct GSH *, GtkWidget *);
GtkWidget * (*new_window)(struct GSH *);
GtkWidget * (*add_button)(struct GSH *, const gchar *);
GtkWidget * (*add_label)(struct GSH *, const gchar *);
Index: guidl_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- guidl_dialog.c 3 May 2007 03:42:31 -0000 1.6
+++ guidl_dialog.c 3 May 2007 22:55:10 -0000 1.7
@@ -24,11 +24,13 @@
extern struct GDLEnvironment * gsh_guidl_env;
-#define DEF(a, b) GSH_GUIDL_DEFINE(dialogs, a, b)
+#define DICT gsh_guidl_env->dictionaries->dialogs
+#define DEF(a, b) GSH_GUIDL_DEFINE(DICT, a, b)
static void
-setup_definitions(struct ARTupleVector * dialogs)
+setup_dictionary()
{
+ DICT=ARNEW(ar, ARTupleVector);
DEF("file", "-df");
DEF("font", "-dF");
DEF("about", "-da");
@@ -41,13 +43,6 @@
DEF("error", "-de");
}
-static void
-setup_dictionary()
-{
- setup_definitions(gsh_guidl_env->dictionaries->dialogs
- = ARNEW(ar, ARTupleVector));
-}
-
void
gsh_guidl_dialog(gchar * dialog_type, gchar * argument)
{
Index: guidl_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_options.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- guidl_options.c 3 May 2007 03:42:31 -0000 1.4
+++ guidl_options.c 3 May 2007 22:55:10 -0000 1.5
@@ -24,11 +24,13 @@
extern struct GDLEnvironment * gsh_guidl_env;
-#define DEF(a, b) GSH_GUIDL_DEFINE(options, a, b);
+#define DICT gsh_guidl_env->dictionaries->options
+#define DEF(a, b) GSH_GUIDL_DEFINE(DICT, a, b);
static void
-setup_definitions(struct ARTupleVector * options)
+setup_dictionary()
{
+ DICT=ARNEW(ar, ARTupleVector);
DEF("framed labels", "-of");
DEF("undecorated", "-on");
DEF("exit on activate", "-oe");
@@ -45,13 +47,6 @@
DEF("update frequency", "-ou");
}
-static void
-setup_dictionary()
-{
- setup_definitions(gsh_guidl_env->dictionaries->options
- =ARNEW(ar, ARTupleVector));
-}
-
void
gsh_guidl_option(gchar * option, gchar * argument)
{
Index: guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- guidl_util.c 3 May 2007 20:49:20 -0000 1.14
+++ guidl_util.c 3 May 2007 22:55:10 -0000 1.15
@@ -41,9 +41,11 @@
#ifdef DEBUG
ARPASSERT(switches);
#endif /* DEBUG */
+ /* A command base argument (for command line
+ switch translation) is required. */
if(switches)
$(env->args, add, switches);
- else /* A command base argument is required. */
+ else
return;
if(argument)
{
@@ -52,23 +54,21 @@
}
}
-static void
+static struct GDLEnvironment *
gsh_setup_GDLEnvironment(struct GDLEnvironment * env)
{
env->args=ARNEW(ar, ARArguments);
env->dictionaries=ARNEW(gsh, GDLDictionaries);
env->delete=&gsh_delete_GDLEnvironment;
env->add=&gsh_GDLEnvironment_add;
+
+ return env;
}
struct GDLEnvironment *
gsh_new_GDLEnvironment()
{
- struct GDLEnvironment * env;
-
- gsh_setup_GDLEnvironment(env=(struct GDLEnvironment *)g_malloc(
+ return gsh_setup_GDLEnvironment(g_malloc(
sizeof(struct GDLEnvironment)));
-
- return env;
}
Index: guidl_widgets.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_widgets.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- guidl_widgets.c 3 May 2007 03:42:31 -0000 1.5
+++ guidl_widgets.c 3 May 2007 22:55:10 -0000 1.6
@@ -24,11 +24,15 @@
extern struct GDLEnvironment * gsh_guidl_env;
-#define DEF(a, b) GSH_GUIDL_DEFINE(widgets, a, b)
+#define DICT gsh_guidl_env->dictionaries->widgets
+
+#define DEF(a, b)\
+ GSH_GUIDL_DEFINE(DICT, a, b)
static void
-setup_definitions(struct ARTupleVector * widgets)
+setup_dictionary()
{
+ gsh_guidl_env->dictionaries->widgets=ARNEW(ar, ARTupleVector);
DEF("label", "-al");
DEF("prompt", "-at");
DEF("terminal", "-as");
@@ -43,13 +47,6 @@
DEF("system button", "-acb");
}
-static void
-setup_dictionary()
-{
- setup_definitions(gsh_guidl_env->dictionaries->widgets
- = ARNEW(ar, ARTupleVector));
-}
-
void
gsh_guidl_widget(gchar * widget, gchar * argument)
{
Index: label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- label.c 3 May 2007 20:49:20 -0000 1.18
+++ label.c 3 May 2007 22:55:10 -0000 1.19
@@ -27,11 +27,8 @@
set_options(struct GSH * gsh, GtkWidget *label)
{
gtk_label_set_single_line_mode(GTK_LABEL(label), FALSE);
- if(GSH_FLAG(GSH_HORIZONTAL_LABELS))
- gtk_label_set_angle(GTK_LABEL(label), 90.0);
- else
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-
+ GSH_FLAG(GSH_HORIZONTAL_LABELS) ? gtk_label_set_angle(GTK_LABEL(label),
+ 90.0) : gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gsh_widget_set_font(label, NULL);
}
@@ -61,16 +58,3 @@
return label;
}
-void
-gsh_new_label(struct GSH * gsh, const gchar *text)
-{
- (void) gsh_add_label(gsh, text);
-}
-
-void
-gsh_set_label(GtkWidget *label, const gchar *text)
-{
- ARPASSERT(label);
- /* Text is not checked, as empty labels are allowed. */
- gtk_label_set_text(GTK_LABEL(label), text);
-}
Index: terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- terminal.c 3 May 2007 03:42:31 -0000 1.10
+++ terminal.c 3 May 2007 22:55:10 -0000 1.11
@@ -162,7 +162,7 @@
return term->widget;
}
-void
+static void
gsh_setup_GSH_Terminal(struct GSH_Terminal * term)
{
term->widget=NULL;
Index: updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- updated_label.c 3 May 2007 03:42:31 -0000 1.15
+++ updated_label.c 3 May 2007 22:55:10 -0000 1.16
@@ -53,10 +53,9 @@
ARPASSERT(command);
ARPASSERT(widget);
#endif /* DEBUG */
-
- results = antiright_pipe_read((char *)command);
+ results=antiright_pipe_read(command);
gsh_check_results(&results);
- gsh_set_label((GtkWidget *) widget, results);
+ gtk_label_set_text(GTK_LABEL(widget), results);
g_free(results);
}
@@ -65,8 +64,6 @@
{
#ifdef DEBUG
g_message("gsh_add_updated_label()");
-#endif /* DEBUG */
-#ifdef DEBUG
ARPASSERT(gsh);
ARPASSERT(command);
#endif /* DEBUG */
Index: updated_progress.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- updated_progress.c 3 May 2007 04:36:18 -0000 1.12
+++ updated_progress.c 3 May 2007 22:55:10 -0000 1.13
@@ -32,13 +32,9 @@
ARPASSERT(widget);
#endif /* DEBUG */
- results = antiright_pipe_read((char *)command);
-#ifdef DEBUG
- ARPASSERT(results);
-#endif /* DEBUG */
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR((GtkWidget *) widget),
- strtod(results, NULL));
- free(results);
+ strtod(results=antiright_pipe_read((char*)command), NULL));
+ g_free(results);
}
void
gsh_add_updated_progress(struct GSH * gsh, const gchar *command)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright/gtkshell add_options.c button.c conta...,
Jeffrey Bedard <=