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.153 by root, Tue Dec 27 12:23:37 2005 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.
… …
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"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
55static char curlocale[128]; 56static char curlocale[128], savelocale[128];
56 57
57bool 58bool
58rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
59{ 60{
60 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 62 return false;
62 63
63 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
65 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);
66} 80}
67 81
68#if ENABLE_COMBINING 82#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
70 84
… …
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
136#endif 150#endif
137#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif 153#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif
143#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 156#endif
146#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
147 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
159 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
160#endif 171#endif
161#ifdef USE_XIM 172#ifdef USE_XIM
162 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
163#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
164 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
165 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
166 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
167 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
168 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
169 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
170 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
173 188
174 termlist.push_back (this); 189 termlist.push_back (this);
175 190
176#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
177 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
178
179 if (!keyboard)
180 rxvt_fatal ("out of memory, aborting.\n");
181#endif 193#endif
182} 194}
183 195
184// 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.
185// for use before an emergency exit 197// for use before an emergency exit
186void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
187{ 199{
188 if (cmd_pid) 200 if (cmd_pid)
189 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
190 202
191#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
192 privileged_utmp (RESTORE);
193#endif
194
195 pty.put ();
196} 204}
197 205
198rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
199{ 207{
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
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 (!(options & Opt_hold)) 300 if (!OPTION (Opt_hold))
299 destroy (); 301 destroy ();
300} 302}
301 303
302void 304void
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 (options & 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
477 pty = rxvt_new_ptytty ();
478
478 create_windows (argc, argv); 479 create_windows (argc, argv);
479 480
480 dDisp; 481 dDisp;
481 482
482 init_xlocale (); 483 init_xlocale ();
483 484
484 scr_reset (); /* initialize screen */ 485 scr_reset (); // initialize screen
485 486
486#if 0 487#if 0
487 XSynchronize (disp, True); 488 XSynchronize (disp, True);
488#endif 489#endif
489 490
490#ifdef HAVE_SCROLLBARS 491#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 492 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 493 resize_scrollbar (); /* create and map scrollbar */
493#endif 494#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 495#ifdef TRANSPARENT
499 if (options & Opt_transparent) 496 if (OPTION (Opt_transparent))
500 { 497 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 498 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 499 check_our_parents ();
503 rootwin_ev.start (display, display->root); 500 rootwin_ev.start (display, display->root);
504 } 501 }
505#endif 502#endif
506 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
507 XMapWindow (disp, vt); 517 XMapWindow (disp, vt);
508 XMapWindow (disp, parent[0]); 518 XMapWindow (disp, parent[0]);
509 519
510 set_colorfgbg ();
511
512 init_command (cmd_argv);
513
514 free (cmd_argv);
515
516 pty_ev.start (pty.pty, EVENT_READ);
517
518 check_ev.start ();
519
520 return true; 520 return true;
521} 521}
522 522
523static struct sig_handlers 523static struct sig_handlers
524{ 524{
525 sig_watcher sw_chld, sw_term, sw_int; 525 sig_watcher sw_term, sw_int;
526 526
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /* 527 /*
542 * Catch a fatal signal and tidy up before quitting 528 * Catch a fatal signal and tidy up before quitting
543 */ 529 */
544 void 530 void
545 sig_term (sig_watcher &w) 531 sig_term (sig_watcher &w)
… …
551 signal (w.signum, SIG_DFL); 537 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 538 kill (getpid (), w.signum);
553 } 539 }
554 540
555 sig_handlers () 541 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 542 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 543 sw_int (this, &sig_handlers::sig_term)
559 { 544 {
560 } 545 }
561} sig_handlers; 546} sig_handlers;
562 547
548char **rxvt_environ; // startup environment
549
563void 550void
564rxvt_init () 551rxvt_init ()
565{ 552{
566 /* 553 uid_t uid = getuid ();
567 * Save and then give up any super-user privileges 554 gid_t gid = getgid ();
568 * If we need privileges in any area then we must specifically request it. 555
569 * We should only need to be root in these cases: 556 // before doing anything else, check for setuid/setgid operation,
570 * 1. write utmp entries on some systems 557 // start the helper process and drop privileges
571 * 2. chown tty on some systems 558 if (uid != geteuid ()
572 */ 559 || gid != getegid ())
573 rxvt_privileges (SAVE); 560 {
574 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;
575 585
576 signal (SIGHUP, SIG_IGN); 586 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 587 signal (SIGPIPE, SIG_IGN);
578 588
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 589 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 590 sig_handlers.sw_int.start (SIGINT);
582 591
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 593 /* signal (SIGURG, SIG_DFL); */
585 594
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 596 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 597 XSetIOErrorHandler (rxvt_xioerror_handler);
598
599 XrmInitialize ();
589} 600}
590 601
591/* ------------------------------------------------------------------------- * 602/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 603 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 604 * ------------------------------------------------------------------------- */
… …
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 622 rxvt_fatal ("memory allocation failure. aborting.\n");
612 623
613 return p; 624 return p;
614} 625}
615 626
616void * 627void *
617rxvt_realloc (void *ptr, size_t size) 628rxvt_realloc (void *ptr, size_t size)
618{ 629{
619 void *p = realloc (ptr, size); 630 void *p = realloc (ptr, size);
620 631
621 if (!p) 632 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 633 rxvt_fatal ("memory allocation failure. aborting.\n");
623 634
624 return p; 635 return p;
625} 636}
626
627/* ------------------------------------------------------------------------- *
628 * PRIVILEGED OPERATIONS *
629 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */
631void
632rxvt_privileges (rxvt_privaction action)
633{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a))
644# define HAVE_SETEUID
645# endif
646# ifdef HAVE_SETEUID
647 switch (action)
648 {
649 case IGNORE:
650 /*
651 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required
653 */
654 seteuid (getuid ());
655 setegid (getgid ());
656 break;
657 case SAVE:
658 euid = geteuid ();
659 egid = getegid ();
660 break;
661 case RESTORE:
662 seteuid (euid);
663 setegid (egid);
664 break;
665 }
666# else
667 switch (action)
668 {
669 case IGNORE:
670 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */
673 case SAVE:
674 /* FALLTHROUGH */
675 case RESTORE:
676 break;
677 }
678# endif
679#endif
680}
681
682#ifdef UTMP_SUPPORT
683void
684rxvt_term::privileged_utmp (rxvt_privaction action)
685{
686 if ((options & Opt_utmpInhibit)
687 || !pty.name || !*pty.name)
688 return;
689
690 rxvt_privileges (RESTORE);
691
692 if (action == SAVE)
693 makeutent (pty.name, rs[Rs_display_name]);
694 else
695 cleanutent ();
696
697 rxvt_privileges (IGNORE);
698}
699#endif
700 637
701/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
702/* 639/*
703 * window size/position calculcations for XSizeHint and other storage. 640 * window size/position calculcations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 641 * if width/height are non-zero then override calculated width/height
705 */ 642 */
706void 643void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 645{
709 short recalc_x, recalc_y; 646 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 647 int x, y, sb_w, flags;
711 unsigned int w, h; 648 unsigned int w, h;
712 unsigned int max_width, max_height; 649 unsigned int max_width, max_height;
713 dDisp; 650 dDisp;
714 651
715 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",
… …
776 max_width = MAX_COLS * fwidth; 713 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 714 max_height = MAX_ROWS * fheight;
778 715
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 716 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 717
781 sb_w = mb_h = 0; 718 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 719 window_vt_x = window_vt_y = int_bwidth;
783 720
784 if (scrollbar_visible ()) 721 if (scrollBar.state)
785 { 722 {
786 sb_w = scrollbar_TotalWidth (); 723 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 724 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 725 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 726 window_vt_x += sb_w;
790 }
791
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 } 727 }
798 728
799 szHint.width_inc = fwidth; 729 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 730 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 731 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
821 { 751 {
822 min_it (height, max_height); 752 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 753 szHint.height = szHint.base_height + height;
824 } 754 }
825 755
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 757 window_sb_x = szHint.width - sb_w;
828 758
829 if (recalc_x) 759 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 761 if (recalc_y)
… …
845 * Called after a window size change. 775 * Called after a window size change.
846 */ 776 */
847void 777void
848rxvt_term::tt_winch () 778rxvt_term::tt_winch ()
849{ 779{
850 if (pty.pty < 0) 780 if (pty->pty < 0)
851 return; 781 return;
852 782
853 struct winsize ws; 783 struct winsize ws;
854 784
855 ws.ws_col = ncol; 785 ws.ws_col = ncol;
856 ws.ws_row = nrow; 786 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 787 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 788 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 790
861#if 0 791#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 793 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 794 kill (-cmd_pid, SIGWINCH);
… …
900 prop.height += lineSpace; 830 prop.height += lineSpace;
901 fs->set_prop (prop); 831 fs->set_prop (prop);
902 832
903 fwidth = prop.width; 833 fwidth = prop.width;
904 fheight = prop.height; 834 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 835 fbase = prop.ascent;
906 836
907 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
908 { 838 {
909#if ENABLE_STYLES 839#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 840 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 931 i = atoi (color);
1002 932
1003 if (i >= 8 && i <= 15) 933 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 934 { /* bright colors */
1005 i -= 8; 935 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 937 SET_PIXCOLOR (idx);
1009 goto done; 938 goto done;
1010# endif
1011 } 939 }
1012 940
1013 if (i >= 0 && i <= 7) 941 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 942 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1188 1116
1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1190 1118
1191 if (fix_screen || newwidth != old_width || newheight != old_height) 1119 if (fix_screen || newwidth != old_width || newheight != old_height)
1192 { 1120 {
1193 if (scrollbar_visible ()) 1121 if (scrollBar.state)
1194 { 1122 {
1195 XMoveResizeWindow (disp, scrollBar.win, 1123 XMoveResizeWindow (disp, scrollBar.win,
1196 window_sb_x, 0, 1124 window_sb_x, 0,
1197 scrollbar_TotalWidth (), szHint.height); 1125 scrollbar_TotalWidth (), szHint.height);
1198 resize_scrollbar (); 1126 resize_scrollbar ();
1199 } 1127 }
1200 1128
1201 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206 XMoveResizeWindow (disp, vt, 1129 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1130 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1131 width, height);
1209 1132
1210 scr_clear (); 1133 scr_clear ();
1211#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1135 resize_pixmap ();
1213#endif 1136#endif
… …
1393 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1317 unsigned long fg, bg;
1395 const char *p; 1318 const char *p;
1396 char **s; 1319 char **s;
1397 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1321
1322 set_environ (envv);
1398 1323
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1325 return false;
1401 1326
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1568 int i; 1493 int i;
1569 const char *p; 1494 const char *p;
1570 char **s; 1495 char **s;
1571 char buf[IMBUFSIZ]; 1496 char buf[IMBUFSIZ];
1572 1497
1573 SET_R (this); 1498 make_current ();
1574 1499
1575 im_destroy (); 1500 im_destroy ();
1576 1501
1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578 if (Input_Context) 1503 if (Input_Context)
… …
1655 XFree (preedit_attr); 1580 XFree (preedit_attr);
1656 XFree (status_attr); 1581 XFree (status_attr);
1657} 1582}
1658#endif /* USE_XIM */ 1583#endif /* USE_XIM */
1659 1584
1660/*----------------------------------------------------------------------*/
1661rxvt_t rxvt_current_term;
1662
1663/*----------------------- end-of-file (C source) -----------------------*/ 1585/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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