[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure gtkshell/add_options.c gtks...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright configure gtkshell/add_options.c gtks... |
|
Date: |
Mon, 14 May 2007 18:06:36 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/14 18:06:35
Modified files:
. : configure
gtkshell : add_options.c add_options.h arguments.c
arguments.h containers.c dialog_options.c
dialog_options.h dragdrop.c gtkshell.h guidl.y
guidl_dialog.c main.c option_options.c
option_options.h options.c options.h pane.c
terminal.c terminal_options.c
terminal_options.h terminal_struct.h
update_manager.c updated_options.c
updated_options.h
libantiright : Makefile library.h util.c util.h
Added files:
libantiright : gui.c gui.h
Log message:
Added ARDimension structure for storing dimensions.
Refactored code previously split as macros, re-added
UNUSED declarations, and fixed type specification for
argv. Use glib types where appropriate.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_dialog.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/pane.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_options.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_options.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_struct.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/update_manager.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/Makefile?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.h?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/gui.c?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/gui.h?cvsroot=antiright&rev=1.1
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- configure 6 May 2007 05:00:11 -0000 1.91
+++ configure 14 May 2007 18:06:34 -0000 1.92
@@ -32,7 +32,8 @@
for ARG in $@; do
if [ "$ARG" = "-d" ]; then
echo 'Configuring with debug options...'
- CFLAGS="$CFLAGS -g3 -Wall -W -DDEBUG"
+ CFLAGS="$CFLAGS -g3 -Wall -W -Wno-unused-variable"
+ CRLAGS="$CFLAGS -Wno-unused -DDEBUG"
elif [ "$ARG" = "-l" ]; then
PREFIX=/usr/local/packages/antiright
elif [ "$ARG" = "-s" ]; then
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gtkshell/add_options.c 14 May 2007 12:16:11 -0000 1.32
+++ gtkshell/add_options.c 14 May 2007 18:06:34 -0000 1.33
@@ -74,8 +74,12 @@
GENERIC_COMMANDED_ADD(gsh, argv[*counter], func)
static void
-handle_commanded_add_arguments(GSH * gsh, const gint argc, gchar **argv, gint
*counter)
+handle_commanded_add_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter)
{
+#ifndef DEBUG
+ UNUSED(argc);
+#endif /* DEBUG */
if(!argv[*counter] || !argv[(*counter)+1])
return;
GSH_COUNT(argc, counter);
@@ -101,7 +105,8 @@
}
void
-gsh_handle_add_arguments(GSH * gsh, const gint argc, gchar **argv, gint
*counter)
+gsh_handle_add_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter)
{
g_assert(strlen(argv[(*counter)]) > 1);
switch (argv[(*counter)][2])
Index: gtkshell/add_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/add_options.h 14 May 2007 12:16:11 -0000 1.5
+++ gtkshell/add_options.h 14 May 2007 18:06:34 -0000 1.6
@@ -26,6 +26,7 @@
#include "gtkshell.h"
void
-gsh_handle_add_arguments(GSH * gsh, const gint argc, gchar **argv, gint
*counter);
+gsh_handle_add_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter);
#endif
Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gtkshell/arguments.c 14 May 2007 12:16:11 -0000 1.25
+++ gtkshell/arguments.c 14 May 2007 18:06:34 -0000 1.26
@@ -75,7 +75,7 @@
}
void
-gsh_parse_arguments(GSH * gsh, gint argc, gchar **argv)
+gsh_parse_arguments(GSH * gsh, const gint argc, const gchar **argv)
{
int counter;
Index: gtkshell/arguments.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/arguments.h 28 Feb 2007 03:53:51 -0000 1.5
+++ gtkshell/arguments.h 14 May 2007 18:06:34 -0000 1.6
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -26,9 +26,9 @@
#include "gtkshell.h"
void
- gsh_parse_arguments(struct GSH * gsh, int argc, char **argv);
+gsh_parse_arguments(GSH * gsh, const gint argc, const gchar **argv);
void
- gsh_check_row(struct GSH * gsh);
+gsh_check_row(GSH * gsh);
#endif
Index: gtkshell/containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtkshell/containers.c 14 May 2007 12:16:11 -0000 1.19
+++ gtkshell/containers.c 14 May 2007 18:06:34 -0000 1.20
@@ -27,26 +27,26 @@
gtk_scrolled_window_set_##item(GTK_SCROLLED_WINDOW(window),\
__VA_ARGS__)
-/* GTK Scrolled Window Set WIDGET */
-#define GSWSWIDGET gsh->widgets.scrolled_window
-
-/* GTK Scrolled Window Set (with WIDGET) */
-#define GSWSW(item, ...) GSWS(item, GSWSWIDGET, __VA_ARGS__)
-
-/* GSWSW for scrolling policy. */
-#define GSWSWP(h_policy, v_policy) GSWSW(policy, h_policy, v_policy)
-
-/* GSWSW for shadow type. */
-#define GSWSWST(type) GSWSW(shadow_type, type)
-
+static void
+set_scrolled_window_options(GtkWidget * win)
+{
+ GSWS(shadow_type, win, GTK_SHADOW_OUT);
/* Shortened name. */
#define GTKPA GTK_POLICY_AUTOMATIC
+ GSWS(policy, win, GTKPA, GTKPA);
+}
+
+#define GTKCA(container, widget)\
+ gtk_container_add(GTK_CONTAINER(container), widget)
-/* Use macro, as only used within scrolled window creation function. */
-#define SET_SCROLLED_WINDOW_OPTIONS(gsh)\
-{\
- GSWSWP(GTKPA, GTKPA);\
- GSWSWST(GTK_SHADOW_OUT);\
+static void
+setup_scrolled_window_containers(GtkWidget * scrolled_window,
+ GtkWidget * window, GtkWidget * hrow)
+{
+ GTKCA(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
@@ -54,26 +54,30 @@
{
GtkWidget * scrolled_window;
- scrolled_window = gsh->widgets.scrolled_window
- = gtk_scrolled_window_new(NULL, NULL);
- SET_SCROLLED_WINDOW_OPTIONS(gsh);
- gtk_container_add(GTK_CONTAINER(gsh->widgets.window), scrolled_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);
gtk_widget_show(scrolled_window);
- gtk_scrolled_window_add_with_viewport(
- GTK_SCROLLED_WINDOW(scrolled_window), gsh->rows->h);
}
-#define GTKCA(container, widget)\
- gtk_container_add(GTK_CONTAINER(container), widget)
+static void
+setup_framed_containers(GtkWidget * frame, GtkWidget * window,
+ GtkWidget * hrow)
+{
+ GTKCA(window, frame);
+ GTKCA(frame, hrow);
+}
static void
setup_framed(struct GSH * gsh)
{
- GtkWidget *frame;
+ GtkWidget * frame;
- gtk_widget_show(frame = gtk_frame_new(NULL));
- GTKCA(gsh->widgets.window, frame);
- GTKCA(frame, gsh->rows->h);
+ frame = gtk_frame_new(NULL);
+ setup_framed_containers(frame, gsh->widgets.window, gsh->rows->h);
+ gtk_widget_show(frame);
}
void
@@ -103,7 +107,6 @@
else if (!GSH_FLAG(GSH_NO_BASE_FRAME))
setup_framed(gsh);
else
- gtk_container_add(GTK_CONTAINER(gsh->widgets.window),
- gsh->rows->h);
+ GTKCA(gsh->widgets.window, gsh->rows->h);
}
Index: gtkshell/dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtkshell/dialog_options.c 10 May 2007 00:08:28 -0000 1.19
+++ gtkshell/dialog_options.c 14 May 2007 18:06:34 -0000 1.20
@@ -23,9 +23,8 @@
#include "gtkshell.h"
static void
-gsh_message_dialog(struct GSH * gsh,
- GtkMessageType type,
- char *text) __attribute__((noreturn));
+gsh_message_dialog(GSH * gsh, GtkMessageType type, const gchar *text)
+ __attribute__((noreturn));
static void
gsh_font_dialog() __attribute__((noreturn));
@@ -34,7 +33,7 @@
gsh_color_dialog() __attribute__((noreturn));
static void
-gsh_message_dialog(struct GSH * gsh, GtkMessageType type, char *text)
+gsh_message_dialog(GSH * gsh, GtkMessageType type, const gchar *text)
{
gtk_dialog_run(GTK_DIALOG(gtk_message_dialog_new(GTK_WINDOW(
gsh->widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, type,
@@ -99,14 +98,16 @@
}
void
-gsh_handle_dialog_arguments(struct GSH * gsh, int argc, char **argv,
- int *counter)
+gsh_handle_dialog_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter)
{
+#ifndef DEBUG
+ UNUSED(argc);
+#endif /* DEBUG */
g_assert(strlen(argv[(*counter)]) > 2);
#ifdef DEBUG
ARPASSERT(gsh);
#endif /* DEBUG */
-
switch (argv[(*counter)][2])
{
case 'a':
Index: gtkshell/dialog_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/dialog_options.h 28 Feb 2007 03:53:51 -0000 1.4
+++ gtkshell/dialog_options.h 14 May 2007 18:06:34 -0000 1.5
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -24,7 +24,7 @@
#define GSH_DIALOG_OPTIONS
void
-gsh_handle_dialog_arguments(struct GSH * gsh, int argc, char **argv,
- int *counter);
+gsh_handle_dialog_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter);
#endif
Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/dragdrop.c 10 May 2007 00:08:28 -0000 1.12
+++ gtkshell/dragdrop.c 14 May 2007 18:06:34 -0000 1.13
@@ -90,6 +90,9 @@
{
gboolean drag_status;
+ UNUSED(x);
+ UNUSED(y);
+ UNUSED(data);
switch (target_type)
{
case TARGET_STRING:
@@ -113,6 +116,9 @@
{
GdkAtom target_type;
+ UNUSED(x);
+ UNUSED(y);
+ UNUSED(data);
target_type =
GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets,
TARGET_STRING));
@@ -133,8 +139,11 @@
{
const gchar *source_data;
+ UNUSED(context);
+ UNUSED(target_type);
+ UNUSED(time);
+ UNUSED(data);
source_data = gtk_button_get_label(GTK_BUTTON(widget));
-
gtk_selection_data_set(selection, selection->target, sizeof(gchar),
(guchar *) source_data, strlen(source_data));
}
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gtkshell/gtkshell.h 14 May 2007 12:16:11 -0000 1.46
+++ gtkshell/gtkshell.h 14 May 2007 18:06:34 -0000 1.47
@@ -82,7 +82,7 @@
/* methods */
void (*delete)(struct GSH *);
- void (*parse)(struct GSH *, const gint, gchar **);
+ void (*parse)(struct GSH *, const gint, const gchar **);
void (*init)(struct GSH *);
void (*finalize)(struct GSH *);
void (*manage)(struct GSH *, GtkWidget *);
Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gtkshell/guidl.y 3 May 2007 03:42:31 -0000 1.20
+++ gtkshell/guidl.y 14 May 2007 18:06:34 -0000 1.21
@@ -33,6 +33,9 @@
yywrap();
void
+yyunput();
+
+void
yyerror(const char *string)
{
g_error("error: %s\n", string);
@@ -72,7 +75,7 @@
|
TOKEN_ECHO STRING
{
- puts($2);
+ g_print("%s", $2);
g_free($2);
}
;
Index: gtkshell/guidl_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_dialog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/guidl_dialog.c 6 May 2007 05:00:11 -0000 1.8
+++ gtkshell/guidl_dialog.c 14 May 2007 18:06:34 -0000 1.9
@@ -20,6 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+/* Set the dictionary to use for this definition file. */
#define DICT gsh_guidl_env->dictionaries->dialog
#include "gtkshell.h"
@@ -31,6 +32,7 @@
setup_dictionary()
{
DICT=ARNEW(ar, ARTupleVector);
+ /* Begin adding mappings between keys and values. */
DEF("file", "-df");
DEF("font", "-dF");
DEF("about", "-da");
@@ -43,5 +45,6 @@
DEF("error", "-de");
}
+/* Generate public function to access these definitions. */
GSH_GUIDL_ITEM_FUNC(dialog, DICT);
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gtkshell/main.c 9 May 2007 20:00:56 -0000 1.20
+++ gtkshell/main.c 14 May 2007 18:06:34 -0000 1.21
@@ -23,7 +23,7 @@
#include "gtkshell.h"
static void
-setup_gui(struct GSH * gsh, int argc, char ** argv)
+setup_gui(struct GSH * gsh, const gint argc, const gchar ** argv)
{
$(gsh, init);
$(gsh, parse, argc, argv); /* Setup GUI. */
@@ -37,7 +37,7 @@
gtk_init(&argc, &argv);
gsh=ARNEW(gsh, GSH);
- setup_gui(gsh, argc, argv);
+ setup_gui(gsh, (const gint)argc, (const gchar **)argv);
gtk_main(); /* application main loop */
/* Cleanup when finished. */
$(gsh, delete);
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gtkshell/option_options.c 14 May 2007 12:16:11 -0000 1.28
+++ gtkshell/option_options.c 14 May 2007 18:06:34 -0000 1.29
@@ -70,7 +70,8 @@
}
void
-gsh_handle_option_arguments(GSH * gsh, const gint argc, gchar **argv, gint
*counter)
+gsh_handle_option_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter)
{
switch (argv[(*counter)][2])
{
Index: gtkshell/option_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/option_options.h 14 May 2007 12:16:11 -0000 1.6
+++ gtkshell/option_options.h 14 May 2007 18:06:35 -0000 1.7
@@ -24,6 +24,7 @@
#define GSH_OPTION_OPTIONS_H
void
-gsh_handle_option_arguments(GSH * gsh, const gint argc, gchar **argv, gint
*counter);
+gsh_handle_option_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter);
#endif
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gtkshell/options.c 14 May 2007 12:16:11 -0000 1.25
+++ gtkshell/options.c 14 May 2007 18:06:35 -0000 1.26
@@ -27,7 +27,7 @@
#ifdef DEBUG
static void
-print_arguments(gint argc, gchar ** argv)
+print_arguments(const gint argc, const gchar ** argv)
{
gint i;
for(i=0; i<argc; i++)
@@ -48,7 +48,7 @@
}
static void
-check_gsh_guidl_env(GSH * gsh)
+check_gsh_guidl_env()
{
if(!gsh_guidl_env)
gsh_guidl_env=ARNEW(gsh, GDLEnvironment);
@@ -57,14 +57,15 @@
static void
common_guidl_handler(GSH * gsh)
{
- check_gsh_guidl_env(gsh);
+ check_gsh_guidl_env();
check_for_dummy_argument(gsh);
yyparse();
+ /* Shortcut for specification of arguments. */
+#define GGEA gsh_guidl_env->args
#ifdef DEBUG
- print_arguments(gsh_guidl_env->args->argc, gsh_guidl_env->args->argv);
+ print_arguments(GGEA->argc, GGEA->argv);
#endif /* DEBUG */
- gsh_parse_arguments(gsh, gsh_guidl_env->args->argc,
- gsh_guidl_env->args->argv);
+ $(gsh, parse, GGEA->argc, (const gchar **)GGEA->argv);
$(gsh_guidl_env, delete);
gsh_guidl_env=NULL;
}
@@ -79,11 +80,18 @@
common_guidl_handler(gsh);
}
+void
+gsh_invalid_option(const gchar ** argv, const gint option)
+{
+ g_warning("%s: %s undefined\n", argv[0], argv[option]);
+}
+
#define HANDLE(type)\
- gsh_handle_##type##_arguments(gsh, argc, argv, counter);
+ gsh_handle_##type##_arguments(gsh, argc, argv, counter)
void
-gsh_handle_switch_arguments(GSH * gsh, const const gint argc, gchar **argv,
gint *counter)
+gsh_handle_switch_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter)
{
$(gsh->rows, check);
switch (argv[*counter][1])
@@ -104,6 +112,6 @@
case 't': /* test area. */
break;
default:
- g_warning("%s: %s undefined\n", argv[0], argv[(*counter)]);
+ gsh_invalid_option(argv, *counter);
}
}
Index: gtkshell/options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/options.h 14 May 2007 12:16:11 -0000 1.6
+++ gtkshell/options.h 14 May 2007 18:06:35 -0000 1.7
@@ -39,6 +39,7 @@
#endif /* DEBUG */
void
-gsh_handle_switch_arguments(GSH * gsh, const gint argc, gchar **argv, gint
*counter);
+gsh_handle_switch_arguments(GSH * gsh, const gint argc, const gchar **argv,
+ gint *counter);
#endif /* not GSH_OPTIONS_H */
Index: gtkshell/pane.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/pane.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/pane.c 14 May 2007 12:16:11 -0000 1.3
+++ gtkshell/pane.c 14 May 2007 18:06:35 -0000 1.4
@@ -47,7 +47,7 @@
}
static GtkWidget *
-setup_first_pane_half(struct GSH * gsh, const gchar ** pair, GtkWidget * pane)
+setup_first_pane_half(struct GSH * gsh, const gchar ** pair)
{
GtkWidget * first;
@@ -58,7 +58,7 @@
}
static GtkWidget *
-setup_second_pane_half(struct GSH * gsh, gchar ** pair, GtkWidget * pane)
+setup_second_pane_half(struct GSH * gsh, gchar ** pair)
{
GtkWidget * second;
@@ -80,23 +80,25 @@
gsh_setup_hpaned(struct GSH * gsh, const gchar * label_pair)
{
GtkWidget * pane;
+ pane=gtk_hpaned_new();
+ {
gchar **pair;
pair=g_strsplit(label_pair, ",", 2);
- pane=gtk_hpaned_new();
{
GtkWidget * first;
- first=setup_first_pane_half(gsh, (const gchar **)pair, pane);
+ first=setup_first_pane_half(gsh, (const gchar **)pair);
split_columns_for_pane(gsh, pane);
{
GtkWidget * second;
/* PAIR freed here. */
- second=setup_second_pane_half(gsh, pair, pane);
+ second=setup_second_pane_half(gsh, pair);
assign_pane_sections(pane, first, second);
}
}
+ }
}
Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/terminal.c 14 May 2007 12:16:11 -0000 1.17
+++ gtkshell/terminal.c 14 May 2007 18:06:35 -0000 1.18
@@ -32,16 +32,19 @@
VSET(element, term->widget, __VA_ARGS__)
static void
-set_terminal_options(struct GSH_Terminal * term)
+set_vte_specific_terminal_options(struct GSH_Terminal * term)
{
- VSETW(size, term->width, term->height);
+ VSETW(size, term->dimensions.width, term->dimensions.height);
VSETW(allow_bold, TRUE);
VSETW(backspace_binding, VTE_ERASE_ASCII_BACKSPACE);
VSETW(background_transparent, TRUE);
- gsh_widget_set_font(term->widget, term->font);
}
+static void
+set_terminal_options(struct GSH_Terminal * term)
{
+ set_vte_specific_terminal_options(term);
+ gsh_widget_set_font(term->widget, term->font);
}
static void
@@ -52,8 +55,8 @@
gchar * height;
gchar * width;
/* Use format of a shell export statement. */
- ar_asprintf(&height, "LINES=%d", term->height);
- ar_asprintf(&width, "COLUMNS=%d", term->width);
+ ar_asprintf(&height, "LINES=%d", term->dimensions.height);
+ ar_asprintf(&width, "COLUMNS=%d", term->dimensions.width);
{
/* Null terminated list of environment elements. */
const gchar *envv[] = {height, width, NULL};
@@ -76,6 +79,7 @@
static void
gsh_delete_GSH_Terminal(struct GSH_Terminal * term)
{
+ UNUSED(term);
/* Freeing the terminal font causes a segmentation fault under
* linux, so likely a double free. */
/* The terminal widget itself is freed by gobject system
@@ -95,24 +99,27 @@
return term->widget;
}
-#define ASSIGN_METHODS(term)\
-{\
- term->delete=&gsh_delete_GSH_Terminal;\
- term->add=&gsh_GSH_Terminal_add;\
-}
-
-#define INITIALIZE_FIELDS(term)\
-{\
- term->widget=NULL;\
- term->font=NULL;\
- term->width=80;\
- term->height=24;\
-}
-
-#define SETUP_GSH_TERMINAL(term) \
-{\
- INITIALIZE_FIELDS(term);\
- ASSIGN_METHODS(term);\
+static void
+assign_methods(struct GSH_Terminal * term)
+{
+ term->delete=&gsh_delete_GSH_Terminal;
+ term->add=&gsh_GSH_Terminal_add;
+}
+
+static void
+initialize_fields(struct GSH_Terminal * term)
+{
+ term->widget=NULL;
+ term->font=NULL;
+ term->dimensions.width=80;
+ term->dimensions.height=24;
+}
+
+static void
+setup_GSH_Terminal(struct GSH_Terminal * term)
+{
+ initialize_fields(term);
+ assign_methods(term);
}
struct GSH_Terminal *
@@ -121,7 +128,7 @@
struct GSH_Terminal * term;
term=xmalloc(sizeof(struct GSH_Terminal));
- SETUP_GSH_TERMINAL(term);
+ setup_GSH_Terminal(term);
return term;
}
Index: gtkshell/terminal_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal_options.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/terminal_options.c 4 May 2007 00:59:58 -0000 1.3
+++ gtkshell/terminal_options.c 14 May 2007 18:06:35 -0000 1.4
@@ -24,23 +24,28 @@
#include "gtkshell.h"
void
-gsh_handle_terminal_options(struct GSH * gsh, int argc,
- char ** argv, int *counter)
+gsh_handle_terminal_options(GSH * gsh, const gint argc,
+ const gchar ** argv, gint *counter)
{
+#ifndef DEBUG
+ UNUSED(argc);
+#endif /* DEBUG */
/* Handle -ot tertiary options. */
switch(argv[(*counter)][3])
{
+#define GSHT gsh->terminal
+#define GSHTD GSHT->dimensions
case 'f': /* Set font for terminal widget. */
GSH_COUNT(argc, counter);
- gsh->terminal->font=argv[*counter];
+ GSHT->font=(gchar *)argv[*counter];
break;
case 'h': /* Set terminal widget height. */
GSH_COUNT(argc, counter);
- gsh->terminal->height=atoi(argv[*counter]);
+ GSHTD.height=atoi(argv[*counter]);
break;
case 'w': /* Set terminal widget width. */
GSH_COUNT(argc, counter);
- gsh->terminal->width=atoi(argv[*counter]);
+ GSHTD.width=atoi(argv[*counter]);
break;
default: /* Error message. */
ARWARN("invalid tertiary terminal option");
Index: gtkshell/terminal_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal_options.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/terminal_options.h 19 Mar 2007 07:09:30 -0000 1.1
+++ gtkshell/terminal_options.h 14 May 2007 18:06:35 -0000 1.2
@@ -25,8 +25,8 @@
#define GSH_TERMINAL_OPTIONS_H
void
-gsh_handle_terminal_options(struct GSH * gsh, int argc,
- char ** argv, int *counter);
+gsh_handle_terminal_options(GSH * gsh, const gint argc,
+ const gchar ** argv, gint *counter);
#endif /* not GSH_TERMINAL_OPTIONS_H */
Index: gtkshell/terminal_struct.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal_struct.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/terminal_struct.h 8 May 2007 20:40:07 -0000 1.5
+++ gtkshell/terminal_struct.h 14 May 2007 18:06:35 -0000 1.6
@@ -28,7 +28,7 @@
GtkWidget * widget;
gchar * font;
struct ARArguments * scripts;
- guint width, height;
+ ARDimensions dimensions;
void (*delete)(struct GSH_Terminal *);
GtkWidget * (*add)(struct GSH_Terminal *, const gchar *);
};
Index: gtkshell/update_manager.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/update_manager.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/update_manager.c 10 May 2007 00:08:28 -0000 1.3
+++ gtkshell/update_manager.c 14 May 2007 18:06:35 -0000 1.4
@@ -42,6 +42,7 @@
static void
gsh_update_each(gpointer data, gpointer user_data)
{
+ UNUSED(user_data);
/*
* Ensure that the argument containing the structure is not
* empty.
@@ -118,6 +119,7 @@
{
struct GSHUpdatedWidget * item;
+ UNUSED(user_data);
item=(struct GSHUpdatedWidget *)data;
$(item, delete);
}
Index: gtkshell/updated_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/updated_options.c 10 May 2007 00:08:28 -0000 1.16
+++ gtkshell/updated_options.c 14 May 2007 18:06:35 -0000 1.17
@@ -43,10 +43,10 @@
}
static void
-add_updater(struct GSH * gsh, int argc, int * counter, char ** argv,
- void (*add_func)(struct GSH *, const gchar *))
+add_updater(GSH * gsh, const gint argc, gint * counter,
+ const gchar ** argv, void (*add_func)(GSH *, const gchar *))
{
- add_func(gsh, (const gchar *)argv[*counter+1]);
+ add_func(gsh, argv[*counter+1]);
GENERIC_ARGUMENT(gsh, argc, counter);
}
@@ -54,8 +54,8 @@
add_updater(gsh, argc, counter, argv, &gsh_add_updated_##type)
void
-gsh_handle_updated_arguments(struct GSH * gsh, int argc,
- char **argv, int *counter)
+gsh_handle_updated_arguments(GSH * gsh, const gint argc,
+ const gchar **argv, gint *counter)
{
#ifdef DEBUG
ARPASSERT(gsh);
Index: gtkshell/updated_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/updated_options.h 28 Feb 2007 03:53:51 -0000 1.4
+++ gtkshell/updated_options.h 14 May 2007 18:06:35 -0000 1.5
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -24,7 +24,7 @@
#define GSH_UPDATED_OPTIONS_H
void
-gsh_handle_updated_arguments(struct GSH * gsh, int argc,
- char **argv, int *counter);
+gsh_handle_updated_arguments(GSH * gsh, const gint argc,
+ const gchar **argv, gint *counter);
#endif
Index: libantiright/Makefile
===================================================================
RCS file: /sources/antiright/antiright/libantiright/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libantiright/Makefile 10 May 2007 00:08:28 -0000 1.10
+++ libantiright/Makefile 14 May 2007 18:06:35 -0000 1.11
@@ -5,7 +5,7 @@
all: libantiright.a
-objects=pipe.o string.o system.o util.o tuple.o arguments.o
+objects=pipe.o string.o system.o util.o tuple.o arguments.o gui.o
libantiright.a: ${objects}
ar rcs libantiright.a ${objects}
Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libantiright/library.h 10 May 2007 00:08:28 -0000 1.18
+++ libantiright/library.h 14 May 2007 18:06:35 -0000 1.19
@@ -36,6 +36,7 @@
#include "util.h"
#include "tuple.h"
#include "arguments.h"
+#include "gui.h"
#include "macros.h"
Index: libantiright/util.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libantiright/util.c 11 May 2007 23:28:52 -0000 1.16
+++ libantiright/util.c 14 May 2007 18:06:35 -0000 1.17
@@ -33,6 +33,12 @@
return (g_malloc(size));
}
+void
+xfree(gpointer data)
+{
+ g_free(data);
+}
+
static ARActionFunction
ar_ARFunctionDictionary_lookup(struct ARFunctionDictionary * dict,
const gchar * key)
Index: libantiright/util.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libantiright/util.h 11 May 2007 23:28:52 -0000 1.12
+++ libantiright/util.h 14 May 2007 18:06:35 -0000 1.13
@@ -29,6 +29,9 @@
gpointer
xmalloc(size_t size);
+void
+xfree(gpointer data);
+
#define UNUSED(arg) /* undefined. */
typedef void(*ARActionFunction)(gint *, gchar **);
Index: libantiright/gui.c
===================================================================
RCS file: libantiright/gui.c
diff -N libantiright/gui.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libantiright/gui.c 14 May 2007 18:06:35 -0000 1.1
@@ -0,0 +1,58 @@
+/*
+ AntiRight
+ (c) 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 "library.h"
+
+static void
+ar_delete_ARDimensions(ARDimensions * this)
+{
+ xfree(this);
+}
+
+static void
+set_dimensions(ARDimensions * this, const gint x, const gint y,
+ const guint width, const guint height)
+{
+ this->x=(gint)x;
+ this->y=(gint)y;
+ this->height=(guint)height;
+ this->width=(guint)width;
+}
+
+static void
+setup_methods(ARDimensions * dimensions)
+{
+ dimensions->delete=&ar_delete_ARDimensions;
+ dimensions->set=&set_dimensions;
+}
+
+ARDimensions *
+ar_new_ARDimensions()
+{
+ ARDimensions * dimensions;
+
+ dimensions=xmalloc(sizeof(ARDimensions));
+ setup_methods(dimensions);
+
+ return dimensions;
+}
+
Index: libantiright/gui.h
===================================================================
RCS file: libantiright/gui.h
diff -N libantiright/gui.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libantiright/gui.h 14 May 2007 18:06:35 -0000 1.1
@@ -0,0 +1,44 @@
+/*
+ AntiRight
+ (c) 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
+*/
+
+#ifndef AR_GUI_H
+#define AR_GUI_H
+
+struct ARDimensions
+{
+ /* fields */
+ guint width;
+ guint height;
+ gint x;
+ gint y;
+ /* methods */
+ void (*delete)(struct ARDimensions *);
+ void (*set)(struct ARDimensions *, const gint, const gint,
+ const guint, const guint);
+};
+
+typedef struct ARDimensions ARDimensions;
+
+ARDimensions *
+ar_new_ARDimensions();
+
+#endif /* AR_GUI_H */
- [Antiright-devel] antiright configure gtkshell/add_options.c gtks...,
Jeffrey Bedard <=