Mercurial > hg > xemacs-beta
annotate lwlib/xlwtabsP.h @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 382b11fa8866 |
| children | a6c778975d7d |
| rev | line source |
|---|---|
| 424 | 1 /* Tabs Widget for XEmacs. |
| 2 Copyright (C) 1999 Edward A. Falk | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 434 | 21 /* Synched up with: TabsP.h 1.8 */ |
| 424 | 22 |
| 23 /* | |
| 24 * TabsP.h - Private definitions for Index Tabs widget | |
| 25 */ | |
| 26 | |
| 27 #ifndef _TabsP_h | |
| 28 #define _TabsP_h | |
| 29 | |
| 30 /*********************************************************************** | |
| 31 * | |
| 32 * Tabs Widget Private Data | |
| 33 * | |
| 34 ***********************************************************************/ | |
| 35 | |
| 36 #include <X11/IntrinsicP.h> | |
| 37 | |
| 38 #ifdef NEED_MOTIF | |
| 39 #include <Xm/XmP.h> | |
| 40 #include <Xm/ManagerP.h> | |
| 41 #endif | |
| 42 | |
| 43 #include "xlwtabs.h" | |
| 3094 | 44 #ifdef USE_XFT_TABS |
| 45 #include <X11/Xft/Xft.h> | |
| 46 #endif | |
| 424 | 47 |
| 48 /* New fields for the Tabs widget class record */ | |
| 49 typedef struct {XtPointer extension;} TabsClassPart; | |
| 50 | |
| 51 /* Full class record declaration */ | |
| 52 typedef struct _TabsClassRec { | |
| 53 CoreClassPart core_class; | |
| 54 CompositeClassPart composite_class; | |
| 55 ConstraintClassPart constraint_class; | |
| 56 #ifdef NEED_MOTIF | |
| 57 XmManagerClassPart manager_class; | |
| 58 #endif | |
| 59 TabsClassPart tabs_class; | |
| 60 } TabsClassRec; | |
| 61 | |
| 62 extern TabsClassRec tabsClassRec; | |
| 63 | |
| 64 | |
| 65 | |
| 66 /**************************************************************** | |
| 67 * | |
| 68 * instance record declaration | |
| 69 * | |
| 70 ****************************************************************/ | |
| 71 | |
| 72 /* New fields for the Tabs widget record */ | |
| 73 typedef struct { | |
| 74 /* resources */ | |
| 75 XFontStruct *font ; | |
| 3094 | 76 #ifdef USE_XFT_TABS |
| 3397 | 77 XftFont *renderFont; |
| 78 String fcFontName; | |
| 3685 | 79 String xftFontName; |
| 3094 | 80 #endif |
| 424 | 81 Dimension internalHeight, internalWidth ; |
| 82 Widget topWidget ; | |
| 83 XtCallbackList callbacks ; | |
| 84 XtCallbackList popdownCallbacks ; | |
| 85 Boolean selectInsensitive ; | |
| 86 Boolean be_nice_to_cmap ; | |
| 87 int top_shadow_contrast ; | |
| 88 int bot_shadow_contrast ; | |
| 89 int insensitive_contrast ; | |
| 90 | |
| 91 /* private state */ | |
| 92 Widget hilight ; | |
| 93 GC foregroundGC ; | |
| 94 GC backgroundGC ; | |
| 95 GC greyGC ; | |
| 96 GC topGC ; | |
| 97 GC botGC ; | |
| 98 Dimension tab_height ; /* height of tabs (all the same) */ | |
| 99 /* Note: includes top shadow only */ | |
| 100 Dimension tab_total ; /* total height of all tabs */ | |
| 101 Dimension child_width, child_height; /* child size, including borders */ | |
| 102 Dimension max_cw, max_ch ; /* max child preferred size */ | |
| 103 Cardinal numRows ; | |
| 446 | 104 Cardinal realRows; /* XEmacs addition */ |
| 424 | 105 XtGeometryMask last_query_mode; |
| 106 Boolean needs_layout ; | |
| 107 Pixmap grey50 ; /* TODO: cache this elsewhere */ | |
| 108 } TabsPart; | |
| 109 | |
| 110 | |
| 111 typedef struct _TabsRec { | |
| 112 CorePart core; | |
| 113 CompositePart composite; | |
| 114 ConstraintPart constraint; | |
| 115 #ifdef NEED_MOTIF | |
| 116 XmManagerPart manager; | |
| 117 #endif | |
| 118 TabsPart tabs; | |
| 119 } TabsRec; | |
| 120 | |
| 121 | |
| 122 | |
| 123 | |
| 124 /**************************************************************** | |
| 125 * | |
| 3397 | 126 * Constraint record declaration |
| 424 | 127 * |
| 128 ****************************************************************/ | |
| 129 | |
| 130 typedef struct _TabsConstraintsPart { | |
| 131 /* resources */ | |
| 132 String label ; | |
| 133 Pixmap left_bitmap ; | |
| 134 Pixel foreground ; | |
| 135 Boolean resizable ; | |
| 136 | |
| 137 /* private state */ | |
| 138 Pixel grey ; | |
| 139 Boolean greyAlloc ; | |
| 446 | 140 Boolean visible; /* XEmacs change */ |
| 424 | 141 Dimension width ; /* tab width */ |
| 142 Position x,y ; /* tab base position */ | |
| 143 short row ; /* tab row */ | |
| 144 Position l_x, l_y ; /* label position */ | |
| 145 Position lbm_x, lbm_y ; /* bitmap position */ | |
| 146 unsigned int lbm_width, lbm_height, lbm_depth ; | |
| 147 } TabsConstraintsPart ; | |
| 148 | |
| 149 typedef struct _TabsConstraintsRec { | |
| 150 #ifdef NEED_MOTIF | |
| 151 XmManagerConstraintPart manager; | |
| 152 #endif | |
| 153 TabsConstraintsPart tabs ; | |
| 154 } TabsConstraintsRec, *TabsConstraints ; | |
| 155 | |
| 156 | |
| 157 #endif /* _TabsP_h */ |