Mercurial > emacs
changeset 89145:9feda646c377
(x_window, x_window): Use use_xim.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Sat, 05 Oct 2002 14:38:51 +0000 |
| parents | ab07a01e1a94 |
| children | 4b3fdf998612 |
| files | src/xfns.c |
| diffstat | 1 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Sat Oct 05 14:37:43 2002 +0000 +++ b/src/xfns.c Sat Oct 05 14:38:51 2002 +0000 @@ -3431,7 +3431,7 @@ static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *)); -/* Supported XIM styles, ordered by preferenc. */ +/* Supported XIM styles, ordered by preference. */ static XIMStyle supported_xim_styles[] = { @@ -3887,9 +3887,8 @@ #ifdef HAVE_X_I18N FRAME_XIC (f) = NULL; -#ifdef USE_XIM - create_frame_xic (f); -#endif + if (use_xim) + create_frame_xic (f); #endif f->output_data.x->wm_hints.input = True; @@ -3992,19 +3991,20 @@ attribute_mask, &attributes); #ifdef HAVE_X_I18N -#ifdef USE_XIM - create_frame_xic (f); - if (FRAME_XIC (f)) - { - /* XIM server might require some X events. */ - unsigned long fevent = NoEventMask; - XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL); - attributes.event_mask |= fevent; - attribute_mask = CWEventMask; - XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - attribute_mask, &attributes); - } -#endif + if use_xim + { + create_frame_xic (f); + if (FRAME_XIC (f)) + { + /* XIM server might require some X events. */ + unsigned long fevent = NoEventMask; + XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL); + attributes.event_mask |= fevent; + attribute_mask = CWEventMask; + XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), + attribute_mask, &attributes); + } + } #endif /* HAVE_X_I18N */ validate_x_resource_name ();