… | |
… | |
271 | for (int i = 0; i < allocated.size (); i++) |
271 | for (int i = 0; i < allocated.size (); i++) |
272 | free (allocated [i]); |
272 | free (allocated [i]); |
273 | |
273 | |
274 | free (selection.text); |
274 | free (selection.text); |
275 | // TODO: manage env vars in child only(!) |
275 | // TODO: manage env vars in child only(!) |
276 | free (env_windowid); |
|
|
277 | free (env_display); |
276 | free (env_display); |
278 | free (env_term); |
277 | free (env_term); |
279 | free (env_colorfgbg); |
|
|
280 | free (locale); |
278 | free (locale); |
281 | free (v_buffer); |
279 | free (v_buffer); |
282 | free (incr_buf); |
280 | free (incr_buf); |
283 | |
281 | |
284 | delete envv; |
282 | delete envv; |
… | |
… | |
305 | rxvt_term::destroy () |
303 | rxvt_term::destroy () |
306 | { |
304 | { |
307 | if (destroy_ev.active) |
305 | if (destroy_ev.active) |
308 | return; |
306 | return; |
309 | |
307 | |
310 | if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) |
308 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
311 | return; |
|
|
312 | |
309 | |
313 | #if ENABLE_OVERLAY |
310 | #if ENABLE_OVERLAY |
314 | scr_overlay_off (); |
311 | scr_overlay_off (); |
315 | #endif |
312 | #endif |
316 | |
313 | |
… | |
… | |
514 | |
511 | |
515 | check_ev.start (); |
512 | check_ev.start (); |
516 | |
513 | |
517 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
514 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
518 | |
515 | |
|
|
516 | #if ENABLE_XEMBED |
|
|
517 | if (rs[Rs_embed]) |
|
|
518 | { |
|
|
519 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
520 | |
|
|
521 | XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
522 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
523 | } |
|
|
524 | #endif |
|
|
525 | |
519 | XMapWindow (disp, vt); |
526 | XMapWindow (disp, vt); |
520 | XMapWindow (disp, parent[0]); |
527 | XMapWindow (disp, parent[0]); |
521 | |
528 | |
522 | return true; |
529 | return true; |
523 | } |
530 | } |
… | |
… | |
977 | { |
984 | { |
978 | unsigned int i; |
985 | unsigned int i; |
979 | const char *xpmb = "\0"; |
986 | const char *xpmb = "\0"; |
980 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
987 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
981 | |
988 | |
982 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); |
|
|
983 | strcpy (fstr, "default"); |
989 | strcpy (fstr, "default"); |
984 | strcpy (bstr, "default"); |
990 | strcpy (bstr, "default"); |
985 | for (i = Color_Black; i <= Color_White; i++) |
991 | for (i = Color_Black; i <= Color_White; i++) |
986 | if (pix_colors[Color_fg] == pix_colors[i]) |
992 | if (pix_colors[Color_fg] == pix_colors[i]) |
987 | { |
993 | { |
… | |
… | |
1212 | XPoint nspot; |
1218 | XPoint nspot; |
1213 | XVaNestedList preedit_attr; |
1219 | XVaNestedList preedit_attr; |
1214 | |
1220 | |
1215 | if (!Input_Context |
1221 | if (!Input_Context |
1216 | || !focus |
1222 | || !focus |
1217 | || !(input_style & XIMPreeditPosition)) |
1223 | || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) |
1218 | return; |
1224 | return; |
1219 | |
1225 | |
1220 | im_set_position (nspot); |
1226 | im_set_position (nspot); |
1221 | |
1227 | |
1222 | if (nspot.x == spot.x && nspot.y == spot.y) |
1228 | if (nspot.x == spot.x && nspot.y == spot.y) |
… | |
… | |
1241 | input_method = 0; |
1247 | input_method = 0; |
1242 | } |
1248 | } |
1243 | |
1249 | |
1244 | Input_Context = 0; |
1250 | Input_Context = 0; |
1245 | } |
1251 | } |
|
|
1252 | |
|
|
1253 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1254 | |
|
|
1255 | static void |
|
|
1256 | xim_preedit_start (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_START, DT_END)); |
|
|
1260 | } |
|
|
1261 | |
|
|
1262 | static void |
|
|
1263 | xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1264 | { |
|
|
1265 | ((rxvt_term *)client_data)->make_current (); |
|
|
1266 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END)); |
|
|
1267 | } |
|
|
1268 | |
|
|
1269 | static void |
|
|
1270 | xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) |
|
|
1271 | { |
|
|
1272 | rxvt_term *term = (rxvt_term *)client_data; |
|
|
1273 | XIMText *text = call_data->text; |
|
|
1274 | |
|
|
1275 | term->make_current (); |
|
|
1276 | |
|
|
1277 | if (text) |
|
|
1278 | { |
|
|
1279 | void *str; |
|
|
1280 | |
|
|
1281 | if (!text->encoding_is_wchar && text->string.multi_byte) |
|
|
1282 | { |
|
|
1283 | // of course, X makes it ugly again |
|
|
1284 | if (term->rs[Rs_imLocale]) |
|
|
1285 | SET_LOCALE (term->rs[Rs_imLocale]); |
|
|
1286 | |
|
|
1287 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
|
|
1288 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
|
|
1289 | |
|
|
1290 | if (term->rs[Rs_imLocale]) |
|
|
1291 | SET_LOCALE (term->locale); |
|
|
1292 | } |
|
|
1293 | else |
|
|
1294 | str = (void *)text->string.wide_char; |
|
|
1295 | |
|
|
1296 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1297 | DT_INT, call_data->caret, |
|
|
1298 | DT_INT, call_data->chg_first, |
|
|
1299 | DT_INT, call_data->chg_length, |
|
|
1300 | DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, |
|
|
1301 | DT_WCS_LEN, str, str ? (int)text->length : 0, |
|
|
1302 | DT_END)); |
|
|
1303 | } |
|
|
1304 | else |
|
|
1305 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1306 | DT_INT, call_data->caret, |
|
|
1307 | DT_INT, call_data->chg_first, |
|
|
1308 | DT_INT, call_data->chg_length, |
|
|
1309 | DT_END)); |
|
|
1310 | } |
|
|
1311 | |
|
|
1312 | #if 0 |
|
|
1313 | static void |
|
|
1314 | xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) |
|
|
1315 | { |
|
|
1316 | ((rxvt_term *)client_data)->make_current (); |
|
|
1317 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, |
|
|
1318 | DT_INT, call_data->position, |
|
|
1319 | DT_INT, call_data->direction, |
|
|
1320 | DT_INT, call_data->style, |
|
|
1321 | DT_END)); |
|
|
1322 | } |
|
|
1323 | #endif |
|
|
1324 | |
|
|
1325 | #endif |
1246 | |
1326 | |
1247 | /* |
1327 | /* |
1248 | * Try to open a XIM with the current modifiers, then see if we can |
1328 | * Try to open a XIM with the current modifiers, then see if we can |
1249 | * open a suitable preedit type |
1329 | * open a suitable preedit type |
1250 | */ |
1330 | */ |
… | |
… | |
1257 | XRectangle rect, status_rect, needed_rect; |
1337 | XRectangle rect, status_rect, needed_rect; |
1258 | unsigned long fg, bg; |
1338 | unsigned long fg, bg; |
1259 | const char *p; |
1339 | const char *p; |
1260 | char **s; |
1340 | char **s; |
1261 | XIMStyles *xim_styles; |
1341 | XIMStyles *xim_styles; |
|
|
1342 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1343 | XIMCallback xcb[4]; |
|
|
1344 | #endif |
1262 | |
1345 | |
1263 | set_environ (envv); |
1346 | set_environ (envv); |
1264 | |
1347 | |
1265 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1348 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1266 | return false; |
1349 | return false; |
… | |
… | |
1292 | s = rxvt_splitcommastring (p); |
1375 | s = rxvt_splitcommastring (p); |
1293 | |
1376 | |
1294 | for (i = found = 0; !found && s[i]; i++) |
1377 | for (i = found = 0; !found && s[i]; i++) |
1295 | { |
1378 | { |
1296 | if (!strcmp (s[i], "OverTheSpot")) |
1379 | if (!strcmp (s[i], "OverTheSpot")) |
1297 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1380 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1298 | else if (!strcmp (s[i], "OffTheSpot")) |
1381 | else if (!strcmp (s[i], "OffTheSpot")) |
1299 | input_style = (XIMPreeditArea | XIMStatusArea); |
1382 | input_style = XIMPreeditArea | XIMStatusArea; |
1300 | else if (!strcmp (s[i], "Root")) |
1383 | else if (!strcmp (s[i], "Root")) |
1301 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1384 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1302 | else if (!strcmp (s[i], "None")) |
1385 | else if (!strcmp (s[i], "None")) |
1303 | input_style = (XIMPreeditNone | XIMStatusNone); |
1386 | input_style = XIMPreeditNone | XIMStatusNone; |
|
|
1387 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1388 | else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot")) |
|
|
1389 | input_style = XIMPreeditCallbacks | XIMStatusNothing; |
|
|
1390 | #endif |
|
|
1391 | else |
|
|
1392 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1304 | |
1393 | |
1305 | for (j = 0; j < xim_styles->count_styles; j++) |
1394 | for (j = 0; j < xim_styles->count_styles; j++) |
1306 | if (input_style == xim_styles->supported_styles[j]) |
1395 | if (input_style == xim_styles->supported_styles[j]) |
1307 | { |
1396 | { |
1308 | rxvt_freecommastring (s); |
1397 | rxvt_freecommastring (s); |
… | |
… | |
1397 | XNBackground, bg, |
1486 | XNBackground, bg, |
1398 | XNArea, &status_rect, |
1487 | XNArea, &status_rect, |
1399 | XNFontSet, fs, |
1488 | XNFontSet, fs, |
1400 | NULL); |
1489 | NULL); |
1401 | } |
1490 | } |
|
|
1491 | else if (input_style & XIMPreeditCallbacks) |
|
|
1492 | { |
|
|
1493 | im_set_position (spot); |
|
|
1494 | |
|
|
1495 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
|
|
1496 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
|
|
1497 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
|
|
1498 | #if 0 |
|
|
1499 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
|
|
1500 | #endif |
|
|
1501 | |
|
|
1502 | preedit_attr = XVaCreateNestedList (0, |
|
|
1503 | XNSpotLocation, &spot, |
|
|
1504 | XNPreeditStartCallback, &xcb[0], |
|
|
1505 | XNPreeditDoneCallback , &xcb[1], |
|
|
1506 | XNPreeditDrawCallback , &xcb[2], |
|
|
1507 | #if 0 |
|
|
1508 | XNPreeditCaretCallback, &xcb[3], |
|
|
1509 | #endif |
|
|
1510 | NULL); |
|
|
1511 | } |
1402 | |
1512 | |
1403 | Input_Context = XCreateIC (xim, |
1513 | Input_Context = XCreateIC (xim, |
1404 | XNInputStyle, input_style, |
1514 | XNInputStyle, input_style, |
1405 | XNClientWindow, vt, |
1515 | XNClientWindow, vt, |
1406 | XNFocusWindow, parent[0], |
1516 | XNFocusWindow, parent[0], |
… | |
… | |
1418 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1528 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1419 | im_destroy (); |
1529 | im_destroy (); |
1420 | return false; |
1530 | return false; |
1421 | } |
1531 | } |
1422 | |
1532 | |
|
|
1533 | #if 0 |
|
|
1534 | // unfortunately, only the focus window is used by XIM, hard to fix |
1423 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1535 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1424 | vt_select_input (); |
1536 | vt_select_input (); |
|
|
1537 | #endif |
1425 | |
1538 | |
1426 | if (input_style & XIMPreeditArea) |
1539 | if (input_style & XIMPreeditArea) |
1427 | IMSetStatusPosition (); |
1540 | IMSetStatusPosition (); |
1428 | |
1541 | |
1429 | return true; |
1542 | return true; |