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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.200 by root, Wed Jan 25 00:42:20 2006 UTC

… …
305rxvt_term::destroy () 305rxvt_term::destroy ()
306{ 306{
307 if (destroy_ev.active) 307 if (destroy_ev.active)
308 return; 308 return;
309 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 311
313#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
314 scr_overlay_off (); 313 scr_overlay_off ();
315#endif 314#endif
316 315
… …
1242 } 1241 }
1243 1242
1244 Input_Context = 0; 1243 Input_Context = 0;
1245} 1244}
1246 1245
1246#ifdef ENABLE_XIM_ONTHESPOT
1247
1248static void
1249xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1250{
1251 ((rxvt_term *)client_data)->make_current ();
1252 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1253}
1254
1255static void
1256xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1260}
1261
1262static void
1263xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1264{
1265 rxvt_term *term = (rxvt_term *)client_data;
1266 XIMText *text = call_data->text;
1267
1268 term->make_current ();
1269
1270 if (text)
1271 {
1272 void *str;
1273
1274 if (!text->encoding_is_wchar && text->string.multi_byte)
1275 {
1276 // of course, X makes it ugly again
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->rs[Rs_imLocale]);
1279
1280 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1281 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1282
1283 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale);
1285 }
1286 else
1287 str = (void *)text->string.wide_char;
1288
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1294 DT_WCS_LEN, str, str ? (int)text->length : 0,
1295 DT_END));
1296 }
1297 else
1298 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1299 DT_INT, call_data->caret,
1300 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length,
1302 DT_END));
1303}
1304
1305static void
1306xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1307{
1308 ((rxvt_term *)client_data)->make_current ();
1309 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1310 DT_INT, call_data->position,
1311 DT_INT, call_data->direction,
1312 DT_INT, call_data->style,
1313 DT_END));
1314}
1315
1316#endif
1317
1247/* 1318/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1319 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1320 * open a suitable preedit type
1250 */ 1321 */
1251bool 1322bool
… …
1257 XRectangle rect, status_rect, needed_rect; 1328 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1329 unsigned long fg, bg;
1259 const char *p; 1330 const char *p;
1260 char **s; 1331 char **s;
1261 XIMStyles *xim_styles; 1332 XIMStyles *xim_styles;
1333#ifdef ENABLE_XIM_ONTHESPOT
1334 XIMCallback xcb[4];
1335#endif
1262 1336
1263 set_environ (envv); 1337 set_environ (envv);
1264 1338
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1339 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1340 return false;
… …
1292 s = rxvt_splitcommastring (p); 1366 s = rxvt_splitcommastring (p);
1293 1367
1294 for (i = found = 0; !found && s[i]; i++) 1368 for (i = found = 0; !found && s[i]; i++)
1295 { 1369 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1370 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1371 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1372 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1373 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1374 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1375 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1376 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1377 input_style = XIMPreeditNone | XIMStatusNone;
1378#ifdef ENABLE_XIM_ONTHESPOT
1379 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1380 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1381#endif
1382 else
1383 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1384
1305 for (j = 0; j < xim_styles->count_styles; j++) 1385 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1386 if (input_style == xim_styles->supported_styles[j])
1307 { 1387 {
1308 rxvt_freecommastring (s); 1388 rxvt_freecommastring (s);
… …
1397 XNBackground, bg, 1477 XNBackground, bg,
1398 XNArea, &status_rect, 1478 XNArea, &status_rect,
1399 XNFontSet, fs, 1479 XNFontSet, fs,
1400 NULL); 1480 NULL);
1401 } 1481 }
1482 else if (input_style & XIMPreeditCallbacks)
1483 {
1484 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;
1486 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1488
1489 preedit_attr = XVaCreateNestedList (0,
1490 XNPreeditStartCallback, &xcb[0],
1491 XNPreeditDoneCallback , &xcb[1],
1492 XNPreeditDrawCallback , &xcb[2],
1493 XNPreeditCaretCallback, &xcb[3],
1494 NULL);
1495 }
1402 1496
1403 Input_Context = XCreateIC (xim, 1497 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1498 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1499 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1500 XNFocusWindow, parent[0],
… …
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1512 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1513 im_destroy ();
1420 return false; 1514 return false;
1421 } 1515 }
1422 1516
1517#if 0
1518 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1519 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1520 vt_select_input ();
1521#endif
1425 1522
1426 if (input_style & XIMPreeditArea) 1523 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1524 IMSetStatusPosition ();
1428 1525
1429 return true; 1526 return true;

Diff Legend

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