From 35393827a90d8378379c6f232654d1c8bea226ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 15 Aug 2017 01:04:58 +0200 Subject: [PATCH] implemented ctrl-, f- and other keys. enter now sends CR, use ctrl-enter for LF. --- CMakeLists.txt | 2 +- html_orig/js/app.js | 395 +++++++++++++++++++++++++++++++++-- html_orig/jssrc/keymaster.js | 296 ++++++++++++++++++++++++++ html_orig/jssrc/term.js | 99 +++++++-- html_orig/packjs.sh | 1 + 5 files changed, 750 insertions(+), 43 deletions(-) create mode 100644 html_orig/jssrc/keymaster.js diff --git a/CMakeLists.txt b/CMakeLists.txt index f438edd..edf13be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ set(SOURCE_FILES user/persist.h include/helpers.h user/syscfg.c - user/syscfg.h user/ansi_utf.c user/ansi_utf.h) + user/syscfg.h) include_directories(include) include_directories(user) diff --git a/html_orig/js/app.js b/html_orig/js/app.js index 9684664..f499255 100644 --- a/html_orig/js/app.js +++ b/html_orig/js/app.js @@ -701,6 +701,302 @@ // Set Chibi's global namespace here ($) w.$ = chibi; }()); +// keymaster.js +// (c) 2011-2013 Thomas Fuchs +// keymaster.js may be freely distributed under the MIT license. + +;(function(global){ + var k, + _handlers = {}, + _mods = { 16: false, 18: false, 17: false, 91: false }, + _scope = 'all', + // modifier keys + _MODIFIERS = { + '⇧': 16, shift: 16, + '⌥': 18, alt: 18, option: 18, + '⌃': 17, ctrl: 17, control: 17, + '⌘': 91, command: 91 + }, + // special keys + _MAP = { + backspace: 8, tab: 9, clear: 12, + enter: 13, 'return': 13, + esc: 27, escape: 27, space: 32, + left: 37, up: 38, + right: 39, down: 40, + del: 46, 'delete': 46, + home: 36, end: 35, + pageup: 33, pagedown: 34, insert: 45, // added insert + ',': 188, '.': 190, '/': 191, + '`': 192, '-': 189, '=': 187, + ';': 186, '\'': 222, + '[': 219, ']': 221, '\\': 220 + }, + code = function(x){ + return _MAP[x] || x.toUpperCase().charCodeAt(0); + }, + _downKeys = []; + + for(k=1;k<20;k++) _MAP['f'+k] = 111+k; + + // IE doesn't support Array#indexOf, so have a simple replacement + function index(array, item){ + var i = array.length; + while(i--) if(array[i]===item) return i; + return -1; + } + + // for comparing mods before unassignment + function compareArray(a1, a2) { + if (a1.length != a2.length) return false; + for (var i = 0; i < a1.length; i++) { + if (a1[i] !== a2[i]) return false; + } + return true; + } + + var modifierMap = { + 16:'shiftKey', + 18:'altKey', + 17:'ctrlKey', + 91:'metaKey' + }; + function updateModifierKey(event) { + for(k in _mods) _mods[k] = event[modifierMap[k]]; + }; + + // handle keydown event + function dispatch(event) { + var key, handler, k, i, modifiersMatch, scope; + key = event.keyCode; + + if (index(_downKeys, key) == -1) { + _downKeys.push(key); + } + + // if a modifier key, set the key. property to true and return + if(key == 93 || key == 224) key = 91; // right command on webkit, command on Gecko + if(key in _mods) { + _mods[key] = true; + // 'assignKey' from inside this closure is exported to window.key + for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = true; + return; + } + updateModifierKey(event); + + // see if we need to ignore the keypress (filter() can can be overridden) + // by default ignore key presses if a select, textarea, or input is focused + if(!assignKey.filter.call(this, event)) return; + + // abort if no potentially matching shortcuts found + if (!(key in _handlers)) return; + + scope = getScope(); + + // for each potential shortcut + for (i = 0; i < _handlers[key].length; i++) { + handler = _handlers[key][i]; + + // see if it's in the current scope + if(handler.scope == scope || handler.scope == 'all'){ + // check if modifiers match if any + modifiersMatch = handler.mods.length > 0; + for(k in _mods) + if((!_mods[k] && index(handler.mods, +k) > -1) || + (_mods[k] && index(handler.mods, +k) == -1)) modifiersMatch = false; + // call the handler and stop the event if neccessary + if((handler.mods.length == 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || modifiersMatch){ + if(handler.method(event, handler)===false){ + if(event.preventDefault) event.preventDefault(); + else event.returnValue = false; + if(event.stopPropagation) event.stopPropagation(); + if(event.cancelBubble) event.cancelBubble = true; + } + } + } + } + }; + + // unset modifier keys on keyup + function clearModifier(event){ + var key = event.keyCode, k, + i = index(_downKeys, key); + + // remove key from _downKeys + if (i >= 0) { + _downKeys.splice(i, 1); + } + + if(key == 93 || key == 224) key = 91; + if(key in _mods) { + _mods[key] = false; + for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = false; + } + }; + + function resetModifiers() { + for(k in _mods) _mods[k] = false; + for(k in _MODIFIERS) assignKey[k] = false; + }; + + // parse and assign shortcut + function assignKey(key, scope, method){ + var keys, mods; + keys = getKeys(key); + if (method === undefined) { + method = scope; + scope = 'all'; + } + + // for each shortcut + for (var i = 0; i < keys.length; i++) { + // set modifier keys if any + mods = []; + key = keys[i].split('+'); + if (key.length > 1){ + mods = getMods(key); + key = [key[key.length-1]]; + } + // convert to keycode and... + key = key[0] + key = code(key); + // ...store handler + if (!(key in _handlers)) _handlers[key] = []; + _handlers[key].push({ shortcut: keys[i], scope: scope, method: method, key: keys[i], mods: mods }); + } + }; + + // unbind all handlers for given key in current scope + function unbindKey(key, scope) { + var multipleKeys, keys, + mods = [], + i, j, obj; + + multipleKeys = getKeys(key); + + for (j = 0; j < multipleKeys.length; j++) { + keys = multipleKeys[j].split('+'); + + if (keys.length > 1) { + mods = getMods(keys); + } + + key = keys[keys.length - 1]; + key = code(key); + + if (scope === undefined) { + scope = getScope(); + } + if (!_handlers[key]) { + return; + } + for (i = 0; i < _handlers[key].length; i++) { + obj = _handlers[key][i]; + // only clear handlers if correct scope and mods match + if (obj.scope === scope && compareArray(obj.mods, mods)) { + _handlers[key][i] = {}; + } + } + } + }; + + // Returns true if the key with code 'keyCode' is currently down + // Converts strings into key codes. + function isPressed(keyCode) { + if (typeof(keyCode)=='string') { + keyCode = code(keyCode); + } + return index(_downKeys, keyCode) != -1; + } + + function getPressedKeyCodes() { + return _downKeys.slice(0); + } + + function filter(event){ + var tagName = (event.target || event.srcElement).tagName; + // ignore keypressed in any elements that support keyboard data input + return !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA'); + } + + // initialize key. to false + for(k in _MODIFIERS) assignKey[k] = false; + + // set current scope (default 'all') + function setScope(scope){ _scope = scope || 'all' }; + function getScope(){ return _scope || 'all' }; + + // delete all handlers for a given scope + function deleteScope(scope){ + var key, handlers, i; + + for (key in _handlers) { + handlers = _handlers[key]; + for (i = 0; i < handlers.length; ) { + if (handlers[i].scope === scope) handlers.splice(i, 1); + else i++; + } + } + }; + + // abstract key logic for assign and unassign + function getKeys(key) { + var keys; + key = key.replace(/\s/g, ''); + keys = key.split(','); + if ((keys[keys.length - 1]) == '') { + keys[keys.length - 2] += ','; + } + return keys; + } + + // abstract mods logic for assign and unassign + function getMods(key) { + var mods = key.slice(0, key.length - 1); + for (var mi = 0; mi < mods.length; mi++) + mods[mi] = _MODIFIERS[mods[mi]]; + return mods; + } + + // cross-browser events + function addEvent(object, event, method) { + if (object.addEventListener) + object.addEventListener(event, method, false); + else if(object.attachEvent) + object.attachEvent('on'+event, function(){ method(window.event) }); + }; + + // set the handlers globally on document + addEvent(document, 'keydown', function(event) { dispatch(event) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48 + addEvent(document, 'keyup', clearModifier); + + // reset modifiers to false whenever the window is (re)focused. + addEvent(window, 'focus', resetModifiers); + + // store previously defined key + var previousKey = global.key; + + // restore previously defined key and return reference to our key object + function noConflict() { + var k = global.key; + global.key = previousKey; + return k; + } + + // set window.key and window.key.set/get/deleteScope, and the default filter + global.key = assignKey; + global.key.setScope = setScope; + global.key.getScope = getScope; + global.key.deleteScope = deleteScope; + global.key.filter = filter; + global.key.isPressed = isPressed; + global.key.getPressedKeyCodes = getPressedKeyCodes; + global.key.noConflict = noConflict; + global.key.unbind = unbindKey; + + if(typeof module !== 'undefined') module.exports = assignKey; + +})(this); /** Make a node */ function mk(e) {return document.createElement(e)} @@ -1619,32 +1915,89 @@ var Input = (function() { Conn.send("BTN:"+n); } - function init() { - window.addEventListener('keypress', function(e) { - var code = +e.which; - if (code >= 32 && code < 127) { - var ch = String.fromCharCode(code); - //console.log("Typed ", ch, "code", code, e); - sendStrMsg(ch); + function _initKeys() { + // This takes care of text characters typed + window.addEventListener('keypress', function(evt) { + var str = ''; + if (evt.key) str = evt.key; + else if (evt.which) str = String.fromCodePoint(evt.which); + if (str.length>0 && str.charCodeAt(0) >= 32) { + console.log("Typed ", str); + sendStrMsg(str); } }); - window.addEventListener('keydown', function(e) { - var code = e.keyCode; - //console.log("Down ", code, e); - switch(code) { - case 8: sendStrMsg('\x08'); break; - case 9: sendStrMsg('\x09'); break; - case 10: - case 13: sendStrMsg('\x0d\x0a'); break; - case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences - case 37: sendStrMsg('\x1b[D'); break; - case 38: sendStrMsg('\x1b[A'); break; - case 39: sendStrMsg('\x1b[C'); break; - case 40: sendStrMsg('\x1b[B'); break; + var keymap = { + 'tab': '\x09', + 'backspace': '\x08', + 'enter': '\x0d', + 'ctrl+enter': '\x0a', + 'esc': '\x1b', + 'up': '\x1b[A', + 'down': '\x1b[B', + 'right': '\x1b[C', + 'left': '\x1b[D', + 'home': '\x1b[1~', + 'insert': '\x1b[2~', + 'delete': '\x1b[3~', + 'end': '\x1b[4~', + 'pageup': '\x1b[5~', + 'pagedown': '\x1b[6~', + 'f1': '\x1b[11~', + 'f2': '\x1b[12~', + 'f3': '\x1b[13~', + 'f4': '\x1b[14~', + 'f5': '\x1b[15~', // disconnect + 'f6': '\x1b[17~', + 'f7': '\x1b[18~', + 'f8': '\x1b[19~', + 'f9': '\x1b[20~', + 'f10': '\x1b[21~', // disconnect + 'f11': '\x1b[23~', + 'f12': '\x1b[24~', + 'shift+f1': '\x1b[25~', + 'shift+f2': '\x1b[26~', // disconnect + 'shift+f3': '\x1b[28~', + 'shift+f4': '\x1b[29~', // disconnect + 'shift+f5': '\x1b[31~', + 'shift+f6': '\x1b[32~', + 'shift+f7': '\x1b[33~', + 'shift+f8': '\x1b[34~', + }; + + function bind(combo, str) { + // mac fix - allow also cmd + if (combo.indexOf('ctrl+') !== -1) { + combo += ',' + combo.replace('ctrl', 'command'); } - }); + key(combo, function (e) { + e.preventDefault(); + console.log(combo); + sendStrMsg(str) + }); + } + + for (var k in keymap) { + if (keymap.hasOwnProperty(k)) { + bind(k, keymap[k]); + } + } + + // ctrl-letter codes are sent as simple low ASCII codes + for (var i = 1; i<=26;i++) { + bind('ctrl+' + String.fromCharCode(96+i), String.fromCharCode(i)); + } + bind('ctrl+]', '\x1b'); // alternate way to enter ESC + bind('ctrl+\\', '\x1c'); + bind('ctrl+[', '\x1d'); + bind('ctrl+^', '\x1e'); + bind('ctrl+_', '\x1f'); + } + + function init() { + _initKeys(); + // Button presses qsa('#buttons button').forEach(function(s) { s.addEventListener('click', function() { sendBtnMsg(+this.dataset['n']); diff --git a/html_orig/jssrc/keymaster.js b/html_orig/jssrc/keymaster.js new file mode 100644 index 0000000..f222d3e --- /dev/null +++ b/html_orig/jssrc/keymaster.js @@ -0,0 +1,296 @@ +// keymaster.js +// (c) 2011-2013 Thomas Fuchs +// keymaster.js may be freely distributed under the MIT license. + +;(function(global){ + var k, + _handlers = {}, + _mods = { 16: false, 18: false, 17: false, 91: false }, + _scope = 'all', + // modifier keys + _MODIFIERS = { + '⇧': 16, shift: 16, + '⌥': 18, alt: 18, option: 18, + '⌃': 17, ctrl: 17, control: 17, + '⌘': 91, command: 91 + }, + // special keys + _MAP = { + backspace: 8, tab: 9, clear: 12, + enter: 13, 'return': 13, + esc: 27, escape: 27, space: 32, + left: 37, up: 38, + right: 39, down: 40, + del: 46, 'delete': 46, + home: 36, end: 35, + pageup: 33, pagedown: 34, insert: 45, // added insert + ',': 188, '.': 190, '/': 191, + '`': 192, '-': 189, '=': 187, + ';': 186, '\'': 222, + '[': 219, ']': 221, '\\': 220 + }, + code = function(x){ + return _MAP[x] || x.toUpperCase().charCodeAt(0); + }, + _downKeys = []; + + for(k=1;k<20;k++) _MAP['f'+k] = 111+k; + + // IE doesn't support Array#indexOf, so have a simple replacement + function index(array, item){ + var i = array.length; + while(i--) if(array[i]===item) return i; + return -1; + } + + // for comparing mods before unassignment + function compareArray(a1, a2) { + if (a1.length != a2.length) return false; + for (var i = 0; i < a1.length; i++) { + if (a1[i] !== a2[i]) return false; + } + return true; + } + + var modifierMap = { + 16:'shiftKey', + 18:'altKey', + 17:'ctrlKey', + 91:'metaKey' + }; + function updateModifierKey(event) { + for(k in _mods) _mods[k] = event[modifierMap[k]]; + }; + + // handle keydown event + function dispatch(event) { + var key, handler, k, i, modifiersMatch, scope; + key = event.keyCode; + + if (index(_downKeys, key) == -1) { + _downKeys.push(key); + } + + // if a modifier key, set the key. property to true and return + if(key == 93 || key == 224) key = 91; // right command on webkit, command on Gecko + if(key in _mods) { + _mods[key] = true; + // 'assignKey' from inside this closure is exported to window.key + for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = true; + return; + } + updateModifierKey(event); + + // see if we need to ignore the keypress (filter() can can be overridden) + // by default ignore key presses if a select, textarea, or input is focused + if(!assignKey.filter.call(this, event)) return; + + // abort if no potentially matching shortcuts found + if (!(key in _handlers)) return; + + scope = getScope(); + + // for each potential shortcut + for (i = 0; i < _handlers[key].length; i++) { + handler = _handlers[key][i]; + + // see if it's in the current scope + if(handler.scope == scope || handler.scope == 'all'){ + // check if modifiers match if any + modifiersMatch = handler.mods.length > 0; + for(k in _mods) + if((!_mods[k] && index(handler.mods, +k) > -1) || + (_mods[k] && index(handler.mods, +k) == -1)) modifiersMatch = false; + // call the handler and stop the event if neccessary + if((handler.mods.length == 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || modifiersMatch){ + if(handler.method(event, handler)===false){ + if(event.preventDefault) event.preventDefault(); + else event.returnValue = false; + if(event.stopPropagation) event.stopPropagation(); + if(event.cancelBubble) event.cancelBubble = true; + } + } + } + } + }; + + // unset modifier keys on keyup + function clearModifier(event){ + var key = event.keyCode, k, + i = index(_downKeys, key); + + // remove key from _downKeys + if (i >= 0) { + _downKeys.splice(i, 1); + } + + if(key == 93 || key == 224) key = 91; + if(key in _mods) { + _mods[key] = false; + for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = false; + } + }; + + function resetModifiers() { + for(k in _mods) _mods[k] = false; + for(k in _MODIFIERS) assignKey[k] = false; + }; + + // parse and assign shortcut + function assignKey(key, scope, method){ + var keys, mods; + keys = getKeys(key); + if (method === undefined) { + method = scope; + scope = 'all'; + } + + // for each shortcut + for (var i = 0; i < keys.length; i++) { + // set modifier keys if any + mods = []; + key = keys[i].split('+'); + if (key.length > 1){ + mods = getMods(key); + key = [key[key.length-1]]; + } + // convert to keycode and... + key = key[0] + key = code(key); + // ...store handler + if (!(key in _handlers)) _handlers[key] = []; + _handlers[key].push({ shortcut: keys[i], scope: scope, method: method, key: keys[i], mods: mods }); + } + }; + + // unbind all handlers for given key in current scope + function unbindKey(key, scope) { + var multipleKeys, keys, + mods = [], + i, j, obj; + + multipleKeys = getKeys(key); + + for (j = 0; j < multipleKeys.length; j++) { + keys = multipleKeys[j].split('+'); + + if (keys.length > 1) { + mods = getMods(keys); + } + + key = keys[keys.length - 1]; + key = code(key); + + if (scope === undefined) { + scope = getScope(); + } + if (!_handlers[key]) { + return; + } + for (i = 0; i < _handlers[key].length; i++) { + obj = _handlers[key][i]; + // only clear handlers if correct scope and mods match + if (obj.scope === scope && compareArray(obj.mods, mods)) { + _handlers[key][i] = {}; + } + } + } + }; + + // Returns true if the key with code 'keyCode' is currently down + // Converts strings into key codes. + function isPressed(keyCode) { + if (typeof(keyCode)=='string') { + keyCode = code(keyCode); + } + return index(_downKeys, keyCode) != -1; + } + + function getPressedKeyCodes() { + return _downKeys.slice(0); + } + + function filter(event){ + var tagName = (event.target || event.srcElement).tagName; + // ignore keypressed in any elements that support keyboard data input + return !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA'); + } + + // initialize key. to false + for(k in _MODIFIERS) assignKey[k] = false; + + // set current scope (default 'all') + function setScope(scope){ _scope = scope || 'all' }; + function getScope(){ return _scope || 'all' }; + + // delete all handlers for a given scope + function deleteScope(scope){ + var key, handlers, i; + + for (key in _handlers) { + handlers = _handlers[key]; + for (i = 0; i < handlers.length; ) { + if (handlers[i].scope === scope) handlers.splice(i, 1); + else i++; + } + } + }; + + // abstract key logic for assign and unassign + function getKeys(key) { + var keys; + key = key.replace(/\s/g, ''); + keys = key.split(','); + if ((keys[keys.length - 1]) == '') { + keys[keys.length - 2] += ','; + } + return keys; + } + + // abstract mods logic for assign and unassign + function getMods(key) { + var mods = key.slice(0, key.length - 1); + for (var mi = 0; mi < mods.length; mi++) + mods[mi] = _MODIFIERS[mods[mi]]; + return mods; + } + + // cross-browser events + function addEvent(object, event, method) { + if (object.addEventListener) + object.addEventListener(event, method, false); + else if(object.attachEvent) + object.attachEvent('on'+event, function(){ method(window.event) }); + }; + + // set the handlers globally on document + addEvent(document, 'keydown', function(event) { dispatch(event) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48 + addEvent(document, 'keyup', clearModifier); + + // reset modifiers to false whenever the window is (re)focused. + addEvent(window, 'focus', resetModifiers); + + // store previously defined key + var previousKey = global.key; + + // restore previously defined key and return reference to our key object + function noConflict() { + var k = global.key; + global.key = previousKey; + return k; + } + + // set window.key and window.key.set/get/deleteScope, and the default filter + global.key = assignKey; + global.key.setScope = setScope; + global.key.getScope = getScope; + global.key.deleteScope = deleteScope; + global.key.filter = filter; + global.key.isPressed = isPressed; + global.key.getPressedKeyCodes = getPressedKeyCodes; + global.key.noConflict = noConflict; + global.key.unbind = unbindKey; + + if(typeof module !== 'undefined') module.exports = assignKey; + +})(this); diff --git a/html_orig/jssrc/term.js b/html_orig/jssrc/term.js index 20bca5e..af7d925 100644 --- a/html_orig/jssrc/term.js +++ b/html_orig/jssrc/term.js @@ -363,32 +363,89 @@ var Input = (function() { Conn.send("BTN:"+n); } - function init() { - window.addEventListener('keypress', function(e) { - var code = +e.which; - if (code >= 32 && code < 127) { - var ch = String.fromCharCode(code); - //console.log("Typed ", ch, "code", code, e); - sendStrMsg(ch); + function _initKeys() { + // This takes care of text characters typed + window.addEventListener('keypress', function(evt) { + var str = ''; + if (evt.key) str = evt.key; + else if (evt.which) str = String.fromCodePoint(evt.which); + if (str.length>0 && str.charCodeAt(0) >= 32) { + console.log("Typed ", str); + sendStrMsg(str); } }); - window.addEventListener('keydown', function(e) { - var code = e.keyCode; - //console.log("Down ", code, e); - switch(code) { - case 8: sendStrMsg('\x08'); break; - case 9: sendStrMsg('\x09'); break; - case 10: - case 13: sendStrMsg('\x0d\x0a'); break; - case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences - case 37: sendStrMsg('\x1b[D'); break; - case 38: sendStrMsg('\x1b[A'); break; - case 39: sendStrMsg('\x1b[C'); break; - case 40: sendStrMsg('\x1b[B'); break; + var keymap = { + 'tab': '\x09', + 'backspace': '\x08', + 'enter': '\x0d', + 'ctrl+enter': '\x0a', + 'esc': '\x1b', + 'up': '\x1b[A', + 'down': '\x1b[B', + 'right': '\x1b[C', + 'left': '\x1b[D', + 'home': '\x1b[1~', + 'insert': '\x1b[2~', + 'delete': '\x1b[3~', + 'end': '\x1b[4~', + 'pageup': '\x1b[5~', + 'pagedown': '\x1b[6~', + 'f1': '\x1b[11~', + 'f2': '\x1b[12~', + 'f3': '\x1b[13~', + 'f4': '\x1b[14~', + 'f5': '\x1b[15~', // disconnect + 'f6': '\x1b[17~', + 'f7': '\x1b[18~', + 'f8': '\x1b[19~', + 'f9': '\x1b[20~', + 'f10': '\x1b[21~', // disconnect + 'f11': '\x1b[23~', + 'f12': '\x1b[24~', + 'shift+f1': '\x1b[25~', + 'shift+f2': '\x1b[26~', // disconnect + 'shift+f3': '\x1b[28~', + 'shift+f4': '\x1b[29~', // disconnect + 'shift+f5': '\x1b[31~', + 'shift+f6': '\x1b[32~', + 'shift+f7': '\x1b[33~', + 'shift+f8': '\x1b[34~', + }; + + function bind(combo, str) { + // mac fix - allow also cmd + if (combo.indexOf('ctrl+') !== -1) { + combo += ',' + combo.replace('ctrl', 'command'); } - }); + key(combo, function (e) { + e.preventDefault(); + console.log(combo); + sendStrMsg(str) + }); + } + + for (var k in keymap) { + if (keymap.hasOwnProperty(k)) { + bind(k, keymap[k]); + } + } + + // ctrl-letter codes are sent as simple low ASCII codes + for (var i = 1; i<=26;i++) { + bind('ctrl+' + String.fromCharCode(96+i), String.fromCharCode(i)); + } + bind('ctrl+]', '\x1b'); // alternate way to enter ESC + bind('ctrl+\\', '\x1c'); + bind('ctrl+[', '\x1d'); + bind('ctrl+^', '\x1e'); + bind('ctrl+_', '\x1f'); + } + + function init() { + _initKeys(); + // Button presses qsa('#buttons button').forEach(function(s) { s.addEventListener('click', function() { sendBtnMsg(+this.dataset['n']); diff --git a/html_orig/packjs.sh b/html_orig/packjs.sh index 6df5917..3c881ef 100755 --- a/html_orig/packjs.sh +++ b/html_orig/packjs.sh @@ -3,6 +3,7 @@ echo "Packing js..." cat jssrc/chibi.js \ + jssrc/keymaster.js \ jssrc/utils.js \ jssrc/modal.js \ jssrc/notif.js \