Mercurial > hg > xemacs-beta
view src/font-mgr.h @ 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 | a9c41067dd88 |
children | 308d34e9f07d |
line wrap: on
line source
/* Lisp font data structures for X and Xft. Copyright (C) 2003 Eric Knauel and Matthias Neubauer Copyright (C) 2005 Eric Knauel Copyright (C) 2004, 2005 Free Software Foundation, Inc. Authors: Eric Knauel <knauel@informatik.uni-tuebingen.de> Matthias Neubauer <neubauer@informatik.uni-freiburg.de> Stephen J. Turnbull <stephen@xemacs.org> Created: 27 Oct 2003 Updated: 05 Mar 2005 by Stephen J. Turnbull 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 in GNU Emacs. */ /* This module provides the Lisp interface to fonts in X11, including Xft, but (at least at first) not GTK+ or Qt. It should be renamed to fonts-x.h. Sealevel code should be in ../lwlib/lwlib-fonts.h or ../lwlib/lwlib-colors.h. */ #ifndef INCLUDED_font_mgr_h_ #define INCLUDED_font_mgr_h_ #include "../lwlib/lwlib-fonts.h" #include "../lwlib/lwlib-colors.h" extern Fixnum debug_xft; /* Standard for fontconfig. Use a macro to show we're not guessing. */ #define Qfc_font_name_encoding Qutf_8 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s))) struct fc_pattern { NORMAL_LISP_OBJECT_HEADER header; FcPattern *fcpatPtr; }; typedef struct fc_pattern fc_pattern; DECLARE_LISP_OBJECT(fc_pattern, struct fc_pattern); #define XFC_PATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern) #define wrap_fc_pattern(p) wrap_record (p, fc_pattern) #define FC_PATTERNP(x) RECORDP (x, fc_pattern) #define CHECK_FC_PATTERN(x) CHECK_RECORD (x, fc_pattern) #define CONCHECK_FC_PATTERN(x) CONCHECK_RECORD (x, fc_pattern) #define XFC_PATTERN_PTR(x) (XFC_PATTERN(x)->fcpatPtr) #define FONTCONFIG_EXPOSE_CONFIG #ifdef FONTCONFIG_EXPOSE_CONFIG struct fc_config { NORMAL_LISP_OBJECT_HEADER header; FcConfig *fccfgPtr; }; typedef struct fc_config fc_config; DECLARE_LISP_OBJECT(fc_config, struct fc_config); #define XFC_CONFIG(x) XRECORD (x, fc_config, struct fc_config) #define wrap_fc_config(p) wrap_record (p, fc_config) #define FC_CONFIGP(x) RECORDP (x, fc_config) #define CHECK_FC_CONFIG(x) CHECK_RECORD (x, fc_config) #define CONCHECK_FC_CONFIG(x) CONCHECK_RECORD (x, fc_config) #define XFC_CONFIG_PTR(x) (XFC_CONFIG(x)->fccfgPtr) #endif /* FONTCONFIG_EXPOSE_CONFIG */ #ifdef HAVE_XFT #ifndef HAVE_FCCONFIGGETRESCANINTERVAL /* Older fontconfig versions misspell this function name. */ #define FcConfigGetRescanInterval FcConfigGetRescanInverval #endif /* */ #ifndef HAVE_FCCONFIGSETRESCANINTERVAL /* Older fontconfig versions misspell this function name. */ #define FcConfigSetRescanInterval FcConfigSetRescanInverval #endif /* */ /* The format of a fontname (as returned by fontconfig) is not well-documented, But the character repertoire is represented in an ASCII-compatible way. See fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. Currently we have a hack where different versions of the unparsed name are used in different contexts fairly arbitrarily. I don't think this is close to coherency; even without the charset and lang properties fontconfig names are too unwieldy to use. We need to rethink the approach here. I think probably Lisp_Font_Instance.name should contain the font name as specified to Lisp (almost surely much shorter than shortname, even, and most likely wildcarded), while Lisp_Font_Instance.truename should contain the longname. For now, I'm going to #ifdef the return values defaulting to short. -- sjt */ /* DEBUGGING STUFF */ /* print message to stderr: one internal-format string argument */ #define DEBUG_XFT0(level,s) \ if (debug_xft > level) stderr_out (s) /* print message to stderr: one formatted argument */ #define DEBUG_XFT1(level,format,x1) \ if (debug_xft > level) stderr_out (format, x1) /* print message to stderr: two formatted arguments */ #define DEBUG_XFT2(level,format,x1,x2) \ if (debug_xft > level) stderr_out (format, x1, x2) /* print message to stderr: three formatted arguments */ #define DEBUG_XFT3(level,format,x1,x2,x3) \ if (debug_xft > level) stderr_out (format, x1, x2, x3) /* print message to stderr: four formatted arguments */ #define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) /* print an Xft pattern to stderr LEVEL is the debug level (to compare to debug_xft) FORMAT is a newline-terminated printf format with one %s for the pattern and must be internal format (eg, pure ASCII) PATTERN is an FcPattern *. */ #define PRINT_XFT_PATTERN(level,format,pattern) \ do { \ DECLARE_EISTRING (eistrpxft_name); \ Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \ \ eicpy_ext(eistrpxft_name, \ name ? name : "FONT WITH NULL NAME", \ Qfc_font_name_encoding); \ DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ free (name); \ } while (0) /* print a progress message LEVEL is the debug level (to compare to debug_xft) FONT is the Xft font name in Mule internal encoding (from an eistring). LANG is the language being checked for support (must be ASCII). */ #define CHECKING_LANG(level,font,lang) \ do { \ DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \ } while (0) #else /* HAVE_XFT */ #endif /* HAVE_XFT */ #endif /* INCLUDED_font_mgr_h_ */