Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1 from tanty/extended-jolla-keymap
[sbj] Added sbj keymap for Jolla phone. Fixes MER#1040
  • Loading branch information
tanty committed Jun 1, 2015
2 parents ee87ef1 + ea72243 commit 122789b
Show file tree
Hide file tree
Showing 13 changed files with 1,147 additions and 2 deletions.
1 change: 1 addition & 0 deletions xkeyboard-config/configure.ac
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions xkeyboard-config/keycodes/Makefile.am
Expand Up @@ -11,6 +11,7 @@ evdev \
fujitsu \
hp \
ibm \
jolla \
macintosh \
olpc \
sony \
Expand Down
10 changes: 10 additions & 0 deletions 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

};
3 changes: 3 additions & 0 deletions xkeyboard-config/rules/base.lists.part
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions 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
Expand Down
1 change: 1 addition & 0 deletions 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])
Expand Down
1 change: 1 addition & 0 deletions xkeyboard-config/rules/base.ml_s.part
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions 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
2 changes: 1 addition & 1 deletion 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 = \
Expand Down
4 changes: 4 additions & 0 deletions xkeyboard-config/symbols/jolla_vndr/Makefile.am
@@ -0,0 +1,4 @@
symbolsdir = $(xkb_base)/symbols/jolla_vndr

dist_symbols_DATA = \
sbj

0 comments on commit 122789b

Please sign in to comment.