Mercurial > hg > xemacs-beta
annotate lisp/tty-init.el @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Mar 2010 05:07:47 -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 |