1
diff -b -r xmt_212/Xmt/AskForBool.c Xmt310/Xmt/AskForBool.c
3
< static Cardinal button_values[] = {
5
> static int button_values[] = {
7
< long icon_type_default,
9
> int icon_type_default,
11
< long icon_type_default;
13
> int icon_type_default;
15
< title = XmtCreateLocalizedXmString(w, data.title);
16
< yes_label = XmtCreateLocalizedXmString(w, data.yes_label);
17
< no_label = XmtCreateLocalizedXmString(w, data.no_label);
18
< cancel_label = XmtCreateLocalizedXmString(w, data.cancel_label);
20
> title = XmtCreateXmString(data.title);
21
> yes_label = XmtCreateXmString(data.yes_label);
22
> no_label = XmtCreateXmString(data.no_label);
23
> cancel_label = XmtCreateXmString(data.cancel_label);
27
diff -b -r xmt_212/Xmt/AskForFile.c Xmt310/Xmt/AskForFile.c
29
< #include <Xm/List.h>
31
< /* extern int errno; */
33
< message = XmtCreateLocalizedXmString(w, data.message);
34
< title = XmtCreateLocalizedXmString(w, data.title);
35
< directory = XmtCreateLocalizedXmString(w, data.directory);
36
< pattern = XmtCreateLocalizedXmString(w, data.pattern);
38
> message = XmtCreateXmString(data.message);
39
> title = XmtCreateXmString(data.title);
40
> directory = XmtCreateXmString(data.directory);
41
> pattern = XmtCreateXmString(data.pattern);
45
diff -b -r xmt_212/Xmt/AskForItem.c Xmt310/Xmt/AskForItem.c
46
< #include <Xm/List.h>
48
< message = XmtCreateLocalizedXmString(w, data.message);
49
< title = XmtCreateLocalizedXmString(w, data.title);
50
< list_title = XmtCreateLocalizedXmString(w, data.list_title);
52
> message = XmtCreateXmString(data.message);
53
> title = XmtCreateXmString(data.title);
54
> list_title = XmtCreateXmString(data.list_title);
56
< item_labels[i] = XmtCreateLocalizedXmString(w, data.items[i]);
58
> item_labels[i] = XmtCreateXmString(data.items[i]);
60
< default_item_label = XmtCreateLocalizedXmString(w, buffer_return);
62
> default_item_label = XmtCreateXmString(buffer_return);
66
diff -b -r xmt_212/Xmt/AskForString.c Xmt310/Xmt/AskForString.c
70
< message = XmtCreateLocalizedXmString(w, data.message);
71
< title = XmtCreateLocalizedXmString(w, data.title);
73
> message = XmtCreateXmString(data.message);
74
> title = XmtCreateXmString(data.title);
78
diff -b -r xmt_212/Xmt/AssertClass.c Xmt310/Xmt/AssertClass.c
82
> extern void abort();
87
diff -b -r xmt_212/Xmt/CallbackCvt.c Xmt310/Xmt/CallbackCvt.c
92
diff -b -r xmt_212/Xmt/Chooser.c Xmt310/Xmt/Chooser.c
94
< /* printf("cw->chooser.type => %d\n", cw->chooser.type); */
97
< size_t size = cw->chooser.num_items * cw->chooser.value_size;
99
> int size = cw->chooser.num_items * cw->chooser.value_size;
101
< static Cardinal values[] = {
103
> static int values[] = {
105
< item_labels[i] = XmtCreateLocalizedXmString((Widget) nw,
106
< nw->chooser.strings[i]);
108
> item_labels[i] = XmtCreateXmString(nw->chooser.strings[i]);
112
diff -b -r xmt_212/Xmt/Chooser.h Xmt310/Xmt/Chooser.h
114
< XmtChooserRadioBox = 0, /* one-of-many toggles */
116
> XmtChooserRadioBox, /* one-of-many toggles */
120
diff -b -r xmt_212/Xmt/Cli.c Xmt310/Xmt/Cli.c
122
< buf = XtMalloc(len+2);
124
> buf = XtMalloc(len+1);
126
< if (cw->cli.escape_newlines && (len > 0) && buf[len-1] == '\\') {
128
> if (cw->cli.escape_newlines && buf[len-1] == '\\') {
130
< XmString label = XmtCreateLocalizedXmString((Widget) cw, cw->cli.page_string);
132
> XmString label = XmtCreateXmString(cw->cli.page_string);
139
diff -b -r xmt_212/Xmt/Color.c Xmt310/Xmt/Color.c
142
< ** undefine if you don't want the full colormap fix
143
< ** contributed by Glenn Carr
145
< #define CLOSEST_COLOR
148
< #ifdef CLOSEST_COLOR
150
< /* Legal Garbage: I borrowed the basis of this code from the...
153
< * by John Ousterhout (and many others at Sun Microsystems and elsewhere)
154
< * john.ousterhout@eng.sun.com
156
< * This software is copyrighted by the Regents of the University of
157
< * California, Sun Microsystems, Inc., and other parties. The following
158
< * terms apply to all files associated with the software unless explicitly
159
< * disclaimed in individual files.
161
< * The authors hereby grant permission to use, copy, modify, distribute,
162
< * and license this software and its documentation for any purpose, provided
163
< * that existing copyright notices are retained in all copies and that this
164
< * notice is included verbatim in any distributions. No written agreement,
165
< * license, or royalty fee is required for any of the authorized uses.
166
< * Modifications to this software may be copyrighted by their authors
167
< * and need not follow the licensing terms described here, provided that
168
< * the new terms are clearly indicated on the first page of each file where
171
< * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
172
< * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
173
< * ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
174
< * DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
175
< * POSSIBILITY OF SUCH DAMAGE.
177
< * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
178
< * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
179
< * FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
180
< * IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
181
< * NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
184
< * RESTRICTED RIGHTS: Use, duplication or disclosure by the government
185
< * is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
186
< * of the Rights in Technical Data and Computer Software Clause as DFARS
187
< * 252.227-7013 and FAR 52.227-19.
190
< #if NeedFunctionPrototypes
192
< FindClosestColor(Screen * screen,
194
< XColor * pxcolorDesired,
195
< XColor * pxcolorActual)
198
< FindClosestColor(screen, colormap, pxcolorDesired, pxcolorActual)
201
< XColor * pxcolorDesired;
202
< XColor * pxcolorActual;
205
< float closestDistance, distance, tmp;
206
< Display *dpy = DisplayOfScreen(screen);
207
< XtAppContext appContext = XtDisplayToApplicationContext(dpy);
208
< Visual *pvisual = XDefaultVisualOfScreen(screen);
209
< static XColor *pxcolors;
211
< int nColors = pvisual->map_entries;
214
< * Get all the colors from the colormap. These should all be
215
< * allocated, otherwise we wouldn't be here.
217
< if (NULL == pxcolors) {
218
< pxcolors = calloc(nColors, sizeof(*pxcolors));
219
< for (i = 0; i < nColors; i++)
220
< pxcolors[i].pixel = i;
222
< XQueryColors(dpy, colormap, pxcolors, pvisual->map_entries);
224
< while (nColors > 0) {
225
< closestDistance = 1e30;
227
< for (i = 0; i < nColors; i++) {
229
< * Use Euclidean distance in RGB space, weighted by Y (of YIQ)
230
< * as the objective function; this accounts for differences
231
< * in the color sensitivity of the eye.
233
< tmp = .30 * (((int) pxcolorDesired->red) - (int) pxcolors[i].red);
234
< distance = tmp * tmp;
235
< tmp = .61 * (((int) pxcolorDesired->green) - (int) pxcolors[i].green);
236
< distance += tmp * tmp;
237
< tmp = .11 * (((int) pxcolorDesired->blue) - (int) pxcolors[i].blue);
238
< distance += tmp * tmp;
239
< if (distance < closestDistance) {
241
< closestDistance = distance;
244
< if (XAllocColor(dpy, colormap, &pxcolors[closest])) {
245
< *pxcolorActual = pxcolors[closest];
248
< pxcolors[closest] = pxcolors[nColors - 1];
253
< * Should never get here, but just in case...
257
< Cardinal num_params = 1;
260
< params[0] = szColor;
262
< sprintf(szColor, "#%04x%04x%04x",
263
< pxcolorDesired->red,
264
< pxcolorDesired->green,
265
< pxcolorDesired->blue);
267
< XtAppWarningMsg(appContext, "badValue", "cvtStringToPixel",
268
< "FindClosestColor",
269
< "Can't find approximation for color \"%s\"",
270
< params, &num_params);
273
< } /* FindClosestColor */
278
< #ifdef CLOSEST_COLOR
279
< Screen* screen = XtScreen(w);
283
< #ifdef CLOSEST_COLOR
284
< if (XAllocColor(dpy, cmap, &c1) == 0)
285
< FindClosestColor(screen, cmap, &c1, &c1);
290
< #ifdef CLOSEST_COLOR
291
< if (XAllocColor(dpy, cmap, &c1) == 0)
292
< FindClosestColor(screen, cmap, &c1, &c1);
297
< #ifdef CLOSEST_COLOR
298
< if (XLookupColor(dpy, cmap, name, &c1, &c2)) {
299
< FindClosestColor(screen, cmap, &c2, &c2);
300
< *pixel_return = c2.pixel;
309
< * GDI doesn't include a function for storing colors in
311
> * API doesn't include a function for storing colors in
315
diff -b -r xmt_212/Xmt/ColorTable.c Xmt310/Xmt/ColorTable.c
317
< static char name[14];
321
< color.red = color.green = color.blue = 0;
324
diff -b -r xmt_212/Xmt/Converters.h Xmt310/Xmt/Converters.h
326
< extern void XmtRegisterEnumConverter(StringConst, String *, Cardinal *,
327
< Cardinal, String *);
329
> extern void XmtRegisterEnumConverter(StringConst, String *, int *,
334
diff -b -r xmt_212/Xmt/Create.c Xmt310/Xmt/Create.c
336
> #include <unistd.h>
340
< (*styles)[*num_styles] = style;
342
> *styles[*num_styles] = style;
344
< if (((CompositeWidget)shell)->composite.num_children) {
347
< ** I love Motif uaahh, for our xtech Motif(SUN4) the dialog shells
348
< ** have four children for protocol stuff
349
< ** the last child is the real child of the shell
350
< ** I try this workaround
351
< ** get the number of children and return the last one
353
< int last = ((CompositeWidget)shell)->composite.num_children - 1;
354
< return ((CompositeWidget)shell)->composite.children[last];
357
> if (((CompositeWidget)shell)->composite.num_children)
362
diff -b -r xmt_212/Xmt/Dialog.c Xmt310/Xmt/Dialog.c
364
< if (d->types[i]->set_value_proc) {
366
< if (XtIsManaged(d->widgets[i]))
369
> if (d->types[i]->set_value_proc)
373
< "Resource '%s':\n\twidget type '%s' has no set value procedure",
375
> "Resource '%s':\n\twidget type '%s' nas no set value procedure",
377
< d->widgets = num_resources ?
378
< (Widget *)XtCalloc(num_resources, sizeof(Widget)) : NULL;
379
< d->types = num_resources ? (XmtWidgetType **)
380
< XtCalloc(num_resources, sizeof(XmtWidgetType *)) : NULL;
382
> d->widgets = (Widget *)XtCalloc(num_resources, sizeof(Widget));
383
> d->types = (XmtWidgetType **)
384
> XtCalloc(num_resources, sizeof(XmtWidgetType *));
388
diff -b -r xmt_212/Xmt/Dialogs.h Xmt310/Xmt/Dialogs.h
390
< XmtButtonType, long, XmtWideBoolean, Boolean *,
392
> XmtButtonType, int, XmtWideBoolean, Boolean *,
396
diff -b -r xmt_212/Xmt/EnumCvt.c Xmt310/Xmt/EnumCvt.c
398
< XrmValuePtr args, Cardinal *num_args,
399
< XrmValuePtr from, XrmValuePtr to, XtPointer *data)
401
> XrmValue *args, Cardinal *num_args,
402
> XrmValue *from, XrmValue *to, XtPointer *data)
414
< /* Cardinal *values = *(Cardinal**)args[2].addr; */
415
< /* Cardinal num = (Cardinal)*(XtPointer*)args[3].addr; */
416
< Cardinal *values = (Cardinal*)*(XtPointer*)args[2].addr;
417
< Cardinal num = (Cardinal)*(XtPointer*)args[3].addr;
419
> int *values = *(int **)args[2].addr;
420
> int num = *(int *)args[3].addr;
422
< static Cardinal value; /* static for converter return */
424
> static int value; /* static for converter return */
427
< /* printf("XmtBSearch(target, names, num) => %d\n", i); */
430
< #ifdef CRAY /* short and int are the same size (8 bytes) on the Cray */
432
< *(int *)to->addr = value;
436
< case sizeof(Cardinal):
437
< *(Cardinal *)to->addr = value;
440
> *(int *)to->addr = value;
444
< if (to->size > sizeof(Cardinal)) {
445
< to->size = sizeof(Cardinal);
446
< *(Cardinal *)to->addr = value;
448
> if (to->size > sizeof(int)) {
449
> to->size = sizeof(int);
450
> *(int *)to->addr = value;
452
< to->size = sizeof(Cardinal);
454
> to->size = sizeof(int);
456
< void XmtRegisterEnumConverter(StringConst type, String *names, Cardinal *values,
457
< Cardinal num, String *prefixes)
459
> void XmtRegisterEnumConverter(StringConst type, String *names, int *values,
460
> int num, String *prefixes)
470
diff -b -r xmt_212/Xmt/FindFile.c Xmt310/Xmt/FindFile.c
472
< #include <stdlib.h>
474
< #include <stdlib.h>
475
< #include <unistd.h>
485
< #include <unistd.h>
487
> extern uid_t getuid();
489
> extern int getuid();
491
< #ifdef NeedFunctionPrototypes
492
< static Boolean DebugPredicate(String path)
499
diff -b -r xmt_212/Xmt/FontListCvt.c Xmt310/Xmt/FontListCvt.c
504
< char **missing_list;
507
< char *def_string = NULL;
509
< XmFontListEntry entry;
512
< if (next_entry == NULL)
513
< next_entry = strchr(s, ':');
517
< ** fontset support it is a bit tricky, but needed for multibyte chars
518
< ** FIXME: figure out how to do it
521
< fontset = XCreateFontSet(dpy, s, &missing_list, &missing_count,
523
< for (i=0; i<missing_count; i++) {
524
< printf("missing_list[%d]: '%s'\n", i, missing_list[i]);
525
< XtFree(missing_list[i]);
527
< XtFree((char *)missing_list);
528
< #if !defined(SOLARIS) && !defined(SOLARIS64)
529
< entry = XmFontListEntryLoad(dpy, s, XmFONT_IS_FONT, tag);
531
< entry = XmFontListEntryLoad(dpy, s, XmFONT_IS_FONTSET, tag);
536
< ** FIXME: replace the following line with the correct version
537
< ** for multibyte chars and fontsets
539
< entry = XmFontListEntryLoad(dpy, s, XmFONT_IS_FONT, tag);
541
< fontlist = XmFontListAppendEntry(fontlist, entry);
542
< XmFontListEntryFree(&entry);
553
diff -b -r xmt_212/Xmt/GetPixmap.c Xmt310/Xmt/GetPixmap.c
555
< #include <stdlib.h>
556
< #include <unistd.h>
559
> extern char *getenv();
563
diff -b -r xmt_212/Xmt/HSLtoRGB.c Xmt310/Xmt/HSLtoRGB.c
564
< #include <Xmt/Xmt.h>
569
diff -b -r xmt_212/Xmt/Hash.c Xmt310/Xmt/Hash.c
571
< long size; /* log2 of the size */
572
< long mask; /* Current size of hash table minus 1. */
573
< long numentries; /* Number of entries currently in table. */
575
> int size; /* log2 of the size */
576
> int mask; /* Current size of hash table minus 1. */
577
> int numentries; /* Number of entries currently in table. */
579
< (ht)->table[(((long)(key)) >> 2) & (ht)->mask]
581
> (ht)->table[(((int)(key)) >> 2) & (ht)->mask]
601
diff -b -r xmt_212/Xmt/HelpBox.c Xmt310/Xmt/HelpBox.c
604
< Dimension width = 0, height = 0;
607
> Dimension width, height;
610
< height = ((int)(height-4) * hb->help_box.visible_lines) / (lines + 4);
612
> height = ((int)(height-4) * hb->help_box.visible_lines) / lines + 4;
616
diff -b -r xmt_212/Xmt/HelpBrowser.c Xmt310/Xmt/HelpBrowser.c
618
< label = XmtCreateLocalizedXmString(w, hb->help_browser.toc_label);
620
> label = XmtCreateXmString(hb->help_browser.toc_label);
622
< label = XmtCreateLocalizedXmString(w, hb->help_browser.index_label);
624
> label = XmtCreateXmString(hb->help_browser.index_label);
626
< label = XmtCreateLocalizedXmString(w, hb->help_browser.crossref_label);
628
> label = XmtCreateXmString(hb->help_browser.crossref_label);
630
< (XtArgVal)XmtCreateLocalizedXmString(w, hb->help_browser.next_label);
632
> (XtArgVal)XmtCreateXmString(hb->help_browser.next_label);
634
< (XtArgVal)XmtCreateLocalizedXmString(w, hb->help_browser.prev_label);
636
> (XtArgVal)XmtCreateXmString(hb->help_browser.prev_label);
638
< (XtArgVal)XmtCreateLocalizedXmString(w, hb->help_browser.done_label);
640
> (XtArgVal)XmtCreateXmString(hb->help_browser.done_label);
642
< label = XmtCreateLocalizedXmString((Widget) sw, sw->help_browser.next_label);
644
> label = XmtCreateXmString(sw->help_browser.next_label);
646
< label = XmtCreateLocalizedXmString((Widget) sw, sw->help_browser.prev_label);
648
> label = XmtCreateXmString(sw->help_browser.prev_label);
650
< label = XmtCreateLocalizedXmString((Widget) sw, sw->help_browser.done_label);
652
> label = XmtCreateXmString(sw->help_browser.done_label);
656
diff -b -r xmt_212/Xmt/HelpNode.c Xmt310/Xmt/HelpNode.c
658
< /* extern int errno; */
663
diff -b -r xmt_212/Xmt/IBMManage.c Xmt310/Xmt/IBMManage.c
665
< #include <X11/IntrinsicP.h>
667
> #include "IntrinsicP.h"
670
diff -b -r xmt_212/Xmt/Include.c Xmt310/Xmt/Include.c
672
< /* extern int errno; */
674
< static Boolean required_quarks_inited = False;
676
> static required_quarks_inited = False;
678
< XtPointer dummy = NULL;
684
diff -b -r xmt_212/Xmt/InputField.c Xmt310/Xmt/InputField.c
686
> #include <string.h>
688
< #if NeedFunctionPrototypes
690
> #if NeedFunctionPrototype
693
> #if NeedFunctionPrototypes
694
> static int isoctal(int c)
696
> static int isoctal(c)
701
> return (int)(strchr ("01234567", c));
705
> static int ishex(int c)
707
> static int ishex(c)
711
> return (int)(strchr ("0123456789abcdefABCDEF", c));
715
> #if NeedFunctionPrototypes
717
< ((*c >= 'A')&&(*c <= 'C')))
719
> ((*c >= 'A')&&(*c <= 'C')) ||
724
> if (!isoctal(*c)) data->doit = False;
727
> if (!ishex(*c)) data->doit = False;
736
< ** if there is a pattern, get its length. Copy it, because it is
737
< ** free'd in the SetValue() and Destroy() routines
739
< if (iw->input_field.pattern) {
740
< iw->input_field.pattern = XtNewString(iw->input_field.pattern);
742
> /* if there is a pattern, get its length */
743
> if (iw->input_field.pattern)
747
< if (iw->input_field.input) {
749
> if (iw->input_field.input)
751
< iw->input_field.input = NULL;
757
< ** changed by _AA, there was no test if s is not NULL, if
758
< ** yes everything works, but if s == NULL tha atoi() calls
759
< ** fail on some architectures
763
< *(String *)address = NULL;
764
< else if (type == XmtQBuffer) {
765
< strncpy(address, "", size-1);
766
< ((char *)address)[size-1] = '\0';
769
< * unsigned values should be handled better here.
770
< * the XmtInputField should also probably have resources to
771
< * set that will automatically verify that the value is valid.
773
< else if ((type == XmtQShort) || (type == XmtQPosition) ||
774
< (type == XmtQDimension))
775
< *(short *)address = 0;
776
< else if ((type == XmtQInt) || (type == XmtQCardinal))
777
< *(int *)address = 0;
778
< else if (type == XmtQFloat)
779
< *(float *)address = 0.0;
780
< else if (type == XmtQDouble)
781
< *(double *)address = 0.0;
783
< XmtWarningMsg("XmtInputField", "getvalue",
784
< "Type mismatch:\n\tCan't set input value on a resource of type '%s'. String or Buffer expected.",
785
< XrmQuarkToString(type));
792
< /* printf("XrmQuark type %d %s '%s'\n", type, XrmQuarkToString(type), s); */
796
< ** Changed by _AA, we get a copy of the string of an input field
797
< ** cause with this statement the memory gets corrupted in using
798
< ** XmtDialogSetDialogValues
800
< if (type == XmtQString)
803
< if (type == XmtQString)
804
< *(String *)address = XtNewString(s);
808
diff -b -r xmt_212/Xmt/InputFieldP.h Xmt310/Xmt/InputFieldP.h
810
< Cardinal pattern_length; /* strlen(pattern); */
811
< Cardinal pattern_skip; /* state variable for HandlePattern() */
813
> short pattern_length; /* strlen(pattern); */
814
> short pattern_skip; /* state variable for HandlePattern() */
816
< Cardinal max_length; /* used with overstrike mode */
818
> int max_length; /* used with overstrike mode */
822
diff -b -r xmt_212/Xmt/Layout.c Xmt310/Xmt/Layout.c
824
< #if (XmVersion >= 2000)
825
< #include <Xm/RowColumnP.h> /* declaration of Motif drawing routines */
828
< static Cardinal justification_values[] = {
830
> static int justification_values[] = {
832
< static Cardinal edge_values[] = {
834
> static int edge_values[] = {
836
< static Cardinal line_type_values[] = {
838
> static int line_type_values[] = {
840
< static Cardinal frame_type_values[] = {
842
> static int frame_type_values[] = {
844
< static Cardinal position_values[] = {
846
> static int position_values[] = {
848
< static Cardinal space_type_values[] = {
850
> static int space_type_values[] = {
852
> #if (XmVersion >= 2001)
853
> XmRenderTableAddRenditions(NULL, &rendition, 1,
859
> #if (XmVersion >= 2001)
860
> XmRenderTableAddRenditions(NULL, &rendition, 1, XmMERGE_REPLACE);
866
< printf("+++++++++++++++++++++++++++++\n");
867
< printf("lw/lw->layout.toplevel: 0x%x/0x%x/%s\n",
868
< lw, lw->layout.toplevel, XtName(lw->layout.toplevel));
869
< printf("+++++++++++++++++++++++++++++\n");
872
< int x=0, y=0, w=0, h=0; /* coordinates of widget */
873
< int fx=0, fy=0, fw=0, fh=0; /* coordinates of outside of frame */
874
< int cx=0, cy=0, cw=0, ch=0; /* coordinates of caption bounding box*/
876
> int x, y, w, h; /* coordinates of widget */
877
> int fx, fy, fw, fh; /* coordinates of outside of frame */
878
> int cx, cy, cw, ch; /* coordinates of caption bounding box*/
880
< int caption_total_width=0, caption_total_height=0;
882
> int caption_total_width, caption_total_height;
884
< frame_type = (XmtLayoutFrameType) cc->frame_type;
885
< frame_line_type = (XmtLayoutFrameLineType) cc->frame_line_type;
887
> frame_type = cc->frame_type;
888
> frame_line_type = cc->frame_line_type;
890
< frame_position = (XmtLayoutFramePosition) cc->frame_position;
892
> frame_position = cc->frame_position;
894
< Dimension width, height;
897
> Dimension width, height, border_width;
899
< if ((request->request_mode & (CWWidth | CWHeight)) == (CWWidth | CWHeight)
901
> if (request->request_mode & (CWWidth | CWHeight) == (CWWidth | CWHeight)
903
< "Widget %s: can't set XtNx or XtNy resources of a child of\n\tan XmtLayout widget. Changes ignored.", XtName((Widget) set));
905
> "Widget %s: can't set XtNx or XtNy resources of a child of\n\tan XmtLayout widget. Changes ignored.");
909
diff -b -r xmt_212/Xmt/LayoutBox.c Xmt310/Xmt/LayoutBox.c
912
< {XmNbackgroundPixmap, XmCPixmap, XtRPixmap,
913
< sizeof(Pixmap), offset(backgroundPixmap),
914
< XtRImmediate, (XtPointer) None},
918
< if (lb->layout_box.backgroundPixmap != None &&
919
< lb->layout_box.backgroundPixmap != XtUnspecifiedPixmap) {
921
< gcv.tile = lb->layout_box.backgroundPixmap;
922
< gcv.fill_style = FillTiled;
923
< lb->layout_box.gc = XtGetGC(init, GCTile|GCFillStyle, &gcv);
925
< else if (lb->layout_box.background != (Pixel)-1) {
930
< frame_type = (XmtLayoutFrameType) cc->frame_type;
931
< frame_position = (XmtLayoutFramePosition) cc->frame_position;
933
> frame_type = cc->frame_type;
934
> frame_position = cc->frame_position;
936
< frame_type = (XmtLayoutFrameType) cc->frame_type;
937
< frame_position = (XmtLayoutFramePosition) cc->frame_position;
939
> frame_type = cc->frame_type;
940
> frame_position = cc->frame_position;
942
< int major_start = 0, minor_start = 0; /* instead of x, y */
943
< int major_length = 0, minor_length = 0; /* instead of width, height */
944
< int cx = 0, cy = 0; /* child x, y */
945
< int cw = 0, ch = 0; /* child w, h */
947
> int major_start, minor_start; /* instead of x, y */
948
> int major_length, minor_length; /* instead of width, height */
949
> int cx, cy; /* child x, y */
950
> int cw, ch; /* child w, h */
952
< int margin_width = 0, margin_height = 0, top_margin = 0, left_margin = 0;
954
> int margin_width, margin_height, top_margin, left_margin;
956
< int total_space, space, interval=0;
958
> int total_space, space, interval;
965
> cmajor0 = &cx; cminor0 = &cy;
966
> cmajorlen = &cw; cminorlen = &ch;
973
> cmajor0 = &cy; cminor0 = &cx;
974
> cmajorlen = &ch; cminorlen = &cw;
978
diff -b -r xmt_212/Xmt/LayoutGP.h Xmt310/Xmt/LayoutGP.h
981
< Pixmap backgroundPixmap;
986
diff -b -r xmt_212/Xmt/LayoutParse.c Xmt310/Xmt/LayoutParse.c
988
< i->constraints.caption = XmtCreateLocalizedXmString((Widget)lw,
991
> i->constraints.caption = XmtCreateXmString(GetStrValue());
995
diff -b -r xmt_212/Xmt/LayoutString.c Xmt310/Xmt/LayoutString.c
997
< XmtCreateLocalizedXmString((Widget) lw, ls->layout_string.label);
999
> XmtCreateXmString(ls->layout_string.label);
1001
< Dimension cs_width, cs_height;
1003
< cs_width = cs->layout_string.width;
1004
< cs_height = cs->layout_string.height;
1006
< if (cs_width != ss->layout_string.width ||
1007
< cs_height != ss->layout_string.height)
1012
< XmtCreateLocalizedXmString((Widget) lw, ss->layout_string.label);
1014
> XmtCreateXmString(ss->layout_string.label);
1016
< cs_width = cs->layout_string.width;
1017
< cs_height = cs->layout_string.height;
1019
< if (cs_width != ss->layout_string.width ||
1020
< cs_height != ss->layout_string.height)
1025
< if (redisplay && XtIsRealized((Widget)lw)) {
1026
< Redisplay((Widget)ss, (XEvent *)NULL, (Region)NULL);
1028
< else if ( relayout && XtIsRealized((Widget)lw)) {
1030
> if ((redisplay | relayout) && XtIsRealized((Widget)lw))
1036
Only in xmt_212/Xmt: Makefile
1038
diff -b -r xmt_212/Xmt/Makefile.aimk Xmt310/Xmt/Makefile.aimk
1040
< XMT_SDIR = ../xmt_212/Xmt
1042
> XMT_SDIR = ../qmon/Xmt310/Xmt
1044
< XMTFLAGS = $(CFLAGS) -I../xmt_212
1047
< XMTLIB = libXmt$(LIBEXT)
1053
< libXmt$(SHAREDEXT): $(XMT_OBJS) $(XMT_UNSHAREDOBJS)
1054
< $(SHAREDLD) $(XLFLAGS) $(SHARED_LFLAGS) -o libXmt$(SHAREDEXT) $(XMT_OBJS) $(XMT_UNSHAREDOBJS) $(XLIBS)
1057
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/All.c
1059
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/All.c
1061
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AppRes.c
1063
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/AppRes.c
1065
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForBool.c
1067
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/AskForBool.c
1069
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForFile.c
1071
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/AskForFile.c
1073
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForItem.c
1075
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/AskForItem.c
1077
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForString.c
1079
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/AskForString.c
1081
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AssertClass.c
1083
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/AssertClass.c
1085
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/BSearch.c
1087
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/BSearch.c
1089
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/BitmapCvt.c
1091
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/BitmapCvt.c
1093
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Block.c
1095
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Block.c
1097
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/CallbackCvt.c
1099
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/CallbackCvt.c
1101
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/CheckFormat.c
1103
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/CheckFormat.c
1105
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Chooser.c
1107
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Chooser.c
1109
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Cli.c
1111
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Cli.c
1113
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Color.c
1115
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Color.c
1117
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ColorTable.c
1119
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/ColorTable.c
1121
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ColorTblCvt.c
1123
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/ColorTblCvt.c
1125
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ContextHelp.c
1127
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/ContextHelp.c
1129
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Create.c
1131
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Create.c
1133
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Cursor.c
1135
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Cursor.c
1137
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/DECHack.c
1139
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/DECHack.c
1141
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Dialog.c
1143
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Dialog.c
1145
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/DialogPos.c
1147
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/DialogPos.c
1149
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Dialogs.c
1151
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Dialogs.c
1153
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Discard.c
1155
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Discard.c
1157
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/EnumCvt.c
1159
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/EnumCvt.c
1161
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/FindFile.c
1163
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/FindFile.c
1165
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/FontListCvt.c
1167
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/FontListCvt.c
1169
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/GetPixmap.c
1171
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/GetPixmap.c
1173
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HSLtoRGB.c
1175
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/HSLtoRGB.c
1177
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Hash.c
1179
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Hash.c
1181
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBox.c
1183
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/HelpBox.c
1185
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBrowser.c
1187
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/HelpBrowser.c
1189
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpNode.c
1191
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/HelpNode.c
1193
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/IBMManage.c
1195
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/IBMManage.c
1197
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Icon.c
1199
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Icon.c
1201
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Icons.c
1203
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Icons.c
1205
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Include.c
1207
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Include.c
1209
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/InitFocus.c
1211
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/InitFocus.c
1213
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Initialize.c
1215
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Initialize.c
1217
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/InputField.c
1219
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/InputField.c
1221
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Layout.c
1223
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Layout.c
1225
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutBox.c
1227
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutBox.c
1229
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutCreate.c
1231
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutCreate.c
1233
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutGadget.c
1235
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutGadget.c
1237
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutParse.c
1239
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutParse.c
1241
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutPixmap.c
1243
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutPixmap.c
1245
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutSep.c
1247
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutSep.c
1249
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutSpace.c
1251
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutSpace.c
1253
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutString.c
1255
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutString.c
1257
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Lexer.c
1259
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Lexer.c
1261
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Localize.c
1263
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Localize.c
1265
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Lookup.c
1267
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Lookup.c
1269
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Menu.c
1271
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Menu.c
1273
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MenuCvt.c
1275
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/MenuCvt.c
1277
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MotifWidgets.c
1279
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/MotifWidgets.c
1281
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MsgDialogs.c
1283
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/MsgDialogs.c
1285
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MsgLine.c
1287
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/MsgLine.c
1289
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/NameToWidget.c
1291
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/NameToWidget.c
1293
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/PixelCvt.c
1295
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/PixelCvt.c
1297
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Pixmap.c
1299
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Pixmap.c
1301
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/PixmapCvt.c
1303
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/PixmapCvt.c
1305
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/PixmapLstCvt.c
1307
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/PixmapLstCvt.c
1309
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Procedures.c
1311
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Procedures.c
1313
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Quarks.c
1315
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Quarks.c
1317
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/RGBtoHSL.c
1319
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/RGBtoHSL.c
1321
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Screen.c
1323
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Screen.c
1325
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/SetValue.c
1327
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/SetValue.c
1329
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ShellUtil.c
1331
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/ShellUtil.c
1333
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/StringLstCvt.c
1335
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/StringLstCvt.c
1337
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Symbols.c
1339
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Symbols.c
1341
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Template.c
1343
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Template.c
1345
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Visual.c
1347
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Visual.c
1349
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/UnixProcs.c
1351
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/UnixProcs.c
1353
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Wait.c
1355
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Wait.c
1357
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Warning.c
1359
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Warning.c
1361
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WidgetCvt.c
1363
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/WidgetCvt.c
1365
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WidgetType.c
1367
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/WidgetType.c
1369
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Working.c
1371
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Working.c
1373
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WorkingBox.c
1375
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/WorkingBox.c
1377
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Xbm.c
1379
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Xbm.c
1381
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmCSText.c
1383
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmCSText.c
1385
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmComboBox.c
1387
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmComboBox.c
1389
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmScale.c
1391
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmScale.c
1393
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmStringCvt.c
1395
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmStringCvt.c
1397
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmText.c
1399
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmText.c
1401
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmTextField.c
1403
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmTextField.c
1405
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmToggleB.c
1407
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmToggleB.c
1409
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmtProcs.c
1411
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmtProcs.c
1413
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmtWidgets.c
1415
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XmtWidgets.c
1417
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Xpm.c
1419
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/Xpm.c
1421
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XpmParse.c
1423
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XpmParse.c
1425
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XtProcs.c
1427
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/XtProcs.c
1429
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ConvertData.c
1431
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/ConvertData.c
1433
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ChooserS.c
1435
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/ChooserS.c
1437
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/CliS.c
1439
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/CliS.c
1441
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBoxS.c
1443
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/HelpBoxS.c
1445
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBrowserS.c
1447
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/HelpBrowserS.c
1449
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/InputFieldS.c
1451
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/InputFieldS.c
1453
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutS.c
1455
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/LayoutS.c
1457
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MenuS.c
1459
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/MenuS.c
1461
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MsgLineS.c
1463
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/MsgLineS.c
1465
< $(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WorkingBoxS.c
1467
> $(CC) -c $(CFLAGS) $(XCFLAGS) $(XMT_SDIR)/WorkingBoxS.c
1469
< $(RM) libXmt.a libXmt$(SHAREDEXT)
1474
Only in Xmt310/Xmt: Makefile.simple
1478
diff -b -r xmt_212/Xmt/Menu.c Xmt310/Xmt/Menu.c
1480
< #include <Xm/TraitP.h>
1482
> #if XmVersion >= 2001
1483
> #include <Xm/TraitP.h>
1486
< #if NeedFunctionPrototypes
1488
> #if NeedFunctionPrototype
1490
< #if XmVersion >= 2000
1492
> #if XmVersion == 2000
1494
< /* extern XmMenuSystemTraitRec _XmRC_menuSystemRecord; */
1495
< static XmMenuSystemTraitRec *xmt_menuSystemRecord;
1497
> extern XmMenuSystemTraitRec _XmRC_menuSystemRecord;
1499
< #if XmVersion >= 2000
1501
> #if XmVersion == 2000
1503
< /* XmeTraitSet((XtPointer) xmtMenuWidgetClass, XmQTmenuSystem, */
1504
< /* (XtPointer) &_XmRC_menuSystemRecord); */
1506
< ** set trait record of the superclass
1508
< xmt_menuSystemRecord = XmeTraitGet((XtPointer) xmRowColumnWidgetClass,
1511
< (XtPointer) xmt_menuSystemRecord);
1513
> (XtPointer) &_XmRC_menuSystemRecord);
1515
> #if XmVersion >= 2001
1516
> /* Trait records */
1517
> XmeTraitSet((XtPointer) xmtMenuWidgetClass, XmQTmenuSystem,
1518
> XmeTraitGet ((XtPointer) xmRowColumnWidgetClass,
1522
< XmToggleButtonSetState(item->w, (int)value, False);
1524
> XmToggleButtonSetState(item->w, value, False);
1526
< XmString accel_label = NULL;
1527
< char namebuf[20], submenu_buf[30];
1528
< char *name = NULL, *submenu_name;
1530
> XmString accel_label;
1531
> char namebuf[10], submenu_buf[20];
1532
> char *name, *submenu_name;
1534
< else item->label1 = XmtCreateLocalizedXmString(w, item->alt_label);
1536
> else item->label1 = XmtCreateXmString(item->alt_label);
1538
< else item->label0 = XmtCreateLocalizedXmString(w, item->label);
1540
> else item->label0 = XmtCreateXmString(item->label);
1544
diff -b -r xmt_212/Xmt/MenuCvt.c Xmt310/Xmt/MenuCvt.c
1550
< Boolean stat = False;
1556
diff -b -r xmt_212/Xmt/MotifWidgets.c Xmt310/Xmt/MotifWidgets.c
1558
< #if (XmVersion == 2000)
1560
> #if XmVersion == 2000
1564
diff -b -r xmt_212/Xmt/MsgDialogs.c Xmt310/Xmt/MsgDialogs.c
1566
< help = XmtCreateLocalizedXmString(w, cache->help_strings[i]);
1568
> help = XmtCreateXmString(cache->help_strings[i]);
1570
< Widget dialog = 0, help_button;
1572
> Widget dialog, help_button;
1574
< msg = XmtCreateLocalizedXmString(w, data.message);
1575
< title = XmtCreateLocalizedXmString(w, data.title);
1577
> msg = XmtCreateXmString(data.message);
1578
> title = XmtCreateXmString(data.title);
1582
diff -b -r xmt_212/Xmt/MsgLine.c Xmt310/Xmt/MsgLine.c
1584
< mw->msgline.input_type = STRING;
1588
diff -b -r xmt_212/Xmt/NameToWidget.c Xmt310/Xmt/NameToWidget.c
1590
< #if NeedFunctionPrototypes
1591
< typedef Widget (*NameMatchProc)(XrmNameList, XrmBindingList, int, WidgetList, int, int, int*, int*);
1596
< static Widget NameListToWidget(Widget root,
1598
> static Widget NameListToWidget(register Widget root,
1602
> register Widget root;
1606
diff -b -r xmt_212/Xmt/PixelCvt.c Xmt310/Xmt/PixelCvt.c
1609
< XmtWarningMsg("XmtConvertStringToPixel","info","addr visual is %p", &visual);
1610
< XmtWarningMsg("XmtConvertStringToPixel","info","visual is %p", visual);
1616
diff -b -r xmt_212/Xmt/PixmapCvt.c Xmt310/Xmt/PixmapCvt.c
1618
< #define XMT_CDE_BUG_FIX
1621
< #ifdef XMT_CDE_BUG_FIX
1622
< if (strcmp(str, "unspecified_pixmap")) {
1625
< #ifdef XMT_CDE_BUG_FIX
1628
< pixmap = XmUNSPECIFIED_PIXMAP;
1634
diff -b -r xmt_212/Xmt/Procedures.c Xmt310/Xmt/Procedures.c
1636
< XmtProcedureInfo *p = NULL;
1638
> XmtProcedureInfo *p;
1642
diff -b -r xmt_212/Xmt/Quarks.c Xmt310/Xmt/Quarks.c
1644
< static int inited = False;
1646
> static inited = False;
1650
diff -b -r xmt_212/Xmt/RGBtoHSL.c Xmt310/Xmt/RGBtoHSL.c
1652
< #include <Xmt/Xmt.h>
1657
diff -b -r xmt_212/Xmt/ScreenP.h Xmt310/Xmt/ScreenP.h
1659
< /* _AA added XmtAskForTime(), XmtAskForMemory() */
1660
< Widget time_dialog;
1661
< Widget memory_dialog;
1662
< Widget items_dialog;
1663
< /******_AA******************/
1667
diff -b -r xmt_212/Xmt/SetValue.c Xmt310/Xmt/SetValue.c
1669
< if (strcmp(type, XtRString) == 0) {
1670
< arg.value = (XtArgVal) to.addr;
1674
< case sizeof(char): arg.value = (XtArgVal)*(char *)to.addr; break;
1675
< case sizeof(int): arg.value = (XtArgVal)*(int *)to.addr; break;
1676
< default: arg.value = (XtArgVal)to.addr; break;
1685
diff -b -r xmt_212/Xmt/ShellUtil.c Xmt310/Xmt/ShellUtil.c
1687
< static Atom wm_delete_window = 0;
1689
> static Atom wm_delete_window;
1691
< static Cardinal focus_values[] = {FocusSetInput, FocusMove, FocusNone, FocusWarp};
1693
> static int focus_values[] = {FocusSetInput, FocusMove, FocusNone, FocusWarp};
1697
diff -b -r xmt_212/Xmt/Symbols.c Xmt310/Xmt/Symbols.c
1699
< #if NeedFunctionPrototypes
1700
< void _XtCopyToArg(XtPointer, XtArgVal *, Cardinal);
1701
< void _XtCopyFromArg(XtArgVal, XtPointer, Cardinal);
1703
< void _XtCopyToArg();
1704
< void _XtCopyFromArg();
1708
> extern void _XtCopyFromArg();
1710
> extern void _XtCopyToArg();
1712
> extern void _XtCopyToArg();
1717
diff -b -r xmt_212/Xmt/UnixProcs.c Xmt310/Xmt/UnixProcs.c
1719
< #include <X11/Xos.h>
1721
> /* these aren't declared in SunOS 4.1.1 */
1722
> extern int puts();
1723
> extern int system();
1729
diff -b -r xmt_212/Xmt/Util.h Xmt310/Xmt/Util.h
1731
< extern XmString XmtCreateLocalizedXmString(Widget, StringConst);
1733
< extern String _XmtLocalize(Screen* , StringConst, StringConst, StringConst);
1735
< extern XmString XmtCreateLocalizedXmString();
1739
diff -b -r xmt_212/Xmt/Visual.c Xmt310/Xmt/Visual.c
1741
< #ifdef ENABLE_ALT_VISUALS
1745
< #ifdef ENABLE_ALT_VISUALS
1751
diff -b -r xmt_212/Xmt/WidgetType.c Xmt310/Xmt/WidgetType.c
1753
< (XtPointer)(long) XrmPermStringToQuark(name),
1755
> (XtPointer)XrmPermStringToQuark(name),
1757
< (XtPointer)(long)XrmPermStringToQuark(name),
1759
> (XtPointer)XrmPermStringToQuark(name),
1761
< (XtPointer)(long)XrmPermStringToQuark(name),
1763
> (XtPointer)XrmPermStringToQuark(name),
1765
< (XtPointer)(long)XrmPermStringToQuark(name),
1767
> (XtPointer)XrmPermStringToQuark(name),
1769
< (XtPointer)(long)XrmPermStringToQuark(types[i].name),
1771
> (XtPointer)XrmPermStringToQuark(types[i].name),
1773
< (XtPointer) (long)XrmStringToQuark(name),
1775
> (XtPointer) XrmStringToQuark(name),
1779
diff -b -r xmt_212/Xmt/WidgetType.h Xmt310/Xmt/WidgetType.h
1785
< #if XmVersion >= 2000
1786
< extern void XmtRegisterXmComboBox(void);
1787
< #endif /* XmVersion >= 2000 */
1788
< #if (XmVersion == 2000)
1789
< extern void XmtRegisterXmCSText(void);
1790
< extern void XmtRegisterXmScrolledCSText(void);
1791
< #endif /* XmVersion >= 2000 */
1793
< #if XmVersion >= 2000
1794
< extern void XmtRegisterXmComboBox();
1795
< #endif /* XmVersion >= 2000 */
1796
< #if (XmVersion == 2000)
1797
< extern void XmtRegisterXmCSText();
1798
< extern void XmtRegisterXmScrolledCSText();
1799
< #endif /* XmVersion == 2000 */
1803
diff -b -r xmt_212/Xmt/Working.c Xmt310/Xmt/Working.c
1805
< title = XmtCreateLocalizedXmString(w, data.title);
1807
> title = XmtCreateXmString(data.title);
1811
diff -b -r xmt_212/Xmt/WorkingBox.c Xmt310/Xmt/WorkingBox.c
1813
< label = XmtCreateLocalizedXmString((Widget) wd, wd->working_box.message);
1815
> label = XmtCreateXmString(wd->working_box.message);
1817
< label = XmtCreateLocalizedXmString((Widget)wd, wd->working_box.scale_label);
1819
> label = XmtCreateXmString(wd->working_box.scale_label);
1821
< label = XmtCreateLocalizedXmString((Widget) wd, wd->working_box.button_label);
1823
> label = XmtCreateXmString(wd->working_box.button_label);
1825
< label = XmtCreateLocalizedXmString((Widget) sw, sw->working_box.message);
1827
> label = XmtCreateXmString(sw->working_box.message);
1829
< label = XmtCreateLocalizedXmString((Widget) sw, sw->working_box.scale_label);
1831
> label = XmtCreateXmString(sw->working_box.scale_label);
1833
< label = XmtCreateLocalizedXmString((Widget) sw, sw->working_box.button_label);
1835
> label = XmtCreateXmString(sw->working_box.button_label);
1839
diff -b -r xmt_212/Xmt/XmCSText.c Xmt310/Xmt/XmCSText.c
1841
< #if (XmVersion == 2000)
1843
> #if XmVersion == 2000
1849
< xmString = XmtCreateLocalizedXmString(w, *(String *)address);
1851
> xmString = XmtCreateXmString(*(String *)address);
1853
< xmString = XmtCreateLocalizedXmString(w, (char *)address);
1855
> xmString = XmtCreateXmString((char *)address);
1857
< (XmtWidgetConstructor)XmCreateCSText,
1861
< (XmtWidgetConstructor)XmCreateScrolledCSText,
1863
> XmCreateScrolledCSText,
1865
< #else /* if XmVersion < 2000 */
1867
> #else /* if XmVersion = 2000 */
1871
diff -b -r xmt_212/Xmt/XmStringCvt.c Xmt310/Xmt/XmStringCvt.c
1873
< #include <stdlib.h>
1876
< /* #if XmVersion >= 2000 */
1878
> #if XmVersion >= 2000
1880
< /* printf("...> '%s'\n", (char *) *text); */
1883
< if ( indicator == '{' )
1885
> if ( indicator == '[' )
1887
< "'@{' locale indicator may occur only at beginning of string.");
1889
> "'@[' locale indicator may occur only at beginning of string.");
1895
< XtSetArg(args[n], XmNpatternType, XmMULTIBYTE_TEXT); n++;
1897
< XtSetArg(args[n], XmNpatternType, XmMULTIBYTE_TEXT); n++;
1899
< XtSetArg(args[n], XmNpatternType, XmMULTIBYTE_TEXT); n++;
1901
< return XmStringParseText((XtPointer) str, NULL, NULL, XmMULTIBYTE_TEXT,
1903
> return XmStringParseText((XtPointer) str, NULL, NULL, XmCHARSET_TEXT,
1907
< char *mtxt = NULL;
1911
< wchar_t *ws = NULL;
1914
< n = mbstowcs(NULL, txt, 0);
1916
< ws = (wchar_t*)malloc(sizeof(wchar_t)*(n+1));
1919
< mbstowcs(ws, txt, (n+1));
1921
< for(s=t=ws; *s; s++, t++) {
1923
< if ((*s == L'@') && (*(s+1) == L'@')) s++;
1925
< *t = *s; /* copy the terminating '\0' */
1926
< n = wcstombs(NULL, ws, 0);
1928
< mtxt = (char*)malloc(sizeof(char)*(n+1));
1931
< wcstombs(mtxt, ws, (n+1));
1934
< mtxt = strdup(txt);
1936
< XtFree((char*)ws);
1939
< s1 = XmStringSegmentCreate(mtxt, charset, XmSTRING_DIRECTION_L_TO_R, sep);
1940
< if (!to) return s1;
1941
< s2 = XmStringConcat(to, s1);
1955
< * make a copy of the string so we can frob with it
1956
< * We keep pointer r so we can free it when done
1958
< r = s = XtNewString(str);
1961
< for(t = s; *s; s++) {
1964
< *s = '\0'; /* null terminate the string */
1965
< result = appendstring(t, result, True, charset, fixup);
1970
< if ((*s == '@') && (*(s+1) == '@')) {
1971
< /* set a flag to strip doubled escapes later */
1976
< else if (*(s+1) != 'f') break;
1977
< /* its a font change, so add the string up to here, if any */
1978
< *s = '\0'; /* null terminate the string */
1980
< result = appendstring(t, result, False, charset, fixup);
1983
< /* and now get the new charset */
1984
< if (*(s+2) == '\0') break;
1986
< if (*s == '[') { /* read till close ']' */
1987
< s = charset = s+1;
1988
< while (*s && (*s != ']')) s++;
1989
< if (*s == '\0') break;
1990
< *s = '\0'; /* null-terminate the charset string */
1992
< else if (*s == '(') { /* charset is next 2 chars */
1993
< if (*(s+1)) s++; else break;
1994
< charset_buf[0] = *s;
1995
< if (*(s+1)) s++; else break;
1996
< charset_buf[1] = *s;
1997
< charset_buf[2] = '\0';
1998
< charset = charset_buf;
2000
< else if (*s) { /* charset is single current character */
2001
< charset_buf[0] = *s;
2002
< charset_buf[1] = '\0';
2003
< charset = charset_buf;
2010
< if (s != t) result = appendstring(t, result, False, charset, fixup);
2018
< #ifdef XMSTRING_TO_COMPOUND_TEXT_BUG
2019
< String charset = XmSTRING_DEFAULT_CHARSET;
2021
< # if XmVersion < 1002
2022
< String charset = XmSTRING_DEFAULT_CHARSET;
2024
< String charset = XmFONTLIST_DEFAULT_TAG;
2027
< char charset_buf[3];
2028
< XmString result = NULL;
2029
< Boolean fixup = False;
2031
< if (!str) return NULL;
2033
< return XmStringSegmentCreate((String)str, charset,
2034
< XmSTRING_DIRECTION_L_TO_R, False);
2043
< /* return XmStringCreateLocalized(str); */
2045
< static XmString XmtCreateLocalizedXmString_(Screen *screen, StringConst str)
2047
> Boolean XmtConvertStringToXmString(Display *dpy,
2048
> XrmValue *args, Cardinal *num_args,
2049
> XrmValue *from, XrmValue *to,
2050
> XtPointer *converter_data)
2052
< static XmString XmtCreateLocalizedXmString_(screen, str)
2056
> Boolean XmtConvertStringToXmString(dpy, args, num_args,
2057
> from, to, converter_data)
2060
> Cardinal *num_args;
2063
> XtPointer *converter_data;
2065
< XmString value = NULL;
2066
< String category, tag, defaultstr;
2068
> String s = (String) from->addr;
2069
> Screen *screen = *(Screen **)args[0].addr;
2070
> String category, tag;
2079
< /* printf("==> '%s'\n", str); */
2081
< if ((str[0] == '@') && (str[1] == '{')) {
2082
< s = XtNewString(str);
2084
> if ((s[0] == '@') && (s[1] == '[')) {
2085
> s = XtNewString(s);
2087
< /* printf("=-> '%s'\n", s); */
2094
< category = defaultstr;
2100
< if (*s == '.' && !tag) {
2110
< /* printf("-=> '%s'\n", free_me+2); */
2115
< s = _XmtLocalize(screen, defaultstr, category, tag);
2117
> s = _XmtLocalize(screen, s, category, tag);
2123
< /* printf("--> '%s'\n", s); */
2128
> done(XmString, value);
2135
> XtDisplayStringConversionWarning(dpy, (String)from->addr, XmRXmString);
2142
< #if NeedFunctionPrototypes
2143
< Boolean XmtConvertStringToXmString(Display *dpy,
2144
< XrmValue *args, Cardinal *num_args,
2145
< XrmValue *from, XrmValue *to,
2146
< XtPointer *converter_data)
2148
< Boolean XmtConvertStringToXmString(dpy, args, num_args,
2149
< from, to, converter_data)
2152
< Cardinal *num_args;
2155
< XtPointer *converter_data;
2158
< String s = (String) from->addr;
2159
< Screen *screen = *(Screen **)args[0].addr;
2162
< value = XmtCreateLocalizedXmString_(screen, s);
2163
< if (!value) goto error;
2164
< done(XmString, value);
2167
< XtDisplayStringConversionWarning(dpy, (String)from->addr, XmRXmString);
2172
< #if NeedFunctionPrototypes
2173
< XmString XmtCreateLocalizedXmString(Widget w, StringConst s)
2175
< XmString XmtCreateLocalizedXmString(w, s)
2180
< return XmtCreateLocalizedXmString_(XtScreen(w), s);
2186
diff -b -r xmt_212/Xmt/Xmt.h Xmt310/Xmt/Xmt.h
2188
> #if !defined (XMT_HAS_STRERROR)
2189
> # if defined (XMT_HAS_SYS_ERRLIST)
2190
> extern char *sys_errlist[];
2191
> # define strerror(err) sys_errlist[err]
2193
> # define strerror(err) "strerror is unsupported"
2194
> # endif /* XMT_HAS_SYS_ERRLIST */
2195
> #endif /* !XMT_HAS_STERROR */
2198
< #define XmtVERSION 2
2200
> #define XmtVERSION 3
2202
< #define XmtPatchlevel 2
2204
> #define XmtPatchlevel 0
2206
< #ifdef __cplusplus /* for C++ V2.0 */
2207
< #define _XFUNCPROTOBEGIN extern "C" {
2208
< #define _XFUNCPROTOEND }
2210
< #define _XFUNCPROTOBEGIN
2211
< #define _XFUNCPROTOEND
2212
< #endif /* __cplusplus */
2214
> # ifdef __cplusplus /* for C++ V2.0 */
2215
> # define _XFUNCPROTOBEGIN extern "C" {
2216
> # define _XFUNCPROTOEND }
2218
> # define _XFUNCPROTOBEGIN
2219
> # define _XFUNCPROTOEND
2220
> # endif /* __cplusplus */
2222
< #define memmove(a,b,n) bcopy((char*)(b),(char*)(a),n)
2224
> #define memmove(a,b,n) bcopy(b,a,n)
2228
diff -b -r xmt_212/Xmt/Xpm.c Xmt310/Xmt/Xpm.c
2230
< (char *) XtMalloc(((*image_return)->bytes_per_line * height));
2232
> (char *) XtMalloc((*image_return)->bytes_per_line * height);
2235
< /* XtFree((char *)alloc_pixels_return); */
2236
< XtFree((char *)alloc_pixels);
2240
> XtFree((char *)alloc_pixels_return);
2242
< #if !defined(WORD64) && !defined(LONG64) && !defined(SOLARIS64)
2244
> #if !defined(WORD64) && !defined(LONG64)
2248
diff -b -r xmt_212/Xmt/XpmParse.c Xmt310/Xmt/XpmParse.c
2250
< {"", '\0', '\n', "", "", "", "" }, /* Natural type */
2251
< {"C", '"', '"', ",\n", "static char *", "[] = {\n", "};\n" },
2252
< {"Lisp", '"', '"', "\n", "(setq ", " '(\n", "))\n" },
2253
< {NULL, 0, 0, NULL, NULL, NULL, NULL }
2255
> "", '\0', '\n', "", "", "", "", /* Natural type */
2256
> "C", '"', '"', ",\n", "static char *", "[] = {\n", "};\n",
2257
> "Lisp", '"', '"', "\n", "(setq ", " '(\n", "))\n",
2258
> NULL, 0, 0, NULL, NULL, NULL, NULL
2260
< /* extern int errno; */