xrsh/xrsh-com
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

milestone 3.3E: basic support for keyboard/handcontrols in terminal
All checks were successful
/ mirror_to_github (push) Successful in 40s
Details
/ test (push) Successful in 8s
Details

Browse source
This commit is contained in:
Leon van Kammen 2025-04-10 16:57:13 +02:00
parent 6f0481830b
commit 6cfeaefe01
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
com/isoterminal/feat/term.js
View file

@ -13,9 +13,9 @@ ISOTerminal.prototype.TermInit = function(){
rows: aEntity.rows, rows: aEntity.rows,
el_or_id: el, el_or_id: el,
scrollback: aEntity.rows*3, scrollback: aEntity.rows*3,
fontSize: null // fontSize: null,
//rainbow: [Term.COLOR_MAGENTA, Term.COLOR_CYAN ], //rainbow: [Term.COLOR_MAGENTA, Term.COLOR_CYAN ],
//xr: AFRAME.scenes[0].renderer.xr, isWebXRKeyboard: () => AFRAME.scenes[0].renderer.xr.isPresenting && AFRAME.scenes[0].renderer.xr.getSession().isSystemKeyboardSupported, // naive way
//map: { //map: {
// 'ArrowRight': { ch: false, ctrl: '\x1b\x66' }, // this triggers ash-shell forward-word // 'ArrowRight': { ch: false, ctrl: '\x1b\x66' }, // this triggers ash-shell forward-word
// 'ArrowLeft': { ch: false, ctrl: '\x1b\x62' } // backward-word // 'ArrowLeft': { ch: false, ctrl: '\x1b\x62' } // backward-word

14
com/isoterminal/term.js
View file

@ -31,6 +31,7 @@ function Term(options)
{ {
} }
this.options = options
width = options.cols ? options.cols : 80; width = options.cols ? options.cols : 80;
height = options.rows ? options.rows : 25; height = options.rows ? options.rows : 25;
scrollback = options.scrollback ? options.scrollback : 0; scrollback = options.scrollback ? options.scrollback : 0;
@ -101,6 +102,9 @@ function Term(options)
this.linux_console = true; this.linux_console = true;
this.textarea_has_focus = false; this.textarea_has_focus = false;
// remember last data (to help WebXRKeyboard decide whether onblur should imply 'enter')
this.last = { keydown: '', input: '', inputValue: ''}
} }
Term.prototype.setKeyHandler = function(handler) Term.prototype.setKeyHandler = function(handler)
@ -1154,6 +1158,7 @@ Term.prototype.keyDownHandler = function (ev)
} }
break; break;
} }
this.last.keydown = str
// console.log("keydown: keycode=" + ev.keyCode + " charcode=" + ev.charCode + " str=" + str + " ctrl=" + ev.ctrlKey + " alt=" + ev.altKey + " meta=" + ev.metaKey); // console.log("keydown: keycode=" + ev.keyCode + " charcode=" + ev.charCode + " str=" + str + " ctrl=" + ev.ctrlKey + " alt=" + ev.altKey + " meta=" + ev.metaKey);
if (str) { if (str) {
if (ev.stopPropagation) if (ev.stopPropagation)
@ -1204,7 +1209,13 @@ Term.prototype.to_utf8 = function(s)
Term.prototype.inputHandler = function (ev) Term.prototype.inputHandler = function (ev)
{ {
var str; var str;
str = this.textarea_el.value; // edge-case: Meta's WebXRKeyboard implementation requires us to use .value
str = this.last.input = this.textarea_el.value.split("").pop();
// edge-case: detect backspace based on length-change [Meta's WebXRKeyboard]
if( (this.textarea_el.value.length + 1) == this.last.inputValue.length ){
str = '\b'
}
this.last.inputValue = this.textarea_el.value
if (str) { if (str) {
this.textarea_el.value = ""; this.textarea_el.value = "";
this.show_cursor(); this.show_cursor();
@ -1243,6 +1254,7 @@ Term.prototype.blurHandler = function (ev)
/* allow unloading the page */ /* allow unloading the page */
window.onbeforeunload = null; window.onbeforeunload = null;
this.textarea_has_focus = false; this.textarea_has_focus = false;
if( this.last.keydown != "\n" && this.last.input && this.options.isWebXRKeyboard() ) this.handler("\n")
}; };
Term.prototype.pasteHandler = function (ev) Term.prototype.pasteHandler = function (ev)