[29961] trunk/dports/x11/kinput2

[source_changes at macosforge.org]

Revision: 29961
          http://trac.macosforge.org/projects/macports/changeset/29961
Author:   takanori at macports.org
Date:     2007-10-16 16:04:05 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
* Added a patch that allows command+space to be used as a conversion key.

Modified Paths:
--------------
    trunk/dports/x11/kinput2/Portfile
    trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad
    trunk/dports/x11/kinput2/files/patch-lib_Canna.c

Modified: trunk/dports/x11/kinput2/Portfile
===================================================================
--- trunk/dports/x11/kinput2/Portfile	2007-10-16 21:13:38 UTC (rev 29960)
+++ trunk/dports/x11/kinput2/Portfile	2007-10-16 23:04:05 UTC (rev 29961)
@@ -3,6 +3,7 @@
 PortSystem      1.0
 name            kinput2
 version         3.1
+revision        1
 categories      x11 japanese
 maintainers     takanori openmaintainer
 description     Input server of Japanese text

Modified: trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad
===================================================================
--- trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad	2007-10-16 21:13:38 UTC (rev 29960)
+++ trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad	2007-10-16 23:04:05 UTC (rev 29961)
@@ -1,6 +1,6 @@
 --- cmd/Kinput2.ad.orig	2002-10-03 18:35:26.000000000 +0900
-+++ cmd/Kinput2.ad	2007-10-13 01:56:44.000000000 +0900
-@@ -96,7 +96,7 @@
++++ cmd/Kinput2.ad	2007-10-17 08:00:36.000000000 +0900
+@@ -96,12 +96,13 @@
  ! XimpProtocol
  *XimpProtocol.ForceDefaultServer: true
  ! X Input Method Protocol
@@ -9,3 +9,10 @@
  ! common to XimpProtocol and IMProtocol
  *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
  *ConversionStartKeys: \
+ 	Shift<Key>space \n\
+-	Ctrl<Key>Kanji
++	Ctrl<Key>Kanji \n\
++	Mod2<Key>space
+ !!
+ !! sending back unused keypress events
+ !!

Modified: trunk/dports/x11/kinput2/files/patch-lib_Canna.c
===================================================================
--- trunk/dports/x11/kinput2/files/patch-lib_Canna.c	2007-10-16 21:13:38 UTC (rev 29960)
+++ trunk/dports/x11/kinput2/files/patch-lib_Canna.c	2007-10-16 23:04:05 UTC (rev 29961)
@@ -1,5 +1,5 @@
 --- lib/Canna.c.orig	2002-10-03 18:35:27.000000000 +0900
-+++ lib/Canna.c	2007-10-13 02:04:29.000000000 +0900
++++ lib/Canna.c	2007-10-17 07:58:25.000000000 +0900
 @@ -61,6 +61,8 @@
  #include "CannaP.h"
  #include "DebugPrint.h"
@@ -9,15 +9,18 @@
  #define _WCHAR_T /* $B$3$NDj5A$O(B jrkanji.h $B$G(B wcKanjiStatus $B$J$I$rDj5A$9$k$?$a(B */
  #define wchar_t wchar
  
-@@ -246,7 +248,7 @@
+@@ -246,9 +248,9 @@
      kanabuf[0] = '\0';
      nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
  
 -    buf[0] = (wchar)kanabuf[0]; /* $B$-$?$J$$(B */
 +    buf[0] = (wchar)(unsigned char)kanabuf[0]; /* $B$-$?$J$$(B */
  
-     if (ks == XK_space && (event->xkey.state & ShiftMask)) {
+-    if (ks == XK_space && (event->xkey.state & ShiftMask)) {
++    if (ks == XK_space && ((event->xkey.state & ShiftMask) || (event->xkey.state & Mod2Mask))) {
        void convend();
+ 
+       convend(obj);
 @@ -271,7 +273,7 @@
  
      /* $B$+$J4A;zJQ49$9$k(B */

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071016/64da624d/attachment.html