antiright-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Antiright-devel] antiright/gtkshell add_options.c callbacks.c ca...


From: Jeffrey Bedard
Subject: [Antiright-devel] antiright/gtkshell add_options.c callbacks.c ca...
Date: Sat, 26 May 2007 21:24:07 +0000

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/26 21:24:07

Modified files:
        gtkshell       : add_options.c callbacks.c callbacks.h text.c 
                         text.h 

Log message:
        Implemented clipboard operations for text editor.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.h?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.h?cvsroot=antiright&r1=1.9&r2=1.10

Patches:
Index: add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- add_options.c       26 May 2007 16:02:28 -0000      1.40
+++ add_options.c       26 May 2007 21:24:06 -0000      1.41
@@ -34,7 +34,7 @@
        GtkWidget * text_area;
 
        text_area=gsh_text_area(gsh);
-       GSH_TEXT_AREA_SET_TEXT(text_area, output);
+       (void)gsh_text_area_set_text(text_area, output);
 }
 
 #define GENERIC_FILE_CONTENTS(gsh, add, input)\

Index: callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- callbacks.c 20 May 2007 18:29:57 -0000      1.30
+++ callbacks.c 26 May 2007 21:24:06 -0000      1.31
@@ -22,6 +22,12 @@
 
 #include "gtkshell.h"
 
+void
+gsh_send_signal(GtkWidget * widget, const gchar * signal_name)
+{
+       g_signal_emit_by_name(widget, signal_name);
+}
+
 static void
 gsh_delete_GSHCBData(struct GSHCBData * cb)
 {
@@ -65,6 +71,12 @@
                gsh_editor_save(gsh);
        else if(MATCH("Open...___"))
                gsh_editor_open(gsh);
+       else if(MATCH("Cut___"))
+               gsh_send_signal(gsh->editor.widget, "cut-clipboard");
+       else if(MATCH("Copy___"))
+               gsh_send_signal(gsh->editor.widget, "copy-clipboard");
+       else if(MATCH("Paste___"))
+               gsh_send_signal(gsh->editor.widget, "paste-clipboard");
        else
                return FALSE;
 

Index: callbacks.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- callbacks.h 10 May 2007 00:08:28 -0000      1.10
+++ callbacks.h 26 May 2007 21:24:07 -0000      1.11
@@ -42,4 +42,7 @@
                gtk_main_quit();\
 }
 
+void
+gsh_send_signal(GtkWidget * widget, const gchar * signal_name);
+
 #endif /* not GSH_CALLBACKS_H */

Index: text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- text.c      23 May 2007 14:57:46 -0000      1.32
+++ text.c      26 May 2007 21:24:07 -0000      1.33
@@ -22,17 +22,19 @@
 
 #include "gtkshell.h"
 
-#define ADD_ENTRY(widget, str) gtk_combo_box_prepend_text(widget, str)
+#define ADD_ENTRY(widget, str)\
+       gtk_combo_box_prepend_text(GTK_COMBO_BOX(widget), str)
 
 /* Some sample entries to use when history is not useful, such as a
  * dialog presentation of this field, where the window displaying the
  * field closes on the first activation.  */
-#define APPEND_SAMPLE_ENTRIES(widget) \
-{\
-       ADD_ENTRY(widget, "ACE -A Terminal");\
-       ADD_ENTRY(widget, "ACE -A Settings");\
-       ADD_ENTRY(widget, "ACE -A IDE");\
-       ADD_ENTRY(widget, "ACE");\
+static void
+append_sample_entries(GtkWidget * widget)
+{
+       ADD_ENTRY(widget, "ACE -A Terminal");
+       ADD_ENTRY(widget, "ACE -A Settings");
+       ADD_ENTRY(widget, "ACE -A IDE");
+       ADD_ENTRY(widget, "ACE");
 }
 
 #ifdef DEBUG
@@ -69,7 +71,7 @@
 
        /* Create widget and assign callback.  */
        setup_entry_cb(gsh, entry=gtk_combo_box_entry_new_text(), command);
-       APPEND_SAMPLE_ENTRIES(GTK_COMBO_BOX(entry));
+       append_sample_entries(entry);
        gsh_manage(gsh, entry);
 
        return entry;
@@ -130,6 +132,17 @@
 #define VALIDATE_TEXT_EDITOR_PARAMETERS(gsh, filename) /* undefined */
 #endif /* DEBUG */
 
+GtkTextBuffer *
+gsh_text_area_set_text(GtkWidget * widget, const gchar * text)
+{
+       GtkTextBuffer * buffer;
+
+       buffer=gtk_text_view_get_buffer(GTK_TEXT_VIEW(widget));
+       gtk_text_buffer_set_text(buffer, text, strlen(text));
+
+       return buffer;
+}
+
 /* This is currently just a text file viewer.  */
 void
 gsh_text_editor(struct GSH * gsh, const gchar *filename)
@@ -138,7 +151,7 @@
 
        VALIDATE_TEXT_EDITOR_PARAMETERS(gsh, filename);
        text=antiright_read_named_file(filename);
-       GSH_TEXT_AREA_SET_TEXT(gsh_text_area(gsh), text);
+       (void)gsh_text_area_set_text(gsh_text_area(gsh), text);
        g_free(text);
        CHECK_GEOMETRY(gsh);
 }
@@ -208,7 +221,7 @@
        gchar * text;
 
        text=antiright_read_named_file(gsh->editor.filename);
-       GSH_TEXT_AREA_SET_TEXT(gsh->editor.widget, text);
+       gsh_text_area_set_text(gsh->editor.widget, text);
        g_free(text);
 }
 
@@ -255,4 +268,3 @@
        }
 }
 
-

Index: text.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- text.h      11 May 2007 23:28:52 -0000      1.9
+++ text.h      26 May 2007 21:24:07 -0000      1.10
@@ -23,10 +23,8 @@
 #ifndef GSH_TEXT_H
 #define GSH_TEXT_H
 
-#define GSH_TEXT_AREA_SET_TEXT(widget, text) \
-       gtk_text_buffer_set_text(\
-               gtk_text_view_get_buffer(GTK_TEXT_VIEW(widget)), text,\
-               strlen(text));
+GtkTextBuffer *
+gsh_text_area_set_text(GtkWidget * widget, const gchar * text);
 
 GtkWidget *
 gsh_setup_command_entry(struct GSH * gsh, const gchar *command);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]