… | |
… | |
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 | } |
… | |
… | |
530 | * Catch a fatal signal and tidy up before quitting |
537 | * Catch a fatal signal and tidy up before quitting |
531 | */ |
538 | */ |
532 | void |
539 | void |
533 | sig_term (sig_watcher &w) |
540 | sig_term (sig_watcher &w) |
534 | { |
541 | { |
535 | #ifdef DEBUG_CMD |
|
|
536 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
537 | #endif |
|
|
538 | rxvt_emergency_cleanup (); |
542 | rxvt_emergency_cleanup (); |
539 | signal (w.signum, SIG_DFL); |
543 | signal (w.signum, SIG_DFL); |
540 | kill (getpid (), w.signum); |
544 | kill (getpid (), w.signum); |
541 | } |
545 | } |
542 | |
546 | |
… | |
… | |
620 | int x, y, sb_w, flags; |
624 | int x, y, sb_w, flags; |
621 | unsigned int w, h; |
625 | unsigned int w, h; |
622 | unsigned int max_width, max_height; |
626 | unsigned int max_width, max_height; |
623 | dDisp; |
627 | dDisp; |
624 | |
628 | |
625 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
626 | ncol, nrow, szHint.width, szHint.height)); |
|
|
627 | |
|
|
628 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
629 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
629 | szHint.win_gravity = NorthWestGravity; |
630 | szHint.win_gravity = NorthWestGravity; |
630 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
631 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
631 | |
632 | |
632 | recalc_x = recalc_y = 0; |
633 | recalc_x = recalc_y = 0; |
… | |
… | |
734 | if (recalc_y) |
735 | if (recalc_y) |
735 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
736 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
736 | |
737 | |
737 | ncol = width / fwidth; |
738 | ncol = width / fwidth; |
738 | nrow = height / fheight; |
739 | nrow = height / fheight; |
739 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
740 | ncol, nrow, szHint.width, |
|
|
741 | szHint.height)); |
|
|
742 | return; |
|
|
743 | } |
740 | } |
744 | |
741 | |
745 | /*----------------------------------------------------------------------*/ |
742 | /*----------------------------------------------------------------------*/ |
746 | /* |
743 | /* |
747 | * Tell the teletype handler what size the window is. |
744 | * Tell the teletype handler what size the window is. |
… | |
… | |
987 | { |
984 | { |
988 | unsigned int i; |
985 | unsigned int i; |
989 | const char *xpmb = "\0"; |
986 | const char *xpmb = "\0"; |
990 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
987 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
991 | |
988 | |
992 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); |
|
|
993 | strcpy (fstr, "default"); |
989 | strcpy (fstr, "default"); |
994 | strcpy (bstr, "default"); |
990 | strcpy (bstr, "default"); |
995 | for (i = Color_Black; i <= Color_White; i++) |
991 | for (i = Color_Black; i <= Color_White; i++) |
996 | if (pix_colors[Color_fg] == pix_colors[i]) |
992 | if (pix_colors[Color_fg] == pix_colors[i]) |
997 | { |
993 | { |
… | |
… | |
1222 | XPoint nspot; |
1218 | XPoint nspot; |
1223 | XVaNestedList preedit_attr; |
1219 | XVaNestedList preedit_attr; |
1224 | |
1220 | |
1225 | if (!Input_Context |
1221 | if (!Input_Context |
1226 | || !focus |
1222 | || !focus |
1227 | || !(input_style & XIMPreeditPosition)) |
1223 | || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) |
1228 | return; |
1224 | return; |
1229 | |
1225 | |
1230 | im_set_position (nspot); |
1226 | im_set_position (nspot); |
1231 | |
1227 | |
1232 | if (nspot.x == spot.x && nspot.y == spot.y) |
1228 | if (nspot.x == spot.x && nspot.y == spot.y) |
… | |
… | |
1251 | input_method = 0; |
1247 | input_method = 0; |
1252 | } |
1248 | } |
1253 | |
1249 | |
1254 | Input_Context = 0; |
1250 | Input_Context = 0; |
1255 | } |
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 |
1256 | |
1326 | |
1257 | /* |
1327 | /* |
1258 | * 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 |
1259 | * open a suitable preedit type |
1329 | * open a suitable preedit type |
1260 | */ |
1330 | */ |
… | |
… | |
1267 | XRectangle rect, status_rect, needed_rect; |
1337 | XRectangle rect, status_rect, needed_rect; |
1268 | unsigned long fg, bg; |
1338 | unsigned long fg, bg; |
1269 | const char *p; |
1339 | const char *p; |
1270 | char **s; |
1340 | char **s; |
1271 | XIMStyles *xim_styles; |
1341 | XIMStyles *xim_styles; |
|
|
1342 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1343 | XIMCallback xcb[4]; |
|
|
1344 | #endif |
1272 | |
1345 | |
1273 | set_environ (envv); |
1346 | set_environ (envv); |
1274 | |
1347 | |
1275 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1348 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1276 | return false; |
1349 | return false; |
1277 | |
1350 | |
1278 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
|
|
1279 | input_method = display->get_xim (locale, modifiers); |
1351 | input_method = display->get_xim (locale, modifiers); |
1280 | if (input_method == NULL) |
1352 | if (input_method == NULL) |
1281 | return false; |
1353 | return false; |
1282 | |
1354 | |
1283 | xim = input_method->xim; |
1355 | xim = input_method->xim; |
… | |
… | |
1303 | s = rxvt_splitcommastring (p); |
1375 | s = rxvt_splitcommastring (p); |
1304 | |
1376 | |
1305 | for (i = found = 0; !found && s[i]; i++) |
1377 | for (i = found = 0; !found && s[i]; i++) |
1306 | { |
1378 | { |
1307 | if (!strcmp (s[i], "OverTheSpot")) |
1379 | if (!strcmp (s[i], "OverTheSpot")) |
1308 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1380 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1309 | else if (!strcmp (s[i], "OffTheSpot")) |
1381 | else if (!strcmp (s[i], "OffTheSpot")) |
1310 | input_style = (XIMPreeditArea | XIMStatusArea); |
1382 | input_style = XIMPreeditArea | XIMStatusArea; |
1311 | else if (!strcmp (s[i], "Root")) |
1383 | else if (!strcmp (s[i], "Root")) |
1312 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1384 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1313 | else if (!strcmp (s[i], "None")) |
1385 | else if (!strcmp (s[i], "None")) |
1314 | 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; |
1315 | |
1393 | |
1316 | for (j = 0; j < xim_styles->count_styles; j++) |
1394 | for (j = 0; j < xim_styles->count_styles; j++) |
1317 | if (input_style == xim_styles->supported_styles[j]) |
1395 | if (input_style == xim_styles->supported_styles[j]) |
1318 | { |
1396 | { |
1319 | rxvt_freecommastring (s); |
1397 | rxvt_freecommastring (s); |
… | |
… | |
1408 | XNBackground, bg, |
1486 | XNBackground, bg, |
1409 | XNArea, &status_rect, |
1487 | XNArea, &status_rect, |
1410 | XNFontSet, fs, |
1488 | XNFontSet, fs, |
1411 | NULL); |
1489 | NULL); |
1412 | } |
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 | } |
1413 | |
1512 | |
1414 | Input_Context = XCreateIC (xim, |
1513 | Input_Context = XCreateIC (xim, |
1415 | XNInputStyle, input_style, |
1514 | XNInputStyle, input_style, |
1416 | XNClientWindow, vt, |
1515 | XNClientWindow, vt, |
1417 | XNFocusWindow, parent[0], |
1516 | XNFocusWindow, parent[0], |
… | |
… | |
1429 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1528 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1430 | im_destroy (); |
1529 | im_destroy (); |
1431 | return false; |
1530 | return false; |
1432 | } |
1531 | } |
1433 | |
1532 | |
|
|
1533 | #if 0 |
|
|
1534 | // unfortunately, only the focus window is used by XIM, hard to fix |
1434 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1535 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1435 | vt_select_input (); |
1536 | vt_select_input (); |
|
|
1537 | #endif |
1436 | |
1538 | |
1437 | if (input_style & XIMPreeditArea) |
1539 | if (input_style & XIMPreeditArea) |
1438 | IMSetStatusPosition (); |
1540 | IMSetStatusPosition (); |
1439 | |
1541 | |
1440 | D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); |
|
|
1441 | return true; |
1542 | return true; |
1442 | } |
1543 | } |
1443 | |
1544 | |
1444 | void |
1545 | void |
1445 | rxvt_term::im_cb () |
1546 | rxvt_term::im_cb () |
… | |
… | |
1451 | |
1552 | |
1452 | make_current (); |
1553 | make_current (); |
1453 | |
1554 | |
1454 | im_destroy (); |
1555 | im_destroy (); |
1455 | |
1556 | |
1456 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
|
|
1457 | if (Input_Context) |
1557 | if (Input_Context) |
1458 | return; |
1558 | return; |
1459 | |
1559 | |
1460 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1560 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1461 | if (rs[Rs_imLocale]) |
1561 | if (rs[Rs_imLocale]) |