Mercurial > hg > xemacs-beta
view src/objects-x-impl.h @ 4884:29fb3baea939
Fix the bugs necessary to resolve the trivial test failures in mule-tests.el
lisp/ChangeLog addition:
2010-01-26 Aidan Kehoe <kehoea@parhasard.net>
* mule/vietnamese.el (viscii): Correct the mapping here, #xA6 is
actually *SMALL* LETTER A WITH CIRCUMFLEX AND HOOK ABOVE.
* mule/cyrillic.el (koi8-c): Correct the mapping here, #x8C is
actually ?\u04D9. Add a case mapping for it.
tests/ChangeLog addition:
2010-01-26 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Only give the list of character sets in HELLO once; correct it to
reflect its current contents and the extant character sets.
etc/ChangeLog addition:
2010-01-26 Aidan Kehoe <kehoea@parhasard.net>
* HELLO: Encode the Arabic in arabic-iso8859-6 once more; delete
the old, experimentally-encoded Thai.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Tue, 26 Jan 2010 02:22:10 +0000 |
parents | ad2f4ae9895b |
children | 87175eb65ff4 |
line wrap: on
line source
/* X-specific Lisp objects. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996, 2002 Ben Wing. 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. */ /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-10-00. */ #ifndef INCLUDED_objects_x_impl_h_ #define INCLUDED_objects_x_impl_h_ #include "objects-impl.h" #include "objects-x.h" #ifdef USE_XFT /* for resource name definitions, etc */ #include "../lwlib/lwlib-fonts.h" #endif #ifdef HAVE_X_WINDOWS /***************************************************************************** Color-Instance ****************************************************************************/ struct x_color_instance_data { XColor color; /* Yes, it looks crazy to have both the XColor and the XftColor, but pragmatically both are used. */ #ifdef USE_XFT XftColor xftColor; #endif char dealloc_on_gc; }; #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data) #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color) #ifdef USE_XFT #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor) #endif #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) /***************************************************************************** Font-Instance ****************************************************************************/ struct x_font_instance_data { /* X-specific information */ /* Yes, it looks crazy to have both the XFontStruct and the XftFont, but pragmatically both are used (lwlib delegates labels to the widget sets, which internally use XFontStructs). */ XFontStruct * font; #ifdef USE_XFT XftFont *xftFont; #endif }; #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data) #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font) #ifdef USE_XFT #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont) #endif #endif /* HAVE_X_WINDOWS */ #endif /* INCLUDED_objects_x_impl_h_ */