AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-04 01:31:13 +00:00
Code Issues Projects Releases Wiki Activity

Remove the XIM input method

Browse Source 
It's old and busted, and mostly broken in weird ways when it comes to
extended input devices. All that XIM does, these days, is make a mess
when people enable it by mistake.
This commit is contained in:
Emmanuele Bassi 2019-11-16 21:05:25 +00:00
parent 1ba2923616
commit a439be5161
4 changed files with 0 additions and 1755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1696
gtk/gtkimcontextxim.c
View File

File diff suppressed because it is too large Load Diff

47
gtk/gtkimcontextxim.h
View File

@ -1,47 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat Software
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_IM_CONTEXT_XIM_H__
#define __GTK_IM_CONTEXT_XIM_H__
#include <gtk/gtk.h>
#include "x11/gdkx.h"
G_BEGIN_DECLS
#define GTK_TYPE_IM_CONTEXT_XIM (gtk_im_context_xim_get_type ())
#define GTK_IM_CONTEXT_XIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIM))
#define GTK_IM_CONTEXT_XIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass))
#define GTK_IS_IM_CONTEXT_XIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_XIM))
#define GTK_IS_IM_CONTEXT_XIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_XIM))
#define GTK_IM_CONTEXT_XIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass))
typedef struct _GtkIMContextXIM GtkIMContextXIM;
typedef struct _GtkIMContextXIMClass GtkIMContextXIMClass;
struct _GtkIMContextXIMClass
{
GtkIMContextClass parent_class;
};
GType gtk_im_context_xim_get_type (void) G_GNUC_CONST;
void gtk_im_context_xim_shutdown (void);
G_END_DECLS
#endif /* __GTK_IM_CONTEXT_XIM_H__ */

11
gtk/gtkimmodule.c
View File

@ -42,7 +42,6 @@
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h" #include "x11/gdkx.h"
#include "gtkimcontextxim.h"
#endif #endif
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
@ -126,13 +125,6 @@ match_backend (GdkDisplay *display,
return FALSE; return FALSE;
#endif #endif
if (g_strcmp0 (context_id, "xim") == 0)
#ifdef GDK_WINDOWING_X11
return GDK_IS_X11_DISPLAY (display);
#else
return FALSE;
#endif
if (g_strcmp0 (context_id, "ime") == 0) if (g_strcmp0 (context_id, "ime") == 0)
#ifdef GDK_WINDOWING_WIN32 #ifdef GDK_WINDOWING_WIN32
return GDK_IS_WIN32_DISPLAY (display); return GDK_IS_WIN32_DISPLAY (display);
@ -270,9 +262,6 @@ gtk_im_modules_init (void)
gtk_im_module_ensure_extension_point (); gtk_im_module_ensure_extension_point ();
g_type_ensure (gtk_im_context_simple_get_type ()); g_type_ensure (gtk_im_context_simple_get_type ());
#ifdef GDK_WINDOWING_X11
g_type_ensure (gtk_im_context_xim_get_type ());
#endif
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
g_type_ensure (gtk_im_context_wayland_get_type ()); g_type_ensure (gtk_im_context_wayland_get_type ());
#endif #endif

1
gtk/meson.build
View File

@ -748,7 +748,6 @@ endif
if x11_enabled if x11_enabled
gtk_sources += ['gtkapplication-x11.c', 'gtkmountoperation-x11.c'] gtk_sources += ['gtkapplication-x11.c', 'gtkmountoperation-x11.c']
gtk_sources += ['gtkimcontextxim.c']
endif endif
if wayland_enabled if wayland_enabled