Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-colors.h @ 5222:18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
src/ChangeLog addition:
2010-05-31 Aidan Kehoe <kehoea@parhasard.net>
* rangetab.c (print_range_table, rangetab_instantiate)
(structure_type_create_rangetab):
* chartab.c (print_char_table, chartab_instantiate)
(structure_type_create_chartab):
* faces.c (syms_of_faces, print_face, face_validate):
Move structure syntax in these files to using keywords by default,
as is done in Common Lisp and GNU Emacs, accepting for the moment
the older non-keywords syntax too.
* glyphs.h: No need to have Q_data here.
* general-slots.h: Add Q_data, Q_type here.
* config.h.in (NEED_TO_HANDLE_21_4_CODE):
New #define, always 1 for the moment, replacing the previous
never-really-used NO_NEED_TO_HANDLE_21_4_CODE, and avoiding
confusing syntax.
* eval.c (Ffuncall): Wrap the hack that allows #'throw to be
funcalled in #ifdef NEED_TO_HANDLE_21_4_CODE.
* elhash.c (syms_of_elhash): Move Q_type, Q_data to
general-slots.h. Change to NEED_TO_HANDLE_21_4_CODE throughout
this file.
lisp/ChangeLog addition:
2010-05-31 Aidan Kehoe <kehoea@parhasard.net>
* specifier.el (current-display-table):
Use keywords in the structure syntax here, now we've moved to that
by default in C.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 31 May 2010 16:47:44 +0100 |
| parents | 8b2f75cecb89 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 3094 | 1 /* Color data structures for X and Xft. |
| 2 | |
| 3 Copyright (C) 2004 Free Software Foundation, Inc. | |
| 4 | |
| 5 Author: Stephen J. Turnbull <stephen@xemacs.org> | |
| 6 Created: 24 Jul 2004 by Stephen J. Turnbull | |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
| 10 XEmacs is free software; you can redistribute it and/or modify it | |
| 11 under the terms of the GNU General Public License as published by the | |
| 12 Free Software Foundation; either version 2, or (at your option) any | |
| 13 later version. | |
| 14 | |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 21 along with XEmacs; see the file COPYING. If not, write to | |
| 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 Boston, MA 02111-1307, USA. */ | |
| 24 | |
| 25 /* Synched up with: Not in GNU Emacs. */ | |
| 26 | |
| 27 #ifndef INCLUDED_lwlib_colors_h_ | |
| 28 #define INCLUDED_lwlib_colors_h_ | |
| 29 | |
| 30 #include <X11/Xlib.h> | |
| 31 | |
| 32 /* WIDGET is an Xt widget, VISUAL and DEPTH are return values */ | |
| 33 void visual_info_from_widget (Widget widget, Visual **visual, int *depth); | |
| 34 | |
| 35 /* basic version from xlwmenu.c */ | |
| 36 int FIXME_allocate_nearest_color (Display *display, Colormap screen_colormap, | |
| 37 XColor *color_def); | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
38 /* haired-up version from ../src/fontcolor-x.c */ |
| 3094 | 39 int x_allocate_nearest_color (Display *display, Colormap screen_colormap, |
| 40 Visual *visual, XColor *color_def); | |
| 41 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
42 #ifdef HAVE_XFT |
| 3094 | 43 #define _XFT_NO_COMPAT_ |
| 44 /* shut up GCC */ | |
| 45 #define face_index face_index_arg | |
| 46 #define glyph_index glyph_index_arg | |
| 47 #include <X11/Xft/Xft.h> | |
| 48 #undef glyph_index | |
| 49 #undef face_index | |
| 50 | |
| 51 #if XFT_MAJOR < 2 | |
| 52 #error Xft versions < 2 not supported | |
| 53 #endif | |
| 54 | |
| 55 XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual, | |
| 56 int c, int dim); | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3094
diff
changeset
|
57 #endif /* HAVE_XFT */ |
| 3094 | 58 |
| 59 #endif /* INCLUDED_lwlib_colors_h_ */ |