[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright Makefile configure ACE-desktop/ACE AC...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright Makefile configure ACE-desktop/ACE AC... |
|
Date: |
Fri, 16 Mar 2007 00:39:32 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/03/16 00:39:32
Modified files:
. : Makefile configure
ACE-desktop : ACE Makefile
doc : gtkshell.1
gshterm : Makefile gshterm.c main.c
gtkshell : Makefile add_options.c containers.c
containers.h font.c gtkshell.h guidl.lex
guidl.y image_button.c main.c option_options.c
options.c
libantiright : Makefile library.h
Log message:
Added GUI definition language. Is now functional.
Integrated terminal and gtkshell. gshterm is now a wrapper script.
Fixed makefile dependencies to avoid unnecessary relinking.
Updated gtkshell.1 manual page.
Added -oF option to specify no base frame.
Added -oS option to specify terminal font.
Added -as option to add a terminal widget.
Added -p option to read a guidl formatted piped stream.
Added -f option to read a guidl formatted piped file.
Removed -Werr option in CFLAGS.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/doc/gtkshell.1?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/Makefile?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/font.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/Makefile?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.10&r2=1.11
Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Makefile 10 Mar 2007 01:45:49 -0000 1.14
+++ Makefile 16 Mar 2007 00:39:31 -0000 1.15
@@ -30,14 +30,14 @@
all:
cd libantiright && $(MAKE)
cd gtkshell && $(MAKE)
- cd gshterm && $(MAKE)
cd ACE-desktop && $(MAKE)
- ctags -w -t */*.[ch] ACE-desktop/ACE
+
+ctags:
+ ctags -w */*.[ch] ACE-desktop/ACE
clean:
cd libantiright && $(MAKE) clean
cd gtkshell && $(MAKE) clean
- cd gshterm && $(MAKE) clean
cd ACE-desktop && $(MAKE) clean
distclean: clean
@@ -69,7 +69,6 @@
$(INSTALL_DATA) doc/TODO $(docdir)/antiright
$(INSTALL_DATA) doc/INSTALL $(docdir)/antiright
cd gtkshell && $(MAKE) install
- cd gshterm && $(MAKE) install
cd ACE-desktop && $(MAKE) install
bzball: distclean
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- configure 9 Mar 2007 20:06:53 -0000 1.84
+++ configure 16 Mar 2007 00:39:31 -0000 1.85
@@ -33,7 +33,7 @@
for ARG in $@; do
if [ "$ARG" = "-d" ]; then
echo 'Configuring with debug options...'
- CFLAGS="$CFLAGS -g3 -Wall -W -Werror -DDEBUG"
+ CFLAGS="$CFLAGS -g3 -Wall -W -DDEBUG"
elif [ "$ARG" = "-l" ]; then
PREFIX=/usr/local/packages/antiright
elif [ "$ARG" = "-s" ]; then
@@ -48,7 +48,7 @@
done
# For development branch
-CFLAGS="$CFLAGS -Wall -W -Werror -W"
+CFLAGS="$CFLAGS -Wall -W -W"
CFLAGS="$CFLAGS -Wwrite-strings "
CFLAGS="$CFLAGS -Wsign-compare -Wunreachable-code"
CFLAGS="$CFLAGS -Wmissing-noreturn -Wmissing-declarations"
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- ACE-desktop/ACE 5 Mar 2007 01:05:42 -0000 1.25
+++ ACE-desktop/ACE 16 Mar 2007 00:39:31 -0000 1.26
@@ -18,7 +18,8 @@
# /bin/sh should have job control enabled. (-m)
-icon=$PREFIX/share/ACE-desktop/icons
+datadir=$PREFIX/share/ACE-desktop
+icon=$datadir/icons
DEBUG=0
if [ "$DEBUG" = "1" ]; then
@@ -62,6 +63,11 @@
ARSHELL=gtkshell
AWK=awk
+GUIDL()
+{
+ exec $ARSHELL -f $datadir/$1
+}
+
ACE_Verification()
{
$ARSHELL -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
@@ -165,25 +171,23 @@
cd $1
fi
export AR_IN_FM=1
- local CMD="exec $ARSHELL -or 16 -og 750x500 -oe -al $(pwd)"
+ local CMD="exec $ARSHELL -os -or 16 -og 750x500 -oe -al $(pwd)"
local FM="ACE -A File_Manager"
- CMD="$CMD 'exit # CLOSE'"
- CMD="$CMD \"cd .. ; $FM & # UP\""
- CMD="$CMD 'ACE -A Delete & # ACE_-A_Delete'"
- CMD="$CMD 'ACE Text_Editor & # address@hidden@Editor'"
- CMD="$CMD 'ACE -A Move & # ACE_-A_Move'"
- CMD="$CMD 'ACE -A Copy & # ACE_-A_Copy'"
- CMD="$CMD 'ACE -A Command & # ACE_-A_Command'"
- CMD="$CMD 'ACE -A Modes & # ACE_-A_Modes'"
- CMD="$CMD 'ACE -A File_Manager & # Refresh'"
+ CMD="$CMD 'exit # CLOSE',gtk-quit"
+ CMD="$CMD \"cd .. ; $FM & # UP\",gtk-directory"
+ CMD="$CMD 'ACE -A Delete & # ACE_-A_Delete',gtk-delete"
+ CMD="$CMD 'ACE Text_Editor & # address@hidden@Editor',gtk-edit"
+ CMD="$CMD 'ACE -A Move & # ACE_-A_Move',gtk-cut"
+ CMD="$CMD 'ACE -A Copy & # ACE_-A_Copy',gtk-copy"
+ CMD="$CMD 'ACE -A Command & # ACE_-A_Command',gtk-execute"
+ CMD="$CMD 'ACE -A Modes & # ACE_-A_Modes',gtk-info"
+ CMD="$CMD 'ACE -A File_Manager & # Refresh',gtk-refresh"
CMD="$CMD -al '--------'"
local FILE
for FILE in *; do
CMD="$CMD \"ACE -A ARO $FILE & # $FILE\",gtk-file"
done
- CMD="$CMD 'exit # CLOSE'"
- CMD="$CMD \"cd .. ; $FM & # UP\""
if [ "$DEBUG" = "1" ]; then
echo $CMD
fi
@@ -211,12 +215,13 @@
echo -n ' '
swapctl -l | tail -n 1 | awk '{print $5}' | tr '\n' '\0'
}
+
taskbar_update()
{
-# From the NetBSD date man page
+ # From the NetBSD date man page
date '+%m/%d/%y%n%H:%M:%S'
-# uptime | awk '{$7=$7"\n"; print $0}'
}
+
Sticky_Note()
{
nice $ARSHELL -aT -og 175x200
@@ -224,16 +229,12 @@
Old_Deskbar()
{
- exec $ARSHELL -og $(ACE Deskbar_X)$(ACE Deskbar_Y)\
- -or 1\
- -aul "uptime | tr -d '\n'"\
- 'ACE Lock'\
- 'ACE Screen'\
- 'ACE Terminal'\
- 'ACE Browser'\
- 'ACE Sticky_Note'\
- 'ACE'\
- -at env
+ GUIDL Old_Deskbar
+}
+
+ICONDIR()
+{
+ echo $icon
}
Deskbar()
@@ -352,36 +353,12 @@
fi
exec sh -c "$CMD"
}
+
Manual_Browser()
{
- mbs=Man_Browse_Section
- exec $ARSHELL -or 3 -al "Manual section:" -al ' ' -al ' '\
- "ACE -A $mbs 1" "ACE -A $mbs 2"\
- "ACE -A $mbs 3" "ACE -A $mbs 4" "ACE -A $mbs 5"\
- "ACE -A $mbs 6" "ACE -A $mbs 7" "ACE -A $mbs 8"\
- "ACE -A $mbs 9"
-}
-
-ACE_Panel()
-{
- exec $ARSHELL -or 5 \
- 'ACE IRC' \
- 'ACE CD_Player' \
- 'ACE File_Manager' \
- 'ACE -A Manual_Browser' \
- '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 Manual_Browser' \
- 'ACE -A Publishing_Panel' \
- 'ACE -A Calendar'\
- 'gtkshell -da & # About'
-
+ GUIDL Manual_Browser
}
+
OS_Specific()
{
$ARSHELL -di 'No OS specific functionality available.'
@@ -490,6 +467,7 @@
}
Monitoring_Panel()
{
+
exec $ARSHELL -or 4 \
"$ARSHELL -os -og 640x480 -ou 3000 -aul 'ps xau' & # Processes"\
"$ARSHELL -ou 2000 -aul who & # Users"\
@@ -501,11 +479,7 @@
}
Administration_Panel()
{
- exec $ARSHELL -or 4 \
- 'ACE -A Secure_Permissions'\
- 'ACE Root_Shell'\
- 'ACE -A Monitoring_Panel'\
- 'ACE -A OS_Specific'
+ exec $ARSHELL -f $datadir/Administration_Panel
}
System_Accounting()
{
@@ -710,7 +684,7 @@
$command $@ &
fi
else
- ACE_Panel
+ GUIDL ACE_Panel
fi
Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ACE-desktop/Makefile 10 Mar 2007 02:25:58 -0000 1.13
+++ ACE-desktop/Makefile 16 Mar 2007 00:39:31 -0000 1.14
@@ -25,7 +25,9 @@
include ../config.mk
-all:
+all: ACE.install
+
+ACE.install: ACE
echo '#!/bin/sh' > ACE.install
grep ^PREFIX ../config.mk >> ACE.install
cat ACE >> ACE.install
@@ -52,6 +54,7 @@
${INSTALL_DIR} $(datadir)
${INSTALL_DIR} $(icondir)
$(INSTALL_DATA) system.antiright $(datadir)
+ $(INSTALL_DATA) guidl/* $(datadir)
$(INSTALL_SCRIPT) ACE.install $(bindir)/ACE
$(INSTALL_DATA) ACE.1 $(man1dir)
$(INSTALL_DATA) system.antiright.5 $(man5dir)
Index: doc/gtkshell.1
===================================================================
RCS file: /sources/antiright/antiright/doc/gtkshell.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/gtkshell.1 9 Mar 2007 22:50:59 -0000 1.7
+++ doc/gtkshell.1 16 Mar 2007 00:39:31 -0000 1.8
@@ -1,4 +1,4 @@
-.DD March 9, 2007
+.DD March 14, 2007
.TH gtkshell 1
.SH NAME
gtkshell \- invocation configurable GUI shell
@@ -20,11 +20,13 @@
message
.B ]s[w
message
-.B ]]] [-o[Eefghn[r
+.B ]]] [-f
+file
+.B ] [-o[Eefghn[r
rows
.B ][u
miliseconds
-.B ]]]] [
+.B ]]]] [-p] [
command
.B ] [
command
@@ -153,6 +155,9 @@
.B message
as its text.
.TP
+.B \-f file
+Parses a file in the GUIDL format.
+.TP
.B \-oE
Make a text entry only print the text to standard output, rather than executing
a command.
@@ -182,6 +187,9 @@
.TP
.B \-ou miliseconds
Specify refresh frequency of updater widgets.
+.TP
+.B \-p
+Parses piped input in the GUIDL format.
.SH AUTHORS
gtkshell was written by Jeffrey Bedard <address@hidden>.
Index: gshterm/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gshterm/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gshterm/Makefile 7 Mar 2007 06:44:47 -0000 1.7
+++ gshterm/Makefile 16 Mar 2007 00:39:31 -0000 1.8
@@ -28,21 +28,21 @@
#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
CFLAGS+=`pkg-config --cflags gtk+-2.0` $(DEFS) -I../libantiright -I../gtkshell
CFLAGS+=`pkg-config --cflags vte`
-LDFLAGS+=-L../libantiright -L../gtkshell
+LDFLAGS+=-L../libantiright -L../gtkshell -L./
LDFLAGS+=`pkg-config --libs gtk+-2.0` -lgtkshell -lantiright
LDFLAGS+=`pkg-config --libs vte`
-objects=main.o gshterm.o command_line.o script.o
-sources=main.c gshterm.c command_line.c script.c
-all: $(objects)
- $(CC) -o gshterm $(objects) $(LDFLAGS)
-
-lint:
- splint `pkg-config --cflags-only-I gtk+-2.0`\
- `pkg-config --cflags-only-I vte` $(sources) > lint.out
+objects=gshterm.o command_line.o script.o
+program=main.o
+
+all: gshterm
+
+gshterm: $(objects) $(program)
+ ar rcs libgshterm.a $(objects)
+ $(CC) -o gshterm $(program) $(LDFLAGS) -lgshterm
clean:
- rm -f gshterm *.o
+ rm -f gshterm *.o libgshterm.a
install:
install gshterm $(PREFIX)/bin
Index: gshterm/gshterm.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gshterm/gshterm.c 28 Feb 2007 03:53:51 -0000 1.11
+++ gshterm/gshterm.c 16 Mar 2007 00:39:31 -0000 1.12
@@ -68,6 +68,7 @@
struct GSHTerm *
gshterm_setup_terminal(struct GSHTerm * term)
{
+ GtkWidget * column;
#ifdef DEBUG
ARPASSERT(term);
@@ -76,7 +77,13 @@
#endif /* DEBUG */
term->widget = vte_terminal_new();
+ column=gtk_vbox_new(FALSE, 2);
+ gtk_container_add(GTK_CONTAINER(term->gsh->window), column);
+ gtk_widget_show(term->gsh->window);
+ term->gsh->window=column;
+ gtk_widget_show(term->gsh->window);
gtk_container_add(GTK_CONTAINER(term->gsh->window), term->widget);
+ gsh_setup_containers(term->gsh);
gshterm_set_terminal_options(term);
gtk_widget_show(term->widget);
@@ -99,3 +106,4 @@
return term;
}
+
Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gshterm/main.c 7 Mar 2007 06:44:47 -0000 1.14
+++ gshterm/main.c 16 Mar 2007 00:39:31 -0000 1.15
@@ -57,6 +57,8 @@
/* Initialize GTK, GSH, and GSHTerm. */
term = gshterm_init_and_script(&argc, &argv);
+ gsh_parse_arguments(term->gsh, argc, argv);
+
gsh_check_and_set_geometry(term->gsh);
g_signal_connect(G_OBJECT(term->widget), "child-exited",
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/Makefile 9 Mar 2007 20:00:29 -0000 1.11
+++ gtkshell/Makefile 16 Mar 2007 00:39:31 -0000 1.12
@@ -26,34 +26,49 @@
include ../config.mk
#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
-GTKFLAGS=`pkg-config --cflags gtk+-2.0`
+GTKFLAGS=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags vte`
CFLAGS+=$(GTKFLAGS) $(DEFS)
LDFLAGS+=-L../libantiright -lantiright
-LDFLAGS+=`pkg-config --libs gtk+-2.0`
+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs vte`
#LDFLAGS+=-lefence
objects=gtkshell.o arguments.o options.o callbacks.o updated.o\
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
+ image_button.o y.tab.o lex.yy.o terminal.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
+ image_button.c y.tab.c lex.yy.c terminal.o
+
+all: gtkshell
+
-all: $(objects) main.o
- $(CC) -o gtkshell $(objects) main.o $(LDFLAGS)
+gtkshell: y.tab.c $(objects) $(program)
+ $(CC) -o gtkshell $(objects) $(program) $(LDFLAGS)
ar rcs libgtkshell.a $(objects)
+lex.yy.c: guidl.lex
+ lex guidl.lex
+
+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
-clean:
+parser-clean:
+ rm -f *.yy.c *.tab.c *.tab.h
+
+clean: parser-clean
rm -f gtkshell *.o libgtkshell.a
install:
install gtkshell $(PREFIX)/bin
+ install gshterm $(PREFIX)/bin
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gtkshell/add_options.c 11 Mar 2007 21:58:51 -0000 1.18
+++ gtkshell/add_options.c 16 Mar 2007 00:39:31 -0000 1.19
@@ -83,6 +83,11 @@
gsh_new_row(gsh);
break;
+ case 's': /* Add a shell. */
+ gsh_count(argc, counter);
+ gsh_setup_terminal(gsh, argv[*counter]);
+ break;
+
case 't':
if (argc != *counter)
gsh_count(argc, counter);
Index: gtkshell/containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/containers.c 2 Mar 2007 16:41:43 -0000 1.9
+++ gtkshell/containers.c 16 Mar 2007 00:39:31 -0000 1.10
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -58,22 +58,27 @@
gsh->rows.h);
}
-
void
gsh_setup_containers(struct GSH * gsh)
{
gsh->rows.h = gtk_hbox_new(FALSE, 2);
+ gtk_widget_show(gsh->rows.h);
+ gsh_new_row(gsh);
+}
- if ((gsh->bflags & GSH_SCROLL) == GSH_SCROLL)
+void
+gsh_setup_base_container(struct GSH * gsh)
+{
+ if (GSH_FLAG(GSH_SCROLL))
{
gsh_setup_scrolled_window(gsh);
gtk_scrolled_window_add_with_viewport(
GTK_SCROLLED_WINDOW(gsh->scrolled_window),
gsh->rows.h);
}
- else
+ else if (!GSH_FLAG(GSH_NO_BASE_FRAME))
setup_framed(gsh);
-
- gtk_widget_show(gsh->rows.h);
- gsh_new_row(gsh);
+ else
+ gtk_container_add(GTK_CONTAINER(gsh->window), gsh->rows.h);
}
+
Index: gtkshell/containers.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/containers.h 28 Feb 2007 03:53:51 -0000 1.4
+++ gtkshell/containers.h 16 Mar 2007 00:39:31 -0000 1.5
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -24,9 +24,12 @@
#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);
+
+void
+gsh_setup_base_container(struct GSH * gsh);
#endif /* GSH_CONTAINERS_H */
Index: gtkshell/font.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/font.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/font.c 7 Mar 2007 06:44:47 -0000 1.4
+++ gtkshell/font.c 16 Mar 2007 00:39:31 -0000 1.5
@@ -25,14 +25,19 @@
void
gsh_widget_set_font(GtkWidget *widget, const gchar *font)
{
- PangoFontDescription *font_desc;
-
ARPASSERT(widget);
ARPASSERT(font);
+ if(VTE_IS_TERMINAL(widget))
+ vte_terminal_set_font_from_string(VTE_TERMINAL(widget), font);
+ else
+ {
+ PangoFontDescription *font_desc;
+
font_desc = pango_font_description_from_string(font);
gtk_widget_modify_font(widget, font_desc);
pango_font_description_free(font_desc);
+ }
}
void
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gtkshell/gtkshell.h 9 Mar 2007 20:00:29 -0000 1.24
+++ gtkshell/gtkshell.h 16 Mar 2007 00:39:31 -0000 1.25
@@ -27,8 +27,26 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <vte/vte.h>
+#include <unistd.h>
+
#include "../libantiright/library.h"
+#ifndef YYFILE
+#include "y.tab.h"
+#endif /* !YYFILE */
+
+int
+yyparse();
+
+void
+gsh_free_parse_memory();
+
+void
+gsh_append_arg(char *);
+
struct GSH_Rows
{
GtkWidget *h;
@@ -43,6 +61,13 @@
/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
@@ -51,6 +76,11 @@
#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
struct GSH
{
@@ -58,6 +88,7 @@
GtkWidget *scrolled_window;
struct GSH_Rows rows;
struct GSH_Updater update;
+ struct GSH_Terminal terminal;
GtkWidget *button;
/address@hidden@*/ gchar *geometry;
guint bflags;
@@ -83,6 +114,7 @@
#include "font.h"
#include "dragdrop.h"
#include "image_button.h"
+#include "terminal.h"
void
gsh_stack_init(struct GSH * gsh, int *argc, char ***argv);
Index: gtkshell/guidl.lex
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.lex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/guidl.lex 8 Mar 2007 06:07:52 -0000 1.1
+++ gtkshell/guidl.lex 16 Mar 2007 00:39:31 -0000 1.2
@@ -1,15 +1,31 @@
%{
-#include "y.tab.h"
+
+#include "gtkshell.h"
+
%}
%%
-CHARACTER [A-za-z\/\_\'\.\"] return CHARACTER;
-/* Conversion is internal. */
-NUMBER ([0-9])+ return NUMBER;
-WORD {CHARACTER}[{CHARACTER}{NUMBER}]*$ return WORD;
-STRING \"{WORD}[{NUMBER}{CHARACTER} ]*\" return STRING;
-COMMA , return COMMA;
-LIST : return LIST;
-ITEM :: return ITEM;
-OPTION -o return OPTION;
-SPACE [ \t] return SPACE;
+[A-Za-z] yylval.string=strdup(yytext); return CHAR;
+\"[^\"]*\" {
+ /* Remove quotes. */
+ yylval.string=strdup(yytext+1);
+ yylval.string[yyleng-2]='\0';
+ return STRING;
+ }
+[0-9]+ yylval.number=atoi(yytext); return NUM;
+, return COMMA;
+; return END;
+:: return IFS;
+option return OPTION;
+button return BUTTON;
+add return ADD;
+prompt return PROMPT;
+viewer return VIEWER;
+label return LABEL;
+progress return PROGRESS;
+updating return UPDATING;
+buttons return BUTTONS;
+
+[ \t\n] /* ignore */;
+"//".*$ /* comment */;
+
%%
Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/guidl.y 8 Mar 2007 06:07:52 -0000 1.1
+++ gtkshell/guidl.y 16 Mar 2007 00:39:31 -0000 1.2
@@ -1,8 +1,18 @@
%{
#include <stdio.h>
+#define YYFILE
#include "gtkshell.h"
void
+yyerror(const char *string);
+
+int
+yywrap();
+
+void
+gsh_append_arg(char * arg);
+
+void
yyerror(const char *string)
{
g_error("error: %s\n", string);
@@ -14,49 +24,196 @@
return 1;
}
+struct GSH * gsh_gsh;
+char **gsh_parsed_argv;
+int gsh_parsed_argc=0;
+
+void
+gsh_append_arg(char * arg)
+{
+ gsh_parsed_argc++;
+ gsh_parsed_argv=realloc(gsh_parsed_argv, sizeof(char*)*gsh_parsed_argc);
+ gsh_parsed_argv[gsh_parsed_argc-1]=strdup(arg);
+}
+
+void
+gsh_free_parse_memory()
+{
+ for(;gsh_parsed_argc>0; gsh_parsed_argc--)
+ free(gsh_parsed_argv[gsh_parsed_argc-1]);
+ free(gsh_parsed_argv);
+}
+
%}
-%token IMAGE STRING WORD NUMBER MENU PAIR MENU_BUTTON
-%
+%union
+{
+ char * string;
+ int number;
+}
+%token IFS SC COMMA OPTION PROMPT VIEWER LABEL
+%token BUTTON END ADD UPDATING PROGRESS BUTTONS
+%token <string> STRING
+%token <number> NUM
+%token <string> CHAR
+%%
commands:
+/* empty */
|
-commands command
+commands command END
;
command:
-add
-|
option
+|
+add
;
-add:
-STRING
+option:
+OPTION CHAR
{
+ char * option_string;
+ asprintf(&option_string, "-o%s", $2);
+ gsh_append_arg(option_string);
+ free(option_string);
}
|
-WORD STRING
+OPTION STRING
{
+ char option;
+ if(!strcmp($2, "undecorated"))
+ option='n';
+ else if(!strcmp($2, "frame_labels"))
+ option='f';
+ else if(!strcmp($2, "exit_on_activate"))
+ option='e';
+ else if(!strcmp($2, "horizontal_labels"))
+ option='h';
+ else
+ break;
+
+ {
+ char * option_string;
+
+ asprintf(&option_string, "-o%c", option);
+ gsh_append_arg(option_string);
+ free(option_string);
+ }
}
|
-LIST items
+OPTION CHAR NUM
{
+ char * option_string;
+
+ asprintf(&option_string, "-o%s", $2);
+ gsh_append_arg(option_string);
+ free(option_string);
+ asprintf(&option_string, "%d", $3);
+ gsh_append_arg(option_string);
+ free(option_string);
+}
+|
+OPTION STRING STRING
+{
+ char option;
+
+ if(!strcmp($2, "geometry"))
+ option='g';
+ else
+ {
+ ARWARN("Invalid option.");
+ break;
+ }
+
+ {
+ char * option_string;
+
+ asprintf(&option_string, "-o%c", option);
+ gsh_append_arg(option_string);
+ free(option_string);
+ gsh_append_arg($3);
+ }
+}
+|
+OPTION STRING NUM
+{
+ char option;
+
+ if(!strcmp($2, "update_frequency"))
+ option='u';
+ if(!strcmp($2, "rows"))
+ option = 'r';
+ else
+ break;
+
+ {
+ char * option_string;
+
+ asprintf(&option_string, "-o%c", option);
+ gsh_append_arg(option_string);
+ free(option_string);
+ asprintf(&option_string, "%d", $3);
+ gsh_append_arg(option_string);
+ free(option_string);
+ }
}
;
-items:
+add:
+ADD PROMPT STRING
+{
+ gsh_append_arg((char *)"-at");
+ gsh_append_arg($3);
+}
+|
+ADD VIEWER STRING
+{
+ gsh_append_arg((char *)"-ae");
+ gsh_append_arg($3);
+}
+|
+ADD LABEL STRING
+{
+ gsh_append_arg((char *)"-al");
+ gsh_append_arg($3);
+ ARBUG($3);
+}
|
-items item
+ADD BUTTON STRING
+{
+ gsh_append_arg($3);
+ ARBUG($3);
+}
+|
+ADD UPDATING PROGRESS STRING
+{
+ gsh_append_arg((char*)"-aup");
+ gsh_append_arg($4);
+
+}
+|
+ADD UPDATING LABEL STRING
+{
+ gsh_append_arg((char*)"-aul");
+ gsh_append_arg($4);
+}
+|
+ADD BUTTONS buttons
;
-item:
-ITEM STRING
+buttons:
+/* empty */
|
-ITEM STRING COMMA STRING
+buttons button COMMA
+|
+buttons button
;
-option:
-OPTION WORD
+button:
+STRING
{
+ gsh_append_arg($1);
}
-%
+;
+
Index: gtkshell/image_button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/image_button.c 5 Mar 2007 01:05:42 -0000 1.5
+++ gtkshell/image_button.c 16 Mar 2007 00:39:31 -0000 1.6
@@ -42,9 +42,10 @@
hrow=gtk_hbox_new(FALSE, 2);
gtk_container_add(GTK_CONTAINER(gsh->button), hrow);
gtk_widget_show(hrow);
- gtk_container_add(GTK_CONTAINER(hrow), image);
+ gtk_box_pack_start(GTK_BOX(hrow), image, FALSE, FALSE, 0);
gtk_widget_show(image);
gtk_container_add(GTK_CONTAINER(hrow), label);
+
gtk_widget_show(label);
}
}
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/main.c 2 Mar 2007 03:56:07 -0000 1.13
+++ gtkshell/main.c 16 Mar 2007 00:39:31 -0000 1.14
@@ -25,9 +25,10 @@
int
main(int argc, char **argv)
{
+ //Store application structure on stack.
struct GSH gsh;
- //Store application structure on stack.
+ gsh.terminal.script=NULL;
gsh_stack_init(&gsh, &argc, &argv);
@@ -41,10 +42,17 @@
gsh_setup_containers(&gsh);
gsh_parse_arguments(&gsh, argc, argv);
+ gsh_setup_base_container(&gsh);
gsh_check_and_set_geometry(&gsh);
gtk_widget_show(gsh.window);
gtk_main();
+ if(gsh.terminal.script != NULL)
+ {
+ unlink(gsh.terminal.script);
+ free(gsh.terminal.script);
+ }
+
return (EXIT_SUCCESS);
}
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/option_options.c 9 Mar 2007 22:12:14 -0000 1.13
+++ gtkshell/option_options.c 16 Mar 2007 00:39:31 -0000 1.14
@@ -17,7 +17,8 @@
You should have received a copy of the GNU General Public License
along with AntiRight; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA
*/
#include "gtkshell.h"
@@ -30,13 +31,16 @@
{
case 'E': /* Make a text entry simply print the
* text. */
- gsh->bflags |= GSH_PROMPT_ECHOES;
+ GSH_SET(GSH_PROMPT_ECHOES);
break;
case 'e':
- gsh->bflags |= GSH_CBEXIT;
+ GSH_SET(GSH_CBEXIT);
+ break;
+ case 'F':
+ GSH_SET(GSH_NO_BASE_FRAME);
break;
case 'f':
- gsh->bflags |= GSH_FRAMED_LABELS;
+ GSH_SET(GSH_FRAMED_LABELS);
break;
case 'g':
gsh_count(argc, counter);
@@ -48,7 +52,7 @@
break;
case 'h':
- gsh->bflags |= GSH_HORIZONTAL_LABELS;
+ GSH_SET(GSH_HORIZONTAL_LABELS);
break;
case 'n':
@@ -64,6 +68,17 @@
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];
+ break;
+
case 'u':
gsh_count(argc, counter);
gsh->update.period = atoi(argv[*counter]);
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/options.c 28 Feb 2007 03:53:51 -0000 1.10
+++ gtkshell/options.c 16 Mar 2007 00:39:31 -0000 1.11
@@ -22,6 +22,10 @@
#include "gtkshell.h"
+extern FILE *yyin, *yyout;
+extern int gsh_parsed_argc;
+extern char ** gsh_parsed_argv;
+
#ifdef _GNU_SOURCE
inline
#endif /* _GNU_SOURCE */
@@ -45,9 +49,23 @@
case 'd':
gsh_handle_dialog_arguments(gsh, argc, argv, counter);
break;
+ case 'f':
+ gsh_count(argc, counter);
+ yyin=fopen(argv[*counter], "r");
+ gsh_append_arg((char*)"guidl");
+ yyparse();
+ gsh_parse_arguments(gsh, gsh_parsed_argc, gsh_parsed_argv);
+ //gsh_free_parse_memory();
+ break;
case 'o':
gsh_handle_option_arguments(gsh, argc, argv, counter);
break;
+ case 'p': /* Handle piped in GUIDL input. */
+ gsh_append_arg((char*)"guidl");
+ yyparse();
+ gsh_parse_arguments(gsh, gsh_parsed_argc, gsh_parsed_argv);
+ //gsh_free_parse_memory();
+ break;
default:
g_warning("%s: %s undefined\n", argv[0], argv[(*counter)]);
}
Index: libantiright/Makefile
===================================================================
RCS file: /sources/antiright/antiright/libantiright/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libantiright/Makefile 9 Feb 2007 16:28:34 -0000 1.3
+++ libantiright/Makefile 16 Mar 2007 00:39:32 -0000 1.4
@@ -2,8 +2,12 @@
CFLAGS=$(DEFS) `pkg-config --cflags glib-2.0`
-all: pipe.o string.o system.o util.o
- ar rcs libantiright.a pipe.o string.o system.o util.o
+all: libantiright.a
+
+objects=pipe.o string.o system.o util.o
+
+libantiright.a: ${objects}
+ ar rcs libantiright.a ${objects}
clean:
rm -f *.o *.a
Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libantiright/library.h 28 Feb 2007 03:53:51 -0000 1.10
+++ libantiright/library.h 16 Mar 2007 00:39:32 -0000 1.11
@@ -38,8 +38,12 @@
#define ARBUGPARAM(message) \
"%s:%d: %s", __FILE__, __LINE__, message
+#ifdef DEBUG
#define ARBUG(message) \
g_debug(ARBUGPARAM(message))
+#else
+#define ARBUG(message) /* disabled */
+#endif /* DEBUG */
#define ARWARN(message) \
g_warning(ARBUGPARAM(message))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright Makefile configure ACE-desktop/ACE AC...,
Jeffrey Bedard <=