comparison src/input-method-xlib.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 966663fcf606
children 7df0dd720c89
comparison
equal deleted inserted replaced
271:c7b7086b0a39 272:c5d627a313b1
243 return; 243 return;
244 } 244 }
245 245
246 if (style & XIMPreeditPosition) 246 if (style & XIMPreeditPosition)
247 { /* Init spot to invalid values */ 247 { /* Init spot to invalid values */
248 XPoint *spot = &(FRAME_X_XIC_SPOT (f)); 248 XPoint *frame_spot = &(FRAME_X_XIC_SPOT (f));
249 spot->x = spot->y = -1; 249 frame_spot->x = frame_spot->y = -1;
250 } 250 }
251 251
252 XIM_SetGeometry (f); 252 XIM_SetGeometry (f);
253 253
254 XSetICFocus (xic); 254 XSetICFocus (xic);
473 STYLE_INFO (XIMPreeditNone|XIMStatusNothing), 473 STYLE_INFO (XIMPreeditNone|XIMStatusNothing),
474 STYLE_INFO (XIMPreeditNone|XIMStatusNone) 474 STYLE_INFO (XIMPreeditNone|XIMStatusNone)
475 }; 475 };
476 #undef STYLE_INFO 476 #undef STYLE_INFO
477 477
478 CONST char *s = (char *) fromVal->addr; 478 char *s = (char *) fromVal->addr;
479 CONST char *end = s + fromVal->size; 479 char *end = s + fromVal->size;
480 XIMStyles * CONST p = (XIMStyles *) toVal->addr; 480 XIMStyles * CONST p = (XIMStyles *) toVal->addr;
481 CONST char * CONST delimiter = " \t\n\r:;," ; 481 CONST char * CONST delimiter = " \t\n\r:;," ;
482 CONST int max_styles = XtNumber(emacs_XIMStyleInfo); 482 CONST int max_styles = XtNumber(emacs_XIMStyleInfo);
483 int i; 483 int i;
484 char *c; 484 char *c;