… | |
… | |
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. |
… | |
… | |
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
31 | *---------------------------------------------------------------------*/ |
31 | *---------------------------------------------------------------------*/ |
32 | |
32 | |
33 | #include "../config.h" /* NECESSARY */ |
33 | #include "../config.h" /* NECESSARY */ |
34 | #include "rxvt.h" /* NECESSARY */ |
34 | #include "rxvt.h" /* NECESSARY */ |
|
|
35 | #include "keyboard.h" |
|
|
36 | #include "rxvtperl.h" |
|
|
37 | |
|
|
38 | #include <limits> |
35 | |
39 | |
36 | #include <csignal> |
40 | #include <csignal> |
37 | #include <cstring> |
41 | #include <cstring> |
38 | |
42 | |
39 | #ifdef TTY_GID_SUPPORT |
43 | #ifdef TTY_GID_SUPPORT |
… | |
… | |
42 | |
46 | |
43 | #ifdef HAVE_TERMIOS_H |
47 | #ifdef HAVE_TERMIOS_H |
44 | # include <termios.h> |
48 | # include <termios.h> |
45 | #endif |
49 | #endif |
46 | |
50 | |
47 | #ifdef KEYSYM_RESOURCE |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
48 | # include "keyboard.h" |
52 | static uid_t saved_euid; |
|
|
53 | static gid_t saved_egid; |
49 | #endif |
54 | #endif |
|
|
55 | |
|
|
56 | bool |
|
|
57 | rxvt_tainted () |
|
|
58 | { |
|
|
59 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
60 | return getuid () != saved_euid || getgid () != saved_egid; |
|
|
61 | #else |
|
|
62 | return false; |
|
|
63 | #endif |
|
|
64 | } |
50 | |
65 | |
51 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
52 | |
67 | |
53 | static char curlocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
54 | |
69 | |
55 | bool |
70 | bool |
56 | rxvt_set_locale (const char *locale) |
71 | rxvt_set_locale (const char *locale) |
57 | { |
72 | { |
58 | if (!locale || !strncmp (locale, curlocale, 128)) |
73 | if (!locale || !strncmp (locale, curlocale, 128)) |
59 | return false; |
74 | return false; |
60 | |
75 | |
61 | strncpy (curlocale, locale, 128); |
76 | strncpy (curlocale, locale, 128); |
62 | setlocale (LC_CTYPE, curlocale); |
77 | setlocale (LC_CTYPE, curlocale); |
63 | return true; |
78 | return true; |
|
|
79 | } |
|
|
80 | |
|
|
81 | bool |
|
|
82 | rxvt_push_locale (const char *locale) |
|
|
83 | { |
|
|
84 | strcpy (savelocale, curlocale); |
|
|
85 | rxvt_set_locale (locale); |
|
|
86 | } |
|
|
87 | |
|
|
88 | void |
|
|
89 | rxvt_pop_locale () |
|
|
90 | { |
|
|
91 | rxvt_set_locale (savelocale); |
64 | } |
92 | } |
65 | |
93 | |
66 | #if ENABLE_COMBINING |
94 | #if ENABLE_COMBINING |
67 | class rxvt_composite_vec rxvt_composite; |
95 | class rxvt_composite_vec rxvt_composite; |
68 | |
96 | |
… | |
… | |
193 | pty.put (); |
221 | pty.put (); |
194 | } |
222 | } |
195 | |
223 | |
196 | rxvt_term::~rxvt_term () |
224 | rxvt_term::~rxvt_term () |
197 | { |
225 | { |
|
|
226 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
227 | |
198 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
228 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
199 | |
229 | |
200 | emergency_cleanup (); |
230 | emergency_cleanup (); |
201 | |
231 | |
202 | #if ENABLE_STYLES |
232 | #if ENABLE_STYLES |
… | |
… | |
259 | |
289 | |
260 | delete pix_colors_focused; |
290 | delete pix_colors_focused; |
261 | #if OFF_FOCUS_FADING |
291 | #if OFF_FOCUS_FADING |
262 | delete pix_colors_unfocused; |
292 | delete pix_colors_unfocused; |
263 | #endif |
293 | #endif |
|
|
294 | #if USE_XGETDEFAULT |
|
|
295 | XrmDestroyDatabase (xrmdatabase); |
|
|
296 | #endif |
264 | |
297 | |
265 | displays.put (display); |
298 | displays.put (display); |
266 | |
299 | |
267 | scr_release (); |
300 | scr_release (); |
268 | |
301 | |
… | |
… | |
284 | delete argv; |
317 | delete argv; |
285 | |
318 | |
286 | #ifdef KEYSYM_RESOURCE |
319 | #ifdef KEYSYM_RESOURCE |
287 | delete keyboard; |
320 | delete keyboard; |
288 | #endif |
321 | #endif |
|
|
322 | } |
|
|
323 | |
|
|
324 | void |
|
|
325 | rxvt_term::child_exit () |
|
|
326 | { |
|
|
327 | cmd_pid = 0; |
|
|
328 | |
|
|
329 | if (!OPTION (Opt_hold)) |
|
|
330 | destroy (); |
289 | } |
331 | } |
290 | |
332 | |
291 | void |
333 | void |
292 | rxvt_term::destroy () |
334 | rxvt_term::destroy () |
293 | { |
335 | { |
… | |
… | |
458 | |
500 | |
459 | #if MENUBAR_MAX |
501 | #if MENUBAR_MAX |
460 | menubar_read (rs[Rs_menu]); |
502 | menubar_read (rs[Rs_menu]); |
461 | #endif |
503 | #endif |
462 | #ifdef HAVE_SCROLLBARS |
504 | #ifdef HAVE_SCROLLBARS |
463 | if (options & Opt_scrollBar) |
505 | if (OPTION (Opt_scrollBar)) |
464 | scrollBar.setIdle (); /* set existence for size calculations */ |
506 | scrollBar.setIdle (); /* set existence for size calculations */ |
|
|
507 | #endif |
|
|
508 | |
|
|
509 | #if ENABLE_PERL |
|
|
510 | if (!rs[Rs_perl_ext_1]) |
|
|
511 | rs[Rs_perl_ext_1] = "default"; |
|
|
512 | |
|
|
513 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
514 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
515 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
516 | { |
|
|
517 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
518 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
|
|
519 | if (rxvt_tainted ()) |
|
|
520 | { |
|
|
521 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
|
|
522 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
523 | { |
|
|
524 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
|
|
525 | rs[Rs_perl_lib] = 0; |
|
|
526 | rs[Rs_perl_eval] = 0; |
|
|
527 | } |
|
|
528 | } |
|
|
529 | #endif |
|
|
530 | rxvt_perl.init (); |
|
|
531 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
532 | } |
465 | #endif |
533 | #endif |
466 | |
534 | |
467 | create_windows (argc, argv); |
535 | create_windows (argc, argv); |
468 | |
536 | |
469 | dDisp; |
537 | dDisp; |
… | |
… | |
475 | #if 0 |
543 | #if 0 |
476 | XSynchronize (disp, True); |
544 | XSynchronize (disp, True); |
477 | #endif |
545 | #endif |
478 | |
546 | |
479 | #ifdef HAVE_SCROLLBARS |
547 | #ifdef HAVE_SCROLLBARS |
480 | if (options & Opt_scrollBar) |
548 | if (OPTION (Opt_scrollBar)) |
481 | resize_scrollbar (); /* create and map scrollbar */ |
549 | resize_scrollbar (); /* create and map scrollbar */ |
482 | #endif |
550 | #endif |
483 | #if (MENUBAR_MAX) |
551 | #if (MENUBAR_MAX) |
484 | if (menubar_visible ()) |
552 | if (menubar_visible ()) |
485 | XMapWindow (disp, menuBar.win); |
553 | XMapWindow (disp, menuBar.win); |
486 | #endif |
554 | #endif |
487 | #ifdef TRANSPARENT |
555 | #ifdef TRANSPARENT |
488 | if (options & Opt_transparent) |
556 | if (OPTION (Opt_transparent)) |
489 | { |
557 | { |
490 | XSelectInput (disp, display->root, PropertyChangeMask); |
558 | XSelectInput (disp, display->root, PropertyChangeMask); |
491 | check_our_parents (); |
559 | check_our_parents (); |
492 | rootwin_ev.start (display, display->root); |
560 | rootwin_ev.start (display, display->root); |
493 | } |
561 | } |
… | |
… | |
500 | |
568 | |
501 | init_command (cmd_argv); |
569 | init_command (cmd_argv); |
502 | |
570 | |
503 | free (cmd_argv); |
571 | free (cmd_argv); |
504 | |
572 | |
|
|
573 | if (pty.pty >= 0) |
505 | pty_ev.start (pty.pty, EVENT_READ); |
574 | pty_ev.start (pty.pty, EVENT_READ); |
506 | |
575 | |
507 | check_ev.start (); |
576 | check_ev.start (); |
|
|
577 | |
|
|
578 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
508 | |
579 | |
509 | return true; |
580 | return true; |
510 | } |
581 | } |
511 | |
582 | |
512 | static struct sig_handlers |
583 | static struct sig_handlers |
… | |
… | |
520 | |
591 | |
521 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
592 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
522 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
593 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
523 | if (pid == (*t)->cmd_pid) |
594 | if (pid == (*t)->cmd_pid) |
524 | { |
595 | { |
525 | (*t)->destroy (); |
596 | (*t)->child_exit (); |
526 | break; |
597 | break; |
527 | } |
598 | } |
528 | } |
599 | } |
529 | |
600 | |
530 | /* |
601 | /* |
… | |
… | |
573 | /* signal (SIGURG, SIG_DFL); */ |
644 | /* signal (SIGURG, SIG_DFL); */ |
574 | |
645 | |
575 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
646 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
576 | // TODO: handle this with exceptions and tolerate the memory loss |
647 | // TODO: handle this with exceptions and tolerate the memory loss |
577 | XSetIOErrorHandler (rxvt_xioerror_handler); |
648 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
649 | |
|
|
650 | #ifdef USE_XGETDEFAULT |
|
|
651 | XrmInitialize (); |
|
|
652 | #endif |
578 | } |
653 | } |
579 | |
654 | |
580 | /* ------------------------------------------------------------------------- * |
655 | /* ------------------------------------------------------------------------- * |
581 | * MEMORY ALLOCATION WRAPPERS * |
656 | * MEMORY ALLOCATION WRAPPERS * |
582 | * ------------------------------------------------------------------------- */ |
657 | * ------------------------------------------------------------------------- */ |
… | |
… | |
618 | * ------------------------------------------------------------------------- */ |
693 | * ------------------------------------------------------------------------- */ |
619 | /* take care of suid/sgid super-user (root) privileges */ |
694 | /* take care of suid/sgid super-user (root) privileges */ |
620 | void |
695 | void |
621 | rxvt_privileges (rxvt_privaction action) |
696 | rxvt_privileges (rxvt_privaction action) |
622 | { |
697 | { |
623 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
624 | static uid_t euid; |
|
|
625 | static gid_t egid; |
|
|
626 | #endif |
|
|
627 | |
|
|
628 | #if ! defined(__CYGWIN32__) |
698 | #if ! defined(__CYGWIN32__) |
629 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
699 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
630 | /* setreuid () is the poor man's setuid (), seteuid () */ |
700 | /* setreuid () is the poor man's setuid (), seteuid () */ |
631 | # define seteuid(a) setreuid(-1, (a)) |
701 | # define seteuid(a) setreuid(-1, (a)) |
632 | # define setegid(a) setregid(-1, (a)) |
702 | # define setegid(a) setregid(-1, (a)) |
… | |
… | |
642 | */ |
712 | */ |
643 | seteuid (getuid ()); |
713 | seteuid (getuid ()); |
644 | setegid (getgid ()); |
714 | setegid (getgid ()); |
645 | break; |
715 | break; |
646 | case SAVE: |
716 | case SAVE: |
647 | euid = geteuid (); |
717 | saved_euid = geteuid (); |
648 | egid = getegid (); |
718 | saved_egid = getegid (); |
649 | break; |
719 | break; |
650 | case RESTORE: |
720 | case RESTORE: |
651 | seteuid (euid); |
721 | seteuid (saved_euid); |
652 | setegid (egid); |
722 | setegid (saved_egid); |
653 | break; |
723 | break; |
654 | } |
724 | } |
655 | # else |
725 | # else |
656 | switch (action) |
726 | switch (action) |
657 | { |
727 | { |
… | |
… | |
670 | |
740 | |
671 | #ifdef UTMP_SUPPORT |
741 | #ifdef UTMP_SUPPORT |
672 | void |
742 | void |
673 | rxvt_term::privileged_utmp (rxvt_privaction action) |
743 | rxvt_term::privileged_utmp (rxvt_privaction action) |
674 | { |
744 | { |
675 | if ((options & Opt_utmpInhibit) |
745 | if (OPTION (Opt_utmpInhibit) |
676 | || !pty.name || !*pty.name) |
746 | || !pty.name || !*pty.name) |
677 | return; |
747 | return; |
678 | |
748 | |
679 | rxvt_privileges (RESTORE); |
749 | rxvt_privileges (RESTORE); |
680 | |
750 | |
… | |
… | |
718 | if (rs[Rs_geometry]) |
788 | if (rs[Rs_geometry]) |
719 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
789 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
720 | |
790 | |
721 | if (flags & WidthValue) |
791 | if (flags & WidthValue) |
722 | { |
792 | { |
723 | ncol = BOUND_POSITIVE_INT16 (w); |
793 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
724 | szHint.flags |= USSize; |
794 | szHint.flags |= USSize; |
725 | } |
795 | } |
726 | |
796 | |
727 | if (flags & HeightValue) |
797 | if (flags & HeightValue) |
728 | { |
798 | { |
729 | nrow = BOUND_POSITIVE_INT16 (h); |
799 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
730 | szHint.flags |= USSize; |
800 | szHint.flags |= USSize; |
731 | } |
801 | } |
732 | |
802 | |
733 | if (flags & XValue) |
803 | if (flags & XValue) |
734 | { |
804 | { |
… | |
… | |
772 | |
842 | |
773 | if (scrollbar_visible ()) |
843 | if (scrollbar_visible ()) |
774 | { |
844 | { |
775 | sb_w = scrollbar_TotalWidth (); |
845 | sb_w = scrollbar_TotalWidth (); |
776 | szHint.base_width += sb_w; |
846 | szHint.base_width += sb_w; |
777 | if (!(options & Opt_scrollBar_right)) |
847 | if (!OPTION (Opt_scrollBar_right)) |
778 | window_vt_x += sb_w; |
848 | window_vt_x += sb_w; |
779 | } |
849 | } |
780 | |
850 | |
781 | if (menubar_visible ()) |
851 | if (menubar_visible ()) |
782 | { |
852 | { |
… | |
… | |
795 | szHint.width = newwidth; |
865 | szHint.width = newwidth; |
796 | width = newwidth - szHint.base_width; |
866 | width = newwidth - szHint.base_width; |
797 | } |
867 | } |
798 | else |
868 | else |
799 | { |
869 | { |
800 | MIN_IT (width, max_width); |
870 | min_it (width, max_width); |
801 | szHint.width = szHint.base_width + width; |
871 | szHint.width = szHint.base_width + width; |
802 | } |
872 | } |
803 | |
873 | |
804 | if (newheight && newheight - szHint.base_height < max_height) |
874 | if (newheight && newheight - szHint.base_height < max_height) |
805 | { |
875 | { |
806 | szHint.height = newheight; |
876 | szHint.height = newheight; |
807 | height = newheight - szHint.base_height; |
877 | height = newheight - szHint.base_height; |
808 | } |
878 | } |
809 | else |
879 | else |
810 | { |
880 | { |
811 | MIN_IT (height, max_height); |
881 | min_it (height, max_height); |
812 | szHint.height = szHint.base_height + height; |
882 | szHint.height = szHint.base_height + height; |
813 | } |
883 | } |
814 | |
884 | |
815 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
885 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
816 | window_sb_x = szHint.width - sb_w; |
886 | window_sb_x = szHint.width - sb_w; |
817 | |
887 | |
818 | if (recalc_x) |
888 | if (recalc_x) |
819 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
889 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
820 | if (recalc_y) |
890 | if (recalc_y) |
… | |
… | |
889 | prop.height += lineSpace; |
959 | prop.height += lineSpace; |
890 | fs->set_prop (prop); |
960 | fs->set_prop (prop); |
891 | |
961 | |
892 | fwidth = prop.width; |
962 | fwidth = prop.width; |
893 | fheight = prop.height; |
963 | fheight = prop.height; |
894 | fweight = prop.weight; |
964 | fbase = prop.ascent; |
895 | fslant = prop.slant; |
|
|
896 | fbase = (*fs)[1]->ascent; |
|
|
897 | |
965 | |
898 | for (int style = 1; style < 4; style++) |
966 | for (int style = 1; style < 4; style++) |
899 | { |
967 | { |
900 | #if ENABLE_STYLES |
968 | #if ENABLE_STYLES |
901 | const char *res = rs[Rs_font + style]; |
969 | const char *res = rs[Rs_font + style]; |
… | |
… | |
935 | return true; |
1003 | return true; |
936 | } |
1004 | } |
937 | |
1005 | |
938 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
1006 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
939 | { |
1007 | { |
940 | // TODO: SMART_WINDOW_TITLE |
|
|
941 | XChangeProperty (display->display, parent[0], |
1008 | XChangeProperty (display->display, parent[0], |
942 | prop, XA_STRING, 8, PropModeReplace, |
1009 | prop, XA_STRING, 8, PropModeReplace, |
943 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
1010 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
944 | } |
1011 | } |
945 | |
1012 | |
946 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
1013 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
947 | { |
1014 | { |
948 | // TODO: SMART_WINDOW_TITLE |
|
|
949 | wchar_t *ws = rxvt_mbstowcs (str, len); |
1015 | wchar_t *ws = rxvt_mbstowcs (str, len); |
950 | char *s = rxvt_wcstoutf8 (ws); |
1016 | char *s = rxvt_wcstoutf8 (ws); |
951 | |
1017 | |
952 | XChangeProperty (display->display, parent[0], |
1018 | XChangeProperty (display->display, parent[0], |
953 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
1019 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
… | |
… | |
994 | i = atoi (color); |
1060 | i = atoi (color); |
995 | |
1061 | |
996 | if (i >= 8 && i <= 15) |
1062 | if (i >= 8 && i <= 15) |
997 | { /* bright colors */ |
1063 | { /* bright colors */ |
998 | i -= 8; |
1064 | i -= 8; |
999 | # ifndef NO_BRIGHTCOLOR |
|
|
1000 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1065 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1001 | SET_PIXCOLOR (idx); |
1066 | SET_PIXCOLOR (idx); |
1002 | goto done; |
1067 | goto done; |
1003 | # endif |
|
|
1004 | } |
1068 | } |
1005 | |
1069 | |
1006 | if (i >= 0 && i <= 7) |
1070 | if (i >= 0 && i <= 7) |
1007 | { /* normal colors */ |
1071 | { /* normal colors */ |
1008 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1072 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
… | |
… | |
1192 | } |
1256 | } |
1193 | |
1257 | |
1194 | if (menubar_visible ()) |
1258 | if (menubar_visible ()) |
1195 | XMoveResizeWindow (disp, menuBar.win, |
1259 | XMoveResizeWindow (disp, menuBar.win, |
1196 | window_vt_x, 0, |
1260 | window_vt_x, 0, |
1197 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1261 | width, menuBar_TotalHeight ()); |
1198 | |
1262 | |
1199 | XMoveResizeWindow (disp, vt, |
1263 | XMoveResizeWindow (disp, vt, |
1200 | window_vt_x, window_vt_y, |
1264 | window_vt_x, window_vt_y, |
1201 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1265 | width, height); |
1202 | |
1266 | |
1203 | scr_clear (); |
1267 | scr_clear (); |
1204 | #ifdef XPM_BACKGROUND |
1268 | #ifdef XPM_BACKGROUND |
1205 | resize_pixmap (); |
1269 | resize_pixmap (); |
1206 | #endif |
1270 | #endif |