Mercurial > hg > xemacs-beta
view lisp/gtk-faces.el @ 5146:88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-15 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (c_readonly):
* alloc.c (deadbeef_memory):
* alloc.c (make_compiled_function):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (noseeum_make_marker):
* alloc.c (ADDITIONAL_FREE_string):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* casetab.c:
* casetab.c (print_case_table):
* console.c:
* console.c (print_console):
* database.c (print_database):
* database.c (finalize_database):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (print_devmode):
* device-msw.c (finalize_devmode):
* device.c:
* device.c (print_device):
* elhash.c:
* elhash.c (print_hash_table):
* eval.c (print_multiple_value):
* eval.c (mark_multiple_value):
* events.c (deinitialize_event):
* events.c (print_event):
* events.c (event_equal):
* extents.c:
* extents.c (soe_dump):
* extents.c (soe_insert):
* extents.c (soe_delete):
* extents.c (soe_move):
* extents.c (extent_fragment_update):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* frame.c:
* frame.c (print_frame):
* free-hook.c:
* free-hook.c (check_free):
* glyphs.c:
* glyphs.c (print_image_instance):
* glyphs.c (print_glyph):
* gui.c:
* gui.c (copy_gui_item):
* hash.c:
* hash.c (NULL_ENTRY):
* hash.c (KEYS_DIFFER_P):
* keymap.c (print_keymap):
* keymap.c (MARKED_SLOT):
* lisp.h:
* lrecord.h:
* lrecord.h (LISP_OBJECT_UID):
* lrecord.h (set_lheader_implementation):
* lrecord.h (struct old_lcrecord_header):
* lstream.c (print_lstream):
* lstream.c (finalize_lstream):
* marker.c (print_marker):
* marker.c (marker_equal):
* mc-alloc.c (visit_all_used_page_headers):
* mule-charset.c:
* mule-charset.c (print_charset):
* objects.c (print_color_instance):
* objects.c (print_font_instance):
* objects.c (finalize_font_instance):
* opaque.c (print_opaque):
* opaque.c (print_opaque_ptr):
* opaque.c (equal_opaque_ptr):
* print.c (internal_object_printer):
* print.c (enum printing_badness):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* specifier.c (print_specifier):
* specifier.c (finalize_specifier):
* symbols.c:
* symbols.c (print_symbol_value_magic):
* tooltalk.c:
* tooltalk.c (print_tooltalk_message):
* tooltalk.c (print_tooltalk_pattern):
* window.c (print_window):
* window.c (debug_print_window):
(1) Make lrecord UID's have a separate UID space for each object.
Otherwise, with 20-bit UID's, we rapidly wrap around, especially
when common objects like conses and strings increment the UID value
for every object created. (Originally I tried making two UID spaces,
one for objects that always print readably and hence don't display
the UID, and one for other objects. But certain objects like markers
for which a UID is displayed are still generated rapidly enough that
UID overflow is a serious issue.) This also has the advantage of
making UID values smaller, hence easier to remember -- their main
purpose is to make it easier to keep track of different objects of
the same type when debugging code. Make sure we dump lrecord UID's
so that we don't have problems with pdumped and non-dumped objects
having the same UID.
(2) Display UID's consistently whenever an object (a) doesn't
consistently print readably (objects like cons and string, which
always print readably, can't display a UID), and (b) doesn't
otherwise have a unique property that makes objects of a
particular type distinguishable. (E.g. buffers didn't and still
don't print an ID, but the buffer name uniquely identifies the
buffer.) Some types, such as event, extent, compiled-function,
didn't always (or didn't ever) display an ID; others (such as
marker, extent, lstream, opaque, opaque-ptr, any object using
internal_object_printer()) used to display the actual machine
pointer instead.
(3) Rename NORMAL_LISP_OBJECT_UID to LISP_OBJECT_UID; make it work
over all Lisp objects and take a Lisp object, not a struct pointer.
(4) Some misc cleanups in alloc.c, elhash.c.
(5) Change code in events.c that "deinitializes" an event so that
it doesn't increment the event UID counter in the process. Also
use deadbeef_memory() to overwrite memory instead of doing the same
with custom code. In the process, make deadbeef_memory() in
alloc.c always available, and delete extraneous copy in mc-alloc.c.
Also capitalize all uses of 0xDEADBEEF. Similarly in elhash.c
call deadbeef_memory().
(6) Resurrect "debug SOE" code in extents.c. Make it conditional
on DEBUG_XEMACS and on a `debug-soe' variable, rather than on
SOE_DEBUG. Make it output to stderr, not stdout.
(7) Delete some custom print methods that were identical to
external_object_printer().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Mar 2010 16:35:38 -0500 |
parents | 79c6ff3eef26 |
children | 7d06a8bf47d2 |
line wrap: on
line source
;;; gtk-faces.el --- GTK-specific face frobnication, aka black magic. ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Copyright (c) 2000 William Perry ;; Author: William M. Perry <wmperry@gnu.org> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, internal, dumped ;; 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, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not synched. ;;; Commentary: ;; This file is dumped with XEmacs (when GTK support is compiled in). (globally-declare-fboundp '(gtk-init-pointers gtk-font-selection-dialog-new gtk-widget-set-sensitive gtk-font-selection-dialog-apply-button gtk-signal-connect gtk-main-quit gtk-font-selection-dialog-ok-button gtk-font-selection-dialog-get-font-name gtk-widget-destroy font-menu-set-font font-family font-size gtk-font-selection-dialog-cancel-button gtk-widget-show-all gtk-main gtk-style-info)) (eval-when-compile (defmacro gtk-style-munge-face (face attribute value) (let ((func (intern (format "face-%s" (eval attribute))))) `(add-spec-to-specifier (,func ,face) ,value nil '(gtk default) 'prepend)))) ;;; gtk-init-device-faces is responsible for initializing default ;;; values for faces on a newly created device. ;;; (defun gtk-init-device-faces (device) ;; ;; If the "default" face didn't have a font specified, try to pick one. ;; (when (eq (device-type device) 'gtk) (let* ((style (gtk-style-info device)) (normal 0) ; GTK_STATE_NORMAL ;;(active 1) ; GTK_STATE_ACTIVE (prelight 2) ; GTK_STATE_PRELIGHT (selected 3) ; GTK_STATE_SELECTED ;;(insensitive 4) ; GTK_STATE_INSENSITIVE ) (gtk-style-munge-face 'highlight 'foreground (nth prelight (plist-get style 'text))) (gtk-style-munge-face 'highlight 'background (nth prelight (plist-get style 'background))) (gtk-style-munge-face 'zmacs-region 'foreground (nth selected (plist-get style 'text))) (gtk-style-munge-face 'zmacs-region 'background (nth selected (plist-get style 'background))) (gtk-style-munge-face 'toolbar 'background (nth normal (plist-get style 'base))) (gtk-style-munge-face 'toolbar 'foreground (nth normal (plist-get style 'text))) (set-face-background 'modeline [toolbar background] '(gtk default)) (set-face-foreground 'modeline [toolbar foreground] '(gtk default)) ) (gtk-init-pointers))) ;;; This is called from `init-frame-faces', which is called from ;;; init_frame_faces() which is called from Fmake_frame(), to perform ;;; any device-specific initialization. ;;; (defun gtk-init-frame-faces (frame) ) (defun gtk-init-global-faces () ) ;;; Lots of this stolen from x-faces.el - I'm not sure if this will ;;; require a rewrite for win32 or not? (defconst gtk-font-regexp nil) (defconst gtk-font-regexp-head nil) (defconst gtk-font-regexp-head-2 nil) (defconst gtk-font-regexp-weight nil) (defconst gtk-font-regexp-slant nil) (defconst gtk-font-regexp-pixel nil) (defconst gtk-font-regexp-point nil) (defconst gtk-font-regexp-foundry-and-family nil) (defconst gtk-font-regexp-registry-and-encoding nil) (defconst gtk-font-regexp-spacing nil) ;;; Regexps matching font names in "Host Portable Character Representation." ;;; (let ((- "[-?]") (foundry "[^-]*") (family "[^-]*") (weight "\\(bold\\|demibold\\|medium\\|black\\)") ; 1 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 (weight\? "\\([^-]*\\)") ; 1 (slant "\\([ior]\\)") ; 2 ; (slant\? "\\([ior?*]?\\)") ; 2 (slant\? "\\([^-]?\\)") ; 2 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 (swidth "\\([^-]*\\)") ; 3 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 (adstyle "\\([^-]*\\)") ; 4 (pixelsize "\\(\\*\\|[0-9]+\\)") ; 5 (pointsize "\\(\\*\\|0\\|[0-9][0-9]+\\)") ; 6 ; (resx "\\(\\*\\|[0-9][0-9]+\\)") ; 7 ; (resy "\\(\\*\\|[0-9][0-9]+\\)") ; 8 (resx "\\([*0]\\|[0-9][0-9]+\\)") ; 7 (resy "\\([*0]\\|[0-9][0-9]+\\)") ; 8 (spacing "[cmp?*]") (avgwidth "\\(\\*\\|[0-9]+\\)") ; 9 (registry "[^-]*") ; some fonts have omitted registries ; (encoding ".+") ; note that encoding may contain "-"... (encoding "[^-]+") ; false! ) (setq gtk-font-regexp (purecopy (concat "\\`\\*?[-?*]" foundry - family - weight\? - slant\? - swidth - adstyle - pixelsize - pointsize - resx - resy - spacing - avgwidth - registry - encoding "\\'" ))) (setq gtk-font-regexp-head (purecopy (concat "\\`[-?*]" foundry - family - weight\? - slant\? "\\([-*?]\\|\\'\\)"))) (setq gtk-font-regexp-head-2 (purecopy (concat "\\`[-?*]" foundry - family - weight\? - slant\? - swidth - adstyle - pixelsize - pointsize "\\([-*?]\\|\\'\\)"))) (setq gtk-font-regexp-slant (purecopy (concat - slant -))) (setq gtk-font-regexp-weight (purecopy (concat - weight -))) ;; if we can't match any of the more specific regexps (unfortunate) then ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits ;; is pixels. Bogus as hell. (setq gtk-font-regexp-pixel (purecopy "[-?*]\\([0-9][0-9]?\\)[-?*]")) (setq gtk-font-regexp-point (purecopy "[-?*]\\([0-9][0-9]+\\)[-?*]")) ;; the following two are used by x-font-menu.el. (setq gtk-font-regexp-foundry-and-family (purecopy (concat "\\`[-?*]" foundry - "\\(" family "\\)" -))) (setq gtk-font-regexp-registry-and-encoding (purecopy (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'"))) (setq gtk-font-regexp-spacing (purecopy (concat - "\\(" spacing "\\)" - avgwidth - registry - encoding "\\'"))) ) (defvaralias 'x-font-regexp 'gtk-font-regexp) (defvaralias 'x-font-regexp-head 'gtk-font-regexp-head) (defvaralias 'x-font-regexp-head-2 'gtk-font-regexp-head-2) (defvaralias 'x-font-regexp-weight 'gtk-font-regexp-weight) (defvaralias 'x-font-regexp-slant 'gtk-font-regexp-slant) (defvaralias 'x-font-regexp-pixel 'gtk-font-regexp-pixel) (defvaralias 'x-font-regexp-point 'gtk-font-regexp-point) (defvaralias 'x-font-regexp-foundry-and-family 'gtk-font-regexp-foundry-and-family) (defvaralias 'x-font-regexp-registry-and-encoding 'gtk-font-regexp-registry-and-encoding) (defvaralias 'x-font-regexp-spacing 'gtk-font-regexp-spacing) (defun gtk-frob-font-weight (font which) (if (font-instance-p font) (setq font (font-instance-name font))) (cond ((null font) nil) ((or (string-match gtk-font-regexp font) (string-match gtk-font-regexp-head font) (string-match gtk-font-regexp-weight font)) (concat (substring font 0 (match-beginning 1)) which (substring font (match-end 1)))) (t nil))) (defun gtk-frob-font-slant (font which) (if (font-instance-p font) (setq font (font-instance-name font))) (cond ((null font) nil) ((or (string-match gtk-font-regexp font) (string-match gtk-font-regexp-head font)) (concat (substring font 0 (match-beginning 2)) which (substring font (match-end 2)))) ((string-match gtk-font-regexp-slant font) (concat (substring font 0 (match-beginning 1)) which (substring font (match-end 1)))) (t nil))) (defun gtk-make-font-bold (font &optional device) (or (try-font-name (gtk-frob-font-weight font "bold") device) (try-font-name (gtk-frob-font-weight font "black") device) (try-font-name (gtk-frob-font-weight font "demibold") device))) (defun gtk-make-font-unbold (font &optional device) (try-font-name (gtk-frob-font-weight font "medium") device)) (defcustom try-oblique-before-italic-fonts t "*If nil, italic fonts are searched before oblique fonts. If non-nil, oblique fonts are tried before italic fonts. This is mostly applicable to adobe-courier fonts" :type 'boolean :tag "Try Oblique Before Italic Fonts" :group 'x) (define-obsolete-variable-alias '*try-oblique-before-italic-fonts* 'try-oblique-before-italic-fonts) (defun gtk-make-font-italic (font &optional device) (if try-oblique-before-italic-fonts (or (try-font-name (gtk-frob-font-slant font "o") device) (try-font-name (gtk-frob-font-slant font "i") device)) (or (try-font-name (gtk-frob-font-slant font "i") device) (try-font-name (gtk-frob-font-slant font "o") device)))) (defun gtk-make-font-unitalic (font &optional device) (try-font-name (gtk-frob-font-slant font "r") device)) (defun gtk-make-font-bold-italic (font &optional device) (if try-oblique-before-italic-fonts (or (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "i") device)) (or (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "o") device)))) (defun gtk-choose-font () (interactive) (require 'x-font-menu) (require 'font) (let ((locale (if font-menu-this-frame-only-p (selected-frame) nil)) (dialog nil)) (setq dialog (gtk-font-selection-dialog-new "Choose default font...")) (put dialog 'modal t) (put dialog 'type 'dialog) (gtk-widget-set-sensitive (gtk-font-selection-dialog-apply-button dialog) nil) (gtk-signal-connect dialog 'destroy (lambda (&rest ignored) (gtk-main-quit))) (gtk-signal-connect (gtk-font-selection-dialog-ok-button dialog) 'clicked (lambda (button data) (let* ((dialog (car data)) (font (font-create-object (gtk-font-selection-dialog-get-font-name dialog)))) (gtk-widget-destroy dialog) (font-menu-set-font (car (font-family font)) nil (* 10 (font-size font))))) (cons dialog locale)) (gtk-signal-connect (gtk-font-selection-dialog-cancel-button dialog) 'clicked (lambda (button dialog) (gtk-widget-destroy dialog)) dialog) (gtk-widget-show-all dialog) (gtk-main)))