Hello community,
here is the log from the commit of package scim-m17n
checked in at Mon Apr 23 23:25:37 CEST 2007.
--------
--- scim-m17n/scim-m17n.changes 2006-11-02 07:07:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/scim-m17n/scim-m17n.changes 2007-04-23 20:57:42.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 23 19:40:26 CEST 2007 - mfabian@suse.de
+
+- update to 0.2.2.
+- remove force-us-keyboard.patch (was from upstream CVS).
+
+-------------------------------------------------------------------
Old:
----
force-us-keyboard.patch
scim-m17n-0.2.1.tar.bz2
New:
----
scim-m17n-0.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim-m17n.spec ++++++
--- /var/tmp/diff_new_pack.Bh1596/_old 2007-04-23 23:22:28.000000000 +0200
+++ /var/tmp/diff_new_pack.Bh1596/_new 2007-04-23 23:22:28.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package scim-m17n (Version 0.2.1)
+# spec file for package scim-m17n (Version 0.2.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,9 +13,9 @@
Name: scim-m17n
#!BuildIgnore: NX
BuildRequires: gcc-c++ libotf-devel m17n-lib-devel scim-devel wordcut-devel
-Version: 0.2.1
-Release: 15
-License: GNU General Public License (GPL) - all versions
+Version: 0.2.2
+Release: 1
+License: GNU General Public License (GPL)
Group: System/I18n/Chinese
Autoreqprov: on
Provides: locale(scim:am;ar;as;bn;cs;da;de;el;en;es;fa;fi;fr;gu;he;hi;hr;it;ja;ka;kk;kn;ko;lo;ml;my;nb;nl;nn;pa;pl;ru;sk;sv;vi;zh)
@@ -24,9 +24,8 @@
# CVS:
# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim login
# cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim co scim-m17n
-Source0: http://belnet.dl.sourceforge.net/sourceforge/scim/scim-m17n-0.2.1.tar.bz2
+Source0: scim-m17n-0.2.2.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch0: force-us-keyboard.patch
Summary: M17N Input Method Engine for SCIM
%description
@@ -55,7 +54,6 @@
%define scim_binary_version %(pkg-config --variable=scim_binary_version scim)
%setup -q -n %{name}-%{version}
find . -name CVS -type d | xargs rm -rf
-%patch0 -p0
%build
libtoolize --force
@@ -69,7 +67,6 @@
make
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
make DESTDIR=${RPM_BUILD_ROOT} install
rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/m17n.{a,la}
# %find_lang scim-m17n
@@ -87,7 +84,10 @@
%dir %{_datadir}/scim/icons/
%{_datadir}/scim/icons/scim-m17n.png
-%changelog -n scim-m17n
+%changelog
+* Mon Apr 23 2007 - mfabian@suse.de
+- update to 0.2.2.
+- remove force-us-keyboard.patch (was from upstream CVS).
* Thu Nov 02 2006 - zsu@suse.de
- Force to convert all key events to US English keyboard layout.
Because m17n-lib can only use US English keyboard layout.
++++++ scim-m17n-0.2.1.tar.bz2 -> scim-m17n-0.2.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-m17n-0.2.1/ChangeLog new/scim-m17n-0.2.2/ChangeLog
--- old/scim-m17n-0.2.1/ChangeLog 2006-10-10 08:42:10.000000000 +0200
+++ new/scim-m17n-0.2.2/ChangeLog 2006-12-02 08:08:48.000000000 +0100
@@ -1,3 +1,34 @@
+2006-12-02 07:05 tag scim_m17n_0_2_2
+
+2006-12-02 07:05 James Su
+
+ * configure.ac (1.12):
+
+ Bump version to 0.2.2
+
+2006-12-01 08:45 James Su
+
+ * src/: scim_m17n_imengine.cpp (1.25), scim_m17n_imengine.h (1.6):
+
+ call preedit callbacks after calling commit_string () in
+ m17n_process_key(). It prevents some preedit string displaying
+ issue in firefox and OpenOffice.
+
+2006-12-01 07:44 James Su
+
+ * src/scim_m17n_imengine.cpp (1.24):
+
+ Force to use US keyboard layout.
+
+2006-10-10 06:49 tag scim_m17n_0_2_1
+
+2006-10-10 06:49 James Su
+
+ * ChangeLog (1.6), Makefile.am (1.3), cvs2cl.pl (1.1), developers
+ (1.1), mkchlog (1.2):
+
+ Use cvs2cl.pl instead of mkchlog script.
+
2006-09-24 16:09 James Su
* ChangeLog (1.5):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-m17n-0.2.1/configure new/scim-m17n-0.2.2/configure
--- old/scim-m17n-0.2.1/configure 2006-09-24 17:47:04.000000000 +0200
+++ new/scim-m17n-0.2.2/configure 2006-12-02 08:03:07.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for scim-m17n 0.2.1.
+# Generated by GNU Autoconf 2.59 for scim-m17n 0.2.2.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='scim-m17n'
PACKAGE_TARNAME='scim-m17n'
-PACKAGE_VERSION='0.2.1'
-PACKAGE_STRING='scim-m17n 0.2.1'
+PACKAGE_VERSION='0.2.2'
+PACKAGE_STRING='scim-m17n 0.2.2'
PACKAGE_BUGREPORT='suzhe@tsinghua.org.cn'
ac_unique_file="src/scim_m17n_imengine.h"
@@ -974,7 +974,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures scim-m17n 0.2.1 to adapt to many kinds of systems.
+\`configure' configures scim-m17n 0.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1040,7 +1040,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of scim-m17n 0.2.1:";;
+ short | recursive ) echo "Configuration of scim-m17n 0.2.2:";;
esac
cat <<\_ACEOF
@@ -1186,7 +1186,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-scim-m17n configure 0.2.1
+scim-m17n configure 0.2.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1200,7 +1200,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by scim-m17n $as_me 0.2.1, which was
+It was created by scim-m17n $as_me 0.2.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1544,7 +1544,7 @@
SCIM_M17N_MAJOR_VERSION=0
SCIM_M17N_MINOR_VERSION=2
-SCIM_M17N_MICRO_VERSION=1
+SCIM_M17N_MICRO_VERSION=2
SCIM_M17N_VERSION=$SCIM_M17N_MAJOR_VERSION.$SCIM_M17N_MINOR_VERSION.$SCIM_M17N_MICRO_VERSION
@@ -1861,7 +1861,7 @@
# Define the identity of the package.
PACKAGE='scim-m17n'
- VERSION='0.2.1'
+ VERSION='0.2.2'
cat >>confdefs.h <<_ACEOF
@@ -23852,7 +23852,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by scim-m17n $as_me 0.2.1, which was
+This file was extended by scim-m17n $as_me 0.2.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23915,7 +23915,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-scim-m17n config.status 0.2.1
+scim-m17n config.status 0.2.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-m17n-0.2.1/configure.ac new/scim-m17n-0.2.2/configure.ac
--- old/scim-m17n-0.2.1/configure.ac 2006-09-24 17:46:40.000000000 +0200
+++ new/scim-m17n-0.2.2/configure.ac 2006-12-02 08:02:42.000000000 +0100
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(scim-m17n, 0.2.1, suzhe@tsinghua.org.cn)
+AC_INIT(scim-m17n, 0.2.2, suzhe@tsinghua.org.cn)
AC_CONFIG_SRCDIR([src/scim_m17n_imengine.h])
# Save this value here, since automake will set cflags and cxxflags later
@@ -8,7 +8,7 @@
SCIM_M17N_MAJOR_VERSION=0
SCIM_M17N_MINOR_VERSION=2
-SCIM_M17N_MICRO_VERSION=1
+SCIM_M17N_MICRO_VERSION=2
SCIM_M17N_VERSION=$SCIM_M17N_MAJOR_VERSION.$SCIM_M17N_MINOR_VERSION.$SCIM_M17N_MICRO_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-m17n-0.2.1/scim-m17n.spec new/scim-m17n-0.2.2/scim-m17n.spec
--- old/scim-m17n-0.2.1/scim-m17n.spec 2006-09-24 17:48:54.000000000 +0200
+++ new/scim-m17n-0.2.2/scim-m17n.spec 2006-12-02 08:03:30.000000000 +0100
@@ -1,5 +1,5 @@
%define nam scim-m17n
-%define ver 0.2.1
+%define ver 0.2.2
%define rel 1
# Something's not quite right with libtool....
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-m17n-0.2.1/src/scim_m17n_imengine.cpp new/scim-m17n-0.2.2/src/scim_m17n_imengine.cpp
--- old/scim-m17n-0.2.1/src/scim_m17n_imengine.cpp 2006-09-24 17:59:37.000000000 +0200
+++ new/scim-m17n-0.2.2/src/scim_m17n_imengine.cpp 2006-12-01 09:45:12.000000000 +0100
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: scim_m17n_imengine.cpp,v 1.23 2006/09/24 15:59:37 suzhe Exp $
+ * $Id: scim_m17n_imengine.cpp,v 1.25 2006/12/01 08:45:12 suzhe Exp $
*/
#define Uses_SCIM_UTILITY
@@ -263,7 +263,13 @@
const String &encoding,
int id)
: IMEngineInstanceBase (factory, encoding, id),
- m_ic (0)
+ m_ic (0),
+ m_cap (0),
+ m_block_preedit_op (false),
+ m_pending_preedit_start (false),
+ m_pending_preedit_draw (false),
+ m_pending_preedit_done (false),
+ m_preedit_showed (false)
{
SCIM_DEBUG_IMENGINE(1) << "Create M17N Instance " << encoding << " " << id << "\n";
@@ -293,7 +299,7 @@
if (key.is_key_release ()) return true;
- MSymbol m17n_key = __key_to_symbol (key);
+ MSymbol m17n_key = __key_to_symbol (key.map_to_layout (SCIM_KEYBOARD_Default));
if (m17n_key == Mnil) return false;
@@ -309,10 +315,15 @@
MText *produced;
int ret;
+ m_block_preedit_op = true;
+
ret = minput_filter(m_ic, key, NULL);
+ m_block_preedit_op = false;
+
if (ret) {
SCIM_DEBUG_IMENGINE(3) << "minput_filter returns 1\n";
+ do_preedit_op ();
return true;
}
@@ -334,10 +345,34 @@
commit_string (utf8_mbstowcs (buf));
}
+ do_preedit_op ();
+
return ret == 0;
}
void
+M17NInstance::do_preedit_op ()
+{
+ if (m_block_preedit_op)
+ return;
+
+ if (m_pending_preedit_start) {
+ preedit_start_cb (m_ic, Minput_preedit_start);
+ m_pending_preedit_start = false;
+ }
+
+ if (m_pending_preedit_draw) {
+ preedit_draw_cb (m_ic, Minput_preedit_draw);
+ m_pending_preedit_draw = false;
+ }
+
+ if (m_pending_preedit_done) {
+ preedit_done_cb (m_ic, Minput_preedit_done);
+ m_pending_preedit_done = false;
+ }
+}
+
+void
M17NInstance::move_preedit_caret (unsigned int pos)
{
}
@@ -378,6 +413,11 @@
hide_preedit_string ();
hide_aux_string ();
hide_lookup_table ();
+
+ m_preedit_showed = false;
+ m_pending_preedit_start = false;
+ m_pending_preedit_draw = false;
+ m_pending_preedit_done = false;
}
void
@@ -470,9 +510,16 @@
{
M17NInstance *this_ptr = __find_instance (ic);
- if (this_ptr) {
+ if (this_ptr && !this_ptr->m_preedit_showed) {
SCIM_DEBUG_IMENGINE(2) << "preedit_start_cb.\n";
+
+ if (this_ptr->m_block_preedit_op) {
+ this_ptr->m_pending_preedit_start = true;
+ return;
+ }
+
this_ptr->show_preedit_string ();
+ this_ptr->m_preedit_showed = true;
}
}
@@ -484,6 +531,11 @@
if (this_ptr && ic->preedit) {
SCIM_DEBUG_IMENGINE(2) << "preedit_draw_cb.\n";
+ if (this_ptr->m_block_preedit_op) {
+ this_ptr->m_pending_preedit_draw = true;
+ return;
+ }
+
char buf[1024];
mconv_rebind_buffer(__m17n_converter, (unsigned char *)buf, 1024);
mconv_encode(__m17n_converter, ic->preedit);
@@ -499,11 +551,16 @@
SCIM_ATTR_DECORATE,
SCIM_ATTR_DECORATE_REVERSE));
- this_ptr->show_preedit_string ();
+ if (!this_ptr->m_preedit_showed) {
+ this_ptr->show_preedit_string ();
+ this_ptr->m_preedit_showed = true;
+ }
+
this_ptr->update_preedit_string (wstr, attrs);
this_ptr->update_preedit_caret (ic->cursor_pos);
} else {
this_ptr->hide_preedit_string ();
+ this_ptr->m_preedit_showed = false;
}
}
}
@@ -513,9 +570,16 @@
{
M17NInstance *this_ptr = __find_instance (ic);
- if (this_ptr) {
+ if (this_ptr && this_ptr->m_preedit_showed) {
SCIM_DEBUG_IMENGINE(2) << "preedit_done_cb.\n";
+
+ if (this_ptr->m_block_preedit_op) {
+ this_ptr->m_pending_preedit_done = true;
+ return;
+ }
+
this_ptr->hide_preedit_string ();
+ this_ptr->m_preedit_showed = false;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-m17n-0.2.1/src/scim_m17n_imengine.h new/scim-m17n-0.2.2/src/scim_m17n_imengine.h
--- old/scim-m17n-0.2.1/src/scim_m17n_imengine.h 2006-08-23 09:36:19.000000000 +0200
+++ new/scim-m17n-0.2.2/src/scim_m17n_imengine.h 2006-12-01 09:45:12.000000000 +0100
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: scim_m17n_imengine.h,v 1.5 2006/08/23 07:36:19 suzhe Exp $
+ * $Id: scim_m17n_imengine.h,v 1.6 2006/12/01 08:45:12 suzhe Exp $
*/
#if !defined (__SCIM_M17N_IMENGINE_H)
@@ -68,6 +68,14 @@
{
MInputContext *m_ic;
unsigned int m_cap;
+
+ bool m_block_preedit_op;
+ bool m_pending_preedit_start;
+ bool m_pending_preedit_draw;
+ bool m_pending_preedit_done;
+
+ bool m_preedit_showed;
+
public:
M17NInstance (M17NFactory *factory,
const String &encoding,
@@ -90,6 +98,8 @@
private:
bool m17n_process_key (MSymbol key);
+ void do_preedit_op ();
+
public:
static MPlist * register_callbacks(MPlist *callback_list);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org