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.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66bool 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 150#endif
148#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 153#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 156#endif
157#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
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),
180 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
184 188
185 termlist.push_back (this); 189 termlist.push_back (this);
186 190
187#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 193#endif
193} 194}
194 195
195// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
196// for use before an emergency exit 197// for use before an emergency exit
197void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
198{ 199{
199 if (cmd_pid) 200 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
201 202
202#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 204}
208 205
209rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
210{ 207{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 209
215 emergency_cleanup (); 210 emergency_cleanup ();
216 211
217#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
227 222
228 selection_clear (); 223 selection_clear ();
229 224
230#ifdef USE_XIM 225#ifdef USE_XIM
231 im_destroy (); 226 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 227#endif
236#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 231#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 246#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 251#endif
260 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
261 253
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; 254 delete drawable;
268 // destroy all windows 255 // destroy all windows
269 if (parent[0]) 256 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
271 } 258 }
272 259
273 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 261 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
278#endif 264#endif
279 265
… …
301#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
302 delete keyboard; 288 delete keyboard;
303#endif 289#endif
304} 290}
305 291
292// child has exited, usually destroys
306void 293void
307rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
308{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
309 cmd_pid = 0; 298 cmd_pid = 0;
310 299
311 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
312 destroy (); 301 destroy ();
313} 302}
… …
316rxvt_term::destroy () 305rxvt_term::destroy ()
317{ 306{
318 if (destroy_ev.active) 307 if (destroy_ev.active)
319 return; 308 return;
320 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
321#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
322 scr_overlay_off (); 314 scr_overlay_off ();
323#endif 315#endif
324 316
325 if (display) 317 if (display)
… …
327#if USE_XIM 319#if USE_XIM
328 im_ev.stop (display); 320 im_ev.stop (display);
329#endif 321#endif
330#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif 324#endif
336#if TRANSPARENT 325#if TRANSPARENT
337 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
338#endif 327#endif
339 incr_ev.stop (); 328 incr_ev.stop ();
… …
363} 352}
364 353
365void 354void
366rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
367{ 356{
368 SET_R (this); 357 make_current ();
369 358
370 delete this; 359 delete this;
371} 360}
372 361
373/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
465bool 454bool
466rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv)
467{ 456{
468 SET_R (this); 457 SET_R (this);
469
470 set_locale (""); 458 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :(
471 460
472 if (!init_vars ()) 461 if (!init_vars ())
473 return false; 462 return false;
474 463
475 init_secondary (); 464 init_secondary ();
… …
478 467
479#ifdef KEYSYM_RESOURCE 468#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 469 keyboard->register_done ();
481#endif 470#endif
482 471
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 472#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 473 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 474 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 475#endif
490 476
491#if ENABLE_PERL 477 pty = rxvt_new_ptytty ();
492 if (!rs[Rs_perl_ext_1])
493 rs[Rs_perl_ext_1] = "default";
494
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_perl.init ();
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 }
502#endif
503 478
504 create_windows (argc, argv); 479 create_windows (argc, argv);
505 480
506 dDisp; 481 dDisp;
507 482
508 init_xlocale (); 483 init_xlocale ();
509 484
510 scr_reset (); /* initialize screen */ 485 scr_reset (); // initialize screen
511 486
512#if 0 487#if 0
513 XSynchronize (disp, True); 488 XSynchronize (disp, True);
514#endif 489#endif
515 490
516#ifdef HAVE_SCROLLBARS 491#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar)) 492 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */ 493 resize_scrollbar (); /* create and map scrollbar */
519#endif 494#endif
520#if (MENUBAR_MAX)
521 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win);
523#endif
524#ifdef TRANSPARENT 495#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent)) 496 if (OPTION (Opt_transparent))
526 { 497 {
527 XSelectInput (disp, display->root, PropertyChangeMask); 498 XSelectInput (disp, display->root, PropertyChangeMask);
528 check_our_parents (); 499 check_our_parents ();
529 rootwin_ev.start (display, display->root); 500 rootwin_ev.start (display, display->root);
530 } 501 }
531#endif 502#endif
532 503
504 set_colorfgbg ();
505
506 init_command (cmd_argv);
507
508 free (cmd_argv);
509
510 if (pty->pty >= 0)
511 pty_ev.start (pty->pty, EVENT_READ);
512
513 check_ev.start ();
514
515 HOOK_INVOKE ((this, HOOK_START, DT_END));
516
533 XMapWindow (disp, vt); 517 XMapWindow (disp, vt);
534 XMapWindow (disp, parent[0]); 518 XMapWindow (disp, parent[0]);
535 519
536 set_colorfgbg ();
537
538 init_command (cmd_argv);
539
540 free (cmd_argv);
541
542 if (pty.pty >= 0)
543 pty_ev.start (pty.pty, EVENT_READ);
544
545 check_ev.start ();
546
547 HOOK_INVOKE ((this, HOOK_START, DT_END));
548
549 return true; 520 return true;
550} 521}
551 522
552static struct sig_handlers 523static struct sig_handlers
553{ 524{
554 sig_watcher sw_chld, sw_term, sw_int; 525 sig_watcher sw_term, sw_int;
555 526
556 void sig_chld (sig_watcher &w)
557 {
558 // we are being called for every SIGCHLD, find the corresponding term
559 int pid;
560
561 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
562 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
563 if (pid == (*t)->cmd_pid)
564 {
565 (*t)->child_exit ();
566 break;
567 }
568 }
569
570 /* 527 /*
571 * Catch a fatal signal and tidy up before quitting 528 * Catch a fatal signal and tidy up before quitting
572 */ 529 */
573 void 530 void
574 sig_term (sig_watcher &w) 531 sig_term (sig_watcher &w)
… …
580 signal (w.signum, SIG_DFL); 537 signal (w.signum, SIG_DFL);
581 kill (getpid (), w.signum); 538 kill (getpid (), w.signum);
582 } 539 }
583 540
584 sig_handlers () 541 sig_handlers ()
585 : sw_chld (this, &sig_handlers::sig_chld),
586 sw_term (this, &sig_handlers::sig_term), 542 : sw_term (this, &sig_handlers::sig_term),
587 sw_int (this, &sig_handlers::sig_term) 543 sw_int (this, &sig_handlers::sig_term)
588 { 544 {
589 } 545 }
590} sig_handlers; 546} sig_handlers;
591 547
548char **rxvt_environ; // startup environment
549
592void 550void
593rxvt_init () 551rxvt_init ()
594{ 552{
595 /* 553 uid_t uid = getuid ();
596 * Save and then give up any super-user privileges 554 gid_t gid = getgid ();
597 * If we need privileges in any area then we must specifically request it. 555
598 * We should only need to be root in these cases: 556 // before doing anything else, check for setuid/setgid operation,
599 * 1. write utmp entries on some systems 557 // start the helper process and drop privileges
600 * 2. chown tty on some systems 558 if (uid != geteuid ()
601 */ 559 || gid != getegid ())
602 rxvt_privileges (SAVE); 560 {
603 rxvt_privileges (IGNORE); 561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566
567 // drop privileges
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583
584 rxvt_environ = environ;
604 585
605 signal (SIGHUP, SIG_IGN); 586 signal (SIGHUP, SIG_IGN);
606 signal (SIGPIPE, SIG_IGN); 587 signal (SIGPIPE, SIG_IGN);
607 588
608 sig_handlers.sw_chld.start (SIGCHLD);
609 sig_handlers.sw_term.start (SIGTERM); 589 sig_handlers.sw_term.start (SIGTERM);
610 sig_handlers.sw_int.start (SIGINT); 590 sig_handlers.sw_int.start (SIGINT);
611 591
612 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
613 /* signal (SIGURG, SIG_DFL); */ 593 /* signal (SIGURG, SIG_DFL); */
614 594
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 596 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 597 XSetIOErrorHandler (rxvt_xioerror_handler);
598
599 XrmInitialize ();
618} 600}
619 601
620/* ------------------------------------------------------------------------- * 602/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 603 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 604 * ------------------------------------------------------------------------- */
… …
640 rxvt_fatal ("memory allocation failure. aborting.\n"); 622 rxvt_fatal ("memory allocation failure. aborting.\n");
641 623
642 return p; 624 return p;
643} 625}
644 626
645void * 627void *
646rxvt_realloc (void *ptr, size_t size) 628rxvt_realloc (void *ptr, size_t size)
647{ 629{
648 void *p = realloc (ptr, size); 630 void *p = realloc (ptr, size);
649 631
650 if (!p) 632 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n"); 633 rxvt_fatal ("memory allocation failure. aborting.\n");
652 634
653 return p; 635 return p;
654} 636}
655
656/* ------------------------------------------------------------------------- *
657 * PRIVILEGED OPERATIONS *
658 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */
660void
661rxvt_privileges (rxvt_privaction action)
662{
663#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664 static uid_t euid;
665 static gid_t egid;
666#endif
667
668#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a))
673# define HAVE_SETEUID
674# endif
675# ifdef HAVE_SETEUID
676 switch (action)
677 {
678 case IGNORE:
679 /*
680 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required
682 */
683 seteuid (getuid ());
684 setegid (getgid ());
685 break;
686 case SAVE:
687 euid = geteuid ();
688 egid = getegid ();
689 break;
690 case RESTORE:
691 seteuid (euid);
692 setegid (egid);
693 break;
694 }
695# else
696 switch (action)
697 {
698 case IGNORE:
699 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */
702 case SAVE:
703 /* FALLTHROUGH */
704 case RESTORE:
705 break;
706 }
707# endif
708#endif
709}
710
711#ifdef UTMP_SUPPORT
712void
713rxvt_term::privileged_utmp (rxvt_privaction action)
714{
715 if (OPTION (Opt_utmpInhibit)
716 || !pty.name || !*pty.name)
717 return;
718
719 rxvt_privileges (RESTORE);
720
721 if (action == SAVE)
722 makeutent (pty.name, rs[Rs_display_name]);
723 else
724 cleanutent ();
725
726 rxvt_privileges (IGNORE);
727}
728#endif
729 637
730/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
731/* 639/*
732 * window size/position calculcations for XSizeHint and other storage. 640 * window size/position calculcations for XSizeHint and other storage.
733 * if width/height are non-zero then override calculated width/height 641 * if width/height are non-zero then override calculated width/height
734 */ 642 */
735void 643void
736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737{ 645{
738 short recalc_x, recalc_y; 646 short recalc_x, recalc_y;
739 int x, y, sb_w, mb_h, flags; 647 int x, y, sb_w, flags;
740 unsigned int w, h; 648 unsigned int w, h;
741 unsigned int max_width, max_height; 649 unsigned int max_width, max_height;
742 dDisp; 650 dDisp;
743 651
744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
805 max_width = MAX_COLS * fwidth; 713 max_width = MAX_COLS * fwidth;
806 max_height = MAX_ROWS * fheight; 714 max_height = MAX_ROWS * fheight;
807 715
808 szHint.base_width = szHint.base_height = 2 * int_bwidth; 716 szHint.base_width = szHint.base_height = 2 * int_bwidth;
809 717
810 sb_w = mb_h = 0; 718 sb_w = 0;
811 window_vt_x = window_vt_y = int_bwidth; 719 window_vt_x = window_vt_y = int_bwidth;
812 720
813 if (scrollbar_visible ()) 721 if (scrollBar.state)
814 { 722 {
815 sb_w = scrollbar_TotalWidth (); 723 sb_w = scrollbar_TotalWidth ();
816 szHint.base_width += sb_w; 724 szHint.base_width += sb_w;
817 if (!OPTION (Opt_scrollBar_right)) 725 if (!OPTION (Opt_scrollBar_right))
818 window_vt_x += sb_w; 726 window_vt_x += sb_w;
819 } 727 }
820 728
821 if (menubar_visible ())
822 {
823 mb_h = menuBar_TotalHeight ();
824 szHint.base_height += mb_h;
825 window_vt_y += mb_h;
826 }
827
828 szHint.width_inc = fwidth; 729 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 730 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 731 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 732 szHint.min_height = szHint.base_height + szHint.height_inc;
832 733
… …
850 { 751 {
851 min_it (height, max_height); 752 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 753 szHint.height = szHint.base_height + height;
853 } 754 }
854 755
855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 757 window_sb_x = szHint.width - sb_w;
857 758
858 if (recalc_x) 759 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860 if (recalc_y) 761 if (recalc_y)
… …
874 * Called after a window size change. 775 * Called after a window size change.
875 */ 776 */
876void 777void
877rxvt_term::tt_winch () 778rxvt_term::tt_winch ()
878{ 779{
879 if (pty.pty < 0) 780 if (pty->pty < 0)
880 return; 781 return;
881 782
882 struct winsize ws; 783 struct winsize ws;
883 784
884 ws.ws_col = ncol; 785 ws.ws_col = ncol;
885 ws.ws_row = nrow; 786 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 787 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 788 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 790
890#if 0 791#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 793 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 794 kill (-cmd_pid, SIGWINCH);
… …
1215 1116
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1118
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1119 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1120 {
1220 if (scrollbar_visible ()) 1121 if (scrollBar.state)
1221 { 1122 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1123 XMoveResizeWindow (disp, scrollBar.win,
1223 window_sb_x, 0, 1124 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1125 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1126 resize_scrollbar ();
1226 } 1127 }
1227
1228 if (menubar_visible ())
1229 XMoveResizeWindow (disp, menuBar.win,
1230 window_vt_x, 0,
1231 width, menuBar_TotalHeight ());
1232 1128
1233 XMoveResizeWindow (disp, vt, 1129 XMoveResizeWindow (disp, vt,
1234 window_vt_x, window_vt_y, 1130 window_vt_x, window_vt_y,
1235 width, height); 1131 width, height);
1236 1132
… …
1420 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1421 unsigned long fg, bg; 1317 unsigned long fg, bg;
1422 const char *p; 1318 const char *p;
1423 char **s; 1319 char **s;
1424 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1321
1322 set_environ (envv);
1425 1323
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1325 return false;
1428 1326
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1595 int i; 1493 int i;
1596 const char *p; 1494 const char *p;
1597 char **s; 1495 char **s;
1598 char buf[IMBUFSIZ]; 1496 char buf[IMBUFSIZ];
1599 1497
1600 SET_R (this); 1498 make_current ();
1601 1499
1602 im_destroy (); 1500 im_destroy ();
1603 1501
1604 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605 if (Input_Context) 1503 if (Input_Context)
… …
1682 XFree (preedit_attr); 1580 XFree (preedit_attr);
1683 XFree (status_attr); 1581 XFree (status_attr);
1684} 1582}
1685#endif /* USE_XIM */ 1583#endif /* USE_XIM */
1686 1584
1687/*----------------------------------------------------------------------*/
1688rxvt_t rxvt_current_term;
1689
1690/*----------------------- end-of-file (C source) -----------------------*/ 1585/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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