rpms/ibus-m17n
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.2.0.20090617, and disable iok patch

Browse Source
This commit is contained in:
Peng Huang 2009-06-22 05:41:54 +00:00
parent a9175a605d
commit 787323a403
4 changed files with 27 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
ibus-m17n-1.1.0.20090211.tar.gz
ibus-m17n-1.2.0.20090617.tar.gz

127
ibus-m17n-HEAD.patch
View File

@ -1,126 +1 @@
diff --git a/src/engine.c b/src/engine.c
index 5c5f56f..06501bb 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -53,9 +53,10 @@ static void ibus_m17n_engine_page_up (IBusEngine *engine);
static void ibus_m17n_engine_page_down (IBusEngine *engine);
static void ibus_m17n_engine_cursor_up (IBusEngine *engine);
static void ibus_m17n_engine_cursor_down (IBusEngine *engine);
-static void ibus_m17n_property_activate (IBusEngine *engine,
+static void ibus_m17n_engine_property_activate
+ (IBusEngine *engine,
const gchar *prop_name,
- gint prop_state);
+ guint prop_state);
static void ibus_m17n_engine_property_show
(IBusEngine *engine,
const gchar *prop_name);
@@ -126,6 +127,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
engine_class->cursor_up = ibus_m17n_engine_cursor_up;
engine_class->cursor_down = ibus_m17n_engine_cursor_down;
+ // engine_class->property_activate = ibus_m17n_engine_property_activate;
}
static void
@@ -277,47 +279,67 @@ MSymbol
ibus_m17n_key_event_to_symbol (guint keyval,
guint modifiers)
{
- GString *key;
- MSymbol mkey = Mnil;
+ GString *keysym;
+ MSymbol mkeysym = Mnil;
guint mask = 0;
+ if (keyval >= IBUS_Shift_L && keyval <= IBUS_Hyper_R) {
+ return Mnil;
+ }
+
+ keysym = g_string_new ("");
+
if (keyval >= IBUS_space && keyval <= IBUS_asciitilde) {
+ gint c = keyval;
if (keyval == IBUS_space && modifiers & IBUS_SHIFT_MASK)
mask |= IBUS_SHIFT_MASK;
if (modifiers & IBUS_CONTROL_MASK) {
- if (keyval >= IBUS_a && keyval <= IBUS_z)
- keyval += IBUS_A - IBUS_a;
+ if (c >= IBUS_a && c <= IBUS_z)
+ c += IBUS_A - IBUS_a;
mask |= IBUS_CONTROL_MASK;
}
+
+ g_string_append_c (keysym, c);
}
- else if (keyval >= IBUS_Shift_L && keyval <= IBUS_Hyper_R) {
- return Mnil;
+ else {
+ mask |= modifiers & (IBUS_CONTROL_MASK | IBUS_SHIFT_MASK);
+ g_string_append (keysym, ibus_keyval_name (keyval));
+ if (keysym->len == 0) {
+ g_string_free (keysym, TRUE);
+ return Mnil;
+ }
}
- mask |= modifiers & (IBUS_MOD1_MASK | IBUS_META_MASK);
+ mask |= modifiers & (IBUS_MOD1_MASK |
+ IBUS_META_MASK |
+ IBUS_SUPER_MASK |
+ IBUS_HYPER_MASK);
- key = g_string_new ("");
+ if (mask & IBUS_HYPER_MASK) {
+ g_string_prepend (keysym, "H-");
+ }
+ if (mask & IBUS_SUPER_MASK) {
+ g_string_prepend (keysym, "s-");
+ }
if (mask & IBUS_MOD1_MASK) {
- g_string_append (key, "A-");
+ g_string_prepend (keysym, "A-");
}
if (mask & IBUS_META_MASK) {
- g_string_append (key, "M-");
+ g_string_prepend (keysym, "M-");
}
if (mask & IBUS_CONTROL_MASK) {
- g_string_append (key, "C-");
+ g_string_prepend (keysym, "C-");
}
if (mask & IBUS_SHIFT_MASK) {
- g_string_append (key, "S-");
+ g_string_prepend (keysym, "S-");
}
- g_string_append (key, ibus_keyval_name (keyval));
-
- mkey = msymbol (key->str);
- g_string_free (key, TRUE);
+ mkeysym = msymbol (keysym->str);
+ g_string_free (keysym, TRUE);
- return mkey;
+ return mkeysym;
}
static gboolean
@@ -457,6 +479,15 @@ ibus_m17n_engine_cursor_down (IBusEngine *engine)
}
static void
+ibus_m17n_engine_property_activate (IBusEngine *engine,
+ const gchar *prop_name,
+ guint prop_state)
+{
+ g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
+ parent_class->property_activate (engine, prop_name, prop_state);
+}
+
+static void
ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n)
{
ibus_lookup_table_clear (m17n->table);

43
ibus-m17n.spec
View File

@ -1,23 +1,25 @@
%define require_ibus_version 1.2.0
Name: ibus-m17n
Version: 1.1.0.20090211
Release: 4%{?dist}
Version: 1.2.0.20090617
Release: 1%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
URL: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Patch0: ibus-m17n-HEAD.patch
Patch1: ibus-m17n-iok.patch
# Patch0: ibus-m17n-HEAD.patch
# Patch1: ibus-m17n-iok.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: m17n-lib-devel
BuildRequires: ibus-devel
BuildRequires: ibus-devel >= %{require_ibus_version}
Requires: ibus
Requires: ibus >= %{require_ibus_version}
Requires: m17n-lib
Requires: iok > 1.3.1
@ -27,8 +29,8 @@ the input table maps from m17n-db.
%prep
%setup -q
%patch0 -p1
%patch1 -p0
# %patch0 -p1
# %patch1 -p0
%build
%configure --disable-static
@ -52,20 +54,23 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/*
%changelog
* Mon Jun 22 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090617-1
- Update to 1.2.0.20090617.
* Thu Mar 05 2009 Parag <pnemade@redhat.com> - 1.1.0.20090211-4
- Add iok support to ibus-m17n.
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0.20090211-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 18 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090211-2
* Wed Feb 18 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.1.0.20090211-2
- Add patch ibus-m17n-HEAD.patch from upstream git tree.
- Make Control + Alt + ... available. (#482789)
* Wed Feb 11 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090211-1
* Wed Feb 11 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.1.0.20090211-1
- Update to 1.1.0.20090211.
* Thu Feb 05 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090205-1
* Thu Feb 05 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.1.0.20090205-1
- Update to 1.1.0.20090205.
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.1.1.20081013-4
@ -74,26 +79,26 @@ rm -rf $RPM_BUILD_ROOT
* Thu Oct 16 2008 Jens Petersen <petersen@redhat.com> - 0.1.1.20081013-3
- move the .engine files to m17n-db and m17n-contrib (#466410)
* Wed Oct 15 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20081013-2
* Wed Oct 15 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20081013-2
- Move unicode, rfc1345 to generic package, and syrc-phonetic to syriac package.
* Mon Oct 13 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20081013-1
* Mon Oct 13 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20081013-1
- Update to 0.1.1.20081013.
* Thu Oct 09 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20081009-1
* Thu Oct 09 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20081009-1
- Update to 0.1.1.20081009.
* Mon Sep 01 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20080901-1
* Mon Sep 01 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20080901-1
- Update to 0.1.1.20080901.
* Sat Aug 23 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20080823-1
* Sat Aug 23 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20080823-1
- Update to 0.1.1.20080823.
* Fri Aug 15 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20080815-1
* Fri Aug 15 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20080815-1
- Update to 0.1.1.20080815.
* Tue Aug 12 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.1.20080812-1
* Tue Aug 12 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.1.20080812-1
- Update to 0.1.1.20080812.
* Thu Aug 07 2008 Huang Peng <shawn.p.huang@gmail.com> - 0.1.0.20080810-1
* Thu Aug 07 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.0.20080810-1
- The first version.

2
sources
View File

@ -1 +1 @@
fd3da5bcf3c58aa5266a31882040ca41 ibus-m17n-1.1.0.20090211.tar.gz
c7cbe6a0359c510e5d678dff8a155ff8 ibus-m17n-1.2.0.20090617.tar.gz