Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-fonts.c @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Mar 2010 01:22:51 -0500 |
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 */ |