Add new keysyms from X11R6.4 (including EuroSign).

1999-10-31  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).

* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.

* gdk/win32/*.c: Change gdk_root_parent to be a pointer.

* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.

* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.

* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.

Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).

Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().

Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.

* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.

* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.

* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.

* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.

* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".

1 files changed, 19 insertions, 7 deletions

diff --git a/gdk/win32/gdkprivate.h b/gdk/win32/gdkprivate.h
index a45044d8e..25ed2e071 100644
--- a/gdk/win32/gdkprivate.h
+++ b/gdk/win32/gdkprivate.h
@@ -50,10 +50,8 @@
 #define VIETNAMESE_CHARSET 163
 #endif
 
-/* MB_CUR_MAX is missing */
-#ifndef MB_CUR_MAX
-extern int *__imp___mb_cur_max;
-#define MB_CUR_MAX (*__imp___mb_cur_max)
+#ifndef VM_OEM_PLUS
+#define VK_OEM_PLUS 0xBB
 #endif
 
 #include <time.h>
@@ -217,6 +215,9 @@ struct _GdkWindowPrivate
 
   GList *filters;
   GList *children;
+
+  HKL input_locale;
+  CHARSETINFO charset_info;
 };
 
 struct _GdkImagePrivate
@@ -304,6 +305,9 @@ struct _GdkVisualPrivate
 struct _GdkFontPrivate
 {
   GdkFont font;
+  /* For now, both GDK_FONT_FONT and GDK_FONT_FONTSET fonts
+   * just have one Windows font loaded. This will change.
+   */
   HFONT xfont;
   guint ref_count;
 
@@ -382,6 +386,15 @@ void    gdk_sel_prop_store (GdkWindow *owner,
 
 void       gdk_event_queue_append (GdkEvent *event);
 
+gint	   gdk_nmbstowcs (GdkWChar    *dest,
+			  const gchar *src,
+			  gint         src_len,
+			  gint         dest_max);
+gint	   gdk_nmbstowchar_ts (wchar_t     *dest,
+			       const gchar *src,
+			       gint         src_len,
+			       gint         dest_max);
+
 /* Please see gdkwindow.c for comments on how to use */ 
 HWND gdk_window_xid_at(HWND base, gint bx, gint by, gint x, gint y, GList *excludes, gboolean excl_child);
 HWND gdk_window_xid_at_coords(gint x, gint y, GList *excludes, gboolean excl_child);
@@ -391,14 +404,12 @@ extern gint		 gdk_show_events;
 extern gint		 gdk_stack_trace;
 extern HWND		 gdk_root_window;
 extern HWND		 gdk_leader_window;
-GDKVAR GdkWindowPrivate	 gdk_root_parent;
+GDKVAR GdkWindowPrivate	*gdk_root_parent;
 GDKVAR Atom		 gdk_selection_property;
-extern GdkWindow	*selection_owner[];
 GDKVAR gchar		*gdk_progclass;
 GDKVAR gint		 gdk_error_code;
 GDKVAR gint		 gdk_error_warnings;
 GDKVAR gint              gdk_null_window_warnings;
-extern GList            *gdk_default_filters;
 extern gint		 gdk_event_func_from_window_proc;
 
 extern HDC		 gdk_DC;
@@ -411,6 +422,7 @@ extern UINT		 gdk_selection_clear_msg;
 extern GdkAtom		 gdk_clipboard_atom;
 extern GdkAtom		 gdk_win32_dropfiles_atom;
 extern GdkAtom		 gdk_ole2_dnd_atom;
+extern BOOL (WINAPI *p_TrackMouseEvent) (TRACKMOUSEEVENT *tme);
 
 extern LRESULT CALLBACK gdk_WindowProc (HWND, UINT, WPARAM, LPARAM);