Support for preedit in e-text widgets.

2003-10-14  Suresh Chandrasekharan  <suresh.chandrasekharan@sun.com>

	* Support for preedit in e-text widgets.

	* gal/gal/e-text/e-text.c: Added e_text_preedit_changed_cb and
	insert_preedit_text.

	* Modified the following functions.
	(e_text_draw) Calls insert_preedit_text also cursor pos @ the end of
	text->selection_start + text->preedit_len

	(e_text_event) Added hooks for preedit_cb
	(e_text_init) Inits text->preedit_len
	(e_text_retrieve_surrounding_cb) Removed printf
	(e_text_delete_surrounding_cb) Correct params for
	gtk_editable_delete_text to make it work.

	* gal/gal/e-text/e-text.h: Added preedit_len in struct _EText


2003-09-25  Suresh Chandrasekharan  <suresh.chandrasekharan@sun.com>

	* Fix for "44222 task summary entry widget not i18ned". The following
	files are changed.

	* gal/gal/e-table/e-cell-text.c: Lots of changes for i18n
	selection/input support. Added these functions for input method support.

	(e_cell_text_preedit_changed_cb)
	(e_cell_text_commit_cb)
	(e_cell_text_retrieve_surrounding_cb)
	(e_cell_text_delete_surrounding_cb)

	(layout_with_preedit) This function inserts the preedit string
	with the right attribs to the layout text.

	(build_attr_list) Creates the PangoAttrList with bold/stikeout/underline
	as applicable for the current ECellText.

	The following functions are modified.

	(ect_stop_editing): disconnect signal handlers when editing stops

	(ect_draw): Changes for including the preedit only to the currently
	selected row/col. Also display the cursor at the end of preedit text.

	(ect_event): Connects the IM callbacks to the key press event.
	Disconnect when not in editing mode. Also a special flag to see
	when Enter key pressed in preedit mode, the text is committed only
	not a new row is created. This woks in conjunction with the changes
	made in the eti_event in e-table-item.c file and e-cell.h.

	(ect_height): Changes due to parameters changing for generate_layout

	(ect_enter_edit): Initialization of im_context for a cell text and
	assoociated flags.

	(ect_max_width):  Changes due to parameters changing for
	generate_layout.

	(ect_max_width_by_row):  Changes due to parameters changing for
	generate_layout.

	(ect_show_tooltip): Changes due to parameters changing for
	generate_layout.

	(e_cell_text_construct): check whether paramters are NULL.

	(get_position_from_xy): Changes due to parameters changing for
	generate_layout.

	(_insert): Set the selection_start as the minimum of strlen(edit->text)
	and selection_start. Used to correct the preedit_string length
	which may have added to the selection_start.

	(e_cell_text_view_command): When inserting, if in the preedit mode
	do not delete the selection.

	(_selection_get): Set utf8 data instead of string data.

	(_selection_received): Take in UTF8_ATOM inaddition to
	GDK_SELECTION_TYPE_STRING.

	(e_cell_text_view_get_selection): Make utf8 data when acting as a
	selection source.

	* gal/e-table/e-cell-text.h : Included <gtk/gtkmenu.h>

	* gal/e-table/e-cell.h: Added enum E_CELL_PREEDIT to ECellFlags

	* gal/e-table/e-table-item.c: (eti_event) Changes for not committing
	the edited text as a seperate row in preedit mode.

	* gal/e-table/e-table.c: (table_canvas_focus_event_cb) To have
	proper im_context focus for the ecanvas holding the e-table.

svn path=/trunk/; revision=22882

2 files changed, 82 insertions, 11 deletions

diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index bda5f46eac..d68198507c 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -142,6 +142,8 @@ static void e_text_update_primary_selection (EText *text);
 static void e_text_paste (EText *text, GdkAtom selection);
 static void e_text_insert(EText *text, const char *string);
 
+static void reset_layout_attrs (EText *text);
+
 /* GtkEditable Methods */
 static void e_text_editable_do_insert_text (GtkEditable    *editable,
 					    const gchar    *text,
@@ -167,6 +169,8 @@ static gint e_text_editable_get_position (GtkEditable    *editable);
 static void     e_text_commit_cb               (GtkIMContext *context,
 						const gchar  *str,
 						EText        *text);
+static void     e_text_preedit_changed_cb      (GtkIMContext *context,
+						EText        *text);
 static gboolean e_text_retrieve_surrounding_cb (GtkIMContext *context,
 						EText        *text);
 static gboolean e_text_delete_surrounding_cb   (GtkIMContext *context,
@@ -282,6 +286,56 @@ e_text_dispose (GObject *object)
 }
 
 static void
+insert_preedit_text (EText *text)
+{
+	PangoAttrList *attrs = NULL;
+	PangoAttrList *preedit_attrs = NULL;
+	gchar *preedit_string = NULL;
+	GString *tmp_string = g_string_new (NULL);
+	gint length = 0, cpos = 0, preedit_length = 0;
+
+	if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context))
+		return;
+
+	text->text = e_text_model_get_text(text->model);
+	length = strlen (text->text);
+
+	g_string_prepend_len (tmp_string, text->text,length); 
+
+	attrs = pango_attr_list_new ();
+
+	gtk_im_context_get_preedit_string (text->im_context,
+					&preedit_string, &preedit_attrs,
+					NULL);
+
+	if (preedit_string && g_utf8_validate (preedit_string, -1, NULL))
+		text->preedit_len = preedit_length = strlen (preedit_string);
+	else
+		text->preedit_len  = preedit_length = 0;
+
+	cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;	
+
+	if (preedit_length)
+		g_string_insert (tmp_string, cpos, preedit_string);
+
+	reset_layout_attrs (text);
+
+	pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len);
+	if (preedit_length)
+		pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length);
+	pango_layout_set_attributes (text->layout, attrs);
+
+	if (preedit_string)
+		g_free (preedit_string);
+	if (preedit_attrs)
+		pango_attr_list_unref (preedit_attrs);
+	if (tmp_string)
+		g_string_free (tmp_string, TRUE);
+	if (attrs)
+		pango_attr_list_unref (attrs);
+}
+
+static void
 reset_layout_attrs (EText *text)
 {
 	PangoAttrList *attrs = NULL;
@@ -1436,7 +1490,10 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		}
 	}
 
-	if (!text->text)
+
+	insert_preedit_text (text);	
+
+	if (!pango_layout_get_text (text->layout))
 		return;
 
 	if (text->stipple)
@@ -1558,7 +1615,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				PangoRectangle strong_pos, weak_pos;
 				char *offs = g_utf8_offset_to_pointer (text->text, text->selection_start);
 
-				pango_layout_get_cursor_pos (text->layout, offs - text->text, &strong_pos, &weak_pos);
+				pango_layout_get_cursor_pos (text->layout, offs - text->text + text->preedit_len, &strong_pos, &weak_pos);
 				draw_pango_rectangle (drawable, main_gc, xpos, ypos, strong_pos);
 				if (strong_pos.x != weak_pos.x ||
 				    strong_pos.y != weak_pos.y ||
@@ -2116,6 +2173,8 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 					if (!text->im_context_signals_registered) {
 						g_signal_connect (text->im_context, "commit",
 								  G_CALLBACK (e_text_commit_cb), text);
+						g_signal_connect (text->im_context, "preedit_changed",
+								  G_CALLBACK (e_text_preedit_changed_cb), text);
 						g_signal_connect (text->im_context, "retrieve_surrounding",
 								  G_CALLBACK (e_text_retrieve_surrounding_cb), text);
 						g_signal_connect (text->im_context, "delete_surrounding",
@@ -3610,6 +3669,7 @@ e_text_init (EText *text)
 {
 	text->model                   = e_text_model_new ();
 	text->text                    = e_text_model_get_text (text->model);
+	text->preedit_len	      = 0;
 	text->layout                  = NULL;
 
 	text->revert                  = NULL;
@@ -3712,6 +3772,7 @@ E_MAKE_TYPE (e_text,
 	     PARENT_TYPE)
 
 
+
 /* IM Context Callbacks */
 static void
 e_text_commit_cb (GtkIMContext *context,
@@ -3722,16 +3783,28 @@ e_text_commit_cb (GtkIMContext *context,
 		if (text->selection_end != text->selection_start)
 			e_text_delete_selection (text);
 		e_text_insert (text, str);
-		g_signal_emit (text, e_text_signals[E_TEXT_KEYPRESS], 0,
-			       0 /* XXX ugh */, 0 /* XXX ugh */);
+		g_signal_emit (text, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
 	}
 }
 
+static void
+e_text_preedit_changed_cb (GtkIMContext *context,
+				EText        *etext)
+{
+	gchar *preedit_string = NULL;
+
+	gtk_im_context_get_preedit_string (context, &preedit_string, 
+					NULL, NULL);
+
+	etext->preedit_len = strlen (preedit_string);
+
+	g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
+}
+
 static gboolean
 e_text_retrieve_surrounding_cb (GtkIMContext *context,
 				EText        *text)
 {
-	printf ("e_text_retrieve_surrounding_cb\n");
 	gtk_im_context_set_surrounding (context,
 					text->text,
 					strlen (text->text),
@@ -3746,12 +3819,9 @@ e_text_delete_surrounding_cb   (GtkIMContext *context,
 				gint          n_chars,
 				EText        *text)
 {
-	printf ("e_text_delete_surrounding_cb\n");
-#if 0
-	gtk_editable_delete_text (GTK_EDITABLE (entry),
-				  entry->current_pos + offset,
-				  entry->current_pos + offset + n_chars);
-#endif
+	gtk_editable_delete_text (GTK_EDITABLE (text),
+				  text->selection_end + offset,
+				  text->selection_end + offset + n_chars);
 
 	return TRUE;
 }
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 0832c5d699..4eb3fa830b 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -108,6 +108,7 @@ struct _EText {
 	gint model_repos_signal_id;
 
 	const gchar *text;              /* Text to display --- from the ETextModel */
+	gint preedit_len;      		/* preedit length to display */
 	PangoLayout *layout;
 	int num_lines;			/* Number of lines of text */