Mercurial > hg > xemacs-beta
annotate src/font-mgr.h @ 5077:d372b17f63ce
clean up toolbar/gutter edge geometry
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-25 Ben Wing <ben@xemacs.org>
* EmacsFrame.c (EmacsFrameSetValues):
* frame-impl.h:
* frame-impl.h (struct frame):
* frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_HEIGHT):
* frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_BORDER_WIDTH):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_HEIGHT):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_VISIBLE):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BOUNDS):
* frame.h:
* frame.h (enum edge_pos):
* gutter.c:
* gutter.c (get_gutter_coords):
* gutter.c (display_boxes_in_gutter_p):
* gutter.c (construct_window_gutter_spec):
* gutter.c (calculate_gutter_size_from_display_lines):
* gutter.c (calculate_gutter_size):
* gutter.c (output_gutter):
* gutter.c (clear_gutter):
* gutter.c (mark_gutters):
* gutter.c (gutter_extent_signal_changed_region_maybe):
* gutter.c (update_gutter_geometry):
* gutter.c (update_frame_gutter_geometry):
* gutter.c (update_frame_gutters):
* gutter.c (reset_gutter_display_lines):
* gutter.c (redraw_exposed_gutter):
* gutter.c (redraw_exposed_gutters):
* gutter.c (free_frame_gutters):
* gutter.c (decode_gutter_position):
* gutter.c (Fset_default_gutter_position):
* gutter.c (Fgutter_pixel_width):
* gutter.c (Fgutter_pixel_height):
* gutter.c (recompute_overlaying_specifier):
* gutter.c (gutter_specs_changed_1):
* gutter.c (gutter_specs_changed):
* gutter.c (top_gutter_specs_changed):
* gutter.c (bottom_gutter_specs_changed):
* gutter.c (left_gutter_specs_changed):
* gutter.c (right_gutter_specs_changed):
* gutter.c (gutter_geometry_changed_in_window):
* gutter.c (init_frame_gutters):
* gutter.c (specifier_vars_of_gutter):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* lisp.h (enum edge_style):
* native-gtk-toolbar.c:
* native-gtk-toolbar.c (gtk_output_toolbar):
* native-gtk-toolbar.c (gtk_clear_toolbar):
* native-gtk-toolbar.c (gtk_output_frame_toolbars):
* native-gtk-toolbar.c (gtk_initialize_frame_toolbars):
* toolbar-msw.c:
* toolbar-msw.c (TOOLBAR_HANDLE):
* toolbar-msw.c (allocate_toolbar_item_id):
* toolbar-msw.c (mswindows_clear_toolbar):
* toolbar-msw.c (mswindows_output_toolbar):
* toolbar-msw.c (mswindows_move_toolbar):
* toolbar-msw.c (mswindows_redraw_exposed_toolbars):
* toolbar-msw.c (mswindows_initialize_frame_toolbars):
* toolbar-msw.c (mswindows_output_frame_toolbars):
* toolbar-msw.c (mswindows_clear_frame_toolbars):
* toolbar-msw.c (DELETE_TOOLBAR):
* toolbar-msw.c (mswindows_free_frame_toolbars):
* toolbar-msw.c (mswindows_get_toolbar_button_text):
* toolbar-xlike.c:
* toolbar-xlike.c (__prepare_button_area):
* toolbar-xlike.c (XLIKE_OUTPUT_BUTTONS_LOOP):
* toolbar-xlike.c (xlike_output_toolbar):
* toolbar-xlike.c (xlike_clear_toolbar):
* toolbar-xlike.c (xlike_output_frame_toolbars):
* toolbar-xlike.c (xlike_clear_frame_toolbars):
* toolbar-xlike.c (xlike_redraw_exposed_toolbar):
* toolbar-xlike.c (xlike_redraw_exposed_toolbars):
* toolbar-xlike.c (xlike_redraw_frame_toolbars):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* toolbar.c (Fset_default_toolbar_position):
* toolbar.c (mark_frame_toolbar_buttons_dirty):
* toolbar.c (compute_frame_toolbar_buttons):
* toolbar.c (set_frame_toolbar):
* toolbar.c (compute_frame_toolbars_data):
* toolbar.c (update_frame_toolbars_geometry):
* toolbar.c (init_frame_toolbars):
* toolbar.c (get_toolbar_coords):
* toolbar.c (CHECK_TOOLBAR):
* toolbar.c (toolbar_buttons_at_pixpos):
* toolbar.c (CTB_ERROR):
* toolbar.c (recompute_overlaying_specifier):
* toolbar.c (specifier_vars_of_toolbar):
* toolbar.h:
* toolbar.h (SET_TOOLBAR_WAS_VISIBLE_FLAG):
Create new enum edge_pos with TOP_EDGE, BOTTOM_EDGE, LEFT_EDGE,
RIGHT_EDGE; subsume TOP_BORDER, TOP_GUTTER, enum toolbar_pos,
enum gutter_pos, etc.
Create EDGE_POS_LOOP, subsuming GUTTER_POS_LOOP.
Create NUM_EDGES, use in many places instead of hardcoded '4'.
Instead of top_toolbar_was_visible, bottom_toolbar_was_visible,
etc. make an array toolbar_was_visible[NUM_EDGES]. This increases
the frame size by 15 bytes or so (could be 3 if we use Boolbytes)
but hardly seems w to matter -- frames are heavy weight objects
anyway. Same with top_gutter_was_visible, etc.
Remove duplicated SET_TOOLBAR_WAS_VISIBLE_FLAG and put defn in
one place (toolbar.h).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 25 Feb 2010 04:45:13 -0600 |
| parents | a6c778975d7d |
| children | b5df3737028a |
| rev | line source |
|---|---|
| 3354 | 1 /* Lisp font data structures for X and Xft. |
| 2 | |
| 3 Copyright (C) 2003 Eric Knauel and Matthias Neubauer | |
| 4 Copyright (C) 2005 Eric Knauel | |
| 5 Copyright (C) 2004, 2005 Free Software Foundation, Inc. | |
| 6 | |
| 7 Authors: Eric Knauel <knauel@informatik.uni-tuebingen.de> | |
| 8 Matthias Neubauer <neubauer@informatik.uni-freiburg.de> | |
| 9 Stephen J. Turnbull <stephen@xemacs.org> | |
| 10 Created: 27 Oct 2003 | |
| 11 Updated: 05 Mar 2005 by Stephen J. Turnbull | |
| 12 | |
| 13 This file is part of XEmacs. | |
| 14 | |
| 15 XEmacs is free software; you can redistribute it and/or modify it | |
| 16 under the terms of the GNU General Public License as published by the | |
| 17 Free Software Foundation; either version 2, or (at your option) any | |
| 18 later version. | |
| 19 | |
| 20 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 21 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 22 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 23 for more details. | |
| 24 | |
| 25 You should have received a copy of the GNU General Public License | |
| 26 along with XEmacs; see the file COPYING. If not, write to | |
| 27 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 28 Boston, MA 02111-1307, USA. */ | |
| 29 | |
| 30 /* Synched up with: Not in GNU Emacs. */ | |
| 31 | |
| 32 /* This module provides the Lisp interface to fonts in X11, including Xft, | |
| 33 but (at least at first) not GTK+ or Qt. | |
| 34 | |
| 35 It should be renamed to fonts-x.h. | |
| 36 | |
| 37 Sealevel code should be in ../lwlib/lwlib-fonts.h or | |
| 38 ../lwlib/lwlib-colors.h. | |
| 39 */ | |
| 40 | |
| 41 | |
| 42 #ifndef INCLUDED_font_mgr_h_ | |
| 43 #define INCLUDED_font_mgr_h_ | |
| 44 | |
| 45 #include "../lwlib/lwlib-fonts.h" | |
| 46 #include "../lwlib/lwlib-colors.h" | |
| 47 | |
| 48 extern Fixnum debug_xft; | |
| 49 | |
| 50 /* Standard for fontconfig. Use a macro to show we're not guessing. */ | |
| 3360 | 51 #define Qfc_font_name_encoding Qutf_8 |
| 3354 | 52 |
| 53 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s))) | |
| 54 | |
| 55 struct fc_pattern | |
| 56 { | |
| 57 struct LCRECORD_HEADER header; | |
| 58 FcPattern *fcpatPtr; | |
| 59 }; | |
| 60 | |
| 61 typedef struct fc_pattern fc_pattern; | |
| 62 | |
| 63 DECLARE_LRECORD(fc_pattern, struct fc_pattern); | |
| 64 #define XFCPATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern) | |
| 65 #define wrap_fcpattern(p) wrap_record (p, fc_pattern) | |
| 66 #define FCPATTERNP(x) RECORDP (x, fc_pattern) | |
| 67 #define CHECK_FCPATTERN(x) CHECK_RECORD (x, fc_pattern) | |
| 68 #define CONCHECK_FCPATTERN(x) CONCHECK_RECORD (x, fc_pattern) | |
| 69 #define XFCPATTERN_PTR(x) (XFCPATTERN(x)->fcpatPtr) | |
| 70 | |
| 3931 | 71 #define FONTCONFIG_EXPOSE_CONFIG |
| 72 #ifdef FONTCONFIG_EXPOSE_CONFIG | |
| 73 | |
| 74 struct fc_config | |
| 75 { | |
| 76 struct LCRECORD_HEADER header; | |
| 77 FcConfig *fccfgPtr; | |
| 78 }; | |
| 79 | |
| 80 typedef struct fc_config fc_config; | |
| 81 | |
| 82 DECLARE_LRECORD(fc_config, struct fc_config); | |
| 83 #define XFCCONFIG(x) XRECORD (x, fc_config, struct fc_config) | |
| 84 #define wrap_fcconfig(p) wrap_record (p, fc_config) | |
| 85 #define FCCONFIGP(x) RECORDP (x, fc_config) | |
| 86 #define CHECK_FCCONFIG(x) CHECK_RECORD (x, fc_config) | |
| 87 #define CONCHECK_FCCONFIG(x) CONCHECK_RECORD (x, fc_config) | |
| 88 #define XFCCONFIG_PTR(x) (XFCCONFIG(x)->fccfgPtr) | |
| 89 | |
| 90 #endif /* FONTCONFIG_EXPOSE_CONFIG */ | |
| 91 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
92 #ifdef HAVE_XFT |
|
4328
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
93 |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
94 #ifndef HAVE_FCCONFIGGETRESCANINTERVAL |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
95 /* Older fontconfig versions misspell this function name. */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
96 #define FcConfigGetRescanInterval FcConfigGetRescanInverval |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
97 #endif /* */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
98 |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
99 #ifndef HAVE_FCCONFIGSETRESCANINTERVAL |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
100 /* Older fontconfig versions misspell this function name. */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
101 #define FcConfigSetRescanInterval FcConfigSetRescanInverval |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
102 #endif /* */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
103 |
| 3666 | 104 /* |
| 105 The format of a fontname (as returned by fontconfig) is not well-documented, | |
| 106 But the character repertoire is represented in an ASCII-compatible way. See | |
| 107 fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. | |
| 108 | |
| 109 Currently we have a hack where different versions of the unparsed name are | |
| 110 used in different contexts fairly arbitrarily. I don't think this is close | |
| 111 to coherency; even without the charset and lang properties fontconfig names | |
| 112 are too unwieldy to use. We need to rethink the approach here. I think | |
| 113 probably Lisp_Font_Instance.name should contain the font name as specified | |
| 114 to Lisp (almost surely much shorter than shortname, even, and most likely | |
| 115 wildcarded), while Lisp_Font_Instance.truename should contain the longname. | |
| 116 For now, I'm going to #ifdef the return values defaulting to short. -- sjt | |
| 117 */ | |
| 118 | |
| 119 /* DEBUGGING STUFF */ | |
| 120 | |
| 121 /* print message to stderr: one internal-format string argument */ | |
| 122 #define DEBUG_XFT0(level,s) \ | |
| 123 if (debug_xft > level) stderr_out (s) | |
| 124 | |
| 125 /* print message to stderr: one formatted argument */ | |
| 126 #define DEBUG_XFT1(level,format,x1) \ | |
| 127 if (debug_xft > level) stderr_out (format, x1) | |
| 128 | |
| 129 /* print message to stderr: two formatted arguments */ | |
| 130 #define DEBUG_XFT2(level,format,x1,x2) \ | |
| 131 if (debug_xft > level) stderr_out (format, x1, x2) | |
| 132 | |
| 133 /* print message to stderr: three formatted arguments */ | |
| 134 #define DEBUG_XFT3(level,format,x1,x2,x3) \ | |
| 135 if (debug_xft > level) stderr_out (format, x1, x2, x3) | |
| 136 | |
| 137 /* print message to stderr: four formatted arguments */ | |
| 138 #define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ | |
| 139 if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) | |
| 140 | |
| 141 /* print an Xft pattern to stderr | |
| 142 LEVEL is the debug level (to compare to debug_xft) | |
| 143 FORMAT is a newline-terminated printf format with one %s for the pattern | |
| 144 and must be internal format (eg, pure ASCII) | |
| 145 PATTERN is an FcPattern *. */ | |
| 146 #define PRINT_XFT_PATTERN(level,format,pattern) \ | |
| 147 do { \ | |
| 148 DECLARE_EISTRING (eistrpxft_name); \ | |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
149 Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \ |
| 3666 | 150 \ |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
151 eicpy_ext(eistrpxft_name, \ |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
152 name ? name : "FONT WITH NULL NAME", \ |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
153 Qfc_font_name_encoding); \ |
| 3666 | 154 DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ |
| 155 free (name); \ | |
| 156 } while (0) | |
| 157 | |
| 158 /* print a progress message | |
| 159 LEVEL is the debug level (to compare to debug_xft) | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
160 FONT is the Xft font name in Mule internal encoding (from an eistring). |
| 3666 | 161 LANG is the language being checked for support (must be ASCII). */ |
| 162 #define CHECKING_LANG(level,font,lang) \ | |
| 163 do { \ | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
164 DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \ |
| 3666 | 165 } while (0) |
| 166 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
167 #else /* HAVE_XFT */ |
| 3666 | 168 |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
169 #endif /* HAVE_XFT */ |
| 3666 | 170 |
| 3354 | 171 #endif /* INCLUDED_font_mgr_h_ */ |