diff src/gtkimhtmltoolbar.c @ 8481:6d0869404696

[gaim-migrate @ 9214] " this fixes and should close 9, 10, and 12 on simguys list... those are... 9 Buttons that are pushed in when text is sent, stay pushed in. They should reset to the default for the line based on the B/I/U preferences. 10 Buttons are not properly pushed in if B/I/U are set in the prefs when the conversation window appears. 12 Buttons don't push in and out when the cursor enters regions that are differently formatted. For example, if you move the cursor to a place where the text is bold, the B button should probably be pushed in. While working on these i uncovered another bug which i'll start working on shortly, but thats no reason to hold this back when someone may find something I missed..." --Gary Kramlich as per his note, this does not fix moving the cursor with the mouse, but that doesn't work without this patch either. committer: Tailor Script <[e-mail]>

--- a/src/gtkimhtmltoolbar.c	Sun Mar 21 18:24:29 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Sun Mar 21 18:38:30 2004 +0000
@@ -36,24 +36,57 @@
 
 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar)
 {
+	GObject *object;
+	
 	g_return_if_fail(toolbar);
+	
+	/* block the format_function_toggle handler */
+	object = g_object_ref(G_OBJECT(GTK_IMHTML(toolbar->imhtml)));
+	g_signal_handlers_block_matched(object,	G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+									NULL, toolbar);
 	gtk_imhtml_toggle_bold(GTK_IMHTML(toolbar->imhtml));
+	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+									  NULL, toolbar);
+	g_object_unref(object);
+	
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
 static void
 do_italic(GtkWidget *italic, GtkIMHtmlToolbar *toolbar)
 {
+	GObject *object;
+	
 	g_return_if_fail(toolbar);
+	
+	/* block the format_function_toggle handler */
+	object = g_object_ref(G_OBJECT(GTK_IMHTML(toolbar->imhtml)));
+	g_signal_handlers_block_matched(object,	G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+									NULL, toolbar);
 	gtk_imhtml_toggle_italic(GTK_IMHTML(toolbar->imhtml));
+	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+									  NULL, toolbar);
+	g_object_unref(object);
+	
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
 static void
 do_underline(GtkWidget *underline, GtkIMHtmlToolbar *toolbar)
 {
+	GObject *object;
+	
 	g_return_if_fail(toolbar);
+	
+	/* block the format_function_toggle handler */
+	object = g_object_ref(G_OBJECT(GTK_IMHTML(toolbar->imhtml)));
+	g_signal_handlers_block_matched(object,	G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+									NULL, toolbar);
 	gtk_imhtml_toggle_underline(GTK_IMHTML(toolbar->imhtml));
+	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+									  NULL, toolbar);
+	g_object_unref(object);
+	
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
@@ -77,8 +110,6 @@
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
-
-
 static void
 destroy_toolbar_font(GtkWidget *widget, GdkEvent *event,
 					 GtkIMHtmlToolbar *toolbar)
@@ -602,7 +633,6 @@
 
 static void update_buttons_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, GtkIMHtmlToolbar *toolbar)
 {
-
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->bold), buttons & GTK_IMHTML_BOLD);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->italic), buttons & GTK_IMHTML_ITALIC);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->underline), buttons & GTK_IMHTML_UNDERLINE);
@@ -617,33 +647,81 @@
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->image), buttons & GTK_IMHTML_IMAGE);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->link), buttons & GTK_IMHTML_LINK);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->smiley), buttons & GTK_IMHTML_SMILEY);
+}
 
+/* we call this when we want to _set_active the toggle button, it'll
+ * block the callback thats connected to the button so we don't have to
+ * do the double toggling hack
+ */
+static void toggle_button_set_active_block(GtkToggleButton *button,
+										   gboolean is_active,
+										   GtkIMHtmlToolbar *toolbar)
+{
+	GObject *object;
+	g_return_if_fail(toolbar);
+
+	object = g_object_ref(button);
+	g_signal_handlers_block_matched(object, G_SIGNAL_MATCH_DATA,
+									0, 0, NULL, NULL, toolbar);
+	gtk_toggle_button_set_active(button, is_active);
+	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA,
+									  0, 0, NULL, NULL, toolbar);
+	g_object_unref(object);
 }
 
 static void toggle_button_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, GtkIMHtmlToolbar *toolbar)
 {
-	/* This is hacky.  I have to tolerate the fact that set_active causes the signal to be emited, so I wind up
-	 * toggling in gtkimhtml twice here */
-
-	if (buttons & GTK_IMHTML_BOLD) {
-		gtk_imhtml_toggle_bold(imhtml);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->bold), !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)));
-	}
+	if (buttons & GTK_IMHTML_BOLD)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold),
+									   !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)),
+									   toolbar);
 
-	if (buttons & GTK_IMHTML_ITALIC) {
-		gtk_imhtml_toggle_italic(imhtml);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->italic), !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)));
-	}
+	if (buttons & GTK_IMHTML_ITALIC)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic),
+									   !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)),
+									   toolbar);
 
-	if (buttons & GTK_IMHTML_UNDERLINE) {
-		gtk_imhtml_toggle_underline(imhtml);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->underline), !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)));
-	}
+	if (buttons & GTK_IMHTML_UNDERLINE)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
+									   !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)),
+									   toolbar);
 }
 
 static void reset_buttons_cb(GtkIMHtml *imhtml, GtkIMHtmlToolbar *toolbar)
 {
-	printf("yo!\n");
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)))
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), FALSE,
+									   toolbar);
+	
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)))
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic),
+									   FALSE, toolbar);
+	
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)))
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
+									   FALSE, toolbar);
+}
+
+static void cursor_moved_cb(GtkIMHtml *imhtml, GtkMovementStep step,
+							gint change, gboolean selected,
+							GtkIMHtmlToolbar *toolbar)
+{
+	gboolean bold, italic, underline;
+
+	bold = italic = underline = FALSE;
+	gtk_imhtml_get_current_format(imhtml, change, &bold, &italic, &underline);	
+
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)) != bold)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), bold,
+									   toolbar);
+	
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)) != italic)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic), italic,
+									   toolbar);
+	
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)) != underline)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
+									   underline, toolbar);
 }
 
 enum {
@@ -893,6 +971,8 @@
 
 void gtk_imhtmltoolbar_attach(GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml)
 {
+	gboolean bold, italic, underline;
+
 	g_return_if_fail(toolbar != NULL);
 	g_return_if_fail(GTK_IS_IMHTMLTOOLBAR(toolbar));
 	g_return_if_fail(imhtml != NULL);
@@ -902,6 +982,23 @@
 	g_signal_connect(G_OBJECT(imhtml), "format_functions_update", G_CALLBACK(update_buttons_cb), toolbar);
 	g_signal_connect(G_OBJECT(imhtml), "format_function_toggle", G_CALLBACK(toggle_button_cb), toolbar);
 	g_signal_connect(G_OBJECT(imhtml), "format_function_clear", G_CALLBACK(reset_buttons_cb), toolbar);
+	g_signal_connect_after(G_OBJECT(imhtml), "move_cursor", G_CALLBACK(cursor_moved_cb), toolbar);
+
+	bold = italic = underline = FALSE;
+
+	gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), 0, &bold, &italic, &underline);
+	
+	if(bold)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), bold,
+									   toolbar);
+	
+	if(italic)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic), italic,
+									   toolbar);
+
+	if(underline)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
+									   underline, toolbar);
 }
 
 void gtk_imhtmltoolbar_associate_smileys(GtkIMHtmlToolbar *toolbar, const char *proto_id)