X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d7d8c62a57e7b4ff8625bccf4e95f8fac7763b26..acaf905b1130aae80fa59d2c861ffd4c8eb75486:/lisp/term/common-win.el diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el index 98baf82671..067b996d1f 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el @@ -1,7 +1,6 @@ ;;; common-win.el --- common part of handling window systems -;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: terminals @@ -113,6 +112,7 @@ is not used)." interprogram-paste-function 'x-selection-value system-key-alist (list + ;; These are special "keys" used to pass events from C to lisp. (cons (logior (lsh 0 16) 1) 'ns-power-off) (cons (logior (lsh 0 16) 2) 'ns-open-file) (cons (logior (lsh 0 16) 3) 'ns-open-temp-file) @@ -127,97 +127,7 @@ is not used)." (cons (logior (lsh 0 16) 12) 'ns-new-frame) (cons (logior (lsh 0 16) 13) 'ns-toggle-toolbar) (cons (logior (lsh 0 16) 14) 'ns-show-prefs) - (cons (logior (lsh 1 16) 32) 'f1) - (cons (logior (lsh 1 16) 33) 'f2) - (cons (logior (lsh 1 16) 34) 'f3) - (cons (logior (lsh 1 16) 35) 'f4) - (cons (logior (lsh 1 16) 36) 'f5) - (cons (logior (lsh 1 16) 37) 'f6) - (cons (logior (lsh 1 16) 38) 'f7) - (cons (logior (lsh 1 16) 39) 'f8) - (cons (logior (lsh 1 16) 40) 'f9) - (cons (logior (lsh 1 16) 41) 'f10) - (cons (logior (lsh 1 16) 42) 'f11) - (cons (logior (lsh 1 16) 43) 'f12) - (cons (logior (lsh 1 16) 44) 'kp-insert) - (cons (logior (lsh 1 16) 45) 'kp-delete) - (cons (logior (lsh 1 16) 46) 'kp-home) - (cons (logior (lsh 1 16) 47) 'kp-end) - (cons (logior (lsh 1 16) 48) 'kp-prior) - (cons (logior (lsh 1 16) 49) 'kp-next) - (cons (logior (lsh 1 16) 50) 'print-screen) - (cons (logior (lsh 1 16) 51) 'scroll-lock) - (cons (logior (lsh 1 16) 52) 'pause) - (cons (logior (lsh 1 16) 53) 'system) - (cons (logior (lsh 1 16) 54) 'break) - ;; Erm, this looks like a FIXME... - (cons (logior (lsh 1 16) 56) - 'please-tell-carl-what-this-key-is-called-56) - (cons (logior (lsh 1 16) 61) - 'please-tell-carl-what-this-key-is-called-61) - (cons (logior (lsh 1 16) 62) - 'please-tell-carl-what-this-key-is-called-62) - (cons (logior (lsh 1 16) 63) - 'please-tell-carl-what-this-key-is-called-63) - (cons (logior (lsh 1 16) 64) - 'please-tell-carl-what-this-key-is-called-64) - (cons (logior (lsh 1 16) 69) - 'please-tell-carl-what-this-key-is-called-69) - (cons (logior (lsh 1 16) 70) - 'please-tell-carl-what-this-key-is-called-70) - (cons (logior (lsh 1 16) 71) - 'please-tell-carl-what-this-key-is-called-71) - (cons (logior (lsh 1 16) 72) - 'please-tell-carl-what-this-key-is-called-72) - (cons (logior (lsh 1 16) 73) - 'please-tell-carl-what-this-key-is-called-73) - (cons (logior (lsh 2 16) 3) 'kp-enter) - (cons (logior (lsh 2 16) 9) 'kp-tab) - (cons (logior (lsh 2 16) 28) 'kp-quit) - (cons (logior (lsh 2 16) 35) 'kp-hash) - (cons (logior (lsh 2 16) 42) 'kp-multiply) - (cons (logior (lsh 2 16) 43) 'kp-add) - (cons (logior (lsh 2 16) 44) 'kp-separator) - (cons (logior (lsh 2 16) 45) 'kp-subtract) - (cons (logior (lsh 2 16) 46) 'kp-decimal) - (cons (logior (lsh 2 16) 47) 'kp-divide) - (cons (logior (lsh 2 16) 48) 'kp-0) - (cons (logior (lsh 2 16) 49) 'kp-1) - (cons (logior (lsh 2 16) 50) 'kp-2) - (cons (logior (lsh 2 16) 51) 'kp-3) - (cons (logior (lsh 2 16) 52) 'kp-4) - (cons (logior (lsh 2 16) 53) 'kp-5) - (cons (logior (lsh 2 16) 54) 'kp-6) - (cons (logior (lsh 2 16) 55) 'kp-7) - (cons (logior (lsh 2 16) 56) 'kp-8) - (cons (logior (lsh 2 16) 57) 'kp-9) - (cons (logior (lsh 2 16) 60) 'kp-less) - (cons (logior (lsh 2 16) 61) 'kp-equal) - (cons (logior (lsh 2 16) 62) 'kp-more) - (cons (logior (lsh 2 16) 64) 'kp-at) - (cons (logior (lsh 2 16) 92) 'kp-backslash) - (cons (logior (lsh 2 16) 96) 'kp-backtick) - (cons (logior (lsh 2 16) 124) 'kp-bar) - (cons (logior (lsh 2 16) 126) 'kp-tilde) - (cons (logior (lsh 2 16) 157) 'kp-mu) - (cons (logior (lsh 2 16) 165) 'kp-yen) - (cons (logior (lsh 2 16) 167) 'kp-paragraph) - (cons (logior (lsh 2 16) 172) 'left) - (cons (logior (lsh 2 16) 173) 'up) - (cons (logior (lsh 2 16) 174) 'right) - (cons (logior (lsh 2 16) 175) 'down) - (cons (logior (lsh 2 16) 176) 'kp-ring) - (cons (logior (lsh 2 16) 201) 'kp-square) - (cons (logior (lsh 2 16) 204) 'kp-cube) - (cons (logior (lsh 3 16) 8) 'backspace) - (cons (logior (lsh 3 16) 9) 'tab) - (cons (logior (lsh 3 16) 10) 'linefeed) - (cons (logior (lsh 3 16) 11) 'clear) - (cons (logior (lsh 3 16) 13) 'return) - (cons (logior (lsh 3 16) 18) 'pause) - (cons (logior (lsh 3 16) 25) 'S-tab) - (cons (logior (lsh 3 16) 27) 'escape) - (cons (logior (lsh 3 16) 127) 'delete))))) + )))) (set-terminal-parameter frame 'x-setup-function-keys t))) (defvar x-invocation-args) @@ -371,11 +281,11 @@ have been processed." ;; The ordering of the colors is chosen for the user's convenience in ;; `list-colors-display', which displays the reverse of this list. ;; Roughly speaking, `list-colors-display' orders by (i) named shades -;; of grey with hue 0.0, sorted by value (ii) named colors with +;; of gray with hue 0.0, sorted by value (ii) named colors with ;; saturation 1.0, sorted by hue, (iii) named non-white colors with ;; saturation less than 1.0, sorted by hue, (iv) other named shades of ;; white, (v) numbered colors sorted by hue, and (vi) numbered shades -;; of grey. +;; of gray. (declare-function ns-list-colors "nsfns.m" (&optional frame)) @@ -552,15 +462,15 @@ the operating system.") (defun xw-defined-colors (&optional frame) "Internal function called by `defined-colors', which see." - (or frame (setq frame (selected-frame))) - ;; FIXME for ns, this is just... x-colors. - (let (defined-colors) - (dolist (this-color (if (eq system-type 'windows-nt) - (or (mapcar 'car w32-color-map) x-colors) - x-colors)) - (and (or (color-supported-p this-color frame t) - (featurep 'ns)) - (setq defined-colors (cons this-color defined-colors)))) - defined-colors)) + (if (featurep 'ns) + x-colors + (or frame (setq frame (selected-frame))) + (let (defined-colors) + (dolist (this-color (if (eq system-type 'windows-nt) + (or (mapcar 'car w32-color-map) x-colors) + x-colors)) + (and (color-supported-p this-color frame t) + (setq defined-colors (cons this-color defined-colors)))) + defined-colors))) ;;; common-win.el ends here