From d578a9b331ed6febde37a4eea1d81ed43dd992da Mon Sep 17 00:00:00 2001
From: Ravi R Kiran <aine.marina@gmail.com>
Date: Tue, 14 Jan 2014 21:43:13 -0800
Subject: Ergodox support that allows 4 modifier keys


diff --git a/init.el b/init.el
index 0fb0767..1de47e5 100644
--- a/init.el
+++ b/init.el
@@ -90,6 +90,8 @@
   :ensure t
   )
 
+(require 'ravi-ergodox-mode)
+
 (require 'ravi-init-ido)
 (require 'ravi-init-marks)
 (require 'ravi-init-appearance)
diff --git a/ravi-ergodox-mode.el b/ravi-ergodox-mode.el
new file mode 100644
index 0000000..78221ab
--- /dev/null
+++ b/ravi-ergodox-mode.el
@@ -0,0 +1,78 @@
+;;; ravi-ergodox-mode.el --- Keybindings fof Ergodox keyboard
+
+;; Copyright (C) 2014  Ravikiran Rajagopal
+
+;; Author: Ravikiran Rajagopal <ravi@nero.lan>
+;; Keywords: convenience, hardware
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Set up keymap for ergodox bindings
+
+;;; Code:
+
+(defgroup ravi-ergodox-mode nil
+  "Keybindings for ergodox."
+  :group 'ravi-ergodox-mode)
+
+(defvar ravi-ergodox-mode-map (make-sparse-keymap)
+  "Keymaps for command `ravi-ergodox-mode-map'.")
+
+(defcustom ravi-ergodox-mode-disable-predicates nil
+  "List of predicates that disable the mode.
+Each function in the list receive no argument."
+  :group 'ravi-ergodox-mode)
+
+(defcustom ravi-ergodox-mode-disabled-modes nil
+  "Modes where `ravi-ergodox-mode' should not activate."
+  :group 'ravi-ergodox-mode
+  :type '(repeat symbol))
+
+(define-minor-mode ravi-ergodox-mode
+  "Enable Ergodox keyboard special bindings."
+  :lighter " RE" :group 'convenience
+  :keymap ravi-ergodox-mode-map
+  :global t
+  (if ravi-ergodox-mode
+      (progn
+        (setq x-meta-keysym 'super)
+        (setq x-super-keysym 'meta))
+    (progn
+      (setq x-meta-keysym nil)
+      (setq x-super-keysym nil))
+    )
+  )
+
+(define-key ravi-ergodox-mode-map (kbd "H-m") 'magit-status)
+(define-key ravi-ergodox-mode-map (kbd "<f6>") 'ff-find-other-file)
+(define-key ravi-ergodox-mode-map (kbd "<f1>") 'ido-switch-buffer)
+(define-key ravi-ergodox-mode-map (kbd "<f2>") 'ido-find-file)
+
+(defun ravi-ergodox-mode-enable ()
+  "Turn on ergodox bindings mode."
+  (and (not (memq major-mode ravi-ergodox-mode-disabled-modes))
+       (not (catch 'disable
+              (dolist (pred ravi-ergodox-mode-disable-predicates)
+                (and (funcall pred)
+                     (throw 'disable t)))))
+       (ravi-ergodox-mode 1)))
+
+(defun ravi-ergodox-mode-disable ()
+  "Turn off ergodox bindings mode."
+  (ravi-ergodox-mode -1))
+
+(provide 'ravi-ergodox-mode)
+;;; ravi-ergodox-mode.el ends here
diff --git a/xkb/ergodox.xkb b/xkb/ergodox.xkb
index 10d0f89..b0a4a6c 100644
--- a/xkb/ergodox.xkb
+++ b/xkb/ergodox.xkb
@@ -38,12 +38,12 @@ xkb_keymap {
     key <LFSH> {        [ Shift_L       ]       };
     key <LCTL> {        [ Control_L     ]       };
 
-    key <LWIN> {        [ Super_L                       ]       };
+    key <LWIN> {        [ Meta_L                       ]       };
 
     key <RTSH> {        [ Shift_R       ]       };
     key <RCTL> {        [ Control_R     ]       };
 
-    key <RWIN> {        [ Meta_L                       ]       };
+    key <RWIN> {        [ Super_L                       ]       };
 
     key <MENU> {        [ Menu                  ]       };
 
@@ -62,7 +62,7 @@ xkb_keymap {
     modifier_map Mod3   { Hyper_L };
     modifier_map Mod4   { Super_L, Super_R };
 
-    //  Fake keys for virtual<->real modifiers mapping 
+    //  Fake keys for virtual<->real modifiers mapping
     key <LVL3> {        [ ISO_Level3_Shift      ]       };
     key <MDSW> {        [ Mode_switch           ]       };
     modifier_map Mod5   { <LVL3>, <MDSW> };
-- 
cgit v0.10.1