[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure ACE-desktop/ACE ACE-desktop...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright configure ACE-desktop/ACE ACE-desktop... |
|
Date: |
Mon, 19 Mar 2007 07:09:30 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/03/19 07:09:30
Modified files:
. : configure
ACE-desktop : ACE Makefile
gtkshell : Makefile gshterm gtkshell.h guidl.y
image_button.c main.c option_options.c
terminal.c terminal.h
libantiright : library.h
Added files:
ACE-desktop/guidl: ACE_Panel.gdl Administration_Panel.gdl
Horizontal_Deskbar.gdl Manual_Browser.gdl
Monitoring_Panel.gdl Old_Deskbar.gdl
ACE-desktop/icons: ACE_32.png Browser_32.png Calculator_32.png
File_Manager_32.png File_Sharing_32.png
Image_Editor_32.png Lock_Display_32.png
Screen_32.png Sticky_Note_32.png
Terminal_32.png Text_Editor_32.png
Word_Processor_32.png
gtkshell : macros.h terminal_options.c terminal_options.h
terminal_struct.h
libantiright : macros.h
Removed files:
ACE-desktop/guidl: ACE_Panel Administration_Panel
Horizontal_Deskbar Manual_Browser
Monitoring_Panel Old_Deskbar
Log message:
Added 32x32 versions of deskbar icons. Split out macros from primary
headers. Bumped version to 3.2-alpha. Added static user interface
definitions, and added their use to ACE. Split some functions in
terminal.c.
Fixed font specification for gshterm script. Added tertiary options for
the terminal widget: -otf, -oth and -otw. Added file for handling these
options.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/ACE_Panel.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Administration_Panel.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Manual_Browser.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Monitoring_Panel.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Old_Deskbar.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/ACE_Panel?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Administration_Panel?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Manual_Browser?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Monitoring_Panel?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Old_Deskbar?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/ACE_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Browser_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Calculator_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/File_Manager_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/File_Sharing_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Image_Editor_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Lock_Display_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Screen_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Sticky_Note_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Terminal_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Text_Editor_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/icons/Word_Processor_32.png?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gshterm?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_options.c?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_options.h?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_struct.h?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/macros.h?cvsroot=antiright&rev=1.1
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- configure 16 Mar 2007 00:39:31 -0000 1.85
+++ configure 19 Mar 2007 07:09:30 -0000 1.86
@@ -25,7 +25,7 @@
#
###############################################################################
-VERSION=3.1-alpha
+VERSION=3.2-alpha
USE_DISTCC=YES
USE_CCACHE=YES
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ACE-desktop/ACE 16 Mar 2007 00:39:31 -0000 1.26
+++ ACE-desktop/ACE 19 Mar 2007 07:09:30 -0000 1.27
@@ -65,7 +65,7 @@
GUIDL()
{
- exec $ARSHELL -f $datadir/$1
+ exec $ARSHELL -f $datadir/$1.gdl
}
ACE_Verification()
@@ -239,10 +239,13 @@
Deskbar()
{
- if [ "$(ACE deskbar_style)" = "0" ]; then
+ local STYLE="$(ACE deskbar_style)"
+
+ if [ "$STYLE" = "0" ]; then
Old_Deskbar
+ elif [ "$STYLE" = "3" ]; then
+ GUIDL Horizontal_Deskbar
else
- local STYLE="$(ACE deskbar_style)"
if [ "$STYLE" = "2" ]; then
local OPTIONS="-or 16 -oh"
Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ACE-desktop/Makefile 16 Mar 2007 00:39:31 -0000 1.14
+++ ACE-desktop/Makefile 19 Mar 2007 07:09:30 -0000 1.15
@@ -54,9 +54,9 @@
${INSTALL_DIR} $(datadir)
${INSTALL_DIR} $(icondir)
$(INSTALL_DATA) system.antiright $(datadir)
- $(INSTALL_DATA) guidl/* $(datadir)
+ $(INSTALL_DATA) guidl/*.gdl $(datadir)
$(INSTALL_SCRIPT) ACE.install $(bindir)/ACE
$(INSTALL_DATA) ACE.1 $(man1dir)
$(INSTALL_DATA) system.antiright.5 $(man5dir)
- $(INSTALL_DATA) icons/*.* $(icondir)
+ $(INSTALL_DATA) icons/*.png $(icondir)
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/Makefile 16 Mar 2007 02:01:21 -0000 1.14
+++ gtkshell/Makefile 19 Mar 2007 07:09:30 -0000 1.15
@@ -36,16 +36,10 @@
label.o button.o text.o updated_label.o updated_progress.o\
updated_options.o add_options.o option_options.o dialog_options.o\
file_dialog.o row.o containers.o geometry.o font.o dragdrop.o\
- image_button.o y.tab.o lex.yy.o terminal.o
+ image_button.o y.tab.o lex.yy.o terminal.o terminal_options.o
program=main.o
-sources=gtkshell.c arguments.c options.c callbacks.c updated.c\
- label.c button.c text.c updated_label.c updated_progress.c\
- updated_options.c add_options.c option_options.c dialog_options.c\
- file_dialog.c row.c containers.c geometry.c font.c dragdrop.c\
- image_button.c y.tab.c lex.yy.c terminal.o
-
all: gtkshell
@@ -59,9 +53,6 @@
y.tab.c: lex.yy.c guidl.y
yacc -d guidl.y
-splint: $(sources)
- splint +posixlib -nullpass -nullstate -temptrans -mustfreeonly
`pkg-config --cflags-only-I gtk+-2.0` $(sources) > splint.out
-
parser-clean:
rm -f *.yy.c *.tab.c *.tab.h
Index: gtkshell/gshterm
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gshterm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/gshterm 16 Mar 2007 02:01:21 -0000 1.1
+++ gtkshell/gshterm 19 Mar 2007 07:09:30 -0000 1.2
@@ -8,6 +8,7 @@
FONT=""
GEOMETRY=""
COMMAND=""
+DEBUG="FALSE"
while [ $# -gt 0 ]; do
case "$1" in
@@ -17,11 +18,11 @@
break
;;
-g)
- GEOMETRY=$2
+ GEOMETRY="$2"
shift
;;
-f)
- FONT=$2
+ FONT="$2"
shift
;;
-h)
@@ -37,11 +38,13 @@
ARGS=""
-if [ "$GEOMETRY" -ne "" ]; then
+if [ "$GEOMETRY" != "" ]; then
ARGS="$ARGS -og $GEOMETRY"
fi
-if [ "$FONT" -ne "" ]; then
- ARGS="$ARGS -oS $FONT"
+if [ "$FONT" != "" ]; then
+ ARGS="$ARGS -otf \"$FONT\""
+else
+ ARGS="$ARGS -otf 'Mono 12'"
fi
#echo $*
@@ -54,5 +57,9 @@
COMMAND="gtkshell -oF $ARGS -as $COMMAND"
+if [ "$DEBUG" = "TRUE" ]; then
+ echo $COMMAND
+fi
+
exec sh -c "$COMMAND"
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gtkshell/gtkshell.h 16 Mar 2007 00:39:31 -0000 1.25
+++ gtkshell/gtkshell.h 19 Mar 2007 07:09:30 -0000 1.26
@@ -61,26 +61,9 @@
/address@hidden@*/ GSList *list;
};
-struct GSH_Terminal
-{
- GtkWidget * widget;
- gchar * font;
- gchar * script;
-};
-#define GSH_NONE 0
-#define GSH_SCROLL 1
-#define GSH_CBEXIT 2
-#define GSH_UPDATING 4
-#define GSH_HORIZONTAL_LABELS 8
-#define GSH_PROMPT_ECHOES 16
-#define GSH_FRAMED_LABELS 32
-#define GSH_MENU_BUTTON 64
-#define GSH_NO_BASE_FRAME 128
-
-#define GSH_FLAG(flag) ((gsh->bflags & flag) == flag)
-#define GSH_SET(flag) gsh->bflags |= flag
-#define GSH_UNSET(flag) gsh->bflags &= ~flag
+#include "macros.h"
+#include "terminal_struct.h"
struct GSH
{
@@ -91,7 +74,7 @@
struct GSH_Terminal terminal;
GtkWidget *button;
/address@hidden@*/ gchar *geometry;
- guint bflags;
+ Bitmask bflags;
};
#include "arguments.h"
@@ -114,6 +97,7 @@
#include "font.h"
#include "dragdrop.h"
#include "image_button.h"
+#include "terminal_options.h"
#include "terminal.h"
void
Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/guidl.y 16 Mar 2007 00:39:31 -0000 1.2
+++ gtkshell/guidl.y 19 Mar 2007 07:09:30 -0000 1.3
@@ -90,6 +90,8 @@
option='e';
else if(!strcmp($2, "horizontal_labels"))
option='h';
+ else if(!strcmp($2, "scrolled"))
+ option='s';
else
break;
Index: gtkshell/image_button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/image_button.c 16 Mar 2007 00:39:31 -0000 1.6
+++ gtkshell/image_button.c 19 Mar 2007 07:09:30 -0000 1.7
@@ -54,15 +54,35 @@
gsh_image_button(struct GSH * gsh, char *command, char *name)
{
GtkWidget *image;
- gboolean is_file;
- is_file = g_file_test(name, G_FILE_TEST_EXISTS);
-
- ARIFB(is_file)
+ ARIFB(g_file_test(name, G_FILE_TEST_EXISTS))
image = gtk_image_new_from_file(name);
else
- image = gtk_image_new_from_stock((const gchar *)name,
+ {
+ gchar * prefixed_name;
+
+ ar_asprintf(&prefixed_name,
+ "%s/share/ACE-desktop/icons/%s",
+ PREFIX, name);
+ ARIFB(g_file_test(prefixed_name, G_FILE_TEST_EXISTS))
+ {
+#ifdef DEBUG
+ puts("using prefixed image");
+#endif /* DEBUG */
+ image = gtk_image_new_from_file(prefixed_name);
+ }
+ else
+ {
+#ifdef DEBUG
+ puts("trying stock image");
+#endif /* DEBUG */
+ image = gtk_image_new_from_stock(
+ (const gchar *)name,
GTK_ICON_SIZE_DND);
+ }
+
+ g_free(prefixed_name);
+ }
generic_image_button(gsh, command, image);
}
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/main.c 16 Mar 2007 00:39:31 -0000 1.14
+++ gtkshell/main.c 19 Mar 2007 07:09:30 -0000 1.15
@@ -29,6 +29,8 @@
struct GSH gsh;
gsh.terminal.script=NULL;
+ gsh.terminal.width=80;
+ gsh.terminal.height=32;
gsh_stack_init(&gsh, &argc, &argv);
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/option_options.c 16 Mar 2007 00:39:31 -0000 1.14
+++ gtkshell/option_options.c 19 Mar 2007 07:09:30 -0000 1.15
@@ -33,15 +33,19 @@
* text. */
GSH_SET(GSH_PROMPT_ECHOES);
break;
+
case 'e':
GSH_SET(GSH_CBEXIT);
break;
+
case 'F':
GSH_SET(GSH_NO_BASE_FRAME);
break;
+
case 'f':
GSH_SET(GSH_FRAMED_LABELS);
break;
+
case 'g':
gsh_count(argc, counter);
@@ -51,11 +55,12 @@
ar_asprintf(&gsh->geometry, "%s", argv[(*counter)]);
break;
+
case 'h':
GSH_SET(GSH_HORIZONTAL_LABELS);
break;
- case 'n':
+ case 'n':
gtk_window_set_decorated(GTK_WINDOW(gsh->window),
FALSE);
@@ -63,20 +68,15 @@
(GTK_WINDOW(gsh->window), TRUE);
break;
+
case 'r':
gsh_count(argc, counter);
gsh->rows.rows =
(unsigned int) atoi(argv[(*counter)]);
break;
- case 'S':
- gsh_count(argc, counter);
- gsh->terminal.font=strdup(argv[*counter]);
- break;
-
- case 'T':
- gsh_count(argc, counter);
- gsh->terminal.font=argv[*counter];
+ case 't':
+ gsh_handle_terminal_options(gsh, argc, argv, counter);
break;
case 'u':
Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/terminal.c 16 Mar 2007 21:12:37 -0000 1.1
+++ gtkshell/terminal.c 19 Mar 2007 07:09:30 -0000 1.2
@@ -23,21 +23,41 @@
#include "gtkshell.h"
static void
+set_size(struct GSH * gsh)
+{
+
+ if(gsh->terminal.width==0)
+ gsh->terminal.width=80;
+ if(gsh->terminal.height==0)
+ gsh->terminal.height=32;
+
+ vte_terminal_set_size(VTE_TERMINAL(gsh->terminal.widget),
+ gsh->terminal.width,
+ gsh->terminal.height);
+}
+
+static void
+set_font(struct GSH * gsh)
+{
+ if(gsh->terminal.font==NULL)
+ gsh_widget_set_font_mono(gsh->terminal.widget);
+ else
+ gsh_widget_set_font(gsh->terminal.widget,
+ gsh->terminal.font);
+}
+
+static void
gsh_set_terminal_options(struct GSH * gsh)
{
GtkWidget * term;
term=gsh->terminal.widget;
- vte_terminal_set_size(VTE_TERMINAL(term), 80, 32);
+ set_size(gsh);
vte_terminal_set_allow_bold(VTE_TERMINAL(term), TRUE);
vte_terminal_set_backspace_binding(VTE_TERMINAL(term),
VTE_ERASE_ASCII_BACKSPACE);
- if(gsh->terminal.font==NULL)
- gsh_widget_set_font_mono(term);
- else
- gsh_widget_set_font(term, gsh->terminal.font);
-
+ set_font(gsh);
vte_terminal_set_background_transparent(VTE_TERMINAL(term), TRUE);
}
@@ -74,7 +94,7 @@
if(fsync(fd) == EOF)
ARERR("cannot write script file");
- fprintf(script, "#!/bin/sh\n%s\n", command);
+ ARASSERT(fprintf(script, "#!/bin/sh\n%s\n", command) != -1);
fclose(script); /* Close and flush buffers. */
#ifdef DEBUG
Index: gtkshell/terminal.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/terminal.h 16 Mar 2007 21:12:37 -0000 1.1
+++ gtkshell/terminal.h 19 Mar 2007 07:09:30 -0000 1.2
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2007 Jeffrey Bedard
+ (c) 2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libantiright/library.h 16 Mar 2007 00:39:32 -0000 1.11
+++ libantiright/library.h 19 Mar 2007 07:09:30 -0000 1.12
@@ -35,47 +35,6 @@
#include "system.h"
#include "util.h"
-#define ARBUGPARAM(message) \
- "%s:%d: %s", __FILE__, __LINE__, message
+#include "macros.h"
-#ifdef DEBUG
-#define ARBUG(message) \
- g_debug(ARBUGPARAM(message))
-#else
-#define ARBUG(message) /* disabled */
-#endif /* DEBUG */
-
-#define ARWARN(message) \
- g_warning(ARBUGPARAM(message))
-
-#define ARERR(message) \
- g_error(ARBUGPARAM(message))
-
-#define ARBBOOL(x) (x == TRUE)
-#define ARPBOOL(x) (x != NULL)
-
-#define ARASSERT g_assert
-
-#define ARBASSERT(x) \
- ARASSERT(ARBBOOL(x))
-
-#define ARPASSERT(x) \
- ARASSERT(ARPBOOL(x))
-
-#define ARIFB(x) \
- if(ARBBOOL(x))
-
-#define ARIFNB(x) \
- if(!ARBBOOL(x))
-
-#define ARIFP(x) \
- if(ARPBOOL(x))
-
-#define ARIFNP(x) \
- if(!ARPBOOL(x))
-
-#define ARWIFNP(x) \
- ARIFNP(x) \
- ARWARN("NULL data passed, operation not performed"); \
- else
#endif /* LIBAR_LIBRARY_H */
Index: ACE-desktop/guidl/ACE_Panel.gdl
===================================================================
RCS file: ACE-desktop/guidl/ACE_Panel.gdl
diff -N ACE-desktop/guidl/ACE_Panel.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/ACE_Panel.gdl 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,9 @@
+// ACE Panel
+option "rows" 5;
+add buttons "ACE IRC", "ACE File_Manager", "ACE -A Manual_Browser",
+ "ACE CD_Player", "ACE Calculator",
+ "ACE -A Alarm", "ACE Mail", "ACE -A Settings", "ACE -A Command",
+ "ACE -A Administration_Panel", "ACE -A File_System_Panel",
+ "ACE -A Network_Panel", "ACE -A Publishing_Panel", "ACE -A Calendar",
+ "gtkshell -da & # About";
+
Index: ACE-desktop/guidl/Administration_Panel.gdl
===================================================================
RCS file: ACE-desktop/guidl/Administration_Panel.gdl
diff -N ACE-desktop/guidl/Administration_Panel.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Administration_Panel.gdl 19 Mar 2007 07:09:30 -0000
1.1
@@ -0,0 +1,6 @@
+option "rows" 4;
+add buttons "ACE -A Secure_Permissions",
+ "ACE Root_Shell",
+ "ACE -A Monitoring_Panel",
+ "ACE -A OS_Specific";
+
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Horizontal_Deskbar.gdl
diff -N ACE-desktop/guidl/Horizontal_Deskbar.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 19 Mar 2007 07:09:30 -0000
1.1
@@ -0,0 +1,23 @@
+// This is the default static deskbar, used by deskbar_style==3.
+
+option "rows" 1;
+option "geometry" "+0+0";
+option "undecorated";
+
+add button "ACE,ACE_32.png::ACE::eclipse";
+add prompt "env";
+
+add buttons "ACE Lock ,Lock_Display_32.png",
+ "ACE Screen,Screen_32.png",
+ "ACE Terminal,Terminal_32.png",
+ "ACE File_Manager ,File_Manager_32.png",
+ "ACE System_Monitor,System_Monitor_32.png",
+ "ACE Browser,Browser_32.png",
+ "ACE Text_Editor ,Text_Editor_32.png",
+ "ACE Calculator,Calculator_32.png",
+ "ACE Sticky_Note,Sticky_Note_32.png";
+
+add updating label "date '+%m/%d/%y%n%H:%M:%S'";
+
+
+
Index: ACE-desktop/guidl/Manual_Browser.gdl
===================================================================
RCS file: ACE-desktop/guidl/Manual_Browser.gdl
diff -N ACE-desktop/guidl/Manual_Browser.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Manual_Browser.gdl 19 Mar 2007 07:09:30 -0000
1.1
@@ -0,0 +1,14 @@
+option "rows" 3;
+add label "Manual section:";
+add label " ";
+add label " ";
+add buttons "ACE -A Man_Browse_Section 1",
+ "ACE -A Man_Browse_Section 2",
+ "ACE -A Man_Browse_Section 3",
+ "ACE -A Man_Browse_Section 4",
+ "ACE -A Man_Browse_Section 5",
+ "ACE -A Man_Browse_Section 6",
+ "ACE -A Man_Browse_Section 7",
+ "ACE -A Man_Browse_Section 8",
+ "ACE -A Man_Browse_Section 9";
+
Index: ACE-desktop/guidl/Monitoring_Panel.gdl
===================================================================
RCS file: ACE-desktop/guidl/Monitoring_Panel.gdl
diff -N ACE-desktop/guidl/Monitoring_Panel.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Monitoring_Panel.gdl 19 Mar 2007 07:09:30 -0000
1.1
@@ -0,0 +1,10 @@
+option "rows" 4;
+add buttons "gtkshell -os -og 640x480 -ou 3000 -aul 'ps xau' & # Processes",
+ "gtkshell -ou 2000 -aul who & # Users",
+ "gtkshell -ou 5000 -aul df & # Disks",
+ "ACE System_Monitor",
+ "gtkshell -ou 2500 -aul uptime & # Uptime",
+ "ACE -A System_Accounting",
+ "xload -bg darkslategrey -fg white -hl azure & # XLoad",
+ "gtkshell -aul iostat";
+
Index: ACE-desktop/guidl/Old_Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Old_Deskbar.gdl
diff -N ACE-desktop/guidl/Old_Deskbar.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Old_Deskbar.gdl 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,7 @@
+option "geometry" "+0+0";
+option "rows" 1;
+add updating label "date";
+add buttons "ACE Lock", "ACE Screen", "ACE Terminal", "ACE Browser",
+ "ACE Sticky_Note", "ACE";
+add prompt "env";
+
Index: ACE-desktop/icons/ACE_32.png
===================================================================
RCS file: ACE-desktop/icons/ACE_32.png
diff -N ACE-desktop/icons/ACE_32.png
Binary files /dev/null and /tmp/cvsslxPFF differ
Index: ACE-desktop/icons/Browser_32.png
===================================================================
RCS file: ACE-desktop/icons/Browser_32.png
diff -N ACE-desktop/icons/Browser_32.png
Binary files /dev/null and /tmp/cvs16opCI differ
Index: ACE-desktop/icons/Calculator_32.png
===================================================================
RCS file: ACE-desktop/icons/Calculator_32.png
diff -N ACE-desktop/icons/Calculator_32.png
Binary files /dev/null and /tmp/cvsS7y0fJ differ
Index: ACE-desktop/icons/File_Manager_32.png
===================================================================
RCS file: ACE-desktop/icons/File_Manager_32.png
diff -N ACE-desktop/icons/File_Manager_32.png
Binary files /dev/null and /tmp/cvsT1nlkH differ
Index: ACE-desktop/icons/File_Sharing_32.png
===================================================================
RCS file: ACE-desktop/icons/File_Sharing_32.png
diff -N ACE-desktop/icons/File_Sharing_32.png
Binary files /dev/null and /tmp/cvsox8GTH differ
Index: ACE-desktop/icons/Image_Editor_32.png
===================================================================
RCS file: ACE-desktop/icons/Image_Editor_32.png
diff -N ACE-desktop/icons/Image_Editor_32.png
Binary files /dev/null and /tmp/cvsFvZZTK differ
Index: ACE-desktop/icons/Lock_Display_32.png
===================================================================
RCS file: ACE-desktop/icons/Lock_Display_32.png
diff -N ACE-desktop/icons/Lock_Display_32.png
Binary files /dev/null and /tmp/cvsiZWXrL differ
Index: ACE-desktop/icons/Screen_32.png
===================================================================
RCS file: ACE-desktop/icons/Screen_32.png
diff -N ACE-desktop/icons/Screen_32.png
Binary files /dev/null and /tmp/cvs5lU2LJ differ
Index: ACE-desktop/icons/Sticky_Note_32.png
===================================================================
RCS file: ACE-desktop/icons/Sticky_Note_32.png
diff -N ACE-desktop/icons/Sticky_Note_32.png
Binary files /dev/null and /tmp/cvsOOKplK differ
Index: ACE-desktop/icons/Terminal_32.png
===================================================================
RCS file: ACE-desktop/icons/Terminal_32.png
diff -N ACE-desktop/icons/Terminal_32.png
Binary files /dev/null and /tmp/cvsVbSYoN differ
Index: ACE-desktop/icons/Text_Editor_32.png
===================================================================
RCS file: ACE-desktop/icons/Text_Editor_32.png
diff -N ACE-desktop/icons/Text_Editor_32.png
Binary files /dev/null and /tmp/cvswG1jYN differ
Index: ACE-desktop/icons/Word_Processor_32.png
===================================================================
RCS file: ACE-desktop/icons/Word_Processor_32.png
diff -N ACE-desktop/icons/Word_Processor_32.png
Binary files /dev/null and /tmp/cvsDLEB2L differ
Index: gtkshell/macros.h
===================================================================
RCS file: gtkshell/macros.h
diff -N gtkshell/macros.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gtkshell/macros.h 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,43 @@
+/*
+ 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 GSH_MACROS_H
+#define GSH_MACROS_H
+
+#define GSH_NONE 0
+#define GSH_SCROLL 1
+#define GSH_CBEXIT 2
+#define GSH_UPDATING 4
+#define GSH_HORIZONTAL_LABELS 8
+#define GSH_PROMPT_ECHOES 16
+#define GSH_FRAMED_LABELS 32
+#define GSH_MENU_BUTTON 64
+#define GSH_NO_BASE_FRAME 128
+
+typedef guint Bitmask;
+
+#define GSH_FLAG(flag) ((gsh->bflags & flag) == flag)
+#define GSH_SET(flag) gsh->bflags |= flag
+#define GSH_UNSET(flag) gsh->bflags &= ~flag
+
+#endif /* not GSH_MACROS_H */
+
Index: gtkshell/terminal_options.c
===================================================================
RCS file: gtkshell/terminal_options.c
diff -N gtkshell/terminal_options.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gtkshell/terminal_options.c 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,48 @@
+/*
+ AntiRight
+ (c) 2002-2007 Jeffrey Bedard
+ address@hidden
+
+ This file is part of AntiRight.
+
+ AntiRight is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ AntiRight is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with AntiRight; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA
+*/
+
+#include "gtkshell.h"
+
+void
+gsh_handle_terminal_options(struct GSH * gsh, int argc,
+ char ** argv, int *counter)
+{
+ /* Handle -ot tertiary options. */
+ switch(argv[(*counter)][3])
+ {
+ case 'f': /* Set font for terminal widget. */
+ gsh_count(argc, counter);
+ gsh->terminal.font=argv[*counter];
+ break;
+ case 'h': /* Set terminal widget height. */
+ gsh_count(argc, counter);
+ gsh->terminal.height=atoi(argv[*counter]);
+ break;
+ case 'w': /* Set terminal widget width. */
+ gsh_count(argc, counter);
+ gsh->terminal.width=atoi(argv[*counter]);
+ break;
+ default: /* Error message. */
+ ARWARN("invalid tertiary terminal option");
+ }
+}
Index: gtkshell/terminal_options.h
===================================================================
RCS file: gtkshell/terminal_options.h
diff -N gtkshell/terminal_options.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gtkshell/terminal_options.h 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,32 @@
+/*
+ AntiRight
+ (c) 2002-2007 Jeffrey Bedard
+ address@hidden
+
+ This file is part of AntiRight.
+
+ AntiRight is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ AntiRight is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with AntiRight; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA
+*/
+
+#ifndef GSH_TERMINAL_OPTIONS_H
+#define GSH_TERMINAL_OPTIONS_H
+
+void
+gsh_handle_terminal_options(struct GSH * gsh, int argc,
+ char ** argv, int *counter);
+
+#endif /* not GSH_TERMINAL_OPTIONS_H */
+
Index: gtkshell/terminal_struct.h
===================================================================
RCS file: gtkshell/terminal_struct.h
diff -N gtkshell/terminal_struct.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gtkshell/terminal_struct.h 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,35 @@
+/*
+ AntiRight
+ (c) 2007 Jeffrey Bedard
+ address@hidden
+
+ This file is part of AntiRight.
+
+ AntiRight is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ AntiRight is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with AntiRight; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+*/
+
+#ifndef GSH_TERMINAL_STRUCT_H
+#define GSH_TERMINAL_STRUCT_H
+
+struct GSH_Terminal
+{
+ GtkWidget * widget;
+ gchar * font;
+ gchar * script;
+ guint width, height;
+};
+
+#endif /* not GSH_TERMINAL_STRUCT_H */
+
Index: libantiright/macros.h
===================================================================
RCS file: libantiright/macros.h
diff -N libantiright/macros.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libantiright/macros.h 19 Mar 2007 07:09:30 -0000 1.1
@@ -0,0 +1,67 @@
+/*
+ AntiRight
+ (c) 2007 Jeffrey Bedard
+ address@hidden
+
+ This file is part of AntiRight.
+
+ AntiRight is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ AntiRight is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with AntiRight; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+*/
+
+#ifndef LIBAR_MACROS_H
+#define LIBAR_MACROS_H
+
+#define ARBUGPARAM(message) \
+ "%s:%d: %s", __FILE__, __LINE__, message
+
+#define ARBUG(message) \
+ g_debug(ARBUGPARAM(message))
+
+#define ARWARN(message) \
+ g_warning(ARBUGPARAM(message))
+
+#define ARERR(message) \
+ g_error(ARBUGPARAM(message))
+
+#define ARBBOOL(x) (x == TRUE)
+#define ARPBOOL(x) (x != NULL)
+
+#define ARASSERT g_assert
+
+#define ARBASSERT(x) \
+ ARASSERT(ARBBOOL(x))
+
+#define ARPASSERT(x) \
+ ARASSERT(ARPBOOL(x))
+
+#define ARIFB(x) \
+ if(ARBBOOL(x))
+
+#define ARIFNB(x) \
+ if(!ARBBOOL(x))
+
+#define ARIFP(x) \
+ if(ARPBOOL(x))
+
+#define ARIFNP(x) \
+ if(!ARPBOOL(x))
+
+#define ARWIFNP(x) \
+ ARIFNP(x) \
+ ARWARN("NULL data passed, operation not performed"); \
+ else
+
+#endif /* not LIBAR_MACROS_H */
+
Index: ACE-desktop/guidl/ACE_Panel
===================================================================
RCS file: ACE-desktop/guidl/ACE_Panel
diff -N ACE-desktop/guidl/ACE_Panel
--- ACE-desktop/guidl/ACE_Panel 16 Mar 2007 02:01:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-// ACE Panel
-option "rows" 5;
-add buttons "ACE IRC", "ACE File_Manager", "ACE -A Manual_Browser",
- "ACE CD_Player", "ACE Calculator",
- "ACE -A Alarm", "ACE Mail", "ACE -A Settings", "ACE -A Command",
- "ACE -A Administration_Panel", "ACE -A File_System_Panel",
- "ACE -A Network_Panel", "ACE -A Publishing_Panel", "ACE -A Calendar",
- "gtkshell -da & # About";
-
Index: ACE-desktop/guidl/Administration_Panel
===================================================================
RCS file: ACE-desktop/guidl/Administration_Panel
diff -N ACE-desktop/guidl/Administration_Panel
--- ACE-desktop/guidl/Administration_Panel 16 Mar 2007 02:01:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-option "rows" 4;
-add buttons "ACE -A Secure_Permissions",
- "ACE Root_Shell",
- "ACE -A Monitoring_Panel",
- "ACE -A OS_Specific";
-
Index: ACE-desktop/guidl/Horizontal_Deskbar
===================================================================
RCS file: ACE-desktop/guidl/Horizontal_Deskbar
diff -N ACE-desktop/guidl/Horizontal_Deskbar
--- ACE-desktop/guidl/Horizontal_Deskbar 16 Mar 2007 02:01:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-// This is the default static deskbar, used by deskbar_style==3.
-
-option "rows" 1;
-option "geometry" "+0+0";
-
-add button "ACE,gtk-execute::ACE::eclipse";
-add prompt "env";
-
-add buttons "ACE Lock ,gtk-dialog-authentication",
- "ACE Screen,gtk-fullscreen",
- "ACE Terminal,gtk-properties",
- "ACE File_Manager ,gtk-directory",
- "ACE System_Monitor,gtk-preferences",
- "ACE Browser,gtk-network",
- "ACE Text_Editor ,gtk-edit",
- "ACE Calculator,gtk-execute",
- "ACE Sticky_Note,gtk-dialog-info";
-
-add updating label "date '+%m/%d/%y%n%H:%M:%S'";
-
-
-
Index: ACE-desktop/guidl/Manual_Browser
===================================================================
RCS file: ACE-desktop/guidl/Manual_Browser
diff -N ACE-desktop/guidl/Manual_Browser
--- ACE-desktop/guidl/Manual_Browser 16 Mar 2007 02:01:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-option "rows" 3;
-add label "Manual section:";
-add label " ";
-add label " ";
-add buttons "ACE -A Man_Browse_Section 1",
- "ACE -A Man_Browse_Section 2",
- "ACE -A Man_Browse_Section 3",
- "ACE -A Man_Browse_Section 4",
- "ACE -A Man_Browse_Section 5",
- "ACE -A Man_Browse_Section 6",
- "ACE -A Man_Browse_Section 7",
- "ACE -A Man_Browse_Section 8",
- "ACE -A Man_Browse_Section 9";
-
Index: ACE-desktop/guidl/Monitoring_Panel
===================================================================
RCS file: ACE-desktop/guidl/Monitoring_Panel
diff -N ACE-desktop/guidl/Monitoring_Panel
--- ACE-desktop/guidl/Monitoring_Panel 16 Mar 2007 02:01:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-option "rows" 4;
-add buttons "gtkshell -os -og 640x480 -ou 3000 -aul 'ps xau' & # Processes",
- "gtkshell -ou 2000 -aul who & # Users",
- "gtkshell -ou 5000 -aul df & # Disks",
- "ACE System_Monitor",
- "gtkshell -ou 2500 -aul uptime & # Uptime",
- "ACE -A System_Accounting",
- "xload -bg darkslategrey -fg white -hl azure & # XLoad",
- "gtkshell -aul iostat";
-
Index: ACE-desktop/guidl/Old_Deskbar
===================================================================
RCS file: ACE-desktop/guidl/Old_Deskbar
diff -N ACE-desktop/guidl/Old_Deskbar
--- ACE-desktop/guidl/Old_Deskbar 16 Mar 2007 02:01:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-option "geometry" "+0+0";
-option "rows" 1;
-add updating label "date";
-add buttons "ACE Lock", "ACE Screen", "ACE Terminal", "ACE Browser",
- "ACE Sticky_Note", "ACE";
-add prompt "env";
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright configure ACE-desktop/ACE ACE-desktop...,
Jeffrey Bedard <=