Merge remote-tracking branch 'origin/master'

Conflicts:
	xinitrc

20-keyboard.conf

@@ -0,0 +1,9 @@
+# ln -s this /etc/X11/xorg.conf.d
+
+Section "InputClass"
+    Identifier             "Keyboard Defaults"
+    MatchIsKeyboard        "yes"
+#    Option                 "XkbModel" "acer_laptop"
+#    Option                 "XkbLayout" "jp"
+    Option                 "XkbOptions" "ctrl:nocaps,ctrl:menu_rctrl"
+EndSection

_keysnail.js

@@ -478,7 +478,7 @@ ext.add("list-tab-history", function () {
 
 // ========================= Special key settings ========================== //
 
-key.quitKey              = "<delete>";
+key.quitKey              = "ESC";
 key.helpKey              = "<f1>";
 key.escapeKey            = "C-q";
 key.macroStartKey        = "";
@@ -550,14 +550,18 @@ key.setGlobalKey('C-<down>', function () {
     }
 }, '選択中のタブを左へ');
 
-key.setGlobalKey('M-:', function (ev) {
-    command.interpreter();
-}, 'JavaScript のコードを評価');
-
 key.setGlobalKey('C-h', function (ev, arg) {
     return;
 }, 'ignore');
 
+key.setGlobalKey('C-l', function (ev, arg) {
+    ext.exec("hok-start-foreground-mode", arg, ev);
+}, 'Start Hit a Hint foreground mode', true);
+
+key.setViewKey('c', function (ev) {
+    command.interpreter();
+}, 'JavaScript のコードを評価');
+
 key.setViewKey('D', function (ev, arg) {
     ext.exec("dig-url", arg, ev);
 }, 'dig url with selector', true);
@@ -728,3 +732,9 @@ key.setViewKey('T', function (ev, arg) {
 key.setEditKey('C-<tab>', function (ev) {
     command.walkInputElement(command.elementsRetrieverTextarea, true, true);
 }, '次のテキストエリアへフォーカス');
+
+key.setGlobalKey('<delete>', function (ev, arg) {
+    let(elem = document.commandDispatcher.focusedElement) elem && elem.blur();
+    gBrowser.focus();
+    content.focus();
+}, 'コンテンツへフォーカス', true);

fonts.conf

@@ -2,14 +2,19 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
-  <alias>
+  <alias binding='strong'>
     <family>serif</family>
     <prefer>
       <family>DejaVu Serif</family>
-      <family>monapo</family>
     </prefer>
   </alias>
   <alias>
+    <family>serif</family>
+    <prefer>
+      <family>monapo</family>
+    </prefer>
+  </alias>
+  <alias binding='strong'>
     <family>sans-serif</family>
     <prefer>
       <family>DejaVu Sans</family>

xinitrc

@@ -1,8 +1,7 @@
 test "`hostname`" == "arch-aspireone" &&
 setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first
 
-setxkbmap -option "ctrl:nocaps"
-setxkbmap -option "ctrl:menu_rctrl"
+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'