… | |
… | |
170 | pointer_ev (this, &rxvt_term::pointer_cb), |
170 | pointer_ev (this, &rxvt_term::pointer_cb), |
171 | #endif |
171 | #endif |
172 | #ifdef USE_XIM |
172 | #ifdef USE_XIM |
173 | im_ev (this, &rxvt_term::im_cb), |
173 | im_ev (this, &rxvt_term::im_cb), |
174 | #endif |
174 | #endif |
|
|
175 | #ifndef NO_BELL |
|
|
176 | bell_ev (this, &rxvt_term::bell_cb), |
|
|
177 | #endif |
175 | termwin_ev (this, &rxvt_term::x_cb), |
178 | termwin_ev (this, &rxvt_term::x_cb), |
176 | vt_ev (this, &rxvt_term::x_cb), |
179 | vt_ev (this, &rxvt_term::x_cb), |
177 | child_ev (this, &rxvt_term::child_cb), |
180 | child_ev (this, &rxvt_term::child_cb), |
178 | check_ev (this, &rxvt_term::check_cb), |
181 | check_ev (this, &rxvt_term::check_cb), |
179 | flush_ev (this, &rxvt_term::flush_cb), |
182 | flush_ev (this, &rxvt_term::flush_cb), |
… | |
… | |
302 | rxvt_term::destroy () |
305 | rxvt_term::destroy () |
303 | { |
306 | { |
304 | if (destroy_ev.active) |
307 | if (destroy_ev.active) |
305 | return; |
308 | return; |
306 | |
309 | |
307 | if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) |
310 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
308 | return; |
|
|
309 | |
311 | |
310 | #if ENABLE_OVERLAY |
312 | #if ENABLE_OVERLAY |
311 | scr_overlay_off (); |
313 | scr_overlay_off (); |
312 | #endif |
314 | #endif |
313 | |
315 | |
… | |
… | |
447 | _exit (EXIT_FAILURE); |
449 | _exit (EXIT_FAILURE); |
448 | } |
450 | } |
449 | |
451 | |
450 | /*----------------------------------------------------------------------*/ |
452 | /*----------------------------------------------------------------------*/ |
451 | bool |
453 | bool |
452 | rxvt_term::init (int argc, const char *const *argv) |
454 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
453 | { |
455 | { |
|
|
456 | this->envv = envv; |
|
|
457 | |
454 | SET_R (this); |
458 | SET_R (this); |
455 | set_locale (""); |
459 | set_locale (""); |
456 | set_environ (envv); // few things in X do not call setlocale :( |
460 | set_environ (envv); // few things in X do not call setlocale :( |
457 | |
461 | |
458 | if (!init_vars ()) |
462 | if (!init_vars ()) |
… | |
… | |
469 | #ifdef HAVE_SCROLLBARS |
473 | #ifdef HAVE_SCROLLBARS |
470 | if (OPTION (Opt_scrollBar)) |
474 | if (OPTION (Opt_scrollBar)) |
471 | scrollBar.setIdle (); /* set existence for size calculations */ |
475 | scrollBar.setIdle (); /* set existence for size calculations */ |
472 | #endif |
476 | #endif |
473 | |
477 | |
474 | pty = rxvt_new_ptytty (); |
478 | pty = ptytty::create (); |
475 | |
479 | |
476 | create_windows (argc, argv); |
480 | create_windows (argc, argv); |
477 | |
481 | |
478 | dDisp; |
482 | dDisp; |
479 | |
483 | |
… | |
… | |
508 | pty_ev.start (pty->pty, EVENT_READ); |
512 | pty_ev.start (pty->pty, EVENT_READ); |
509 | |
513 | |
510 | check_ev.start (); |
514 | check_ev.start (); |
511 | |
515 | |
512 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
516 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
|
|
517 | |
|
|
518 | #if ENABLE_XEMBED |
|
|
519 | if (rs[Rs_embed]) |
|
|
520 | { |
|
|
521 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
522 | |
|
|
523 | XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
524 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
525 | } |
|
|
526 | #endif |
513 | |
527 | |
514 | XMapWindow (disp, vt); |
528 | XMapWindow (disp, vt); |
515 | XMapWindow (disp, parent[0]); |
529 | XMapWindow (disp, parent[0]); |
516 | |
530 | |
517 | return true; |
531 | return true; |
… | |
… | |
525 | * Catch a fatal signal and tidy up before quitting |
539 | * Catch a fatal signal and tidy up before quitting |
526 | */ |
540 | */ |
527 | void |
541 | void |
528 | sig_term (sig_watcher &w) |
542 | sig_term (sig_watcher &w) |
529 | { |
543 | { |
530 | #ifdef DEBUG_CMD |
|
|
531 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
532 | #endif |
|
|
533 | rxvt_emergency_cleanup (); |
544 | rxvt_emergency_cleanup (); |
534 | signal (w.signum, SIG_DFL); |
545 | signal (w.signum, SIG_DFL); |
535 | kill (getpid (), w.signum); |
546 | kill (getpid (), w.signum); |
536 | } |
547 | } |
537 | |
548 | |
… | |
… | |
545 | char **rxvt_environ; // startup environment |
556 | char **rxvt_environ; // startup environment |
546 | |
557 | |
547 | void |
558 | void |
548 | rxvt_init () |
559 | rxvt_init () |
549 | { |
560 | { |
550 | uid_t uid = getuid (); |
561 | ptytty::init (); |
551 | gid_t gid = getgid (); |
|
|
552 | |
|
|
553 | // before doing anything else, check for setuid/setgid operation, |
|
|
554 | // start the helper process and drop privileges |
|
|
555 | if (uid != geteuid () |
|
|
556 | || gid != getegid ()) |
|
|
557 | { |
|
|
558 | #if PTYTTY_HELPER |
|
|
559 | rxvt_ptytty_server (); |
|
|
560 | #else |
|
|
561 | rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); |
|
|
562 | #endif |
|
|
563 | |
|
|
564 | // drop privileges |
|
|
565 | #if HAVE_SETRESUID |
|
|
566 | setresgid (gid, gid, gid); |
|
|
567 | setresuid (uid, uid, uid); |
|
|
568 | #elif HAVE_SETREUID |
|
|
569 | setregid (gid, gid); |
|
|
570 | setreuid (uid, uid); |
|
|
571 | #elif HAVE_SETUID |
|
|
572 | setgid (gid); |
|
|
573 | setuid (uid); |
|
|
574 | #endif |
|
|
575 | |
|
|
576 | if (uid != geteuid () |
|
|
577 | || gid != getegid ()) |
|
|
578 | rxvt_fatal ("unable to drop privileges, aborting.\n"); |
|
|
579 | } |
|
|
580 | |
562 | |
581 | rxvt_environ = environ; |
563 | rxvt_environ = environ; |
582 | |
564 | |
583 | signal (SIGHUP, SIG_IGN); |
565 | signal (SIGHUP, SIG_IGN); |
584 | signal (SIGPIPE, SIG_IGN); |
566 | signal (SIGPIPE, SIG_IGN); |
… | |
… | |
643 | short recalc_x, recalc_y; |
625 | short recalc_x, recalc_y; |
644 | int x, y, sb_w, flags; |
626 | int x, y, sb_w, flags; |
645 | unsigned int w, h; |
627 | unsigned int w, h; |
646 | unsigned int max_width, max_height; |
628 | unsigned int max_width, max_height; |
647 | dDisp; |
629 | dDisp; |
648 | |
|
|
649 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
650 | ncol, nrow, szHint.width, szHint.height)); |
|
|
651 | |
630 | |
652 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
631 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
653 | szHint.win_gravity = NorthWestGravity; |
632 | szHint.win_gravity = NorthWestGravity; |
654 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
633 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
655 | |
634 | |
… | |
… | |
758 | if (recalc_y) |
737 | if (recalc_y) |
759 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
738 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
760 | |
739 | |
761 | ncol = width / fwidth; |
740 | ncol = width / fwidth; |
762 | nrow = height / fheight; |
741 | nrow = height / fheight; |
763 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
764 | ncol, nrow, szHint.width, |
|
|
765 | szHint.height)); |
|
|
766 | return; |
|
|
767 | } |
742 | } |
768 | |
743 | |
769 | /*----------------------------------------------------------------------*/ |
744 | /*----------------------------------------------------------------------*/ |
770 | /* |
745 | /* |
771 | * Tell the teletype handler what size the window is. |
746 | * Tell the teletype handler what size the window is. |
… | |
… | |
1055 | * -------------------------------------------------------------------- */ |
1030 | * -------------------------------------------------------------------- */ |
1056 | void |
1031 | void |
1057 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1032 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1058 | { |
1033 | { |
1059 | int fix_screen; |
1034 | int fix_screen; |
1060 | int old_width = szHint.width, old_height = szHint.height; |
1035 | int old_width = szHint.width; |
|
|
1036 | int old_height = szHint.height; |
1061 | dDisp; |
1037 | dDisp; |
1062 | |
1038 | |
1063 | window_calc (newwidth, newheight); |
1039 | window_calc (newwidth, newheight); |
1064 | XSetWMNormalHints (disp, parent[0], &szHint); |
1040 | XSetWMNormalHints (disp, parent[0], &szHint); |
1065 | |
1041 | |
… | |
… | |
1087 | { |
1063 | { |
1088 | x -= x1; |
1064 | x -= x1; |
1089 | y -= y1; |
1065 | y -= y1; |
1090 | } |
1066 | } |
1091 | |
1067 | |
1092 | x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; |
1068 | x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; |
1093 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1069 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1094 | dx = old_width - szHint.width; |
1070 | dx = old_width - szHint.width; |
1095 | dy = old_height - szHint.height; |
1071 | dy = old_height - szHint.height; |
1096 | |
1072 | |
1097 | /* Check position of the center of the window */ |
1073 | /* Check position of the center of the window */ |
1098 | if (x < x1) /* left half */ |
1074 | if (x < x1) /* left half */ |
1099 | dx = 0; |
1075 | dx = 0; |
… | |
… | |
1132 | resize_pixmap (); |
1108 | resize_pixmap (); |
1133 | #endif |
1109 | #endif |
1134 | } |
1110 | } |
1135 | |
1111 | |
1136 | if (fix_screen || old_height == 0) |
1112 | if (fix_screen || old_height == 0) |
1137 | { |
|
|
1138 | int curr_screen = -1; |
|
|
1139 | int old_ncol = prev_ncol; |
|
|
1140 | |
|
|
1141 | /* scr_reset only works on the primary screen */ |
|
|
1142 | if (old_height) /* this is not the first time through */ |
|
|
1143 | { |
|
|
1144 | unsigned int ocol = ncol; |
|
|
1145 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
|
|
1146 | curr_screen = scr_change_screen (PRIMARY); |
|
|
1147 | ncol = ocol; |
|
|
1148 | } |
|
|
1149 | |
|
|
1150 | scr_reset (); |
1113 | scr_reset (); |
1151 | |
|
|
1152 | if (curr_screen >= 0) /* this is not the first time through */ |
|
|
1153 | { |
|
|
1154 | scr_change_screen (curr_screen); |
|
|
1155 | selection_check (old_ncol != ncol ? 4 : 0); |
|
|
1156 | } |
|
|
1157 | } |
|
|
1158 | |
|
|
1159 | old_width = szHint.width; |
|
|
1160 | old_height = szHint.height; |
|
|
1161 | |
1114 | |
1162 | #ifdef XPM_BACKGROUND |
1115 | #ifdef XPM_BACKGROUND |
1163 | if (pixmap) |
1116 | if (pixmap) |
1164 | scr_touch (false); |
1117 | scr_touch (false); |
1165 | #endif |
1118 | #endif |
… | |
… | |
1268 | XPoint nspot; |
1221 | XPoint nspot; |
1269 | XVaNestedList preedit_attr; |
1222 | XVaNestedList preedit_attr; |
1270 | |
1223 | |
1271 | if (!Input_Context |
1224 | if (!Input_Context |
1272 | || !focus |
1225 | || !focus |
1273 | || !(input_style & XIMPreeditPosition)) |
1226 | || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) |
1274 | return; |
1227 | return; |
1275 | |
1228 | |
1276 | im_set_position (nspot); |
1229 | im_set_position (nspot); |
1277 | |
1230 | |
1278 | if (nspot.x == spot.x && nspot.y == spot.y) |
1231 | if (nspot.x == spot.x && nspot.y == spot.y) |
… | |
… | |
1297 | input_method = 0; |
1250 | input_method = 0; |
1298 | } |
1251 | } |
1299 | |
1252 | |
1300 | Input_Context = 0; |
1253 | Input_Context = 0; |
1301 | } |
1254 | } |
|
|
1255 | |
|
|
1256 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1257 | |
|
|
1258 | static void |
|
|
1259 | xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1260 | { |
|
|
1261 | ((rxvt_term *)client_data)->make_current (); |
|
|
1262 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END)); |
|
|
1263 | } |
|
|
1264 | |
|
|
1265 | static void |
|
|
1266 | xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1267 | { |
|
|
1268 | ((rxvt_term *)client_data)->make_current (); |
|
|
1269 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END)); |
|
|
1270 | } |
|
|
1271 | |
|
|
1272 | static void |
|
|
1273 | xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) |
|
|
1274 | { |
|
|
1275 | rxvt_term *term = (rxvt_term *)client_data; |
|
|
1276 | XIMText *text = call_data->text; |
|
|
1277 | |
|
|
1278 | term->make_current (); |
|
|
1279 | |
|
|
1280 | if (text) |
|
|
1281 | { |
|
|
1282 | void *str; |
|
|
1283 | |
|
|
1284 | if (!text->encoding_is_wchar && text->string.multi_byte) |
|
|
1285 | { |
|
|
1286 | // of course, X makes it ugly again |
|
|
1287 | if (term->rs[Rs_imLocale]) |
|
|
1288 | SET_LOCALE (term->rs[Rs_imLocale]); |
|
|
1289 | |
|
|
1290 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
|
|
1291 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
|
|
1292 | |
|
|
1293 | if (term->rs[Rs_imLocale]) |
|
|
1294 | SET_LOCALE (term->locale); |
|
|
1295 | } |
|
|
1296 | else |
|
|
1297 | str = (void *)text->string.wide_char; |
|
|
1298 | |
|
|
1299 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1300 | DT_INT, call_data->caret, |
|
|
1301 | DT_INT, call_data->chg_first, |
|
|
1302 | DT_INT, call_data->chg_length, |
|
|
1303 | DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, |
|
|
1304 | DT_WCS_LEN, str, str ? (int)text->length : 0, |
|
|
1305 | DT_END)); |
|
|
1306 | } |
|
|
1307 | else |
|
|
1308 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1309 | DT_INT, call_data->caret, |
|
|
1310 | DT_INT, call_data->chg_first, |
|
|
1311 | DT_INT, call_data->chg_length, |
|
|
1312 | DT_END)); |
|
|
1313 | } |
|
|
1314 | |
|
|
1315 | #if 0 |
|
|
1316 | static void |
|
|
1317 | xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) |
|
|
1318 | { |
|
|
1319 | ((rxvt_term *)client_data)->make_current (); |
|
|
1320 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, |
|
|
1321 | DT_INT, call_data->position, |
|
|
1322 | DT_INT, call_data->direction, |
|
|
1323 | DT_INT, call_data->style, |
|
|
1324 | DT_END)); |
|
|
1325 | } |
|
|
1326 | #endif |
|
|
1327 | |
|
|
1328 | #endif |
1302 | |
1329 | |
1303 | /* |
1330 | /* |
1304 | * Try to open a XIM with the current modifiers, then see if we can |
1331 | * Try to open a XIM with the current modifiers, then see if we can |
1305 | * open a suitable preedit type |
1332 | * open a suitable preedit type |
1306 | */ |
1333 | */ |
… | |
… | |
1313 | XRectangle rect, status_rect, needed_rect; |
1340 | XRectangle rect, status_rect, needed_rect; |
1314 | unsigned long fg, bg; |
1341 | unsigned long fg, bg; |
1315 | const char *p; |
1342 | const char *p; |
1316 | char **s; |
1343 | char **s; |
1317 | XIMStyles *xim_styles; |
1344 | XIMStyles *xim_styles; |
|
|
1345 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1346 | XIMCallback xcb[4]; |
|
|
1347 | #endif |
1318 | |
1348 | |
1319 | set_environ (envv); |
1349 | set_environ (envv); |
1320 | |
1350 | |
1321 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1351 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1322 | return false; |
1352 | return false; |
1323 | |
1353 | |
1324 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
|
|
1325 | input_method = display->get_xim (locale, modifiers); |
1354 | input_method = display->get_xim (locale, modifiers); |
1326 | if (input_method == NULL) |
1355 | if (input_method == NULL) |
1327 | return false; |
1356 | return false; |
1328 | |
1357 | |
1329 | xim = input_method->xim; |
1358 | xim = input_method->xim; |
… | |
… | |
1349 | s = rxvt_splitcommastring (p); |
1378 | s = rxvt_splitcommastring (p); |
1350 | |
1379 | |
1351 | for (i = found = 0; !found && s[i]; i++) |
1380 | for (i = found = 0; !found && s[i]; i++) |
1352 | { |
1381 | { |
1353 | if (!strcmp (s[i], "OverTheSpot")) |
1382 | if (!strcmp (s[i], "OverTheSpot")) |
1354 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1383 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1355 | else if (!strcmp (s[i], "OffTheSpot")) |
1384 | else if (!strcmp (s[i], "OffTheSpot")) |
1356 | input_style = (XIMPreeditArea | XIMStatusArea); |
1385 | input_style = XIMPreeditArea | XIMStatusArea; |
1357 | else if (!strcmp (s[i], "Root")) |
1386 | else if (!strcmp (s[i], "Root")) |
1358 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1387 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1359 | else if (!strcmp (s[i], "None")) |
1388 | else if (!strcmp (s[i], "None")) |
1360 | input_style = (XIMPreeditNone | XIMStatusNone); |
1389 | input_style = XIMPreeditNone | XIMStatusNone; |
|
|
1390 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1391 | else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot")) |
|
|
1392 | input_style = XIMPreeditCallbacks | XIMStatusNothing; |
|
|
1393 | #endif |
|
|
1394 | else |
|
|
1395 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1361 | |
1396 | |
1362 | for (j = 0; j < xim_styles->count_styles; j++) |
1397 | for (j = 0; j < xim_styles->count_styles; j++) |
1363 | if (input_style == xim_styles->supported_styles[j]) |
1398 | if (input_style == xim_styles->supported_styles[j]) |
1364 | { |
1399 | { |
1365 | rxvt_freecommastring (s); |
1400 | rxvt_freecommastring (s); |
… | |
… | |
1454 | XNBackground, bg, |
1489 | XNBackground, bg, |
1455 | XNArea, &status_rect, |
1490 | XNArea, &status_rect, |
1456 | XNFontSet, fs, |
1491 | XNFontSet, fs, |
1457 | NULL); |
1492 | NULL); |
1458 | } |
1493 | } |
|
|
1494 | else if (input_style & XIMPreeditCallbacks) |
|
|
1495 | { |
|
|
1496 | im_set_position (spot); |
|
|
1497 | |
|
|
1498 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
|
|
1499 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
|
|
1500 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
|
|
1501 | #if 0 |
|
|
1502 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
|
|
1503 | #endif |
|
|
1504 | |
|
|
1505 | preedit_attr = XVaCreateNestedList (0, |
|
|
1506 | XNSpotLocation, &spot, |
|
|
1507 | XNPreeditStartCallback, &xcb[0], |
|
|
1508 | XNPreeditDoneCallback , &xcb[1], |
|
|
1509 | XNPreeditDrawCallback , &xcb[2], |
|
|
1510 | #if 0 |
|
|
1511 | XNPreeditCaretCallback, &xcb[3], |
|
|
1512 | #endif |
|
|
1513 | NULL); |
|
|
1514 | } |
1459 | |
1515 | |
1460 | Input_Context = XCreateIC (xim, |
1516 | Input_Context = XCreateIC (xim, |
1461 | XNInputStyle, input_style, |
1517 | XNInputStyle, input_style, |
1462 | XNClientWindow, vt, |
1518 | XNClientWindow, vt, |
1463 | XNFocusWindow, parent[0], |
1519 | XNFocusWindow, parent[0], |
… | |
… | |
1475 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1531 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1476 | im_destroy (); |
1532 | im_destroy (); |
1477 | return false; |
1533 | return false; |
1478 | } |
1534 | } |
1479 | |
1535 | |
|
|
1536 | #if 0 |
|
|
1537 | // unfortunately, only the focus window is used by XIM, hard to fix |
|
|
1538 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
|
|
1539 | vt_select_input (); |
|
|
1540 | #endif |
|
|
1541 | |
1480 | if (input_style & XIMPreeditArea) |
1542 | if (input_style & XIMPreeditArea) |
1481 | IMSetStatusPosition (); |
1543 | IMSetStatusPosition (); |
1482 | |
1544 | |
1483 | D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); |
|
|
1484 | return true; |
1545 | return true; |
1485 | } |
1546 | } |
1486 | |
1547 | |
1487 | void |
1548 | void |
1488 | rxvt_term::im_cb () |
1549 | rxvt_term::im_cb () |
… | |
… | |
1494 | |
1555 | |
1495 | make_current (); |
1556 | make_current (); |
1496 | |
1557 | |
1497 | im_destroy (); |
1558 | im_destroy (); |
1498 | |
1559 | |
1499 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
|
|
1500 | if (Input_Context) |
1560 | if (Input_Context) |
1501 | return; |
1561 | return; |
1502 | |
1562 | |
1503 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1563 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1504 | if (rs[Rs_imLocale]) |
1564 | if (rs[Rs_imLocale]) |