[oe-commits] org.oe.dev xkbd 0.8.15: Add default common slides.

[pfalcon commit]

xkbd 0.8.15: Add default common slides.
* xkbd has supports for "slides", where instead of just click on key,
there's a gesture up, down, left, or right. These can be specified in
keyboard definition, and xkbd has defaults for each 4. But of 4 pristine
defaults, only 1 is useful - up is shift+key. The other are for ctrl, alt,
etc modifiers, which are less useful in real life. Instead, have following
defaults: left - backspace, right - space, down - Enter. This means that
on common xkbd file w/o slide definition, making a right-to-left gesture
anywhere on keyboard will be equivalent of backspace, etc.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1c5e81832689a22042c9d187108a443307df9015
ViewMTN: http://monotone.openembedded.org/revision/info/1c5e81832689a22042c9d187108a443307df9015
Files:
1
packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch
packages/xkbd/xkbd_0.8.15.bb
Diffs:

#
# mt diff -r61e3209c19410f3d0436f4afa1f9a1429e8f4caa -r1c5e81832689a22042c9d187108a443307df9015
#
# 
# 
# add_file "packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch"
#  content [4957122498068bf57792326573ba5a501d74fc75]
# 
# patch "packages/xkbd/xkbd_0.8.15.bb"
#  from [229349f47a9b63600a6fc300caecefbfa2679b4c]
#    to [9013b4a317fe2b993dc22cd9fae92e3e670c0939]
# 
============================================================
--- packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch	4957122498068bf57792326573ba5a501d74fc75
+++ packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch	4957122498068bf57792326573ba5a501d74fc75
@@ -0,0 +1,44 @@
+diff -r 6b20ef8fbdee src/kb.c
+--- a/src/kb.c	Tue Nov 27 21:28:21 2007 +0200
++++ b/src/kb.c	Tue Nov 27 22:27:09 2007 +0200
+@@ -954,6 +954,13 @@ void kb_send_keypress(button *b)
+   int slide_flag = 0;
+ 
+   struct keycodeEntry vk_keycodes[10];
++  
++  static KeySym ksSpace, ksBackSpace, ksReturn;
++  if (!ksSpace) {
++    ksSpace = XStringToKeysym("space");
++    ksBackSpace = XStringToKeysym("BackSpace");
++    ksReturn = XStringToKeysym("Return");
++  }
+ 
+   if (b->kb->state & KB_STATE_SHIFT || b->kb->state & KB_STATE_CAPS)
+   {
+@@ -981,20 +988,17 @@ void kb_send_keypress(button *b)
+ 	    ks = b->slide_up_ks;
+ 	    if (ks == 0) ks = b->shift_ks;
+ 	    break;
+-	  case down : /* hold ctrl */
++	  case down :
+ 	    ks = b->slide_down_ks;
+-	    if (ks == 0) slide_flag = KB_STATE_CTRL;
++	    if (ks == 0) ks = ksReturn;
+ 	    break;
+-	  case left : /* hold alt */
++	  case left :
+ 	    ks = b->slide_left_ks;
+-	    if (ks == 0) 
+-	      {
+-		ks = b->mod_ks;
+-		slide_flag = KB_STATE_MOD;
+-	      }
++	    if (ks == 0) ks = ksBackSpace;
+ 	    break;
+-	  case right : /* hold alt */
++	  case right :
+ 	    ks = b->slide_right_ks;
++	    if (ks == 0) ks = ksSpace;
+ 	    break;
+ 	  case none:
+ 	    break;
============================================================
--- packages/xkbd/xkbd_0.8.15.bb	229349f47a9b63600a6fc300caecefbfa2679b4c
+++ packages/xkbd/xkbd_0.8.15.bb	9013b4a317fe2b993dc22cd9fae92e3e670c0939
@@ -1,10 +1,11 @@ SRC_URI = "http://handhelds.org/~mallum/
 SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \
            file://libtool-lossage.patch;patch=1;pnum=1 \
 	   file://fix-equalsign.patch;patch=1 \
 	   file://fix-circumkey.patch;patch=1 \
+	   file://add-default-common-slides.patch;patch=1 \
 	   file://xkbd.png"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SECTION = "x11"
 DEPENDS = "libxpm libxtst libxft"