[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/guidl/IDE.gdl gtkshell/ca...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/guidl/IDE.gdl gtkshell/ca... |
|
Date: |
Wed, 09 May 2007 16:13:50 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/09 16:13:49
Modified files:
ACE-desktop/guidl: IDE.gdl
gtkshell : callbacks.c dragdrop.c init.c macros.h
terminal.c
Log message:
Do not display object files in IDE recent file list in status bar.
Show a FIXME dialog until special callbacks for editor are implemented.
Added macro for displaying such a dialog. Call gtk_main_quit()
in the Exit___ special command section, so that control is returned
to main, which calls the GSH destructor. Do not free term->widget
in terminal destructor, as it is freed by the gobject system once
its last reference has been destroyed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/IDE.gdl?cvsroot=antiright&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/init.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.12&r2=1.13
Patches:
Index: ACE-desktop/guidl/IDE.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/IDE.gdl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- ACE-desktop/guidl/IDE.gdl 8 May 2007 20:40:07 -0000 1.19
+++ ACE-desktop/guidl/IDE.gdl 9 May 2007 16:13:49 -0000 1.20
@@ -15,7 +15,7 @@
// set up status bar.
option "update frequency" 10000;
-add "updating label" "echo -n 'Recent: '; ls -t | tr '\n' ' ' | cut -d ' '
-f-6";
+add "updating label" "echo -n 'Recent: '; ls -t | grep -v o$ | tr '\n' ' ' |
cut -d ' ' -f-6";
option "icon size" "small toolbar";
@@ -38,10 +38,10 @@
option "no fill";
add buttons
"ACE -A IDE_CD & # CD,gtk-open",
- "TERM__make,gtk-save",
- "TERM__make clean,gtk-delete",
- "TERM__make install,gtk-save",
- "TERM__make test,gtk-execute",
+ "TERM__make # Build,gtk-save",
+ "TERM__make clean # Clean,gtk-delete",
+ "TERM__make install # Install,gtk-save",
+ "TERM__make test # Test,gtk-execute",
"gshterm -e cvs commit & # CVS_Commit,gtk-save",
"TERM__cvs -q -z3 update -dP & # CVS_Update,gtk-open";
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gtkshell/callbacks.c 8 May 2007 20:40:07 -0000 1.23
+++ gtkshell/callbacks.c 9 May 2007 16:13:49 -0000 1.24
@@ -73,18 +73,19 @@
if(MATCH("Exit__"))
{
- /* Clean up application before exiting, particularly
- delete terminal command script files. */
- $(gsh, delete);
- exit(0);
+ /* GSH is cleaned up when this causes
+ * a return back to main(). */
+ gtk_main_quit();
}
else if(MATCH("TERM__"))
terminal_feed((gchar *)command, gsh->terminal->widget);
else if(MATCH("Save_As...___"))
{
+ GSH_FIXME();
}
else if(MATCH("Save___"))
{
+ GSH_FIXME();
}
else /* No special command found. */
return FALSE;
Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/dragdrop.c 13 Apr 2007 14:23:51 -0000 1.10
+++ gtkshell/dragdrop.c 9 May 2007 16:13:49 -0000 1.11
@@ -57,15 +57,15 @@
static void
drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data);*/
+#define DND_SIGNAL(sig, func) \
+ (void) g_signal_connect(widget, sig, G_CALLBACK(func), NULL)
+
static void
setup_drag_drop_signals(GtkWidget * widget)
{
- (void) g_signal_connect(widget, "drag-data-received",
- G_CALLBACK(drag_received), NULL);
- (void) g_signal_connect(widget, "drag-drop",
- G_CALLBACK(drag_drop), NULL);
- (void) g_signal_connect(widget, "drag-data-get",
- G_CALLBACK(drag_data_get), NULL);
+ DND_SIGNAL("drag-data-received", drag_received);
+ DND_SIGNAL("drag-drop", drag_drop);
+ DND_SIGNAL("drag-data-get", drag_data_get);
}
void
@@ -80,9 +80,8 @@
setup_drag_drop_signals(widget);
- if ((gsh->bflags & GSH_CBEXIT) == GSH_CBEXIT)
- (void) g_signal_connect(widget, "drag-end",
- G_CALLBACK(gtk_main_quit), NULL);
+ if (GSH_FLAG(GSH_CBEXIT))
+ DND_SIGNAL("drag-end", gtk_main_quit);
}
static void
@@ -92,21 +91,15 @@
{
gboolean drag_status;
- UNUSED(x);
- UNUSED(y);
- UNUSED(data);
-
switch (target_type)
{
case TARGET_STRING:
- {
- const gchar *label;
- label=gtk_button_get_label(GTK_BUTTON(widget));
- sysprintf("%s %s", (const gchar *)label,
+ sysprintf("%s %s",
+ (const gchar *)gtk_button_get_label(
+ GTK_BUTTON(widget)),
(gchar *) selection->data);
drag_status = TRUE;
break;
- }
default:
drag_status = FALSE;
ARWARN("invalid data dropped");
@@ -121,10 +114,6 @@
{
GdkAtom target_type;
- UNUSED(x);
- UNUSED(y);
- UNUSED(data);
-
target_type =
GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets,
TARGET_STRING));
@@ -145,11 +134,6 @@
{
const gchar *source_data;
- UNUSED(context);
- UNUSED(target_type);
- UNUSED(time);
- UNUSED(data);
-
source_data = gtk_button_get_label(GTK_BUTTON(widget));
gtk_selection_data_set(selection, selection->target, sizeof(gchar),
Index: gtkshell/init.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/init.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/init.c 5 May 2007 23:38:07 -0000 1.5
+++ gtkshell/init.c 9 May 2007 16:13:49 -0000 1.6
@@ -22,19 +22,16 @@
#include "gtkshell.h"
-static void
-setup_quit_signal(GtkWidget * window, const gchar * signal)
-{
- (void) g_signal_connect(window, signal,
- G_CALLBACK(gtk_main_quit), NULL);
+#define SETUP_QUIT_SIGNAL(window, signal) \
+ (void) g_signal_connect(window, signal,\
+ G_CALLBACK(gtk_main_quit), NULL)
+
+#define SETUP_QUIT_SIGNALS(window) \
+{\
+ SETUP_QUIT_SIGNAL(window, "delete-event");\
+ SETUP_QUIT_SIGNAL(window, "destroy");\
}
-static void
-setup_quit_signals(GtkWidget * window)
-{
- setup_quit_signal(window, "delete-event");
- setup_quit_signal(window, "destroy");
-}
GtkWidget *
gsh_create_main_window()
@@ -42,7 +39,7 @@
GtkWidget *window;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- setup_quit_signals(window);
+ SETUP_QUIT_SIGNALS(window);
return (window);
}
Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/macros.h 6 May 2007 06:23:36 -0000 1.7
+++ gtkshell/macros.h 9 May 2007 16:13:49 -0000 1.8
@@ -45,5 +45,9 @@
#define GSH_DESTROY_IF(widget) GSH_ACTION_IF(gtk_widget_destroy, widget)
#define GSH_FREE_IF(var) GSH_ACTION_IF(g_free, var)
+#define GSH_FIXME() \
+ sysprintf("gtkshell -dw '%s:%d: FIXME'",\
+ __FILE__, __LINE__)
+
#endif /* not GSH_MACROS_H */
Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/terminal.c 8 May 2007 20:40:07 -0000 1.12
+++ gtkshell/terminal.c 9 May 2007 16:13:49 -0000 1.13
@@ -49,7 +49,8 @@
gsh_delete_GSH_Terminal(struct GSH_Terminal * term)
{
GSH_FREE_IF(term->font);
- g_free(term);
+ /* The terminal widget itself is freed by gobject system
+ * reference counting. */
}
static GtkWidget *
- [Antiright-devel] antiright ACE-desktop/guidl/IDE.gdl gtkshell/ca...,
Jeffrey Bedard <=