rpms/scim/devel scim_panel_gtk-settle-toolbar-after-drag.patch, NONE, 1.1 initial-locale-hotkey-186861.patch, 1.1, 1.2 scim-1.4.5-panel-menu-fixes.patch, 1.1, 1.2 scim-system-default-config.patch, 1.9, 1.10 scim.spec, 1.73, 1.74 scim_panel-observe-workarea-xprop-204442.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 15 08:36:38 UTC 2006
Author: petersen
Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32464
Modified Files:
initial-locale-hotkey-186861.patch
scim-1.4.5-panel-menu-fixes.patch
scim-system-default-config.patch scim.spec
scim_panel-observe-workarea-xprop-204442.patch
Added Files:
scim_panel_gtk-settle-toolbar-after-drag.patch
Log Message:
- improve scim_panel-observe-workarea-xprop-204442.patch to autosnap within
desktop workarea (#204442)
- add scim_panel_gtk-settle-toolbar-after-drag.patch to autosnap toolbar after
dragging
- improve initial-locale-hotkey-186861.patch not to set next/previous factory
and show menu hotkeys by default (#219247)
- remove show factory menu hotkey and add super and hyper as valid modifiers
in scim-system-default-config.patch
- improve scim-1.4.5-panel-menu-fixes.patch to correctly name recently used
factories for same language (#217324)
scim_panel_gtk-settle-toolbar-after-drag.patch:
scim_panel_gtk.cpp | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
--- NEW FILE scim_panel_gtk-settle-toolbar-after-drag.patch ---
diff -u scim-1.4.5/extras/panel/scim_panel_gtk.cpp~ scim-1.4.5/extras/panel/scim_panel_gtk.cpp
--- scim-1.4.5/extras/panel/scim_panel_gtk.cpp~ 2006-12-15 11:51:59.000000000 +1000
+++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp 2006-12-15 11:51:59.000000000 +1000
@@ -1888,20 +1888,14 @@
gdk_pointer_ungrab (event->time);
_toolbar_window_draging = FALSE;
- gint pos_x, pos_y;
-
- gtk_window_get_position (GTK_WINDOW (window), &pos_x, &pos_y);
+ ui_settle_toolbar_window ();
- if (!_config.null () &&
- (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) {
+ if (!_config.null ()) {
_config->write (
- SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x);
+ SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, _toolbar_window_x);
_config->write (
- SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y, pos_y);
-
+ SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y, _toolbar_window_y);
}
- _toolbar_window_x = pos_x;
- _toolbar_window_y = pos_y;
return TRUE;
} else if (click_type == 1 && event->button > 1) {
initial-locale-hotkey-186861.patch:
scim_hotkey.cpp | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
Index: initial-locale-hotkey-186861.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/initial-locale-hotkey-186861.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initial-locale-hotkey-186861.patch 13 Jun 2006 01:28:52 -0000 1.1
+++ initial-locale-hotkey-186861.patch 15 Dec 2006 08:36:36 -0000 1.2
@@ -1,7 +1,19 @@
-diff -uNr scim-1.4.4.orig/src/scim_hotkey.cpp scim-1.4.4/src/scim_hotkey.cpp
---- scim-1.4.4.orig/src/scim_hotkey.cpp 2006-06-07 16:03:32.961933656 +0800
-+++ scim-1.4.4/src/scim_hotkey.cpp 2006-06-07 17:13:56.089920616 +0800
-@@ -362,12 +362,30 @@
+--- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey 2005-06-18 23:19:35.000000000 +1000
++++ scim-1.4.5/src/scim_hotkey.cpp 2006-12-12 16:22:59.000000000 +1000
+@@ -332,9 +332,9 @@
+ "Control+space",
+ "",
+ "",
+- "Control+Alt+Down,Control+Shift+Shift_L+KeyRelease,Control+Shift+Shift_R+KeyRelease",
+- "Control+Alt+Up,Control+Shift+Control_L+KeyRelease,Control+Shift+Control_R+KeyRelease",
+- "Control+Alt+Right",
++ "",
++ "",
++ "",
+ 0
+ };
+
+@@ -362,11 +362,26 @@
if (config.null () || !config->valid ()) return;
KeyEventList keys;
@@ -18,7 +30,7 @@
- if (scim_string_to_key_list (keys, config->read (String (__scim_frontend_hotkey_config_paths [i]), String (__scim_frontend_hotkey_defaults [i]))))
- m_impl->m_matcher.add_hotkeys (keys, i);
+ if (userconf_exist == false ) {
-+ String config_paths = String (String (__scim_frontend_hotkey_config_paths [i]) + "/" + lang);
++ String config_paths = String (__scim_frontend_hotkey_config_paths [i]) + "/" + lang;
+ if (scim_string_to_key_list (keys, config->read (config_paths, String (__scim_frontend_hotkey_defaults [i]))))
+ m_impl->m_matcher.add_hotkeys (keys, i);
+ config->write (String (__scim_frontend_hotkey_config_paths [i]),
@@ -28,9 +40,5 @@
+ m_impl->m_matcher.add_hotkeys (keys, i);
+ }
}
-+
-+ if (userconf_exist == false)
-+ config->flush ();
}
- void
scim-1.4.5-panel-menu-fixes.patch:
scim_panel_gtk.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
Index: scim-1.4.5-panel-menu-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim-1.4.5-panel-menu-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-1.4.5-panel-menu-fixes.patch 7 Nov 2006 02:03:21 -0000 1.1
+++ scim-1.4.5-panel-menu-fixes.patch 15 Dec 2006 08:36:36 -0000 1.2
@@ -1,5 +1,6 @@
---- scim-1.4.5/extras/panel/scim_panel_gtk.cpp.11-factory-menu 2006-11-06 18:51:56.000000000 +1000
-+++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp 2006-11-07 11:44:25.000000000 +1000
+diff -u scim-1.4.5/extras/panel/scim_panel_gtk.cpp.11-factory-menu scim-1.4.5/extras/panel/scim_panel_gtk.cpp
+--- scim-1.4.5/extras/panel/scim_panel_gtk.cpp.11-factory-menu 2006-12-15 17:33:53.000000000 +1000
++++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp 2006-12-15 17:33:53.000000000 +1000
@@ -193,7 +193,7 @@
static GtkWidget* ui_create_left_icon (void);
static GtkWidget* ui_create_right_icon (void);
@@ -43,12 +44,33 @@
} else {
text = scim_get_language_name (info.lang) + " - " + info.name;
tooltip = "";
-@@ -2700,13 +2699,12 @@
+@@ -2651,7 +2650,7 @@
+ size_t i;
+
+ MapStringVectorSizeT groups;
+- std::map<String,size_t> recents;
++ std::map<String,size_t> langs, recents;
+
+ guint32 activate_time = gtk_get_current_event_time ();
+
+@@ -2663,6 +2662,7 @@
+
+ for (i = 0; i < factories.size (); ++i) {
+ _factory_menu_uuids.push_back (factories [i].uuid);
++ langs [factories [i].lang]++;
+
+ if (show_recent &&
+ std::find (_recent_factory_uuids.begin (), _recent_factory_uuids.end (),
+@@ -2697,16 +2697,16 @@
+ // recently used factories
+ if (show_recent && recents.size ()) {
+ for (std::list<String>::iterator it = _recent_factory_uuids.begin (); it != _recent_factory_uuids.end (); ++it) {
++
id = recents [*it];
info = factories [id];
- ui_create_factory_menu_entry (info, id, GTK_MENU_SHELL (_factory_menu), true, true);
-+ ui_create_factory_menu_entry (info, id, GTK_MENU_SHELL (_factory_menu), true, (groups [factories [id].lang].size () > 1));
++ ui_create_factory_menu_entry (info, id, GTK_MENU_SHELL (_factory_menu), true, (langs [info.lang] > 1));
if (use_submenus) {
MapStringVectorSizeT::iterator g = groups.find (info.lang);
@@ -58,12 +80,12 @@
}
}
}
-@@ -2729,7 +2727,7 @@
+@@ -2729,7 +2729,7 @@
for (i = 0; i < it->second.size (); ++i) {
id = it->second [i];
info = factories [id];
- ui_create_factory_menu_entry (info, id, GTK_MENU_SHELL (submenu ? submenu : _factory_menu), !submenu, submenu || !use_submenus);
-+ ui_create_factory_menu_entry (info, id, GTK_MENU_SHELL (submenu ? submenu : _factory_menu), !submenu, (groups [factories [id].lang].size () > 1));
++ ui_create_factory_menu_entry (info, id, GTK_MENU_SHELL (submenu ? submenu : _factory_menu), !submenu, (langs [info.lang] > 1));
}
if (menu_item && submenu) {
scim-system-default-config.patch:
config | 28 +++++++++++++++++++++++-----
global | 2 ++
2 files changed, 25 insertions(+), 5 deletions(-)
Index: scim-system-default-config.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim-system-default-config.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-system-default-config.patch 3 Nov 2006 08:46:32 -0000 1.9
+++ scim-system-default-config.patch 15 Dec 2006 08:36:36 -0000 1.10
@@ -1,5 +1,5 @@
--- scim-1.4.5/configs/global.6-config 2005-06-27 02:35:08.000000000 +1000
-+++ scim-1.4.5/configs/global 2006-11-03 14:28:33.000000000 +1000
++++ scim-1.4.5/configs/global 2006-12-12 16:27:04.000000000 +1000
@@ -7,3 +7,5 @@
/DefaultPanelSocketAddress = local:/tmp/scim-panel-socket
/DefaultHelperManagerSocketAddress = local:/tmp/scim-helper-manager-socket
@@ -7,7 +7,7 @@
+# disable by default: rawcode, CNS11643, CangJie3, CangJie5, Cantonese, Dayi3, EZ-Big, Erbi-QS, Erbi, Jyutping, Simplex, Stroke5, Wu, ZhuYin-Big, Ziranma
+/DisabledIMEngineFactories = 6e029d75-ef65-42a8-848e-332e63d70f9c,468effb6-69fa-48b8-9207-dc4f722640a0,5da9d4ff-ccdd-45af-b1a5-7bd4ac0aeb5f,11cb2711-6225-49ca-bde4-472d2ca8aaef,33a8f7ff-b05a-4a54-b617-a73cd53583bd,a9eb5dd7-8e8a-4d1c-b486-2f59bbd12ef0,8bd47de6-4b38-49c0-864b-f6ea43bd2dff,17ebfb4f-2cc5-44da-a440-5c28c68997cf,107dcd74-b06a-4fcd-ac29-4b3136358eb7,a82d50ad-7995-4db7-9b34-3e9e4e31e4d7,2ffa6ab6-8ebc-4e8d-95a2-7ee6b7ffb9bd,bdf5fc1e-63a0-41bd-8e31-3239d67152c0,170d45fe-7fce-4e5b-bd86-f78d2aa8b29e,6137b317-cffc-4e39-80a1-eabb903ed855,8a6975df-6a78-4c7e-91d5-889da6c2fd80
--- scim-1.4.5/configs/config.6-config 2006-09-24 19:52:07.000000000 +1000
-+++ scim-1.4.5/configs/config 2006-11-03 15:04:47.000000000 +1000
++++ scim-1.4.5/configs/config 2006-12-12 17:13:30.000000000 +1000
@@ -1,4 +1,12 @@
# This file is encoded in UTF-8 encoding.
+/DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
@@ -21,12 +21,13 @@
/FrontEnd/OnTheSpot = true
/FrontEnd/ChangeFactoryGlobally = false
/FrontEnd/Socket/ConfigReadOnly = false
-@@ -7,10 +15,20 @@
+@@ -7,11 +15,21 @@
/FrontEnd/X11/Dynamic = false
/FrontEnd/X11/OnTheSpot = true
/FrontEnd/X11/ServerName = SCIM
-/Hotkeys/FrontEnd/NextFactory = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-/Hotkeys/FrontEnd/PreviousFactory = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
+-/Hotkeys/FrontEnd/ShowFactoryMenu = Control+Alt+Right
+/Hotkeys/FrontEnd/NextFactory =
+/Hotkeys/FrontEnd/NextFactory/zh_CN = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
+/Hotkeys/FrontEnd/NextFactory/zh_HK = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
@@ -37,13 +38,15 @@
+/Hotkeys/FrontEnd/PreviousFactory/zh_HK = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
+/Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
+/Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
- /Hotkeys/FrontEnd/ShowFactoryMenu = Control+Alt+Right
++/Hotkeys/FrontEnd/ShowFactoryMenu =
/Hotkeys/FrontEnd/Trigger = Control+space
+-/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta
+/Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space
+/Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul
- /Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta
++/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper
/Panel/Gtk/Color/ActiveBackground = light sky blue
/Panel/Gtk/Color/ActiveText = black
+ /Panel/Gtk/Color/NormalBackground = #F7F3F7
@@ -19,7 +37,7 @@
/Panel/Gtk/Font = default
/Panel/Gtk/DefaultSticked = false
Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- scim.spec 1 Dec 2006 10:55:08 -0000 1.73
+++ scim.spec 15 Dec 2006 08:36:36 -0000 1.74
@@ -3,7 +3,7 @@
Name: scim
Version: 1.4.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Smart Common Input Method platform
License: LGPL
@@ -42,6 +42,7 @@
Patch13: scim_panel-observe-workarea-xprop-204442.patch
Patch14: scim_x11_frontend-ic-focus-LTC27940-215953.patch
Patch15: scim-gtkimm-default-snooper-off-213796.patch
+Patch16: scim_panel_gtk-settle-toolbar-after-drag.patch
%description
SCIM is a user friendly and full featured input method user interface and
@@ -100,6 +101,7 @@
%patch13 -p1 -b .13-workarea-xprop
%patch14 -p1 -b .14-xim-focus
%patch15 -p1 -b .15-key-snooper
+%patch16 -p1 -b .16-drag-move
%if %{snapshot}
./bootstrap
@@ -232,6 +234,18 @@
%changelog
+* Fri Dec 15 2006 Jens Petersen <petersen at redhat.com> - 1.4.5-7
+- improve scim_panel-observe-workarea-xprop-204442.patch to autosnap within
+ desktop workarea (#204442)
+- add scim_panel_gtk-settle-toolbar-after-drag.patch to autosnap toolbar after
+ dragging
+- improve initial-locale-hotkey-186861.patch not to set next/previous factory
+ and show menu hotkeys by default (#219247)
+- remove show factory menu hotkey and add super and hyper as valid modifiers
+ in scim-system-default-config.patch
+- improve scim-1.4.5-panel-menu-fixes.patch to correctly name recently used
+ factories for same language (#217324)
+
* Fri Dec 1 2006 Jens Petersen <petersen at redhat.com> - 1.4.5-6
- fix scim-restart quoting for pkill -f
- rename scim-turn-off-snooper.patch to
@@ -249,10 +263,10 @@
im-scim to avoid crashes when clicking during scim gtkimm preedit (#213796)
* Fri Nov 17 2006 Jens Petersen <petersen at redhat.com> - 1.4.5-3
-- add scim-panel-observe-workarea-xprop.patch to make toolbar respect desktop
+- add scim_panel-observe-workarea-xprop.patch to make toolbar respect desktop
work area (Takuro Ashie, #204442)
- add scim_x11_frontend-ic-focus-LTC27940-215953.patch from cvs to fix XIM
- focus preedit commit issue (#215953)
+ focus preedit commit issue (Shoji Sugiyama, #215953)
- add scim_panel_gtk-emacs-cc-style.patch to set emacs cc-mode style for panel
- reduce systray icon size even more to 11
@@ -273,6 +287,7 @@
- add scim-1.4.5-panel-menu-fixes.patch to fix latest factory menu labelling
- improve scim-restart script to also handle scim-bridge (#205547)
- obsolete iiimf-csconv (#211875)
+- add Hangul keysym to Korean hotkeys (#212115)
* Thu Nov 2 2006 Jens Petersen <petersen at redhat.com>
- return scim-bridge-qt support to xinput script
scim_panel-observe-workarea-xprop-204442.patch:
scim_panel_gtk.cpp | 90 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 28 deletions(-)
Index: scim_panel-observe-workarea-xprop-204442.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim_panel-observe-workarea-xprop-204442.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim_panel-observe-workarea-xprop-204442.patch 17 Nov 2006 09:33:35 -0000 1.1
+++ scim_panel-observe-workarea-xprop-204442.patch 15 Dec 2006 08:36:36 -0000 1.2
@@ -1,5 +1,5 @@
---- scim-1.4.5/extras/panel/scim_panel_gtk.cpp.12-workarea-xprop 2006-11-15 10:02:59.000000000 +1000
-+++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp 2006-11-17 14:20:56.000000000 +1000
+--- scim-1.4.5/extras/panel/scim_panel_gtk.cpp.13-workarea-xprop 2006-12-12 16:27:04.000000000 +1000
++++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp 2006-12-14 13:21:04.000000000 +1000
@@ -33,6 +33,9 @@
#include <errno.h>
#include <glib.h>
@@ -74,7 +74,7 @@
_ui_initialized = true;
}
-@@ -1155,13 +1177,22 @@
+@@ -1155,19 +1177,26 @@
return;
}
@@ -88,18 +88,25 @@
- pos_x = _toolbar_window_x;
- pos_y = _toolbar_window_y;
-+ pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X),
-+ workarea_x + workarea_width - ws.width);
-+ pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y),
-+ workarea_y + workarea_height - ws.height);
++ pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X), -1);
++ pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y), -1);
+ if (pos_x == -1 && pos_y == -1) {
+ pos_x = workarea_x + workarea_width - ws.width;
+ pos_y = workarea_y + workarea_height - ws.height;
+ }
if (_toolbar_auto_snap) {
- if ((ui_screen_width () - (pos_x + ws.width)) < pos_x)
-@@ -1266,18 +1297,8 @@
+- if ((ui_screen_width () - (pos_x + ws.width)) < pos_x)
+- pos_x = ui_screen_width () - ws.width;
++ if (ws.width + (pos_x - workarea_x) * 2 > workarea_width)
++ pos_x = workarea_x + workarea_width - ws.width;
+ else
+- pos_x = 0;
++ pos_x = workarea_x;
+ } else if (pos_x + ws.width > ui_screen_width ()) {
+ pos_x = ui_screen_width () - ws.width;
+ } else if (pos_x < 0) {
+@@ -1266,18 +1295,8 @@
}
if (_toolbar_window) {
@@ -119,7 +126,7 @@
}
if (!_lookup_table_embedded && _lookup_table_window) {
-@@ -1299,6 +1320,14 @@
+@@ -1299,6 +1318,14 @@
gtk_window_set_screen (GTK_WINDOW (_help_dialog), screen);
}
@@ -134,7 +141,7 @@
ui_settle_input_window ();
ui_settle_lookup_table_window ();
ui_settle_toolbar_window ();
-@@ -2571,6 +2600,13 @@
+@@ -2571,6 +2598,13 @@
GdkScreen *screen = gdk_display_get_screen (gdk_display_get_default (), num);
if (screen) {
More information about the fedora-cvs-commits
mailing list