[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/dateload....
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/ACE ACE-desktop/dateload.... |
|
Date: |
Tue, 20 Feb 2007 03:59:51 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/20 03:59:50
Modified files:
ACE-desktop : ACE dateload.c
gtkshell : add_options.c callbacks.c gtkshell.c gtkshell.h
label.c option_options.c row.c text.c
updated_label.c
Log message:
Modified layout to be unexpanded on certain widgets. Do not
do this with only one vertical row. Removed printing of newline
from ctime output in dateload, formatted output improved. Clear
text when entered into text entry. Make text entry exit when
-oe set, remove -ap. Make text entry echo when -oE is set.
Reindent add_options.c. Stop using pango markup for label update,
as certain input causes errors, even when encapsulated as
documented. Set max label width to 80 chars. Changed ACE according
to these changes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/dateload.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.7&r2=1.8
Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ACE-desktop/ACE 19 Feb 2007 20:58:07 -0000 1.4
+++ ACE-desktop/ACE 20 Feb 2007 03:59:50 -0000 1.5
@@ -291,7 +291,7 @@
}
Command()
{
- $ARSHELL -os -al 'Command:' -ap env
+ $ARSHELL -os -al 'Command:' -oe -at env
}
Calendar()
{
@@ -329,7 +329,7 @@
{
new_value=$($ARSHELL -og 256x154\
-al "$(ACE -r $1)"\
- -ap "echo")
+ -oe -at "echo")
# echo new value is $new_value
if [ "$new_value" != "" ]; then
set_value $1 "$new_value"
@@ -358,9 +358,9 @@
}
Alarm()
{
- local alarm_time="$($ARSHELL -os -al 'Alarm Time (ex 22:40):' -ap echo)"
+ local alarm_time="$($ARSHELL -os -al 'Alarm Time (ex 22:40):' -oe -at
echo)"
if [ "$alarm_time" != "" ]; then
- $ARSHELL -os -al "Alarm Command:" -ap echo | at "$alarm_time"
+ $ARSHELL -os -al "Alarm Command:" -oe -at echo | at "$alarm_time"
fi
}
@@ -601,7 +601,7 @@
exit 0
;;
L|+L)
- arguments=$($ARSHELL -os -al 'Launch Arguments:' -ap "echo")
+ arguments=$($ARSHELL -os -al 'Launch Arguments:' -oe -at "echo")
shift $(($OPTIND - 1))
$@ $arguments &
exit 0
Index: ACE-desktop/dateload.c
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/dateload.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ACE-desktop/dateload.c 18 Feb 2007 22:43:25 -0000 1.5
+++ ACE-desktop/dateload.c 20 Feb 2007 03:59:50 -0000 1.6
@@ -14,10 +14,14 @@
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);
- g_print(" %s %.2f, %.2f, %.2f",
+ g_print("%s \n%.2f, %.2f, %.2f",
date, loadavg[0], loadavg[1], loadavg[2]);
return(0);
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/add_options.c 19 Feb 2007 01:43:09 -0000 1.4
+++ gtkshell/add_options.c 20 Feb 2007 03:59:50 -0000 1.5
@@ -23,60 +23,54 @@
#include "gtkshell.h"
void
-gsh_handle_add_image_button(
- struct GSH *gsh, int argc, char **argv, int *counter)
+gsh_handle_add_image_button (
+ struct GSH * gsh, int argc, char **argv, int *counter)
{
- gsh_count(argc, counter);
- gsh_image_button(gsh, argv[(*counter)],
- argv[(*counter)+1]);
- gsh_count(argc, counter);
+ gsh_count (argc, counter);
+ gsh_image_button (gsh, argv[(*counter)],
+ argv[(*counter) + 1]);
+ gsh_count (argc, counter);
}
void
-gsh_handle_add_unlabeled_image_button(
- struct GSH *gsh, int argc, char **argv, int *counter)
+gsh_handle_add_unlabeled_image_button (
+ struct GSH * gsh, int argc, char **argv, int *counter)
{
- gsh_handle_add_image_button(gsh, argc, argv, counter);
- gtk_button_set_label( GTK_BUTTON(gsh->button), "");
+ gsh_handle_add_image_button (gsh, argc, argv, counter);
+ gtk_button_set_label (GTK_BUTTON (gsh->button), "");
}
void
-gsh_handle_add_arguments(struct GSH *gsh, int argc, char **argv, int *counter)
+gsh_handle_add_arguments (struct GSH * gsh, int argc, char **argv, int
*counter)
{
- g_assert(strlen(argv[(*counter)])>1);
- switch(argv[(*counter)][2])
+ g_assert (strlen (argv[(*counter)]) > 1);
+ switch (argv[(*counter)][2])
{
case 'e':
- gsh_count(argc, counter);
- gsh_text_editor(gsh, argv[*counter]);
+ gsh_count (argc, counter);
+ gsh_text_editor (gsh, argv[*counter]);
break;
case 'I':
- gsh_handle_add_unlabeled_image_button(
+ gsh_handle_add_unlabeled_image_button (
gsh, argc, argv, counter);
break;
case 'i':
- gsh_handle_add_image_button(
+ gsh_handle_add_image_button (
gsh, argc, argv, counter);
break;
case 'l':
- gsh_count(argc, counter);
- gsh_add_label(gsh, argv[(*counter)]);
- break;
- case 'p':
- gsh_count(argc, counter);
- gsh_setup_prompt_command_entry(
- gsh, argv[(*counter)]);
+ gsh_count (argc, counter);
+ gsh_add_label (gsh, argv[(*counter)]);
break;
case 't':
- gsh_count(argc, counter);
- gsh_setup_command_entry(gsh, argv[(*counter)]);
+ gsh_count (argc, counter);
+ gsh_setup_command_entry (gsh, argv[(*counter)]);
break;
case 'T':
- gsh_text_area(gsh);
+ gsh_text_area (gsh);
break;
case 'u':
- gsh_handle_updated_arguments(
+ gsh_handle_updated_arguments (
gsh, argc, argv, counter);
break;
}
}
-
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/callbacks.c 12 Feb 2007 16:36:56 -0000 1.4
+++ gtkshell/callbacks.c 20 Feb 2007 03:59:50 -0000 1.5
@@ -34,6 +34,7 @@
{
struct GSH_CBData *cb;
cb=(struct GSH_CBData *)data;
+
UNUSED(widget);
antiright_system(cb->data);
@@ -43,12 +44,21 @@
void
entry_cb(GtkWidget * widget, gpointer data)
{
- const gchar *input;
+ const gchar *input; /* Must not be freed. */
struct GSH_CBData *cb;
cb=(struct GSH_CBData *)data;
input = gtk_entry_get_text(GTK_ENTRY(widget));
+
+ if(cb->gsh->flags.prompt_echoes)
+ g_print("%s\n", input);
+ else
sysprintf("%s %s", (char *) cb->data, (char *) input);
+
+ if(cb->gsh->flags.button_exits)
+ exit(0);
+
+ gtk_entry_set_text(GTK_ENTRY(widget), ""); /* Clear. */
}
Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/gtkshell.c 17 Feb 2007 23:07:31 -0000 1.8
+++ gtkshell/gtkshell.c 20 Feb 2007 03:59:50 -0000 1.9
@@ -42,6 +42,7 @@
flags->dont_scroll=FALSE;
flags->button_exits=FALSE;
flags->updating=FALSE;
+ flags->prompt_echoes=FALSE;
}
void
gsh_GSH_Rows(struct GSH_Rows *rows)
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/gtkshell.h 19 Feb 2007 20:58:07 -0000 1.11
+++ gtkshell/gtkshell.h 20 Feb 2007 03:59:50 -0000 1.12
@@ -32,6 +32,7 @@
gboolean button_exits;
gboolean updating;
gboolean horizontal_labels;
+ gboolean prompt_echoes;
};
struct GSH_Rows
Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/label.c 19 Feb 2007 20:58:07 -0000 1.4
+++ gtkshell/label.c 20 Feb 2007 03:59:50 -0000 1.5
@@ -22,17 +22,24 @@
#include "gtkshell.h"
+
GtkWidget *
gsh_add_label(struct GSH *gsh, char *text)
{
GtkWidget *label;
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);
- gsh_manage_unexpanded(gsh, label);
+
+ /* This uses expanded management, as the label may be
+ displaying a large text area. */
+ gsh_manage(gsh, label);
return label;
}
@@ -40,11 +47,6 @@
void
gsh_set_label(GtkWidget *label, char *text)
{
- gchar *markup;
-
- markup=g_markup_printf_escaped
- ("<span><tt>%s</tt></span>", text);
- gtk_label_set_markup(GTK_LABEL(label), markup);
- g_free(markup);
+ gtk_label_set_text(GTK_LABEL(label), text);
}
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/option_options.c 19 Feb 2007 01:43:09 -0000 1.5
+++ gtkshell/option_options.c 20 Feb 2007 03:59:50 -0000 1.6
@@ -27,6 +27,9 @@
{
switch(argv[(*counter)][2])
{
+ case 'E': /* Make a text entry simpley print the text. */
+ gsh->flags.prompt_echoes=TRUE;
+ break;
case 'e':
gsh->flags.button_exits=TRUE;
break;
Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/row.c 19 Feb 2007 20:58:07 -0000 1.7
+++ gtkshell/row.c 20 Feb 2007 03:59:50 -0000 1.8
@@ -49,9 +49,17 @@
void
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)
+ {
gsh_check_row(gsh);
- gtk_box_pack_start(GTK_BOX(gsh->rows.v), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(gsh->rows.v), widget,
+ FALSE, FALSE, 0);
gsh_manage_generic(gsh, widget);
+ }
+ else
+ gsh_manage(gsh, widget);
}
@@ -61,7 +69,6 @@
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.row = 0;
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/text.c 19 Feb 2007 20:58:07 -0000 1.5
+++ gtkshell/text.c 20 Feb 2007 03:59:50 -0000 1.6
@@ -28,23 +28,21 @@
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);
+
+ /* Create widget. */
entry = gtk_entry_new();
- g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(entry_cb),
- (gpointer) cb);
- gsh_manage_unexpanded(gsh, entry);
- return(entry);
-}
-void
-gsh_setup_prompt_command_entry(struct GSH *gsh, char *command)
-{
- GtkWidget *entry;
- entry=gsh_setup_command_entry(gsh, command);
g_signal_connect(G_OBJECT(entry), "activate",
- G_CALLBACK(gtk_main_quit), NULL);
+ G_CALLBACK(entry_cb), (gpointer) cb);
+
+ /* Do not fill remaining container area. */
+ gsh_manage_unexpanded(gsh, entry);
+
+ return(entry);
}
GtkWidget *
Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/updated_label.c 17 Feb 2007 23:32:15 -0000 1.7
+++ gtkshell/updated_label.c 20 Feb 2007 03:59:50 -0000 1.8
@@ -41,16 +41,14 @@
char *results;
#ifdef DEBUG
- g_message("gsh_update_label()");
+ ARBUG("gsh_update_label()");
- assert(command);
- 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);
}