diff options
Diffstat (limited to 'source/x/scim-bridge/patches')
6 files changed, 0 insertions, 191 deletions
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch deleted file mode 100644 index f925507a7..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp.bak 2009-01-18 01:04:20.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp 2010-09-11 22:38:27.196979199 +0800 -@@ -65,7 +65,7 @@ - unsigned int tmp_uint; - - int option = 0; -- while (option != EOF) { -+ while (option != -1) { - option = getopt_long (argc, argv, short_options, long_options, NULL); - switch (option) { - case 'v': diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch deleted file mode 100644 index 85732013d..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.bak 2009-02-03 22:36:14.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp 2010-09-11 23:25:00.636978519 +0800 -@@ -60,6 +60,8 @@ - - static bool on_the_spot_enabled = true; - -+static String help_hotkeys = ""; -+ - /* Class definition */ - class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext - { -@@ -274,6 +276,12 @@ - } - - -+void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str) -+{ -+ help_hotkeys = hotkey_str; -+} -+ -+ - ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener): - client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY), - preedit_shown (false), preedit_cursor_position (0) -@@ -654,6 +662,8 @@ - - void ScimBridgeAgentIMContextImpl::focus_out () - { -+ if (!imengine_shared && imengine == NULL) alloc_imengine (); -+ - ScimBridgeAgentIMContext *focused_imcontext = static_cast<ScimBridgeAgentIMContext*> (get_imengine ()->get_frontend_data ()); - - if ( !focused ) -@@ -923,9 +933,11 @@ - - void ScimBridgeAgentIMContextImpl::panel_request_help () - { -- String help = String ("Smart Common Input Method platform ") + -- String (SCIM_VERSION) + -- String ("\n(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n\n"); -+ String help = String ("SCIM Bridge") + -+ String (VERSION) + -+ String ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki@users.sourceforge.net>\n") + -+ help_hotkeys + -+ String ("\n\n"); - - IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ()); - if (factory.null ()) factory = fallback_imengine_factory; diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch deleted file mode 100644 index f16b34c14..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.bak 2008-11-02 14:44:49.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h 2010-09-11 23:12:18.085979961 +0800 -@@ -130,6 +130,21 @@ - static void set_enabled_by_default (bool enabled); - - /** -+ * Get the hotkey help messages. -+ * -+ * @return help messages about hotkeys. -+ */ -+ static scim::String get_help_hotkeys (); -+ -+ /** -+ * Set the hotkey help messages. -+ * -+ * @param hotkey_str Help message about hotkeys. -+ * -+ */ -+ static void set_help_hotkeys (const scim::String &hotkey_str); -+ -+ /** - * Destructor. - */ - virtual ~ScimBridgeAgentIMContext () {} diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch deleted file mode 100644 index 27c5cb73b..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.bak 2009-03-08 21:07:29.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent.cpp 2010-09-11 22:59:34.476979479 +0800 -@@ -542,6 +542,27 @@ - scim_global_config_flush (); - - scim_keyboard_layout = scim_get_default_keyboard_layout (); -+ -+ // Hot key name, hot key config key. -+ // ! Update hotkey_list_length according to updated list length. -+ int hotkey_list_length = 6; -+ String hotkey_list[][2] = { -+ { "Toggle on/off - ", "/Hotkeys/FrontEnd/Trigger" }, -+ { "Turn on - ", "/Hotkeys/FrontEnd/On" }, -+ { "Turn off - ", "/Hotkeys/FrontEnd/Off" }, -+ { "Next input method - ", "/Hotkeys/FrontEnd/NextFactory" }, -+ { "Previous input method - ", "/Hotkeys/FrontEnd/PreviousFactory" }, -+ { "Show input method menu - ", "/Hotkeys/FrontEnd/ShowFactoryMenu" } -+ }; -+ -+ // Undefined hot keys are hidden from help window. -+ String help_hotkeys = "\nGlobal Hotkeys:"; -+ for ( int i = 0; i < hotkey_list_length; i++ ) { -+ String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String ("")); -+ if ( tmp_hotkeys != "" ) -+ help_hotkeys += "\n" + hotkey_list[i][0] + "<" + tmp_hotkeys + ">"; -+ } -+ ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys); - } - - diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch deleted file mode 100644 index 21f1f824e..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c.bak 2008-11-02 14:44:23.000000000 +0800 -+++ scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c 2010-09-11 23:19:10.556978680 +0800 -@@ -35,6 +35,8 @@ - #include "scim-bridge-output.h" - #include "scim-bridge-string.h" - -+#define SEND_EVENT_MASK 0x02 -+ - /* Typedef */ - struct _ScimBridgeClientIMContext - { -@@ -200,7 +202,7 @@ - { - scim_bridge_pdebugln (7, "key_snooper ()"); - -- if (!event->send_event && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) { -+ if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) { - if (focused_imcontext->client_window != NULL) { - int new_window_x; - int new_window_y; -@@ -556,7 +558,7 @@ - { - GdkEventKey gdk_event; - scim_bridge_key_event_bridge_to_gdk (&gdk_event, imcontext->client_window, key_event); -- gdk_event.send_event = TRUE; -+ gdk_event.send_event |= SEND_EVENT_MASK; - if (imcontext == focused_imcontext && focused_widget != NULL) { - const char *signal_name = NULL; - if (scim_bridge_key_event_is_pressed (key_event)) { -@@ -762,7 +764,7 @@ - - ScimBridgeClientIMContext *imcontext = SCIM_BRIDGE_CLIENT_IMCONTEXT (context); - -- if (!event->send_event && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) { -+ if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) { - - if (imcontext->client_window != NULL) { - int new_window_x; -@@ -875,7 +877,7 @@ - scim_bridge_client_open_messenger (); - } - -- if (is_key_snooper_enabled ()) { -+ if (!key_snooper_used && is_key_snooper_enabled ()) { - key_snooper_id = gtk_key_snooper_install ((GtkKeySnoopFunc) &key_snooper, NULL); - key_snooper_used = TRUE; - } diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch deleted file mode 100644 index 74a3252ef..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp.bak 2008-11-02 14:44:46.000000000 +0800 -+++ scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp 2010-09-11 22:46:10.396979441 +0800 -@@ -220,7 +220,12 @@ - { - scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()"); - QInputContext::setFocusWidget (widget); -- focus_in (); -+ if (widget == NULL) { -+ focus_out (); -+ } -+ else { -+ focus_in (); -+ } - update (); - } - -@@ -442,9 +447,11 @@ - } - } - -- set_preedit_shown (false); -- update_preedit (); -- -+ if (preedit_shown) { -+ set_preedit_shown (false); -+ update_preedit (); -+ } -+ - focused_imcontext = NULL; - } - |