Browse Source

revert two commit related to disabling menu_as_ctrl

pull/1/head
10sr 12 years ago
parent
commit
cd41e07fa5
3 changed files with 15 additions and 15 deletions
  1. +1
    -1
      20-keyboard.conf
  2. +13
    -13
      _keysnail.js
  3. +1
    -1
      xinitrc

+ 1
- 1
20-keyboard.conf View File

@@ -5,5 +5,5 @@ Section "InputClass"
MatchIsKeyboard "yes"
# Option "XkbModel" "acer_laptop"
# Option "XkbLayout" "jp"
Option "XkbOptions" "ctrl:nocaps"
Option "XkbOptions" "ctrl:nocaps,ctrl:menu_rctrl"
EndSection

+ 13
- 13
_keysnail.js View File

@@ -558,12 +558,6 @@ key.setGlobalKey('C-l', function (ev, arg) {
ext.exec("hok-start-foreground-mode", arg, ev);
}, 'Start Hit a Hint foreground mode', true);

key.setGlobalKey('<delete>', function (ev, arg) {
let (elem = document.commandDispatcher.focusedElement) elem && elem.blur();
gBrowser.focus();
content.focus();
}, 'コンテンツへフォーカス', true);

key.setViewKey('c', function (ev) {
command.interpreter();
}, 'JavaScript のコードを評価');
@@ -690,6 +684,14 @@ key.setViewKey('a', function (ev, arg) {
allTabs.open();
}, 'alltabs.open');

key.setViewKey('<left>', function (ev) {
goDoCommand("cmd_scrollPageUp");
}, '一画面分スクロールアップ');

key.setViewKey('<right>', function (ev) {
goDoCommand("cmd_scrollPageDown");
}, '一画面スクロールダウン');

key.setViewKey([['<prior>'], ['<next>']], function (ev, arg) {
return;
}, 'ignore');
@@ -731,10 +733,8 @@ key.setEditKey('C-<tab>', function (ev) {
command.walkInputElement(command.elementsRetrieverTextarea, true, true);
}, '次のテキストエリアへフォーカス');

key.setViewKey('<right>', function (ev) {
getBrowser().mTabContainer.advanceSelectedTab(1, true);
}, 'ひとつ右のタブへ');

key.setViewKey('<left>', function (ev) {
getBrowser().mTabContainer.advanceSelectedTab(-1, true);
}, 'ひとつ左のタブへ');
key.setGlobalKey('<delete>', function (ev, arg) {
let(elem = document.commandDispatcher.focusedElement) elem && elem.blur();
gBrowser.focus();
content.focus();
}, 'コンテンツへフォーカス', true);

+ 1
- 1
xinitrc View File

@@ -1,7 +1,7 @@
test "`hostname`" == "arch-aspireone" &&
setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first

setxkbmap -option "ctrl:nocaps"
setxkbmap -option "ctrl:nocaps,ctrl:menu_rctrl"
xmodmap -e 'keycode 101 = Alt_R Meta_R' # hiragana key as alt
#xmodmap -e 'remove Lock = Caps_Lock'
#xmodmap -e 'add Control = Caps_Lock'


Loading…
Cancel
Save