set handle_popup to TRUE on the EText.

2003-04-03  Chris Toshok  <toshok@ximian.com>

	* gal/e-text/e-entry.c (e_entry_init): set handle_popup to TRUE on
	the EText.

	* gal/e-text/e-text.c (e_text_set_property): add setter for
	handle_popup.
	(e_text_get_property): add getter for handle_popup.
	(e_text_event): only do our special popup handling if handle_popup
	is true.  otherwise, pass the event along.
	(e_text_class_init): install the handle_popup property.
	(e_text_init): init handle_popup to FALSE, so we get default
	behavior in most cases.

	* gal/e-text/e-text.h: add "handle_popup" field, so the user of an
	EText can decide whether to handle popups themselves.

svn path=/trunk/; revision=20664

3 files changed, 34 insertions, 8 deletions

diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index 2bcf165e0b..085a3a1a52 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -335,6 +335,7 @@ e_entry_init (GtkObject *object)
 		"editable", TRUE,
 		"allow_newlines", FALSE,
 		"im_context", E_CANVAS (entry->canvas)->im_context,
+		"handle_popup", TRUE,
 		NULL));
 
 	g_signal_connect (entry->item,
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 1999148187..1ea86dac18 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -117,7 +117,8 @@ enum {
 	PROP_DRAW_BACKGROUND,
 	PROP_DRAW_BUTTON,
 	PROP_CURSOR_POS,
-	PROP_IM_CONTEXT
+	PROP_IM_CONTEXT,
+	PROP_HANDLE_POPUP
 };
 
 static void e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data);
@@ -897,7 +898,11 @@ e_text_set_property (GObject *object,
 
 		text->need_im_reset = FALSE;
 		break;
-		
+
+	case PROP_HANDLE_POPUP:
+		text->handle_popup = g_value_get_boolean (value);
+		break;
+
 	default:
 		return;
 	}
@@ -1062,6 +1067,10 @@ e_text_get_property (GObject *object,
 		g_value_set_object (value, text->im_context);
 		break;
 		
+	case PROP_HANDLE_POPUP:
+		g_value_set_boolean (value, text->handle_popup);
+		break;
+
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -2207,9 +2216,14 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 
 		/* We follow convention and emit popup events on right-clicks. */
 		if (event->type == GDK_BUTTON_PRESS && event->button.button == 3) {
-			e_text_do_popup (text, &(event->button),
-					 get_position_from_xy (text, event->button.x, event->button.y));
-			return TRUE;
+			if (text->handle_popup) {
+				e_text_do_popup (text, &(event->button),
+						 get_position_from_xy (text, event->button.x, event->button.y));
+				return TRUE;
+			}
+			else {
+				break;
+			}
 		}
 
 		/* Create our own double and triple click events, 
@@ -2507,7 +2521,7 @@ popup_targets_received (GtkClipboard     *clipboard,
 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem);
 	g_signal_connect_swapped (menuitem, "activate",
 				  G_CALLBACK (e_text_cut_clipboard), text);
-	gtk_widget_set_sensitive (menuitem, text->selection_start != text->selection_end);
+	gtk_widget_set_sensitive (menuitem, text->editable && (text->selection_start != text->selection_end));
 
 	/* copy menu item */
 	menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
@@ -2523,7 +2537,7 @@ popup_targets_received (GtkClipboard     *clipboard,
 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem);
 	g_signal_connect_swapped (menuitem, "activate",
 				  G_CALLBACK (e_text_paste_clipboard), text);
-	gtk_widget_set_sensitive (menuitem, gtk_selection_data_targets_include_text (data));
+	gtk_widget_set_sensitive (menuitem, text->editable && gtk_selection_data_targets_include_text (data));
 
 	menuitem = gtk_menu_item_new_with_label (_("Select All"));
 	gtk_widget_show (menuitem);
@@ -3391,6 +3405,13 @@ e_text_class_init (ETextClass *klass)
 							      GTK_TYPE_IM_CONTEXT,
 							      G_PARAM_READWRITE));
 
+	g_object_class_install_property (gobject_class, PROP_HANDLE_POPUP,
+					 g_param_spec_boolean ("handle_popup",
+							       _( "Handle Popup" ),
+							       _( "Handle Popup" ),
+							       FALSE,
+							       G_PARAM_READWRITE));
+
 	if (!clipboard_atom)
 		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
 }
@@ -3481,6 +3502,8 @@ e_text_init (EText *text)
 	text->need_im_reset           = FALSE;
 	text->im_context_signals_registered = FALSE;
 
+	text->handle_popup            = FALSE;
+
 
 	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
 }
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index c40dad4ea3..a0224969bb 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -211,10 +211,12 @@ struct _EText {
 	guint32  last_time_request;       /* The time of the last selection request. */
 	GdkAtom  last_selection_request;  /* The time of the last selection request. */
 	GList   *queued_requests;         /* Queued selection requests. */
-	
+
 	GtkIMContext *im_context;
 	gboolean      need_im_reset;
 	gboolean      im_context_signals_registered;
+
+	gboolean      handle_popup;
 };
 
 struct _ETextClass {