[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure gshterm/command_line.c gsht...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright configure gshterm/command_line.c gsht... |
|
Date: |
Tue, 13 Feb 2007 03:23:28 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/13 03:23:28
Modified files:
. : configure
gshterm : command_line.c command_line.h gshterm.c
gshterm.h main.c
gtkshell : arguments.h button.c dialog_options.c
file_dialog.c geometry.c gtkshell.c gtkshell.h
option_options.h row.c row.h text.c text.h
updated_label.c updated_label.h
updated_options.c updated_options.h
updated_progress.c updated_progress.h
Log message:
Finished global structuring.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.h?cvsroot=antiright&r1=1.1&r2=1.2
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- configure 10 Feb 2007 18:54:06 -0000 1.73
+++ configure 13 Feb 2007 03:23:28 -0000 1.74
@@ -24,7 +24,7 @@
#
###############################################################################
-VERSION=2.99.6
+VERSION=2.99.7
for ARG in $@; do
if [ "$ARG" = "-d" ]; then
Index: gshterm/command_line.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gshterm/command_line.c 9 Feb 2007 16:02:03 -0000 1.1
+++ gshterm/command_line.c 13 Feb 2007 03:23:28 -0000 1.2
@@ -23,9 +23,10 @@
#include "gshterm.h"
extern char *gsh_geometry;
+char *gshterm_font=NULL;
char*
-gshterm_construct_command(int argc, char **argv)
+gshterm_construct_command(struct GSHTerm *term, int argc, char **argv)
{
gchar *command;
@@ -33,40 +34,48 @@
the first concatenation. */
if(!gshterm_construct_command_from_args(
- argc, argv, &command))
+ term, argc, argv, &command))
asprintf(&command, "/bin/sh");
return(command);
}
gboolean
-gshterm_handle_command_line_option(gchar option, gchar *arg)
+gshterm_handle_command_line_option(
+ struct GSHTerm *term, gchar option, gchar *arg)
{
- gboolean exec_reached=FALSE;
+ assert(arg);
+#ifdef DEBUG
putchar(option);
- assert(arg);
+#endif /* DEBUG */
+
switch(option)
{
case 'e':
- exec_reached=TRUE;
+ return TRUE;
+ break;
+ case 'f':
+ asprintf(&term->font, arg);
break;
case 'g':
- asprintf(&gsh_geometry, arg);
+ asprintf(&term->gsh->geometry, arg);
break;
default:
- g_printerr("unknown option");
+ g_printerr("unknown option: %c\n", option);
}
-
- return(exec_reached);
+ return FALSE;
}
gboolean
-gshterm_construct_command_from_args(int argc, char **argv, gchar **command)
+gshterm_construct_command_from_args(
+ struct GSHTerm *term, int argc, char **argv, gchar **command)
{
int counter;
gboolean exec_reached;
+#ifdef DEBUG
puts(*command);
+#endif /* DEBUG */
for(counter=1, exec_reached=FALSE; counter < argc; counter++)
{
@@ -74,7 +83,7 @@
asprintf(command, "%s %s ", *command, argv[counter]);
else if(argv[counter][0] == '-')
exec_reached=gshterm_handle_command_line_option(
- argv[counter][1], argv[counter+1]);
+ term, argv[counter][1], argv[counter+1]);
#ifdef DEBUG
g_print("\n%d\t%s\n", counter, argv[counter]);
@@ -83,7 +92,6 @@
}
return(exec_reached);
-
}
Index: gshterm/command_line.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gshterm/command_line.h 9 Feb 2007 16:02:03 -0000 1.1
+++ gshterm/command_line.h 13 Feb 2007 03:23:28 -0000 1.2
@@ -23,11 +23,14 @@
#ifndef GSHTERM_COMMAND_LINE_H
#define GSHTERM_COMMAND_LINE_H
+#include "gshterm.h"
+
gboolean
-gshterm_construct_command_from_args(int argc, char **argv, gchar **command);
+gshterm_construct_command_from_args(
+ struct GSHTerm *term, int argc, char **argv, gchar **command);
char*
-gshterm_construct_command(int argc, char **argv);
+gshterm_construct_command(struct GSHTerm *term, int argc, char **argv);
#endif /* GSHTERM_COMMAND_LINE_H */
Index: gshterm/gshterm.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gshterm/gshterm.c 9 Feb 2007 16:10:42 -0000 1.4
+++ gshterm/gshterm.c 13 Feb 2007 03:23:28 -0000 1.5
@@ -22,6 +22,8 @@
#include "gshterm.h"
+extern char *gshterm_font;
+
void
gshterm_set_terminal_options(GtkWidget *terminal)
{
@@ -29,18 +31,30 @@
vte_terminal_set_allow_bold(VTE_TERMINAL(terminal), TRUE);
vte_terminal_set_backspace_binding(VTE_TERMINAL(terminal),
VTE_ERASE_ASCII_BACKSPACE);
+ if(!gshterm_font)
+ asprintf(&gshterm_font, "Mono 18");
+ vte_terminal_set_font_from_string(VTE_TERMINAL(terminal), gshterm_font);
+ free(gshterm_font);
+ vte_terminal_set_background_transparent(
+ VTE_TERMINAL(terminal), TRUE);
}
-GtkWidget *
-gshterm_setup_terminal()
+GtkWidget*
+gshterm_setup_terminal(struct GSHTerm *term)
{
GtkWidget *terminal;
+#ifdef DEBUG
+ assert(term);
+ assert(term->gsh);
+ assert(term->gsh->window);
+#endif /* DEBUG */
+
terminal=vte_terminal_new();
- gtk_container_add(GTK_CONTAINER(gsh_window), terminal);
+ gtk_container_add(GTK_CONTAINER(term->gsh->window), terminal);
gshterm_set_terminal_options(terminal);
gtk_widget_show(terminal);
-
+ term->widget=terminal;
return(terminal);
}
Index: gshterm/gshterm.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gshterm/gshterm.h 9 Feb 2007 16:02:03 -0000 1.2
+++ gshterm/gshterm.h 13 Feb 2007 03:23:28 -0000 1.3
@@ -26,6 +26,14 @@
#include <vte/vte.h>
#include <unistd.h>
+struct GSHTerm
+{
+ struct GSH *gsh;
+ gchar *script;
+ gchar *font;
+ GtkWidget *widget;
+};
+
#include "command_line.h"
#include "script.h"
Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gshterm/main.c 9 Feb 2007 03:16:12 -0000 1.4
+++ gshterm/main.c 13 Feb 2007 03:23:28 -0000 1.5
@@ -22,38 +22,48 @@
#include "gshterm.h"
-extern char *gsh_geometry;
-int
-main(int argc, char **argv)
+struct GSHTerm *
+gshterm_init_and_script(int *argc, char ***argv)
{
- char *script_name;
- GtkWidget *terminal;
-
- gsh_init(&argc, &argv);
+ struct GSHTerm *term;
- terminal=gshterm_setup_terminal();
+ term=(struct GSHTerm *)xmalloc(sizeof(struct GSHTerm));
- script_name=gshterm_command_script(
- gshterm_construct_command(argc, argv));
-
- gsh_check_and_set_geometry();
+ term->gsh=gsh_init(argc, argv);
#ifdef DEBUG
- puts(gsh_geometry);
+ assert(term->gsh);
+ assert(term->gsh->window);
#endif /* DEBUG */
- g_signal_connect(G_OBJECT(terminal), "child-exited",
- G_CALLBACK(gshterm_exit_cb), script_name);
+ term->script=gshterm_command_script(
+ gshterm_construct_command(term, *argc, *argv));
+
+
+ return(term);
+}
+
+int
+main(int argc, char **argv)
+{
+ struct GSHTerm *term;
+
+ /* Initialize GTK, GSH, and GSHTerm. */
+ term=gshterm_init_and_script(&argc, &argv);
+ term->widget=gshterm_setup_terminal(term);
+ gsh_check_and_set_geometry(term->gsh);
+ g_signal_connect(G_OBJECT(term->widget), "child-exited",
+ G_CALLBACK(gshterm_exit_cb), term->script);
/* SCRIPT_NAME is left allocated as it is needed
by the exit callback. */
vte_terminal_fork_command(
- VTE_TERMINAL(terminal), script_name, NULL, NULL, NULL,
+ VTE_TERMINAL(term->widget), term->script, NULL, NULL, NULL,
TRUE, TRUE, TRUE);
- gtk_widget_show(gsh_window);
+ gtk_widget_show(term->gsh->window);
gtk_main();
Index: gtkshell/arguments.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/arguments.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/arguments.h 13 Feb 2007 03:23:28 -0000 1.3
@@ -19,6 +19,7 @@
along with AntiRight; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+
#ifndef GSH_ARGUMENTS_H
#define GSH_ARGUMENTS_H
@@ -28,6 +29,6 @@
gsh_parse_arguments(struct GSH *gsh, int argc, char **argv);
void
-gsh_check_row();
+gsh_check_row(struct GSH *gsh);
#endif
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/button.c 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/button.c 13 Feb 2007 03:23:28 -0000 1.3
@@ -46,7 +46,7 @@
{
GtkWidget *image;
image=gtk_image_new_from_file(filename);
- gsh_command_button(command);
+ gsh_command_button(gsh, command);
gtk_button_set_image(GTK_BUTTON(gsh->button), image);
gtk_button_set_relief(GTK_BUTTON(gsh->button), GTK_RELIEF_NONE);
}
Index: gtkshell/dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/dialog_options.c 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/dialog_options.c 13 Feb 2007 03:23:28 -0000 1.3
@@ -54,7 +54,7 @@
gchar *font;
font=gtk_font_selection_dialog_get_font_name(
GTK_FONT_SELECTION_DIALOG(dialog));
- gprint("%s\n", font);
+ g_print("%s\n", font);
g_free(font);
}
exit(0);
Index: gtkshell/file_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/file_dialog.c 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/file_dialog.c 13 Feb 2007 03:23:28 -0000 1.3
@@ -41,7 +41,7 @@
{
gchar *name;
name=gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
- gprint("%s\n", name);
+ g_print("%s\n", name);
g_free(name);
}
Index: gtkshell/geometry.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/geometry.c 12 Feb 2007 16:36:56 -0000 1.3
+++ gtkshell/geometry.c 13 Feb 2007 03:23:28 -0000 1.4
@@ -34,7 +34,7 @@
void
gsh_check_and_set_geometry(struct GSH *gsh)
{
- if(gsh->geometry)
+ if(!gsh->geometry)
asprintf(&gsh->geometry, "400x300");
gsh_set_geometry(gsh);
Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/gtkshell.c 12 Feb 2007 16:36:56 -0000 1.5
+++ gtkshell/gtkshell.c 13 Feb 2007 03:23:28 -0000 1.6
@@ -36,14 +36,46 @@
return(window);
}
+void
+gsh_GSH_Flags(struct GSH_Flags *flags)
+{
+ flags->dont_scroll=FALSE;
+ flags->button_exits=FALSE;
+ flags->updating=FALSE;
+}
+void
+gsh_GSH_Rows(struct GSH_Rows *rows)
+{
+ rows->row=1;
+ rows->rows=8;
+}
+void
+gsh_GSH(struct GSH *gsh)
+{
+ gsh->geometry=NULL;
+ gsh->update_period=1000;
+ gsh_GSH_Flags(&gsh->flags);
+ gsh_GSH_Rows(&gsh->rows);
+}
+struct GSH *
+gsh_new_GSH()
+{
+ struct GSH *gsh;
+
+ gsh=(struct GSH *)xmalloc(sizeof(struct GSH));
+ gsh_GSH(gsh);
+ return gsh;
+}
struct GSH *
gsh_init(int *argc, char ***argv)
{
struct GSH *gsh;
+
gtk_init(argc, argv);
- gsh=(struct GSH *)xmalloc(sizeof(struct GSH));
+ gsh=gsh_new_GSH();
gsh->window=gsh_create_main_window();
+
return gsh;
}
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/gtkshell.h 12 Feb 2007 16:36:56 -0000 1.5
+++ gtkshell/gtkshell.h 13 Feb 2007 03:23:28 -0000 1.6
@@ -26,6 +26,33 @@
#include <errno.h>
#include "../libantiright/library.h"
+struct GSH_Flags
+{
+ gboolean dont_scroll;
+ gboolean button_exits;
+ gboolean updating;
+};
+
+struct GSH_Rows
+{
+ GtkWidget *h;
+ GtkWidget *v;
+ unsigned int row;
+ unsigned int rows;
+};
+
+struct GSH
+{
+ GtkWidget *window;
+ GtkWidget *scrolled_window;
+ struct GSH_Rows rows;
+ struct GSH_Flags flags;
+ GtkWidget *label;
+ GtkWidget *button;
+ gchar *geometry;
+ unsigned int update_period;
+};
+
#include "arguments.h"
#include "options.h"
#include "callbacks.h"
@@ -44,23 +71,6 @@
#include "containers.h"
#include "geometry.h"
-struct GSH_Flags
-{
- gboolean dont_scroll;
- gboolean button_exits;
-};
-
-struct GSH
-{
- GtkWidget *window;
- GtkWidget *scrolled_window;
- struct GSH_Rows rows;
- struct GSH_Flags flags;
- GtkWidget *label;
- GtkWidget *button;
- gchar *geometry;
- unsigned int update_period;
-};
struct GSH *
gsh_init(int *argc, char ***argv);
Index: gtkshell/option_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/option_options.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/option_options.h 13 Feb 2007 03:23:28 -0000 1.3
@@ -25,6 +25,6 @@
void
gsh_handle_option_arguments(
- struct GSH *gsh, int argc, char **argv, unsigned int *counter);
+ struct GSH *gsh, int argc, char **argv, int *counter);
#endif
Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/row.c 9 Feb 2007 03:16:12 -0000 1.2
+++ gtkshell/row.c 13 Feb 2007 03:23:28 -0000 1.3
@@ -22,43 +22,38 @@
#include "gtkshell.h"
-unsigned int gsh_rows=8;
-unsigned int gsh_row=1;
-
void
-gsh_manage(GtkWidget *widget)
+gsh_manage(struct GSH *gsh, GtkWidget *widget)
{
- gsh_check_row();
- gtk_container_add(GTK_CONTAINER(gsh_vbox), widget);
+ gsh_check_row(gsh);
+ gtk_container_add(GTK_CONTAINER(gsh->rows.h), widget);
gtk_widget_show(widget);
- gsh_row++;
+ gsh->rows.row++;
#ifdef DEBUG
- printf("gsh_row: %d, gsh_rows: %d\n", gsh_row, gsh_rows);
+ printf("gsh_row: %d, gsh_rows: %d\n", gsh->rows.row, gsh->rows.rows);
#endif
}
void
-gsh_new_row()
+gsh_new_row(struct GSH *gsh)
{
- gsh_vbox = gtk_vbox_new(FALSE, 2);
- gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
- gtk_widget_show(gsh_vbox);
- gsh_row = 1;
+ gsh->rows.v = gtk_vbox_new(FALSE, 2);
+ gtk_container_add(GTK_CONTAINER(gsh->rows.h), gsh->rows.v);
+ gtk_widget_show(gsh->rows.v);
+ gsh->rows.row = 1;
}
void
-gsh_check_row()
+gsh_check_row(struct GSH *gsh)
{
#ifdef DEBUG
- printf("==> gsh_row: %d, gsh_rows: %d\n", gsh_row, gsh_rows);
+ printf("==> gsh_row: %d, gsh_rows: %d\n", gsh->rows.row, gsh->rows.rows);
#endif
- if(gsh_row > gsh_rows)
+ if(gsh->rows.row > gsh->rows.rows)
{
- gsh_new_row();
+ gsh_new_row(gsh);
}
}
-
-
Index: gtkshell/row.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/row.h 12 Feb 2007 16:36:56 -0000 1.3
+++ gtkshell/row.h 13 Feb 2007 03:23:28 -0000 1.4
@@ -22,21 +22,13 @@
#ifndef GSH_ROW_H
#define GSH_ROW_H
-struct Rows
-{
- GtkWidget *h;
- GtkWidget *v;
- unsigned int row;
- unsigned int rows;
-}
-
void
-gsh_manage(GtkWidget *widget);
+gsh_manage(struct GSH *gsh, GtkWidget *widget);
void
-gsh_new_row();
+gsh_new_row(struct GSH *gsh);
void
-gsh_check_row();
+gsh_check_row(struct GSH *gsh);
#endif /* GSH_ROW_H */
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/text.c 8 Feb 2007 23:22:31 -0000 1.2
+++ gtkshell/text.c 13 Feb 2007 03:23:28 -0000 1.3
@@ -23,32 +23,36 @@
#include "gtkshell.h"
GtkWidget*
-gsh_setup_command_entry(char *command)
+gsh_setup_command_entry(struct GSH *gsh, char *command)
{
GtkWidget *entry;
+ struct GSH_CBData *cb;
+ cb=(struct GSH_CBData *)xmalloc(sizeof(struct GSH_CBData));
+ cb->gsh=gsh;
+ asprintf((char **)&cb->data, "%s", command);
entry = gtk_entry_new();
g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(entry_cb),
- (gpointer) command);
- gsh_manage(entry);
+ (gpointer) cb);
+ gsh_manage(gsh, entry);
return(entry);
}
void
-gsh_setup_prompt_command_entry(char *command)
+gsh_setup_prompt_command_entry(struct GSH *gsh, char *command)
{
GtkWidget *entry;
- entry=gsh_setup_command_entry(command);
+ entry=gsh_setup_command_entry(gsh, command);
g_signal_connect(G_OBJECT(entry), "activate",
G_CALLBACK(gtk_main_quit), NULL);
}
void
-gsh_text_area()
+gsh_text_area(struct GSH *gsh)
{
GtkWidget *text;
text=gtk_text_view_new();
- gsh_manage(text);
+ gsh_manage(gsh, text);
}
Index: gtkshell/text.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/text.h 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/text.h 13 Feb 2007 03:23:28 -0000 1.2
@@ -24,10 +24,10 @@
#define GSH_TEXT_H
GtkWidget*
-gsh_setup_command_entry(char *command);
+gsh_setup_command_entry(struct GSH *gsh, char *command);
void
-gsh_setup_prompt_command_entry(char *command);
+gsh_setup_prompt_command_entry(struct GSH *gsh, char *command);
void
gsh_text_area();
Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/updated_label.c 9 Feb 2007 16:10:42 -0000 1.3
+++ gtkshell/updated_label.c 13 Feb 2007 03:23:28 -0000 1.4
@@ -52,7 +52,7 @@
}
void
-gsh_add_updated_label(char *command)
+gsh_add_updated_label(struct GSH *gsh, char *command)
{
GtkWidget *widget;
@@ -60,7 +60,7 @@
puts("gsh_add_updated_label()");
#endif
widget=gtk_label_new("");
- gsh_manage(widget);
+ gsh_manage(gsh, widget);
gsh_add_updater(&gsh_update_label, command, (void*)widget);
}
Index: gtkshell/updated_label.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/updated_label.h 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/updated_label.h 13 Feb 2007 03:23:28 -0000 1.2
@@ -27,7 +27,7 @@
gsh_update_label(char *command, void *widget);
void
-gsh_add_updated_label(char *command);
+gsh_add_updated_label(struct GSH *gsh, char *command);
#endif
Index: gtkshell/updated_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/updated_options.c 9 Feb 2007 03:16:12 -0000 1.3
+++ gtkshell/updated_options.c 13 Feb 2007 03:23:28 -0000 1.4
@@ -22,39 +22,37 @@
#include "gtkshell.h"
-extern GSList *gsh_updater_list;
-gboolean gsh_is_updating=FALSE;
-
void
-gsh_test_updating()
+gsh_test_updating(struct GSH *gsh)
{
- if(!gsh_is_updating)
+ if(!gsh->flags.updating)
{
gsh_start_updates();
- gsh_is_updating=TRUE;
+ gsh->flags.updating=TRUE;
}
}
void
-gsh_updater_argument_generic(int argc, unsigned int *counter)
+gsh_updater_argument_generic(struct GSH *gsh, int argc, unsigned int *counter)
{
gsh_count(argc, counter);
- gsh_test_updating();
+ gsh_test_updating(gsh);
}
void
-gsh_handle_updated_arguments(int argc, char **argv, unsigned int *counter)
+gsh_handle_updated_arguments(struct GSH *gsh, int argc,
+ char **argv, int *counter)
{
assert(strlen(argv[(*counter)])>2);
switch(argv[(*counter)][3])
{
case 'l':
- gsh_add_updated_label(argv[*counter+1]);
- gsh_updater_argument_generic(argc, counter);
+ gsh_add_updated_label(gsh, argv[*counter+1]);
+ gsh_updater_argument_generic(gsh, argc, counter);
break;
case 'p':
- gsh_add_updated_progress(argv[*counter+1]);
- gsh_updater_argument_generic(argc, counter);
+ gsh_add_updated_progress(gsh, argv[*counter+1]);
+ gsh_updater_argument_generic(gsh, argc, counter);
break;
}
}
Index: gtkshell/updated_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/updated_options.h 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/updated_options.h 13 Feb 2007 03:23:28 -0000 1.2
@@ -24,6 +24,7 @@
#define GSH_UPDATED_OPTIONS_H
void
-gsh_handle_updated_arguments(int argc, char **argv, unsigned int *counter);
+gsh_handle_updated_arguments(struct GSH *gsh, int argc,
+ char **argv, int *counter);
#endif
Index: gtkshell/updated_progress.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/updated_progress.c 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/updated_progress.c 13 Feb 2007 03:23:28 -0000 1.2
@@ -32,11 +32,11 @@
free(results);
}
void
-gsh_add_updated_progress(char *command)
+gsh_add_updated_progress(struct GSH *gsh, char *command)
{
GtkWidget *widget;
widget=gtk_progress_bar_new();
- gsh_manage(widget);
+ gsh_manage(gsh, widget);
gsh_add_updater(&gsh_update_progress, command, (void*)widget);
}
Index: gtkshell/updated_progress.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/updated_progress.h 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/updated_progress.h 13 Feb 2007 03:23:28 -0000 1.2
@@ -27,7 +27,7 @@
gsh_update_progress(char *command, void *widget);
void
-gsh_add_updated_progress(char *command);
+gsh_add_updated_progress(struct GSH *gsh, char *command);
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright configure gshterm/command_line.c gsht...,
Jeffrey Bedard <=