annotate lisp/term/common-win.el @ 111192:a514b8e891c0

* lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
author Glenn Morris <rgm@gnu.org>
date Tue, 26 Oct 2010 09:56:11 -0700
parents ed5bac97776a
children 8f6857157cb5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1 ;;; common-win.el --- common part of handling window systems
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
3 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
4 ;; 2008, 2009, 2010 Free Software Foundation, Inc.
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
6 ;; Maintainer: FSF
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
7 ;; Keywords: terminals
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
10
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
14 ;; (at your option) any later version.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
15
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
19 ;; GNU General Public License for more details.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
20
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
23
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24 ;;; Commentary:
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26 ;;; Code:
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27
111134
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
28 (defcustom x-select-enable-clipboard t
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
29 "Non-nil means cutting and pasting uses the clipboard.
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
30 This is in addition to, but in preference to, the primary selection.
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
31
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
32 Note that MS-Windows does not support selection types other than the
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
33 clipboard. (The primary selection that is set by Emacs is not
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
34 accessible to other programs on MS-Windows.)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
35
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
36 This variable is not used by the Nextstep port."
111134
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
37 :type 'boolean
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
38 :group 'killing
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
39 ;; The GNU/Linux version changed in 24.1, the MS-Windows version did not.
a3c68a313b81 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.
Glenn Morris <rgm@gnu.org>
parents: 108979
diff changeset
40 :version "24.1")
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
41
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
42 (defvar x-last-selected-text) ; w32-fns.el
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
43 (declare-function w32-set-clipboard-data "w32select.c"
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
44 (string &optional ignored))
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
45 (defvar ns-last-selected-text) ; ns-win.el
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
46 (declare-function ns-set-pasteboard "ns-win" (string))
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
47
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
48 (defun x-select-text (text)
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
49 "Select TEXT, a string, according to the window system.
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
50
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
51 On X, if `x-select-enable-clipboard' is non-nil, copy TEXT to the
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
52 clipboard. If `x-select-enable-primary' is non-nil, put TEXT in
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
53 the primary selection.
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
54
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
55 On MS-Windows, make TEXT the current selection. If
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
56 `x-select-enable-clipboard' is non-nil, copy the text to the
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
57 clipboard as well.
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
58
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
59 On Nextstep, put TEXT in the pasteboard (`x-select-enable-clipboard'
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
60 is not used)."
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
61 (cond ((eq system-type 'windows-nt)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
62 (if x-select-enable-clipboard
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
63 (w32-set-clipboard-data text))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
64 (setq x-last-selected-text text))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
65 ((featurep 'ns)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
66 ;; Don't send the pasteboard too much text.
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
67 ;; It becomes slow, and if really big it causes errors.
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
68 (ns-set-pasteboard text)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
69 (setq ns-last-selected-text text))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
70 (t
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
71 ;; With multi-tty, this function may be called from a tty frame.
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
72 (when (eq (framep (selected-frame)) 'x)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
73 (when x-select-enable-primary
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
74 (x-set-selection 'PRIMARY text)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
75 (setq x-last-selected-text-primary text))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
76 (when x-select-enable-clipboard
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
77 (x-set-selection 'CLIPBOARD text)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
78 (setq x-last-selected-text-clipboard text))))))
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
79
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
80 ;;;; Function keys
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
81
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
82 (defvar x-alternatives-map
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
83 (let ((map (make-sparse-keymap)))
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
84 ;; Map certain keypad keys into ASCII characters that people usually expect.
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
85 (define-key map [M-backspace] [?\M-\d])
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
86 (define-key map [M-delete] [?\M-\d])
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
87 (define-key map [M-tab] [?\M-\t])
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
88 (define-key map [M-linefeed] [?\M-\n])
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
89 (define-key map [M-clear] [?\M-\C-l])
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
90 (define-key map [M-return] [?\M-\C-m])
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
91 (define-key map [M-escape] [?\M-\e])
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
92 (unless (featurep 'ns)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
93 (define-key map [iso-lefttab] [backtab])
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
94 (define-key map [S-iso-lefttab] [backtab]))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
95 (and (or (eq system-type 'windows-nt)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
96 (featurep 'ns))
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
97 (define-key map [S-tab] [backtab]))
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
98 map)
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
99 "Keymap of possible alternative meanings for some keys.")
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
100
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
101 (defun x-setup-function-keys (frame)
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
102 "Set up `function-key-map' on the graphical frame FRAME."
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
103 ;; Don't do this twice on the same display, or it would break
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
104 ;; normal-erase-is-backspace-mode.
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
105 (unless (terminal-parameter frame 'x-setup-function-keys)
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
106 ;; Map certain keypad keys into ASCII characters that people usually expect.
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
107 (with-selected-frame frame
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
108 (let ((map (copy-keymap x-alternatives-map)))
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
109 (set-keymap-parent map (keymap-parent local-function-key-map))
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
110 (set-keymap-parent local-function-key-map map))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
111 (when (featurep 'ns)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
112 (setq interprogram-cut-function 'x-select-text
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
113 interprogram-paste-function 'x-selection-value
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
114 system-key-alist
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
115 (list
111191
ed5bac97776a * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 111185
diff changeset
116 ;; These are special "keys" used to pass events from C to lisp.
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
117 (cons (logior (lsh 0 16) 1) 'ns-power-off)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
118 (cons (logior (lsh 0 16) 2) 'ns-open-file)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
119 (cons (logior (lsh 0 16) 3) 'ns-open-temp-file)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
120 (cons (logior (lsh 0 16) 4) 'ns-drag-file)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
121 (cons (logior (lsh 0 16) 5) 'ns-drag-color)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
122 (cons (logior (lsh 0 16) 6) 'ns-drag-text)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
123 (cons (logior (lsh 0 16) 7) 'ns-change-font)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
124 (cons (logior (lsh 0 16) 8) 'ns-open-file-line)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
125 ;;; (cons (logior (lsh 0 16) 9) 'ns-insert-working-text)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
126 ;;; (cons (logior (lsh 0 16) 10) 'ns-delete-working-text)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
127 (cons (logior (lsh 0 16) 11) 'ns-spi-service-call)
111191
ed5bac97776a * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 111185
diff changeset
128 ;;; (cons (logior (lsh 0 16) 12) 'ns-new-frame)
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
129 (cons (logior (lsh 0 16) 13) 'ns-toggle-toolbar)
111191
ed5bac97776a * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 111185
diff changeset
130 ;;; (cons (logior (lsh 0 16) 14) 'ns-show-prefs)
ed5bac97776a * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 111185
diff changeset
131 ))))
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
132 (set-terminal-parameter frame 'x-setup-function-keys t)))
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
133
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
134 (defvar x-invocation-args)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
135
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
136 (defvar x-command-line-resources nil)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
137
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
138 ;; Handler for switches of the form "-switch value" or "-switch".
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
139 (defun x-handle-switch (switch &optional numeric)
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
140 (let ((aelt (assoc switch command-line-x-option-alist)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
141 (if aelt
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
142 (setq default-frame-alist
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
143 (cons (cons (nth 3 aelt)
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
144 (if numeric
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
145 (string-to-number (pop x-invocation-args))
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
146 (or (nth 4 aelt) (pop x-invocation-args))))
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
147 default-frame-alist)))))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
149 ;; Handler for switches of the form "-switch n"
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
150 (defun x-handle-numeric-switch (switch)
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
151 (x-handle-switch switch t))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
152
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
153 ;; Handle options that apply to initial frame only
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
154 (defun x-handle-initial-switch (switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
155 (let ((aelt (assoc switch command-line-x-option-alist)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
156 (if aelt
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
157 (setq initial-frame-alist
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
158 (cons (cons (nth 3 aelt)
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
159 (or (nth 4 aelt) (pop x-invocation-args)))
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
160 initial-frame-alist)))))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
161
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
162 ;; Make -iconic apply only to the initial frame!
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
163 (defun x-handle-iconic (switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
164 (setq initial-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
165 (cons '(visibility . icon) initial-frame-alist)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
166
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
167 ;; Handle the -xrm option.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
168 (defun x-handle-xrm-switch (switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
169 (unless (consp x-invocation-args)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
170 (error "%s: missing argument to `%s' option" (invocation-name) switch))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
171 (setq x-command-line-resources
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
172 (if (null x-command-line-resources)
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
173 (pop x-invocation-args)
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
174 (concat x-command-line-resources "\n" (pop x-invocation-args)))))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
175
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
176 (declare-function x-parse-geometry "frame.c" (string))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
177
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
178 ;; Handle the geometry option
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
179 (defun x-handle-geometry (switch)
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
180 (let* ((geo (x-parse-geometry (pop x-invocation-args)))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
181 (left (assq 'left geo))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
182 (top (assq 'top geo))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
183 (height (assq 'height geo))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
184 (width (assq 'width geo)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
185 (if (or height width)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
186 (setq default-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
187 (append default-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
188 '((user-size . t))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
189 (if height (list height))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
190 (if width (list width)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
191 initial-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
192 (append initial-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
193 '((user-size . t))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
194 (if height (list height))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
195 (if width (list width)))))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
196 (if (or left top)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
197 (setq initial-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
198 (append initial-frame-alist
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
199 '((user-position . t))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
200 (if left (list left))
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
201 (if top (list top)))))))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
202
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
203 (defvar x-resource-name)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
204
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
205 ;; Handle the -name option. Set the variable x-resource-name
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
206 ;; to the option's operand; set the name of
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
207 ;; the initial frame, too.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
208 (defun x-handle-name-switch (switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
209 (or (consp x-invocation-args)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
210 (error "%s: missing argument to `%s' option" (invocation-name) switch))
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
211 (setq x-resource-name (pop x-invocation-args)
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
212 initial-frame-alist (cons (cons 'name x-resource-name)
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
213 initial-frame-alist)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
214
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
215 (defvar x-display-name nil
104066
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
216 "The name of the window display on which Emacs was started.
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
217 On X, the display name of individual X frames is recorded in the
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
218 `display' frame parameter.")
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
219
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
220 (defun x-handle-display (switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
221 "Handle -display DISPLAY option."
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
222 (setq x-display-name (pop x-invocation-args))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
223 ;; Make subshell programs see the same DISPLAY value Emacs really uses.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
224 ;; Note that this isn't completely correct, since Emacs can use
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
225 ;; multiple displays. However, there is no way to tell an already
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
226 ;; running subshell which display the user is currently typing on.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
227 (setenv "DISPLAY" x-display-name))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
228
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
229 (defun x-handle-args (args)
111185
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
230 "Process the X (or Nextstep) related command line options in ARGS.
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
231 This is done before the user's startup file is loaded.
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
232 Copies the options in ARGS to `x-invocation-args'. It then extracts
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
233 the X (or Nextstep) options according to the handlers defined in
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
234 `command-line-x-option-alist' (or `command-line-ns-option-alist').
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
235 For example, `x-handle-switch' handles a switch like \"-fg\" and its
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
236 value \"black\". This function returns ARGS minus the arguments that
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
237 have been processed."
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
238 ;; We use ARGS to accumulate the args that we don't handle here, to return.
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
239 (setq x-invocation-args args ; FIXME let-bind?
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
240 args nil)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
241 (while (and x-invocation-args
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
242 (not (equal (car x-invocation-args) "--")))
111175
f900266d10a0 Simplifications for lisp/term/common-win.el
Glenn Morris <rgm@gnu.org>
parents: 111166
diff changeset
243 (let* ((this-switch (pop x-invocation-args))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
244 (orig-this-switch this-switch)
111185
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
245 (option-alist (if (featurep 'ns)
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
246 command-line-ns-option-alist
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
247 command-line-x-option-alist))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
248 completion argval aelt handler)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
249 ;; Check for long options with attached arguments
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
250 ;; and separate out the attached option argument into argval.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
251 (if (string-match "^--[^=]*=" this-switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
252 (setq argval (substring this-switch (match-end 0))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
253 this-switch (substring this-switch 0 (1- (match-end 0)))))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
254 ;; Complete names of long options.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
255 (if (string-match "^--" this-switch)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
256 (progn
111185
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
257 (setq completion (try-completion this-switch option-alist))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
258 (if (eq completion t)
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
259 ;; Exact match for long option.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
260 nil
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
261 (if (stringp completion)
111185
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
262 (let ((elt (assoc completion option-alist)))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
263 ;; Check for abbreviated long option.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
264 (or elt
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
265 (error "Option `%s' is ambiguous" this-switch))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
266 (setq this-switch completion))))))
111185
050a28bd1797 Remove ns-handle-* functions that duplicate x-handle-*.
Glenn Morris <rgm@gnu.org>
parents: 111183
diff changeset
267 (setq aelt (assoc this-switch option-alist))
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
268 (if aelt (setq handler (nth 2 aelt)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
269 (if handler
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
270 (if argval
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
271 (let ((x-invocation-args
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
272 (cons argval x-invocation-args)))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
273 (funcall handler this-switch))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
274 (funcall handler this-switch))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
275 (setq args (cons orig-this-switch args)))))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
276 (nconc (nreverse args) x-invocation-args))
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
277
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
278
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
279 ;;
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
280 ;; Available colors
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
281 ;;
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
282 ;; The ordering of the colors is chosen for the user's convenience in
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
283 ;; `list-colors-display', which displays the reverse of this list.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
284 ;; Roughly speaking, `list-colors-display' orders by (i) named shades
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
285 ;; of grey with hue 0.0, sorted by value (ii) named colors with
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
286 ;; saturation 1.0, sorted by hue, (iii) named non-white colors with
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
287 ;; saturation less than 1.0, sorted by hue, (iv) other named shades of
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
288 ;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
289 ;; of grey.
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
290
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
291 (declare-function ns-list-colors "nsfns.m" (&optional frame))
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
292
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
293 (defvar x-colors
111183
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
294 (if (featurep 'ns) (ns-list-colors)
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
295 (purecopy
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
296 '("gray100" "grey100" "gray99" "grey99" "gray98" "grey98" "gray97"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
297 "grey97" "gray96" "grey96" "gray95" "grey95" "gray94" "grey94"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
298 "gray93" "grey93" "gray92" "grey92" "gray91" "grey91" "gray90"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
299 "grey90" "gray89" "grey89" "gray88" "grey88" "gray87" "grey87"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
300 "gray86" "grey86" "gray85" "grey85" "gray84" "grey84" "gray83"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
301 "grey83" "gray82" "grey82" "gray81" "grey81" "gray80" "grey80"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
302 "gray79" "grey79" "gray78" "grey78" "gray77" "grey77" "gray76"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
303 "grey76" "gray75" "grey75" "gray74" "grey74" "gray73" "grey73"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
304 "gray72" "grey72" "gray71" "grey71" "gray70" "grey70" "gray69"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
305 "grey69" "gray68" "grey68" "gray67" "grey67" "gray66" "grey66"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
306 "gray65" "grey65" "gray64" "grey64" "gray63" "grey63" "gray62"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
307 "grey62" "gray61" "grey61" "gray60" "grey60" "gray59" "grey59"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
308 "gray58" "grey58" "gray57" "grey57" "gray56" "grey56" "gray55"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
309 "grey55" "gray54" "grey54" "gray53" "grey53" "gray52" "grey52"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
310 "gray51" "grey51" "gray50" "grey50" "gray49" "grey49" "gray48"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
311 "grey48" "gray47" "grey47" "gray46" "grey46" "gray45" "grey45"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
312 "gray44" "grey44" "gray43" "grey43" "gray42" "grey42" "gray41"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
313 "grey41" "gray40" "grey40" "gray39" "grey39" "gray38" "grey38"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
314 "gray37" "grey37" "gray36" "grey36" "gray35" "grey35" "gray34"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
315 "grey34" "gray33" "grey33" "gray32" "grey32" "gray31" "grey31"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
316 "gray30" "grey30" "gray29" "grey29" "gray28" "grey28" "gray27"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
317 "grey27" "gray26" "grey26" "gray25" "grey25" "gray24" "grey24"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
318 "gray23" "grey23" "gray22" "grey22" "gray21" "grey21" "gray20"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
319 "grey20" "gray19" "grey19" "gray18" "grey18" "gray17" "grey17"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
320 "gray16" "grey16" "gray15" "grey15" "gray14" "grey14" "gray13"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
321 "grey13" "gray12" "grey12" "gray11" "grey11" "gray10" "grey10"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
322 "gray9" "grey9" "gray8" "grey8" "gray7" "grey7" "gray6" "grey6"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
323 "gray5" "grey5" "gray4" "grey4" "gray3" "grey3" "gray2" "grey2"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
324 "gray1" "grey1" "gray0" "grey0"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
325 "LightPink1" "LightPink2" "LightPink3" "LightPink4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
326 "pink1" "pink2" "pink3" "pink4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
327 "PaleVioletRed1" "PaleVioletRed2" "PaleVioletRed3" "PaleVioletRed4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
328 "LavenderBlush1" "LavenderBlush2" "LavenderBlush3" "LavenderBlush4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
329 "VioletRed1" "VioletRed2" "VioletRed3" "VioletRed4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
330 "HotPink1" "HotPink2" "HotPink3" "HotPink4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
331 "DeepPink1" "DeepPink2" "DeepPink3" "DeepPink4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
332 "maroon1" "maroon2" "maroon3" "maroon4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
333 "orchid1" "orchid2" "orchid3" "orchid4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
334 "plum1" "plum2" "plum3" "plum4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
335 "thistle1" "thistle2" "thistle3" "thistle4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
336 "MediumOrchid1" "MediumOrchid2" "MediumOrchid3" "MediumOrchid4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
337 "DarkOrchid1" "DarkOrchid2" "DarkOrchid3" "DarkOrchid4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
338 "purple1" "purple2" "purple3" "purple4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
339 "MediumPurple1" "MediumPurple2" "MediumPurple3" "MediumPurple4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
340 "SlateBlue1" "SlateBlue2" "SlateBlue3" "SlateBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
341 "RoyalBlue1" "RoyalBlue2" "RoyalBlue3" "RoyalBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
342 "LightSteelBlue1" "LightSteelBlue2" "LightSteelBlue3" "LightSteelBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
343 "SlateGray1" "SlateGray2" "SlateGray3" "SlateGray4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
344 "DodgerBlue1" "DodgerBlue2" "DodgerBlue3" "DodgerBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
345 "SteelBlue1" "SteelBlue2" "SteelBlue3" "SteelBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
346 "SkyBlue1" "SkyBlue2" "SkyBlue3" "SkyBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
347 "LightSkyBlue1" "LightSkyBlue2" "LightSkyBlue3" "LightSkyBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
348 "LightBlue1" "LightBlue2" "LightBlue3" "LightBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
349 "CadetBlue1" "CadetBlue2" "CadetBlue3" "CadetBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
350 "azure1" "azure2" "azure3" "azure4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
351 "LightCyan1" "LightCyan2" "LightCyan3" "LightCyan4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
352 "PaleTurquoise1" "PaleTurquoise2" "PaleTurquoise3" "PaleTurquoise4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
353 "DarkSlateGray1" "DarkSlateGray2" "DarkSlateGray3" "DarkSlateGray4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
354 "aquamarine1" "aquamarine2" "aquamarine3" "aquamarine4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
355 "SeaGreen1" "SeaGreen2" "SeaGreen3" "SeaGreen4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
356 "honeydew1" "honeydew2" "honeydew3" "honeydew4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
357 "DarkSeaGreen1" "DarkSeaGreen2" "DarkSeaGreen3" "DarkSeaGreen4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
358 "PaleGreen1" "PaleGreen2" "PaleGreen3" "PaleGreen4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
359 "DarkOliveGreen1" "DarkOliveGreen2" "DarkOliveGreen3" "DarkOliveGreen4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
360 "OliveDrab1" "OliveDrab2" "OliveDrab3" "OliveDrab4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
361 "ivory1" "ivory2" "ivory3" "ivory4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
362 "LightYellow1" "LightYellow2" "LightYellow3" "LightYellow4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
363 "khaki1" "khaki2" "khaki3" "khaki4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
364 "LemonChiffon1" "LemonChiffon2" "LemonChiffon3" "LemonChiffon4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
365 "LightGoldenrod1" "LightGoldenrod2" "LightGoldenrod3" "LightGoldenrod4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
366 "cornsilk1" "cornsilk2" "cornsilk3" "cornsilk4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
367 "goldenrod1" "goldenrod2" "goldenrod3" "goldenrod4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
368 "DarkGoldenrod1" "DarkGoldenrod2" "DarkGoldenrod3" "DarkGoldenrod4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
369 "wheat1" "wheat2" "wheat3" "wheat4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
370 "NavajoWhite1" "NavajoWhite2" "NavajoWhite3" "NavajoWhite4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
371 "burlywood1" "burlywood2" "burlywood3" "burlywood4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
372 "AntiqueWhite1" "AntiqueWhite2" "AntiqueWhite3" "AntiqueWhite4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
373 "bisque1" "bisque2" "bisque3" "bisque4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
374 "tan1" "tan2" "tan3" "tan4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
375 "PeachPuff1" "PeachPuff2" "PeachPuff3" "PeachPuff4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
376 "seashell1" "seashell2" "seashell3" "seashell4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
377 "chocolate1" "chocolate2" "chocolate3" "chocolate4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
378 "sienna1" "sienna2" "sienna3" "sienna4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
379 "LightSalmon1" "LightSalmon2" "LightSalmon3" "LightSalmon4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
380 "salmon1" "salmon2" "salmon3" "salmon4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
381 "coral1" "coral2" "coral3" "coral4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
382 "tomato1" "tomato2" "tomato3" "tomato4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
383 "MistyRose1" "MistyRose2" "MistyRose3" "MistyRose4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
384 "snow1" "snow2" "snow3" "snow4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
385 "RosyBrown1" "RosyBrown2" "RosyBrown3" "RosyBrown4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
386 "IndianRed1" "IndianRed2" "IndianRed3" "IndianRed4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
387 "firebrick1" "firebrick2" "firebrick3" "firebrick4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
388 "brown1" "brown2" "brown3" "brown4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
389 "magenta1" "magenta2" "magenta3" "magenta4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
390 "blue1" "blue2" "blue3" "blue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
391 "DeepSkyBlue1" "DeepSkyBlue2" "DeepSkyBlue3" "DeepSkyBlue4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
392 "turquoise1" "turquoise2" "turquoise3" "turquoise4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
393 "cyan1" "cyan2" "cyan3" "cyan4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
394 "SpringGreen1" "SpringGreen2" "SpringGreen3" "SpringGreen4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
395 "green1" "green2" "green3" "green4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
396 "chartreuse1" "chartreuse2" "chartreuse3" "chartreuse4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
397 "yellow1" "yellow2" "yellow3" "yellow4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
398 "gold1" "gold2" "gold3" "gold4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
399 "orange1" "orange2" "orange3" "orange4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
400 "DarkOrange1" "DarkOrange2" "DarkOrange3" "DarkOrange4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
401 "OrangeRed1" "OrangeRed2" "OrangeRed3" "OrangeRed4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
402 "red1" "red2" "red3" "red4"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
403 "lavender blush" "LavenderBlush" "ghost white" "GhostWhite"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
404 "lavender" "alice blue" "AliceBlue" "azure" "light cyan"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
405 "LightCyan" "mint cream" "MintCream" "honeydew" "ivory"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
406 "light goldenrod yellow" "LightGoldenrodYellow" "light yellow"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
407 "LightYellow" "beige" "floral white" "FloralWhite" "old lace"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
408 "OldLace" "blanched almond" "BlanchedAlmond" "moccasin"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
409 "papaya whip" "PapayaWhip" "bisque" "antique white"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
410 "AntiqueWhite" "linen" "peach puff" "PeachPuff" "seashell"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
411 "misty rose" "MistyRose" "snow" "light pink" "LightPink" "pink"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
412 "hot pink" "HotPink" "deep pink" "DeepPink" "maroon"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
413 "pale violet red" "PaleVioletRed" "violet red" "VioletRed"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
414 "medium violet red" "MediumVioletRed" "violet" "plum" "thistle"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
415 "orchid" "medium orchid" "MediumOrchid" "dark orchid"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
416 "DarkOrchid" "purple" "blue violet" "BlueViolet" "medium purple"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
417 "MediumPurple" "light slate blue" "LightSlateBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
418 "medium slate blue" "MediumSlateBlue" "slate blue" "SlateBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
419 "dark slate blue" "DarkSlateBlue" "midnight blue" "MidnightBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
420 "navy" "navy blue" "NavyBlue" "dark blue" "DarkBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
421 "light steel blue" "LightSteelBlue" "cornflower blue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
422 "CornflowerBlue" "dodger blue" "DodgerBlue" "royal blue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
423 "RoyalBlue" "light slate gray" "light slate grey"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
424 "LightSlateGray" "LightSlateGrey" "slate gray" "slate grey"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
425 "SlateGray" "SlateGrey" "dark slate gray" "dark slate grey"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
426 "DarkSlateGray" "DarkSlateGrey" "steel blue" "SteelBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
427 "cadet blue" "CadetBlue" "light sky blue" "LightSkyBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
428 "sky blue" "SkyBlue" "light blue" "LightBlue" "powder blue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
429 "PowderBlue" "pale turquoise" "PaleTurquoise" "turquoise"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
430 "medium turquoise" "MediumTurquoise" "dark turquoise"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
431 "DarkTurquoise" "dark cyan" "DarkCyan" "aquamarine"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
432 "medium aquamarine" "MediumAquamarine" "light sea green"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
433 "LightSeaGreen" "medium sea green" "MediumSeaGreen" "sea green"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
434 "SeaGreen" "dark sea green" "DarkSeaGreen" "pale green"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
435 "PaleGreen" "lime green" "LimeGreen" "dark green" "DarkGreen"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
436 "forest green" "ForestGreen" "light green" "LightGreen"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
437 "green yellow" "GreenYellow" "yellow green" "YellowGreen"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
438 "olive drab" "OliveDrab" "dark olive green" "DarkOliveGreen"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
439 "lemon chiffon" "LemonChiffon" "khaki" "dark khaki" "DarkKhaki"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
440 "cornsilk" "pale goldenrod" "PaleGoldenrod" "light goldenrod"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
441 "LightGoldenrod" "goldenrod" "dark goldenrod" "DarkGoldenrod"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
442 "wheat" "navajo white" "NavajoWhite" "tan" "burlywood"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
443 "sandy brown" "SandyBrown" "peru" "chocolate" "saddle brown"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
444 "SaddleBrown" "sienna" "rosy brown" "RosyBrown" "dark salmon"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
445 "DarkSalmon" "coral" "tomato" "light salmon" "LightSalmon"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
446 "salmon" "light coral" "LightCoral" "indian red" "IndianRed"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
447 "firebrick" "brown" "dark red" "DarkRed" "magenta"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
448 "dark magenta" "DarkMagenta" "dark violet" "DarkViolet"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
449 "medium blue" "MediumBlue" "blue" "deep sky blue" "DeepSkyBlue"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
450 "cyan" "medium spring green" "MediumSpringGreen" "spring green"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
451 "SpringGreen" "green" "lawn green" "LawnGreen" "chartreuse"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
452 "yellow" "gold" "orange" "dark orange" "DarkOrange" "orange red"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
453 "OrangeRed" "red" "white" "white smoke" "WhiteSmoke" "gainsboro"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
454 "light gray" "light grey" "LightGray" "LightGrey" "gray" "grey"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
455 "dark gray" "dark grey" "DarkGray" "DarkGrey" "dim gray"
72ef880ed198 Let ns load common-win.
Glenn Morris <rgm@gnu.org>
parents: 111175
diff changeset
456 "dim grey" "DimGray" "DimGrey" "black")))
104066
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
457 "List of basic colors available on color displays.
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
458 For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
459 For Nextstep, this is a list of non-PANTONE colors returned by
b564cde0cb8b Fix Bug#3888:
Eli Zaretskii <eliz@gnu.org>
parents: 100908
diff changeset
460 the operating system.")
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
461
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
462 (defvar w32-color-map)
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
463
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
464 (defun xw-defined-colors (&optional frame)
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
465 "Internal function called by `defined-colors', which see."
111192
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
466 (if (featurep 'ns)
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
467 x-colors
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
468 (or frame (setq frame (selected-frame)))
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
469 (let (defined-colors)
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
470 (dolist (this-color (if (eq system-type 'windows-nt)
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
471 (or (mapcar 'car w32-color-map) x-colors)
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
472 x-colors))
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
473 (and (color-supported-p this-color frame t)
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
474 (setq defined-colors (cons this-color defined-colors))))
a514b8e891c0 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.
Glenn Morris <rgm@gnu.org>
parents: 111191
diff changeset
475 defined-colors)))
111166
6cf6c01cf9bf Move some more shared x-, w32- things to common-win.
Glenn Morris <rgm@gnu.org>
parents: 111134
diff changeset
476
96830
a8aac59d9c7a * term/x-win.el (x-handle-switch, x-handle-numeric-switch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
477 ;;; common-win.el ends here