… | |
… | |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
12 | * - extensive modifications |
12 | * - extensive modifications |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
15 | * - extensive modifications |
15 | * - extensive modifications |
16 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
16 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
17 | * |
17 | * |
18 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
19 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
20 | * the Free Software Foundation; either version 2 of the License, or |
20 | * the Free Software Foundation; either version 2 of the License, or |
21 | * (at your option) any later version. |
21 | * (at your option) any later version. |
… | |
… | |
61 | strncpy (curlocale, locale, 128); |
61 | strncpy (curlocale, locale, 128); |
62 | setlocale (LC_CTYPE, curlocale); |
62 | setlocale (LC_CTYPE, curlocale); |
63 | return true; |
63 | return true; |
64 | } |
64 | } |
65 | |
65 | |
66 | bool |
66 | void |
67 | rxvt_push_locale (const char *locale) |
67 | rxvt_push_locale (const char *locale) |
68 | { |
68 | { |
69 | strcpy (savelocale, curlocale); |
69 | strcpy (savelocale, curlocale); |
70 | rxvt_set_locale (locale); |
70 | rxvt_set_locale (locale); |
71 | } |
71 | } |
… | |
… | |
145 | #if TRANSPARENT |
145 | #if TRANSPARENT |
146 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
146 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
147 | #endif |
147 | #endif |
148 | #ifdef HAVE_SCROLLBARS |
148 | #ifdef HAVE_SCROLLBARS |
149 | scrollbar_ev (this, &rxvt_term::x_cb), |
149 | scrollbar_ev (this, &rxvt_term::x_cb), |
150 | #endif |
|
|
151 | #ifdef MENUBAR |
|
|
152 | menubar_ev (this, &rxvt_term::x_cb), |
|
|
153 | #endif |
150 | #endif |
154 | #ifdef CURSOR_BLINK |
151 | #ifdef CURSOR_BLINK |
155 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
152 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
156 | #endif |
153 | #endif |
157 | #ifdef TEXT_BLINK |
154 | #ifdef TEXT_BLINK |
… | |
… | |
197 | void rxvt_term::emergency_cleanup () |
194 | void rxvt_term::emergency_cleanup () |
198 | { |
195 | { |
199 | if (cmd_pid) |
196 | if (cmd_pid) |
200 | kill (-cmd_pid, SIGHUP); |
197 | kill (-cmd_pid, SIGHUP); |
201 | |
198 | |
202 | #ifdef UTMP_SUPPORT |
199 | delete pty; pty = 0; |
203 | privileged_utmp (RESTORE); |
|
|
204 | #endif |
|
|
205 | |
|
|
206 | pty.put (); |
|
|
207 | } |
200 | } |
208 | |
201 | |
209 | rxvt_term::~rxvt_term () |
202 | rxvt_term::~rxvt_term () |
210 | { |
203 | { |
211 | PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); |
204 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
212 | |
205 | |
213 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
206 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
214 | |
207 | |
215 | emergency_cleanup (); |
208 | emergency_cleanup (); |
216 | |
209 | |
… | |
… | |
227 | |
220 | |
228 | selection_clear (); |
221 | selection_clear (); |
229 | |
222 | |
230 | #ifdef USE_XIM |
223 | #ifdef USE_XIM |
231 | im_destroy (); |
224 | im_destroy (); |
232 | #endif |
|
|
233 | #ifdef MENUBAR |
|
|
234 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
235 | #endif |
225 | #endif |
236 | #ifdef XTERM_SCROLLBAR |
226 | #ifdef XTERM_SCROLLBAR |
237 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
227 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
238 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
228 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
239 | #endif |
229 | #endif |
… | |
… | |
250 | if (upArrow) XFreePixmap (disp, upArrow); |
240 | if (upArrow) XFreePixmap (disp, upArrow); |
251 | if (downArrow) XFreePixmap (disp, downArrow); |
241 | if (downArrow) XFreePixmap (disp, downArrow); |
252 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
242 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
253 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
243 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
254 | #endif |
244 | #endif |
255 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
245 | #ifdef RXVT_SCROLLBAR |
256 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
246 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
257 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
247 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
258 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
248 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
259 | #endif |
249 | #endif |
260 | if (gc) XFreeGC (disp, gc); |
250 | if (gc) XFreeGC (disp, gc); |
261 | |
251 | |
262 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
263 | delete menuBar.drawable; |
|
|
264 | //if (menuBar.win) |
|
|
265 | // XDestroyWindow (disp, menuBar.win); |
|
|
266 | #endif |
|
|
267 | delete drawable; |
252 | delete drawable; |
268 | // destroy all windows |
253 | // destroy all windows |
269 | if (parent[0]) |
254 | if (parent[0]) |
270 | XDestroyWindow (disp, parent[0]); |
255 | XDestroyWindow (disp, parent[0]); |
271 | } |
256 | } |
272 | |
257 | |
273 | // TODO: free pixcolours, colours should become part of rxvt_display |
258 | // TODO: free pixcolours, colours should become part of rxvt_display |
274 | |
|
|
275 | delete pix_colors_focused; |
259 | delete pix_colors_focused; |
276 | #if OFF_FOCUS_FADING |
260 | #if OFF_FOCUS_FADING |
277 | delete pix_colors_unfocused; |
261 | delete pix_colors_unfocused; |
278 | #endif |
262 | #endif |
279 | |
263 | |
… | |
… | |
328 | im_ev.stop (display); |
312 | im_ev.stop (display); |
329 | #endif |
313 | #endif |
330 | #if HAVE_SCROLLBARS |
314 | #if HAVE_SCROLLBARS |
331 | scrollbar_ev.stop (display); |
315 | scrollbar_ev.stop (display); |
332 | #endif |
316 | #endif |
333 | #if MENUBAR |
|
|
334 | menubar_ev.stop (display); |
|
|
335 | #endif |
|
|
336 | #if TRANSPARENT |
317 | #if TRANSPARENT |
337 | rootwin_ev.stop (display); |
318 | rootwin_ev.stop (display); |
338 | #endif |
319 | #endif |
339 | incr_ev.stop (); |
320 | incr_ev.stop (); |
340 | termwin_ev.stop (display); |
321 | termwin_ev.stop (display); |
… | |
… | |
363 | } |
344 | } |
364 | |
345 | |
365 | void |
346 | void |
366 | rxvt_term::destroy_cb (time_watcher &w) |
347 | rxvt_term::destroy_cb (time_watcher &w) |
367 | { |
348 | { |
368 | SET_R (this); |
349 | make_current (); |
369 | |
350 | |
370 | delete this; |
351 | delete this; |
371 | } |
352 | } |
372 | |
353 | |
373 | /*----------------------------------------------------------------------*/ |
354 | /*----------------------------------------------------------------------*/ |
… | |
… | |
464 | /*----------------------------------------------------------------------*/ |
445 | /*----------------------------------------------------------------------*/ |
465 | bool |
446 | bool |
466 | rxvt_term::init (int argc, const char *const *argv) |
447 | rxvt_term::init (int argc, const char *const *argv) |
467 | { |
448 | { |
468 | SET_R (this); |
449 | SET_R (this); |
469 | |
|
|
470 | set_locale (""); |
450 | set_locale (""); |
|
|
451 | set_environ (envv); // few things in X do not call setlocale :( |
471 | |
452 | |
472 | if (!init_vars ()) |
453 | if (!init_vars ()) |
473 | return false; |
454 | return false; |
474 | |
455 | |
475 | init_secondary (); |
456 | init_secondary (); |
… | |
… | |
478 | |
459 | |
479 | #ifdef KEYSYM_RESOURCE |
460 | #ifdef KEYSYM_RESOURCE |
480 | keyboard->register_done (); |
461 | keyboard->register_done (); |
481 | #endif |
462 | #endif |
482 | |
463 | |
483 | #if MENUBAR_MAX |
|
|
484 | menubar_read (rs[Rs_menu]); |
|
|
485 | #endif |
|
|
486 | #ifdef HAVE_SCROLLBARS |
464 | #ifdef HAVE_SCROLLBARS |
487 | if (OPTION (Opt_scrollBar)) |
465 | if (OPTION (Opt_scrollBar)) |
488 | scrollBar.setIdle (); /* set existence for size calculations */ |
466 | scrollBar.setIdle (); /* set existence for size calculations */ |
489 | #endif |
467 | #endif |
490 | |
468 | |
491 | #if ENABLE_PERL |
469 | #if ENABLE_PERL |
|
|
470 | if (!rs[Rs_perl_ext_1]) |
|
|
471 | rs[Rs_perl_ext_1] = "default"; |
|
|
472 | |
492 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
473 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
493 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
474 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
494 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
475 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
495 | { |
476 | { |
496 | rxvt_perl.init (); |
477 | rxvt_perl.init (this); |
497 | PERL_INVOKE ((this, HOOK_INIT, DT_END)); |
478 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
498 | } |
479 | } |
499 | #endif |
480 | #endif |
|
|
481 | |
|
|
482 | pty = rxvt_new_ptytty (); |
500 | |
483 | |
501 | create_windows (argc, argv); |
484 | create_windows (argc, argv); |
502 | |
485 | |
503 | dDisp; |
486 | dDisp; |
504 | |
487 | |
505 | init_xlocale (); |
488 | init_xlocale (); |
506 | |
489 | |
507 | scr_reset (); /* initialize screen */ |
490 | scr_reset (); // initialize screen |
508 | |
491 | |
509 | #if 0 |
492 | #if 0 |
510 | XSynchronize (disp, True); |
493 | XSynchronize (disp, True); |
511 | #endif |
494 | #endif |
512 | |
495 | |
513 | #ifdef HAVE_SCROLLBARS |
496 | #ifdef HAVE_SCROLLBARS |
514 | if (OPTION (Opt_scrollBar)) |
497 | if (OPTION (Opt_scrollBar)) |
515 | resize_scrollbar (); /* create and map scrollbar */ |
498 | resize_scrollbar (); /* create and map scrollbar */ |
516 | #endif |
499 | #endif |
517 | #if (MENUBAR_MAX) |
|
|
518 | if (menubar_visible ()) |
|
|
519 | XMapWindow (disp, menuBar.win); |
|
|
520 | #endif |
|
|
521 | #ifdef TRANSPARENT |
500 | #ifdef TRANSPARENT |
522 | if (OPTION (Opt_transparent)) |
501 | if (OPTION (Opt_transparent)) |
523 | { |
502 | { |
524 | XSelectInput (disp, display->root, PropertyChangeMask); |
503 | XSelectInput (disp, display->root, PropertyChangeMask); |
525 | check_our_parents (); |
504 | check_our_parents (); |
… | |
… | |
534 | |
513 | |
535 | init_command (cmd_argv); |
514 | init_command (cmd_argv); |
536 | |
515 | |
537 | free (cmd_argv); |
516 | free (cmd_argv); |
538 | |
517 | |
|
|
518 | if (pty->pty >= 0) |
539 | pty_ev.start (pty.pty, EVENT_READ); |
519 | pty_ev.start (pty->pty, EVENT_READ); |
540 | |
520 | |
541 | check_ev.start (); |
521 | check_ev.start (); |
542 | |
522 | |
543 | PERL_INVOKE ((this, HOOK_START, DT_END)); |
523 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
544 | |
524 | |
545 | return true; |
525 | return true; |
546 | } |
526 | } |
547 | |
527 | |
548 | static struct sig_handlers |
528 | static struct sig_handlers |
… | |
… | |
583 | sw_int (this, &sig_handlers::sig_term) |
563 | sw_int (this, &sig_handlers::sig_term) |
584 | { |
564 | { |
585 | } |
565 | } |
586 | } sig_handlers; |
566 | } sig_handlers; |
587 | |
567 | |
|
|
568 | char **rxvt_environ; // startup environment |
|
|
569 | |
588 | void |
570 | void |
589 | rxvt_init () |
571 | rxvt_init () |
590 | { |
572 | { |
591 | /* |
573 | uid_t uid = getuid (); |
592 | * Save and then give up any super-user privileges |
574 | gid_t gid = getgid (); |
593 | * If we need privileges in any area then we must specifically request it. |
575 | |
594 | * We should only need to be root in these cases: |
576 | // before doing anything else, check for setuid/setgid operation, |
595 | * 1. write utmp entries on some systems |
577 | // start the helper process and drop privileges |
596 | * 2. chown tty on some systems |
578 | if (uid != geteuid () |
597 | */ |
579 | || 1 //D |
598 | rxvt_privileges (SAVE); |
580 | || gid != getegid ()) |
599 | rxvt_privileges (IGNORE); |
581 | { |
|
|
582 | #if PTYTTY_HELPER |
|
|
583 | rxvt_ptytty_server (); |
|
|
584 | #else |
|
|
585 | rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); |
|
|
586 | #endif |
|
|
587 | |
|
|
588 | // drop privileges |
|
|
589 | #if HAVE_SETRESUID |
|
|
590 | setresgid (gid, gid, gid); |
|
|
591 | setresuid (uid, uid, uid); |
|
|
592 | #elif HAVE_SETREUID |
|
|
593 | setregid (gid, gid); |
|
|
594 | setreuid (uid, uid); |
|
|
595 | #elif HAVE_SETUID |
|
|
596 | setgid (gid); |
|
|
597 | setuid (uid); |
|
|
598 | #endif |
|
|
599 | |
|
|
600 | if (uid != geteuid () |
|
|
601 | || gid != getegid ()) |
|
|
602 | rxvt_fatal ("unable to drop privileges, aborting.\n"); |
|
|
603 | } |
|
|
604 | |
|
|
605 | rxvt_environ = environ; |
600 | |
606 | |
601 | signal (SIGHUP, SIG_IGN); |
607 | signal (SIGHUP, SIG_IGN); |
602 | signal (SIGPIPE, SIG_IGN); |
608 | signal (SIGPIPE, SIG_IGN); |
603 | |
609 | |
604 | sig_handlers.sw_chld.start (SIGCHLD); |
610 | sig_handlers.sw_chld.start (SIGCHLD); |
… | |
… | |
609 | /* signal (SIGURG, SIG_DFL); */ |
615 | /* signal (SIGURG, SIG_DFL); */ |
610 | |
616 | |
611 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
617 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
612 | // TODO: handle this with exceptions and tolerate the memory loss |
618 | // TODO: handle this with exceptions and tolerate the memory loss |
613 | XSetIOErrorHandler (rxvt_xioerror_handler); |
619 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
620 | |
|
|
621 | XrmInitialize (); |
614 | } |
622 | } |
615 | |
623 | |
616 | /* ------------------------------------------------------------------------- * |
624 | /* ------------------------------------------------------------------------- * |
617 | * MEMORY ALLOCATION WRAPPERS * |
625 | * MEMORY ALLOCATION WRAPPERS * |
618 | * ------------------------------------------------------------------------- */ |
626 | * ------------------------------------------------------------------------- */ |
… | |
… | |
647 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
655 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
648 | |
656 | |
649 | return p; |
657 | return p; |
650 | } |
658 | } |
651 | |
659 | |
652 | /* ------------------------------------------------------------------------- * |
|
|
653 | * PRIVILEGED OPERATIONS * |
|
|
654 | * ------------------------------------------------------------------------- */ |
|
|
655 | /* take care of suid/sgid super-user (root) privileges */ |
|
|
656 | void |
|
|
657 | rxvt_privileges (rxvt_privaction action) |
|
|
658 | { |
|
|
659 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
660 | static uid_t euid; |
|
|
661 | static gid_t egid; |
|
|
662 | #endif |
|
|
663 | |
|
|
664 | #if ! defined(__CYGWIN32__) |
|
|
665 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
|
|
666 | /* setreuid () is the poor man's setuid (), seteuid () */ |
|
|
667 | # define seteuid(a) setreuid(-1, (a)) |
|
|
668 | # define setegid(a) setregid(-1, (a)) |
|
|
669 | # define HAVE_SETEUID |
|
|
670 | # endif |
|
|
671 | # ifdef HAVE_SETEUID |
|
|
672 | switch (action) |
|
|
673 | { |
|
|
674 | case IGNORE: |
|
|
675 | /* |
|
|
676 | * change effective uid/gid - not real uid/gid - so we can switch |
|
|
677 | * back to root later, as required |
|
|
678 | */ |
|
|
679 | seteuid (getuid ()); |
|
|
680 | setegid (getgid ()); |
|
|
681 | break; |
|
|
682 | case SAVE: |
|
|
683 | euid = geteuid (); |
|
|
684 | egid = getegid (); |
|
|
685 | break; |
|
|
686 | case RESTORE: |
|
|
687 | seteuid (euid); |
|
|
688 | setegid (egid); |
|
|
689 | break; |
|
|
690 | } |
|
|
691 | # else |
|
|
692 | switch (action) |
|
|
693 | { |
|
|
694 | case IGNORE: |
|
|
695 | setuid (getuid ()); |
|
|
696 | setgid (getgid ()); |
|
|
697 | /* FALLTHROUGH */ |
|
|
698 | case SAVE: |
|
|
699 | /* FALLTHROUGH */ |
|
|
700 | case RESTORE: |
|
|
701 | break; |
|
|
702 | } |
|
|
703 | # endif |
|
|
704 | #endif |
|
|
705 | } |
|
|
706 | |
|
|
707 | #ifdef UTMP_SUPPORT |
|
|
708 | void |
|
|
709 | rxvt_term::privileged_utmp (rxvt_privaction action) |
|
|
710 | { |
|
|
711 | if (OPTION (Opt_utmpInhibit) |
|
|
712 | || !pty.name || !*pty.name) |
|
|
713 | return; |
|
|
714 | |
|
|
715 | rxvt_privileges (RESTORE); |
|
|
716 | |
|
|
717 | if (action == SAVE) |
|
|
718 | makeutent (pty.name, rs[Rs_display_name]); |
|
|
719 | else |
|
|
720 | cleanutent (); |
|
|
721 | |
|
|
722 | rxvt_privileges (IGNORE); |
|
|
723 | } |
|
|
724 | #endif |
|
|
725 | |
|
|
726 | /*----------------------------------------------------------------------*/ |
660 | /*----------------------------------------------------------------------*/ |
727 | /* |
661 | /* |
728 | * window size/position calculcations for XSizeHint and other storage. |
662 | * window size/position calculcations for XSizeHint and other storage. |
729 | * if width/height are non-zero then override calculated width/height |
663 | * if width/height are non-zero then override calculated width/height |
730 | */ |
664 | */ |
731 | void |
665 | void |
732 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
666 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
733 | { |
667 | { |
734 | short recalc_x, recalc_y; |
668 | short recalc_x, recalc_y; |
735 | int x, y, sb_w, mb_h, flags; |
669 | int x, y, sb_w, flags; |
736 | unsigned int w, h; |
670 | unsigned int w, h; |
737 | unsigned int max_width, max_height; |
671 | unsigned int max_width, max_height; |
738 | dDisp; |
672 | dDisp; |
739 | |
673 | |
740 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
674 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
… | |
… | |
801 | max_width = MAX_COLS * fwidth; |
735 | max_width = MAX_COLS * fwidth; |
802 | max_height = MAX_ROWS * fheight; |
736 | max_height = MAX_ROWS * fheight; |
803 | |
737 | |
804 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
738 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
805 | |
739 | |
806 | sb_w = mb_h = 0; |
740 | sb_w = 0; |
807 | window_vt_x = window_vt_y = int_bwidth; |
741 | window_vt_x = window_vt_y = int_bwidth; |
808 | |
742 | |
809 | if (scrollbar_visible ()) |
743 | if (scrollBar.state) |
810 | { |
744 | { |
811 | sb_w = scrollbar_TotalWidth (); |
745 | sb_w = scrollbar_TotalWidth (); |
812 | szHint.base_width += sb_w; |
746 | szHint.base_width += sb_w; |
813 | if (!OPTION (Opt_scrollBar_right)) |
747 | if (!OPTION (Opt_scrollBar_right)) |
814 | window_vt_x += sb_w; |
748 | window_vt_x += sb_w; |
815 | } |
749 | } |
816 | |
750 | |
817 | if (menubar_visible ()) |
|
|
818 | { |
|
|
819 | mb_h = menuBar_TotalHeight (); |
|
|
820 | szHint.base_height += mb_h; |
|
|
821 | window_vt_y += mb_h; |
|
|
822 | } |
|
|
823 | |
|
|
824 | szHint.width_inc = fwidth; |
751 | szHint.width_inc = fwidth; |
825 | szHint.height_inc = fheight; |
752 | szHint.height_inc = fheight; |
826 | szHint.min_width = szHint.base_width + szHint.width_inc; |
753 | szHint.min_width = szHint.base_width + szHint.width_inc; |
827 | szHint.min_height = szHint.base_height + szHint.height_inc; |
754 | szHint.min_height = szHint.base_height + szHint.height_inc; |
828 | |
755 | |
… | |
… | |
846 | { |
773 | { |
847 | min_it (height, max_height); |
774 | min_it (height, max_height); |
848 | szHint.height = szHint.base_height + height; |
775 | szHint.height = szHint.base_height + height; |
849 | } |
776 | } |
850 | |
777 | |
851 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
778 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
852 | window_sb_x = szHint.width - sb_w; |
779 | window_sb_x = szHint.width - sb_w; |
853 | |
780 | |
854 | if (recalc_x) |
781 | if (recalc_x) |
855 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
782 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
856 | if (recalc_y) |
783 | if (recalc_y) |
… | |
… | |
870 | * Called after a window size change. |
797 | * Called after a window size change. |
871 | */ |
798 | */ |
872 | void |
799 | void |
873 | rxvt_term::tt_winch () |
800 | rxvt_term::tt_winch () |
874 | { |
801 | { |
875 | if (pty.pty < 0) |
802 | if (pty->pty < 0) |
876 | return; |
803 | return; |
877 | |
804 | |
878 | struct winsize ws; |
805 | struct winsize ws; |
879 | |
806 | |
880 | ws.ws_col = ncol; |
807 | ws.ws_col = ncol; |
881 | ws.ws_row = nrow; |
808 | ws.ws_row = nrow; |
882 | ws.ws_xpixel = width; |
809 | ws.ws_xpixel = width; |
883 | ws.ws_ypixel = height; |
810 | ws.ws_ypixel = height; |
884 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
811 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
885 | |
812 | |
886 | #if 0 |
813 | #if 0 |
887 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
814 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
888 | if (cmd_pid) /* force through to the command */ |
815 | if (cmd_pid) /* force through to the command */ |
889 | kill (-cmd_pid, SIGWINCH); |
816 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
1211 | |
1138 | |
1212 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1139 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1213 | |
1140 | |
1214 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1141 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1215 | { |
1142 | { |
1216 | if (scrollbar_visible ()) |
1143 | if (scrollBar.state) |
1217 | { |
1144 | { |
1218 | XMoveResizeWindow (disp, scrollBar.win, |
1145 | XMoveResizeWindow (disp, scrollBar.win, |
1219 | window_sb_x, 0, |
1146 | window_sb_x, 0, |
1220 | scrollbar_TotalWidth (), szHint.height); |
1147 | scrollbar_TotalWidth (), szHint.height); |
1221 | resize_scrollbar (); |
1148 | resize_scrollbar (); |
1222 | } |
1149 | } |
1223 | |
|
|
1224 | if (menubar_visible ()) |
|
|
1225 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1226 | window_vt_x, 0, |
|
|
1227 | width, menuBar_TotalHeight ()); |
|
|
1228 | |
1150 | |
1229 | XMoveResizeWindow (disp, vt, |
1151 | XMoveResizeWindow (disp, vt, |
1230 | window_vt_x, window_vt_y, |
1152 | window_vt_x, window_vt_y, |
1231 | width, height); |
1153 | width, height); |
1232 | |
1154 | |
… | |
… | |
1416 | XRectangle rect, status_rect, needed_rect; |
1338 | XRectangle rect, status_rect, needed_rect; |
1417 | unsigned long fg, bg; |
1339 | unsigned long fg, bg; |
1418 | const char *p; |
1340 | const char *p; |
1419 | char **s; |
1341 | char **s; |
1420 | XIMStyles *xim_styles; |
1342 | XIMStyles *xim_styles; |
|
|
1343 | |
|
|
1344 | set_environ (envv); |
1421 | |
1345 | |
1422 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1346 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1423 | return false; |
1347 | return false; |
1424 | |
1348 | |
1425 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1349 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
… | |
… | |
1591 | int i; |
1515 | int i; |
1592 | const char *p; |
1516 | const char *p; |
1593 | char **s; |
1517 | char **s; |
1594 | char buf[IMBUFSIZ]; |
1518 | char buf[IMBUFSIZ]; |
1595 | |
1519 | |
1596 | SET_R (this); |
1520 | make_current (); |
1597 | |
1521 | |
1598 | im_destroy (); |
1522 | im_destroy (); |
1599 | |
1523 | |
1600 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1524 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1601 | if (Input_Context) |
1525 | if (Input_Context) |