xemacs-beta: lwlib/xt-wrappers.h annotate

annotate lwlib/xt-wrappers.h @ 4604:e0a8715fdb1f

Support new IGNORE-INVALID-SEQUENCESP argument, #'query-coding-region. lisp/ChangeLog addition: 2009-02-07 Aidan Kehoe <kehoea@parhasard.net> * coding.el (query-coding-clear-highlights): Rename the BUFFER argument to BUFFER-OR-STRING, describe it as possibly being a string in its documentation. (default-query-coding-region): Add a new IGNORE-INVALID-SEQUENCESP argument, document that this function does not support it. Bind case-fold-search to nil, we don't want this to influence what the function thinks is encodable or not. (query-coding-region): Add a new IGNORE-INVALID-SEQUENCESP argument, document what it does; reflect this new argument in the associated compiler macro. (query-coding-string): Add a new IGNORE-INVALID-SEQUENCESP argument, document what it does. Support the HIGHLIGHT argument correctly. * unicode.el (unicode-query-coding-region): Add a new IGNORE-INVALID-SEQUENCESP argument, document what it does, implement this. Document a potential problem. Use #'query-coding-clear-highlights instead of reimplementing it ourselves. Remove some debugging messages. * mule/arabic.el (iso-8859-6): * mule/cyrillic.el (iso-8859-5): * mule/greek.el (iso-8859-7): * mule/hebrew.el (iso-8859-8): * mule/latin.el (iso-8859-2): * mule/latin.el (iso-8859-3): * mule/latin.el (iso-8859-4): * mule/latin.el (iso-8859-14): * mule/latin.el (iso-8859-15): * mule/latin.el (iso-8859-16): * mule/latin.el (iso-8859-9): * mule/latin.el (windows-1252): * mule/mule-coding.el (iso-8859-1): Avoid the assumption that characters not given an explicit mapping in these coding systems map to the ISO 8859-1 characters corresponding to the octets on disk; this makes it much more reasonable to implement the IGNORE-INVALID-SEQUENCESP argument to query-coding-region. * mule/mule-cmds.el (set-language-info): Correct the docstring. * mule/mule-cmds.el (finish-set-language-environment): Treat invalid Unicode sequences produced from invalid-sequence-coding-system and corresponding to control characters the same as control characters in redisplay. * mule/mule-cmds.el: Document that encode-coding-char is available in coding.el * mule/mule-coding.el (make-8-bit-generate-helper): Change to return the both the encode-program generated and the relevant non-ASCII charset; update the docstring to reflect this. * mule/mule-coding.el (make-8-bit-generate-encode-program-and-skip-chars-strings): Rename this function; have it return skip-chars-strings as well as the encode program. Have these skip-chars-strings use ranges for charsets, where possible. * mule/mule-coding.el (make-8-bit-create-decode-encode-tables): Revise this to allow people to specify explicitly characters that should be undefined (= corresponding to keys in unicode-error-default-translation-table), and treating unspecified octets above #x7f as undefined by default. * mule/mule-coding.el (8-bit-fixed-query-coding-region): Add a new IGNORE-INVALID-SEQUENCESP argument, implement support for it using the 8-bit-fixed-invalid-sequences-skip-chars coding system property; remove some debugging messages. * mule/mule-coding.el (make-8-bit-coding-system): This function is dumped, autoloading it makes no sense. Document what happens when characters above #x7f are not specified, implement this. * mule/vietnamese.el: Correct spelling. tests/ChangeLog addition: 2009-02-07 Aidan Kehoe <kehoea@parhasard.net> * automated/query-coding-tests.el: Add FAILING-CASE arguments to the Assert calls, making #'q-c-debug mostly unnecessary. Remove #'q-c-debug. Add new tests that use the IGNORE-INVALID-SEQUENCESP argument to #'query-coding-region; rework the existing ones to respect it.

author	Aidan Kehoe <kehoea@parhasard.net>
date	Sat, 07 Feb 2009 17:13:37 +0000
parents	726060ee587c
children	2ade80e8c640

rev	line source
4528 726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	1 /* Wrappers for Xt functions and macros
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	2
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	3 Copyright (C) 2008 Free Software Foundation
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	4
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	5 This file is part of XEmacs.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	6
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	7 XEmacs is free software; you can redistribute it and/or modify it
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	9 Free Software Foundation; either version 2, or (at your option) any
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	10 later version.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	11
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	15 for more details.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	16 You should have received a copy of the GNU General Public License
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	17 along with XEmacs; see the file COPYING. If not, write to
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	19 Boston, MA 02111-1307, USA. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	20
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	21 /* Synched up with: Not in FSF. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	22
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	23 /* Original author: Stephen J. Turnbull for 21.5.29 */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	24
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	25 /* Generic utility macros, including coping with G++ whining.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	26 Used in lwlib via lwlib.h and X consoles via console-x.h.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	27
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	28 We would prefer to find another way to shut up G++. The issue is that
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	29 recent versions of the C++ standard deprecate implicit conversions
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	30 across function boundaries like
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	31
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	32 typedef char *String;
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	33 void foo (String string);
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	34 foo ("bar");
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	35
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	36 because "bar" should be allowed to be a read-only array of chars. But of
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	37 course lots of legacy code (== X11) declares things as char * and expects
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	38 to assign literal strings to them. Now, the typedef in the example is
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	39 important because in G++ 4.3.2 at least, this
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	40
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	41 void foo (const String string);
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	42 foo ("bar");
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	43
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	44 does not work as expected! G++ still warns about this construct. However,
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	45 if foo is declared
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	46
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	47 void foo (const char *string);
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	48
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	49 G++ does not complain. (#### There are two possibilities I can think of.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	50 (a) G++ is buggy. (b) "const String" is interpreted as "char * const".)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	51
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	52 The upshot is that to avoid warnings with Xt's String typedef, we need to
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	53 arrange to cast literal strings to String, rather than use "const String"
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	54 in declarations. (My <X11/Intrinsic.h> says that the actual internal
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	55 typedef used is _XtString, so that String can be #define'd to something
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	56 else for the purposes of C++. But that doesn't really help us much.)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	57
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	58 It's not very satisfactory to do it this way -- it would be much better to
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	59 have const Strings where they make sense -- but it does eliminate a few
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	60 hundred warnings from the C++ build. And in any case we don't control the
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	61 many objects declared with String components in Intrinsic.h. The remaining
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	62 issues are the WEXTTEXT macro used in src/emacs.c, and Emacs.ad.h (where
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	63 instead of String we use const char * in src/event-Xt.c in the array that
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	64 #includes it).
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	65 */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	66
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	67 #ifndef INCLUDED_xt_wrappers_h_
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	68 #define INCLUDED_xt_wrappers_h_
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	69
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	70 /* Wrap XtResource, with the same elements as arguments.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	71 The cast to String shuts up G++ 4.3's whining about const char *.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	72 The invocation of sizeof should be pretty safe, and the cast to XtPointer
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	73 surely is, since that's how that member of XtResource is declared. It
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	74 doesn't hide potential problems, because XtPointer is a "generic" type in
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	75 any case -- the actual object will have a different type, that will be
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	76 cast to XtPointer. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	77
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	78 #define Xt_RESOURCE(name,_class,intrepr,type,member,extrepr,value) \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	79 { (String) name, (String) _class, (String) intrepr, sizeof(type), \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	80 member, extrepr, (XtPointer) value }
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	81
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	82 /* Wrap XtSetArg, with the same arguments.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	83 The cast to String shuts up G++ 4.3's whining about const char . /
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	84
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	85 #define Xt_SET_ARG(al, resource, x) do { \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	86 XtSetArg ((al), (String) (resource), (x)); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	87 } while (0)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	88
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	89 /* Convenience macros for getting/setting one resource value. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	90
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	91 #define Xt_SET_VALUE(widget, resource, value) do { \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	92 Arg al; \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	93 Xt_SET_ARG (al, resource, value); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	94 XtSetValues (widget, &al, 1); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	95 } while (0)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	96
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	97 #define Xt_GET_VALUE(widget, resource, location) do { \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	98 Arg al; \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	99 Xt_SET_ARG (al, resource, location); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	100 XtGetValues (widget, &al, 1); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	101 } while (0)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	102
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	103 #endif /* INCLUDED_xt_wrappers_h_ */

rev	line source
4528 726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	1 /* Wrappers for Xt functions and macros
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	2
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	3 Copyright (C) 2008 Free Software Foundation
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	4
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	5 This file is part of XEmacs.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	6
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	7 XEmacs is free software; you can redistribute it and/or modify it
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	9 Free Software Foundation; either version 2, or (at your option) any
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	10 later version.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	11
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	15 for more details.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	16 You should have received a copy of the GNU General Public License
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	17 along with XEmacs; see the file COPYING. If not, write to
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	19 Boston, MA 02111-1307, USA. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	20
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	21 /* Synched up with: Not in FSF. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	22
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	23 /* Original author: Stephen J. Turnbull for 21.5.29 */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	24
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	25 /* Generic utility macros, including coping with G++ whining.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	26 Used in lwlib via lwlib.h and X consoles via console-x.h.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	27
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	28 We would prefer to find another way to shut up G++. The issue is that
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	29 recent versions of the C++ standard deprecate implicit conversions
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	30 across function boundaries like
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	31
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	32 typedef char *String;
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	33 void foo (String string);
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	34 foo ("bar");
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	35
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	36 because "bar" should be allowed to be a read-only array of chars. But of
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	37 course lots of legacy code (== X11) declares things as char * and expects
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	38 to assign literal strings to them. Now, the typedef in the example is
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	39 important because in G++ 4.3.2 at least, this
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	40
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	41 void foo (const String string);
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	42 foo ("bar");
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	43
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	44 does not work as expected! G++ still warns about this construct. However,
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	45 if foo is declared
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	46
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	47 void foo (const char *string);
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	48
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	49 G++ does not complain. (#### There are two possibilities I can think of.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	50 (a) G++ is buggy. (b) "const String" is interpreted as "char * const".)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	51
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	52 The upshot is that to avoid warnings with Xt's String typedef, we need to
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	53 arrange to cast literal strings to String, rather than use "const String"
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	54 in declarations. (My <X11/Intrinsic.h> says that the actual internal
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	55 typedef used is _XtString, so that String can be #define'd to something
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	56 else for the purposes of C++. But that doesn't really help us much.)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	57
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	58 It's not very satisfactory to do it this way -- it would be much better to
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	59 have const Strings where they make sense -- but it does eliminate a few
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	60 hundred warnings from the C++ build. And in any case we don't control the
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	61 many objects declared with String components in Intrinsic.h. The remaining
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	62 issues are the WEXTTEXT macro used in src/emacs.c, and Emacs.ad.h (where
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	63 instead of String we use const char * in src/event-Xt.c in the array that
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	64 #includes it).
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	65 */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	66
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	67 #ifndef INCLUDED_xt_wrappers_h_
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	68 #define INCLUDED_xt_wrappers_h_
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	69
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	70 /* Wrap XtResource, with the same elements as arguments.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	71 The cast to String shuts up G++ 4.3's whining about const char *.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	72 The invocation of sizeof should be pretty safe, and the cast to XtPointer
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	73 surely is, since that's how that member of XtResource is declared. It
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	74 doesn't hide potential problems, because XtPointer is a "generic" type in
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	75 any case -- the actual object will have a different type, that will be
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	76 cast to XtPointer. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	77
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	78 #define Xt_RESOURCE(name,_class,intrepr,type,member,extrepr,value) \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	79 { (String) name, (String) _class, (String) intrepr, sizeof(type), \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	80 member, extrepr, (XtPointer) value }
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	81
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	82 /* Wrap XtSetArg, with the same arguments.
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	83 The cast to String shuts up G++ 4.3's whining about const char . /
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	84
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	85 #define Xt_SET_ARG(al, resource, x) do { \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	86 XtSetArg ((al), (String) (resource), (x)); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	87 } while (0)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	88
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	89 /* Convenience macros for getting/setting one resource value. */
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	90
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	91 #define Xt_SET_VALUE(widget, resource, value) do { \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	92 Arg al; \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	93 Xt_SET_ARG (al, resource, value); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	94 XtSetValues (widget, &al, 1); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	95 } while (0)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	96
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	97 #define Xt_GET_VALUE(widget, resource, location) do { \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	98 Arg al; \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	99 Xt_SET_ARG (al, resource, location); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	100 XtGetValues (widget, &al, 1); \
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	101 } while (0)
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	102
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. Needs ChangeLogs. Stephen J. Turnbull <stephen@xemacs.org> parents: diff changeset	103 #endif /* INCLUDED_xt_wrappers_h_ */

Mercurial > hg > xemacs-beta

annotate lwlib/xt-wrappers.h @ 4604:e0a8715fdb1f