[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/ACE gtkshell/add_options....
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/ACE gtkshell/add_options.... |
|
Date: |
Wed, 28 Feb 2007 06:55:27 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/28 06:55:27
Modified files:
ACE-desktop : ACE
gtkshell : add_options.c callbacks.c dragdrop.c gtkshell.c
main.c text.c
Log message:
Added command to find cd commands in strings. May be adapted to a
generic
command lexer.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.12&r2=1.13
Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ACE-desktop/ACE 28 Feb 2007 03:22:03 -0000 1.17
+++ ACE-desktop/ACE 28 Feb 2007 06:55:27 -0000 1.18
@@ -62,7 +62,7 @@
ACE_Verification()
{
- $ARSHELL -os -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
+ $ARSHELL -or 1 -oe -al "$(echo $1 __ | tr '_' ' ')"\
'echo Yes' 'echo No'
}
ACE_Check_Configuration_File()
@@ -107,7 +107,7 @@
}
Prompt_User()
{
- $ARSHELL -os -oe -al "Enter $1:"
+ $ARSHELL -oe -al "Enter $1:"
}
Binary_Command()
{
@@ -146,9 +146,10 @@
}
Modes()
{
- $ARSHELL -al "$(ls -l $1)" -al 'Drag a mode to the appropriate chmod'\
- 'chmod u' 'chmod g' 'chmod o' -al add: '+r' '+w' '+x'\
- -al subtract: '-r' '-w' '-x'
+ $ARSHELL -or 5 -al "$(ls -l $1)" -ar\
+ -al 'Drag a mode to the appropriate chmod'\
+ 'chmod u' 'chmod g' 'chmod o' -ar -al add: '+r' '+w' '+x'\
+ -ar -al subtract: '-r' '-w' '-x'
Check_AR_IN_FM
}
@@ -158,32 +159,37 @@
local TMP=$(Get_Temp File_Manager)
Prepare_Temp_Script $TMP
echo "export AR_IN_FM=1" >> $TMP
- echo "exec $ARSHELL -og 750x500 -oe -al $(pwd)\\" >> $TMP
+ echo "exec $ARSHELL -os -og 750x500 -oe -al $(pwd)\\" >> $TMP
local FM="ACE -A File_Manager"
- echo " 'ACE_-A_Delete' 'ACE_-A_Text_Editor'\\" >> $TMP
- echo " 'ACE_-A_Move' 'ACE_-A_Copy'\\" >> $TMP
- echo " 'ACE_-A_Command' 'ACE_-A_Modes'\\" >> $TMP
- echo " 'ACE -A File_Manager \# Refresh\\" >> $TMP
+ echo " 'ACE -A Delete & # ACE_-A_Delete'\\" >> $TMP
+ echo " 'ACE Text_Editor & # ACE_Text_Editor'\\" >> $TMP
+ echo " 'ACE -A Move & # ACE_-A_Move'\\" >> $TMP
+ echo " 'ACE -A Copy & # ACE_-A_Copy'\\" >> $TMP
+ echo " 'ACE -A Command & # ACE_-A_Command'\\" >> $TMP
+ echo " 'ACE -A Modes & # ACE_-A_Modes'\\" >> $TMP
+ echo " 'ACE -A File_Manager # Refresh'\\" >> $TMP
for file in *; do
- echo " '""ACE -A ARO $file & $FM & \# $file""'\\" >> $TMP
+ echo " '""ACE -A ARO $file & # $file""'\\" >> $TMP
done
- echo " '""cd .. ; $FM & \# UP""'\\" >> $TMP
+ echo " 'exit # CLOSE'\\" >> $TMP
+ echo " '""cd .. ; $FM & \# UP""'" >> $TMP
if [ "$DEBUG" = "1" ]; then
cat $TMP
fi
+ cat $TMP | grep -n --color=always '.*'
$TMP
rm -f $TMP
}
Clock()
{
- gtkshell -os -on -og -0-0 -aul "date | tr '\n' ' '"
+ gtkshell -on -og -0-0 -aul "date | tr '\n' ' '"
}
Console()
{
local TMP=$(Get_Temp Console)
Prepare_Temp_Script $TMP
- echo 'gtkshell -og 750x500+0-0 -ou 5000\' >> $TMP
+ echo "$ARSHELL -os -og 750x500+0-0 -ou 5000\\" >> $TMP
for ITEM in "$@"; do
echo " -al $ITEM -aul \"tail -n 3 $ITEM\" \\" >> $TMP
@@ -207,7 +213,7 @@
}
Sticky_Note()
{
- nice $ARSHELL -os -aT -og 175x200
+ nice $ARSHELL -aT -og 175x200
}
Old_Deskbar()
@@ -246,7 +252,7 @@
# Set correct permissions and shell.
Prepare_Temp_Script $TMP
- echo "exec $ARSHELL -os -of -on $OPTIONS \\" >> $TMP
+ echo "exec $ARSHELL -of -on $OPTIONS \\" >> $TMP
echo " -og +$(ACE Deskbar_X)+$(ACE Deskbar_Y)\\" >> $TMP
if [ "$UPDATER" = "TRUE" ]; then
@@ -275,7 +281,10 @@
}
ARO()
{
+# TMP=Get_Temp ARO
+# TMP=Prepare_Temp $TMP
TMP=/tmp/ARO.$$
+ echo $@
if [ $# -gt 0 ]; then
file $1 > $TMP
if grep script $TMP; then
@@ -311,8 +320,8 @@
elif grep empty $TMP; then
ACE Text_Editor $1 &
elif grep directory $TMP; then
- cd $1
- ACE File_Manager
+ local AR_IN_FM=0
+ cd $1 && File_Manager
else
# Execute the file.
$@ &
@@ -320,6 +329,9 @@
else
$ARSHELL -de "No arguments were specified" &
fi
+ if [ "$AR_IN_FM" = "1" ]; then
+ File_Manager
+ fi
rm -f $TMP
}
Read_Man_Page()
@@ -334,7 +346,7 @@
chmod og-rwx $tf
chmod u+x $tf
echo '#!/bin/sh' >> $tf
- echo "$ARSHELL -og 500x450 -or 42\\" >> $tf
+ echo "$ARSHELL -os -og 500x450 -or 42\\" >> $tf
manual_root=$(ACE Manual_Root)
cd $manual_root/man$1
echo "'Manual Section "$1"' \\" >> $tf
@@ -353,19 +365,15 @@
Manual_Browser()
{
mbs=Man_Browse_Section
- $ARSHELL -os -or 3 -al "Manual section:" -al ' ' -al ' '\
+ $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"
}
-Man_Page()
-{
- rmp " " $1
-}
ACE_Panel()
{
- $ARSHELL -os -or 5 \
+ $ARSHELL -or 5 \
'ACE IRC' \
'ACE CD_Player' \
'ACE File_Manager' \
@@ -389,12 +397,12 @@
}
Command()
{
- local COMMAND="$($ARSHELL -os -al 'Command:' -oe -at env)"
+ local COMMAND="$($ARSHELL -al 'Command:' -oe -at env)"
exec $COMMAND $@
}
Calendar()
{
- $ARSHELL -os -al "$(cal)"
+ $ARSHELL -al "$(cal)"
}
ARI()
{
@@ -439,7 +447,7 @@
# Ensure the existance of a configuration file.
ACE_Check_Configuration_File
local TMP=${TMPDIR:-/tmp}/ACE.$$
- echo "$ARSHELL -os -or 11"\\ > $TMP
+ echo "$ARSHELL -or 11"\\ > $TMP
for title in $(ACE_record_titles)
do
echo " \"ACE -A Settings_Node $title\""\\ >> $TMP
@@ -457,9 +465,9 @@
}
Alarm()
{
- local alarm_time="$($ARSHELL -os -al 'Alarm Time (ex 22:40):' -oe -at
echo)"
+ local alarm_time="$($ARSHELL -al 'Alarm Time (ex 22:40):' -oe -at echo)"
if [ "$alarm_time" != "" ]; then
- $ARSHELL -os -al "Alarm Command:" -oe -at echo | at "$alarm_time"
+ $ARSHELL -al "Alarm Command:" -oe -at echo | at "$alarm_time"
fi
}
@@ -701,7 +709,7 @@
exit 0
;;
L|+L)
- arguments=$($ARSHELL -os -al 'Launch Arguments:' -oe -at "echo")
+ arguments=$($ARSHELL -al 'Launch Arguments:' -oe -at "echo")
shift $(($OPTIND - 1))
$@ $arguments &
exit 0
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/add_options.c 28 Feb 2007 03:53:51 -0000 1.8
+++ gtkshell/add_options.c 28 Feb 2007 06:55:27 -0000 1.9
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -51,13 +51,12 @@
break;
case 'I':
- gsh_handle_add_unlabeled_image_button(
- gsh, argc, argv, counter);
+ gsh_handle_add_unlabeled_image_button(gsh, argc,
+ argv, counter);
break;
case 'i':
- gsh_handle_add_image_button(
- gsh, argc, argv, counter);
+ gsh_handle_add_image_button(gsh, argc, argv, counter);
break;
case 'l':
@@ -65,6 +64,10 @@
gsh_add_label(gsh, argv[(*counter)]);
break;
+ case 'r': /* Force creation of a new row. */
+ gsh_new_row(gsh);
+ break;
+
case 't':
if (argc != *counter)
gsh_count(argc, counter);
@@ -77,8 +80,7 @@
break;
case 'u':
- gsh_handle_updated_arguments(
- gsh, argc, argv, counter);
+ gsh_handle_updated_arguments(gsh, argc, argv, counter);
break;
}
}
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/callbacks.c 28 Feb 2007 03:53:51 -0000 1.12
+++ gtkshell/callbacks.c 28 Feb 2007 06:55:27 -0000 1.13
@@ -22,7 +22,6 @@
#include "gtkshell.h"
-
static void
gsh_test_exit(struct GSH * gsh)
{
@@ -39,6 +38,31 @@
#endif /* DEBUG */
}
+static void
+find_cd(gchar * command)
+{
+ gint length;
+ gint i;
+
+ length=strlen(command);
+ for(i=0; (i+3) < length; i++)
+ {
+ if(strncmp((command+i), "cd ", 3) == 0)
+ {
+ gchar *directory;
+
+ command+=i+3;
+ length=strlen(command);
+ for(i=0; (i < length) && (command[i] != ' '); i++);
+ directory=(gchar *)xmalloc(sizeof(gchar)*(i+1));
+ strncpy(directory, command, i+3);
+ g_chdir(directory);
+ g_free(directory);
+ break;
+ }
+ }
+}
+
void
system_cb(GtkWidget *widget, gpointer data)
{
Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/dragdrop.c 28 Feb 2007 03:53:51 -0000 1.5
+++ gtkshell/dragdrop.c 28 Feb 2007 06:55:27 -0000 1.6
@@ -88,11 +88,13 @@
switch (target_type)
{
case TARGET_STRING:
- sysprintf("%s %s",
- gtk_button_get_label(GTK_BUTTON(widget)),
- (gchar *) selection->data);
+ {
+ char *label;
+ label=gtk_button_get_label(GTK_BUTTON(widget));
+ sysprintf("%s %s", label, (gchar *) selection->data);
drag_status = TRUE;
break;
+ }
default:
drag_status = FALSE;
ARWARN("invalid data dropped");
Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/gtkshell.c 28 Feb 2007 03:53:51 -0000 1.16
+++ gtkshell/gtkshell.c 28 Feb 2007 06:55:27 -0000 1.17
@@ -42,7 +42,7 @@
static void
gsh_GSH_Flags(struct GSH_Flags * flags)
{
- flags->dont_scroll = FALSE;
+ flags->dont_scroll = TRUE;
flags->button_exits = FALSE;
flags->updating = FALSE;
flags->prompt_echoes = FALSE;
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/main.c 28 Feb 2007 03:53:51 -0000 1.10
+++ gtkshell/main.c 28 Feb 2007 06:55:27 -0000 1.11
@@ -36,11 +36,8 @@
g_debug("row:\t%d\n", gsh.rows.row);
#endif /* DEBUG */
- gsh.flags.dont_scroll =
- (((argc > 1)
- && (strlen(argv[1]) == 3))
- && !strncmp(argv[1], "-os", 3))
- ? TRUE : FALSE;
+ gsh.flags.dont_scroll = (((argc > 1) && (strlen(argv[1]) == 3))
+ && !strncmp(argv[1], "-os", 3)) ? FALSE : TRUE;
gsh_setup_containers(&gsh);
gsh_parse_arguments(&gsh, argc, argv);
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/text.c 28 Feb 2007 03:53:51 -0000 1.12
+++ gtkshell/text.c 28 Feb 2007 06:55:27 -0000 1.13
@@ -61,7 +61,7 @@
gsh_text_area(struct GSH * gsh)
{
GtkWidget *text;
-
+/* FIXME: make scrollable, and word wrap at 80. */
text = gtk_text_view_new();
gsh_manage(gsh, text);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/ACE gtkshell/add_options....,
Jeffrey Bedard <=