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.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC

… …
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.
… …
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]; 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;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
64} 80}
65 81
66#if ENABLE_COMBINING 82#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
68 84
… …
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 150#endif
135#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 153#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 156#endif
144#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
162 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
171 188
172 termlist.push_back (this); 189 termlist.push_back (this);
173 190
174#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 193#endif
180} 194}
181 195
182// 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.
183// for use before an emergency exit 197// for use before an emergency exit
184void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
185{ 199{
186 if (cmd_pid) 200 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
188 202
189#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
190 privileged_utmp (RESTORE);
191#endif
192
193 pty.put ();
194} 204}
195 205
196rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
197{ 207{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 209
202 emergency_cleanup (); 210 emergency_cleanup ();
203 211
204#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
214 222
215 selection_clear (); 223 selection_clear ();
216 224
217#ifdef USE_XIM 225#ifdef USE_XIM
218 im_destroy (); 226 im_destroy ();
219#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif 227#endif
223#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
226#endif 231#endif
… …
237 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
241#endif 246#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246#endif 251#endif
247 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
248 253
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 254 delete drawable;
255 // destroy all windows 255 // destroy all windows
256 if (parent[0]) 256 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 261 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
265#endif 264#endif
266 265
… …
288#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
289 delete keyboard; 288 delete keyboard;
290#endif 289#endif
291} 290}
292 291
292// child has exited, usually destroys
293void 293void
294rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
295{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
296 cmd_pid = 0; 298 cmd_pid = 0;
297 299
298 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
299 destroy (); 301 destroy ();
300} 302}
… …
303rxvt_term::destroy () 305rxvt_term::destroy ()
304{ 306{
305 if (destroy_ev.active) 307 if (destroy_ev.active)
306 return; 308 return;
307 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
308#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
309 scr_overlay_off (); 314 scr_overlay_off ();
310#endif 315#endif
311 316
312 if (display) 317 if (display)
… …
314#if USE_XIM 319#if USE_XIM
315 im_ev.stop (display); 320 im_ev.stop (display);
316#endif 321#endif
317#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 324#endif
323#if TRANSPARENT 325#if TRANSPARENT
324 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
325#endif 327#endif
326 incr_ev.stop (); 328 incr_ev.stop ();
… …
350} 352}
351 353
352void 354void
353rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
354{ 356{
355 SET_R (this); 357 make_current ();
356 358
357 delete this; 359 delete this;
358} 360}
359 361
360/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
451/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
452bool 454bool
453rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv)
454{ 456{
455 SET_R (this); 457 SET_R (this);
456
457 set_locale (""); 458 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :(
458 460
459 if (!init_vars ()) 461 if (!init_vars ())
460 return false; 462 return false;
461 463
462 init_secondary (); 464 init_secondary ();
… …
465 467
466#ifdef KEYSYM_RESOURCE 468#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 469 keyboard->register_done ();
468#endif 470#endif
469 471
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 472#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 473 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 474 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 475#endif
477 476
478#if ENABLE_PERL 477 pty = rxvt_new_ptytty ();
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
483 478
484 create_windows (argc, argv); 479 create_windows (argc, argv);
485 480
486 dDisp; 481 dDisp;
487 482
488 init_xlocale (); 483 init_xlocale ();
489 484
490 scr_reset (); /* initialize screen */ 485 scr_reset (); // initialize screen
491 486
492#if 0 487#if 0
493 XSynchronize (disp, True); 488 XSynchronize (disp, True);
494#endif 489#endif
495 490
496#ifdef HAVE_SCROLLBARS 491#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 492 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 493 resize_scrollbar (); /* create and map scrollbar */
499#endif 494#endif
500#if (MENUBAR_MAX)
501 if (menubar_visible ())
502 XMapWindow (disp, menuBar.win);
503#endif
504#ifdef TRANSPARENT 495#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent)) 496 if (OPTION (Opt_transparent))
506 { 497 {
507 XSelectInput (disp, display->root, PropertyChangeMask); 498 XSelectInput (disp, display->root, PropertyChangeMask);
508 check_our_parents (); 499 check_our_parents ();
509 rootwin_ev.start (display, display->root); 500 rootwin_ev.start (display, display->root);
510 } 501 }
511#endif 502#endif
512 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
513 XMapWindow (disp, vt); 517 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]); 518 XMapWindow (disp, parent[0]);
515 519
516 set_colorfgbg ();
517
518 init_command (cmd_argv);
519
520 free (cmd_argv);
521
522 pty_ev.start (pty.pty, EVENT_READ);
523
524 check_ev.start ();
525
526 PERL_INVOKE ((this, HOOK_START, DT_END));
527
528 return true; 520 return true;
529} 521}
530 522
531static struct sig_handlers 523static struct sig_handlers
532{ 524{
533 sig_watcher sw_chld, sw_term, sw_int; 525 sig_watcher sw_term, sw_int;
534 526
535 void sig_chld (sig_watcher &w)
536 {
537 // we are being called for every SIGCHLD, find the corresponding term
538 int pid;
539
540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542 if (pid == (*t)->cmd_pid)
543 {
544 (*t)->child_exit ();
545 break;
546 }
547 }
548
549 /* 527 /*
550 * Catch a fatal signal and tidy up before quitting 528 * Catch a fatal signal and tidy up before quitting
551 */ 529 */
552 void 530 void
553 sig_term (sig_watcher &w) 531 sig_term (sig_watcher &w)
… …
559 signal (w.signum, SIG_DFL); 537 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum); 538 kill (getpid (), w.signum);
561 } 539 }
562 540
563 sig_handlers () 541 sig_handlers ()
564 : sw_chld (this, &sig_handlers::sig_chld),
565 sw_term (this, &sig_handlers::sig_term), 542 : sw_term (this, &sig_handlers::sig_term),
566 sw_int (this, &sig_handlers::sig_term) 543 sw_int (this, &sig_handlers::sig_term)
567 { 544 {
568 } 545 }
569} sig_handlers; 546} sig_handlers;
570 547
548char **rxvt_environ; // startup environment
549
571void 550void
572rxvt_init () 551rxvt_init ()
573{ 552{
574 /* 553 uid_t uid = getuid ();
575 * Save and then give up any super-user privileges 554 gid_t gid = getgid ();
576 * If we need privileges in any area then we must specifically request it. 555
577 * We should only need to be root in these cases: 556 // before doing anything else, check for setuid/setgid operation,
578 * 1. write utmp entries on some systems 557 // start the helper process and drop privileges
579 * 2. chown tty on some systems 558 if (uid != geteuid ()
580 */ 559 || gid != getegid ())
581 rxvt_privileges (SAVE); 560 {
582 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;
583 585
584 signal (SIGHUP, SIG_IGN); 586 signal (SIGHUP, SIG_IGN);
585 signal (SIGPIPE, SIG_IGN); 587 signal (SIGPIPE, SIG_IGN);
586 588
587 sig_handlers.sw_chld.start (SIGCHLD);
588 sig_handlers.sw_term.start (SIGTERM); 589 sig_handlers.sw_term.start (SIGTERM);
589 sig_handlers.sw_int.start (SIGINT); 590 sig_handlers.sw_int.start (SIGINT);
590 591
591 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
592 /* signal (SIGURG, SIG_DFL); */ 593 /* signal (SIGURG, SIG_DFL); */
593 594
594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595 // TODO: handle this with exceptions and tolerate the memory loss 596 // TODO: handle this with exceptions and tolerate the memory loss
596 XSetIOErrorHandler (rxvt_xioerror_handler); 597 XSetIOErrorHandler (rxvt_xioerror_handler);
598
599 XrmInitialize ();
597} 600}
598 601
599/* ------------------------------------------------------------------------- * 602/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS * 603 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */ 604 * ------------------------------------------------------------------------- */
… …
619 rxvt_fatal ("memory allocation failure. aborting.\n"); 622 rxvt_fatal ("memory allocation failure. aborting.\n");
620 623
621 return p; 624 return p;
622} 625}
623 626
624void * 627void *
625rxvt_realloc (void *ptr, size_t size) 628rxvt_realloc (void *ptr, size_t size)
626{ 629{
627 void *p = realloc (ptr, size); 630 void *p = realloc (ptr, size);
628 631
629 if (!p) 632 if (!p)
630 rxvt_fatal ("memory allocation failure. aborting.\n"); 633 rxvt_fatal ("memory allocation failure. aborting.\n");
631 634
632 return p; 635 return p;
633} 636}
634
635/* ------------------------------------------------------------------------- *
636 * PRIVILEGED OPERATIONS *
637 * ------------------------------------------------------------------------- */
638/* take care of suid/sgid super-user (root) privileges */
639void
640rxvt_privileges (rxvt_privaction action)
641{
642#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643 static uid_t euid;
644 static gid_t egid;
645#endif
646
647#if ! defined(__CYGWIN32__)
648# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649 /* setreuid () is the poor man's setuid (), seteuid () */
650# define seteuid(a) setreuid(-1, (a))
651# define setegid(a) setregid(-1, (a))
652# define HAVE_SETEUID
653# endif
654# ifdef HAVE_SETEUID
655 switch (action)
656 {
657 case IGNORE:
658 /*
659 * change effective uid/gid - not real uid/gid - so we can switch
660 * back to root later, as required
661 */
662 seteuid (getuid ());
663 setegid (getgid ());
664 break;
665 case SAVE:
666 euid = geteuid ();
667 egid = getegid ();
668 break;
669 case RESTORE:
670 seteuid (euid);
671 setegid (egid);
672 break;
673 }
674# else
675 switch (action)
676 {
677 case IGNORE:
678 setuid (getuid ());
679 setgid (getgid ());
680 /* FALLTHROUGH */
681 case SAVE:
682 /* FALLTHROUGH */
683 case RESTORE:
684 break;
685 }
686# endif
687#endif
688}
689
690#ifdef UTMP_SUPPORT
691void
692rxvt_term::privileged_utmp (rxvt_privaction action)
693{
694 if (OPTION (Opt_utmpInhibit)
695 || !pty.name || !*pty.name)
696 return;
697
698 rxvt_privileges (RESTORE);
699
700 if (action == SAVE)
701 makeutent (pty.name, rs[Rs_display_name]);
702 else
703 cleanutent ();
704
705 rxvt_privileges (IGNORE);
706}
707#endif
708 637
709/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
710/* 639/*
711 * window size/position calculcations for XSizeHint and other storage. 640 * window size/position calculcations for XSizeHint and other storage.
712 * if width/height are non-zero then override calculated width/height 641 * if width/height are non-zero then override calculated width/height
713 */ 642 */
714void 643void
715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
716{ 645{
717 short recalc_x, recalc_y; 646 short recalc_x, recalc_y;
718 int x, y, sb_w, mb_h, flags; 647 int x, y, sb_w, flags;
719 unsigned int w, h; 648 unsigned int w, h;
720 unsigned int max_width, max_height; 649 unsigned int max_width, max_height;
721 dDisp; 650 dDisp;
722 651
723 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",
… …
784 max_width = MAX_COLS * fwidth; 713 max_width = MAX_COLS * fwidth;
785 max_height = MAX_ROWS * fheight; 714 max_height = MAX_ROWS * fheight;
786 715
787 szHint.base_width = szHint.base_height = 2 * int_bwidth; 716 szHint.base_width = szHint.base_height = 2 * int_bwidth;
788 717
789 sb_w = mb_h = 0; 718 sb_w = 0;
790 window_vt_x = window_vt_y = int_bwidth; 719 window_vt_x = window_vt_y = int_bwidth;
791 720
792 if (scrollbar_visible ()) 721 if (scrollBar.state)
793 { 722 {
794 sb_w = scrollbar_TotalWidth (); 723 sb_w = scrollbar_TotalWidth ();
795 szHint.base_width += sb_w; 724 szHint.base_width += sb_w;
796 if (!OPTION (Opt_scrollBar_right)) 725 if (!OPTION (Opt_scrollBar_right))
797 window_vt_x += sb_w; 726 window_vt_x += sb_w;
798 } 727 }
799 728
800 if (menubar_visible ())
801 {
802 mb_h = menuBar_TotalHeight ();
803 szHint.base_height += mb_h;
804 window_vt_y += mb_h;
805 }
806
807 szHint.width_inc = fwidth; 729 szHint.width_inc = fwidth;
808 szHint.height_inc = fheight; 730 szHint.height_inc = fheight;
809 szHint.min_width = szHint.base_width + szHint.width_inc; 731 szHint.min_width = szHint.base_width + szHint.width_inc;
810 szHint.min_height = szHint.base_height + szHint.height_inc; 732 szHint.min_height = szHint.base_height + szHint.height_inc;
811 733
… …
829 { 751 {
830 min_it (height, max_height); 752 min_it (height, max_height);
831 szHint.height = szHint.base_height + height; 753 szHint.height = szHint.base_height + height;
832 } 754 }
833 755
834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
835 window_sb_x = szHint.width - sb_w; 757 window_sb_x = szHint.width - sb_w;
836 758
837 if (recalc_x) 759 if (recalc_x)
838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
839 if (recalc_y) 761 if (recalc_y)
… …
853 * Called after a window size change. 775 * Called after a window size change.
854 */ 776 */
855void 777void
856rxvt_term::tt_winch () 778rxvt_term::tt_winch ()
857{ 779{
858 if (pty.pty < 0) 780 if (pty->pty < 0)
859 return; 781 return;
860 782
861 struct winsize ws; 783 struct winsize ws;
862 784
863 ws.ws_col = ncol; 785 ws.ws_col = ncol;
864 ws.ws_row = nrow; 786 ws.ws_row = nrow;
865 ws.ws_xpixel = width; 787 ws.ws_xpixel = width;
866 ws.ws_ypixel = height; 788 ws.ws_ypixel = height;
867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
868 790
869#if 0 791#if 0
870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
871 if (cmd_pid) /* force through to the command */ 793 if (cmd_pid) /* force through to the command */
872 kill (-cmd_pid, SIGWINCH); 794 kill (-cmd_pid, SIGWINCH);
… …
908 prop.height += lineSpace; 830 prop.height += lineSpace;
909 fs->set_prop (prop); 831 fs->set_prop (prop);
910 832
911 fwidth = prop.width; 833 fwidth = prop.width;
912 fheight = prop.height; 834 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 835 fbase = prop.ascent;
914 836
915 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
916 { 838 {
917#if ENABLE_STYLES 839#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 840 const char *res = rs[Rs_font + style];
… …
1009 i = atoi (color); 931 i = atoi (color);
1010 932
1011 if (i >= 8 && i <= 15) 933 if (i >= 8 && i <= 15)
1012 { /* bright colors */ 934 { /* bright colors */
1013 i -= 8; 935 i -= 8;
1014# ifndef NO_BRIGHTCOLOR
1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016 SET_PIXCOLOR (idx); 937 SET_PIXCOLOR (idx);
1017 goto done; 938 goto done;
1018# endif
1019 } 939 }
1020 940
1021 if (i >= 0 && i <= 7) 941 if (i >= 0 && i <= 7)
1022 { /* normal colors */ 942 { /* normal colors */
1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1196 1116
1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1198 1118
1199 if (fix_screen || newwidth != old_width || newheight != old_height) 1119 if (fix_screen || newwidth != old_width || newheight != old_height)
1200 { 1120 {
1201 if (scrollbar_visible ()) 1121 if (scrollBar.state)
1202 { 1122 {
1203 XMoveResizeWindow (disp, scrollBar.win, 1123 XMoveResizeWindow (disp, scrollBar.win,
1204 window_sb_x, 0, 1124 window_sb_x, 0,
1205 scrollbar_TotalWidth (), szHint.height); 1125 scrollbar_TotalWidth (), szHint.height);
1206 resize_scrollbar (); 1126 resize_scrollbar ();
1207 } 1127 }
1208 1128
1209 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1213
1214 XMoveResizeWindow (disp, vt, 1129 XMoveResizeWindow (disp, vt,
1215 window_vt_x, window_vt_y, 1130 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1131 width, height);
1217 1132
1218 scr_clear (); 1133 scr_clear ();
1219#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1220 resize_pixmap (); 1135 resize_pixmap ();
1221#endif 1136#endif
… …
1401 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1402 unsigned long fg, bg; 1317 unsigned long fg, bg;
1403 const char *p; 1318 const char *p;
1404 char **s; 1319 char **s;
1405 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1321
1322 set_environ (envv);
1406 1323
1407 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408 return false; 1325 return false;
1409 1326
1410 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1576 int i; 1493 int i;
1577 const char *p; 1494 const char *p;
1578 char **s; 1495 char **s;
1579 char buf[IMBUFSIZ]; 1496 char buf[IMBUFSIZ];
1580 1497
1581 SET_R (this); 1498 make_current ();
1582 1499
1583 im_destroy (); 1500 im_destroy ();
1584 1501
1585 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1586 if (Input_Context) 1503 if (Input_Context)
… …
1663 XFree (preedit_attr); 1580 XFree (preedit_attr);
1664 XFree (status_attr); 1581 XFree (status_attr);
1665} 1582}
1666#endif /* USE_XIM */ 1583#endif /* USE_XIM */
1667 1584
1668/*----------------------------------------------------------------------*/
1669rxvt_t rxvt_current_term;
1670
1671/*----------------------- end-of-file (C source) -----------------------*/ 1585/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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