Add missing files.

ChangeLog

+2005-09-20  Yves Combe  <yves@ycombe.net>
+
+	Add missing files.
+
+	* src/boards/algebra.c: (key_press):
+	* src/gcompris/gcompris_im.c: (gcompris_im_init),
+	(gcompris_im_reset), (im_context_commit_callback),
+	(im_context_preedit_callback), (window_focus_callback):
+	* src/gcompris/gcompris_im.h:
+
 2005-09-19  Yves Combe  <yves@ycombe.net>
 
 	Uses GtkIMContext to handle correctly input in all languages. All boards using key_press are now broken.

src/boards/algebra.c

 /* gcompris - algebra.c
  *
- * Time-stamp: <2005/09/18 20:31:25 yves>
+ * Time-stamp: <2005/09/19 23:14:52 yves>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -221,13 +221,12 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str)
     return;
 
   g_warning("key_press: %d %s %s %s", keyval, gdk_keyval_name (keyval), commit_str, preedit_str);
-
-  
+ 
 
   guint c;
   gboolean stop = FALSE;
 
-  if(!gcomprisBoard)
+  if(!boardRootItem)
     return FALSE;
 
   /* Add some filter for control and shift key */

src/gcompris/gcompris_im.c

+/* gcompris - gcompris_im.c
+ *
+ * Time-stamp: <2005/09/15 14:56:51 yves>
+ *
+ * Copyright (C) 2000,2003 Bruno Coudoin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "gcompris.h"
+
+static gint im_context_commit_callback (GtkIMContext *imcontext,
+					gchar *arg1,
+					gpointer user_data);
+
+static gint im_context_preedit_callback (GtkIMContext *imcontext,
+					 gpointer user_data);
+
+static gint window_focus_callback (GtkWidget *widget,
+				   GdkEventFocus *event,
+				   gpointer user_data);
+
+
+void *gcompris_im_init(GtkWidget *window)
+{
+  GcomprisProperties	*properties = gcompris_get_properties ();
+
+
+  /* set IMContext */
+  properties->context = gtk_im_multicontext_new ();
+  GtkWidget *submenu;
+
+
+  GHashTable *init_im =  g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+  init_im = gcompris_get_conf_with_table (gcompris_get_current_profile()->profile_id, 
+					  -1, 
+					  init_im );
+
+  properties->default_context = g_hash_table_lookup ( init_im, "default_im");
+
+  if (properties->default_context)
+    g_setenv ("GTK_IM_MODULE",
+	      properties->default_context,
+	      TRUE);
+
+  gtk_im_context_set_client_window (properties->context,
+                                    window->window);
+
+  g_signal_connect (G_OBJECT (properties->context), "commit",
+		    G_CALLBACK(im_context_commit_callback), NULL);
+
+  g_signal_connect (G_OBJECT (properties->context), "preedit-changed",
+		    G_CALLBACK(im_context_preedit_callback), NULL);
+
+  g_signal_connect (GTK_WIDGET (window), "focus-in-event",
+		    G_CALLBACK(window_focus_callback), NULL);
+
+  g_signal_connect (GTK_WIDGET (window), "focus-out-event",
+		    G_CALLBACK(window_focus_callback), NULL);
+ 
+}
+
+void *gcompris_im_reset()
+{
+  GcomprisProperties	*properties = gcompris_get_properties ();
+  gtk_im_context_reset (properties->context);
+}
+
+    
+static gint im_context_commit_callback (GtkIMContext *imcontext,
+					gchar *arg1,
+					gpointer user_data)
+{
+  if (get_current_board_plugin()!=NULL && get_current_board_plugin()->key_press)
+    {
+      int result = get_current_board_plugin()->key_press (0, arg1, NULL);
+      //      g_free(arg1);
+      return(result);
+    }
+}
+    
+static gint im_context_preedit_callback (GtkIMContext *imcontext,
+					 gpointer user_data)
+{
+  gchar *preedit_string;
+  PangoAttrList *attrs;
+  gint cursor_pos;
+
+  gtk_im_context_get_preedit_string (imcontext,
+				     &preedit_string,
+				     &attrs,
+				     &cursor_pos);
+
+  if (get_current_board_plugin()!=NULL && get_current_board_plugin()->key_press)
+    {
+      int result = get_current_board_plugin()->key_press (0, NULL, preedit_string);
+      g_free(preedit_string);
+      pango_attr_list_unref (attrs);
+      return(result);
+    }
+}
+
+static gint window_focus_callback (GtkWidget *widget,
+				   GdkEventFocus *event,
+				   gpointer user_data)
+{
+  GcomprisProperties	*properties = gcompris_get_properties ();
+  if (event->in)
+    gtk_im_context_focus_in (properties->context);
+  else
+    gtk_im_context_focus_out (properties->context);
+  
+  return FALSE;
+}
+
+
+
+
+/* Local Variables: */
+/* mode:c */
+/* eval:(load-library "time-stamp") */
+/* eval:(make-local-variable 'write-file-hooks) */
+/* eval:(add-hook 'write-file-hooks 'time-stamp) */
+/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
+/* End: */

src/gcompris/gcompris_im.h

+/* gcompris - gcompris_im.h
+ *
+ * Time-stamp: <2005/09/15 14:19:33 yves>
+ *
+ * Copyright (C) 2005 Bruno Coudoin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*****************************************************************************/
+/* this files gives access to im_context for gcompris_board.                 */
+/*****************************************************************************/
+
+#ifndef GCOMPRIS_IM_H
+#define GCOMPRIS_IM_H
+
+void *gcompris_im_init();
+
+void *gcompris_board_change_context();
+
+void *gcompris_im_reset();
+
+#endif
+
+
+/* Local Variables: */
+/* mode:c */
+/* eval:(load-library "time-stamp") */
+/* eval:(make-local-variable 'write-file-hooks) */
+/* eval:(add-hook 'write-file-hooks 'time-stamp) */
+/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
+/* End: */