Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Mz mods #14

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+28 −3
Open

Draft: Mz mods #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec7f029
Fix wrong condition in x11key Lookup for ASCII code
misak113 Dec 29, 2020
56ae3d9
Add missing XK ISO Level 3 shift non unicode char in x11key map
misak113 Jan 3, 2021
5e9556e
Add missing methods descriptions
misak113 Jan 3, 2021
1779ad9
Replace wrong XK_menu mapped values to correct CodeProps
misak113 Jan 3, 2021
73e0679
Add support for more event key modifiers for x11 (capslock, numlock &…
misak113 Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ require (
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
)

replace golang.org/x/mobile => github.com/misak113/mobile v0.0.0-20210103170524-21e5a0da1870
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOC
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/misak113/mobile v0.0.0-20210103170524-21e5a0da1870 h1:aY61pPEbj2YiIDdjBvnvbkTxxGuBps3CS7Qirb1AODg=
github.com/misak113/mobile v0.0.0-20210103170524-21e5a0da1870/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down
27 changes: 24 additions & 3 deletions shiny/driver/internal/x11key/x11key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

//go:generate go run gen.go

// x11key contains X11 numeric codes for the keyboard and mouse.
// Package x11key contains X11 numeric codes for the keyboard and mouse.
package x11key // import "golang.org/x/exp/shiny/driver/internal/x11key"

import (
Expand All @@ -30,12 +30,14 @@ const (
Button5Mask = 1 << 12
)

// KeysymTable holds current table of keyboard keys mapped to Xkb keysyms & current special modifiers bits
type KeysymTable struct {
Table [256][6]uint32

NumLockMod, ModeSwitchMod, ISOLevel3ShiftMod uint16
}

// Lookup converts Xkb xproto keycode (detail) & mod (state) into mobile/event/key Rune & Code
func (t *KeysymTable) Lookup(detail uint8, state uint16) (rune, key.Code) {
te := t.Table[detail][0:2]
if state&t.ModeSwitchMod != 0 {
Expand Down Expand Up @@ -63,7 +65,7 @@ func (t *KeysymTable) Lookup(detail uint8, state uint16) (rune, key.Code) {

// The key event's code is independent of whether the shift key is down.
var c key.Code
if 0 <= unshifted && unshifted < 0x80 {
if 0 >= unshifted && unshifted < 0x80 {
c = asciiKeycodes[unshifted]
if state&LockMask != 0 {
r = unicode.ToUpper(r)
Expand All @@ -86,6 +88,9 @@ func isKeypad(keysym uint32) bool {
return keysym >= 0xff80 && keysym <= 0xffbd
}

// KeyModifiers returns mobile/event/key modifiers type from xproto mod state
// ModCapsLock, ModNumLock & ModLevel3Shift are currently implemented using default general modifier bits
// it should be method of KeysymTable with current keyboard mapping
func KeyModifiers(state uint16) (m key.Modifiers) {
if state&ShiftMask != 0 {
m |= key.ModShift
Expand All @@ -99,11 +104,25 @@ func KeyModifiers(state uint16) (m key.Modifiers) {
if state&Mod4Mask != 0 {
m |= key.ModMeta
}
if state&LockMask != 0 {
m |= key.ModCapsLock
}
if state&Mod2Mask != 0 { // TODO should goes from t.NumLockMod instead because it's dynamic
m |= key.ModNumLock
}
if state&Mod5Mask != 0 { // TODO should goes from t.ISOLevel3ShiftMod instead because it's dynamic
m |= key.ModLevel3Shift
}
if state&Mod5Mask != 0 { // TODO should goes from t.ModeSwitchMod instead because it's dynamic
m |= key.ModModeSwitch
}
return m
}

// These constants come from /usr/include/X11/{keysymdef,XF86keysym}.h
const (
xkISOLevel3Shift = 0xfe03

xkISOLeftTab = 0xfe20
xkBackSpace = 0xff08
xkTab = 0xff09
Expand Down Expand Up @@ -183,6 +202,8 @@ const (
// that do not correspond to a Unicode code point, such as "Page Up", "F1" or
// "Left Shift", to key.Code values.
var nonUnicodeKeycodes = map[rune]key.Code{
xkISOLevel3Shift: key.CodeRightAlt,

xkISOLeftTab: key.CodeTab,
xkBackSpace: key.CodeDeleteBackspace,
xkTab: key.CodeTab,
Expand All @@ -197,7 +218,7 @@ var nonUnicodeKeycodes = map[rune]key.Code{
xkPageDown: key.CodePageDown,
xkEnd: key.CodeEnd,
xkInsert: key.CodeInsert,
xkMenu: key.CodeRightGUI, // TODO: CodeRightGUI or CodeMenu??
xkMenu: key.CodeProps,
xkHelp: key.CodeHelp,
xkNumLock: key.CodeKeypadNumLock,
xkMultiKey: key.CodeCompose,
Expand Down