Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-fonts.c @ 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 | a6c778975d7d |
| children | c9d31263ab7d 308d34e9f07d |
| rev | line source |
|---|---|
| 3094 | 1 /* Font handling code for X and Xft. |
| 2 | |
| 3 Copyright (C) 2003 Eric Knauel | |
| 4 Copyright (C) 2004 Free Software Foundation, Inc. | |
| 5 | |
| 6 Author: Stephen J. Turnbull <stephen@xemacs.org> | |
| 7 Created: 24 Jul 2004 by Stephen J. Turnbull | |
| 8 | |
| 9 This file is part of XEmacs. | |
| 10 | |
| 11 XEmacs is free software; you can redistribute it and/or modify it | |
| 12 under the terms of the GNU General Public License as published by the | |
| 13 Free Software Foundation; either version 2, or (at your option) any | |
| 14 later version. | |
| 15 | |
| 16 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 17 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 18 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 19 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 | |
| 23 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 Boston, MA 02111-1307, USA. */ | |
| 25 | |
| 26 /* Synched up with: Not in GNU Emacs. */ | |
| 27 | |
| 28 #include <config.h> | |
| 29 #include <stdio.h> | |
| 30 #include <stdlib.h> | |
| 31 #include "lwlib-fonts.h" | |
| 32 | |
| 33 #if 0 | |
| 34 /* these are all from ../src; if we need them move the code */ | |
| 35 #include "lisp.h" | |
| 36 #include "device.h" | |
| 37 #include "device-impl.h" | |
| 38 #include "console-x-impl.h" | |
| 3360 | 39 #ifdef HAVE_FONTCONFIG |
| 3354 | 40 #include "font-mgr.h" |
| 3094 | 41 #endif |
| 3360 | 42 #endif |
| 3094 | 43 |
| 44 /* | |
| 45 * code for handling Xft | |
| 46 */ | |
| 47 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3360
diff
changeset
|
48 #ifdef HAVE_XFT |
| 3094 | 49 |
| 50 /* helper function to correctly open Xft/core fonts by name | |
| 51 #### Can't we use FcParseName here? | |
| 52 #### Is this done so often that the logic needs to be hard-coded in C? | |
| 53 | |
| 54 Daniel Pittman sez: Older code tried to enforce that an XLFD font was | |
| 55 not scaled, while this version just doesn't care. I think that is a | |
| 56 better behavior, since if someone really wants a scaled font we should | |
| 57 oblige them. | |
| 58 | |
| 59 Stephen sez: This whole function was ill-conceived, and I'm not sure it | |
| 60 succeeds at any of the things it attempts to do. First, we should be | |
| 61 using fontconfig directly. I'm not sure what Xft (or fontconfig) will | |
| 62 try to do if passed an XLFD. As for scaled fonts, both options are | |
| 63 equally bad. The problem is that the X server will often scale bitmap | |
| 64 fonts willy-nilly; it's worth trying to avoid that, but I can't say | |
| 65 whether that's worth overriding somebody who knows what they're doing. | |
| 66 In any case, I think we should find out what Xft (fontconfig?) is able | |
| 67 and willing to do with XLFDs, and probably move the logic to LISP. | |
| 68 */ | |
| 69 XftFont * | |
| 70 xft_open_font_by_name (Display *dpy, char *name) | |
| 71 { | |
| 72 XftFont *res = NULL; | |
| 73 | |
| 74 /* if (!NILP (Fxft_xlfd_font_name_p (make_string (name, strlen (name))))) */ | |
| 75 /* #### this is bogus but ... */ | |
| 76 int count = 0; | |
| 77 char *pos = name; | |
| 78 /* extra parens shut up gcc */ | |
| 79 while ((pos = index (pos, '-'))) | |
| 80 { | |
| 81 count++; | |
| 82 pos++; | |
| 83 } | |
| 84 | |
| 85 /* #### hard-coding DefaultScreen is evil! */ | |
| 86 if (count == 14 /* fully-qualified XLFD */ | |
| 87 || (count < 14 /* heuristic for wildcarded XLFD */ | |
| 88 && count >= 5 | |
| 89 && index (name, '*'))) | |
| 90 res = XftFontOpenXlfd (dpy, DefaultScreen (dpy), name); | |
| 91 else | |
| 92 res = XftFontOpenName (dpy, DefaultScreen (dpy), name); | |
| 93 | |
| 94 /* Try for a generic monospace font | |
| 95 #### Why? Menus don't need to line up in columns! */ | |
| 96 if (!res) | |
| 97 res = XftFontOpenName (dpy, DefaultScreen (dpy), "monospace"); | |
| 98 /* Try for anything we can get */ | |
| 99 if (!res) | |
| 100 res = XftFontOpenName (dpy, DefaultScreen (dpy), ""); | |
| 101 | |
| 102 if (!res) | |
| 103 { | |
| 104 /* #### This is Just So Wrong ... ! */ | |
| 105 /* sorry folks ... */ | |
| 106 fprintf (stderr, | |
| 107 "Unable to find any usable XFT font, even the defaults!\n"); | |
| 108 abort (); | |
| 109 return 0; | |
| 110 } | |
| 111 | |
| 112 return res; | |
| 113 } | |
| 114 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3360
diff
changeset
|
115 #endif /* HAVE_XFT */ |
| 3094 | 116 |
| 117 /* End of lwlib-fonts.c */ |