… | |
… | |
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), |
… | |
… | |
213 | #endif |
216 | #endif |
214 | delete fontset[0]; |
217 | delete fontset[0]; |
215 | |
218 | |
216 | if (display) |
219 | if (display) |
217 | { |
220 | { |
218 | dDisp; |
|
|
219 | |
|
|
220 | selection_clear (); |
221 | selection_clear (); |
221 | |
222 | |
222 | #ifdef USE_XIM |
223 | #ifdef USE_XIM |
223 | im_destroy (); |
224 | im_destroy (); |
224 | #endif |
225 | #endif |
225 | #ifdef XTERM_SCROLLBAR |
226 | #ifdef XTERM_SCROLLBAR |
226 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
227 | if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); |
227 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
228 | if (ShadowGC) XFreeGC (xdisp, ShadowGC); |
228 | #endif |
229 | #endif |
229 | #ifdef PLAIN_SCROLLBAR |
230 | #ifdef PLAIN_SCROLLBAR |
230 | if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); |
231 | if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); |
231 | #endif |
232 | #endif |
232 | #ifdef NEXT_SCROLLBAR |
233 | #ifdef NEXT_SCROLLBAR |
233 | if (blackGC) XFreeGC (disp, blackGC); |
234 | if (blackGC) XFreeGC (xdisp, blackGC); |
234 | if (whiteGC) XFreeGC (disp, whiteGC); |
235 | if (whiteGC) XFreeGC (xdisp, whiteGC); |
235 | if (grayGC) XFreeGC (disp, grayGC); |
236 | if (grayGC) XFreeGC (xdisp, grayGC); |
236 | if (darkGC) XFreeGC (disp, darkGC); |
237 | if (darkGC) XFreeGC (xdisp, darkGC); |
237 | if (stippleGC) XFreeGC (disp, stippleGC); |
238 | if (stippleGC) XFreeGC (xdisp, stippleGC); |
238 | if (dimple) XFreePixmap (disp, dimple); |
239 | if (dimple) XFreePixmap (xdisp, dimple); |
239 | if (upArrow) XFreePixmap (disp, upArrow); |
240 | if (upArrow) XFreePixmap (xdisp, upArrow); |
240 | if (downArrow) XFreePixmap (disp, downArrow); |
241 | if (downArrow) XFreePixmap (xdisp, downArrow); |
241 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
242 | if (upArrowHi) XFreePixmap (xdisp, upArrowHi); |
242 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
243 | if (downArrowHi) XFreePixmap (xdisp, downArrowHi); |
243 | #endif |
244 | #endif |
244 | #ifdef RXVT_SCROLLBAR |
245 | #ifdef RXVT_SCROLLBAR |
245 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
246 | if (topShadowGC) XFreeGC (xdisp, topShadowGC); |
246 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
247 | if (botShadowGC) XFreeGC (xdisp, botShadowGC); |
247 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
248 | if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); |
248 | #endif |
249 | #endif |
249 | if (gc) XFreeGC (disp, gc); |
250 | if (gc) XFreeGC (xdisp, gc); |
250 | |
251 | |
251 | delete drawable; |
252 | delete drawable; |
252 | // destroy all windows |
253 | // destroy all windows |
253 | if (parent[0]) |
254 | if (parent[0]) |
254 | XDestroyWindow (disp, parent[0]); |
255 | XDestroyWindow (xdisp, parent[0]); |
|
|
256 | |
|
|
257 | clear (); |
255 | } |
258 | } |
256 | |
259 | |
257 | // TODO: free pixcolours, colours should become part of rxvt_display |
260 | // TODO: free pixcolours, colours should become part of rxvt_display |
258 | delete pix_colors_focused; |
261 | delete pix_colors_focused; |
259 | #if OFF_FOCUS_FADING |
262 | #if OFF_FOCUS_FADING |
… | |
… | |
268 | for (int i = 0; i < allocated.size (); i++) |
271 | for (int i = 0; i < allocated.size (); i++) |
269 | free (allocated [i]); |
272 | free (allocated [i]); |
270 | |
273 | |
271 | free (selection.text); |
274 | free (selection.text); |
272 | // TODO: manage env vars in child only(!) |
275 | // TODO: manage env vars in child only(!) |
273 | free (env_windowid); |
|
|
274 | free (env_display); |
276 | free (env_display); |
275 | free (env_term); |
277 | free (env_term); |
276 | free (env_colorfgbg); |
|
|
277 | free (locale); |
278 | free (locale); |
278 | free (v_buffer); |
279 | free (v_buffer); |
279 | free (incr_buf); |
280 | free (incr_buf); |
280 | |
281 | |
281 | delete envv; |
282 | delete envv; |
… | |
… | |
302 | rxvt_term::destroy () |
303 | rxvt_term::destroy () |
303 | { |
304 | { |
304 | if (destroy_ev.active) |
305 | if (destroy_ev.active) |
305 | return; |
306 | return; |
306 | |
307 | |
307 | if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) |
308 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
308 | return; |
|
|
309 | |
309 | |
310 | #if ENABLE_OVERLAY |
310 | #if ENABLE_OVERLAY |
311 | scr_overlay_off (); |
311 | scr_overlay_off (); |
312 | #endif |
312 | #endif |
313 | |
313 | |
… | |
… | |
447 | _exit (EXIT_FAILURE); |
447 | _exit (EXIT_FAILURE); |
448 | } |
448 | } |
449 | |
449 | |
450 | /*----------------------------------------------------------------------*/ |
450 | /*----------------------------------------------------------------------*/ |
451 | bool |
451 | bool |
452 | rxvt_term::init (int argc, const char *const *argv) |
452 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
453 | { |
453 | { |
|
|
454 | this->envv = envv; |
|
|
455 | |
454 | SET_R (this); |
456 | SET_R (this); |
455 | set_locale (""); |
457 | set_locale (""); |
456 | set_environ (envv); // few things in X do not call setlocale :( |
458 | set_environ (envv); // few things in X do not call setlocale :( |
457 | |
459 | |
458 | if (!init_vars ()) |
460 | if (!init_vars ()) |
… | |
… | |
469 | #ifdef HAVE_SCROLLBARS |
471 | #ifdef HAVE_SCROLLBARS |
470 | if (OPTION (Opt_scrollBar)) |
472 | if (OPTION (Opt_scrollBar)) |
471 | scrollBar.setIdle (); /* set existence for size calculations */ |
473 | scrollBar.setIdle (); /* set existence for size calculations */ |
472 | #endif |
474 | #endif |
473 | |
475 | |
474 | pty = rxvt_new_ptytty (); |
476 | pty = ptytty::create (); |
475 | |
477 | |
476 | create_windows (argc, argv); |
478 | create_windows (argc, argv); |
477 | |
479 | |
478 | dDisp; |
|
|
479 | |
|
|
480 | init_xlocale (); |
480 | init_xlocale (); |
481 | |
481 | |
482 | scr_reset (); // initialize screen |
482 | scr_reset (); // initialize screen |
483 | |
483 | |
484 | #if 0 |
484 | #if 0 |
485 | XSynchronize (disp, True); |
485 | XSynchronize (xdisp, True); |
486 | #endif |
486 | #endif |
487 | |
487 | |
488 | #ifdef HAVE_SCROLLBARS |
488 | #ifdef HAVE_SCROLLBARS |
489 | if (OPTION (Opt_scrollBar)) |
489 | if (OPTION (Opt_scrollBar)) |
490 | resize_scrollbar (); /* create and map scrollbar */ |
490 | resize_scrollbar (); /* create and map scrollbar */ |
491 | #endif |
491 | #endif |
492 | #ifdef TRANSPARENT |
492 | #ifdef TRANSPARENT |
493 | if (OPTION (Opt_transparent)) |
493 | if (OPTION (Opt_transparent)) |
494 | { |
494 | { |
495 | XSelectInput (disp, display->root, PropertyChangeMask); |
495 | XSelectInput (xdisp, display->root, PropertyChangeMask); |
496 | check_our_parents (); |
496 | check_our_parents (); |
497 | rootwin_ev.start (display, display->root); |
497 | rootwin_ev.start (display, display->root); |
498 | } |
498 | } |
499 | #endif |
499 | #endif |
500 | |
500 | |
… | |
… | |
509 | |
509 | |
510 | check_ev.start (); |
510 | check_ev.start (); |
511 | |
511 | |
512 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
512 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
513 | |
513 | |
|
|
514 | #if ENABLE_XEMBED |
|
|
515 | if (rs[Rs_embed]) |
|
|
516 | { |
|
|
517 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
518 | |
|
|
519 | XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
520 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
521 | } |
|
|
522 | #endif |
|
|
523 | |
514 | XMapWindow (disp, vt); |
524 | XMapWindow (xdisp, vt); |
515 | XMapWindow (disp, parent[0]); |
525 | XMapWindow (xdisp, parent[0]); |
516 | |
526 | |
517 | return true; |
527 | return true; |
518 | } |
528 | } |
519 | |
529 | |
520 | static struct sig_handlers |
530 | static struct sig_handlers |
… | |
… | |
525 | * Catch a fatal signal and tidy up before quitting |
535 | * Catch a fatal signal and tidy up before quitting |
526 | */ |
536 | */ |
527 | void |
537 | void |
528 | sig_term (sig_watcher &w) |
538 | sig_term (sig_watcher &w) |
529 | { |
539 | { |
530 | #ifdef DEBUG_CMD |
|
|
531 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
532 | #endif |
|
|
533 | rxvt_emergency_cleanup (); |
540 | rxvt_emergency_cleanup (); |
534 | signal (w.signum, SIG_DFL); |
541 | signal (w.signum, SIG_DFL); |
535 | kill (getpid (), w.signum); |
542 | kill (getpid (), w.signum); |
536 | } |
543 | } |
537 | |
544 | |
… | |
… | |
545 | char **rxvt_environ; // startup environment |
552 | char **rxvt_environ; // startup environment |
546 | |
553 | |
547 | void |
554 | void |
548 | rxvt_init () |
555 | rxvt_init () |
549 | { |
556 | { |
550 | uid_t uid = getuid (); |
557 | 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 | |
558 | |
581 | rxvt_environ = environ; |
559 | rxvt_environ = environ; |
582 | |
560 | |
583 | signal (SIGHUP, SIG_IGN); |
561 | signal (SIGHUP, SIG_IGN); |
584 | signal (SIGPIPE, SIG_IGN); |
562 | signal (SIGPIPE, SIG_IGN); |
… | |
… | |
642 | { |
620 | { |
643 | short recalc_x, recalc_y; |
621 | short recalc_x, recalc_y; |
644 | int x, y, sb_w, flags; |
622 | int x, y, sb_w, flags; |
645 | unsigned int w, h; |
623 | unsigned int w, h; |
646 | unsigned int max_width, max_height; |
624 | unsigned int max_width, max_height; |
647 | dDisp; |
|
|
648 | |
|
|
649 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
650 | ncol, nrow, szHint.width, szHint.height)); |
|
|
651 | |
625 | |
652 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
626 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
653 | szHint.win_gravity = NorthWestGravity; |
627 | szHint.win_gravity = NorthWestGravity; |
654 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
628 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
655 | |
629 | |
… | |
… | |
752 | |
726 | |
753 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
727 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
754 | window_sb_x = szHint.width - sb_w; |
728 | window_sb_x = szHint.width - sb_w; |
755 | |
729 | |
756 | if (recalc_x) |
730 | if (recalc_x) |
757 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
731 | szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; |
|
|
732 | |
758 | if (recalc_y) |
733 | if (recalc_y) |
759 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
734 | szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; |
760 | |
735 | |
761 | ncol = width / fwidth; |
736 | ncol = width / fwidth; |
762 | nrow = height / fheight; |
737 | 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 | } |
738 | } |
768 | |
739 | |
769 | /*----------------------------------------------------------------------*/ |
740 | /*----------------------------------------------------------------------*/ |
770 | /* |
741 | /* |
771 | * Tell the teletype handler what size the window is. |
742 | * Tell the teletype handler what size the window is. |
… | |
… | |
871 | return true; |
842 | return true; |
872 | } |
843 | } |
873 | |
844 | |
874 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
845 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
875 | { |
846 | { |
876 | XChangeProperty (display->display, parent[0], |
847 | XChangeProperty (xdisp, parent[0], |
877 | prop, XA_STRING, 8, PropModeReplace, |
848 | prop, XA_STRING, 8, PropModeReplace, |
878 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
849 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
879 | } |
850 | } |
880 | |
851 | |
881 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
852 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
882 | { |
853 | { |
883 | wchar_t *ws = rxvt_mbstowcs (str, len); |
854 | wchar_t *ws = rxvt_mbstowcs (str, len); |
884 | char *s = rxvt_wcstoutf8 (ws); |
855 | char *s = rxvt_wcstoutf8 (ws); |
885 | |
856 | |
886 | XChangeProperty (display->display, parent[0], |
857 | XChangeProperty (xdisp, parent[0], |
887 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
858 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
888 | (const unsigned char *)s, strlen (s)); |
859 | (const unsigned char *)s, strlen (s)); |
889 | |
860 | |
890 | free (s); |
861 | free (s); |
891 | free (ws); |
862 | free (ws); |
… | |
… | |
944 | } |
915 | } |
945 | |
916 | |
946 | if (!rXParseAllocColor (&xcol, color)) |
917 | if (!rXParseAllocColor (&xcol, color)) |
947 | return; |
918 | return; |
948 | |
919 | |
949 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
920 | /* XStoreColor (xdisp, display->cmap, XColor*); */ |
950 | |
921 | |
951 | /* |
922 | /* |
952 | * FIXME: should free colors here, but no idea how to do it so instead, |
923 | * FIXME: should free colors here, but no idea how to do it so instead, |
953 | * so just keep gobbling up the colormap |
924 | * so just keep gobbling up the colormap |
954 | */ |
925 | */ |
… | |
… | |
957 | if (pix_colors[idx] == pix_colors[i]) |
928 | if (pix_colors[idx] == pix_colors[i]) |
958 | break; |
929 | break; |
959 | if (i > Color_White) |
930 | if (i > Color_White) |
960 | { |
931 | { |
961 | /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ |
932 | /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ |
962 | XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, |
933 | XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1, |
963 | DisplayPlanes (display->display, display->screen)); |
934 | DisplayPlanes (xdisp, display->screen)); |
964 | } |
935 | } |
965 | # endif |
936 | # endif |
966 | |
937 | |
967 | pix_colors_focused[idx] = xcol; |
938 | pix_colors_focused[idx] = xcol; |
968 | SET_PIXCOLOR (idx); |
939 | SET_PIXCOLOR (idx); |
… | |
… | |
971 | /* Cursor cursor; */ |
942 | /* Cursor cursor; */ |
972 | done: |
943 | done: |
973 | |
944 | |
974 | #if OFF_FOCUS_FADING |
945 | #if OFF_FOCUS_FADING |
975 | if (rs[Rs_fade]) |
946 | if (rs[Rs_fade]) |
976 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
947 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
977 | #endif |
948 | #endif |
978 | |
949 | |
979 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
950 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
980 | |
951 | |
981 | recolour_cursor (); |
952 | recolour_cursor (); |
… | |
… | |
996 | : pix_colors_focused[Color_fg]; |
967 | : pix_colors_focused[Color_fg]; |
997 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
968 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
998 | ? pix_colors_focused[Color_pointer_bg] |
969 | ? pix_colors_focused[Color_pointer_bg] |
999 | : pix_colors_focused[Color_bg]; |
970 | : pix_colors_focused[Color_bg]; |
1000 | |
971 | |
1001 | XQueryColors (display->display, display->cmap, xcol, 2); |
972 | XQueryColors (xdisp, cmap, xcol, 2); |
1002 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
973 | XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); |
1003 | } |
974 | } |
1004 | |
975 | |
1005 | /*----------------------------------------------------------------------*/ |
976 | /*----------------------------------------------------------------------*/ |
1006 | /* |
977 | /* |
1007 | * find if fg/bg matches any of the normal (low-intensity) colors |
978 | * find if fg/bg matches any of the normal (low-intensity) colors |
… | |
… | |
1011 | { |
982 | { |
1012 | unsigned int i; |
983 | unsigned int i; |
1013 | const char *xpmb = "\0"; |
984 | const char *xpmb = "\0"; |
1014 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
985 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
1015 | |
986 | |
1016 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); |
|
|
1017 | strcpy (fstr, "default"); |
987 | strcpy (fstr, "default"); |
1018 | strcpy (bstr, "default"); |
988 | strcpy (bstr, "default"); |
1019 | for (i = Color_Black; i <= Color_White; i++) |
989 | for (i = Color_Black; i <= Color_White; i++) |
1020 | if (pix_colors[Color_fg] == pix_colors[i]) |
990 | if (pix_colors[Color_fg] == pix_colors[i]) |
1021 | { |
991 | { |
… | |
… | |
1039 | /*----------------------------------------------------------------------*/ |
1009 | /*----------------------------------------------------------------------*/ |
1040 | |
1010 | |
1041 | int |
1011 | int |
1042 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1012 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1043 | { |
1013 | { |
1044 | if (!screen_in_out->set (display, colour)) |
1014 | if (!screen_in_out->set (this, colour)) |
1045 | { |
1015 | { |
1046 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
1016 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
1047 | return false; |
1017 | return false; |
1048 | } |
1018 | } |
1049 | |
1019 | |
… | |
… | |
1055 | * -------------------------------------------------------------------- */ |
1025 | * -------------------------------------------------------------------- */ |
1056 | void |
1026 | void |
1057 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1027 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1058 | { |
1028 | { |
1059 | int fix_screen; |
1029 | int fix_screen; |
1060 | int old_width = szHint.width, old_height = szHint.height; |
1030 | int old_width = szHint.width; |
1061 | dDisp; |
1031 | int old_height = szHint.height; |
1062 | |
1032 | |
1063 | window_calc (newwidth, newheight); |
1033 | window_calc (newwidth, newheight); |
1064 | XSetWMNormalHints (disp, parent[0], &szHint); |
1034 | XSetWMNormalHints (xdisp, parent[0], &szHint); |
1065 | |
1035 | |
1066 | if (!ignoreparent) |
1036 | if (!ignoreparent) |
1067 | { |
1037 | { |
1068 | #ifdef SMART_RESIZE |
1038 | #ifdef SMART_RESIZE |
1069 | /* |
1039 | /* |
… | |
… | |
1073 | int x, y, x1, y1; |
1043 | int x, y, x1, y1; |
1074 | int dx, dy; |
1044 | int dx, dy; |
1075 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1045 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1076 | Window unused_cr; |
1046 | Window unused_cr; |
1077 | |
1047 | |
1078 | XTranslateCoordinates (disp, parent[0], display->root, |
1048 | XTranslateCoordinates (xdisp, parent[0], display->root, |
1079 | 0, 0, &x, &y, &unused_cr); |
1049 | 0, 0, &x, &y, &unused_cr); |
1080 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1050 | XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, |
1081 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1051 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1082 | /* |
1052 | /* |
1083 | * if display->root isn't the parent window, a WM will probably have offset |
1053 | * if display->root isn't the parent window, a WM will probably have offset |
1084 | * our position for handles and decorations. Counter it |
1054 | * our position for handles and decorations. Counter it |
1085 | */ |
1055 | */ |
… | |
… | |
1087 | { |
1057 | { |
1088 | x -= x1; |
1058 | x -= x1; |
1089 | y -= y1; |
1059 | y -= y1; |
1090 | } |
1060 | } |
1091 | |
1061 | |
1092 | x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; |
1062 | x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; |
1093 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1063 | y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; |
1094 | dx = old_width - szHint.width; |
1064 | dx = old_width - szHint.width; |
1095 | dy = old_height - szHint.height; |
1065 | dy = old_height - szHint.height; |
1096 | |
1066 | |
1097 | /* Check position of the center of the window */ |
1067 | /* Check position of the center of the window */ |
1098 | if (x < x1) /* left half */ |
1068 | if (x < x1) /* left half */ |
1099 | dx = 0; |
1069 | dx = 0; |
… | |
… | |
1102 | if (y < y1) /* top half */ |
1072 | if (y < y1) /* top half */ |
1103 | dy = 0; |
1073 | dy = 0; |
1104 | else if (y == y1) /* exact center */ |
1074 | else if (y == y1) /* exact center */ |
1105 | dy /= 2; |
1075 | dy /= 2; |
1106 | |
1076 | |
1107 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1077 | XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, |
1108 | szHint.width, szHint.height); |
1078 | szHint.width, szHint.height); |
1109 | #else |
1079 | #else |
1110 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1080 | XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); |
1111 | #endif |
1081 | #endif |
1112 | } |
1082 | } |
1113 | |
1083 | |
1114 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1084 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1115 | |
1085 | |
1116 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1086 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1117 | { |
1087 | { |
1118 | if (scrollBar.state) |
1088 | if (scrollBar.state) |
1119 | { |
1089 | { |
1120 | XMoveResizeWindow (disp, scrollBar.win, |
1090 | XMoveResizeWindow (xdisp, scrollBar.win, |
1121 | window_sb_x, 0, |
1091 | window_sb_x, 0, |
1122 | scrollbar_TotalWidth (), szHint.height); |
1092 | scrollbar_TotalWidth (), szHint.height); |
1123 | resize_scrollbar (); |
1093 | resize_scrollbar (); |
1124 | } |
1094 | } |
1125 | |
1095 | |
1126 | XMoveResizeWindow (disp, vt, |
1096 | XMoveResizeWindow (xdisp, vt, |
1127 | window_vt_x, window_vt_y, |
1097 | window_vt_x, window_vt_y, |
1128 | width, height); |
1098 | width, height); |
1129 | |
1099 | |
1130 | scr_clear (); |
1100 | scr_clear (); |
1131 | #ifdef XPM_BACKGROUND |
1101 | #ifdef XPM_BACKGROUND |
1132 | resize_pixmap (); |
1102 | resize_pixmap (); |
1133 | #endif |
1103 | #endif |
1134 | } |
1104 | } |
1135 | |
1105 | |
1136 | if (fix_screen || old_height == 0) |
1106 | 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 (); |
1107 | 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 | |
1108 | |
1162 | #ifdef XPM_BACKGROUND |
1109 | #ifdef XPM_BACKGROUND |
1163 | if (pixmap) |
1110 | if (pixmap) |
1164 | scr_touch (false); |
1111 | scr_touch (false); |
1165 | #endif |
1112 | #endif |
… | |
… | |
1178 | { |
1125 | { |
1179 | XWindowAttributes wattr; |
1126 | XWindowAttributes wattr; |
1180 | |
1127 | |
1181 | if (newwidth == 0 || newheight == 0) |
1128 | if (newwidth == 0 || newheight == 0) |
1182 | { |
1129 | { |
1183 | XGetWindowAttributes (display->display, display->root, &wattr); |
1130 | XGetWindowAttributes (xdisp, display->root, &wattr); |
1184 | |
1131 | |
1185 | if (newwidth == 0) |
1132 | if (newwidth == 0) |
1186 | newwidth = wattr.width - szHint.base_width; |
1133 | newwidth = wattr.width - szHint.base_width; |
1187 | if (newheight == 0) |
1134 | if (newheight == 0) |
1188 | newheight = wattr.height - szHint.base_height; |
1135 | newheight = wattr.height - szHint.base_height; |
… | |
… | |
1250 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1197 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1251 | |
1198 | |
1252 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1199 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1253 | *p = '\0'; |
1200 | *p = '\0'; |
1254 | |
1201 | |
1255 | atom = XInternAtom (display->display, server, False); |
1202 | atom = XInternAtom (xdisp, server, False); |
1256 | win = XGetSelectionOwner (display->display, atom); |
1203 | win = XGetSelectionOwner (xdisp, atom); |
1257 | |
1204 | |
1258 | if (win != None) |
1205 | if (win != None) |
1259 | return True; |
1206 | return True; |
1260 | } |
1207 | } |
1261 | |
1208 | |
… | |
… | |
1268 | XPoint nspot; |
1215 | XPoint nspot; |
1269 | XVaNestedList preedit_attr; |
1216 | XVaNestedList preedit_attr; |
1270 | |
1217 | |
1271 | if (!Input_Context |
1218 | if (!Input_Context |
1272 | || !focus |
1219 | || !focus |
1273 | || !(input_style & XIMPreeditPosition)) |
1220 | || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) |
1274 | return; |
1221 | return; |
1275 | |
1222 | |
1276 | im_set_position (nspot); |
1223 | im_set_position (nspot); |
1277 | |
1224 | |
1278 | if (nspot.x == spot.x && nspot.y == spot.y) |
1225 | if (nspot.x == spot.x && nspot.y == spot.y) |
… | |
… | |
1297 | input_method = 0; |
1244 | input_method = 0; |
1298 | } |
1245 | } |
1299 | |
1246 | |
1300 | Input_Context = 0; |
1247 | Input_Context = 0; |
1301 | } |
1248 | } |
|
|
1249 | |
|
|
1250 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1251 | |
|
|
1252 | static void |
|
|
1253 | xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1254 | { |
|
|
1255 | ((rxvt_term *)client_data)->make_current (); |
|
|
1256 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END)); |
|
|
1257 | } |
|
|
1258 | |
|
|
1259 | static void |
|
|
1260 | xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1261 | { |
|
|
1262 | ((rxvt_term *)client_data)->make_current (); |
|
|
1263 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END)); |
|
|
1264 | } |
|
|
1265 | |
|
|
1266 | static void |
|
|
1267 | xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) |
|
|
1268 | { |
|
|
1269 | rxvt_term *term = (rxvt_term *)client_data; |
|
|
1270 | XIMText *text = call_data->text; |
|
|
1271 | |
|
|
1272 | term->make_current (); |
|
|
1273 | |
|
|
1274 | if (text) |
|
|
1275 | { |
|
|
1276 | void *str; |
|
|
1277 | |
|
|
1278 | if (!text->encoding_is_wchar && text->string.multi_byte) |
|
|
1279 | { |
|
|
1280 | // of course, X makes it ugly again |
|
|
1281 | if (term->rs[Rs_imLocale]) |
|
|
1282 | SET_LOCALE (term->rs[Rs_imLocale]); |
|
|
1283 | |
|
|
1284 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
|
|
1285 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
|
|
1286 | |
|
|
1287 | if (term->rs[Rs_imLocale]) |
|
|
1288 | SET_LOCALE (term->locale); |
|
|
1289 | } |
|
|
1290 | else |
|
|
1291 | str = (void *)text->string.wide_char; |
|
|
1292 | |
|
|
1293 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1294 | DT_INT, call_data->caret, |
|
|
1295 | DT_INT, call_data->chg_first, |
|
|
1296 | DT_INT, call_data->chg_length, |
|
|
1297 | DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, |
|
|
1298 | DT_WCS_LEN, str, str ? (int)text->length : 0, |
|
|
1299 | DT_END)); |
|
|
1300 | } |
|
|
1301 | else |
|
|
1302 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1303 | DT_INT, call_data->caret, |
|
|
1304 | DT_INT, call_data->chg_first, |
|
|
1305 | DT_INT, call_data->chg_length, |
|
|
1306 | DT_END)); |
|
|
1307 | } |
|
|
1308 | |
|
|
1309 | #if 0 |
|
|
1310 | static void |
|
|
1311 | xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) |
|
|
1312 | { |
|
|
1313 | ((rxvt_term *)client_data)->make_current (); |
|
|
1314 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, |
|
|
1315 | DT_INT, call_data->position, |
|
|
1316 | DT_INT, call_data->direction, |
|
|
1317 | DT_INT, call_data->style, |
|
|
1318 | DT_END)); |
|
|
1319 | } |
|
|
1320 | #endif |
|
|
1321 | |
|
|
1322 | #endif |
1302 | |
1323 | |
1303 | /* |
1324 | /* |
1304 | * Try to open a XIM with the current modifiers, then see if we can |
1325 | * Try to open a XIM with the current modifiers, then see if we can |
1305 | * open a suitable preedit type |
1326 | * open a suitable preedit type |
1306 | */ |
1327 | */ |
… | |
… | |
1313 | XRectangle rect, status_rect, needed_rect; |
1334 | XRectangle rect, status_rect, needed_rect; |
1314 | unsigned long fg, bg; |
1335 | unsigned long fg, bg; |
1315 | const char *p; |
1336 | const char *p; |
1316 | char **s; |
1337 | char **s; |
1317 | XIMStyles *xim_styles; |
1338 | XIMStyles *xim_styles; |
|
|
1339 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1340 | XIMCallback xcb[4]; |
|
|
1341 | #endif |
1318 | |
1342 | |
1319 | set_environ (envv); |
1343 | set_environ (envv); |
1320 | |
1344 | |
1321 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1345 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1322 | return false; |
1346 | return false; |
1323 | |
1347 | |
1324 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
|
|
1325 | input_method = display->get_xim (locale, modifiers); |
1348 | input_method = display->get_xim (locale, modifiers); |
1326 | if (input_method == NULL) |
1349 | if (input_method == NULL) |
1327 | return false; |
1350 | return false; |
1328 | |
1351 | |
1329 | xim = input_method->xim; |
1352 | xim = input_method->xim; |
… | |
… | |
1349 | s = rxvt_splitcommastring (p); |
1372 | s = rxvt_splitcommastring (p); |
1350 | |
1373 | |
1351 | for (i = found = 0; !found && s[i]; i++) |
1374 | for (i = found = 0; !found && s[i]; i++) |
1352 | { |
1375 | { |
1353 | if (!strcmp (s[i], "OverTheSpot")) |
1376 | if (!strcmp (s[i], "OverTheSpot")) |
1354 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1377 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1355 | else if (!strcmp (s[i], "OffTheSpot")) |
1378 | else if (!strcmp (s[i], "OffTheSpot")) |
1356 | input_style = (XIMPreeditArea | XIMStatusArea); |
1379 | input_style = XIMPreeditArea | XIMStatusArea; |
1357 | else if (!strcmp (s[i], "Root")) |
1380 | else if (!strcmp (s[i], "Root")) |
1358 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1381 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1359 | else if (!strcmp (s[i], "None")) |
1382 | else if (!strcmp (s[i], "None")) |
1360 | input_style = (XIMPreeditNone | XIMStatusNone); |
1383 | input_style = XIMPreeditNone | XIMStatusNone; |
|
|
1384 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1385 | else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot")) |
|
|
1386 | input_style = XIMPreeditCallbacks | XIMStatusNothing; |
|
|
1387 | #endif |
|
|
1388 | else |
|
|
1389 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1361 | |
1390 | |
1362 | for (j = 0; j < xim_styles->count_styles; j++) |
1391 | for (j = 0; j < xim_styles->count_styles; j++) |
1363 | if (input_style == xim_styles->supported_styles[j]) |
1392 | if (input_style == xim_styles->supported_styles[j]) |
1364 | { |
1393 | { |
1365 | rxvt_freecommastring (s); |
1394 | rxvt_freecommastring (s); |
… | |
… | |
1403 | "*", |
1432 | "*", |
1404 | fheight, |
1433 | fheight, |
1405 | fheight + 1, fheight - 1, |
1434 | fheight + 1, fheight - 1, |
1406 | fheight - 2, fheight + 2); |
1435 | fheight - 2, fheight + 2); |
1407 | |
1436 | |
1408 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1437 | fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1409 | &missing_charset_list, &missing_charset_count, &def_string); |
1438 | &missing_charset_list, &missing_charset_count, &def_string); |
1410 | |
1439 | |
1411 | if (missing_charset_list) |
1440 | if (missing_charset_list) |
1412 | XFreeStringList (missing_charset_list); |
1441 | XFreeStringList (missing_charset_list); |
1413 | |
1442 | |
… | |
… | |
1454 | XNBackground, bg, |
1483 | XNBackground, bg, |
1455 | XNArea, &status_rect, |
1484 | XNArea, &status_rect, |
1456 | XNFontSet, fs, |
1485 | XNFontSet, fs, |
1457 | NULL); |
1486 | NULL); |
1458 | } |
1487 | } |
|
|
1488 | #if ENABLE_XIM_ONTHESPOT |
|
|
1489 | else if (input_style & XIMPreeditCallbacks) |
|
|
1490 | { |
|
|
1491 | im_set_position (spot); |
|
|
1492 | |
|
|
1493 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
|
|
1494 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
|
|
1495 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
|
|
1496 | # if 0 |
|
|
1497 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
|
|
1498 | # endif |
|
|
1499 | |
|
|
1500 | preedit_attr = XVaCreateNestedList (0, |
|
|
1501 | XNSpotLocation, &spot, |
|
|
1502 | XNPreeditStartCallback, &xcb[0], |
|
|
1503 | XNPreeditDoneCallback , &xcb[1], |
|
|
1504 | XNPreeditDrawCallback , &xcb[2], |
|
|
1505 | # if 0 |
|
|
1506 | XNPreeditCaretCallback, &xcb[3], |
|
|
1507 | # endif |
|
|
1508 | NULL); |
|
|
1509 | } |
|
|
1510 | #endif |
1459 | |
1511 | |
1460 | Input_Context = XCreateIC (xim, |
1512 | Input_Context = XCreateIC (xim, |
1461 | XNInputStyle, input_style, |
1513 | XNInputStyle, input_style, |
1462 | XNClientWindow, vt, |
1514 | XNClientWindow, vt, |
1463 | XNFocusWindow, parent[0], |
1515 | XNFocusWindow, parent[0], |
… | |
… | |
1466 | status_attr ? XNStatusAttributes : NULL, |
1518 | status_attr ? XNStatusAttributes : NULL, |
1467 | status_attr, NULL); |
1519 | status_attr, NULL); |
1468 | |
1520 | |
1469 | if (preedit_attr) XFree (preedit_attr); |
1521 | if (preedit_attr) XFree (preedit_attr); |
1470 | if (status_attr) XFree (status_attr); |
1522 | if (status_attr) XFree (status_attr); |
1471 | if (fs) XFreeFontSet (display->display, fs); |
1523 | if (fs) XFreeFontSet (xdisp, fs); |
1472 | |
1524 | |
1473 | if (Input_Context == NULL) |
1525 | if (Input_Context == NULL) |
1474 | { |
1526 | { |
1475 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1527 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1476 | im_destroy (); |
1528 | im_destroy (); |
1477 | return false; |
1529 | return false; |
1478 | } |
1530 | } |
1479 | |
1531 | |
|
|
1532 | #if 0 |
|
|
1533 | // unfortunately, only the focus window is used by XIM, hard to fix |
|
|
1534 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
|
|
1535 | vt_select_input (); |
|
|
1536 | #endif |
|
|
1537 | |
1480 | if (input_style & XIMPreeditArea) |
1538 | if (input_style & XIMPreeditArea) |
1481 | IMSetStatusPosition (); |
1539 | IMSetStatusPosition (); |
1482 | |
1540 | |
1483 | D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); |
|
|
1484 | return true; |
1541 | return true; |
1485 | } |
1542 | } |
1486 | |
1543 | |
1487 | void |
1544 | void |
1488 | rxvt_term::im_cb () |
1545 | rxvt_term::im_cb () |
… | |
… | |
1494 | |
1551 | |
1495 | make_current (); |
1552 | make_current (); |
1496 | |
1553 | |
1497 | im_destroy (); |
1554 | im_destroy (); |
1498 | |
1555 | |
1499 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
|
|
1500 | if (Input_Context) |
1556 | if (Input_Context) |
1501 | return; |
1557 | return; |
1502 | |
1558 | |
1503 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1559 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1504 | if (rs[Rs_imLocale]) |
1560 | if (rs[Rs_imLocale]) |