pidgin.yaz: pidgin/gtkimhtml.c comparison

comparison pidgin/gtkimhtml.c @ 27846:9f91d6e0983c

propagate from branch 'im.pidgin.pidgin' (head 8c6407ae1c2c31473f78557c5805f8efa18e1ed8) to branch 'im.pidgin.pidgin.yaz' (head f312eb270934d9529df8503635b1d0a62e8de289)

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Mon, 02 Jun 2008 06:58:38 +0000
parents	86bf0ce0d7ac 0aa090fde749
children	81ebe4fac9ce

comparison

equal deleted inserted replaced

-:2b997b690500
+:9f91d6e0983c
 GdkDragContext   *context,
 gint              x,
 gint              y,
 guint             time);
+/* yaz. If you want to use shortcut keys that may conflict with
+inputmethods, change this to 1. */
+#define ENABLE_SHORTCUT 0
 static void preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml);
 static void insert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml);
 static void delete_cb(GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextIter *end, GtkIMHtml *imhtml);
 static void insert_ca_cb(GtkTextBuffer *buffer, GtkTextIter *arg1, GtkTextChildAnchor *arg2, gpointer user_data);
 static void gtk_imhtml_apply_tags_on_insert(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end);
 }
 static gint
 gtk_imhtml_tip (gpointer data)
 {
-	GtkIMHtml *imhtml = data;
+	GtkIMHtml *imhtml = (GtkIMHtml *)data;
 	PangoFontMetrics *font_metrics;
 	PangoLayout *layout;
 	PangoFont *font;
+	PangoLanguage *lang;
 	gint gap, x, y, h, w, scr_w, baseline_skip;
 	g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
 		g_object_unref(layout);
 		return FALSE;
 	}
-	font_metrics = pango_font_get_metrics(font, NULL);
+	lang = pango_context_get_language (pango_layout_get_context(layout));
+	font_metrics = pango_font_get_metrics(font, lang); //it's ok.
+//	font_metrics = pango_font_get_metrics(font, NULL); //crash!
 	pango_layout_get_pixel_size(layout, &scr_w, NULL);
 	gap = PANGO_PIXELS((pango_font_metrics_get_ascent(font_metrics) +
 					   pango_font_metrics_get_descent(font_metrics))/ 4);
 	anchor = gtk_text_iter_get_child_anchor(&iter);
 	if (anchor) {
 		tip = g_object_get_data(G_OBJECT(anchor), "gtkimhtml_tiptext");
 		hand = FALSE;
 	}
 	if (tip && *tip) {
 		if (!GTK_IMHTML(imhtml)->editable && hand)
 			gdk_window_set_cursor(win, GTK_IMHTML(imhtml)->hand_cursor);
 		GTK_IMHTML(imhtml)->tip_timer = g_timeout_add (TOOLTIP_TIMEOUT,
 							       gtk_imhtml_tip, imhtml);
 	}
 	GTK_IMHTML(imhtml)->tip = tip;
 	g_slist_free(tags);
 	return FALSE;
 }
 	}
 	if (info == TARGET_HTML) {
 		char *selection;
 #ifndef _WIN32
-		gsize len;
 		if (primary) {
 			text = gtk_imhtml_get_markup_range(imhtml, &start, &end);
 		} else
 			text = html_clipboard;
-		/* Mozilla asks that we start our text/html with the Unicode byte order mark */
+		selection = NULL;
-		selection = g_convert(text, -1, "UTF-16", "UTF-8", NULL, &len, NULL);
+		if (primary) {
-		gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), 16, (const guchar *)selection, len);
+			text = gtk_imhtml_get_markup_range(imhtml, &start, &end);
-#else
+		} else {
+			text = html_clipboard;
+		}
+		/* xxx should remove following line --yaz */
+		purple_debug_info("imhtml clipboard", "html_clipboard: %s len = %d\n", text, strlen(text));
+		gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE),
+				       8, (const guchar *)text, strlen(text)+1); // include trailing '\0' --yaz
+#else /*_WIN32 */
 		selection = clipboard_html_to_win32(html_clipboard);
-		gtk_selection_data_set(selection_data, gdk_atom_intern("HTML Format", FALSE), 8, (const guchar *)selection, strlen(selection));
+		gtk_selection_data_set(selection_data, gdk_atom_intern("HTML Format", FALSE),
+				       8, (const guchar *)selection, strlen(selection));
 #endif
 		g_free(selection);
 	} else {
 		if (primary) {
 			text = gtk_imhtml_get_text(imhtml, &start, &end);
 	}
 	if (selection_data->length >= 2 &&
 		(*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
 		/* This is UTF-16 */
-		char *utf8 = utf16_to_utf8_with_bom_check(text, selection_data->length);
+//		char *utf8 = utf16_to_utf8_with_bom_check(text, selection_data->length);
+		char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UTF-16", NULL, NULL, NULL);
 		g_free(text);
 		text = utf8;
 		if (!text) {
 			purple_debug_warning("gtkimhtml", "g_convert from UTF-16 failed in paste_received_cb\n");
 			return;
 			 *
 			 * See also the comment on text/html here:
 			 * http://mail.gnome.org/archives/gtk-devel-list/2001-September/msg00114.html
 			 */
 			if (sd->length >= 2 && !g_utf8_validate(text, sd->length - 1, NULL)) {
-				utf8 = utf16_to_utf8_with_bom_check(text, sd->length);
+//				utf8 = utf16_to_utf8_with_bom_check(text, sd->length);
+				utf8 = g_convert(text, sd->length, "UTF-8", "UTF-16", NULL, NULL, NULL);
 				if (!utf8) {
 					purple_debug_warning("gtkimhtml", "g_convert from UTF-16 failed in drag_rcv_cb\n");
 					return;
 				}
 			pos++;
 		} else {
 			break;
 		}
 	}
+	ws[wpos] = '\0'; // chop ws at wpos. due to bug of gtk_text_buffer_insert() --yaz
 	gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
 	ws[0] = '\0'; wpos = 0;
 	/* NEW_BIT(NEW_TEXT_BIT); */
 		gtk_text_iter_set_line(&line_iter, align_line);
 		/* insert RLM character to set alignment */
 		ws[wpos++]  = 0xE2;
 		ws[wpos++]  = 0x80;
 		ws[wpos++]  = 0x8F;
 		if (!rtl_direction)
 		{
 			/* insert LRM character to set direction */
 			/* (alignment=right and direction=LTR) */
 			ws[wpos++]  = 0xE2;

Mercurial > pidgin.yaz

comparison pidgin/gtkimhtml.c @ 27846:9f91d6e0983c