From 2981d55a1eda048a04c6f3f939a683e84af88ee7 Mon Sep 17 00:00:00 2001 From: Eliran Gonen <31196036+elig0n@users.noreply.github.com> Date: Sat, 11 Apr 2020 07:48:37 +0300 Subject: [PATCH 1/3] Commented keyRebindings as they overwrite the multi-key defaults in SelectionMenu.js --- scripts/Blackbox.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/Blackbox.js b/scripts/Blackbox.js index 083c2bf..211b144 100644 --- a/scripts/Blackbox.js +++ b/scripts/Blackbox.js @@ -853,18 +853,18 @@ Blackbox.prototype.switchMenu = function(forcePage) showHelpHint: userConfig.getValue('help_hint'), favoritePaths: userConfig.getMultiValue('favorites'), includeRegex: userConfig.getValue('include_regex'), - keyRebindings: { - 'Menu-Up': userConfig.getMultiValue('keys_menu_up'), - 'Menu-Down': userConfig.getMultiValue('keys_menu_down'), - 'Menu-Up-Fast': userConfig.getMultiValue('keys_menu_up_fast'), - 'Menu-Down-Fast': userConfig.getMultiValue('keys_menu_down_fast'), - 'Menu-Left': userConfig.getMultiValue('keys_menu_left'), - 'Menu-Right': userConfig.getMultiValue('keys_menu_right'), - 'Menu-Open': userConfig.getMultiValue('keys_menu_open'), - 'Menu-Undo': userConfig.getMultiValue('keys_menu_undo'), - 'Menu-Help': userConfig.getMultiValue('keys_menu_help'), - 'Menu-Close': userConfig.getMultiValue('keys_menu_close') - } + // keyRebindings: { + // 'Menu-Up': userConfig.getMultiValue('keys_menu_up'), + // 'Menu-Down': userConfig.getMultiValue('keys_menu_down'), + // 'Menu-Up-Fast': userConfig.getMultiValue('keys_menu_up_fast'), + // 'Menu-Down-Fast': userConfig.getMultiValue('keys_menu_down_fast'), + // 'Menu-Left': userConfig.getMultiValue('keys_menu_left'), + // 'Menu-Right': userConfig.getMultiValue('keys_menu_right'), + // 'Menu-Open': userConfig.getMultiValue('keys_menu_open'), + // 'Menu-Undo': userConfig.getMultiValue('keys_menu_undo'), + // 'Menu-Help': userConfig.getMultiValue('keys_menu_help'), + // 'Menu-Close': userConfig.getMultiValue('keys_menu_close') + // } }); } catch (e) { mp.msg.error('Blackbox: '+e+'.'); From d491f933b18a5a5817d2f56cb8b07fdedebcfbe1 Mon Sep 17 00:00:00 2001 From: Eliran Gonen <31196036+elig0n@users.noreply.github.com> Date: Sat, 11 Apr 2020 07:49:53 +0300 Subject: [PATCH 2/3] Extended default keys with mouse and vim navigation Mouse wheel up & down to scroll list one by one and left mouse button to select. Keyboard 'j' & 'k' for up one and down one. --- scripts/modules.js/SelectionMenu.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/modules.js/SelectionMenu.js b/scripts/modules.js/SelectionMenu.js index 18d6a20..c2f1212 100644 --- a/scripts/modules.js/SelectionMenu.js +++ b/scripts/modules.js/SelectionMenu.js @@ -53,13 +53,13 @@ var SelectionMenu = function(settings) settings.autoCloseDelay >= 0 ? settings.autoCloseDelay : 5; // 0 = Off. this.autoCloseActiveAt = 0; this.keyBindings = { // Default keybindings. - 'Menu-Up':{repeatable:true, keys:['up']}, - 'Menu-Down':{repeatable:true, keys:['down']}, + 'Menu-Up':{repeatable:true, keys:['up','WHEEL_UP', 'k'] }, + 'Menu-Down':{repeatable:true, keys:['down', 'WHEEL_DOWN', 'j' ]}, 'Menu-Up-Fast':{repeatable:true, keys:['shift+up']}, 'Menu-Down-Fast':{repeatable:true, keys:['shift+down']}, 'Menu-Left':{repeatable:true, keys:['left']}, 'Menu-Right':{repeatable:false, keys:['right']}, - 'Menu-Open':{repeatable:false, keys:['enter']}, + 'Menu-Open':{repeatable:false, keys:['enter', 'MBTN_LEFT']}, 'Menu-Undo':{repeatable:false, keys:['bs']}, 'Menu-Help':{repeatable:false, keys:['h']}, 'Menu-Close':{repeatable:false, keys:['esc']} From 31fb78a5f97586d3cd59666c58290ac45d9bf21b Mon Sep 17 00:00:00 2001 From: elig0n Date: Fri, 17 Apr 2020 12:43:43 +0300 Subject: [PATCH 3/3] 'h' and 'l' for left & right keys, '?' for help --- scripts/modules.js/SelectionMenu.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/modules.js/SelectionMenu.js b/scripts/modules.js/SelectionMenu.js index c2f1212..ceb34ed 100644 --- a/scripts/modules.js/SelectionMenu.js +++ b/scripts/modules.js/SelectionMenu.js @@ -57,11 +57,11 @@ var SelectionMenu = function(settings) 'Menu-Down':{repeatable:true, keys:['down', 'WHEEL_DOWN', 'j' ]}, 'Menu-Up-Fast':{repeatable:true, keys:['shift+up']}, 'Menu-Down-Fast':{repeatable:true, keys:['shift+down']}, - 'Menu-Left':{repeatable:true, keys:['left']}, - 'Menu-Right':{repeatable:false, keys:['right']}, + 'Menu-Left':{repeatable:true, keys:['left', 'h']}, + 'Menu-Right':{repeatable:false, keys:['right', 'l']}, 'Menu-Open':{repeatable:false, keys:['enter', 'MBTN_LEFT']}, 'Menu-Undo':{repeatable:false, keys:['bs']}, - 'Menu-Help':{repeatable:false, keys:['h']}, + 'Menu-Help':{repeatable:false, keys:['?']}, 'Menu-Close':{repeatable:false, keys:['esc']} };