[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright doc/indent.pro gshterm/command_line.c...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright doc/indent.pro gshterm/command_line.c... |
|
Date: |
Wed, 28 Feb 2007 03:53:52 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/28 03:53:51
Modified files:
doc : indent.pro
gshterm : command_line.c command_line.h gshterm.c
gshterm.h main.c script.c script.h
gtkshell : add_options.c add_options.h arguments.c
arguments.h button.c button.h callbacks.c
callbacks.h containers.c containers.h
dialog_options.c dialog_options.h dragdrop.c
dragdrop.h file_dialog.c file_dialog.h font.c
font.h geometry.c geometry.h gtkshell.c
gtkshell.h label.c label.h main.c
option_options.c option_options.h options.c
options.h row.c row.h text.c text.h updated.c
updated.h updated_label.c updated_label.h
updated_options.c updated_options.h
updated_progress.c updated_progress.h
libantiright : library.h pipe.c pipe.h string.c string.h
system.c system.h util.c util.h
Log message:
Fixed bug involving comparison between integer and pointer.
Reindented source.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/doc/indent.pro?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.h?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/script.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/script.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/font.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/font.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/pipe.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/pipe.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.h?cvsroot=antiright&r1=1.4&r2=1.5
Patches:
Index: doc/indent.pro
===================================================================
RCS file: /sources/antiright/antiright/doc/indent.pro,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- doc/indent.pro 20 Feb 2007 04:29:43 -0000 1.1
+++ doc/indent.pro 28 Feb 2007 03:53:51 -0000 1.2
@@ -1,3 +1,3 @@
--nbad -bap -nbc -bl -bli2 -bls -ncdb -nce -di2
--ndj -nfc1 -i2 -ip5 -lp -pcs -psl -nsc -nsob
--bacc
+-bacc -bad -bap -bbb -nbc -bl -nce -eei -i8 -nip -l72 -lp -npcs
+-Tgchar -TGtkWidget -Tgint -Tgpointer -Tgboolean
+
Index: gshterm/command_line.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gshterm/command_line.c 26 Feb 2007 19:38:39 -0000 1.6
+++ gshterm/command_line.c 28 Feb 2007 03:53:51 -0000 1.7
@@ -23,31 +23,31 @@
#include "gshterm.h"
char *
-gshterm_construct_command (struct GSHTerm * term, int argc, char **argv)
+gshterm_construct_command(struct GSHTerm * term, int argc, char **argv)
{
gchar *command;
command = ""; /* Initialize to empty for the first
- concatenation. */
+ * concatenation. */
- ARIFNB(gshterm_construct_command_from_args (
+ ARIFNB(gshterm_construct_command_from_args(
term, argc, argv, &command))
{
char *shell;
- shell=getenv("SHELL");
+ shell = getenv("SHELL");
ARIFNP(shell)
- ar_asprintf (&command, "/bin/sh");
+ ar_asprintf(&command, "/bin/sh");
else
- ar_asprintf (&command, "%s", shell);
+ ar_asprintf(&command, "%s", shell);
}
return (command);
}
gboolean
-gshterm_handle_command_line_option (
- struct GSHTerm * term, gchar option, gchar * arg)
+gshterm_handle_command_line_option(
+ struct GSHTerm * term, gchar option, gchar *arg)
{
ARIFNP(arg)
{
@@ -56,7 +56,7 @@
}
#ifdef DEBUG
- putchar (option);
+ putchar(option);
#endif /* DEBUG */
switch (option)
@@ -64,41 +64,41 @@
case 'e':
return TRUE;
case 'f':
- ar_asprintf (&term->font, arg);
+ ar_asprintf(&term->font, arg);
break;
case 'g':
- ar_asprintf (&term->gsh->geometry, arg);
+ ar_asprintf(&term->gsh->geometry, arg);
break;
case 's':
- term->font_size=(gint)atoi(arg);
+ term->font_size = (gint) atoi(arg);
break;
default:
- g_warning ("gshterm: unknown option: -%c\n", option);
+ g_warning("gshterm: unknown option: -%c\n", option);
}
return FALSE;
}
gboolean
-gshterm_construct_command_from_args (
- struct GSHTerm * term, 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);
+ puts(*command);
#endif /* DEBUG */
for (counter = 1, exec_reached = FALSE; counter < argc; counter++)
{
if (exec_reached)
- ar_asprintf (command, "%s %s ", *command, argv[counter]);
+ ar_asprintf(command, "%s %s ", *command, argv[counter]);
else if (argv[counter][0] == '-')
- exec_reached = gshterm_handle_command_line_option (
+ exec_reached = gshterm_handle_command_line_option(
term, argv[counter][1], argv[counter + 1]);
#ifdef DEBUG
- g_print ("\n%d\t%s\n", counter, argv[counter]);
+ g_print("\n%d\t%s\n", counter, argv[counter]);
#endif /* DEBUG */
}
Index: gshterm/command_line.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gshterm/command_line.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gshterm/command_line.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -26,9 +26,10 @@
#include "gshterm.h"
gboolean
-gshterm_construct_command_from_args (
- struct GSHTerm * term, int argc, char **argv, gchar ** command);
+gshterm_construct_command_from_args(
+ struct GSHTerm * term, int argc, char **argv, gchar **command);
char *
- gshterm_construct_command (struct GSHTerm * term, 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gshterm/gshterm.c 26 Feb 2007 19:50:07 -0000 1.10
+++ gshterm/gshterm.c 28 Feb 2007 03:53:51 -0000 1.11
@@ -31,50 +31,54 @@
ar_asprintf(&final_font, "Mono 12");
else
{
- if(term->font_size == 0)
- /* If size is unspecified, then either the user
- * may have specified a font size as part of the
- * font string, or we will rely on system defaults. */
+ if (term->font_size == 0)
+
+ /*
+ * If size is unspecified, then either the user
+ * may have specified a font size as part of
+ * the font string, or we will rely on system
+ * defaults.
+ */
ar_asprintf(&final_font, "%s", term->font);
else
ar_asprintf(&final_font, "%s %d", term->font,
term->font_size);
g_free(term->font);
- term->font=NULL;
+ term->font = NULL;
}
- vte_terminal_set_font_from_string (VTE_TERMINAL (term->widget),
+ vte_terminal_set_font_from_string(VTE_TERMINAL(term->widget),
final_font);
g_free(final_font);
}
void
-gshterm_set_terminal_options (struct GSHTerm * term)
+gshterm_set_terminal_options(struct GSHTerm * term)
{
- vte_terminal_set_size (VTE_TERMINAL (term->widget), 80, 32);
- vte_terminal_set_allow_bold (VTE_TERMINAL (term->widget), TRUE);
- vte_terminal_set_backspace_binding (VTE_TERMINAL (term->widget),
+ vte_terminal_set_size(VTE_TERMINAL(term->widget), 80, 32);
+ vte_terminal_set_allow_bold(VTE_TERMINAL(term->widget), TRUE);
+ vte_terminal_set_backspace_binding(VTE_TERMINAL(term->widget),
VTE_ERASE_ASCII_BACKSPACE);
set_font(term);
- vte_terminal_set_background_transparent (
- VTE_TERMINAL (term->widget), TRUE);
+ vte_terminal_set_background_transparent(
+ VTE_TERMINAL(term->widget), TRUE);
}
struct GSHTerm *
-gshterm_setup_terminal (struct GSHTerm * term)
+gshterm_setup_terminal(struct GSHTerm * term)
{
#ifdef DEBUG
- ARPASSERT (term);
- ARPASSERT (term->gsh);
- ARPASSERT (term->gsh->window);
+ ARPASSERT(term);
+ ARPASSERT(term->gsh);
+ ARPASSERT(term->gsh->window);
#endif /* DEBUG */
- term->widget = vte_terminal_new ();
- gtk_container_add (GTK_CONTAINER (term->gsh->window), term->widget);
- gshterm_set_terminal_options (term);
- gtk_widget_show (term->widget);
+ term->widget = vte_terminal_new();
+ gtk_container_add(GTK_CONTAINER(term->gsh->window), term->widget);
+ gshterm_set_terminal_options(term);
+ gtk_widget_show(term->widget);
return (term);
}
@@ -84,15 +88,14 @@
{
struct GSHTerm *term;
- term = (struct GSHTerm *) xmalloc (sizeof (struct GSHTerm));
+ term = (struct GSHTerm *) xmalloc(sizeof(struct GSHTerm));
ARPASSERT(term);
- term->gsh=NULL;
- term->font=NULL;
- term->font_size=0;
- term->widget=NULL;
+ term->gsh = NULL;
+ term->font = NULL;
+ term->font_size = 0;
+ term->widget = NULL;
return term;
}
-
Index: gshterm/gshterm.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gshterm/gshterm.h 26 Feb 2007 19:38:39 -0000 1.7
+++ gshterm/gshterm.h 28 Feb 2007 03:53:51 -0000 1.8
@@ -40,12 +40,12 @@
#include "script.h"
void
- gshterm_set_terminal_options (struct GSHTerm * term);
+ gshterm_set_terminal_options(struct GSHTerm * term);
struct GSHTerm *
- gshterm_setup_terminal ();
+ gshterm_setup_terminal();
struct GSHTerm *
-GSHTerm_new();
+ GSHTerm_new();
#endif
Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gshterm/main.c 26 Feb 2007 19:38:39 -0000 1.12
+++ gshterm/main.c 28 Feb 2007 03:53:51 -0000 1.13
@@ -25,21 +25,21 @@
struct GSHTerm *
-gshterm_init_and_script (int *argc, char ***argv)
+gshterm_init_and_script(int *argc, char ***argv)
{
struct GSHTerm *term;
term = GSHTerm_new();
- term->gsh = gsh_init (argc, argv);
+ term->gsh = gsh_init(argc, argv);
#ifdef DEBUG
- ARPASSERT (term->gsh);
- ARPASSERT (term->gsh->window);
+ ARPASSERT(term->gsh);
+ ARPASSERT(term->gsh->window);
#endif /* DEBUG */
term->script = gshterm_command_script
- (gshterm_construct_command (term, *argc, *argv));
+ (gshterm_construct_command(term, *argc, *argv));
gshterm_setup_terminal(term);
@@ -48,37 +48,36 @@
}
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
struct GSHTerm *term;
gpointer script;
/* Initialize GTK, GSH, and GSHTerm. */
- term = gshterm_init_and_script (&argc, &argv);
+ term = gshterm_init_and_script(&argc, &argv);
- gsh_check_and_set_geometry (term->gsh);
+ gsh_check_and_set_geometry(term->gsh);
- g_signal_connect (G_OBJECT (term->widget), "child-exited",
- G_CALLBACK (gtk_main_quit), NULL);
+ g_signal_connect(G_OBJECT(term->widget), "child-exited",
+ G_CALLBACK(gtk_main_quit), NULL);
/* Run the script in the terminal widget. */
- vte_terminal_fork_command (
- VTE_TERMINAL (term->widget),
+ vte_terminal_fork_command(VTE_TERMINAL(term->widget),
term->script, NULL, NULL, NULL,
TRUE, TRUE, TRUE);
script = term->script;
- gtk_widget_show (term->gsh->window);
+ gtk_widget_show(term->gsh->window);
- g_free (term->gsh);
- g_free (term);
+ g_free(term->gsh);
+ g_free(term);
- gtk_main ();
+ gtk_main();
- unlink (script);
- g_free (script);
+ unlink(script);
+ g_free(script);
return (0);
}
Index: gshterm/script.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/script.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gshterm/script.c 26 Feb 2007 19:38:39 -0000 1.5
+++ gshterm/script.c 28 Feb 2007 03:53:51 -0000 1.6
@@ -25,7 +25,7 @@
#include <sys/stat.h>
char *
-gshterm_command_script (char *command)
+gshterm_command_script(char *command)
{
gchar *script_name;
FILE *script;
@@ -37,29 +37,31 @@
/* This is a workaround for vte's fscking up of option arrays. */
- pid = getpid ();
- ar_asprintf (&script_name, "/tmp/gshterm.%d", (int) pid);
- script=fopen(script_name, "w");
+ pid = getpid();
+ ar_asprintf(&script_name, "/tmp/gshterm.%d", (int) pid);
+ script = fopen(script_name, "w");
ARIFNP(script)
ARERR("script file could not be opened");
fflush(script);
- /* Do this immediately after opening in order to
- * reduce the possiblity of script modification exploit. */
+ /*
+ * Do this immediately after opening in order to reduce the
+ * possiblity of script modification exploit.
+ */
- if(chmod(script_name, S_IXUSR | S_IRUSR | S_IWUSR) != 0)
+ if (chmod(script_name, S_IXUSR | S_IRUSR | S_IWUSR) != 0)
ARERR("script file does not exist");
- fprintf (script, "#!/bin/sh\n");
- fprintf (script, "%s\n", command);
- g_free (command);
+ fprintf(script, "#!/bin/sh\n");
+ fprintf(script, "%s\n", command);
+ g_free(command);
fflush(script);
fclose(script);
#ifdef DEBUG
- sysprintf ("cat %s", script_name);
+ sysprintf("cat %s", script_name);
ARBUG("end gshterm_command_script()");
#endif /* DEBUG */
Index: gshterm/script.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/script.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gshterm/script.h 20 Feb 2007 04:29:43 -0000 1.2
+++ gshterm/script.h 28 Feb 2007 03:53:51 -0000 1.3
@@ -24,5 +24,6 @@
#define GSHTERM_SCRIPT_H
char *
- gshterm_command_script (char *command);
+ gshterm_command_script(char *command);
+
#endif /* GSHTERM_SCRIPT_H */
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/add_options.c 25 Feb 2007 10:48:38 -0000 1.7
+++ gtkshell/add_options.c 28 Feb 2007 03:53:51 -0000 1.8
@@ -23,62 +23,61 @@
#include "gtkshell.h"
static void
-gsh_handle_add_image_button (
+gsh_handle_add_image_button(
struct GSH * gsh, int argc, char **argv, int *counter)
{
- gsh_count (argc, counter);
- gsh_image_button (gsh, argv[(*counter)],
+ gsh_count(argc, counter);
+ gsh_image_button(gsh, argv[(*counter)],
argv[(*counter) + 1]);
- gsh_count (argc, counter);
+ gsh_count(argc, counter);
}
static void
-gsh_handle_add_unlabeled_image_button (
+gsh_handle_add_unlabeled_image_button(
struct GSH * gsh, int argc, char **argv, int *counter)
{
- gsh_handle_add_image_button (gsh, argc, argv, counter);
- gtk_button_set_label (GTK_BUTTON (gsh->button), "");
+ gsh_handle_add_image_button(gsh, argc, argv, counter);
+ gtk_button_set_label(GTK_BUTTON(gsh->button), "");
}
void
-gsh_handle_add_arguments (struct GSH * gsh, int argc, char **argv, int
*counter)
+gsh_handle_add_arguments(struct GSH * gsh, int argc, char **argv, int *counter)
{
- g_assert (strlen (argv[(*counter)]) > 1);
+ g_assert(strlen(argv[(*counter)]) > 1);
switch (argv[(*counter)][2])
{
case 'e':
- gsh_count (argc, counter);
- gsh_text_editor (gsh, argv[*counter]);
+ gsh_count(argc, counter);
+ gsh_text_editor(gsh, argv[*counter]);
break;
case 'I':
- gsh_handle_add_unlabeled_image_button (
+ gsh_handle_add_unlabeled_image_button(
gsh, argc, argv, counter);
break;
case 'i':
- gsh_handle_add_image_button (
+ gsh_handle_add_image_button(
gsh, argc, argv, counter);
break;
case 'l':
- gsh_count (argc, counter);
- gsh_add_label (gsh, argv[(*counter)]);
+ gsh_count(argc, counter);
+ gsh_add_label(gsh, argv[(*counter)]);
break;
case 't':
+ if (argc != *counter)
+ gsh_count(argc, counter);
- if (argc != counter)
- gsh_count (argc, counter);
-
- gsh_setup_command_entry (gsh, argv[(*counter)]);
+ gsh_setup_command_entry(gsh, argv[(*counter)]);
break;
case 'T':
- gsh_text_area (gsh);
+ gsh_text_area(gsh);
break;
case 'u':
- gsh_handle_updated_arguments (
+ gsh_handle_updated_arguments(
gsh, argc, argv, counter);
break;
}
Index: gtkshell/add_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/add_options.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/add_options.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -26,5 +26,6 @@
#include "gtkshell.h"
void
- gsh_handle_add_arguments (struct GSH * gsh, int argc, char **argv, int
*counter);
+ gsh_handle_add_arguments(struct GSH * gsh, int argc, char **argv, int
*counter);
+
#endif
Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/arguments.c 25 Feb 2007 10:48:38 -0000 1.6
+++ gtkshell/arguments.c 28 Feb 2007 03:53:51 -0000 1.7
@@ -23,13 +23,13 @@
#include "gtkshell.h"
void
-gsh_parse_arguments (struct GSH * gsh, int argc, char **argv)
+gsh_parse_arguments(struct GSH * gsh, int argc, char **argv)
{
int counter;
for (counter = 1; counter < argc; counter++)
if (argv[counter][0] == '-')
- gsh_handle_switch_arguments (gsh, argc, argv, &counter);
+ gsh_handle_switch_arguments(gsh, argc, argv, &counter);
else
- gsh_command_button (gsh, argv[counter]);
+ gsh_command_button(gsh, argv[counter]);
}
Index: gtkshell/arguments.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/arguments.h 20 Feb 2007 04:29:43 -0000 1.4
+++ gtkshell/arguments.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -26,8 +26,9 @@
#include "gtkshell.h"
void
- gsh_parse_arguments (struct GSH * gsh, int argc, char **argv);
+ gsh_parse_arguments(struct GSH * gsh, int argc, char **argv);
void
- gsh_check_row (struct GSH * gsh);
+ gsh_check_row(struct GSH * gsh);
+
#endif
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/button.c 27 Feb 2007 23:31:37 -0000 1.14
+++ gtkshell/button.c 28 Feb 2007 03:53:51 -0000 1.15
@@ -23,59 +23,62 @@
#include "gtkshell.h"
static void
-setup_label(GtkWidget *widget, char *command);
+ setup_label(GtkWidget *widget, char *command);
static void
setup_label(GtkWidget *widget, char *command)
{
- gchar * formatted;
- formatted=antiright_beautified_label(command);
+ gchar *formatted;
+
+ formatted = antiright_beautified_label(command);
gtk_button_set_label(GTK_BUTTON(widget), formatted);
free(formatted);
}
void
-gsh_command_button (struct GSH * gsh, char *command)
+gsh_command_button(struct GSH * gsh, char *command)
{
char *label_text;
struct GSH_CBData *cb;
#ifdef DEBUG
- ARBUG ("gsh_command_button");
+ ARBUG("gsh_command_button");
#endif /* DEBUG */
/* Allocate and initialize elements. */
- cb = (struct GSH_CBData *) xmalloc (sizeof (struct GSH_CBData));
+ cb = (struct GSH_CBData *) xmalloc(sizeof(struct GSH_CBData));
ARPASSERT(gsh);
cb->gsh = gsh;
- cb->data=command; /* command from argv, literal, or preallocated. */
+ cb->data = command; /* command from argv, literal, or
+ * preallocated. */
- gsh->button = gtk_button_new ();
+ gsh->button = gtk_button_new();
setup_label(gsh->button, command);
gsh_setup_drag_drop(gsh, gsh->button);
- /address@hidden@*/
- (void)g_signal_connect (G_OBJECT (gsh->button), "clicked",
- G_CALLBACK (system_cb), cb);
+ /* @null@ */
+ (void) g_signal_connect(G_OBJECT(gsh->button), "clicked",
+ G_CALLBACK(system_cb), cb);
- gsh_manage_unexpanded (gsh, gsh->button);
+ gsh_manage_unexpanded(gsh, gsh->button);
#ifdef DEBUG
- g_debug ("==> row: %d out of %d rows\n",
+ g_debug("==> row: %d out of %d rows\n",
gsh->rows.row, gsh->rows.rows);
#endif /* DEBUG */
}
void
-gsh_image_button (struct GSH * gsh, char *command, char *filename)
+gsh_image_button(struct GSH * gsh, char *command, char *filename)
{
GtkWidget *image;
- image = gtk_image_new_from_file (filename);
- 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);
+
+ image = gtk_image_new_from_file(filename);
+ 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/button.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/button.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/button.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -24,8 +24,9 @@
#define GSH_BUTTON_H
void
- gsh_command_button (struct GSH * gsh, char *command);
+ gsh_command_button(struct GSH * gsh, char *command);
void
- gsh_image_button (struct GSH * gsh, char *command, char *filename);
+ gsh_image_button(struct GSH * gsh, char *command, char *filename);
+
#endif
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/callbacks.c 24 Feb 2007 00:05:26 -0000 1.11
+++ gtkshell/callbacks.c 28 Feb 2007 03:53:51 -0000 1.12
@@ -24,14 +24,15 @@
static void
-gsh_test_exit (struct GSH * gsh)
+gsh_test_exit(struct GSH * gsh)
{
+
#ifdef DEBUG
ARBUG("gsh_test_exit()");
#endif /* DEBUG */
- if (ARPBOOL (gsh) && ARBBOOL (gsh->flags.button_exits))
- exit (EXIT_SUCCESS);
+ if (ARPBOOL(gsh) && ARBBOOL(gsh->flags.button_exits))
+ exit(EXIT_SUCCESS);
#ifdef DEBUG
ARBUG("==>made it past exit");
@@ -39,26 +40,27 @@
}
void
-system_cb (GtkWidget * widget, gpointer data)
+system_cb(GtkWidget *widget, gpointer data)
{
struct GSH_CBData *cb;
+
cb = (struct GSH_CBData *) data;
#ifdef DEBUG
ARBUG("system_cb");
#endif /* DEBUG */
- UNUSED (widget);
+ UNUSED(widget);
ARWIFNP(cb)
{
- (void)antiright_system (cb->data);
- gsh_test_exit (cb->gsh);
+ (void) antiright_system(cb->data);
+ gsh_test_exit(cb->gsh);
}
}
void
-entry_cb (GtkWidget * widget, gpointer data)
+entry_cb(GtkWidget *widget, gpointer data)
{
const gchar *input; /* Must not be freed. */
struct GSH_CBData *cb;
@@ -67,19 +69,18 @@
ARWIFNP(widget)
{
- input = gtk_entry_get_text (GTK_ENTRY (widget));
+ input = gtk_entry_get_text(GTK_ENTRY(widget));
ARWIFNP(cb)
{
ARIFB(cb->gsh->flags.prompt_echoes)
- g_print ("%s\n", input);
+ g_print("%s\n", input);
else
- sysprintf ("%s %s", (char *) cb->data, (char *)
input);
+ sysprintf("%s %s", (char *) cb->data, (char *) input);
gsh_test_exit(cb->gsh);
}
- gtk_entry_set_text (GTK_ENTRY (widget), ""); /*
Clear. */
+ gtk_entry_set_text(GTK_ENTRY(widget), ""); /* Clear. */
}
}
-
Index: gtkshell/callbacks.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/callbacks.h 20 Feb 2007 04:29:43 -0000 1.4
+++ gtkshell/callbacks.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -30,8 +30,9 @@
};
void
- system_cb (GtkWidget * widget, gpointer data);
+ system_cb(GtkWidget *widget, gpointer data);
void
- entry_cb (GtkWidget * widget, gpointer data);
+ entry_cb(GtkWidget *widget, gpointer data);
+
#endif
Index: gtkshell/containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/containers.c 23 Feb 2007 19:15:05 -0000 1.6
+++ gtkshell/containers.c 28 Feb 2007 03:53:51 -0000 1.7
@@ -23,45 +23,45 @@
#include "gtkshell.h"
void
-gsh_setup_scrolled_window (struct GSH * gsh)
+gsh_setup_scrolled_window(struct GSH * gsh)
{
- gsh->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (
- GTK_SCROLLED_WINDOW (gsh->scrolled_window),
+ gsh->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(
+ GTK_SCROLLED_WINDOW(gsh->scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (
- GTK_SCROLLED_WINDOW (gsh->scrolled_window),
+ gtk_scrolled_window_set_shadow_type(
+ GTK_SCROLLED_WINDOW(gsh->scrolled_window),
GTK_SHADOW_OUT);
- gtk_container_add (GTK_CONTAINER (gsh->window),
+ gtk_container_add(GTK_CONTAINER(gsh->window),
gsh->scrolled_window);
- gtk_widget_show (gsh->scrolled_window);
+ gtk_widget_show(gsh->scrolled_window);
}
void
-gsh_setup_containers (struct GSH * gsh)
+gsh_setup_containers(struct GSH * gsh)
{
- gsh->rows.h = gtk_hbox_new (FALSE, 2);
+ gsh->rows.h = gtk_hbox_new(FALSE, 2);
ARIFNB(gsh->flags.dont_scroll)
{
- gsh_setup_scrolled_window (gsh);
- gtk_scrolled_window_add_with_viewport (
- GTK_SCROLLED_WINDOW (gsh->scrolled_window),
+ gsh_setup_scrolled_window(gsh);
+ gtk_scrolled_window_add_with_viewport(
+ GTK_SCROLLED_WINDOW(gsh->scrolled_window),
gsh->rows.h);
}
else
{
GtkWidget *frame;
- frame=gtk_frame_new(NULL);
- gtk_container_add (GTK_CONTAINER (gsh->window),
+ frame = gtk_frame_new(NULL);
+ gtk_container_add(GTK_CONTAINER(gsh->window),
frame);
gtk_widget_show(frame);
- gtk_container_add (GTK_CONTAINER (frame),
+ gtk_container_add(GTK_CONTAINER(frame),
gsh->rows.h);
}
- gtk_widget_show (gsh->rows.h);
- gsh_new_row (gsh);
+ gtk_widget_show(gsh->rows.h);
+ gsh_new_row(gsh);
}
Index: gtkshell/containers.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/containers.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/containers.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -24,8 +24,9 @@
#define GSH_CONTAINERS_H
void
- gsh_setup_scrolled_window (struct GSH * gsh);
+ gsh_setup_scrolled_window(struct GSH * gsh);
void
- gsh_setup_containers (struct GSH * gsh);
+ gsh_setup_containers(struct GSH * gsh);
+
#endif /* GSH_CONTAINERS_H */
Index: gtkshell/dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/dialog_options.c 23 Feb 2007 03:13:53 -0000 1.9
+++ gtkshell/dialog_options.c 28 Feb 2007 03:53:51 -0000 1.10
@@ -23,143 +23,145 @@
#include "gtkshell.h"
static void
-gsh_message_dialog (struct GSH * gsh, GtkMessageType type, char *text)
+gsh_message_dialog(struct GSH * gsh, GtkMessageType type, char *text)
{
GtkWidget *dialog;
- dialog = gtk_message_dialog_new (
- GTK_WINDOW (gsh->window),
+
+ dialog = gtk_message_dialog_new(
+ GTK_WINDOW(gsh->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
type,
GTK_BUTTONS_CLOSE,
(gchar *) text);
- gtk_dialog_run (GTK_DIALOG (dialog));
- exit (0);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ exit(0);
}
static void
-gsh_setup_message_dialog (struct GSH * gsh, int argc, char **argv,
+gsh_setup_message_dialog(struct GSH * gsh, int argc, char **argv,
unsigned int *counter, GtkMessageType type)
{
- gsh_count (argc, counter);
- gsh_message_dialog (gsh, type, argv[(*counter)]);
+ gsh_count(argc, counter);
+ gsh_message_dialog(gsh, type, argv[(*counter)]);
}
static void
-gsh_font_dialog ()
+gsh_font_dialog()
{
GtkWidget *dialog;
- dialog = gtk_font_selection_dialog_new ("Font Selector");
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+ dialog = gtk_font_selection_dialog_new("Font Selector");
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
{
gchar *font;
- font = gtk_font_selection_dialog_get_font_name (
- GTK_FONT_SELECTION_DIALOG (dialog));
- g_print ("%s\n", font);
- g_free (font);
+
+ font = gtk_font_selection_dialog_get_font_name(
+ GTK_FONT_SELECTION_DIALOG(dialog));
+ g_print("%s\n", font);
+ g_free(font);
}
- exit (0);
+ exit(0);
}
static void
-gsh_color_dialog ()
+gsh_color_dialog()
{
const GtkWidget *dialog;
- dialog = gtk_color_selection_dialog_new ("Color Selector");
+ dialog = gtk_color_selection_dialog_new("Color Selector");
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
{
GdkColor color;
- gtk_color_selection_get_current_color (
- GTK_COLOR_SELECTION (
- GTK_COLOR_SELECTION_DIALOG (dialog)
+ gtk_color_selection_get_current_color(
+ GTK_COLOR_SELECTION(
+ GTK_COLOR_SELECTION_DIALOG(dialog)
->colorsel),
&color);
- g_print ("#%x%x%x\n", color.red, color.green, color.blue);
+ g_print("#%x%x%x\n", color.red, color.green, color.blue);
}
- exit (0);
+ exit(0);
}
static void
-gsh_about_dialog ()
+gsh_about_dialog()
{
const GtkWidget *dialog;
const gchar *authors[] =
{"Jeffrey E. Bedard <address@hidden>",
NULL};
- dialog = gtk_about_dialog_new ();
+ dialog = gtk_about_dialog_new();
- gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (dialog),
+ gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog),
PACKAGE_STRING);
- gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (dialog),
+ gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
"Copyright 2002-2007, Jeffrey E. Bedard");
- gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (dialog),
+ gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog),
"http://www.nongnu.org/antiright";);
- gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog),
+ gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog),
"This software is licensed under the terms"
" of the GNU General Public License.");
- gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (dialog),
+ gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog),
authors);
- gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (dialog),
+ gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog),
"The desktop scripting environment.");
- gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run(GTK_DIALOG(dialog));
- exit (0);
+ exit(0);
}
void
-gsh_handle_dialog_arguments (struct GSH * gsh, int argc, char **argv,
+gsh_handle_dialog_arguments(struct GSH * gsh, int argc, char **argv,
int *counter)
{
- g_assert (strlen (argv[(*counter)]) > 2);
+ g_assert(strlen(argv[(*counter)]) > 2);
ARPASSERT(gsh);
switch (argv[(*counter)][2])
{
case 'a':
- gsh_about_dialog ();
+ gsh_about_dialog();
break;
case 'c': /* Color Selection */
- gsh_color_dialog ();
+ gsh_color_dialog();
break;
case 'D': /* Folder Creation Selector */
- gsh_folder_create_dialog (gsh);
+ gsh_folder_create_dialog(gsh);
break;
case 'd': /* Folder Selector */
- gsh_folder_open_dialog (gsh);
+ gsh_folder_open_dialog(gsh);
break;
case 'e': /* Error Message */
- gsh_setup_message_dialog (gsh, argc, argv,
+ gsh_setup_message_dialog(gsh, argc, argv,
counter, GTK_MESSAGE_ERROR);
break;
case 'F': /* Font Selection */
- gsh_font_dialog ();
+ gsh_font_dialog();
break;
case 'f': /* File Selection */
- gsh_file_open_dialog (gsh);
+ gsh_file_open_dialog(gsh);
break;
case 'i': /* Information */
- gsh_setup_message_dialog (gsh, argc, argv,
+ gsh_setup_message_dialog(gsh, argc, argv,
counter, GTK_MESSAGE_INFO);
break;
case 's': /* Filename Selection for Saving */
- gsh_file_save_dialog (gsh);
+ gsh_file_save_dialog(gsh);
break;
case 'w': /* Warning */
- gsh_setup_message_dialog (gsh, argc, argv,
+ gsh_setup_message_dialog(gsh, argc, argv,
counter,
GTK_MESSAGE_WARNING);
break;
Index: gtkshell/dialog_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/dialog_options.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/dialog_options.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -24,6 +24,7 @@
#define GSH_DIALOG_OPTIONS
void
-gsh_handle_dialog_arguments (struct GSH * gsh, int argc, char **argv,
+gsh_handle_dialog_arguments(struct GSH * gsh, int argc, char **argv,
int *counter);
+
#endif
Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/dragdrop.c 27 Feb 2007 23:31:37 -0000 1.4
+++ gtkshell/dragdrop.c 28 Feb 2007 03:53:51 -0000 1.5
@@ -20,65 +20,67 @@
#include "gtkshell.h"
-/* Portions Copyright 2005 Ryan McDougall, GNU GPL terms.
- * Based on drag and drop tutorial:
- * http://live.gnome.org/GnomeLove/DragNDropTutorial */
+/*
+ * Portions Copyright 2005 Ryan McDougall, GNU GPL terms. Based on drag
+ * and drop tutorial: http://live.gnome.org/GnomeLove/DragNDropTutorial
+ */
-enum {
+enum
+{
TARGET_STRING
};
static GtkTargetEntry target_list[] =
{
- { "text/plain", 0, TARGET_STRING }
+ {"text/plain", 0, TARGET_STRING}
};
-static guint n_targets = G_N_ELEMENTS (target_list);
+static guint n_targets = G_N_ELEMENTS(target_list);
static void
-drag_received(GtkWidget * widget, GdkDragContext *context, gint x,
- gint y,
GtkSelectionData *selection, guint target_type,
+drag_received(GtkWidget *widget, GdkDragContext * context, gint x,
+ gint y, GtkSelectionData * selection, guint target_type,
guint time, gpointer
data);
static gboolean
-drag_drop(GtkWidget * widget, GdkDragContext *context, gint x,
+drag_drop(GtkWidget *widget, GdkDragContext * context, gint x,
gint y, guint time, gpointer data);
static void
-drag_data_get(GtkWidget * widget, GdkDragContext *context,
- GtkSelectionData
*selection, guint target_type,
+drag_data_get(GtkWidget *widget, GdkDragContext * context,
+ GtkSelectionData * selection, guint target_type,
guint time, gpointer
data);
static void
-drag_begin (GtkWidget * widget, GdkDragContext *context, gpointer data);
+ drag_begin(GtkWidget *widget, GdkDragContext * context, gpointer data);
static void
-drag_end (GtkWidget * widget, GdkDragContext *context, gpointer data);
+ drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data);
void
-gsh_setup_drag_drop(struct GSH *gsh, GtkWidget * widget)
+gsh_setup_drag_drop(struct GSH * gsh, GtkWidget *widget)
{
- gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_MOTION
+ gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_MOTION
| GTK_DEST_DEFAULT_HIGHLIGHT, target_list,
n_targets,
GDK_ACTION_COPY);
- gtk_drag_source_set (widget, GDK_BUTTON1_MASK, target_list, n_targets,
+ gtk_drag_source_set(widget, GDK_BUTTON1_MASK, target_list, n_targets,
GDK_ACTION_COPY);
- (void) g_signal_connect (widget, "drag-data-received",
+ (void) g_signal_connect(widget, "drag-data-received",
G_CALLBACK(drag_received), NULL);
- (void) g_signal_connect (widget, "drag-drop", G_CALLBACK(drag_drop),
NULL);
- (void) g_signal_connect (widget, "drag-data-get",
+ (void) g_signal_connect(widget, "drag-drop", G_CALLBACK(drag_drop),
NULL);
+ (void) g_signal_connect(widget, "drag-data-get",
G_CALLBACK(drag_data_get), NULL);
- if(gsh->flags.button_exits)
- (void) g_signal_connect (widget, "drag-end",
+ if (gsh->flags.button_exits)
+ (void) g_signal_connect(widget, "drag-end",
G_CALLBACK(gtk_main_quit), NULL);
}
static void
-drag_received(GtkWidget * widget, GdkDragContext *context, gint x,
- gint y,
GtkSelectionData *selection, guint target_type,
+drag_received(GtkWidget *widget, GdkDragContext * context, gint x,
+ gint y, GtkSelectionData * selection, guint target_type,
guint time, gpointer
data)
{
gboolean drag_status;
@@ -89,10 +91,10 @@
sysprintf("%s %s",
gtk_button_get_label(GTK_BUTTON(widget)),
(gchar *) selection->data);
- drag_status=TRUE;
+ drag_status = TRUE;
break;
default:
- drag_status=FALSE;
+ drag_status = FALSE;
ARWARN("invalid data dropped");
}
@@ -100,18 +102,18 @@
}
static gboolean
-drag_drop(GtkWidget * widget, GdkDragContext *context, gint x,
+drag_drop(GtkWidget *widget, GdkDragContext * context, gint x,
gint y, guint time, gpointer data)
{
GdkAtom target_type;
target_type =
- GDK_POINTER_TO_ATOM (g_list_nth_data (context->targets,
+ GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets,
TARGET_STRING));
ARIFP(context->targets)
{
- gtk_drag_get_data ( widget, context, target_type, time
);
+ gtk_drag_get_data(widget, context, target_type, time);
return TRUE;
}
else
@@ -119,27 +121,26 @@
}
static void
-drag_data_get(GtkWidget * widget, GdkDragContext *context,
- GtkSelectionData
*selection, guint target_type,
+drag_data_get(GtkWidget *widget, GdkDragContext * context,
+ GtkSelectionData * selection, guint target_type,
guint time, gpointer
data)
{
- const gchar * source_data;
+ const gchar *source_data;
- source_data=gtk_button_get_label(GTK_BUTTON(widget));
+ source_data = gtk_button_get_label(GTK_BUTTON(widget));
gtk_selection_data_set(selection, selection->target, sizeof(gchar),
-
(guchar*)source_data, strlen(source_data));
+ (guchar *) source_data, strlen(source_data));
}
/* Use to set icon. */
static void
-drag_begin (GtkWidget * widget, GdkDragContext *context, gpointer data)
+drag_begin(GtkWidget *widget, GdkDragContext * context, gpointer data)
{
}
static void
-drag_end (GtkWidget * widget, GdkDragContext *context, gpointer data)
+drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data)
{
}
-
Index: gtkshell/dragdrop.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/dragdrop.h 27 Feb 2007 23:31:37 -0000 1.2
+++ gtkshell/dragdrop.h 28 Feb 2007 03:53:51 -0000 1.3
@@ -24,7 +24,6 @@
#define GSH_DRAGDROP_H
void
-gsh_setup_drag_drop(struct GSH *gsh, GtkWidget * widget);
+ gsh_setup_drag_drop(struct GSH * gsh, GtkWidget *widget);
#endif /* GSH_DRAGDROP_H */
-
Index: gtkshell/file_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/file_dialog.c 20 Feb 2007 04:29:43 -0000 1.4
+++ gtkshell/file_dialog.c 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,50 +24,51 @@
/* Taken from the GTK+ Reference Manual */
void
-gsh_file_dialog (struct GSH * gsh, GtkFileChooserAction action)
+gsh_file_dialog(struct GSH * gsh, GtkFileChooserAction action)
{
GtkWidget *dialog;
dialog =
- gtk_file_chooser_dialog_new (
+ gtk_file_chooser_dialog_new(
"File Chooser",
- GTK_WINDOW (gsh->window),
+ GTK_WINDOW(gsh->window),
action,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
{
gchar *name;
- name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- g_print ("%s\n", name);
- g_free (name);
+
+ name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+ g_print("%s\n", name);
+ g_free(name);
}
- exit (0);
+ exit(0);
}
void
-gsh_file_open_dialog (struct GSH * gsh)
+gsh_file_open_dialog(struct GSH * gsh)
{
- gsh_file_dialog (gsh, GTK_FILE_CHOOSER_ACTION_OPEN);
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_OPEN);
}
void
-gsh_file_save_dialog (struct GSH * gsh)
+gsh_file_save_dialog(struct GSH * gsh)
{
- gsh_file_dialog (gsh, GTK_FILE_CHOOSER_ACTION_SAVE);
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_SAVE);
}
void
-gsh_folder_create_dialog (struct GSH * gsh)
+gsh_folder_create_dialog(struct GSH * gsh)
{
- gsh_file_dialog (gsh, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
}
void
-gsh_folder_open_dialog (struct GSH * gsh)
+gsh_folder_open_dialog(struct GSH * gsh)
{
- gsh_file_dialog (gsh, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
}
Index: gtkshell/file_dialog.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/file_dialog.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/file_dialog.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -23,13 +23,14 @@
#ifndef GSH_FILE_DIALOG
#define GSH_FILE_DIALOG
void
- gsh_file_dialog (struct GSH * gsh, GtkFileChooserAction action);
+ gsh_file_dialog(struct GSH * gsh, GtkFileChooserAction action);
void
- gsh_file_open_dialog (struct GSH * gsh);
+ gsh_file_open_dialog(struct GSH * gsh);
void
- gsh_file_save_dialog (struct GSH * gsh);
+ gsh_file_save_dialog(struct GSH * gsh);
void
- gsh_folder_open_dialog (struct GSH * gsh);
+ gsh_folder_open_dialog(struct GSH * gsh);
void
- gsh_folder_create_dialog (struct GSH * gsh);
+ gsh_folder_create_dialog(struct GSH * gsh);
+
#endif
Index: gtkshell/font.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/font.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/font.c 22 Feb 2007 23:19:01 -0000 1.2
+++ gtkshell/font.c 28 Feb 2007 03:53:51 -0000 1.3
@@ -30,9 +30,9 @@
ARPASSERT(widget);
ARPASSERT(font);
- font_desc = pango_font_description_from_string (font);
- gtk_widget_modify_font (widget, font_desc);
- pango_font_description_free (font_desc);
+ font_desc = pango_font_description_from_string(font);
+ gtk_widget_modify_font(widget, font_desc);
+ pango_font_description_free(font_desc);
}
void
@@ -40,4 +40,3 @@
{
gsh_widget_set_font(widget, "Mono 12");
}
-
Index: gtkshell/font.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/font.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/font.h 22 Feb 2007 23:16:45 -0000 1.1
+++ gtkshell/font.h 28 Feb 2007 03:53:51 -0000 1.2
@@ -24,9 +24,9 @@
#define GTKSHELL_FONT_H
void
-gsh_widget_set_font(GtkWidget *widget, gchar *font);
+ gsh_widget_set_font(GtkWidget *widget, gchar *font);
void
-gsh_widget_set_font_mono(GtkWidget *widget);
+ gsh_widget_set_font_mono(GtkWidget *widget);
#endif /* GTKSHELL_FONT_H */
Index: gtkshell/geometry.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/geometry.c 24 Feb 2007 00:05:26 -0000 1.9
+++ gtkshell/geometry.c 28 Feb 2007 03:53:51 -0000 1.10
@@ -24,33 +24,33 @@
/* gsh->geometry is freed after this, so only call once. */
void
-gsh_set_geometry (struct GSH * gsh)
+gsh_set_geometry(struct GSH * gsh)
{
if (gsh->geometry)
{
- gtk_window_parse_geometry (GTK_WINDOW (gsh->window),
+ gtk_window_parse_geometry(GTK_WINDOW(gsh->window),
gsh->geometry);
- free (gsh->geometry);
+ free(gsh->geometry);
}
}
static gboolean
-gsh_check_geometry (struct GSH * gsh)
+gsh_check_geometry(struct GSH * gsh)
{
gboolean geometry_status = FALSE;
- if(!ARPBOOL (gsh->geometry) && !ARBBOOL(gsh->flags.dont_scroll))
- ar_asprintf (&gsh->geometry, "400x267");
+ if (!ARPBOOL(gsh->geometry) && !ARBBOOL(gsh->flags.dont_scroll))
+ ar_asprintf(&gsh->geometry, "400x267");
- ARIFP (gsh->geometry)
+ ARIFP(gsh->geometry)
geometry_status = TRUE;
return geometry_status;
}
void
-gsh_check_and_set_geometry (struct GSH * gsh)
+gsh_check_and_set_geometry(struct GSH * gsh)
{
- if (gsh_check_geometry (gsh))
- gsh_set_geometry (gsh);
+ if (gsh_check_geometry(gsh))
+ gsh_set_geometry(gsh);
}
Index: gtkshell/geometry.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/geometry.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/geometry.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -24,8 +24,9 @@
#define GSH_GEOMETRY_H
void
- gsh_set_geometry (struct GSH * gsh);
+ gsh_set_geometry(struct GSH * gsh);
void
- gsh_check_and_set_geometry (struct GSH * gsh);
+ gsh_check_and_set_geometry(struct GSH * gsh);
+
#endif /* GSH_GEOMETRY_H */
Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/gtkshell.c 23 Feb 2007 19:15:05 -0000 1.15
+++ gtkshell/gtkshell.c 28 Feb 2007 03:53:51 -0000 1.16
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -17,29 +17,30 @@
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
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA
*/
#include "gtkshell.h"
GtkWidget *
-gsh_create_main_window ()
+gsh_create_main_window()
{
GtkWidget *window;
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- /address@hidden@*/
- (void)g_signal_connect (window, "delete-event",
- G_CALLBACK (gtk_main_quit), NULL);
- /address@hidden@*/
- (void)g_signal_connect (window, "destroy",
- G_CALLBACK (gtk_main_quit), NULL);
+ /* @null@ */
+ (void) g_signal_connect(window, "delete-event",
+ G_CALLBACK(gtk_main_quit), NULL);
+ /* @null@ */
+ (void) g_signal_connect(window, "destroy",
+ G_CALLBACK(gtk_main_quit), NULL);
return (window);
}
static void
-gsh_GSH_Flags (struct GSH_Flags * flags)
+gsh_GSH_Flags(struct GSH_Flags * flags)
{
flags->dont_scroll = FALSE;
flags->button_exits = FALSE;
@@ -48,66 +49,65 @@
flags->horizontal_labels = FALSE;
}
static void
-gsh_GSH_Rows (struct GSH_Rows * rows)
+gsh_GSH_Rows(struct GSH_Rows * rows)
{
rows->row = 0;
rows->rows = 8;
}
static void
-gsh_GSH_Updater (struct GSH_Updater * update)
+gsh_GSH_Updater(struct GSH_Updater * update)
{
update->period = 1000;
/* Pointer must have not previously been used. */
- /address@hidden@*/
- update->list = (GSList *)NULL;
+ /* @null@ */
+ update->list = (GSList *) NULL;
}
void
-gsh_GSH (struct GSH * gsh)
+gsh_GSH(struct GSH * gsh)
{
- /address@hidden/
- gsh->geometry = (gchar *)NULL;
- gsh_GSH_Flags (&gsh->flags);
- gsh_GSH_Rows (&gsh->rows);
- gsh_GSH_Updater (&gsh->update);
+ /* @null */
+ gsh->geometry = (gchar *) NULL;
+ gsh_GSH_Flags(&gsh->flags);
+ gsh_GSH_Rows(&gsh->rows);
+ gsh_GSH_Updater(&gsh->update);
}
struct GSH *
-gsh_new_GSH ()
+gsh_new_GSH()
{
struct GSH *gsh;
- gsh = (struct GSH *) xmalloc (sizeof (struct GSH));
- gsh_GSH (gsh);
+ gsh = (struct GSH *) xmalloc(sizeof(struct GSH));
+ gsh_GSH(gsh);
return gsh;
}
struct GSH *
-gsh_init (int *argc, char ***argv)
+gsh_init(int *argc, char ***argv)
{
struct GSH *gsh;
- gsh = gsh_new_GSH ();
- gsh_stack_init (gsh, argc, argv);
+ gsh = gsh_new_GSH();
+ gsh_stack_init(gsh, argc, argv);
return gsh;
}
void
-gsh_stack_init (struct GSH * gsh, int *argc, char ***argv)
+gsh_stack_init(struct GSH * gsh, int *argc, char ***argv)
{
- gtk_init (argc, argv);
- gsh_GSH (gsh);
- gsh->window = gsh_create_main_window ();
+ gtk_init(argc, argv);
+ gsh_GSH(gsh);
+ gsh->window = gsh_create_main_window();
}
void
-gsh_widget_set_bg(GtkWidget * widget, int red, int green, int blue)
+gsh_widget_set_bg(GtkWidget *widget, int red, int green, int blue)
{
GdkColor color;
- color.red=red;
- color.green=green;
- color.blue=blue;
+ color.red = red;
+ color.green = green;
+ color.blue = blue;
gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &color);
}
-
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtkshell/gtkshell.h 25 Feb 2007 09:35:02 -0000 1.19
+++ gtkshell/gtkshell.h 28 Feb 2007 03:53:51 -0000 1.20
@@ -85,16 +85,15 @@
#include "dragdrop.h"
void
- gsh_stack_init (struct GSH * gsh, int *argc, char ***argv);
+ gsh_stack_init(struct GSH * gsh, int *argc, char ***argv);
struct GSH *
- gsh_init (int *argc, char ***argv);
+ gsh_init(int *argc, char ***argv);
GtkWidget *
- gsh_create_main_window ();
+ gsh_create_main_window();
void
gsh_widget_set_bg(GtkWidget *widget, int red, int green, int blue);
-
#endif
Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/label.c 26 Feb 2007 16:39:42 -0000 1.11
+++ gtkshell/label.c 28 Feb 2007 03:53:51 -0000 1.12
@@ -26,57 +26,58 @@
static void
set_options(struct GSH * gsh, GtkWidget *label)
{
- gtk_label_set_single_line_mode (GTK_LABEL (label), FALSE);
+ gtk_label_set_single_line_mode(GTK_LABEL(label), FALSE);
ARIFB(gsh->flags.horizontal_labels)
- gtk_label_set_angle (GTK_LABEL (label), 90.0);
+ gtk_label_set_angle(GTK_LABEL(label), 90.0);
else
{
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
}
gsh_widget_set_font_mono(label);
}
GtkWidget *
-gsh_add_label (struct GSH * gsh, char *text)
+gsh_add_label(struct GSH * gsh, char *text)
{
GtkWidget *label;
GtkWidget *to_be_managed;
ARPASSERT(gsh);
- label = gtk_label_new (text);
+ label = gtk_label_new(text);
ARPASSERT(label);
set_options(gsh, label);
- if(gsh->flags.framed_labels)
+ if (gsh->flags.framed_labels)
{
GtkWidget *frame;
- frame=gtk_frame_new(NULL);
+ frame = gtk_frame_new(NULL);
gtk_container_add(GTK_CONTAINER(frame), label);
gtk_widget_show(label);
- to_be_managed=frame;
+ to_be_managed = frame;
}
else
- to_be_managed=label;
+ to_be_managed = label;
- /* This uses expanded management, as the label may be displaying a large
- text area. */
- gsh_manage (gsh, to_be_managed);
+ /*
+ * This uses expanded management, as the label may be
+ * displaying a large text area.
+ */
+ gsh_manage(gsh, to_be_managed);
return label;
}
void
-gsh_set_label (GtkWidget * label, char *text)
+gsh_set_label(GtkWidget *label, char *text)
{
ARPASSERT(label);
/* Text is not checked, as empty labels are allowed. */
- gtk_label_set_text (GTK_LABEL (label), text);
+ gtk_label_set_text(GTK_LABEL(label), text);
}
-
Index: gtkshell/label.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/label.h 20 Feb 2007 04:29:43 -0000 1.4
+++ gtkshell/label.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,8 +24,9 @@
#define GSH_LABEL_H
GtkWidget *
- gsh_add_label (struct GSH * gsh, char *text);
+ gsh_add_label(struct GSH * gsh, char *text);
void
- gsh_set_label (GtkWidget * label, char *text);
+ gsh_set_label(GtkWidget *label, char *text);
+
#endif
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/main.c 23 Feb 2007 03:11:52 -0000 1.9
+++ gtkshell/main.c 28 Feb 2007 03:53:51 -0000 1.10
@@ -23,11 +23,13 @@
#include "gtkshell.h"
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
- struct GSH gsh; // Store application structure on stack.
+ struct GSH gsh;
- gsh_stack_init (&gsh, &argc, &argv);
+ //Store application structure on stack.
+
+ gsh_stack_init(&gsh, &argc, &argv);
#ifdef DEBUG
g_debug("rows:\t%d\n", gsh.rows.rows);
@@ -36,18 +38,18 @@
gsh.flags.dont_scroll =
(((argc > 1)
- && (strlen (argv[1]) == 3))
- && !strncmp (argv[1], "-os", 3))
+ && (strlen(argv[1]) == 3))
+ && !strncmp(argv[1], "-os", 3))
? TRUE : FALSE;
- gsh_setup_containers (&gsh);
- gsh_parse_arguments (&gsh, argc, argv);
+ gsh_setup_containers(&gsh);
+ gsh_parse_arguments(&gsh, argc, argv);
- gsh_check_and_set_geometry (&gsh);
+ gsh_check_and_set_geometry(&gsh);
- gtk_widget_show (gsh.window);
+ gtk_widget_show(gsh.window);
- gtk_main ();
+ gtk_main();
return (EXIT_SUCCESS);
}
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/option_options.c 26 Feb 2007 16:39:42 -0000 1.10
+++ gtkshell/option_options.c 28 Feb 2007 03:53:51 -0000 1.11
@@ -23,12 +23,13 @@
#include "gtkshell.h"
void
-gsh_handle_option_arguments (struct GSH * gsh, int argc, char **argv,
+gsh_handle_option_arguments(struct GSH * gsh, int argc, char **argv,
int *counter)
{
switch (argv[(*counter)][2])
{
- case 'E': /* Make a text entry simpley print the text. */
+ case 'E': /* Make a text entry simpley print the
+ * text. */
gsh->flags.prompt_echoes = TRUE;
break;
case 'e':
@@ -38,12 +39,12 @@
gsh->flags.framed_labels = TRUE;
break;
case 'g':
- gsh_count (argc, counter);
+ gsh_count(argc, counter);
ARIFP(gsh->geometry)
- free (gsh->geometry);
+ free(gsh->geometry);
- ar_asprintf (&gsh->geometry, "%s", argv[(*counter)]);
+ ar_asprintf(&gsh->geometry, "%s", argv[(*counter)]);
break;
case 'h':
@@ -51,21 +52,21 @@
break;
case 'n':
- gtk_window_set_decorated (GTK_WINDOW (gsh->window),
+ gtk_window_set_decorated(GTK_WINDOW(gsh->window),
FALSE);
gtk_window_set_skip_taskbar_hint
- (GTK_WINDOW (gsh->window), TRUE);
+ (GTK_WINDOW(gsh->window), TRUE);
break;
case 'r':
- gsh_count (argc, counter);
+ gsh_count(argc, counter);
gsh->rows.rows =
- (unsigned int) atoi (argv[(*counter)]);
+ (unsigned int) atoi(argv[(*counter)]);
break;
case 'u':
- gsh_count (argc, counter);
- gsh->update.period = atoi (argv[*counter]);
+ gsh_count(argc, counter);
+ gsh->update.period = atoi(argv[*counter]);
break;
}
}
Index: gtkshell/option_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/option_options.h 20 Feb 2007 04:29:43 -0000 1.4
+++ gtkshell/option_options.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,6 +24,7 @@
#define GSH_OPTION_OPTIONS_H
void
-gsh_handle_option_arguments (
+gsh_handle_option_arguments(
struct GSH * gsh, int argc, char **argv, int *counter);
+
#endif
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/options.c 27 Feb 2007 23:38:35 -0000 1.9
+++ gtkshell/options.c 28 Feb 2007 03:53:51 -0000 1.10
@@ -26,29 +26,29 @@
inline
#endif /* _GNU_SOURCE */
void
-gsh_count (int argc, int *counter)
+gsh_count(int argc, int *counter)
{
(*counter)++;
- g_assert ((*counter) <= argc);
+ g_assert((*counter) <= argc);
}
void
-gsh_handle_switch_arguments (struct GSH * gsh, int argc,
+gsh_handle_switch_arguments(struct GSH * gsh, int argc,
char **argv, int *counter)
{
- gsh_check_row (gsh);
+ gsh_check_row(gsh);
switch (argv[*counter][1])
{
case 'a':
- gsh_handle_add_arguments (gsh, argc, argv, counter);
+ gsh_handle_add_arguments(gsh, argc, argv, counter);
break;
case 'd':
- gsh_handle_dialog_arguments (gsh, argc, argv, counter);
+ gsh_handle_dialog_arguments(gsh, argc, argv, counter);
break;
case 'o':
- gsh_handle_option_arguments (gsh, argc, argv, counter);
+ gsh_handle_option_arguments(gsh, argc, argv, counter);
break;
default:
- g_warning ("%s: %s undefined\n", argv[0], argv[(*counter)]);
+ g_warning("%s: %s undefined\n", argv[0], argv[(*counter)]);
}
}
Index: gtkshell/options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/options.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/options.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -26,8 +26,9 @@
#include "gtkshell.h"
void
- gsh_count (int argc, int *counter);
+ gsh_count(int argc, int *counter);
void
- gsh_handle_switch_arguments (struct GSH * gsh, int argc, char **argv, int
*counter);
+ gsh_handle_switch_arguments(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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/row.c 23 Feb 2007 03:11:52 -0000 1.10
+++ gtkshell/row.c 28 Feb 2007 03:53:51 -0000 1.11
@@ -23,62 +23,65 @@
#include "gtkshell.h"
static void
-gsh_manage_generic (struct GSH * gsh, GtkWidget * widget)
+gsh_manage_generic(struct GSH * gsh, GtkWidget *widget)
{
#ifdef DEBUG
- ARBUG ("gsh_manage()");
+ ARBUG("gsh_manage()");
#endif /* DEBUG */
- gtk_widget_show (widget);
+ gtk_widget_show(widget);
gsh->rows.row++;
#ifdef DEBUG
- g_debug ("==> gsh_row: %d, gsh_rows: %d",
+ g_debug("==> gsh_row: %d, gsh_rows: %d",
gsh->rows.row, gsh->rows.rows);
#endif /* DEBUG */
}
void
-gsh_manage (struct GSH * gsh, GtkWidget * widget)
+gsh_manage(struct GSH * gsh, GtkWidget *widget)
{
- gsh_check_row (gsh);
- gtk_container_add (GTK_CONTAINER (gsh->rows.v), widget);
- gsh_manage_generic (gsh, widget);
+ gsh_check_row(gsh);
+ gtk_container_add(GTK_CONTAINER(gsh->rows.v), widget);
+ gsh_manage_generic(gsh, widget);
}
void
-gsh_manage_unexpanded (struct GSH * gsh, GtkWidget * widget)
+gsh_manage_unexpanded(struct GSH * gsh, GtkWidget *widget)
{
- /* Checking for a 1 row counter allows the ACE Deskbar to maintain a decent
- appearance. */
+
+ /*
+ * Checking for a 1 row counter allows the ACE Deskbar to
+ * maintain a decent appearance.
+ */
if (gsh->rows.rows != 1)
{
- gsh_check_row (gsh);
- gtk_box_pack_start (GTK_BOX (gsh->rows.v), widget,
+ gsh_check_row(gsh);
+ gtk_box_pack_start(GTK_BOX(gsh->rows.v), widget,
FALSE, FALSE, 0);
- gsh_manage_generic (gsh, widget);
+ gsh_manage_generic(gsh, widget);
}
else
- gsh_manage (gsh, widget);
+ gsh_manage(gsh, widget);
}
void
-gsh_new_row (struct GSH * gsh)
+gsh_new_row(struct GSH * gsh)
{
- 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.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 = 0;
}
void
-gsh_check_row (struct GSH * gsh)
+gsh_check_row(struct GSH * gsh)
{
#ifdef DEBUG
- ARBUG ("gsh_check_row()");
- g_debug ("==> gsh_row: %d, gsh_rows: %d",
+ ARBUG("gsh_check_row()");
+ g_debug("==> gsh_row: %d, gsh_rows: %d",
gsh->rows.row, gsh->rows.rows);
#endif
@@ -86,9 +89,9 @@
{
#ifdef DEBUG
- ARBUG ("new row");
+ ARBUG("new row");
#endif
- gsh_new_row (gsh);
+ gsh_new_row(gsh);
}
}
Index: gtkshell/row.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/row.h 20 Feb 2007 04:29:43 -0000 1.6
+++ gtkshell/row.h 28 Feb 2007 03:53:51 -0000 1.7
@@ -24,15 +24,16 @@
#define GSH_ROW_H
void
- gsh_manage (struct GSH * gsh, GtkWidget * widget);
+ gsh_manage(struct GSH * gsh, GtkWidget *widget);
void
- gsh_manage_unexpanded (struct GSH * gsh, GtkWidget * widget);
+ gsh_manage_unexpanded(struct GSH * gsh, GtkWidget *widget);
void
- gsh_new_row (struct GSH * gsh);
+ gsh_new_row(struct GSH * gsh);
void
- gsh_check_row (struct GSH * gsh);
+ 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/text.c 23 Feb 2007 19:15:05 -0000 1.11
+++ gtkshell/text.c 28 Feb 2007 03:53:51 -0000 1.12
@@ -23,7 +23,7 @@
#include "gtkshell.h"
GtkWidget *
-gsh_setup_command_entry (struct GSH * gsh, char *command)
+gsh_setup_command_entry(struct GSH * gsh, char *command)
{
GtkWidget *entry;
struct GSH_CBData *cb;
@@ -31,44 +31,46 @@
ARPASSERT(gsh);
/* Set up callback data. */
- cb = (struct GSH_CBData *) xmalloc (sizeof (struct GSH_CBData));
+ cb = (struct GSH_CBData *) xmalloc(sizeof(struct GSH_CBData));
cb->gsh = gsh;
- /*ARIFP(command)
- asprintf ((char **) &cb->data, "%s", command);
- else
- asprintf ((char **) &cb->data, "echo");*/
+
+ /*
+ * ARIFP(command) asprintf ((char **) &cb->data, "%s",
+ * command); else asprintf ((char **) &cb->data, "echo");
+ */
ARIFP(command)
- cb->data=command; /* Static storage, will not pass out of
scope. */
+ cb->data = command; /* Static storage, will not
+ * pass out of scope. */
else
- cb->data="echo"; /* Literal */
+ cb->data = "echo"; /* Literal */
/* Create widget. */
- entry = gtk_entry_new ();
+ entry = gtk_entry_new();
- /address@hidden/
- (void)g_signal_connect (G_OBJECT (entry), "activate",
- G_CALLBACK (entry_cb), (gpointer) cb);
+ /* @null */
+ (void) g_signal_connect(G_OBJECT(entry), "activate",
+ G_CALLBACK(entry_cb), (gpointer) cb);
/* Do not fill remaining container area. */
- gsh_manage_unexpanded (gsh, entry);
+ gsh_manage_unexpanded(gsh, entry);
return (entry);
}
GtkWidget *
-gsh_text_area (struct GSH * gsh)
+gsh_text_area(struct GSH * gsh)
{
GtkWidget *text;
- text = gtk_text_view_new ();
- gsh_manage (gsh, text);
+ text = gtk_text_view_new();
+ gsh_manage(gsh, text);
return text;
}
/* This is currently just a text file viewer. */
void
-gsh_text_editor (struct GSH * gsh, char *filename)
+gsh_text_editor(struct GSH * gsh, char *filename)
{
GtkWidget *text;
GtkTextBuffer *buffer;
@@ -79,29 +81,28 @@
ARPASSERT(gsh);
- text = gsh_text_area (gsh);
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
+ text = gsh_text_area(gsh);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
ARPASSERT(filename);
- file = fopen (filename, "r");
+ file = fopen(filename, "r");
ARWIFNP(file)
{
- while ((read = fread (buf, sizeof (char), BUFSIZ, file)) != 0)
+ while ((read = fread(buf, sizeof(char), BUFSIZ, file)) != 0)
{
- /address@hidden/
- gtk_text_buffer_get_end_iter (buffer, &iter);
- gtk_text_buffer_insert (buffer, &iter, buf, (gint)read);
+ /* @out */
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ gtk_text_buffer_insert(buffer, &iter, buf, (gint) read);
}
- (void)fclose (file);
+ (void) fclose(file);
}
ARIFNP(gsh->geometry)
- asprintf (&gsh->geometry, "775x700");
+ asprintf(&gsh->geometry, "775x700");
gsh_widget_set_font_mono(text);
}
-
Index: gtkshell/text.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/text.h 20 Feb 2007 04:29:43 -0000 1.4
+++ gtkshell/text.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,14 +24,15 @@
#define GSH_TEXT_H
GtkWidget *
- gsh_setup_command_entry (struct GSH * gsh, char *command);
+ gsh_setup_command_entry(struct GSH * gsh, char *command);
void
- gsh_setup_prompt_command_entry (struct GSH * gsh, char *command);
+ gsh_setup_prompt_command_entry(struct GSH * gsh, char *command);
GtkWidget *
- gsh_text_area (struct GSH * gsh);
+ gsh_text_area(struct GSH * gsh);
void
- gsh_text_editor (struct GSH * gsh, char *filename);
+ gsh_text_editor(struct GSH * gsh, char *filename);
+
#endif
Index: gtkshell/updated.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/updated.c 26 Feb 2007 16:39:42 -0000 1.9
+++ gtkshell/updated.c 28 Feb 2007 03:53:51 -0000 1.10
@@ -24,30 +24,30 @@
static void
-gsh_append_updater (struct GSH * gsh, gsh_updater_data * item)
+gsh_append_updater(struct GSH * gsh, gsh_updater_data * item)
{
#ifdef DEBUG
- ARBUG ("gsh_append_updater()");
+ ARBUG("gsh_append_updater()");
#endif /* DEBUG */
if ((gsh != NULL) && (item != NULL))
- gsh->update.list = g_slist_prepend (gsh->update.list, item);
+ gsh->update.list = g_slist_prepend(gsh->update.list, item);
#ifdef DEBUG
- ARBUG ("end gsh_append_updater()");
+ ARBUG("end gsh_append_updater()");
#endif /* DEBUG */
}
static void
-gsh_assign_updater (
+gsh_assign_updater(
gsh_updater_data * item,
void (*function) (gchar *, gpointer),
gchar *command, GtkWidget *widget)
{
/* Assign the values to ITEM's members. */
- asprintf (&item->command, "%s", command);
+ asprintf(&item->command, "%s", command);
/* No allocation necessary as these are duplicate pointers. */
@@ -56,7 +56,7 @@
}
void
-gsh_add_updater (
+gsh_add_updater(
struct GSH * gsh,
void (*function) (gchar *, gpointer),
gchar *command, GtkWidget *widget)
@@ -64,29 +64,34 @@
gsh_updater_data *item;
/* Allocate memory for ITEM cell. */
- item = (gsh_updater_data *) xmalloc (sizeof (gsh_updater_data));
+ item = (gsh_updater_data *) xmalloc(sizeof(gsh_updater_data));
/* Initialize. */
- gsh_assign_updater (item, function, command, widget);
+ gsh_assign_updater(item, function, command, widget);
/* Add to singly linked list. */
- gsh_append_updater (gsh, item);
+ gsh_append_updater(gsh, item);
}
static void
-gsh_update_each (gpointer data, gpointer user_data)
+gsh_update_each(gpointer data, gpointer user_data)
{
- UNUSED (user_data); /* USER_DATA is unused. */
+ UNUSED(user_data); /* USER_DATA is unused. */
- /* Ensure that the argument containing the structure is not empty. */
+ /*
+ * Ensure that the argument containing the structure is not
+ * empty.
+ */
ARIFP(data)
{
gsh_updater_data *item;
- /* Assign data to structure and call
- * function pointer with parameters. */
+ /*
+ * Assign data to structure and call function pointer
+ * with parameters.
+ */
item = (gsh_updater_data *) data;
ARPASSERT(item->function);
- item->function (item->command, item->widget);
+ item->function(item->command, item->widget);
}
else
{
@@ -95,19 +100,19 @@
}
static gint
-gsh_perform_updates (gpointer data)
+gsh_perform_updates(gpointer data)
{
struct GSH *gsh;
#ifdef DEBUG
- ARBUG ("gsh_perform_updates()");
+ ARBUG("gsh_perform_updates()");
#endif /* DEBUG */
gsh = (struct GSH *) data;
- if((gsh != NULL) && (gsh->update.list != NULL))
- g_slist_foreach (gsh->update.list, gsh_update_each, gsh);
+ if ((gsh != NULL) && (gsh->update.list != NULL))
+ g_slist_foreach(gsh->update.list, gsh_update_each, gsh);
else
{
ARWARN("data invalid, operation not performed.");
@@ -118,16 +123,17 @@
}
void
-gsh_start_updates (struct GSH * gsh)
+gsh_start_updates(struct GSH * gsh)
{
#ifdef DEBUG
- ARBUG ("gsh_start_updates()");
+ ARBUG("gsh_start_updates()");
#endif /* DEBUG */
- if(gsh != NULL)
+
+ if (gsh != NULL)
{
- (void)gsh_perform_updates (gsh);
- (void)g_timeout_add (gsh->update.period, gsh_perform_updates,
+ (void) gsh_perform_updates(gsh);
+ (void) g_timeout_add(gsh->update.period, gsh_perform_updates,
gsh);
}
else
Index: gtkshell/updated.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/updated.h 23 Feb 2007 03:11:52 -0000 1.5
+++ gtkshell/updated.h 28 Feb 2007 03:53:51 -0000 1.6
@@ -31,10 +31,11 @@
} gsh_updater_data;
void
-gsh_add_updater (struct GSH * gsh,
+gsh_add_updater(struct GSH * gsh,
void (*function) (char *, gpointer),
gchar *command, GtkWidget *widget);
void
- gsh_start_updates (struct GSH * gsh);
+ gsh_start_updates(struct GSH * gsh);
+
#endif
Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/updated_label.c 23 Feb 2007 03:11:52 -0000 1.11
+++ gtkshell/updated_label.c 28 Feb 2007 03:53:51 -0000 1.12
@@ -23,50 +23,53 @@
#include "gtkshell.h"
static void
-gsh_check_results (char **results)
+gsh_check_results(char **results)
{
- /* This ensures that the result string is not empty, avoiding certain
- formatting problems. */
+
+ /*
+ * This ensures that the result string is not empty, avoiding
+ * certain formatting problems.
+ */
/* Otherwise, a GTK warning and termination occurs. */
ARPASSERT(*results);
if (*results[0] == '\0')
{
- free (*results);
- asprintf (results, "(empty)");
+ free(*results);
+ asprintf(results, "(empty)");
}
}
static void
-gsh_update_label (char *command, gpointer widget)
+gsh_update_label(char *command, gpointer widget)
{
char *results;
#ifdef DEBUG
- ARBUG ("gsh_update_label()");
+ ARBUG("gsh_update_label()");
#endif /* DEBUG */
ARPASSERT(command);
ARPASSERT(widget);
- results = antiright_pipe_read (command);
- gsh_check_results (&results);
- gsh_set_label ((GtkWidget *) widget, results);
- free (results);
+ results = antiright_pipe_read(command);
+ gsh_check_results(&results);
+ gsh_set_label((GtkWidget *) widget, results);
+ free(results);
}
void
-gsh_add_updated_label (struct GSH * gsh, char *command)
+gsh_add_updated_label(struct GSH * gsh, char *command)
{
GtkWidget *widget;
#ifdef DEBUG
- g_message ("gsh_add_updated_label()");
+ g_message("gsh_add_updated_label()");
#endif /* DEBUG */
ARPASSERT(gsh);
ARPASSERT(command);
- widget = gsh_add_label (gsh, command);
- gsh_add_updater (gsh, &gsh_update_label, command, (gpointer) widget);
+ widget = gsh_add_label(gsh, command);
+ gsh_add_updater(gsh, &gsh_update_label, command, (gpointer) widget);
}
Index: gtkshell/updated_label.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/updated_label.h 23 Feb 2007 03:11:52 -0000 1.4
+++ gtkshell/updated_label.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,7 +24,6 @@
#define GSH_UPDATED_LABEL_H
void
- gsh_add_updated_label (struct GSH * gsh, char *command);
+ gsh_add_updated_label(struct GSH * gsh, char *command);
#endif /* GSH_UPDATED_LABEL_H */
-
Index: gtkshell/updated_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/updated_options.c 23 Feb 2007 03:11:52 -0000 1.7
+++ gtkshell/updated_options.c 28 Feb 2007 03:53:51 -0000 1.8
@@ -23,38 +23,38 @@
#include "gtkshell.h"
static void
-gsh_test_updating (struct GSH * gsh)
+gsh_test_updating(struct GSH * gsh)
{
ARPASSERT(gsh);
ARIFNB(gsh->flags.updating)
{
- gsh_start_updates (gsh);
+ gsh_start_updates(gsh);
gsh->flags.updating = TRUE;
}
}
static void
-gsh_updater_argument_generic (struct GSH * gsh, int argc, int *counter)
+gsh_updater_argument_generic(struct GSH * gsh, int argc, int *counter)
{
- gsh_count (argc, counter);
- gsh_test_updating (gsh);
+ gsh_count(argc, counter);
+ gsh_test_updating(gsh);
}
void
-gsh_handle_updated_arguments (struct GSH * gsh, int argc,
+gsh_handle_updated_arguments(struct GSH * gsh, int argc,
char **argv, int *counter)
{
- g_assert (strlen (argv[(*counter)]) > 2);
+ g_assert(strlen(argv[(*counter)]) > 2);
switch (argv[(*counter)][3])
{
case 'l':
- gsh_add_updated_label (gsh, argv[*counter + 1]);
- gsh_updater_argument_generic (gsh, argc, counter);
+ gsh_add_updated_label(gsh, argv[*counter + 1]);
+ gsh_updater_argument_generic(gsh, argc, counter);
break;
case 'p':
- gsh_add_updated_progress (gsh, argv[*counter + 1]);
- gsh_updater_argument_generic (gsh, 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/updated_options.h 20 Feb 2007 04:29:43 -0000 1.3
+++ gtkshell/updated_options.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -24,6 +24,7 @@
#define GSH_UPDATED_OPTIONS_H
void
-gsh_handle_updated_arguments (struct GSH * gsh, int argc,
+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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/updated_progress.c 23 Feb 2007 03:11:52 -0000 1.6
+++ gtkshell/updated_progress.c 28 Feb 2007 03:53:51 -0000 1.7
@@ -23,29 +23,29 @@
#include "gtkshell.h"
static void
-gsh_update_progress (gchar *command, gpointer widget)
+gsh_update_progress(gchar *command, gpointer widget)
{
gchar *results;
ARPASSERT(command);
ARPASSERT(widget);
- results = antiright_pipe_read (command);
+ results = antiright_pipe_read(command);
ARPASSERT(results);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR ((GtkWidget *) widget),
- strtod (results, NULL));
- free (results);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR((GtkWidget *) widget),
+ strtod(results, NULL));
+ free(results);
}
void
-gsh_add_updated_progress (struct GSH * gsh, gchar *command)
+gsh_add_updated_progress(struct GSH * gsh, gchar *command)
{
GtkWidget *widget;
ARPASSERT(gsh);
ARPASSERT(command);
- widget = gtk_progress_bar_new ();
- gsh_manage_unexpanded (gsh, widget);
- gsh_add_updater (gsh, &gsh_update_progress,
+ widget = gtk_progress_bar_new();
+ gsh_manage_unexpanded(gsh, widget);
+ gsh_add_updater(gsh, &gsh_update_progress,
command, widget);
}
Index: gtkshell/updated_progress.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/updated_progress.h 23 Feb 2007 03:11:52 -0000 1.4
+++ gtkshell/updated_progress.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,6 +24,6 @@
#define GSH_UPDATED_PROGRESS_H
void
- gsh_add_updated_progress (struct GSH * gsh, gchar *command);
+ gsh_add_updated_progress(struct GSH * gsh, gchar *command);
#endif
Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libantiright/library.h 24 Feb 2007 00:05:26 -0000 1.9
+++ libantiright/library.h 28 Feb 2007 03:53:51 -0000 1.10
@@ -74,5 +74,4 @@
ARIFNP(x) \
ARWARN("NULL data passed, operation not performed"); \
else
-
#endif /* LIBAR_LIBRARY_H */
Index: libantiright/pipe.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/pipe.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libantiright/pipe.c 23 Feb 2007 21:23:27 -0000 1.4
+++ libantiright/pipe.c 28 Feb 2007 03:53:51 -0000 1.5
@@ -25,7 +25,7 @@
/* Make sure that you free the returned string. */
char *
-antiright_pipe_read (char *command_string)
+antiright_pipe_read(char *command_string)
{
/* Declare. */
@@ -36,25 +36,25 @@
/* Initialize. */
- read=0;
- total=0;
- text_string=NULL;
+ read = 0;
+ total = 0;
+ text_string = NULL;
ARPASSERT(command_string);
/* Execute the command indicated by command_string. */
/* Pipe is read-only. Stdout will be directed to it. */
- pipe = popen (command_string, "r");
+ pipe = popen(command_string, "r");
ARPASSERT(pipe);
ar_asprintf(&text_string, "\0");
/* Read the command's stdout. */
- while((read = fread (buffer, sizeof (char), BUFSIZ, pipe)) != 0)
+ while ((read = fread(buffer, sizeof(char), BUFSIZ, pipe)) != 0)
{
total += read;
- text_string = (char*) realloc (text_string, total * sizeof (char));
+ text_string = (char *) realloc(text_string, total *
sizeof(char));
ARPASSERT(text_string);
/* buffer[read-1]='\0'; */
@@ -62,7 +62,7 @@
}
/* Close the pipe once fgets() returns a false condition. */
- (void) pclose (pipe);
+ (void) pclose(pipe);
return (text_string);
}
Index: libantiright/pipe.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/pipe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libantiright/pipe.h 20 Feb 2007 04:29:43 -0000 1.2
+++ libantiright/pipe.h 28 Feb 2007 03:53:51 -0000 1.3
@@ -1,28 +1,28 @@
-/* AntiRight
- (c) 2002-2006 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
-*/
+/*
+ * AntiRight (c) 2002-2006 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 LIBAR_PIPE_H
#define LIBAR_PIPE_H
char *
- antiright_pipe_read (char *command_string);
+ antiright_pipe_read(char *command_string);
+
/* void */
/* antiright_pipe_write(char *command_string, char* data); */
/* void */
Index: libantiright/string.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libantiright/string.c 23 Feb 2007 21:23:27 -0000 1.4
+++ libantiright/string.c 28 Feb 2007 03:53:51 -0000 1.5
@@ -23,14 +23,14 @@
#include "library.h"
gint
-ar_asprintf(gchar **string, const gchar *format, ...)
+ar_asprintf(gchar **string, const gchar *format,...)
{
va_list list;
gint return_value;
- va_start (list, format);
- return_value = g_vasprintf (string, format, list);
- va_end (list);
+ va_start(list, format);
+ return_value = g_vasprintf(string, format, list);
+ va_end(list);
return return_value;
}
@@ -38,13 +38,13 @@
/* Free the returned value! */
/* (This is rather scary) */
char *
-antiright_beautified_label (char *current_argument_string)
+antiright_beautified_label(char *current_argument_string)
{
- char *label_string = xmalloc (strlen (current_argument_string));
+ char *label_string = xmalloc(strlen(current_argument_string));
int parse_counter;
int label_counter;
- for (parse_counter = strlen (current_argument_string);
+ for (parse_counter = strlen(current_argument_string);
((current_argument_string[parse_counter]) != ' ' && (parse_counter > 0));
parse_counter--);
@@ -54,7 +54,8 @@
{
if (current_argument_string[parse_counter] == ' ')
{
- parse_counter++; /* This gets rid of an extra leading space. */
+ parse_counter++; /* This gets rid of an
+ * extra leading space. */
}
if (current_argument_string[parse_counter] != '_')
{
Index: libantiright/string.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libantiright/string.h 23 Feb 2007 22:52:36 -0000 1.3
+++ libantiright/string.h 28 Feb 2007 03:53:51 -0000 1.4
@@ -24,14 +24,23 @@
#define LIBAR_STRING_H
gint
- ar_asprintf(gchar **string, const gchar *format, ...);
+ ar_asprintf(gchar **string, const gchar *format,...);
char *
- antiright_beautified_label (char *current_argument_string);
+ antiright_beautified_label(char *current_argument_string);
+
/* char* */
-/* antiright_insert_string(char *text, char *insertion, unsigned int
position); */
+
+/*
+ * antiright_insert_string(char *text, char *insertion, unsigned int
+ * position);
+ */
/* char* */
-/* antiright_delete_range(char *text, unsigned int start, unsigned int end); */
+
+/*
+ * antiright_delete_range(char *text, unsigned int start, unsigned int
+ * end);
+ */
/* char* */
/* ar_insert_txt(char* source, char* text, unsigned int position); */
#endif
Index: libantiright/system.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/system.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libantiright/system.c 23 Feb 2007 21:23:27 -0000 1.6
+++ libantiright/system.c 28 Feb 2007 03:53:51 -0000 1.7
@@ -26,8 +26,9 @@
must_reformat(char *field_string)
{
size_t length;
- length=strlen(field_string);
- if(field_string[length-1] != '&')
+
+ length = strlen(field_string);
+ if (field_string[length - 1] != '&')
return TRUE;
else
return FALSE;
@@ -47,16 +48,16 @@
}
int
-antiright_system (char *field_string)
+antiright_system(char *field_string)
{
/* Ensure that FIELD_STRING is not empty. */
ARIFP(field_string)
{
char *command;
- command=get_command_string(field_string);
+ command = get_command_string(field_string);
- if(system(command) == 0)
+ if (system(command) == 0)
{
g_free(command);
@@ -65,7 +66,7 @@
else
{
g_free(command);
- ARWARN ("command could not be executed");
+ ARWARN("command could not be executed");
return EXIT_FAILURE;
}
@@ -73,32 +74,32 @@
else
{
/* The user input is empty, so generate an error. */
- ARWARN ("field_string is NULL");
+ ARWARN("field_string is NULL");
return (EXIT_FAILURE);
}
}
int
-vsysprintf (const char *format, va_list list)
+vsysprintf(const char *format, va_list list)
{
char *command;
int return_value;
- g_vasprintf (&command, format, list);
- return_value = antiright_system (command);
- g_free (command);
+ g_vasprintf(&command, format, list);
+ return_value = antiright_system(command);
+ g_free(command);
return (return_value);
}
int
-sysprintf (const char *format, ...)
+sysprintf(const char *format,...)
{
va_list list;
int return_value;
- va_start (list, format);
- return_value = vsysprintf (format, list);
- va_end (list);
+ va_start(list, format);
+ return_value = vsysprintf(format, list);
+ va_end(list);
return (return_value);
}
Index: libantiright/system.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/system.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libantiright/system.h 23 Feb 2007 21:23:27 -0000 1.4
+++ libantiright/system.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,11 +24,12 @@
#define LIBAR_SYSTEM_H
int
- antiright_system (char *field_string);
+ antiright_system(char *field_string);
int
- sysprintf (const char *format,...);
+ sysprintf(const char *format,...);
int
- vsysprintf (const char *format, va_list list);
+ vsysprintf(const char *format, va_list list);
+
#endif /* LIBAR_SYSTEM_H */
Index: libantiright/util.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libantiright/util.c 23 Feb 2007 15:57:53 -0000 1.8
+++ libantiright/util.c 28 Feb 2007 03:53:51 -0000 1.9
@@ -23,22 +23,25 @@
#include "library.h"
gpointer
-xmalloc (size_t size)
+xmalloc(size_t size)
{
- /* There is no need to check for success, as g_malloc causes the
- application to terminate on failure. */
- return (g_malloc (size));
+ /*
+ * There is no need to check for success, as g_malloc causes
+ * the application to terminate on failure.
+ */
+
+ return (g_malloc(size));
}
void
-rand_seed ()
+rand_seed()
{
- srandom ((unsigned int) time (NULL));
+ srandom((unsigned int) time(NULL));
}
int
-rand_ranged (int start, int finish)
+rand_ranged(int start, int finish)
{
- return random () % (finish - start) + start;
+ return random() % (finish - start) + start;
}
Index: libantiright/util.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libantiright/util.h 20 Feb 2007 04:29:43 -0000 1.4
+++ libantiright/util.h 28 Feb 2007 03:53:51 -0000 1.5
@@ -24,13 +24,14 @@
#define LIBAR_UTIL_H
gpointer
-xmalloc (size_t size);
+ xmalloc(size_t size);
#define UNUSED(arg) { arg = arg; }
void
- rand_seed ();
+ rand_seed();
int
- rand_ranged (int start, int finish);
+ rand_ranged(int start, int finish);
+
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright doc/indent.pro gshterm/command_line.c...,
Jeffrey Bedard <=