Mercurial > hg > xemacs-beta
comparison src/input-method-xlib.c @ 4522:fc7067b7f407
Backout last patch; forgot to specify file.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Wed, 29 Oct 2008 03:37:16 +0900 |
parents | 383ab474a241 |
children | 726060ee587c |
comparison
equal
deleted
inserted
replaced
4521:383ab474a241 | 4522:fc7067b7f407 |
---|---|
284 char *inputmethod; | 284 char *inputmethod; |
285 } xic_vars_t; | 285 } xic_vars_t; |
286 xic_vars_t xic_vars; | 286 xic_vars_t xic_vars; |
287 XIC xic; | 287 XIC xic; |
288 | 288 |
289 #define res(name, class_, representation, field, default_value) \ | 289 #define res(name, class_, representation, field, default_value) \ |
290 Xt_RESOURCE (name, class_, representation, xic_vars.field, \ | 290 { name, class_, representation, sizeof(xic_vars.field), \ |
291 XtOffsetOf(xic_vars_t, field), XtRString, default_value) | 291 XtOffsetOf(xic_vars_t, field), XtRString, default_value } |
292 | 292 |
293 static XtResource resources[] = | 293 static XtResource resources[] = |
294 { | 294 { |
295 /* name class represent'n field default value */ | 295 /* name class represent'n field default value */ |
296 res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, DefaultXIMStyles), | 296 res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, (XtPointer) DefaultXIMStyles), |
297 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, XtDefaultFontSet), | 297 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, (XtPointer) XtDefaultFontSet), |
298 res(XtNximForeground, XtCForeground, XtRPixel, fg, XtDefaultForeground), | 298 res(XtNximForeground, XtCForeground, XtRPixel, fg, (XtPointer) XtDefaultForeground), |
299 res(XtNximBackground, XtCBackground, XtRPixel, bg, XtDefaultBackground) | 299 res(XtNximBackground, XtCBackground, XtRPixel, bg, (XtPointer) XtDefaultBackground) |
300 }; | 300 }; |
301 #undef res | 301 |
302 | 302 |
303 xim = DEVICE_X_XIM (d); | 303 xim = DEVICE_X_XIM (d); |
304 | 304 |
305 if (!xim) | 305 if (!xim) |
306 { | 306 { |
975 stderr_out ("XNResourceClass: %s\n", resourceClass ? resourceClass : "NULL"); | 975 stderr_out ("XNResourceClass: %s\n", resourceClass ? resourceClass : "NULL"); |
976 stderr_out ("XNFilterEvents: "); describe_event_mask (filter_mask); | 976 stderr_out ("XNFilterEvents: "); describe_event_mask (filter_mask); |
977 } | 977 } |
978 | 978 |
979 void | 979 void |
980 describe_XRectangle (const char *name, XRectangle *r) | 980 describe_XRectangle (char *name, XRectangle *r) |
981 { | 981 { |
982 if (r == NULL) | 982 if (r == NULL) |
983 stderr_out ("%s: NULL\n", name); | 983 stderr_out ("%s: NULL\n", name); |
984 else | 984 else |
985 stderr_out ("%s: x=%d y=%d w=%d h=%d\n", | 985 stderr_out ("%s: x=%d y=%d w=%d h=%d\n", |