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.200 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC

… …
1211 XPoint nspot; 1211 XPoint nspot;
1212 XVaNestedList preedit_attr; 1212 XVaNestedList preedit_attr;
1213 1213
1214 if (!Input_Context 1214 if (!Input_Context
1215 || !focus 1215 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1216 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1217 return;
1218 1218
1219 im_set_position (nspot); 1219 im_set_position (nspot);
1220 1220
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1221 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 DT_INT, call_data->chg_first, 1300 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length, 1301 DT_INT, call_data->chg_length,
1302 DT_END)); 1302 DT_END));
1303} 1303}
1304 1304
1305#if 0
1305static void 1306static void
1306xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) 1307xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1307{ 1308{
1308 ((rxvt_term *)client_data)->make_current (); 1309 ((rxvt_term *)client_data)->make_current ();
1309 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, 1310 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1310 DT_INT, call_data->position, 1311 DT_INT, call_data->position,
1311 DT_INT, call_data->direction, 1312 DT_INT, call_data->direction,
1312 DT_INT, call_data->style, 1313 DT_INT, call_data->style,
1313 DT_END)); 1314 DT_END));
1314} 1315}
1316#endif
1315 1317
1316#endif 1318#endif
1317 1319
1318/* 1320/*
1319 * Try to open a XIM with the current modifiers, then see if we can 1321 * Try to open a XIM with the current modifiers, then see if we can
… …
1479 XNFontSet, fs, 1481 XNFontSet, fs,
1480 NULL); 1482 NULL);
1481 } 1483 }
1482 else if (input_style & XIMPreeditCallbacks) 1484 else if (input_style & XIMPreeditCallbacks)
1483 { 1485 {
1486 im_set_position (spot);
1487
1484 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1488 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1485 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1489 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1486 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1490 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1491#if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1492 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1493#endif
1488 1494
1489 preedit_attr = XVaCreateNestedList (0, 1495 preedit_attr = XVaCreateNestedList (0,
1496 XNSpotLocation, &spot,
1490 XNPreeditStartCallback, &xcb[0], 1497 XNPreeditStartCallback, &xcb[0],
1491 XNPreeditDoneCallback , &xcb[1], 1498 XNPreeditDoneCallback , &xcb[1],
1492 XNPreeditDrawCallback , &xcb[2], 1499 XNPreeditDrawCallback , &xcb[2],
1500#if 0
1493 XNPreeditCaretCallback, &xcb[3], 1501 XNPreeditCaretCallback, &xcb[3],
1502#endif
1494 NULL); 1503 NULL);
1495 } 1504 }
1496 1505
1497 Input_Context = XCreateIC (xim, 1506 Input_Context = XCreateIC (xim,
1498 XNInputStyle, input_style, 1507 XNInputStyle, input_style,

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines