[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/dateload.c gshterm/comman...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/dateload.c gshterm/comman... |
|
Date: |
Tue, 20 Feb 2007 04:29:43 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/20 04:29:43
Modified files:
ACE-desktop : dateload.c
gshterm : command_line.c command_line.h gshterm.c
gshterm.h main.c script.c script.h
gtkshell : 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
file_dialog.c file_dialog.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
Added files:
doc : indent.pro
Log message:
Reindented all sources. Added indentation profile to doc dir.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/dateload.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/doc/indent.pro?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/script.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/script.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/pipe.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/pipe.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.h?cvsroot=antiright&r1=1.3&r2=1.4
Patches:
Index: ACE-desktop/dateload.c
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/dateload.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ACE-desktop/dateload.c 20 Feb 2007 03:59:50 -0000 1.6
+++ ACE-desktop/dateload.c 20 Feb 2007 04:29:42 -0000 1.7
@@ -3,26 +3,26 @@
#include <time.h>
#include "../libantiright/library.h"
-int main(int argc, char **argv)
+int
+main (int argc, char **argv)
{
char *date;
double loadavg[3];
time_t time_data;
- UNUSED(argc);
- UNUSED(argv);
+ UNUSED (argc);
+ UNUSED (argv);
- time(&time_data);
- date=ctime(&time_data);
- /* Get rid of newline. DATE has constant width,
- according to ctime documentation, so position
- is uniform. */
- date[24]='\0';
+ time (&time_data);
+ date = ctime (&time_data);
+ /* Get rid of newline. DATE has constant width, according to ctime
+ documentation, so position is uniform. */
+ date[24] = '\0';
- getloadavg(loadavg, 3);
+ getloadavg (loadavg, 3);
- g_print("%s \n%.2f, %.2f, %.2f",
+ g_print ("%s \n%.2f, %.2f, %.2f",
date, loadavg[0], loadavg[1], loadavg[2]);
- return(0);
+ return (0);
}
Index: gshterm/command_line.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gshterm/command_line.c 13 Feb 2007 03:23:28 -0000 1.2
+++ gshterm/command_line.c 20 Feb 2007 04:29:43 -0000 1.3
@@ -23,75 +23,74 @@
#include "gshterm.h"
extern char *gsh_geometry;
-char *gshterm_font=NULL;
+char *gshterm_font = NULL;
-char*
-gshterm_construct_command(struct GSHTerm *term, int argc, char **argv)
+char *
+gshterm_construct_command (struct GSHTerm * term, int argc, char **argv)
{
gchar *command;
- command=""; /* Initialize to empty for
- the first concatenation. */
+ command = ""; /* Initialize to empty for the first
+ concatenation. */
- if(!gshterm_construct_command_from_args(
+ if (!gshterm_construct_command_from_args (
term, argc, argv, &command))
- asprintf(&command, "/bin/sh");
+ asprintf (&command, "/bin/sh");
- return(command);
+ 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)
{
- assert(arg);
+ assert (arg);
#ifdef DEBUG
- putchar(option);
+ putchar (option);
#endif /* DEBUG */
- switch(option)
+ switch (option)
{
case 'e':
return TRUE;
break;
case 'f':
- asprintf(&term->font, arg);
+ asprintf (&term->font, arg);
break;
case 'g':
- asprintf(&term->gsh->geometry, arg);
+ asprintf (&term->gsh->geometry, arg);
break;
default:
- g_printerr("unknown option: %c\n", option);
+ g_printerr ("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++)
+ for (counter = 1, exec_reached = FALSE; counter < argc; counter++)
{
- if(exec_reached)
- asprintf(command, "%s %s ", *command, argv[counter]);
- else if(argv[counter][0] == '-')
- exec_reached=gshterm_handle_command_line_option(
- term, argv[counter][1], argv[counter+1]);
+ if (exec_reached)
+ asprintf (command, "%s %s ", *command, argv[counter]);
+ else if (argv[counter][0] == '-')
+ 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 */
}
- return(exec_reached);
+ return (exec_reached);
}
-
-
Index: gshterm/command_line.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gshterm/command_line.h 13 Feb 2007 03:23:28 -0000 1.2
+++ gshterm/command_line.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -26,11 +26,9 @@
#include "gshterm.h"
gboolean
-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_from_args (
+ struct GSHTerm * term, int argc, char **argv, gchar ** command);
+char *
+ 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gshterm/gshterm.c 17 Feb 2007 23:59:37 -0000 1.6
+++ gshterm/gshterm.c 20 Feb 2007 04:29:43 -0000 1.7
@@ -23,34 +23,33 @@
#include "gshterm.h"
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);
- if(!term->font)
- asprintf(&term->font, "Mono 18");
- vte_terminal_set_font_from_string(VTE_TERMINAL(term->widget),
term->font);
- free(term->font);
- vte_terminal_set_background_transparent(
- VTE_TERMINAL(term->widget), TRUE);
+ if (!term->font)
+ asprintf (&term->font, "Mono 18");
+ vte_terminal_set_font_from_string (VTE_TERMINAL (term->widget), term->font);
+ free (term->font);
+ 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
- assert(term);
- assert(term->gsh);
- assert(term->gsh->window);
+ assert (term);
+ assert (term->gsh);
+ assert (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);
- return(term);
+ 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);
}
-
-
Index: gshterm/gshterm.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gshterm/gshterm.h 18 Feb 2007 00:02:06 -0000 1.5
+++ gshterm/gshterm.h 20 Feb 2007 04:29:43 -0000 1.6
@@ -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 GSHTERM_H
#define GSHTERM_H
@@ -38,10 +39,8 @@
#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 ();
#endif
-
Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gshterm/main.c 18 Feb 2007 00:01:26 -0000 1.7
+++ gshterm/main.c 20 Feb 2007 04:29:43 -0000 1.8
@@ -25,56 +25,55 @@
struct GSHTerm *
-gshterm_init_and_script(int *argc, char ***argv)
+gshterm_init_and_script (int *argc, char ***argv)
{
struct GSHTerm *term;
- term=(struct GSHTerm *)xmalloc(sizeof(struct GSHTerm));
+ term = (struct GSHTerm *) xmalloc (sizeof (struct GSHTerm));
- term->gsh=gsh_init(argc, argv);
+ term->gsh = gsh_init (argc, argv);
#ifdef DEBUG
- assert(term->gsh);
- assert(term->gsh->window);
+ assert (term->gsh);
+ assert (term->gsh->window);
#endif /* DEBUG */
- term->script=gshterm_command_script(
- gshterm_construct_command(term, *argc, *argv));
+ term->script = gshterm_command_script (
+ gshterm_construct_command (term, *argc, *argv));
- return(term);
+ return (term);
}
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_setup_terminal(term);
- gsh_check_and_set_geometry(term->gsh);
- g_signal_connect(G_OBJECT(term->widget), "child-exited",
- G_CALLBACK(gtk_main_quit), NULL);
+ term = gshterm_init_and_script (&argc, &argv);
+ term = gshterm_setup_terminal (term);
+ gsh_check_and_set_geometry (term->gsh);
+ 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), term->script, NULL, NULL, NULL,
+ vte_terminal_fork_command (
+ VTE_TERMINAL (term->widget), term->script, NULL, NULL, NULL,
TRUE, TRUE, TRUE);
- script=term->script;
+ 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);
+ return (0);
}
-
Index: gshterm/script.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/script.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gshterm/script.c 9 Feb 2007 16:02:03 -0000 1.1
+++ gshterm/script.c 20 Feb 2007 04:29:43 -0000 1.2
@@ -22,8 +22,8 @@
#include "gshterm.h"
-char*
-gshterm_command_script(char *command)
+char *
+gshterm_command_script (char *command)
{
char *script_name;
pid_t pid;
@@ -31,17 +31,15 @@
/* This is a workaround for vte's fscking up of option arrays. */
- pid=getpid();
+ pid = getpid ();
- asprintf(&script_name, "/tmp/gshterm.%d", (int)pid);
+ asprintf (&script_name, "/tmp/gshterm.%d", (int) pid);
- sysprintf("echo '#!/bin/sh' > %s", script_name);
- sysprintf("echo %s >> %s", command, script_name);
- free(command);
- sysprintf("chmod +x %s", script_name);
- sysprintf("cat %s", script_name);
+ sysprintf ("echo '#!/bin/sh' > %s", script_name);
+ sysprintf ("echo %s >> %s", command, script_name);
+ free (command);
+ sysprintf ("chmod +x %s", script_name);
+ sysprintf ("cat %s", script_name);
- return(script_name);
+ return (script_name);
}
-
-
Index: gshterm/script.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/script.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gshterm/script.h 9 Feb 2007 16:02:03 -0000 1.1
+++ gshterm/script.h 20 Feb 2007 04:29:43 -0000 1.2
@@ -23,8 +23,6 @@
#ifndef GSHTERM_SCRIPT_H
#define GSHTERM_SCRIPT_H
-char*
-gshterm_command_script(char *command);
-
+char *
+ gshterm_command_script (char *command);
#endif /* GSHTERM_SCRIPT_H */
-
Index: gtkshell/add_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/add_options.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/add_options.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -26,7 +26,5 @@
#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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/arguments.c 12 Feb 2007 16:36:56 -0000 1.3
+++ gtkshell/arguments.c 20 Feb 2007 04:29:43 -0000 1.4
@@ -23,7 +23,7 @@
#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;
@@ -31,12 +31,11 @@
{
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/arguments.h 13 Feb 2007 03:23:28 -0000 1.3
+++ gtkshell/arguments.h 20 Feb 2007 04:29:43 -0000 1.4
@@ -26,9 +26,8 @@
#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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/button.c 19 Feb 2007 20:58:07 -0000 1.7
+++ gtkshell/button.c 20 Feb 2007 04:29:43 -0000 1.8
@@ -25,42 +25,41 @@
GtkWidget *gsh_button;
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->gsh=gsh;
+ cb = (struct GSH_CBData *) xmalloc (sizeof (struct GSH_CBData));
+ cb->gsh = gsh;
- asprintf((char **)&cb->data, "%s", command);
- label_text = antiright_beautified_label(command);
- gsh->button = gtk_button_new_with_label(label_text);
- free(label_text);
+ asprintf ((char **) &cb->data, "%s", command);
+ label_text = antiright_beautified_label (command);
+ gsh->button = gtk_button_new_with_label (label_text);
+ free (label_text);
- g_signal_connect(G_OBJECT(gsh->button), "clicked",
- G_CALLBACK(system_cb), cb);
+ 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/button.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/button.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -19,13 +19,13 @@
along with AntiRight; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+
#ifndef GSH_BUTTON_H
#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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/callbacks.c 20 Feb 2007 03:59:50 -0000 1.5
+++ gtkshell/callbacks.c 20 Feb 2007 04:29:43 -0000 1.6
@@ -23,42 +23,41 @@
#include "gtkshell.h"
void
-gsh_test_exit(struct GSH *gsh)
+gsh_test_exit (struct GSH * gsh)
{
if (gsh->flags.button_exits)
- exit(0);
+ exit (0);
}
void
-system_cb(GtkWidget * widget, gpointer data)
+system_cb (GtkWidget * widget, gpointer data)
{
struct GSH_CBData *cb;
- cb=(struct GSH_CBData *)data;
+ cb = (struct GSH_CBData *) data;
- UNUSED(widget);
+ UNUSED (widget);
- antiright_system(cb->data);
- gsh_test_exit(cb->gsh);
+ 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;
- cb=(struct GSH_CBData *)data;
+ cb = (struct GSH_CBData *) data;
- input = gtk_entry_get_text(GTK_ENTRY(widget));
+ input = gtk_entry_get_text (GTK_ENTRY (widget));
- if(cb->gsh->flags.prompt_echoes)
- g_print("%s\n", input);
+ if (cb->gsh->flags.prompt_echoes)
+ g_print ("%s\n", input);
else
- sysprintf("%s %s", (char *) cb->data, (char *) input);
+ sysprintf ("%s %s", (char *) cb->data, (char *) input);
- if(cb->gsh->flags.button_exits)
- exit(0);
+ if (cb->gsh->flags.button_exits)
+ exit (0);
- 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/callbacks.h 12 Feb 2007 16:36:56 -0000 1.3
+++ gtkshell/callbacks.h 20 Feb 2007 04:29:43 -0000 1.4
@@ -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_CALLBACKS_H
#define GSH_CALLBACKS_H
@@ -29,9 +30,8 @@
};
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/containers.c 17 Feb 2007 23:55:03 -0000 1.3
+++ gtkshell/containers.c 20 Feb 2007 04:29:43 -0000 1.4
@@ -23,44 +23,41 @@
#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);
- if(!gsh->flags.dont_scroll)
+ if (!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
{
- gtk_container_add(GTK_CONTAINER(gsh->window),
+ gtk_container_add (GTK_CONTAINER (gsh->window),
gsh->rows.h);
}
- gtk_widget_show(gsh->rows.h);
- 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);
+ gtk_widget_show (gsh->rows.h);
+ 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);
}
-
-
-
Index: gtkshell/containers.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/containers.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/containers.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,11 +24,8 @@
#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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/dialog_options.c 19 Feb 2007 01:43:09 -0000 1.5
+++ gtkshell/dialog_options.c 20 Feb 2007 04:29:43 -0000 1.6
@@ -23,143 +23,141 @@
#include "gtkshell.h"
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);
+ (gchar *) text);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ exit (0);
}
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)]);
}
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);
}
void
-gsh_color_dialog()
+gsh_color_dialog ()
{
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);
}
void
-gsh_about_dialog()
+gsh_about_dialog ()
{
GtkWidget *dialog;
- const gchar *authors[]=
+ 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)
{
- assert(strlen(argv[(*counter)])>2);
- switch(argv[(*counter)][2])
+ assert (strlen (argv[(*counter)]) > 2);
+ switch (argv[(*counter)][2])
{
case 'a':
- gsh_about_dialog();
+ gsh_about_dialog ();
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/dialog_options.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/dialog_options.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,11 +24,6 @@
#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/file_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/file_dialog.c 13 Feb 2007 03:23:28 -0000 1.3
+++ gtkshell/file_dialog.c 20 Feb 2007 04:29:43 -0000 1.4
@@ -24,51 +24,50 @@
/* 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(
+ dialog =
+ 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/file_dialog.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/file_dialog.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -23,14 +23,13 @@
#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/geometry.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/geometry.c 18 Feb 2007 22:43:25 -0000 1.6
+++ gtkshell/geometry.c 20 Feb 2007 04:29:43 -0000 1.7
@@ -24,35 +24,33 @@
void
-gsh_set_geometry(struct GSH *gsh)
+gsh_set_geometry (struct GSH * gsh)
{
- if(gsh->geometry)
+ 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);
}
}
gboolean
-gsh_check_geometry(struct GSH *gsh)
+gsh_check_geometry (struct GSH * gsh)
{
- gboolean geometry_status=FALSE;
+ gboolean geometry_status = FALSE;
- if(!gsh->geometry && !gsh->flags.dont_scroll)
- asprintf(&gsh->geometry, "400x300");
+ if (!gsh->geometry && !gsh->flags.dont_scroll)
+ asprintf (&gsh->geometry, "400x300");
- if(gsh->geometry)
- geometry_status=TRUE;
+ if (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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/geometry.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/geometry.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,10 +24,8 @@
#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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/gtkshell.c 20 Feb 2007 03:59:50 -0000 1.9
+++ gtkshell/gtkshell.c 20 Feb 2007 04:29:43 -0000 1.10
@@ -23,71 +23,70 @@
#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);
g_signal_connect (window, "delete-event",
G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_main_quit), NULL);
- return(window);
+ return (window);
}
void
-gsh_GSH_Flags(struct GSH_Flags *flags)
+gsh_GSH_Flags (struct GSH_Flags * flags)
{
- flags->dont_scroll=FALSE;
- flags->button_exits=FALSE;
- flags->updating=FALSE;
- flags->prompt_echoes=FALSE;
+ flags->dont_scroll = FALSE;
+ flags->button_exits = FALSE;
+ flags->updating = FALSE;
+ flags->prompt_echoes = FALSE;
}
void
-gsh_GSH_Rows(struct GSH_Rows *rows)
+gsh_GSH_Rows (struct GSH_Rows * rows)
{
/* rows->row is initialized by gsh_manage. */
- rows->rows=8;
+ rows->rows = 8;
}
void
-gsh_GSH_Updater(struct GSH_Updater *update)
+gsh_GSH_Updater (struct GSH_Updater * update)
{
- update->period=1000;
+ update->period = 1000;
}
void
-gsh_GSH(struct GSH *gsh)
+gsh_GSH (struct GSH * gsh)
{
- gsh->geometry=NULL;
- gsh_GSH_Flags(&gsh->flags);
- gsh_GSH_Rows(&gsh->rows);
- gsh_GSH_Updater(&gsh->update);
+ gsh->geometry = 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 ();
}
-
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/gtkshell.h 20 Feb 2007 03:59:50 -0000 1.12
+++ gtkshell/gtkshell.h 20 Feb 2007 04:29:43 -0000 1.13
@@ -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_GTKSHELL_H
#define GSH_GTKSHELL_H
@@ -78,13 +79,11 @@
#include "geometry.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 ();
#endif
-
Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/label.c 20 Feb 2007 03:59:50 -0000 1.5
+++ gtkshell/label.c 20 Feb 2007 04:29:43 -0000 1.6
@@ -24,29 +24,28 @@
GtkWidget *
-gsh_add_label(struct GSH *gsh, char *text)
+gsh_add_label (struct GSH * gsh, char *text)
{
GtkWidget *label;
- label = gtk_label_new(text);
+ label = gtk_label_new (text);
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_label_set_single_line_mode(GTK_LABEL(label), FALSE);
- gtk_label_set_max_width_chars(GTK_LABEL(label), 80);
-
- if(gsh->flags.horizontal_labels)
- gtk_label_set_angle(GTK_LABEL(label), 270);
-
- /* This uses expanded management, as the label may be
- displaying a large text area. */
- gsh_manage(gsh, label);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_label_set_single_line_mode (GTK_LABEL (label), FALSE);
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 80);
+
+ if (gsh->flags.horizontal_labels)
+ gtk_label_set_angle (GTK_LABEL (label), 270);
+
+ /* This uses expanded management, as the label may be displaying a large
+ text area. */
+ gsh_manage (gsh, label);
return label;
}
void
-gsh_set_label(GtkWidget *label, char *text)
+gsh_set_label (GtkWidget * label, char *text)
{
- 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/label.h 17 Feb 2007 23:29:53 -0000 1.3
+++ gtkshell/label.h 20 Feb 2007 04:29:43 -0000 1.4
@@ -24,10 +24,8 @@
#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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/main.c 16 Feb 2007 22:18:01 -0000 1.5
+++ gtkshell/main.c 20 Feb 2007 04:29:43 -0000 1.6
@@ -23,30 +23,29 @@
#include "gtkshell.h"
int
-main(int argc, char **argv)
+main (int argc, char **argv)
{
struct GSH *gsh;
- gsh=gsh_init(&argc, &argv);
+ gsh = gsh_init (&argc, &argv);
- gsh->flags.dont_scroll=
+ 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);
/* Free object references and initialization variables */
- g_free(gsh);
+ g_free (gsh);
- gtk_main();
+ gtk_main ();
return (0);
}
-
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/option_options.c 20 Feb 2007 03:59:50 -0000 1.6
+++ gtkshell/option_options.c 20 Feb 2007 04:29:43 -0000 1.7
@@ -23,41 +23,40 @@
#include "gtkshell.h"
void
-gsh_handle_option_arguments(struct GSH *gsh, int argc, char **argv, int
*counter)
+gsh_handle_option_arguments (struct GSH * gsh, int argc, char **argv, int
*counter)
{
- switch(argv[(*counter)][2])
+ switch (argv[(*counter)][2])
{
case 'E': /* Make a text entry simpley print the text. */
- gsh->flags.prompt_echoes=TRUE;
+ gsh->flags.prompt_echoes = TRUE;
break;
case 'e':
- gsh->flags.button_exits=TRUE;
+ gsh->flags.button_exits = TRUE;
break;
case 'g':
- gsh_count(argc, counter);
+ gsh_count (argc, counter);
- if(gsh->geometry)
- free(gsh->geometry);
+ if (gsh->geometry)
+ free (gsh->geometry);
- asprintf(&gsh->geometry, "%s", argv[(*counter)]);
+ asprintf (&gsh->geometry, "%s", argv[(*counter)]);
break;
case 'h':
- gsh->flags.horizontal_labels=TRUE;
+ gsh->flags.horizontal_labels = TRUE;
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_set_skip_taskbar_hint (
+ GTK_WINDOW (gsh->window), TRUE);
break;
case 'r':
- gsh_count(argc, counter);
- gsh->rows.rows=(unsigned int)atoi(argv[(*counter)]);
+ gsh_count (argc, counter);
+ gsh->rows.rows = (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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/option_options.h 13 Feb 2007 03:23:28 -0000 1.3
+++ gtkshell/option_options.h 20 Feb 2007 04:29:43 -0000 1.4
@@ -24,7 +24,6 @@
#define GSH_OPTION_OPTIONS_H
void
-gsh_handle_option_arguments(
- struct GSH *gsh, int argc, char **argv, int *counter);
-
+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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/options.c 12 Feb 2007 16:36:56 -0000 1.4
+++ gtkshell/options.c 20 Feb 2007 04:29:43 -0000 1.5
@@ -23,43 +23,42 @@
#include "gtkshell.h"
void
-gsh_count(int argc, int *counter)
+gsh_count (int argc, int *counter)
{
(*counter)++;
- assert((*counter) <= argc);
+ assert ((*counter) <= argc);
}
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)
{
- gsh_check_row(gsh);
+ gsh_check_row (gsh);
switch (argv[(*counter)][1])
{
case 'a':
- gsh_handle_add_arguments(gsh,
+ gsh_handle_add_arguments (gsh,
argc,
argv,
counter);
break;
case 'd':
- gsh_handle_dialog_arguments(gsh,
+ gsh_handle_dialog_arguments (gsh,
argc,
argv,
counter);
break;
case 'h':
- g_printerr("Read the source code.\n");
- exit(1);
+ g_printerr ("Read the source code.\n");
+ exit (1);
break;
case 'o':
- gsh_handle_option_arguments(gsh,
+ gsh_handle_option_arguments (gsh,
argc,
argv,
counter);
break;
default:
- g_printerr("%s: %s undefined\n", argv[0],
argv[(*counter)]);
+ g_printerr ("%s: %s undefined\n", argv[0], argv[(*counter)]);
break;
}
}
-
Index: gtkshell/options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/options.h 12 Feb 2007 16:36:56 -0000 1.2
+++ gtkshell/options.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -19,15 +19,15 @@
along with AntiRight; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+
#ifndef GSH_OPTIONS_H
#define GSH_OPTIONS_H
#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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/row.c 20 Feb 2007 03:59:50 -0000 1.8
+++ gtkshell/row.c 20 Feb 2007 04:29:43 -0000 1.9
@@ -23,75 +23,75 @@
#include "gtkshell.h"
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. */
- if(gsh->rows.rows!=1)
+ /* 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
- if(gsh->rows.row == gsh->rows.rows)
+ if (gsh->rows.row == gsh->rows.rows)
{
#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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/row.h 19 Feb 2007 20:58:07 -0000 1.5
+++ gtkshell/row.h 20 Feb 2007 04:29:43 -0000 1.6
@@ -19,20 +19,20 @@
along with AntiRight; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+
#ifndef GSH_ROW_H
#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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/text.c 20 Feb 2007 03:59:50 -0000 1.6
+++ gtkshell/text.c 20 Feb 2007 04:29:43 -0000 1.7
@@ -22,43 +22,43 @@
#include "gtkshell.h"
-GtkWidget*
-gsh_setup_command_entry(struct GSH *gsh, char *command)
+GtkWidget *
+gsh_setup_command_entry (struct GSH * gsh, char *command)
{
GtkWidget *entry;
struct GSH_CBData *cb;
/* Set up callback data. */
- cb=(struct GSH_CBData *)xmalloc(sizeof(struct GSH_CBData));
- cb->gsh=gsh;
- asprintf((char **)&cb->data, "%s", command);
+ cb = (struct GSH_CBData *) xmalloc (sizeof (struct GSH_CBData));
+ cb->gsh = gsh;
+ asprintf ((char **) &cb->data, "%s", command);
/* Create widget. */
- entry = gtk_entry_new();
+ entry = gtk_entry_new ();
- g_signal_connect(G_OBJECT(entry), "activate",
- G_CALLBACK(entry_cb), (gpointer) cb);
+ 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);
+ 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;
@@ -68,23 +68,22 @@
FILE *file;
char buf[BUFSIZ];
- 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));
- file=fopen(filename, "r");
- while(read=fread(buf, sizeof(char), BUFSIZ, file))
+ file = fopen (filename, "r");
+ while (read = fread (buf, sizeof (char), BUFSIZ, file))
{
- gtk_text_buffer_get_end_iter(buffer, &iter);
- gtk_text_buffer_insert(buffer, &iter, buf, read);
+ gtk_text_buffer_get_end_iter (buffer, &iter);
+ gtk_text_buffer_insert (buffer, &iter, buf, read);
}
- fclose(file);
+ fclose (file);
- if(!gsh->geometry)
- asprintf(&gsh->geometry, "775x700");
+ if (!gsh->geometry)
+ asprintf (&gsh->geometry, "775x700");
- font_desc=pango_font_description_from_string("Mono 14");
- gtk_widget_modify_font(text, font_desc);
- pango_font_description_free(font_desc);
+ font_desc = pango_font_description_from_string ("Mono 14");
+ gtk_widget_modify_font (text, font_desc);
+ pango_font_description_free (font_desc);
}
-
Index: gtkshell/text.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/text.h 19 Feb 2007 01:43:09 -0000 1.3
+++ gtkshell/text.h 20 Feb 2007 04:29:43 -0000 1.4
@@ -23,16 +23,15 @@
#ifndef GSH_TEXT_H
#define GSH_TEXT_H
-GtkWidget*
-gsh_setup_command_entry(struct GSH *gsh, char *command);
+GtkWidget *
+ 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/updated.c 18 Feb 2007 22:43:25 -0000 1.4
+++ gtkshell/updated.c 20 Feb 2007 04:29:43 -0000 1.5
@@ -24,99 +24,96 @@
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 */
- gsh->update.list=g_slist_append(gsh->update.list, item);
+ gsh->update.list = g_slist_append (gsh->update.list, item);
}
void
-gsh_assign_updater(
- gsh_updater_data *item,
- void (*function)(char*, void*),
+gsh_assign_updater (
+ gsh_updater_data * item,
+ void (*function) (char *, void *),
char *command, void *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. */
+ /* No allocation necessary as these are duplicate pointers. */
- item->widget=widget;
- item->function=function;
+ item->widget = widget;
+ item->function = function;
}
void
-gsh_add_updater(
- struct GSH *gsh,
- void (*function)(char*, void*),
+gsh_add_updater (
+ struct GSH * gsh,
+ void (*function) (char *, void *),
char *command, void *widget)
{
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);
}
-void gsh_update_each(gpointer data, gpointer user_data)
+void
+gsh_update_each (gpointer data, gpointer user_data)
{
gsh_updater_data *item;
- 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. */
- assert(data);
+ assert (data);
- /* 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;
- item->function(item->command, item->widget);
+ item = (gsh_updater_data *) data;
+ item->function (item->command, item->widget);
}
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;
+ gsh = (struct GSH *) data;
- UNUSED(data); /* DATA is unused. */
+ UNUSED (data); /* DATA is unused. */
#ifdef DEBUG
g_assert (gsh->update.list);
#endif /* DEBUG */
- g_slist_foreach(gsh->update.list, gsh_update_each, gsh);
+ g_slist_foreach (gsh->update.list, gsh_update_each, gsh);
- return(TRUE);
+ return (TRUE);
}
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 */
- gsh_perform_updates(gsh);
- g_timeout_add(gsh->update.period, gsh_perform_updates, gsh);
+ gsh_perform_updates (gsh);
+ g_timeout_add (gsh->update.period, gsh_perform_updates, gsh);
}
-
Index: gtkshell/updated.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/updated.h 17 Feb 2007 23:07:31 -0000 1.2
+++ gtkshell/updated.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -25,18 +25,16 @@
typedef struct
{
- void (*function)(char *, void *);
+ void (*function) (char *, void *);
char *command;
void *widget;
} gsh_updater_data;
void
-gsh_add_updater(struct GSH *gsh,
- void (*function)(char *, void *),
+gsh_add_updater (struct GSH * gsh,
+ void (*function) (char *, void *),
char *command, void *widget);
-void
-gsh_start_updates(struct GSH *gsh);
-
+ void
+ 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/updated_label.c 20 Feb 2007 03:59:50 -0000 1.8
+++ gtkshell/updated_label.c 20 Feb 2007 04:29:43 -0000 1.9
@@ -23,46 +23,45 @@
#include "gtkshell.h"
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 is produced. */
- if(!strncmp(*results, "", 1))
+ if (!strncmp (*results, "", 1))
{
- free(*results);
- asprintf(results, " ");
+ free (*results);
+ asprintf (results, " ");
}
}
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()");
- g_assert(command);
- g_assert(widget);
+ g_assert (command);
+ g_assert (widget);
#endif /* DEBUG */
- 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 */
- widget=gsh_add_label(gsh, NULL);
- gsh_add_updater(gsh, &gsh_update_label, command, (gpointer)widget);
+ widget = gsh_add_label (gsh, NULL);
+ 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/updated_label.h 13 Feb 2007 03:23:28 -0000 1.2
+++ gtkshell/updated_label.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,10 +24,8 @@
#define GSH_UPDATED_LABEL_H
void
-gsh_update_label(char *command, void *widget);
+ gsh_update_label (char *command, void *widget);
void
-gsh_add_updated_label(struct GSH *gsh, 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/updated_options.c 17 Feb 2007 23:07:31 -0000 1.5
+++ gtkshell/updated_options.c 20 Feb 2007 04:29:43 -0000 1.6
@@ -23,37 +23,36 @@
#include "gtkshell.h"
void
-gsh_test_updating(struct GSH *gsh)
+gsh_test_updating (struct GSH * gsh)
{
- if(!gsh->flags.updating)
+ if (!gsh->flags.updating)
{
- gsh_start_updates(gsh);
- gsh->flags.updating=TRUE;
+ gsh_start_updates (gsh);
+ gsh->flags.updating = TRUE;
}
}
void
-gsh_updater_argument_generic(struct GSH *gsh, 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);
+ 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)
{
- assert(strlen(argv[(*counter)])>2);
- switch(argv[(*counter)][3])
+ 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/updated_options.h 13 Feb 2007 03:23:28 -0000 1.2
+++ gtkshell/updated_options.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,7 +24,6 @@
#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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/updated_progress.c 19 Feb 2007 20:58:07 -0000 1.4
+++ gtkshell/updated_progress.c 20 Feb 2007 04:29:43 -0000 1.5
@@ -23,21 +23,20 @@
#include "gtkshell.h"
void
-gsh_update_progress(char *command, void *widget)
+gsh_update_progress (char *command, void *widget)
{
char *results;
- results=antiright_pipe_read(command);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR((GtkWidget*) widget),
- strtod(results, NULL));
- free(results);
+ results = antiright_pipe_read (command);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR ((GtkWidget *) widget),
+ strtod (results, NULL));
+ free (results);
}
void
-gsh_add_updated_progress(struct GSH *gsh, char *command)
+gsh_add_updated_progress (struct GSH * gsh, char *command)
{
GtkWidget *widget;
- widget=gtk_progress_bar_new();
- gsh_manage_unexpanded(gsh, widget);
- gsh_add_updater(gsh, &gsh_update_progress,
- command, (void*)widget);
+ widget = gtk_progress_bar_new ();
+ gsh_manage_unexpanded (gsh, widget);
+ gsh_add_updater (gsh, &gsh_update_progress,
+ command, (void *) widget);
}
-
Index: gtkshell/updated_progress.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/updated_progress.h 13 Feb 2007 03:23:28 -0000 1.2
+++ gtkshell/updated_progress.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,10 +24,8 @@
#define GSH_UPDATED_PROGRESS_H
void
-gsh_update_progress(char *command, void *widget);
+ gsh_update_progress (char *command, void *widget);
void
-gsh_add_updated_progress(struct GSH *gsh, char *command);
-
+ gsh_add_updated_progress (struct GSH * gsh, char *command);
#endif
-
Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libantiright/library.h 18 Feb 2007 22:43:25 -0000 1.5
+++ libantiright/library.h 20 Feb 2007 04:29:43 -0000 1.6
@@ -39,6 +39,4 @@
#define ARBUG(message) g_debug(ARBUGPARAM(message))
#define ARWARN(message) g_warning(ARBUGPARAM(message))
#define ARERR(message) g_error(ARBUGPARAM(message))
-
#endif /* LIBAR_LIBRARY_H */
-
Index: libantiright/pipe.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/pipe.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/pipe.c 12 Aug 2006 03:52:48 -0000 1.1
+++ libantiright/pipe.c 20 Feb 2007 04:29:43 -0000 1.2
@@ -24,35 +24,35 @@
#include "library.h"
/* Make sure that you free the returned string. */
-char*
-antiright_pipe_read(char *command_string)
+char *
+antiright_pipe_read (char *command_string)
{
char *text_string;
char buffer[BUFSIZ];
FILE *pipe_fp;
- unsigned int buffer_size=BUFSIZ;
+ unsigned int buffer_size = BUFSIZ;
/* Execute the command indicated by command_string. */
/* Pipe is read-only. Stdout will be directed to it. */
- pipe_fp=popen(command_string, "r");
+ pipe_fp = popen (command_string, "r");
/* Read the command's stdout. */
/* Read in the first buffer segment. */
- fgets(buffer, BUFSIZ, pipe_fp);
- asprintf(&text_string, "%s", buffer);
+ fgets (buffer, BUFSIZ, pipe_fp);
+ asprintf (&text_string, "%s", buffer);
/* Read in the rest of the buffer segments. */
- while(fgets(buffer, BUFSIZ, pipe_fp))
+ while (fgets (buffer, BUFSIZ, pipe_fp))
{
- buffer_size+=BUFSIZ;
- text_string=(char*)realloc(text_string,
- (unsigned long)buffer_size);
- snprintf(text_string, buffer_size,
- "%s%s", text_string, (unsigned long)buffer);
+ buffer_size += BUFSIZ;
+ text_string = (char *) realloc (text_string,
+ (unsigned long) buffer_size);
+ snprintf (text_string, buffer_size,
+ "%s%s", text_string, (unsigned long) buffer);
}
/* Close the pipe once fgets() returns a false condition. */
- pclose(pipe_fp);
+ pclose (pipe_fp);
- return(text_string);
+ return (text_string);
}
/* void */
@@ -77,5 +77,3 @@
/* fclose(fifo_fp); */
/* } */
/* } */
-
-
Index: libantiright/pipe.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/pipe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/pipe.h 12 Aug 2006 03:52:48 -0000 1.1
+++ libantiright/pipe.h 20 Feb 2007 04:29:43 -0000 1.2
@@ -21,11 +21,10 @@
#ifndef LIBAR_PIPE_H
#define LIBAR_PIPE_H
-char*
-antiright_pipe_read(char *command_string);
+char *
+ antiright_pipe_read (char *command_string);
/* void */
/* antiright_pipe_write(char *command_string, char* data); */
/* void */
/* antiright_fifo_server(char *command_string, char *fifo); */
#endif
-
Index: libantiright/string.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libantiright/string.c 9 Feb 2007 16:28:34 -0000 1.2
+++ libantiright/string.c 20 Feb 2007 04:29:43 -0000 1.3
@@ -23,41 +23,39 @@
#include "library.h"
/* Free the returned value! */
-char*
-antiright_beautified_label(char* current_argument_string)
+char *
+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);
- ((current_argument_string[parse_counter])!=' ' && (parse_counter>0));
+ for (parse_counter = strlen (current_argument_string);
+ ((current_argument_string[parse_counter]) != ' ' && (parse_counter > 0));
parse_counter--);
- for(label_counter=0;
- current_argument_string[parse_counter]!='\0';
+ for (label_counter = 0;
+ current_argument_string[parse_counter] != '\0';
parse_counter++)
{
- if(current_argument_string[parse_counter] == ' ')
+ 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] != '_')
+ if (current_argument_string[parse_counter] != '_')
{
- label_string[label_counter]=
+ label_string[label_counter] =
current_argument_string[parse_counter];
}
else
{
- label_string[label_counter]=' ';
+ label_string[label_counter] = ' ';
}
label_counter++;
}
/* Ensure that the string is null-terminated. */
- label_string[label_counter]='\0';
+ label_string[label_counter] = '\0';
- return(label_string);
+ return (label_string);
}
-
Index: libantiright/string.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/string.h 12 Aug 2006 03:52:48 -0000 1.1
+++ libantiright/string.h 20 Feb 2007 04:29:43 -0000 1.2
@@ -22,8 +22,8 @@
#ifndef LIBAR_STRING_H
#define LIBAR_STRING_H
-char*
-antiright_beautified_label(char* current_argument_string);
+char *
+ antiright_beautified_label (char *current_argument_string);
/* char* */
/* antiright_insert_string(char *text, char *insertion, unsigned int
position); */
/* char* */
@@ -31,4 +31,3 @@
/* 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libantiright/system.c 9 Feb 2007 16:28:34 -0000 1.3
+++ libantiright/system.c 20 Feb 2007 04:29:43 -0000 1.4
@@ -23,71 +23,72 @@
#include "library.h"
int
-antiright_system(char *field_string)
+antiright_system (char *field_string)
{
/* Ensure that FIELD_STRING is not empty. */
- if((field_string != NULL) & (strlen(field_string)>0))
+ if ((field_string != NULL) & (strlen (field_string) > 0))
{
- int system_return_value=0;
+ int system_return_value = 0;
- if(field_string[strlen(field_string)-1] != '&')
- /* Do the following if there is no
- * ampersand at the end of FIELD_STRING. */
+ if (field_string[strlen (field_string) - 1] != '&')
{
+ /* Do the following if there is no ampersand at the end of
+ FIELD_STRING. */
+
char *system_string;
- /* Append an ampersand to FIELD_STRING. Place the
- * resulting string in SYSTEM_STRING. */
- asprintf(&system_string, "%s &", field_string);
+ /* Append an ampersand to FIELD_STRING. Place the resulting string in
+ SYSTEM_STRING. */
+ asprintf (&system_string, "%s &", field_string);
/* Ensure that SYSTEM_STRING was correctly allocated. */
- assert(system_string != NULL);
+ assert (system_string != NULL);
/* Execute SYSTEM_STRING. */
- system_return_value=system(system_string);
+ system_return_value = system (system_string);
/* Clean up. */
- free(system_string);
+ free (system_string);
}
- else /* The input command already includes an ampersand
- and will become a background operation. */
+ else
{
+ /* The input command already includes an ampersand and will become a
+ background operation. */
/* Execute raw FIELD_STRING. */
- system_return_value=system(field_string);
+ system_return_value = system (field_string);
}
/* Return result of system call. */
- return(system_return_value);
+ return (system_return_value);
}
- else /* The user input is empty. */
+ else
{
- /* Generate an error. */
- perror("FIELD_STRING is empty.");
- return(-1);
+ /* The user input is empty, so generate an error. */
+ perror ("FIELD_STRING is empty");
+ return (-1);
}
}
int
-vsysprintf(char *format, va_list list)
+vsysprintf (char *format, va_list list)
{
char *command;
int return_value;
- vasprintf(&command, format, list);
- return_value=antiright_system(command);
- free(command);
- return(return_value);
+ vasprintf (&command, format, list);
+ return_value = antiright_system (command);
+ free (command);
+ return (return_value);
}
int
-sysprintf(char *format, ...)
+sysprintf (char *format,...)
{
va_list list;
int return_value;
- va_start(list, format);
- return_value=vsysprintf(format, list);
- va_end(list);
- return(return_value);
+ 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libantiright/system.h 9 Feb 2007 03:16:12 -0000 1.2
+++ libantiright/system.h 20 Feb 2007 04:29:43 -0000 1.3
@@ -24,13 +24,11 @@
#define LIBAR_SYSTEM_H
int
-antiright_system(char *field_string);
+ antiright_system (char *field_string);
int
-sysprintf(char *format, ...);
+ sysprintf (char *format,...);
int
-vsysprintf(char *format, va_list list);
-
+ vsysprintf (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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libantiright/util.c 17 Feb 2007 23:07:31 -0000 1.6
+++ libantiright/util.c 20 Feb 2007 04:29:43 -0000 1.7
@@ -23,25 +23,22 @@
#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. */
+ /* There is no need to check for success, as g_malloc causes the
+ application to terminate on failure. */
- return(g_malloc(size));
+ 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libantiright/util.h 11 Feb 2007 04:23:30 -0000 1.3
+++ libantiright/util.h 20 Feb 2007 04:29:43 -0000 1.4
@@ -24,15 +24,13 @@
#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
-
Index: doc/indent.pro
===================================================================
RCS file: doc/indent.pro
diff -N doc/indent.pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ doc/indent.pro 20 Feb 2007 04:29:43 -0000 1.1
@@ -0,0 +1,3 @@
+-nbad -bap -nbc -bl -bli2 -bls -ncdb -nce -di2
+-ndj -nfc1 -i2 -ip5 -lp -pcs -psl -nsc -nsob
+-bacc
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/dateload.c gshterm/comman...,
Jeffrey Bedard <=