ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.356 by sf-exg, Fri Apr 29 10:10:20 2011 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

1301 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1302 unsigned long fg, bg; 1302 unsigned long fg, bg;
1303 const char *p; 1303 const char *p;
1304 char **s; 1304 char **s;
1305 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1306#ifdef ENABLE_XIM_ONTHESPOT
1307 XIMCallback xcb[4];
1308#endif
1309 1306
1310 set_environ (envv); 1307 set_environ (envv);
1311 1308
1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1313 return false; 1310 return false;
1453 NULL); 1450 NULL);
1454 } 1451 }
1455#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1456 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1457 { 1454 {
1455 XIMCallback xcb[4];
1456
1458 im_set_position (spot); 1457 im_set_position (spot);
1459 1458
1460 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1461 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1462 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines