Commit Graph

79 Commits

Author SHA1 Message Date
Hidetoshi Tajima
530fda038f Fix #90661: add im_info->im switch at the top of setup_im() and
* modules/input/gtkimcontextxim.c:
	Fix #90661: add im_info->im switch at the top of setup_im() and
	get_ic_real().
	Fix #97674: make sure only one status window for the focused
	input context should be shown.
2002-11-13 19:00:01 +00:00
Owen Taylor
497ef033d4 Don't use connect_swapped() when the function being connected has a
Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c (get_im): Don't use
        connect_swapped() when the function being connected
        has a non-swapped signature.
2002-10-15 21:27:45 +00:00
Owen Taylor
640c8cecf1 Initialize info->ics to NULL. (Hidetoshi Tajima.)
Tue Oct 15 09:54:54 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c (get_im): Initialize
        info->ics to NULL. (Hidetoshi Tajima.)

        * modules/input/gtkimcontextxim.c (status_window_get):
        Call set_resizable on the window, not on the structure.
2002-10-15 13:56:27 +00:00
Owen Taylor
af2c20ac1a - Make GtkXIMInfo structures per-screen (they were a mix between
Mon Oct 14 15:10:34 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c:
        - Make GtkXIMInfo structures per-screen (they were
          a mix between per-display and per-context before)
        - Make signal connections info->settings one-per-info
         - Handle a GdkDisplay being closed, by destroying
          all XIC, calling XCloseIM on the XIM. (#87482)
2002-10-14 19:19:08 +00:00
Manish Singh
aa54cfeede Deprecation cleanup
Sun Oct 13 13:43:16 2002  Manish Singh  <yosh@gimp.org>

        * gtk/gtkcurve.[ch] gtk/gtkgamma.[ch] gtk/gtklayout.[ch]
        gtk/gtkwidget.[ch] modules/input/gtkimcontextxim.c
        modules/input/imam-et.c modules/input/imcyrillic-translit.c
        modules/input/imhangul.c modules/input/iminuktitut.c
        modules/input/imipa.c modules/input/imthai-broken.c
        modules/input/imti-er.c modules/input/imti-et.c
        modules/input/imviqr.c: Deprecation cleanup

        * modules/input/Makefile.am: Added disable deprecation flags
2002-10-13 20:44:18 +00:00
Owen Taylor
1f8a8061b5 Patch from Takuro Ashie to fix updating of open_ims list. (#95150)
Tue Oct  8 09:41:43 2002  Owen Taylor  <otaylor@redhat.com>

        * Patch from Takuro Ashie to fix updating of open_ims
        list. (#95150)
2002-10-08 13:50:34 +00:00
Hidetoshi Tajima
fc7534bbcb Fix memory intilization error caused by my previous checkin. #94908 a
* modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
	intilization error caused by my previous checkin.
	#94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
2002-10-04 22:41:24 +00:00
Hidetoshi Tajima
335c622faf - use gtk_settings_get_for_screen () instead of gtk_settings_get_default
* modules/input/gtkimcontextxim.c:
       - use gtk_settings_get_for_screen () instead of
         gtk_settings_get_default () for multihead
       - connect property-notify signal handlers to respond runtime
         changes of status_style and preedit_style in the settings
       - Some indentation and code cleanup (#59076 - 2nd check-in)
2002-09-26 22:51:34 +00:00
Hidetoshi Tajima
8cc9e8cfa9 disable/enable preedit/status in GtkIMContextXIM (#59076)
* gnome-settings-xsettings.c: added two new xsettings
	for GTK+ input method preedit and status styles.

	With the other patch for gtk+, the preedit and status styles of
	GTK+ input method are configurable with associated gconf schemas
	keys:
	"/desktop/gnome/interface/gtk-im-preedit-style"
	"/desktop/gnome/interface/gtk-im-status-style"

	Both are set to "callback" by default, and platform's
	packging can have different default by changing
	libgnome's desktop_gnome_interface.schemas.
2002-09-24 22:55:41 +00:00
Owen Taylor
d4fe39c3f8 Fix incorrect usage of gdk_get_default_root_window ()). (#92767)
Mon Sep 23 12:24:14 2002  Owen Taylor  <otaylor@redhat.com>
        * modules/input/gtkimcontextxim.c (status_window_get):
        Fix incorrect usage of gdk_get_default_root_window ()).
        (#92767)
2002-09-23 16:27:12 +00:00
Hidetoshi Tajima
2589ff07b3 modify a warning when XSetLocaleModifiers() fails, and add a warning when
* modules/input/gtkimcontextxim.c
	(get_im): modify a warning when XSetLocaleModifiers() fails, and
	add a warning when XOpenIM() fails
	(gtk_im_context_xim_filter_keypress): use XLookupString when xic
	is not available. (#90661)
	(gtk_im_context_xim_get_ic, gtk_im_with_preedit,
	gtk_im_without_preeedit): filter key release events only when
	input methods ask for (#81759)
2002-09-10 16:49:44 +00:00
Owen Taylor
7c7bcb243f Pass the actual input keycode to XIM, rather than the result of
Fri Sep  6 12:41:16 2002  Owen Taylor  <otaylor@redhat.com>
        * modules/input/gtkimcontextxim.c: Pass the actual input
        keycode to XIM, rather than the result of backconverting
        the keysym. Fixes the <> input problem! (#74922)

        * gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment
        variable couldn't be used to force the input method to
        the default input method.
2002-09-06 16:48:40 +00:00
Owen Taylor
bf09470d79 Fix some cases where signal connection IDs where being assigned to guint
Wed Jul 10 14:27:14 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c
        gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases
        where signal connection IDs where being assigned to
        guint rather than gulong. (part of #87281, Shivram U)
2002-07-10 18:30:23 +00:00
Owen Taylor
3fe86a489d Protect against reentrancy problems by emitting ::preedit_changed at the
Fri May 17 14:40:24 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkimmulticontext.c (gtk_im_multicontext_set_slave):
        Protect against reentrancy problems by emitting
        ::preedit_changed at the end, fixing input context
        leak. (Yao Zhang)

        * modules/input/gtkimcontextxim.c (status_window_free):
        Patch from Federico Mena Quintero to fix problem where
        references to IMContextXIM were kept around after
        module was unloaded.

        * gtk/gtkdnd.c (gtk_drag_dest_set): NULL initialize
        proxy window.
2002-05-17 19:27:53 +00:00
Alex Larsson
7df4f0fb5e Make multihead-safe; use a different IM context per display.
Tue Apr 30 11:37:09 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c: Make multihead-safe;
        use a different IM context per display.

        * configure.in acconfig.h: Add Xinerama checks from
        multihead branch, changing HAS_XINERAMA => HAVE_XINERAMA.

        * gdk/x11/gdkdisplay-x11.c: HAS_XINERAMA => HAVE_XINERAMA.

2002-04-29  Alex Larsson  <alexl@redhat.com>

        * gdk/gdkpango.c (gdk_draw_layout_line_with_colors):
        Use tmp also if foreground is set.
2002-04-30 15:51:29 +00:00
Owen Taylor
2d770e946a Fix incorrect return value, filter out returns of 0x7f for the delete key.
Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
        Fix incorrect return value, filter out returns of 0x7f for
        the delete key. (#74179, Kang Jeong-He)
2002-03-12 20:01:47 +00:00
Owen Taylor
cd6070461e 1.3.12, interface, binary age 0.
Sat Dec 22 12:38:03 2001  Owen Taylor  <otaylor@redhat.com>

        * configure.in: 1.3.12, interface, binary age 0.

        * configure.in: Require new versions of Glib, Pango, ATK.

        * NEWS: Updated.

        * configure.in: Make explicit what libtool we are executing.
        (Tomas Ogren)

        * gdk/gdkcolor.c gdk/gdkgc.c gdk/gdkwindow.c: Doc fixes.

        * gtk/gtkwidget.c (gtk_widget_[class]path) gtkrc.h : Fix
        parameter names for docs.

Sat Dec 22 22:35:29 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_realize)
          gtk/gtkplug.c (gtk_plug_realize): Include GDK_KEY_RELEASE_MASK.

        * gtk/gtkentry.c (gtk_entry_key_release)
          gtk/gtktextview.c (gtk_text_view_key_release_event): Pass
        key release events to the input method.

        * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):
        Handle release of Control/Shift to end hex sequence.

        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):         Handle key releases as well as presses.
2001-12-23 22:59:30 +00:00
Owen Taylor
9fd70c6bf5 Display the XIM status callbacks with a popup window. (Patch from
Fri Dec  7 16:05:22 2001  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c: Display the XIM
        status callbacks with a popup window. (Patch from
        HideToshi Tajima, #50628, somewhat modified.)
2001-12-07 23:15:32 +00:00
Owen Taylor
7f63b5db98 Patch from HideToshi Tajima (#51922)
Fri Nov  2 15:30:34 2001  Owen Taylor  <otaylor@redhat.com>

        Patch from HideToshi Tajima (#51922)

        * gtk/gtkimmulticontext.c: Proxy set_use_preedit().

        * gtk/modules/input/gtkimcontextxim.[ch]: Implement
        set_use_preedit().

        * gtk/modules/input/gtkimcontextxim.[ch]: If we have
        to destroy the input context because we change the
        client window or use_preedit, make sure we empty
        the preedit string.
2001-11-02 20:48:15 +00:00
Owen Taylor
effa390541 Make GtkIMContext derive from GObject, not GtkObject. (#62621)
Fri Oct 19 15:08:30 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/{gtkimcontext.c,gtkimcontextsimple.c,gtkimmulticontext.c}
	modules/input/{gtkimcontextxim.c,imcyrillic-translit.c,iminuktitut.c,
	imipa.c,imthai-broken.c,imviqr.c}: Make GtkIMContext derive from
	GObject, not GtkObject. (#62621)
2001-10-19 19:28:27 +00:00
Hidetoshi Tajima
29d11da8c6 Skip g_convert when to_codeset and from_codeset are both 'UTF-8' (gnome
* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
	(gnome bugzilla #58202)
2001-08-06 17:09:26 +00:00
Darin Adler
0349676329 Ignore the sgml directory made by gtkdoc. Use gtk_window_set_resizable
* .cvsignore: Ignore the sgml directory made by gtkdoc.
	* demos/pixbuf-demo.c: (main): Use gtk_window_set_resizable
	instead of the deprecated gtk_window_set_policy.
	* demos/testpixbuf-scale.c: Add missing <stdlib.h> include.
	* gdk/gdkkeys.c: (gdk_keymap_class_init): Remove empty finalize
	function to get rid of warning and some code too.
	* gdk/x11/gdkfont-x11.c: (gdk_font_charset_for_locale): Add
	missing const.
	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_init_check): Remove
	unused local.
	* gdk/x11/gdkpango-x11.c: (gdk_pango_context_get): Add missing
	const.
	* gdk/x11/gdkselection-x11.c: (gdk_text_property_to_utf8_list),
	(gdk_utf8_to_compound_text): Add missing const.
	* gtk/gtkimage.c: (gtk_image_expose): Remove unused local.
	* gtk/gtkmenubar.c: (gtk_menu_bar_hierarchy_changed): Add missing
	cast and get rid of an unnecessary one.
	* gtk/gtksettings.c: (gtk_settings_notify): Remove unused local.
	* gtk/gtkstatusbar.c: (gtk_statusbar_size_allocate): Remove unused
	local.
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_build_level):
	Remove unused local.
	* modules/input/gtkimcontextxim.c: (gtk_im_context_xim_new): Add
	missing const.
	* tests/testsocket.c: (add_child): Add cast so the printf format
	doesn't make us implicitly depend on what integer type
	gtk_socket_get_id returns.
	* tests/testtextbuffer.c: Add missing const.
	* tests/testtreefocus.c: (main): Remove unused local.
	* tests/treestoretest.c: (iter_remove): Remove unused local.
	(uppercase_value): Remove unused function.
	(make_window): Add statement to quiet the compiler's uninitialized
	variable warning.
2001-07-18 04:31:11 +00:00
Owen Taylor
b09d194d3c Fixup some problems with text length handling in error cases.
Sat Jun 23 10:27:53 2001  Owen Taylor  <otaylor@redhat.com>

	* modules/input/gtkimcontextxim.c: Fixup some problems with
	text length handling in error cases.

	* gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder
	a bit to make test actually warn on attempt to allocation
	a negative size. (#56101, Matthias Clasen)
2001-06-23 14:32:44 +00:00
HideToshi Tajima
df726ee888 rename set_cursor_pos to set_cursor_location in GtkInputContext class
2001-03-15  HideToshi Tajima  <tajima@happy>

        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_locat
ion):
        * gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
        * gtk/gtkentry.c (update_im_cursor_location):
        * gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
        set_cursor_pos to set_cursor_location in GtkInputContext class
2001-03-16 01:44:54 +00:00
HideToshi Tajima
02f376a91f add set_cursor_pos() virtual method
2001-03-14  HideToshi Tajima  <tajima@happy.sunsoft.eng.sun.com>

	* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_pos):
	* gtk/gtkimcontext.c (gtk_im_context_set_cursor_pos):
	* gtk/gtkimcontext.h (struct _GtkIMContextClass): add
	set_cursor_pos() virtual method

	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_class_init):
	(gtk_im_context_xim_set_cursor_pos): add implementation for
	set_cursor_pos() method

	* gtk/gtkentry.c (recompute_idle_func): set current cursor
	position to input methods
2001-03-14 22:03:24 +00:00
Owen Taylor
eb2fdbb176 Adopt to new prototypes for unicode,locale,filename conversion functions.
Fri Jan  5 16:16:29 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
	modules/input/gtkimcontextxim.c: Adopt to new prototypes
	for unicode,locale,filename conversion functions.
2001-01-05 21:23:53 +00:00
8
eccd33b2e7 Add focus_in and focus_out implementation to im_context_class as
2000-12-08    <tajima@eng.sun.com>

        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_class_init):
          Add focus_in and focus_out implementation to im_context_class
          as gtk_im_context_xim_focus_in and gtk_im_context_xim_focus_out.
2000-12-09 01:06:55 +00:00
Hidetoshi Tajima
c396e4bb05 -Add NULL argument to XGetIMValues.
-Check NULL return for xim_styles and ic_values.
-Restore preedit state after XmbResetIC.
-Change XVaNestedList* to XVaNestedList.
-Match "preedit-changed" to "preedit_changed".
2000-12-01 03:43:14 +00:00
Owen Taylor
b9d3287313 Rip out support for multiple locales; that simple doesn't work reliably
Tue Sep 19 10:54:22 2000  Owen Taylor  <otaylor@redhat.com>

	* modules/input/{gtkimcontextxim.[ch],imxim.c}: Rip
	out support for multiple locales; that simple doesn't
	work reliably with current Xlib

	* gtk/gtkimcontext*.[ch] gtk/gtkimmulticontext.[ch]
	gtk/gtktextlayout.[ch] gtk/gtktextview.c gtk/gtkentry.c:
	Add support for positioning the cursor within the preedit string.

Mon Sep 18 23:56:32 2000  Owen Taylor  <otaylor@redhat.com>

	* modules/input/{imxim.c,gtkimcontextxim.[ch]}: Start
	at XIM input method module.

Sun Sep 17 10:08:16 2000  Owen Taylor  <otaylor@redhat.com>

	* modules/input/Makefile.am (moduledir): remove
	leftover bin program target.

Sat Sep 16 13:05:48 2000  Owen Taylor  <otaylor@redhat.com>

	* modules/input/imcyrillic-translit.c: A sample input
	method (based on GtkIMContextSimple with an extra table),
	which demonstrates preedit strings and the module
	system for input modules
2000-11-12 03:40:47 +00:00