Mercurial > hg > xemacs-beta
view src/scrollbar-x.h @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | fdefd0186b75 |
children | 308d34e9f07d |
line wrap: on
line source
/* Define X-specific scrollbar instance. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 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 FSF. */ #ifndef INCLUDED_scrollbar_x_h_ #define INCLUDED_scrollbar_x_h_ #if defined (HAVE_X_WINDOWS) && defined (HAVE_SCROLLBARS) #include "scrollbar.h" struct x_scrollbar_data { /* Unique scrollbar identifier and name. */ unsigned int id; char *name; /* Is set if we have already set the backing_store attribute correctly */ char backing_store_initialized; /* Positioning and sizing information for scrollbar and slider. */ scrollbar_values pos_data; /* Pointer to the scrollbar widget this structure describes. */ Widget widget; #if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID) || \ defined (LWLIB_SCROLLBARS_ATHENA3D) /* Recorded starting position for Motif-like scrollbar drags. */ int vdrag_orig_value; Charbpos vdrag_orig_window_start; #endif }; #define SCROLLBAR_X_DATA(i) ((struct x_scrollbar_data *) ((i)->scrollbar_data)) #define SCROLLBAR_X_ID(i) (SCROLLBAR_X_DATA (i)->id) #define SCROLLBAR_X_NAME(i) (SCROLLBAR_X_DATA (i)->name) #define SCROLLBAR_X_BACKING_STORE_INITIALIZED(i) \ (SCROLLBAR_X_DATA (i)->backing_store_initialized) #define SCROLLBAR_X_POS_DATA(i) (SCROLLBAR_X_DATA (i)->pos_data) #define SCROLLBAR_X_WIDGET(i) (SCROLLBAR_X_DATA (i)->widget) #if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID) || \ defined (LWLIB_SCROLLBARS_ATHENA3D) #define SCROLLBAR_X_VDRAG_ORIG_VALUE(i) \ (SCROLLBAR_X_DATA (i)->vdrag_orig_value) #define SCROLLBAR_X_VDRAG_ORIG_WINDOW_START(i) \ (SCROLLBAR_X_DATA (i)->vdrag_orig_window_start) #endif void x_update_frame_scrollbars (struct frame *f); void x_set_scrollbar_pointer (struct frame *f, Lisp_Object cursor); #endif /* HAVE_X_WINDOWS and HAVE_SCROLLBARS */ #endif /* INCLUDED_scrollbar_x_h_ */