diff options
Diffstat (limited to 'source/x/scim-bridge')
8 files changed, 0 insertions, 366 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 f925507a..00000000 --- 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 85732013..00000000 --- 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 f16b34c1..00000000 --- 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 27c5cb73..00000000 --- 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 21f1f824..00000000 --- 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 74a3252e..00000000 --- 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; - } - diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild deleted file mode 100755 index 8501d9c4..00000000 --- a/source/x/scim-bridge/scim-bridge.SlackBuild +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ----------------------------------------------------------------------------- -# -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers <alien@slackware.com> -# For: scim-bridge -# Descr: yet another gtk-immodule for SCIM -# URL: http://scim-im.org/ -# -# ----------------------------------------------------------------------------- - - -PKGNAM=scim-bridge -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PKGNAM}-${VERSION} || exit 1 -#sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * ) - -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch.gz | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -echo Building ... -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-agent \ - --enable-ltdl-install \ - --enable-gtk2-immodule \ - --enable-qt4-immodule \ - --disable-qt3-immodule \ - --disable-documents \ - --disable-static \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux - # We disable the qt3-immodule because that one will not build. - # The qt4-immodule will build however. - -make $NUMJOBS || make || exit 1 -make DESTDIR=$PKG install || exit 1 - -# Add this to the doinst.sh -mkdir -p $PKG/install -cat <<EOINS >> $PKG/install/doinst.sh -# Run gtk-query-immodules so that "scim" will appear under Imput Method -# when you right- click your mouse in a text box. -if [ -x /usr/bin/update-gtk-immodules ]; then - /usr/bin/update-gtk-immodules -fi -EOINS - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \ - $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - diff --git a/source/x/scim-bridge/slack-desc b/source/x/scim-bridge/slack-desc deleted file mode 100644 index cd58299a..00000000 --- a/source/x/scim-bridge/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -scim-bridge: scim-bridge (yet another gtk-immodule for SCIM) -scim-bridge: -scim-bridge: Scim-bridge is yet another gtk-immodule for SCIM. Scim-bridge -scim-bridge: consists of two parts, that is, client and agent (server). The client -scim-bridge: is a GTK immodule which communicates with the agent over sockets. -scim-bridge: The agent communicates with SCIM, and brings back the data -scim-bridge: for each client. -scim-bridge: -scim-bridge: scim-bridge home: http://scim-im.org/ -scim-bridge: -scim-bridge: |