Mercurial > hg > xemacs-beta
view lisp/disp-table.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 20:51:18 -0600 |
parents | 1f0aa40cafe0 |
children | b2dcf6a6d8ab e0db3c197671 |
line wrap: on
line source
;;; disp-table.el --- functions for dealing with char tables. ;; Copyright (C) 1987, 1994, 1997, 2007 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Author: Howard Gayle ;; Maintainer: XEmacs Development Team ;; Keywords: i18n, internal ;; This file is part of XEmacs. ;; XEmacs 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 2, or (at your option) ;; any later version. ;; XEmacs 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 XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not synched with FSF. ;;; Commentary: ;; Rewritten for XEmacs July 1995, Ben Wing. ;;; Code: ;;;###autoload (defun make-display-table () "Return a new, empty display table. This returns a generic character table; previously it returned a vector, but that was not helpful when dealing with internationalized characters above ?\xFF. See `make-char-table' for details of character tables in general. To write code that works with both vectors and character tables, add something like the following to the beginning of your file, and use `put-display-table' to set what a given character is displayed as, and `get-display-table' to examine what that character is currently displayed as: \(defun-when-void put-display-table (range value display-table) \"Set the value for char RANGE to VALUE in DISPLAY-TABLE. \" (if (sequencep display-table) (aset display-table range value) (put-char-table range value display-table))) \(defun-when-void get-display-table (character display-table) \"Find value for CHARACTER in DISPLAY-TABLE. \" (if (sequencep display-table) (aref display-table character) (get-char-table character display-table))) In this implementation, `put-display-table' and `get-display-table' are aliases of `put-char-table' and `get-char-table' respectively, and are always available." (make-char-table 'generic)) ;;;###autoload (defalias 'put-display-table #'put-char-table) ;;;###autoload (defalias 'get-display-table #'get-char-table) (defun describe-display-table (dt) "Describe the display table DT in a help buffer." (with-displaying-help-buffer (lambda () (map-char-table (lambda (range value) (cond ((eq range t) (princ "\nAll characters: \n") (princ (format " %S" value))) ((eq 'charset (and (symbolp range) (type-of (find-charset range)))) (princ (format "\n\nCharset %S: \n" (charset-name range))) (princ (format " %S" value))) ((vectorp range) (princ (format "\n\nCharset %S, row %d \n" (charset-name (aref value 0)) (aref value 1))) (princ (format " %S\n\n" value))) ((characterp range) (princ (format "\nCharacter U+%04X, %S: " range (if (fboundp 'split-char) (split-char range) (list 'ascii (char-to-int range))))) (princ (format " %S" value)))) nil) dt) (princ "\n\nFor some of the various other glyphs that GNU Emacs uses the display table for, see the XEmacs specifiers `truncation-glyph' , `continuation-glyph', `control-arrow-glyph', `octal-escape-glyph' and the others described in the docstring of `make-glyph'. \n\n")))) ;;;###autoload (defun describe-current-display-table (&optional domain) "Describe the display table in use in the selected window and buffer." (interactive) (or domain (setq domain (selected-window))) (let ((disptab (specifier-instance current-display-table domain))) (if disptab (describe-display-table disptab) (message "No display table")))) ;; #### we need a generic frob-specifier function. ;; #### this also needs to be redone like frob-face-property. ;; Let me say one more time how much dynamic scoping sucks. ;;;###autoload (defun frob-display-table (fdt-function fdt-locale &optional tag-set) (or fdt-locale (setq fdt-locale 'global)) (or (specifier-spec-list current-display-table fdt-locale tag-set) (add-spec-to-specifier current-display-table (make-display-table) fdt-locale tag-set)) (add-spec-list-to-specifier current-display-table (list (cons fdt-locale (mapcar (lambda (fdt-x) (funcall fdt-function (cdr fdt-x)) fdt-x) (cdar (specifier-spec-list current-display-table fdt-locale tag-set))))))) (defun standard-display-8bit-1 (dt l h) (while (<= l h) (remove-char-table (int-to-char l) dt) (setq l (1+ l)))) ;;;###autoload (defun standard-display-8bit (l h &optional locale) "Display characters in the range L to H literally [sic]. GNU Emacs includes this function. There, `literally' has no good meaning. Under XEmacs, this function makes characters with numeric values in the range L to H display as themselves; that is, as ASCII, latin-iso8859-1, latin-iso8859-2 or whatever. See `standard-display-default' for the inverse function. " (frob-display-table (lambda (x) (standard-display-8bit-1 x l h)) locale)) (defun standard-display-default-1 (dt l h) "Misnamed function under XEmacs. See `standard-display-default'." (while (<= l h) (put-char-table (int-to-char l) (format "\\%o" l) dt) (setq l (1+ l)))) ;;;###autoload (defun standard-display-default (l h &optional locale) "Display characters in the range L to H using octal escape notation. In the XEmacs context this function is misnamed. Under GNU Emacs, characters in the range #xA0 to #xFF display as octal escapes unless `standard-display-european' has been called; this function neutralizes the effects of `standard-display-european'. Under XEmacs, those characters normally do not display as octal escapes (this ignores hackery like specifying the X11 font character set on non-Mule builds) and this function sets them to display as octal escapes. " (frob-display-table (lambda (x) (standard-display-default-1 x l h)) locale)) ;;;###autoload (defun standard-display-ascii (c s &optional locale) "Display character C using printable string S." (frob-display-table (lambda (x) (put-char-table c s x)) locale)) ;;;###autoload (defun standard-display-g1 (c sc &optional locale) "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." (frob-display-table (lambda (x) (put-char-table c (concat "\016" (char-to-string sc) "\017") x)) locale '(tty))) ;;;###autoload (defun standard-display-graphic (c gc &optional locale) "Display character C as character GC in graphics character set. This function assumes VT100-compatible escapes; it is meaningless for an X frame." (frob-display-table (lambda (x) (put-char-table c (concat "\e(0" (char-to-string gc) "\e(B") x)) locale '(tty))) ;;;###autoload (defun standard-display-underline (c uc &optional locale) "Display character C as character UC plus underlining." (frob-display-table (lambda (x) (let (glyph) (setq glyph (make-glyph (vector 'string :data (char-to-string uc)))) (set-glyph-face glyph 'underline) (put-char-table c glyph x))) locale)) ;;;###autoload (defun standard-display-european (arg &optional locale) "Toggle display of European characters encoded with ISO 8859-1. When enabled (the default), characters in the range of 160 to 255 display as accented characters. With negative prefix argument, display characters in that range as octal escapes. If you want to work in a Western European language under XEmacs, it shouldn't be necessary to call this function--things should just work. But it's in a sufficient number of init files that we're not in a hurry to remove it. " (interactive "P") (if (<= (prefix-numeric-value arg) 0) (frob-display-table (lambda (x) (standard-display-default-1 x 160 255)) locale) (frob-display-table (lambda (x) (standard-display-8bit-1 x 160 255)) locale))) (provide 'disp-table) ;;; disp-table.el ends here