From 77a4a8c2766f2d5648e100ff237fd69dd4abccfd Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 19 Jun 2013 16:21:41 -0500 Subject: [PATCH] adjust various drracket keybindings so they are not just "m:" but are now "~c:m:" to try to ward off alt-gr related problems under windows --- pkgs/drracket/browser/private/hyper.rkt | 4 ++-- pkgs/drracket/drracket/private/rep.rkt | 6 +++--- .../scribblings/drracket/incremental-keybindings.rkt | 4 ++-- pkgs/drracket/scribblings/drracket/keybindings.scrbl | 2 +- pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/drracket/browser/private/hyper.rkt b/pkgs/drracket/browser/private/hyper.rkt index 5471ba317e..8792977279 100644 --- a/pkgs/drracket/browser/private/hyper.rkt +++ b/pkgs/drracket/browser/private/hyper.rkt @@ -617,14 +617,14 @@ A test case: (send hyper-keymap map-function "d:left" "rewind") (send hyper-keymap map-function "a:left" "rewind") (send hyper-keymap map-function "c:left" "rewind") -(send hyper-keymap map-function "m:left" "rewind") +(send hyper-keymap map-function "~c:m:left" "rewind") (send hyper-keymap map-function "d:]" "forward") (send hyper-keymap map-function "a:]" "forward") (send hyper-keymap map-function "c:]" "forward") (send hyper-keymap map-function "d:right" "forward") (send hyper-keymap map-function "a:right" "forward") (send hyper-keymap map-function "c:right" "forward") -(send hyper-keymap map-function "m:right" "forward") +(send hyper-keymap map-function "~c:m:right" "forward") (send hyper-keymap map-function "wheelup" "do-wheel") (send hyper-keymap map-function "pageup" "previous-page") (send hyper-keymap map-function "wheeldown" "do-wheel") diff --git a/pkgs/drracket/drracket/private/rep.rkt b/pkgs/drracket/drracket/private/rep.rkt index 8a59c8a616..23233c0412 100644 --- a/pkgs/drracket/drracket/private/rep.rkt +++ b/pkgs/drracket/drracket/private/rep.rkt @@ -206,8 +206,8 @@ TODO (add-drs-function "send-selection-to-repl-and-go" (λ (frame) (send frame send-selection-to-repl #t))) (add-drs-function "move-to-interactions" (λ (frame) (send frame move-to-interactions)))) - (send drs-bindings-keymap map-function "m:p" "jump-to-previous-error-loc") - (send drs-bindings-keymap map-function "m:n" "jump-to-next-error-loc") + (send drs-bindings-keymap map-function "~c:m:p" "jump-to-previous-error-loc") + (send drs-bindings-keymap map-function "~c:m:n" "jump-to-next-error-loc") (send drs-bindings-keymap map-function "esc;p" "jump-to-previous-error-loc") (send drs-bindings-keymap map-function "esc;n" "jump-to-next-error-loc") (send drs-bindings-keymap map-function "c:x;`" "jump-to-next-error-loc") @@ -229,7 +229,7 @@ TODO (format "a:~a" i) (format "show-tab-~a" i)) (send drs-bindings-keymap map-function - (format "m:~a" i) + (format "~c:m:~a" i) (format "show-tab-~a" i))) (define (get-drs-bindings-keymap) drs-bindings-keymap) diff --git a/pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt b/pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt index db0636d064..529f76110a 100644 --- a/pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt +++ b/pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt @@ -4,8 +4,8 @@ (keybinding "c:c;c:e" (lambda (ed evt) (send-toplevel-form ed #f))) (keybinding "c:c;c:r" (lambda (ed evt) (send-selection ed #f))) -(keybinding "c:c;m:e" (lambda (ed evt) (send-toplevel-form ed #t))) -(keybinding "c:c;m:r" (lambda (ed evt) (send-selection ed #t))) +(keybinding "c:c;~c:m:e" (lambda (ed evt) (send-toplevel-form ed #t))) +(keybinding "c:c;~c:m:r" (lambda (ed evt) (send-selection ed #t))) (define/contract (send-toplevel-form defs shift-focus?) (-> any/c boolean? any) diff --git a/pkgs/drracket/scribblings/drracket/keybindings.scrbl b/pkgs/drracket/scribblings/drracket/keybindings.scrbl index e7a969da39..5a1ce2706c 100644 --- a/pkgs/drracket/scribblings/drracket/keybindings.scrbl +++ b/pkgs/drracket/scribblings/drracket/keybindings.scrbl @@ -304,7 +304,7 @@ s-exp framework/keybinding-lang (apply string-append (map (λ (p) (case p - [(ctl) "c:"] [(cmd) "d:"] [(alt meta) "m:"] + [(ctl) "c:"] [(cmd) "d:"] [(alt meta) "~c:m:"] [(shift) "s:"] [(option) "a:"])) (get-default-shortcut-prefix)))) diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt index e5601705c1..5e60a5f00f 100644 --- a/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt +++ b/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt @@ -321,7 +321,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (make-meta-prefix-list key) - (list (string-append "m:" key) + (list (string-append "~c:m:" key) (string-append "ESC;" key))) (define send-map-function-meta @@ -1139,7 +1139,7 @@ (if shift? "s:" "") roman-char) (format "insert ~a" greek-char)) - (map (format "m:x;c:g;~a~a" + (map (format "~c:m:x;c:g;~a~a" (if shift? "s:" "") roman-char) (format "insert ~a" greek-char))