Mercurial > hg > xemacs-beta
view lwlib/xlwtabsP.h @ 5189:b65692aa90d8
Cosmetic XFT-code fixes, some variable renamings
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-04-04 Ben Wing <ben@xemacs.org>
* font-mgr.c:
* font-mgr.c (fc_standard_properties):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_create):
* font-mgr.c (Ffc_config_destroy):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_config_dirs):
* font-mgr.c (Ffc_config_get_font_dirs):
* font-mgr.c (Ffc_config_get_config_files):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (Ffc_init_load_config):
* font-mgr.c (Ffc_init_load_config_and_fonts):
* font-mgr.c (Ffc_config_get_current):
* font-mgr.c (size):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (Ffc_init):
* font-mgr.c (Ffc_get_version):
* font-mgr.c (Ffc_init_reinitialize):
* font-mgr.c (Ffc_init_bring_up_to_date):
* font-mgr.c (Fxlfd_font_name_p):
* font-mgr.c (make_xlfd_font_regexp):
* font-mgr.c (syms_of_font_mgr):
* font-mgr.c (vars_of_font_mgr):
* font-mgr.c (complex_vars_of_font_mgr):
Fix the code to conform to GNU style standards.
Rename xft-debug-level to debug-xft.
* fontcolor-x.c:
* fontcolor-x.c (vars_of_fontcolor_x):
Rename debug-x-objects to debug-x-fonts.
* fontcolor-xlike-inc.c:
* fontcolor-xlike-inc.c (DEBUG_FONTS1):
* fontcolor-xlike-inc.c (DEBUG_FONTS2):
* fontcolor-xlike-inc.c (DEBUG_FONTS3):
* fontcolor-xlike-inc.c (DEBUG_FONTS4):
* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP1):
* fontcolor-xlike-inc.c (count_hyphens):
* fontcolor-xlike-inc.c (XFUN):
* fontcolor-xlike-inc.c (xlistfonts_checking_charset):
* fontcolor-xlike-inc.c (xft_find_charset_font):
Misc. code fixes, mostly cosmetic. Get rid of some warnings.
Fix the code to conform to GNU style standards.
* lisp.h:
* print.c:
* print.c (debug_out_lisp):
New function for doing printf-like formatting involving Lisp objects
and outputting to the debug output.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 04 Apr 2010 23:46:50 -0500 |
parents | a6c778975d7d |
children | 308d34e9f07d |
line wrap: on
line source
/* Tabs Widget for XEmacs. Copyright (C) 1999 Edward A. Falk 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: TabsP.h 1.8 */ /* * TabsP.h - Private definitions for Index Tabs widget */ #ifndef _TabsP_h #define _TabsP_h /*********************************************************************** * * Tabs Widget Private Data * ***********************************************************************/ #include <X11/IntrinsicP.h> #ifdef NEED_MOTIF #include <Xm/XmP.h> #include <Xm/ManagerP.h> #endif #include "xlwtabs.h" #ifdef HAVE_XFT_TABS #include <X11/Xft/Xft.h> #endif /* New fields for the Tabs widget class record */ typedef struct {XtPointer extension;} TabsClassPart; /* Full class record declaration */ typedef struct _TabsClassRec { CoreClassPart core_class; CompositeClassPart composite_class; ConstraintClassPart constraint_class; #ifdef NEED_MOTIF XmManagerClassPart manager_class; #endif TabsClassPart tabs_class; } TabsClassRec; extern TabsClassRec tabsClassRec; /**************************************************************** * * instance record declaration * ****************************************************************/ /* New fields for the Tabs widget record */ typedef struct { /* resources */ XFontStruct *font ; #ifdef HAVE_XFT_TABS XftFont *renderFont; String fcFontName; String xftFontName; #endif Dimension internalHeight, internalWidth ; Widget topWidget ; XtCallbackList callbacks ; XtCallbackList popdownCallbacks ; Boolean selectInsensitive ; Boolean be_nice_to_cmap ; int top_shadow_contrast ; int bot_shadow_contrast ; int insensitive_contrast ; /* private state */ Widget hilight ; GC foregroundGC ; GC backgroundGC ; GC greyGC ; GC topGC ; GC botGC ; Dimension tab_height ; /* height of tabs (all the same) */ /* Note: includes top shadow only */ Dimension tab_total ; /* total height of all tabs */ Dimension child_width, child_height; /* child size, including borders */ Dimension max_cw, max_ch ; /* max child preferred size */ Cardinal numRows ; Cardinal realRows; /* XEmacs addition */ XtGeometryMask last_query_mode; Boolean needs_layout ; Pixmap grey50 ; /* TODO: cache this elsewhere */ } TabsPart; typedef struct _TabsRec { CorePart core; CompositePart composite; ConstraintPart constraint; #ifdef NEED_MOTIF XmManagerPart manager; #endif TabsPart tabs; } TabsRec; /**************************************************************** * * Constraint record declaration * ****************************************************************/ typedef struct _TabsConstraintsPart { /* resources */ String label ; Pixmap left_bitmap ; Pixel foreground ; Boolean resizable ; /* private state */ Pixel grey ; Boolean greyAlloc ; Boolean visible; /* XEmacs change */ Dimension width ; /* tab width */ Position x,y ; /* tab base position */ short row ; /* tab row */ Position l_x, l_y ; /* label position */ Position lbm_x, lbm_y ; /* bitmap position */ unsigned int lbm_width, lbm_height, lbm_depth ; } TabsConstraintsPart ; typedef struct _TabsConstraintsRec { #ifdef NEED_MOTIF XmManagerConstraintPart manager; #endif TabsConstraintsPart tabs ; } TabsConstraintsRec, *TabsConstraints ; #endif /* _TabsP_h */