Mercurial > emacs
view lisp/disp-table.el @ 92109:4d9fc08769fa
Consolidate the image_cache to the terminal struct.
* termhooks.h (P_): Remove redundant def.
(struct terminal): New field `image_cache'.
* frame.h (FRAME_IMAGE_CACHE): New macro. Use it everywhere in place
of FRAME_X_IMAGE_CACHE.
* xterm.h (struct x_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* w32term.h (struct w32_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* macterm.h (struct mac_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* xterm.c (x_term_init):
* w32term.c (w32_term_init):
* macterm.c (mac_term_init): Set the image_cache in the terminal.
* dispextern.h (clear_image_cache, forall_images_in_image_cache):
Remove declarations.
(clear_image_caches, mark_image_cache): New declarations.
* xfaces.c (clear_face_cache):
* xdisp.c (redisplay_internal): Use clear_image_caches.
* image.c (clear_image_cache): Don't check that a frame is on
a window-system before checking if it shares the same cache.
(clear_image_caches): New function.
(Fclear_image_cache): Use it.
(mark_image): Move from allo.c.
(mark_image_cache): Move from alloc.c and forall_images_in_image_cache.
* alloc.c (mark_image, mark_image_cache): Move to image.c.
(mark_object): Don't call mark_image_cache for frames.
(mark_terminals): Call mark_image_cache.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 22 Feb 2008 17:42:09 +0000 |
parents | 606f2d163a64 |
children | 7898dbba29fe |
line wrap: on
line source
;;; disp-table.el --- functions for dealing with char tables ;; Copyright (C) 1987, 1994, 1995, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> ;; Based on a previous version by Howard Gayle ;; Maintainer: FSF ;; Keywords: i18n ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: (put 'display-table 'char-table-extra-slots 6) ;;;###autoload (defun make-display-table () "Return a new, empty display table." (make-char-table 'display-table nil)) (or standard-display-table (setq standard-display-table (make-display-table))) ;;; Display-table slot names. The property value says which slot. (put 'truncation 'display-table-slot 0) (put 'wrap 'display-table-slot 1) (put 'escape 'display-table-slot 2) (put 'control 'display-table-slot 3) (put 'selective-display 'display-table-slot 4) (put 'vertical-border 'display-table-slot 5) ;;;###autoload (defun display-table-slot (display-table slot) "Return the value of the extra slot in DISPLAY-TABLE named SLOT. SLOT may be a number from 0 to 5 inclusive, or a slot name (symbol). Valid symbols are `truncation', `wrap', `escape', `control', `selective-display', and `vertical-border'." (let ((slot-number (if (numberp slot) slot (or (get slot 'display-table-slot) (error "Invalid display-table slot name: %s" slot))))) (char-table-extra-slot display-table slot-number))) ;;;###autoload (defun set-display-table-slot (display-table slot value) "Set the value of the extra slot in DISPLAY-TABLE named SLOT to VALUE. SLOT may be a number from 0 to 5 inclusive, or a name (symbol). Valid symbols are `truncation', `wrap', `escape', `control', `selective-display', and `vertical-border'." (let ((slot-number (if (numberp slot) slot (or (get slot 'display-table-slot) (error "Invalid display-table slot name: %s" slot))))) (set-char-table-extra-slot display-table slot-number value))) ;;;###autoload (defun describe-display-table (dt) "Describe the display table DT in a help buffer." (with-help-window "*Help*" (princ "\nTruncation glyph: ") (prin1 (display-table-slot dt 'truncation)) (princ "\nWrap glyph: ") (prin1 (display-table-slot dt 'wrap)) (princ "\nEscape glyph: ") (prin1 (display-table-slot dt 'escape)) (princ "\nCtrl glyph: ") (prin1 (display-table-slot dt 'control)) (princ "\nSelective display glyph sequence: ") (prin1 (display-table-slot dt 'selective-display)) (princ "\nVertical window border glyph: ") (prin1 (display-table-slot dt 'vertical-border)) (princ "\nCharacter display glyph sequences:\n") (save-excursion (set-buffer standard-output) (let ((vector (make-vector 256 nil)) (i 0)) (while (< i 256) (aset vector i (aref dt i)) (setq i (1+ i))) (describe-vector vector)) (help-mode)))) ;;;###autoload (defun describe-current-display-table () "Describe the display table in use in the selected window and buffer." (interactive) (let ((disptab (or (window-display-table (selected-window)) buffer-display-table standard-display-table))) (if disptab (describe-display-table disptab) (message "No display table")))) ;;;###autoload (defun standard-display-8bit (l h) "Display characters in the range L to H literally." (or standard-display-table (setq standard-display-table (make-display-table))) (while (<= l h) (aset standard-display-table l (if (or (< l ?\s) (>= l 127)) (vector l))) (setq l (1+ l)))) ;;;###autoload (defun standard-display-default (l h) "Display characters in the range L to H using the default notation." (or standard-display-table (setq standard-display-table (make-display-table))) (while (<= l h) (if (and (>= l ?\s) (characterp l)) (aset standard-display-table l nil)) (setq l (1+ l)))) ;; This function does NOT take terminal-dependent escape sequences. ;; For that, you need to go through create-glyph. Use one of the ;; other functions below, or roll your own. ;;;###autoload (defun standard-display-ascii (c s) "Display character C using printable string S." (or standard-display-table (setq standard-display-table (make-display-table))) (aset standard-display-table c (vconcat s))) ;;;###autoload (defun standard-display-g1 (c sc) "Display character C as character SC in the g1 character set. This function assumes that your terminal uses the SO/SI characters; it is meaningless for an X frame." (if (memq window-system '(x w32 mac)) (error "Cannot use string glyphs in a windowing system")) (or standard-display-table (setq standard-display-table (make-display-table))) (aset standard-display-table c (vector (create-glyph (concat "\016" (char-to-string sc) "\017"))))) ;;;###autoload (defun standard-display-graphic (c gc) "Display character C as character GC in graphics character set. This function assumes VT100-compatible escapes; it is meaningless for an X frame." (if (memq window-system '(x w32 mac)) (error "Cannot use string glyphs in a windowing system")) (or standard-display-table (setq standard-display-table (make-display-table))) (aset standard-display-table c (vector (create-glyph (concat "\e(0" (char-to-string gc) "\e(B"))))) ;;;###autoload (defun standard-display-underline (c uc) "Display character C as character UC plus underlining." (or standard-display-table (setq standard-display-table (make-display-table))) (aset standard-display-table c (vector (if window-system (make-glyph-code uc 'underline) (create-glyph (concat "\e[4m" (char-to-string uc) "\e[m")))))) ;;;###autoload (defun create-glyph (string) "Allocate a glyph code to display by sending STRING to the terminal." (if (= (length glyph-table) 65536) (error "No free glyph codes remain")) ;; Don't use slots that correspond to ASCII characters. (if (= (length glyph-table) 32) (setq glyph-table (vconcat glyph-table (make-vector 224 nil)))) (setq glyph-table (vconcat glyph-table (list string))) (1- (length glyph-table))) ;;;###autoload (defun make-glyph-code (char &optional face) "Return a glyph code representing char CHAR with face FACE." ;; Due to limitations on Emacs integer values, faces with ;; face id greater that 512 are silently ignored. (if (and face (<= (face-id face) #x1ff)) (logior char (lsh (face-id face) 22)) char)) ;;;###autoload (defun glyph-char (glyph) "Return the character of glyph code GLYPH." (logand glyph #x3fffff)) ;;;###autoload (defun glyph-face (glyph) "Return the face of glyph code GLYPH, or nil if glyph has default face." (let ((face-id (lsh glyph -22))) (and (> face-id 0) (car (delq nil (mapcar (lambda (face) (and (eq (get face 'face) face-id) face)) (face-list))))))) ;;;###autoload (defun standard-display-european (arg) "Semi-obsolete way to toggle display of ISO 8859 European characters. This function is semi-obsolete; if you want to do your editing with unibyte characters, it is better to `set-language-environment' coupled with either the `--unibyte' option or the EMACS_UNIBYTE environment variable, or else customize `enable-multibyte-characters'. With prefix argument, this command enables European character display if ARG is positive, disables it otherwise. Otherwise, it toggles European character display. When this mode is enabled, characters in the range of 160 to 255 display not as octal escapes, but as accented characters. Codes 146 and 160 display as apostrophe and space, even though they are not the ASCII codes for apostrophe and space. Enabling European character display with this command noninteractively from Lisp code also selects Latin-1 as the language environment, and selects unibyte mode for all Emacs buffers \(both existing buffers and those created subsequently). This provides increased compatibility for users who call this function in `.emacs'." (if (or (<= (prefix-numeric-value arg) 0) (and (null arg) (char-table-p standard-display-table) ;; Test 161, because 160 displays as a space. (equal (aref standard-display-table 161) [161]))) (progn (standard-display-default 160 255) (unless (or (memq window-system '(x w32 mac))) (and (terminal-coding-system) (set-terminal-coding-system nil)))) (display-warning 'i18n "`standard-display-european' is semi-obsolete; see its doc string for details" :warning) ;; Switch to Latin-1 language environment ;; unless some other has been specified. (if (equal current-language-environment "English") (set-language-environment "latin-1")) (unless (or noninteractive (memq window-system '(x w32 mac))) ;; Send those codes literally to a character-based terminal. ;; If we are using single-byte characters, ;; it doesn't matter which coding system we use. (set-terminal-coding-system (let ((c (intern (downcase current-language-environment)))) (if (coding-system-p c) c 'latin-1)))) (standard-display-european-internal))) (provide 'disp-table) ;; arch-tag: ffe4c28c-960c-47aa-b8a8-ae89d371ffc7 ;;; disp-table.el ends here