Mercurial > hg > xemacs-beta
view lisp/msw-font-menu.el @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 06:42:16 -0600 |
| parents | b4f4e0cc90f1 |
| children | 2a54dfbe434f 308d34e9f07d |
line wrap: on
line source
;; msw-font-menu.el --- Managing menus of mswindows fonts. ;; Copyright (C) 1999 Free Software Foundation, Inc. ;; Copyright (C) 2002 Ben Wing. ;; Adapted from x-font-menu.el by Andy Piper <andy@xemacs.org> ;; 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. ;;; Known Problems: ;;; =============== ;;; There is knowledge here about the regexp match numbers in ;;; `mswindows-font-regexp' and `mswindows-font-regexp-foundry-and-family' defined in ;;; mswindows-faces.el. ;;; ;;; mswindows fonts look like: ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset] ;;; ie: ;;; Lucida Console:Regular:10 ;;; minimal: ;;; Courier New ;;; maximal: ;;; Courier New:Bold Italic:10:underline strikeout:western ;;; Code: ;; #### - implement these... ;; ;;; (defvar font-menu-ignore-proportional-fonts nil ;;; "*If non-nil, then the font menu will only show fixed-width fonts.") (require 'font-menu) (globally-declare-boundp 'mswindows-font-regexp) (globally-declare-fboundp '(mswindows-parse-font-style mswindows-construct-font-style)) (defvar mswindows-font-menu-junk-families (mapconcat #'identity '("Symbol" ) "\\|") "A regexp matching font families which are uninteresting (e.g. cursor fonts).") (defvar mswindows-font-regexp-ascii nil "This is used to filter out font families that can't display ASCII text. It must be set at run-time.") ;;;###autoload (defun mswindows-reset-device-font-menus (device &optional debug) "Generates the `Font', `Size', and `Weight' submenus for the Options menu. This is run the first time that a font-menu is needed for each device. If you don't like the lazy invocation of this function, you can add it to `create-device-hook' and that will make the font menus respond more quickly when they are selected for the first time. If you add fonts to your system, or if you change your font path, you can call this to re-initialize the menus." (unless mswindows-font-regexp-ascii (setq mswindows-font-regexp-ascii "Western")) (let ((case-fold-search t) family size weight entry dev-cache cache families sizes weights) (dolist (name (cond ((null debug) ; debugging kludge (font-list "::::" device)) ((stringp debug) (split-string debug "\n")) (t debug))) (when (and (string-match mswindows-font-regexp-ascii name) (string-match mswindows-font-regexp name)) (setq weight (capitalize (car (mswindows-parse-font-style (match-string 2 name)))) size (string-to-int (match-string 3 name)) family (match-string 1 name)) (unless (string-match mswindows-font-menu-junk-families family) (setq entry (or (vassoc name cache) (car (setq cache (cons (vector family nil nil t) cache))))) (or (member family families) (push family families)) (or (member weight weights) (push weight weights)) (or (member size sizes) (push size sizes)) (or (member weight (aref entry 1)) (push weight (aref entry 1))) (or (member size (aref entry 2)) (push size (aref entry 2)))))) ;; ;; Hack scalable fonts. ;; Some fonts come only in scalable versions (the only size is 0) ;; and some fonts come in both scalable and non-scalable versions ;; (one size is 0). If there are any scalable fonts at all, make ;; sure that the union of all point sizes contains at least some ;; common sizes - it's possible that some sensible sizes might end ;; up not getting mentioned explicitly. ;; (if (member 0 sizes) (let ((common '(6 8 10 12 14 16 18 24))) (while common (or;;(member (car common) sizes) ; not enough slack (let ((rest sizes) (done nil)) (while (and (not done) rest) (if (and (> (car common) (- (car rest) 1)) (< (car common) (+ (car rest) 1))) (setq done t)) (setq rest (cdr rest))) done) (setq sizes (cons (car common) sizes))) (setq common (cdr common))) (setq sizes (delq 0 sizes)))) (setq families (sort families 'string-lessp) weights (sort weights 'string-lessp) sizes (sort sizes '<)) (dolist (entry cache) (aset entry 1 (sort (aref entry 1) 'string-lessp)) (aset entry 2 (sort (aref entry 2) '<))) (setq dev-cache (assq device device-fonts-cache)) (or dev-cache (setq dev-cache (car (push (list device) device-fonts-cache)))) (setcdr dev-cache (vector cache (mapcar (lambda (x) (vector x (list 'font-menu-set-font x nil nil) ':style 'radio ':active nil ':selected nil)) families) (mapcar (lambda (x) (vector (int-to-string x) (list 'font-menu-set-font nil nil x) ':style 'radio ':active nil ':selected nil)) sizes) (mapcar (lambda (x) (vector x (list 'font-menu-set-font nil x nil) ':style 'radio ':active nil ':selected nil)) weights))) (cdr dev-cache))) ;; Extract font information from a face. We examine both the ;; user-specified font name and the canonical (`true') font name. ;; These can appear to have totally different properties. ;; We use the user-specified one if possible, else use the truename. ;; If the user didn't specify one get the truename and use the ;; possibly suboptimal data from that. ;;;###autoload (defun* mswindows-font-menu-font-data (face dcache) (let* ((case-fold-search t) (domain (if font-menu-this-frame-only-p (selected-frame) (selected-device))) (name (font-instance-name (face-font-instance face domain))) (truename (font-instance-truename (face-font-instance face domain (if (featurep 'mule) 'ascii)))) family size weight entry slant) (when (string-match mswindows-font-regexp name) (setq family (match-string 1 name)) (setq entry (vassoc family (aref dcache 0)))) (when (and (null entry) (string-match mswindows-font-regexp truename)) (setq family (match-string 1 truename)) (setq entry (vassoc family (aref dcache 0)))) (when (null entry) (return-from mswindows-font-menu-font-data (make-vector 5 nil))) (when (string-match mswindows-font-regexp name) (setq weight (car (mswindows-parse-font-style (match-string 2 name)))) (setq size (string-to-int (match-string 3 name)))) (when (string-match mswindows-font-regexp truename) (destructuring-bind (newweight . slant) (mswindows-parse-font-style (match-string 2 truename)) (when (not (member weight (aref entry 1))) (setq weight newweight)) (when (not (member size (aref entry 2))) (setq size (string-to-int (match-string 3 truename)))))) (vector entry family size weight slant))) (defun mswindows-font-menu-load-font (family weight size slant resolution) "Try to load a font with the requested properties. The weight, slant and resolution are only hints." (when (integerp size) (setq size (int-to-string size))) (let (font) (catch 'got-font (dolist (weight (list weight "")) (dolist (slant ;; oblique is not currently implemented (cond ((string-equal slant "Oblique") '("Italic" "")) ((string-equal slant "Italic") '("Italic" "")) (t (list slant "")))) (when (setq font (make-font-instance (concat family ":" (mswindows-construct-font-style weight slant) ":" size "::") nil t)) (throw 'got-font font))))))) (provide 'mswindows-font-menu) ;;; msw-font-menu.el ends here
