Changed copyright : Sun -> Oracle

Added virtual keyboard functionality (with ibus patch)
sun-im · Jul 1, 2010 · b0d2a69 · b0d2a69
1 parent 0c332a0
commit b0d2a69
Show file tree

Hide file tree

Showing 50 changed files with 2,672 additions and 117 deletions.
diff --git a/COPYING b/COPYING
@@ -8,7 +8,7 @@ is applied is otherwise unspecified.
 
 --------------------------------------------------------------------
 
-Copyright (C) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
+Copyright (C) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 Use is subject to license terms.
 
 This program is free software; you can redistribute it and/or modify

diff --git a/Makefile.am b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The XKeyboard Config based engine for IBus
 #
-# Copyright (c) 2009 Naoyuki Ishimura <naoyuki.ishimura@sun.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ SUBDIRS = \
 	engine \
 	setup \
 	setup/xkbc \
+	vkb \
 	icons \
 	m4 \
 	po \

diff --git a/autogen.sh b/autogen.sh
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The Input Bus XKBC project
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,6 +78,8 @@ engine/xkbc.engine
 setup/Makefile
 setup/ibus-setup-xkbc
 setup/xkbc/Makefile
+vkb/Makefile
+vkb/ibus-kbd-xkbc
 icons/Makefile
 m4/Makefile
 help/Makefile

diff --git a/engine/Makefile.am b/engine/Makefile.am
@@ -1,8 +1,8 @@
 # vim:set noet ts=4:
 #
-# ibus-tmpl - The Input Bus template project
+# ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
 # 
 engine_xkbc_PYTHON = \
 	engine.py \
- 	factory.py \
+	factory.py \
 	compose_tbl.py \
- 	main.py \
+	main.py \
- 	$(NULL)
+	$(NULL)
 
 engine_xkbcdir = $(datadir)/ibus-xkbc/engine
 
@@ -42,14 +42,14 @@ xkbc.xml: xkbc.xml.in
 CLEANFILES = \
 	xkbc.xml \
 	*.py \
- 	*.pyc \
+	*.pyc \
 	*.pyo \
- 	$(NULL)
+	$(NULL)
 
 EXTRA_DIST = \
- 	ibus-engine-xkbc.in \
+	ibus-engine-xkbc.in \
- 	xkbc.xml.in \
+	xkbc.xml.in \
- 	$(NULL)
+	$(NULL)
 
 # test:
 # 	$(ENV) LANG=en_US PYTHONPATH=$(top_srcdir) $(PYTHON) $(srcdir)/main.py

diff --git a/engine/compose_tbl.py b/engine/compose_tbl.py
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/engine/engine.py b/engine/engine.py
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ def __init__(self, bus, object_path):
         self.__compose_state = COMPOSE_END
         self.__compose_dict = None
 
-        self.__xkbc = prefs_get_symbols_data()
+        self.__xkbc = prefs_get_xkbc_db()
         self.__prop_list = self._init_props()
 
         self.__target_layout_name = prefs_get_last_layout()

diff --git a/engine/factory.py b/engine/factory.py
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/engine/ibus-engine-xkbc.in b/engine/ibus-engine-xkbc.in
@@ -1,10 +1,9 @@
 #!/bin/bash
 # vim:set noet ts=4:
 #
-# ibus-tmpl - The Input Bus template project
+# ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/engine/main.py b/engine/main.py
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/engine/xkbc.xml.in.in b/engine/xkbc.xml.in.in
@@ -5,16 +5,16 @@
 	<description>XKBC Component</description>
 	<exec>${libexecdir}/ibus-engine-xkbc --ibus</exec>
 	<version>@VERSION@</version>
-	<author>Naoyuki Ishimura &lt;naoyuki.ishimura@sun.com&gt;</author>
+	<author>Naoyuki Ishimura &lt;naoyuki.ishimura@oracle.com&gt;</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>http://github.com/sun-im/ibus-xkbc</homepage>
 	<textdomain>ibus-xkbc</textdomain>
 
 	<engines>
 		<engine>
 			<name>xkbc</name>
 			<license>GPL</license>
-			<author>Naoyuki Ishimura &lt;naoyuki.ishimura@sun.com&gt;</author>
+			<author>Naoyuki Ishimura &lt;naoyuki.ishimura@oracle.com&gt;</author>
 			<icon>${pkgdatadir}/icons/ibus-xkbc.png</icon>
 			<layout>us</layout>
 			<longname>XKBC (Keyboard Emulation)</longname>

diff --git a/help/C/ibus-xkbc-C.omf b/help/C/ibus-xkbc-C.omf
@@ -2,10 +2,10 @@
 <omf>
   <resource>
     <creator>
-      Sun Documentation Team
+      Oracle Documentation Team
     </creator>
     <maintainer>
-      Sun Documentation Team
+      Oracle Documentation Team
     </maintainer>
     <title>
       Keyboard Layout Emulation Input Method (XKBC)
@@ -25,6 +25,6 @@
     <identifier url="ibus-xkbc.xml"/>
     <language code="C"/>
     <relation seriesid="00dc1156-d4c6-11d8-9917-c62edd84afcc"/>
-    <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Oracle and/or its affiliates"/>
   </resource>        
 </omf>
diff --git a/help/C/ibus-xkbc.xml b/help/C/ibus-xkbc.xml
@@ -3,9 +3,9 @@
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appname "iBus XKBC">
-  <!ENTITY author1 "Sun">
+  <!ENTITY author1 "Oracle">
   <!ENTITY author2 "Input Method dev">
-  <!ENTITY publisher "Sun Microsystems, Inc.">
+  <!ENTITY publisher "Oracle">
   <!ENTITY appversion "1.0">
   <!ENTITY manrevision "1.0">
   <!ENTITY date "January 2010">

diff --git a/ibus-xkbc.spec.in b/ibus-xkbc.spec.in
@@ -3,10 +3,10 @@ Name:       @PACKAGE_NAME@
 Version:    @PACKAGE_VERSION@
 Release:    1%{?dist}
 Summary:    The XKBC engine for IBus input platform
-License:    GPL
+License:    GPLv2
 Group:      System Environment/Libraries
-URL:        http://code.google.com/p/ibus/
+URL:        http://github.com/sun-im/ibus-xkbc/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:    http://cloud.github.com/download/sun-im/ibus-xkbc/%{name}-%{version}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -15,15 +15,17 @@ BuildRequires:  libtool
 BuildRequires:  python-devel
 BuildRequires:  pkgconfig
 
-Requires:   ibus >= 1.2.0.20090904
+Requires:   ibus >= %{require_ibus_version}
 
 %description
-The XKBC engine for IBus platform. It provides keyboard layout emulation input method.
+The XKBC engine for IBus platform. 
+It provides keyboard layout emulation input method.
 
 %prep
 %setup -q
 
 %build
+sh autogen.sh
 %configure --disable-static
 # make -C po update-gmo
 make %{?_smp_mflags}
@@ -46,5 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Wed Feb 04 2010 Peng Wu <pwu@redhat.com> - 1.2.0.20100115-3
+- Correct home page url.
+
+* Wed Feb 04 2010 Peng Wu <pwu@redhat.com> - 1.2.0.20100115-2
+- Fixes koji build for F-13.
+
 * Fri Oct 30 2009 Naoyuki Ishimura <naoyuki.ishimura@sun.com> - 0.1.0-1
 - The first version.
diff --git a/icons/Makefile.am b/icons/Makefile.am
@@ -1,8 +1,8 @@
 # vim:set noet ts=4:
 #
-# ibus-tmpl - The Input Bus template project
+# ibus-xkbc - The XKeyboard Config based engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/patches/ibus-1.3.3-on-nv-ss12.patch b/patches/ibus-1.3.3-on-nv-ss12.patch
@@ -0,0 +1,108 @@
+diff -ruNa ibus-1.3.3.orig/bus/connection.c ibus-1.3.3/bus/connection.c
+--- ibus-1.3.3.orig/bus/connection.c    2010-03-25 16:29:20.000000000 +0900
++++ ibus-1.3.3/bus/connection.c 2010-05-26 13:28:29.917200467 +0900
+@@ -28,6 +28,7 @@
+
+ /* BusConnectionPriv */
+ struct _BusConnectionPrivate {
++       char dummy;
+ };
+ typedef struct _BusConnectionPrivate BusConnectionPrivate;
+
+diff -ruNa ibus-1.3.3.orig/bus/dbusimpl.c ibus-1.3.3/bus/dbusimpl.c
+--- ibus-1.3.3.orig/bus/dbusimpl.c      2010-03-25 16:29:20.000000000 +0900
++++ ibus-1.3.3/bus/dbusimpl.c   2010-05-25 15:15:17.717446408 +0900
+@@ -804,6 +804,42 @@
+         /* ignore signal from local interface */
+         return FALSE;
+     }
++    /* for Virtual Keyboard support */
++    if (ibus_message_is_signal (message,
++                                "org.freedesktop.IBus.VKB",
++                                "SendText")) {
++        gboolean retval;
++        IBusText *text;
++        IBusError *error = NULL;
++
++        retval = ibus_message_get_args (message,
++                                        &error,
++                                        IBUS_TYPE_TEXT, &text,
++                                        G_TYPE_INVALID);
++
++        if (text) {
++            bus_input_context_send_text_to_last_focused (text);
++        }
++        return FALSE;
++    }
++    if (ibus_message_is_signal (message,
++                                "org.freedesktop.IBus.VKB",
++                                "SendKey")) {
++        gboolean retval;
++        guint keyval, state;
++        IBusError *error = NULL;
++
++        retval = ibus_message_get_args (message,
++                                        &error,
++                                        G_TYPE_UINT, &keyval,
++                                        G_TYPE_UINT, &state,
++                                        G_TYPE_INVALID);
++
++        bus_input_context_send_key_to_last_focused (keyval, 0, state);
++
++        return FALSE;
++    }
++
+
+     ibus_message_set_sender (message, bus_connection_get_unique_name (connection));
+
+diff -ruNa ibus-1.3.3.orig/bus/dbusimpl.c ibus-1.3.3/bus/dbusimpl.c
+--- ibus-1.3.3.orig/bus/inputcontext.c  2010-04-30 21:22:39.000000000 +0900
++++ ibus-1.3.3/bus/inputcontext.c       2010-05-25 15:13:47.390586237 +0900
+@@ -1175,11 +1175,15 @@
+     return context->has_focus;
+ }
+
++static BusInputContext *target_context = NULL;
++
+ void
+ bus_input_context_focus_in (BusInputContext *context)
+ {
+     g_assert (BUS_IS_INPUT_CONTEXT (context));
+
++    target_context = context;
++
+     if (context->has_focus)
+         return;
+
+@@ -1241,6 +1245,30 @@
+ }
+
+ void
++bus_input_context_send_text_to_last_focused (IBusText *text)
++{
++    if (target_context) {
++        bus_input_context_send_signal (target_context,
++                                       "CommitText",
++                                       IBUS_TYPE_TEXT, &text,
++                                       G_TYPE_INVALID);
++    }
++}
++
++void
++bus_input_context_send_key_to_last_focused (guint keyval, guint keycode, guint state)
++{
++    if (target_context) {
++        bus_input_context_send_signal (target_context,
++                                       "ForwardKeyEvent",
++                                       G_TYPE_UINT, &keyval,
++                                       G_TYPE_UINT, &keycode,
++                                       G_TYPE_UINT, &state,
++                                       G_TYPE_INVALID);
++    }
++}
++
++void
+ bus_input_context_focus_out (BusInputContext *context)
+ {
+     g_assert (BUS_IS_INPUT_CONTEXT (context));
+
diff --git a/setup/Makefile.am b/setup/Makefile.am
@@ -1,8 +1,8 @@
 # vim:set noet ts=4:
 #
-# ibus-pinyin - The PinYin engine for IBus
+# ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/setup/hotkey.py b/setup/hotkey.py
@@ -2,7 +2,7 @@
 #
 # ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/setup/ibus-setup-xkbc.in b/setup/ibus-setup-xkbc.in
@@ -1,10 +1,9 @@
 #!/bin/bash
 # vim:set noet ts=4:
 #
-# ibus-tmpl - The Input Bus template project
+# ibus-xkbc - The Input Bus Keyboard Layout emulaton engine.
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2009-2010 Sun Microsystems, Inc All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by