ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
56vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
57 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
58static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
59 57
60bool 58bool
61rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
62{ 60{
63 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
64 return false; 62 return false;
65 63
66 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
67 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
68 return true; 66 return true;
69} 67}
70 68
71bool 69void
72rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
73{ 71{
74 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
75 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
76} 74}
77 75
78void 76void
79rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
80{ 78{
81 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
82} 80}
83 81
84#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
151 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
152#endif 150#endif
153#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
154 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
155#endif 153#endif
156#ifdef MENUBAR
157 menubar_ev (this, &rxvt_term::x_cb),
158#endif
159#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
161#endif 156#endif
162#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
163 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
177#ifdef USE_XIM 172#ifdef USE_XIM
178 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
179#endif 174#endif
180 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
181 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb),
182 check_ev (this, &rxvt_term::check_cb), 178 check_ev (this, &rxvt_term::check_cb),
183 flush_ev (this, &rxvt_term::flush_cb), 179 flush_ev (this, &rxvt_term::flush_cb),
184 destroy_ev (this, &rxvt_term::destroy_cb), 180 destroy_ev (this, &rxvt_term::destroy_cb),
185 pty_ev (this, &rxvt_term::pty_cb), 181 pty_ev (this, &rxvt_term::pty_cb),
186 incr_ev (this, &rxvt_term::incr_cb) 182 incr_ev (this, &rxvt_term::incr_cb)
… …
189 185
190 termlist.push_back (this); 186 termlist.push_back (this);
191 187
192#ifdef KEYSYM_RESOURCE 188#ifdef KEYSYM_RESOURCE
193 keyboard = new keyboard_manager; 189 keyboard = new keyboard_manager;
194
195 if (!keyboard)
196 rxvt_fatal ("out of memory, aborting.\n");
197#endif 190#endif
198} 191}
199 192
200// clean up the most important stuff, do *not* call x or free mem etc. 193// clean up the most important stuff, do *not* call x or free mem etc.
201// for use before an emergency exit 194// for use before an emergency exit
202void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
203{ 196{
204 if (cmd_pid) 197 if (cmd_pid)
205 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
206 199
207#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
208 privileged_utmp (RESTORE);
209#endif
210
211 pty.put ();
212} 201}
213 202
214rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
215{ 204{
216 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
217
218 termlist.erase (find (termlist.begin (), termlist.end(), this)); 205 termlist.erase (find (termlist.begin (), termlist.end(), this));
219 206
220 emergency_cleanup (); 207 emergency_cleanup ();
221 208
222#if ENABLE_STYLES 209#if ENABLE_STYLES
… …
232 219
233 selection_clear (); 220 selection_clear ();
234 221
235#ifdef USE_XIM 222#ifdef USE_XIM
236 im_destroy (); 223 im_destroy ();
237#endif
238#ifdef MENUBAR
239 if (menubarGC) XFreeGC (disp, menubarGC);
240#endif 224#endif
241#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
243 if (ShadowGC) XFreeGC (disp, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
244#endif 228#endif
… …
255 if (upArrow) XFreePixmap (disp, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
256 if (downArrow) XFreePixmap (disp, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
257 if (upArrowHi) XFreePixmap (disp, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
258 if (downArrowHi) XFreePixmap (disp, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
259#endif 243#endif
260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (disp, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
262 if (botShadowGC) XFreeGC (disp, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
263 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
264#endif 248#endif
265 if (gc) XFreeGC (disp, gc); 249 if (gc) XFreeGC (disp, gc);
266 250
267#if defined(MENUBAR) && (MENUBAR_MAX > 1)
268 delete menuBar.drawable;
269 //if (menuBar.win)
270 // XDestroyWindow (disp, menuBar.win);
271#endif
272 delete drawable; 251 delete drawable;
273 // destroy all windows 252 // destroy all windows
274 if (parent[0]) 253 if (parent[0])
275 XDestroyWindow (disp, parent[0]); 254 XDestroyWindow (disp, parent[0]);
276 } 255 }
277 256
278 // TODO: free pixcolours, colours should become part of rxvt_display 257 // TODO: free pixcolours, colours should become part of rxvt_display
279
280 delete pix_colors_focused; 258 delete pix_colors_focused;
281#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
282 delete pix_colors_unfocused; 260 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
286#endif 261#endif
287 262
288 displays.put (display); 263 displays.put (display);
289 264
290 scr_release (); 265 scr_release ();
… …
309#ifdef KEYSYM_RESOURCE 284#ifdef KEYSYM_RESOURCE
310 delete keyboard; 285 delete keyboard;
311#endif 286#endif
312} 287}
313 288
289// child has exited, usually destroys
314void 290void
315rxvt_term::child_exit () 291rxvt_term::child_cb (child_watcher &w, int status)
316{ 292{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294
317 cmd_pid = 0; 295 cmd_pid = 0;
318 296
319 if (!OPTION (Opt_hold)) 297 if (!OPTION (Opt_hold))
320 destroy (); 298 destroy ();
321} 299}
… …
324rxvt_term::destroy () 302rxvt_term::destroy ()
325{ 303{
326 if (destroy_ev.active) 304 if (destroy_ev.active)
327 return; 305 return;
328 306
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
308 return;
309
329#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
330 scr_overlay_off (); 311 scr_overlay_off ();
331#endif 312#endif
332 313
333 if (display) 314 if (display)
… …
335#if USE_XIM 316#if USE_XIM
336 im_ev.stop (display); 317 im_ev.stop (display);
337#endif 318#endif
338#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
339 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
340#endif
341#if MENUBAR
342 menubar_ev.stop (display);
343#endif 321#endif
344#if TRANSPARENT 322#if TRANSPARENT
345 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
346#endif 324#endif
347 incr_ev.stop (); 325 incr_ev.stop ();
… …
371} 349}
372 350
373void 351void
374rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
375{ 353{
376 SET_R (this); 354 make_current ();
377 355
378 delete this; 356 delete this;
379} 357}
380 358
381/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
472/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
473bool 451bool
474rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv)
475{ 453{
476 SET_R (this); 454 SET_R (this);
477
478 set_locale (""); 455 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :(
479 457
480 if (!init_vars ()) 458 if (!init_vars ())
481 return false; 459 return false;
482 460
483 init_secondary (); 461 init_secondary ();
… …
486 464
487#ifdef KEYSYM_RESOURCE 465#ifdef KEYSYM_RESOURCE
488 keyboard->register_done (); 466 keyboard->register_done ();
489#endif 467#endif
490 468
491#if MENUBAR_MAX 469#if ENABLE_PERL
492 menubar_read (rs[Rs_menu]); 470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
493#endif 480#endif
481
494#ifdef HAVE_SCROLLBARS 482#ifdef HAVE_SCROLLBARS
495 if (OPTION (Opt_scrollBar)) 483 if (OPTION (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */ 484 scrollBar.setIdle (); /* set existence for size calculations */
497#endif 485#endif
498 486
499#if ENABLE_PERL 487 pty = rxvt_new_ptytty ();
500 if (!rs[Rs_perl_ext_1])
501 rs[Rs_perl_ext_1] = "default";
502
503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
524 rxvt_perl.init (tainted);
525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526 }
527#endif
528 488
529 create_windows (argc, argv); 489 create_windows (argc, argv);
530 490
531 dDisp; 491 dDisp;
532 492
533 init_xlocale (); 493 init_xlocale ();
534 494
535 scr_reset (); /* initialize screen */ 495 scr_reset (); // initialize screen
536 496
537#if 0 497#if 0
538 XSynchronize (disp, True); 498 XSynchronize (disp, True);
539#endif 499#endif
540 500
541#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
542 if (OPTION (Opt_scrollBar)) 502 if (OPTION (Opt_scrollBar))
543 resize_scrollbar (); /* create and map scrollbar */ 503 resize_scrollbar (); /* create and map scrollbar */
544#endif 504#endif
545#if (MENUBAR_MAX)
546 if (menubar_visible ())
547 XMapWindow (disp, menuBar.win);
548#endif
549#ifdef TRANSPARENT 505#ifdef TRANSPARENT
550 if (OPTION (Opt_transparent)) 506 if (OPTION (Opt_transparent))
551 { 507 {
552 XSelectInput (disp, display->root, PropertyChangeMask); 508 XSelectInput (disp, display->root, PropertyChangeMask);
553 check_our_parents (); 509 check_our_parents ();
554 rootwin_ev.start (display, display->root); 510 rootwin_ev.start (display, display->root);
555 } 511 }
556#endif 512#endif
557 513
514 set_colorfgbg ();
515
516 init_command (cmd_argv);
517
518 free (cmd_argv);
519
520 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ);
522
523 check_ev.start ();
524
525 HOOK_INVOKE ((this, HOOK_START, DT_END));
526
558 XMapWindow (disp, vt); 527 XMapWindow (disp, vt);
559 XMapWindow (disp, parent[0]); 528 XMapWindow (disp, parent[0]);
560 529
561 set_colorfgbg ();
562
563 init_command (cmd_argv);
564
565 free (cmd_argv);
566
567 if (pty.pty >= 0)
568 pty_ev.start (pty.pty, EVENT_READ);
569
570 check_ev.start ();
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574 return true; 530 return true;
575} 531}
576 532
577static struct sig_handlers 533static struct sig_handlers
578{ 534{
579 sig_watcher sw_chld, sw_term, sw_int; 535 sig_watcher sw_term, sw_int;
580 536
581 void sig_chld (sig_watcher &w)
582 {
583 // we are being called for every SIGCHLD, find the corresponding term
584 int pid;
585
586 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
587 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
588 if (pid == (*t)->cmd_pid)
589 {
590 (*t)->child_exit ();
591 break;
592 }
593 }
594
595 /* 537 /*
596 * Catch a fatal signal and tidy up before quitting 538 * Catch a fatal signal and tidy up before quitting
597 */ 539 */
598 void 540 void
599 sig_term (sig_watcher &w) 541 sig_term (sig_watcher &w)
… …
605 signal (w.signum, SIG_DFL); 547 signal (w.signum, SIG_DFL);
606 kill (getpid (), w.signum); 548 kill (getpid (), w.signum);
607 } 549 }
608 550
609 sig_handlers () 551 sig_handlers ()
610 : sw_chld (this, &sig_handlers::sig_chld),
611 sw_term (this, &sig_handlers::sig_term), 552 : sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term) 553 sw_int (this, &sig_handlers::sig_term)
613 { 554 {
614 } 555 }
615} sig_handlers; 556} sig_handlers;
616 557
558char **rxvt_environ; // startup environment
559
617void 560void
618rxvt_init () 561rxvt_init ()
619{ 562{
620 /* 563 uid_t uid = getuid ();
621 * Save and then give up any super-user privileges 564 gid_t gid = getgid ();
622 * If we need privileges in any area then we must specifically request it. 565
623 * We should only need to be root in these cases: 566 // before doing anything else, check for setuid/setgid operation,
624 * 1. write utmp entries on some systems 567 // start the helper process and drop privileges
625 * 2. chown tty on some systems 568 if (uid != geteuid ()
626 */ 569 || gid != getegid ())
627 rxvt_privileges (SAVE); 570 {
628 rxvt_privileges (IGNORE); 571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593
594 rxvt_environ = environ;
629 595
630 signal (SIGHUP, SIG_IGN); 596 signal (SIGHUP, SIG_IGN);
631 signal (SIGPIPE, SIG_IGN); 597 signal (SIGPIPE, SIG_IGN);
632 598
633 sig_handlers.sw_chld.start (SIGCHLD);
634 sig_handlers.sw_term.start (SIGTERM); 599 sig_handlers.sw_term.start (SIGTERM);
635 sig_handlers.sw_int.start (SIGINT); 600 sig_handlers.sw_int.start (SIGINT);
636 601
637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
638 /* signal (SIGURG, SIG_DFL); */ 603 /* signal (SIGURG, SIG_DFL); */
639 604
640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641 // TODO: handle this with exceptions and tolerate the memory loss 606 // TODO: handle this with exceptions and tolerate the memory loss
642 XSetIOErrorHandler (rxvt_xioerror_handler); 607 XSetIOErrorHandler (rxvt_xioerror_handler);
643 608
644#ifdef USE_XGETDEFAULT
645 XrmInitialize (); 609 XrmInitialize ();
646#endif
647} 610}
648 611
649/* ------------------------------------------------------------------------- * 612/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS * 613 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */ 614 * ------------------------------------------------------------------------- */
… …
669 rxvt_fatal ("memory allocation failure. aborting.\n"); 632 rxvt_fatal ("memory allocation failure. aborting.\n");
670 633
671 return p; 634 return p;
672} 635}
673 636
674void * 637void *
675rxvt_realloc (void *ptr, size_t size) 638rxvt_realloc (void *ptr, size_t size)
676{ 639{
677 void *p = realloc (ptr, size); 640 void *p = realloc (ptr, size);
678 641
679 if (!p) 642 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n"); 643 rxvt_fatal ("memory allocation failure. aborting.\n");
681 644
682 return p; 645 return p;
683} 646}
684
685/* ------------------------------------------------------------------------- *
686 * PRIVILEGED OPERATIONS *
687 * ------------------------------------------------------------------------- */
688/* take care of suid/sgid super-user (root) privileges */
689void
690rxvt_privileges (rxvt_privaction action)
691{
692#if ! defined(__CYGWIN32__)
693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
694 /* setreuid () is the poor man's setuid (), seteuid () */
695# define seteuid(a) setreuid(-1, (a))
696# define setegid(a) setregid(-1, (a))
697# define HAVE_SETEUID
698# endif
699# ifdef HAVE_SETEUID
700 switch (action)
701 {
702 case IGNORE:
703 /*
704 * change effective uid/gid - not real uid/gid - so we can switch
705 * back to root later, as required
706 */
707 seteuid (getuid ());
708 setegid (getgid ());
709 break;
710 case SAVE:
711 saved_euid = geteuid ();
712 saved_egid = getegid ();
713 break;
714 case RESTORE:
715 seteuid (saved_euid);
716 setegid (saved_egid);
717 break;
718 }
719# else
720 switch (action)
721 {
722 case IGNORE:
723 setuid (getuid ());
724 setgid (getgid ());
725 /* FALLTHROUGH */
726 case SAVE:
727 /* FALLTHROUGH */
728 case RESTORE:
729 break;
730 }
731# endif
732#endif
733}
734
735#ifdef UTMP_SUPPORT
736void
737rxvt_term::privileged_utmp (rxvt_privaction action)
738{
739 if (OPTION (Opt_utmpInhibit)
740 || !pty.name || !*pty.name)
741 return;
742
743 rxvt_privileges (RESTORE);
744
745 if (action == SAVE)
746 makeutent (pty.name, rs[Rs_display_name]);
747 else
748 cleanutent ();
749
750 rxvt_privileges (IGNORE);
751}
752#endif
753 647
754/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
755/* 649/*
756 * window size/position calculcations for XSizeHint and other storage. 650 * window size/position calculcations for XSizeHint and other storage.
757 * if width/height are non-zero then override calculated width/height 651 * if width/height are non-zero then override calculated width/height
758 */ 652 */
759void 653void
760rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
761{ 655{
762 short recalc_x, recalc_y; 656 short recalc_x, recalc_y;
763 int x, y, sb_w, mb_h, flags; 657 int x, y, sb_w, flags;
764 unsigned int w, h; 658 unsigned int w, h;
765 unsigned int max_width, max_height; 659 unsigned int max_width, max_height;
766 dDisp; 660 dDisp;
767 661
768 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
829 max_width = MAX_COLS * fwidth; 723 max_width = MAX_COLS * fwidth;
830 max_height = MAX_ROWS * fheight; 724 max_height = MAX_ROWS * fheight;
831 725
832 szHint.base_width = szHint.base_height = 2 * int_bwidth; 726 szHint.base_width = szHint.base_height = 2 * int_bwidth;
833 727
834 sb_w = mb_h = 0; 728 sb_w = 0;
835 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
836 730
837 if (scrollbar_visible ()) 731 if (scrollBar.state)
838 { 732 {
839 sb_w = scrollbar_TotalWidth (); 733 sb_w = scrollbar_TotalWidth ();
840 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
841 if (!OPTION (Opt_scrollBar_right)) 735 if (!OPTION (Opt_scrollBar_right))
842 window_vt_x += sb_w; 736 window_vt_x += sb_w;
843 } 737 }
844 738
845 if (menubar_visible ())
846 {
847 mb_h = menuBar_TotalHeight ();
848 szHint.base_height += mb_h;
849 window_vt_y += mb_h;
850 }
851
852 szHint.width_inc = fwidth; 739 szHint.width_inc = fwidth;
853 szHint.height_inc = fheight; 740 szHint.height_inc = fheight;
854 szHint.min_width = szHint.base_width + szHint.width_inc; 741 szHint.min_width = szHint.base_width + szHint.width_inc;
855 szHint.min_height = szHint.base_height + szHint.height_inc; 742 szHint.min_height = szHint.base_height + szHint.height_inc;
856 743
… …
874 { 761 {
875 min_it (height, max_height); 762 min_it (height, max_height);
876 szHint.height = szHint.base_height + height; 763 szHint.height = szHint.base_height + height;
877 } 764 }
878 765
879 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 766 if (scrollBar.state && OPTION (Opt_scrollBar_right))
880 window_sb_x = szHint.width - sb_w; 767 window_sb_x = szHint.width - sb_w;
881 768
882 if (recalc_x) 769 if (recalc_x)
883 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
884 if (recalc_y) 771 if (recalc_y)
… …
898 * Called after a window size change. 785 * Called after a window size change.
899 */ 786 */
900void 787void
901rxvt_term::tt_winch () 788rxvt_term::tt_winch ()
902{ 789{
903 if (pty.pty < 0) 790 if (pty->pty < 0)
904 return; 791 return;
905 792
906 struct winsize ws; 793 struct winsize ws;
907 794
908 ws.ws_col = ncol; 795 ws.ws_col = ncol;
909 ws.ws_row = nrow; 796 ws.ws_row = nrow;
910 ws.ws_xpixel = width; 797 ws.ws_xpixel = width;
911 ws.ws_ypixel = height; 798 ws.ws_ypixel = height;
912 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
913 800
914#if 0 801#if 0
915 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
916 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
917 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
… …
1239 1126
1240 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1241 1128
1242 if (fix_screen || newwidth != old_width || newheight != old_height) 1129 if (fix_screen || newwidth != old_width || newheight != old_height)
1243 { 1130 {
1244 if (scrollbar_visible ()) 1131 if (scrollBar.state)
1245 { 1132 {
1246 XMoveResizeWindow (disp, scrollBar.win, 1133 XMoveResizeWindow (disp, scrollBar.win,
1247 window_sb_x, 0, 1134 window_sb_x, 0,
1248 scrollbar_TotalWidth (), szHint.height); 1135 scrollbar_TotalWidth (), szHint.height);
1249 resize_scrollbar (); 1136 resize_scrollbar ();
1250 } 1137 }
1251
1252 if (menubar_visible ())
1253 XMoveResizeWindow (disp, menuBar.win,
1254 window_vt_x, 0,
1255 width, menuBar_TotalHeight ());
1256 1138
1257 XMoveResizeWindow (disp, vt, 1139 XMoveResizeWindow (disp, vt,
1258 window_vt_x, window_vt_y, 1140 window_vt_x, window_vt_y,
1259 width, height); 1141 width, height);
1260 1142
… …
1444 XRectangle rect, status_rect, needed_rect; 1326 XRectangle rect, status_rect, needed_rect;
1445 unsigned long fg, bg; 1327 unsigned long fg, bg;
1446 const char *p; 1328 const char *p;
1447 char **s; 1329 char **s;
1448 XIMStyles *xim_styles; 1330 XIMStyles *xim_styles;
1331
1332 set_environ (envv);
1449 1333
1450 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1451 return false; 1335 return false;
1452 1336
1453 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1619 int i; 1503 int i;
1620 const char *p; 1504 const char *p;
1621 char **s; 1505 char **s;
1622 char buf[IMBUFSIZ]; 1506 char buf[IMBUFSIZ];
1623 1507
1624 SET_R (this); 1508 make_current ();
1625 1509
1626 im_destroy (); 1510 im_destroy ();
1627 1511
1628 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1629 if (Input_Context) 1513 if (Input_Context)
… …
1706 XFree (preedit_attr); 1590 XFree (preedit_attr);
1707 XFree (status_attr); 1591 XFree (status_attr);
1708} 1592}
1709#endif /* USE_XIM */ 1593#endif /* USE_XIM */
1710 1594
1711/*----------------------------------------------------------------------*/
1712rxvt_t rxvt_current_term;
1713
1714/*----------------------- end-of-file (C source) -----------------------*/ 1595/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines