Mercurial > hg > xemacs-beta
annotate lisp/tty-init.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 16:51:25 -0600 |
| parents | c786c3fd0740 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; tty-init.el --- initialization code for tty's |
| 2 | |
| 3 ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1996 Ben Wing <ben@xemacs.org>. | |
| 5 | |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: terminals, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify | |
| 12 ;; it under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, | |
| 17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 19 ;; GNU General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: Not synched. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when TTY support is compiled in). | |
| 31 | |
| 32 ;;; Code: | |
| 33 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
34 (defvar make-device-early-tty-entry-point-called-p nil |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
35 "Whether `make-device-early-tty-entry-point' has been called, at least once.") |
| 428 | 36 |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
37 (defun make-device-early-tty-entry-point () |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
38 "Entry point to set up the Lisp environment for TTY device creation." |
| 502 | 39 (with-fboundp 'register-tty-color |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
40 (unless make-device-early-tty-entry-point-called-p |
| 502 | 41 (register-tty-color "black" "\e[30m" "\e[40m") |
| 42 (register-tty-color "red" "\e[31m" "\e[41m") | |
| 43 (register-tty-color "green" "\e[32m" "\e[42m") | |
| 44 (register-tty-color "yellow" "\e[33m" "\e[43m") | |
| 45 (register-tty-color "blue" "\e[34m" "\e[44m") | |
| 46 (register-tty-color "magenta" "\e[35m" "\e[45m") | |
| 47 (register-tty-color "cyan" "\e[36m" "\e[46m") | |
| 48 (register-tty-color "white" "\e[37m" "\e[47m") | |
| 428 | 49 |
| 502 | 50 ;; Define `highlighted' tty colors |
| 51 (register-tty-color "darkgrey" "\e[1;30m" "\e[1;40m") | |
| 52 (register-tty-color "brightred" "\e[1;31m" "\e[1;41m") | |
| 53 (register-tty-color "brightgreen" "\e[1;32m" "\e[1;42m") | |
| 54 (register-tty-color "brightyellow" "\e[1;33m" "\e[1;43m") | |
| 55 (register-tty-color "brightblue" "\e[1;34m" "\e[1;44m") | |
| 56 (register-tty-color "brightmagenta" "\e[1;35m" "\e[1;45m") | |
| 57 (register-tty-color "brightcyan" "\e[1;36m" "\e[1;46m") | |
| 58 (register-tty-color "brightwhite" "\e[1;37m" "\e[1;47m") | |
| 428 | 59 |
|
4605
c786c3fd0740
Listen to the byte-compiler, core Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
60 (setq make-device-early-tty-entry-point-called-p t)))) |
| 428 | 61 |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
62 ;; We have to do this for every created TTY console, after the first frame |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
63 ;; has been created. |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
64 (defun make-frame-after-init-entry-point (console) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
65 "Entry point for Lisp called after first frame creation on a TTY device." |
| 428 | 66 ;; load the appropriate term-type-specific Lisp file. |
| 67 ;; we don't do this at startup here so that the user can | |
| 68 ;; override term-file-prefix. (startup.el does it after | |
| 69 ;; loading the init file.) | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
70 (when (and (find-coding-system 'euc-jp) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
71 (string-match "^kterm" (getenv "TERM"))) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
72 (set-console-tty-coding-system console 'euc-jp)) |
| 428 | 73 (when init-file-loaded |
| 74 ;; temporarily select the console so that the changes | |
| 75 ;; to function-key-map are made for the right console. | |
| 76 (let ((foobar (selected-console))) | |
| 77 (unwind-protect | |
| 78 (progn | |
| 79 (select-console console) | |
| 80 (load-terminal-library)) | |
| 81 (select-console foobar))))) | |
| 82 | |
| 83 (defun make-frame-on-tty (tty &optional props) | |
| 84 "Create a frame on the TTY connection named TTY. | |
| 85 TTY should be a TTY device name such as \"/dev/ttyp3\" (as returned by | |
| 86 the `tty' command in that TTY), or nil for the standard input/output | |
| 87 of the running XEmacs process. | |
| 88 | |
| 89 PROPS should be a plist of properties, as in the call to `make-frame'. | |
| 90 | |
| 91 This function opens a connection to the TTY or reuses an existing | |
| 92 connection. | |
| 93 | |
| 94 This function is a trivial wrapper around `make-frame-on-device'." | |
| 95 (interactive "sMake frame on TTY: ") | |
| 96 (if (equal tty "") (setq tty nil)) | |
| 97 (make-frame-on-device 'tty tty props)) | |
| 98 | |
| 99 ;;; tty-init.el ends here |