<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[29961] trunk/dports/x11/kinput2</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/29961">29961</a></dd>
<dt>Author</dt> <dd>takanori@macports.org</dd>
<dt>Date</dt> <dd>2007-10-16 16:04:05 -0700 (Tue, 16 Oct 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>* Added a patch that allows command+space to be used as a conversion key.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11kinput2Portfile">trunk/dports/x11/kinput2/Portfile</a></li>
<li><a href="#trunkdportsx11kinput2filespatchcmd_Kinput2ad">trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad</a></li>
<li><a href="#trunkdportsx11kinput2filespatchlib_Cannac">trunk/dports/x11/kinput2/files/patch-lib_Canna.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11kinput2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/kinput2/Portfile (29960 => 29961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> PortSystem      1.0
</span><span class="cx"> name            kinput2
</span><span class="cx"> version         3.1
</span><ins>+revision        1
</ins><span class="cx"> categories      x11 japanese
</span><span class="cx"> maintainers     takanori openmaintainer
</span><span class="cx"> description     Input server of Japanese text
</span></span></pre></div>
<a id="trunkdportsx11kinput2filespatchcmd_Kinput2ad"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad (29960 => 29961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- cmd/Kinput2.ad.orig        2002-10-03 18:35:26.000000000 +0900
</span><del>-+++ cmd/Kinput2.ad        2007-10-13 01:56:44.000000000 +0900
-@@ -96,7 +96,7 @@
</del><ins>++++ cmd/Kinput2.ad        2007-10-17 08:00:36.000000000 +0900
+@@ -96,12 +96,13 @@
</ins><span class="cx">  ! XimpProtocol
</span><span class="cx">  *XimpProtocol.ForceDefaultServer: true
</span><span class="cx">  ! X Input Method Protocol
</span><span class="lines">@@ -9,3 +9,10 @@
</span><span class="cx">  ! common to XimpProtocol and IMProtocol
</span><span class="cx">  *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
</span><span class="cx">  *ConversionStartKeys: \
</span><ins>+         Shift&lt;Key&gt;space \n\
+-        Ctrl&lt;Key&gt;Kanji
++        Ctrl&lt;Key&gt;Kanji \n\
++        Mod2&lt;Key&gt;space
+ !!
+ !! sending back unused keypress events
+ !!
</ins></span></pre></div>
<a id="trunkdportsx11kinput2filespatchlib_Cannac"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/kinput2/files/patch-lib_Canna.c (29960 => 29961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> --- lib/Canna.c.orig        2002-10-03 18:35:27.000000000 +0900
</span><del>-+++ lib/Canna.c        2007-10-13 02:04:29.000000000 +0900
</del><ins>++++ lib/Canna.c        2007-10-17 07:58:25.000000000 +0900
</ins><span class="cx"> @@ -61,6 +61,8 @@
</span><span class="cx">  #include &quot;CannaP.h&quot;
</span><span class="cx">  #include &quot;DebugPrint.h&quot;
</span><span class="lines">@@ -9,15 +9,18 @@
</span><span class="cx">  #define _WCHAR_T /* この定義は jrkanji.h で wcKanjiStatus などを定義するため */
</span><span class="cx">  #define wchar_t wchar
</span><span class="cx">  
</span><del>-@@ -246,7 +248,7 @@
</del><ins>+@@ -246,9 +248,9 @@
</ins><span class="cx">      kanabuf[0] = '\0';
</span><span class="cx">      nbytes = XKanaLookup(event, kanabuf, 20, &amp;ks, &amp;compose_status);
</span><span class="cx">  
</span><span class="cx"> -    buf[0] = (wchar)kanabuf[0]; /* きたない */
</span><span class="cx"> +    buf[0] = (wchar)(unsigned char)kanabuf[0]; /* きたない */
</span><span class="cx">  
</span><del>-     if (ks == XK_space &amp;&amp; (event-&gt;xkey.state &amp; ShiftMask)) {
</del><ins>+-    if (ks == XK_space &amp;&amp; (event-&gt;xkey.state &amp; ShiftMask)) {
++    if (ks == XK_space &amp;&amp; ((event-&gt;xkey.state &amp; ShiftMask) || (event-&gt;xkey.state &amp; Mod2Mask))) {
</ins><span class="cx">        void convend();
</span><ins>+ 
+       convend(obj);
</ins><span class="cx"> @@ -271,7 +273,7 @@
</span><span class="cx">  
</span><span class="cx">      /* かな漢字変換する */
</span></span></pre>
</div>
</div>

</body>
</html>