[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright/gtkshell arguments.c gtkshell.c guidl...
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright/gtkshell arguments.c gtkshell.c guidl... |
Date: |
Thu, 08 Mar 2007 06:07:52 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/03/08 06:07:52
Modified files:
gtkshell : arguments.c gtkshell.c
Added files:
gtkshell : guidl.lex guidl.y
Log message:
Fix some splint warnings. Added guidl.lex and guidl.y. These are
currently
just skeleton files and are not built. They will be the definition of
the
GUI Definition Language, which will allow a formalization of the GUI
construction procedure. This will allow programs that use the gtkshell
library to define GUIs internally, GUIs to be defined via pipes to
increase
security (and serve as the basis of ACE security features), and allow
GUI definitions to be statically stored (decreasing the size of ACE).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&rev=1.1
Patches:
Index: arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- arguments.c 7 Mar 2007 06:44:47 -0000 1.13
+++ arguments.c 8 Mar 2007 06:07:52 -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"
@@ -29,20 +30,25 @@
{
gchar **pair;
- pair=g_strsplit(string, ",", 2);
+ /address@hidden@*/pair=g_strsplit(string, ",", 2);
if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
{
gchar * command;
+ gint return_value;
- ar_asprintf(&command, "%s", pair[0]);
- gsh_image_button(gsh, command, pair[1]);
+
return_value=ar_asprintf(/address@hidden@*//address@hidden@*/&command,
+ "%s", pair[0]);
+ if(return_value != -1)
+ gsh_image_button(gsh, /address@hidden@*/command,
pair[1]);
+ else
+ ARWARN("cannot create button");
}
else
gsh_command_button(gsh, string);
- g_strfreev(pair);
+ g_strfreev(/address@hidden@*/pair);
}
static void
@@ -53,7 +59,13 @@
pair=g_strsplit(string, ",", 2);
- ar_asprintf(&command, "%s", pair[0]);
+ if(ar_asprintf(&command, "%s", pair[0]) == -1)
+ {
+ ARWARN("could not construct command string");
+ return;
+ }
+
+ ARPASSERT(command);
if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
gsh_image_button(gsh, command, pair[1]);
@@ -69,7 +81,11 @@
GdkEventButton *event_button;
event_button=(GdkEventButton *)event;
- gtk_menu_popup(GTK_MENU(widget), NULL, NULL, NULL, NULL,
+ gtk_menu_popup(GTK_MENU(widget),
+ /address@hidden@*/NULL,
+ /address@hidden@*/NULL,
+ /address@hidden@*/NULL,
+ /address@hidden@*/NULL,
event_button->button, event_button->time);
return TRUE;
Index: gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gtkshell.c 2 Mar 2007 16:41:43 -0000 1.20
+++ gtkshell.c 8 Mar 2007 06:07:52 -0000 1.21
@@ -26,9 +26,8 @@
static void
setup_quit_signal(GtkWidget * window, const gchar * signal)
{
- /* @null@ */
(void) g_signal_connect(window, signal,
- G_CALLBACK(gtk_main_quit), NULL);
+ G_CALLBACK(gtk_main_quit), /address@hidden@*/NULL);
}
static void
@@ -62,14 +61,12 @@
update->period = 1000;
/* Pointer must have not previously been used. */
- /* @null@ */
- update->list = (GSList *) NULL;
+ /address@hidden@*/update->list = (GSList *)/address@hidden@*/NULL;
}
void
gsh_GSH(struct GSH * gsh)
{
- /* @null */
- gsh->geometry = (gchar *) NULL;
+ /address@hidden@*/gsh->geometry = (gchar *)/address@hidden@*/NULL;
gsh->bflags=0;
gsh_GSH_Rows(&gsh->rows);
gsh_GSH_Updater(&gsh->update);
@@ -99,7 +96,7 @@
{
gtk_init(argc, argv);
gsh_GSH(gsh);
- gsh->window = gsh_create_main_window();
+ /address@hidden@*/gsh->window =
/address@hidden@*/gsh_create_main_window();
}
Index: guidl.lex
===================================================================
RCS file: guidl.lex
diff -N guidl.lex
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ guidl.lex 8 Mar 2007 06:07:52 -0000 1.1
@@ -0,0 +1,15 @@
+%{
+#include "y.tab.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;
+%%
Index: guidl.y
===================================================================
RCS file: guidl.y
diff -N guidl.y
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ guidl.y 8 Mar 2007 06:07:52 -0000 1.1
@@ -0,0 +1,62 @@
+%{
+#include <stdio.h>
+#include "gtkshell.h"
+
+void
+yyerror(const char *string)
+{
+ g_error("error: %s\n", string);
+}
+
+int
+yywrap()
+{
+ return 1;
+}
+
+%}
+%token IMAGE STRING WORD NUMBER MENU PAIR MENU_BUTTON
+%
+commands:
+|
+commands command
+;
+
+command:
+add
+|
+option
+;
+
+add:
+STRING
+{
+
+}
+|
+WORD STRING
+{
+
+}
+|
+LIST items
+{
+}
+;
+
+items:
+|
+items item
+;
+
+item:
+ITEM STRING
+|
+ITEM STRING COMMA STRING
+;
+
+option:
+OPTION WORD
+{
+}
+%
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright/gtkshell arguments.c gtkshell.c guidl...,
Jeffrey Bedard <=