[sbj] Added sbj keymap for Jolla phone. Fixes MER#1040

Based on the RM-680 keymap for N950 by Markus Lehtonen. This extended keymap includes keycodes beyond the 255 which are not handled by X11 so it is only suitable for the use with libraries that support extended keycodes, like libxkbcommon.
sailfishos · May 29, 2015 · ea72243 · ea72243
1 parent ee87ef1
commit ea72243
Show file tree

Hide file tree

Showing 13 changed files with 1,147 additions and 2 deletions.
diff --git a/xkeyboard-config/configure.ac b/xkeyboard-config/configure.ac
@@ -93,6 +93,7 @@ symbols/Makefile
 symbols/digital_vndr/Makefile
 symbols/fujitsu_vndr/Makefile
 symbols/hp_vndr/Makefile
+symbols/jolla_vndr/Makefile
 symbols/macintosh_vndr/Makefile
 symbols/nec_vndr/Makefile
 symbols/nokia_vndr/Makefile

diff --git a/xkeyboard-config/keycodes/Makefile.am b/xkeyboard-config/keycodes/Makefile.am
@@ -11,6 +11,7 @@ evdev \
 fujitsu \
 hp \
 ibm \
+jolla \
 macintosh \
 olpc \
 sony \

diff --git a/xkeyboard-config/keycodes/jolla b/xkeyboard-config/keycodes/jolla
@@ -0,0 +1,10 @@
+default
+xkb_keycodes "jolla" {
+
+   // These keycodes are beyond the X11 255 limit value so it would
+   // only be valid for the use with SW which supports extended keycodes,
+   // like xkbcommon.
+
+   <I264> = 264;	// Jolla phone has the wired headset button sending this keycode
+
+};
diff --git a/xkeyboard-config/rules/base.lists.part b/xkeyboard-config/rules/base.lists.part
@@ -8,6 +8,9 @@
 // PC models
 ! $pcmodels = pc101 pc102 pc104 pc105
 
+// Jolla devices and keyboards
+! $jollamodels = jollasbj
+
 // Microsoft models (using MS geometry)
 ! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
 

diff --git a/xkeyboard-config/rules/base.m_t.part b/xkeyboard-config/rules/base.m_t.part
@@ -1,3 +1,4 @@
+  $jollamodels	=	complete+jolla
   $macs		=	complete+numpad(mac)
   $applealu	=	complete+numpad(mac)
   $nokiamodels	=	complete+nokia

diff --git a/xkeyboard-config/rules/base.ml1_s.part b/xkeyboard-config/rules/base.ml1_s.part
@@ -1,5 +1,6 @@
   ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+  jollasbj	*			=	jolla_vndr/sbj(common)+jolla_vndr/sbj(%l[1]%_v[1])
  $sun		$sun_custom	=	pc+sun_vndr/%l[1]%(v[1])
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])

diff --git a/xkeyboard-config/rules/base.ml_s.part b/xkeyboard-config/rules/base.ml_s.part
@@ -5,6 +5,7 @@
   classmate	us			=	pc+%l(classmate)
   empty         *                       =       empty(basic)
   *             empty                   =       empty(basic)
+  jollasbj	*			=	jolla_vndr/sbj(common)+jolla_vndr/sbj(%l%_v)
  $sun		$sun_custom		=	pc+sun_vndr/%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
   macintosh_old	us			=	macintosh_vndr/us(oldmac)

diff --git a/xkeyboard-config/rules/evdev.m_k.part b/xkeyboard-config/rules/evdev.m_k.part
@@ -1,5 +1,6 @@
   pc98		=	evdev(pc98)
   applealu_jis	=	evdev+macintosh(jisevdev)
+ $jollamodels   =       evdev+jolla(jolla)
   olpc          =       evdev+olpc(olpc)
   olpcm         =       evdev+olpc(olpcm)
   *		=	evdev
diff --git a/xkeyboard-config/symbols/Makefile.am b/xkeyboard-config/symbols/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
 symbolsdir = $(xkb_base)/symbols
 symbols_DATA = \

diff --git a/xkeyboard-config/symbols/jolla_vndr/Makefile.am b/xkeyboard-config/symbols/jolla_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/jolla_vndr
+
+dist_symbols_DATA = \
+sbj