From c5e89bcdf719089bb8ebdc2905db9b69dfed7908 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 6 May 2008 15:04:12 +0100 Subject: [PATCH] Great key rebinding. * Rebind Enlightenment keys to use right-hand Alt key, leaving left Alt available for Emacs. * Remove a bunch of old Emacs key bindings. In particular, F9 (`mdw-divvy-window') is now on C-x w d; `undo' is removed from F8 and is now only (ahem) on C-x u, C-_ and C-/. F4 (`query-replace-regexp') moved to the default C-M-%. F5 (`goto-line') is on M-g M-g. F6 (`auto-fill-mode') is moved to C-x /. Finally, M-RET is no longer `kmacro-call-macro', but one can use C-x C-k C-k or (now we've stopped squatting on it) F4. The remaining fly in the ointment is that C-M-DEL is still trapped by the X server. This needs some XKB hacking. --- dot-emacs.el | 34 ------------------- e-keybindings.cfg | 99 ++++++++++++++++++++++++++++++++++--------------------- emacs | 11 ++----- 3 files changed, 64 insertions(+), 80 deletions(-) diff --git a/dot-emacs.el b/dot-emacs.el index 1b1a71c..25105a9 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -541,40 +541,6 @@ doesn't cope with anything approximating a complicated case." ;;;----- Other common declarations ------------------------------------------ -(defun mdw-set-frame-transparency (&optional n) - (interactive "P") - (let* ((alist (frame-parameters)) - (trans (assq 'transparency alist))) - (if trans - (rplacd trans (not (if n (zerop n) (cdr trans)))) - (setq trans (cons 'transparency (not (equal 0 n))))) - (modify-frame-parameters (selected-frame) (list trans)))) - -;; --- Mouse wheel support --- - -(defconst mdw-wheel-scroll-amount 15) -(defun mdw-wheel-up (click) - (interactive "@e") - (mdw-wheel-scroll click (function scroll-down))) -(defun mdw-wheel-down (click) - (interactive "@e") - (mdw-wheel-scroll click (function scroll-up))) - -(defun mdw-wheel-scroll (click func) - (let ((win (selected-window))) - (unwind-protect - (progn - (select-window (posn-window (event-start click))) - (let ((arg 2)) - (funcall func (/ (window-height) 2)))) - (select-window win)))) - -;; --- Going backwards --- - -(defun other-window-backwards (arg) - (interactive "p") - (other-window (- arg))) - ;; --- Common mode settings --- (defvar mdw-auto-indent t diff --git a/e-keybindings.cfg b/e-keybindings.cfg index b0e49b5..7f5cd00 100644 --- a/e-keybindings.cfg +++ b/e-keybindings.cfg @@ -13,26 +13,51 @@ __ACLASS __BGN __TYPE __TYPE_NORMAL __EVENT __MOUSE_PRESS __BUTTON 1 + __MODIFIER_KEY __CTRL_META5 + __ACTION __A_MOVE + __NEXT_ACTION + __EVENT __MOUSE_PRESS + __BUTTON 1 __MODIFIER_KEY __CTRL_ALT __ACTION __A_MOVE __NEXT_ACTION __EVENT __DOUBLE_CLICK __BUTTON 1 + __MODIFIER_KEY __CTRL_META5 + __ACTION __A_SHADE + __NEXT_ACTION + __EVENT __DOUBLE_CLICK + __BUTTON 1 __MODIFIER_KEY __CTRL_ALT __ACTION __A_SHADE __NEXT_ACTION __EVENT __MOUSE_PRESS __BUTTON 2 + __MODIFIER_KEY __CTRL_META5 + __ACTION __A_RESIZE + __NEXT_ACTION + __EVENT __MOUSE_PRESS + __BUTTON 2 __MODIFIER_KEY __CTRL_ALT __ACTION __A_RESIZE __NEXT_ACTION __EVENT __DOUBLE_CLICK __BUTTON 2 + __MODIFIER_KEY __CTRL_META5 + __ACTION __A_MAX_HEIGHT available + __NEXT_ACTION + __EVENT __DOUBLE_CLICK + __BUTTON 2 __MODIFIER_KEY __CTRL_ALT __ACTION __A_MAX_HEIGHT available __NEXT_ACTION __EVENT __MOUSE_PRESS __BUTTON 3 + __MODIFIER_KEY __CTRL_META5 + __ACTION __A_SHOW_MENU "named WINOPS_MENU" + __NEXT_ACTION + __EVENT __MOUSE_PRESS + __BUTTON 3 __MODIFIER_KEY __CTRL_ALT __ACTION __A_SHOW_MENU "named WINOPS_MENU" __END @@ -70,7 +95,7 @@ __ACLASS __BGN __TOOLTIP_ACTION_TEXT "Display Task List Menu" __EVENT __MOUSE_PRESS __BUTTON 2 - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_SHOW_MENU "taskmenu" __NEXT_ACTION __TOOLTIP_ACTION_TEXT "Display Desktop Menu" @@ -195,7 +220,7 @@ __ACLASS __BGN /* * Can I use this with any modifier? (default is no) */ - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 /* * you can also use modifier to specify a specific mod mask (alt,ctrl,qshift,etc) */ @@ -204,150 +229,150 @@ __ACLASS __BGN __NEXT_ACTION __KEY Insert __EVENT __KEY_PRESS - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __ACTION __A_EXEC xatom set XINIT_COMMAND :terminal __NEXT_ACTION __KEY v - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __EVENT __KEY_PRESS __ACTION __A_DESKRAY __NEXT_ACTION __KEY Delete __EVENT __KEY_PRESS - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __ACTION __A_EXIT logout __NEXT_ACTION __KEY End __EVENT __KEY_PRESS - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __ACTION __A_EXIT restart __NEXT_ACTION __KEY Right __EVENT __KEY_PRESS - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __ACTION __A_DESKTOP_NEXT __NEXT_ACTION __KEY Left __EVENT __KEY_PRESS - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __ACTION __A_DESKTOP_PREV __NEXT_ACTION __KEY Down __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT_SHIFT + __MODIFIER_KEY __SHIFT_META5 __ACTION __A_AREA_MOVE_BY 0 1 __NEXT_ACTION __KEY Up __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT_SHIFT + __MODIFIER_KEY __SHIFT_META5 __ACTION __A_AREA_MOVE_BY 0 -1 __NEXT_ACTION __KEY Left __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT_SHIFT + __MODIFIER_KEY __SHIFT_META5 __ACTION __A_AREA_MOVE_BY -1 0 __NEXT_ACTION __KEY Right __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT_SHIFT + __MODIFIER_KEY __SHIFT_META5 __ACTION __A_AREA_MOVE_BY 1 0 __NEXT_ACTION __KEY F1 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 0 __NEXT_ACTION __KEY F2 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 1 __NEXT_ACTION __KEY F3 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 2 __NEXT_ACTION __KEY F4 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 3 __NEXT_ACTION __KEY F5 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 4 __NEXT_ACTION __KEY F6 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 5 __NEXT_ACTION __KEY F7 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_GOTO_DESK 6 __NEXT_ACTION __KEY F8 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_EXEC xatom set XINIT_COMMAND :terminal __NEXT_ACTION __KEY F9 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_EXEC xrun __NEXT_ACTION __KEY F10 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_EXEC xatom set XINIT_COMMAND gnome-panel __NEXT_ACTION __KEY F11 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_EXEC xscreensaver-command -lock __NEXT_ACTION __KEY F12 __EVENT __KEY_PRESS - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __ACTION __A_EXEC xshutdown __NEXT_ACTION __KEY Tab - __MODIFIER_KEY __ALT + __MODIFIER_KEY __META5 __EVENT __KEY_PRESS __ACTION __A_FOCUS_NEXT __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY Up __EVENT __KEY_PRESS __ACTION __A_RAISE __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY Down __EVENT __KEY_PRESS __ACTION __A_LOWER __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY x __EVENT __KEY_PRESS __ACTION __A_KILL __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY k __EVENT __KEY_PRESS __ACTION __A_KILL_NASTY __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY s __EVENT __KEY_PRESS __ACTION __A_STICK __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY i __EVENT __KEY_PRESS __ACTION __A_ICONIFY __NEXT_ACTION - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __KEY r __EVENT __KEY_PRESS __ACTION __A_SHADE @@ -362,26 +387,26 @@ __ACLASS __BGN __TYPE __TYPE_GLOBAL __KEY d __EVENT __KEY_PRESS - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __ACTION __A_DRAGDIR_SET __NEXT_ACTION __KEY o - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __EVENT __KEY_PRESS __ACTION __A_DRAGBAR_ORDER_SET __NEXT_ACTION __KEY c - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __EVENT __KEY_PRESS __ACTION __A_HIDESHOW_BUTTON buttons CONFIG* __NEXT_ACTION __KEY b - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __EVENT __KEY_PRESS __ACTION __A_HIDESHOW_BUTTON __NEXT_ACTION __KEY a - __MODIFIER_KEY __CTRL_ALT + __MODIFIER_KEY __CTRL_META5 __EVENT __KEY_PRESS __ACTION __A_HIDESHOW_BUTTON all __END diff --git a/emacs b/emacs index f47f77b..e2075ed 100644 --- a/emacs +++ b/emacs @@ -330,19 +330,14 @@ (setq windmove-wrap-around t)) (trap (iswitchb-mode)) (global-set-key [?\M-#] 'calc-dispatch) -(global-set-key [f4] 'query-replace-regexp) -(global-set-key [f5] 'goto-line) -(global-set-key [f6] 'auto-fill-mode) -(global-set-key [f7] 'occur) -(global-set-key [f8] 'undo) -(global-set-key [f9] 'mdw-divvy-window) +(global-set-key [?\C-x ?/] 'auto-fill-mode) +(global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) (global-set-key [insertchar] 'overwrite-mode) (global-set-key [?\C-x ?m] 'vm-mail) (global-set-key [?\C-x ?\C-n] 'skel-create-file) (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame) (global-set-key [delete] 'delete-char) -(global-set-key [?\C-[ ?\C-m] 'call-last-kbd-macro) (global-set-key [?\M-q] 'mdw-fill-paragraph) (global-set-key [?\C-h ?\C-m] 'manual-entry) (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window) @@ -350,8 +345,6 @@ 'mouse-drag-vertical-line) (global-set-key [vertical-scroll-bar C-mouse-1] #'(lambda () (interactive))) -(global-set-key [mouse-4] 'mdw-wheel-up) -(global-set-key [mouse-5] 'mdw-wheel-down) ;; --- Recognising types of files --- -- 2.11.0