Mercurial > hg > xemacs-beta
annotate lisp/tty-init.el @ 5047:07dcc7000bbf
put width before height consistently, fix a real bug found in the process
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* faces.c (default_face_font_info):
* faces.c (default_face_width_and_height):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-gtk.c (gtk_recompute_cell_sizes):
* frame.c:
* frame.c (frame_conversion_internal_1):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-widget.c (widget_instantiate):
* glyphs-widget.c (tree_view_query_geometry):
* glyphs-widget.c (Fwidget_logical_to_character_width):
* glyphs-widget.c (Fwidget_logical_to_character_height):
* indent.c (vmotion_pixels):
* redisplay-output.c (get_cursor_size_and_location):
* redisplay-xlike-inc.c (XLIKE_output_eol_cursor):
* redisplay-xlike-inc.c (XLIKE_flash):
* redisplay.c (calculate_baseline):
* redisplay.c (start_with_point_on_display_line):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* window.c (margin_width_internal):
* window.c (frame_size_valid_p):
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
* window.c (set_window_pixsize):
* window.c (window_pixel_height_to_char_height):
* window.c (window_char_height_to_pixel_height):
* window.c (window_displayed_height):
* window.c (window_pixel_width_to_char_width):
* window.c (window_char_width_to_pixel_width):
* window.c (change_window_height):
* window.c (window_scroll):
* window.h:
IMPORTANT: Aidan and Carbon Repo, please pay attention and fix
appropriately!
Rename: default_face_height_and_width -> default_face_width_and_height
and reverse width/height arguments.
Reverse width/height arguments to the following functions:
-- default_face_font_info
-- default_face_height_and_width (see above)
-- check_frame_size
-- frame_size_valid_p (made into a static function)
Fix a redisplay bug where args to default_face_height_and_width
were in the wrong order.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 20 Feb 2010 18:56:01 -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 |