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.152 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.195 by root, Sun Jan 22 00:48:13 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/*----------------------------------------------------------------------*/
… …
448 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
449} 451}
450 452
451/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
452bool 454bool
453rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 456{
457 this->envv = envv;
458
455 SET_R (this); 459 SET_R (this);
456
457 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
458 462
459 if (!init_vars ()) 463 if (!init_vars ())
460 return false; 464 return false;
461 465
462 init_secondary (); 466 init_secondary ();
… …
465 469
466#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 471 keyboard->register_done ();
468#endif 472#endif
469 473
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 475 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 477#endif
477 478
479 pty = ptytty_new ();
480
478 create_windows (argc, argv); 481 create_windows (argc, argv);
479 482
480 dDisp; 483 dDisp;
481 484
482 init_xlocale (); 485 init_xlocale ();
483 486
484 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
485 488
486#if 0 489#if 0
487 XSynchronize (disp, True); 490 XSynchronize (disp, True);
488#endif 491#endif
489 492
490#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 494 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
493#endif 496#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 497#ifdef TRANSPARENT
499 if (options & Opt_transparent) 498 if (OPTION (Opt_transparent))
500 { 499 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 501 check_our_parents ();
503 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
504 } 503 }
505#endif 504#endif
506 505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
507 XMapWindow (disp, vt); 519 XMapWindow (disp, vt);
508 XMapWindow (disp, parent[0]); 520 XMapWindow (disp, parent[0]);
509 521
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; 522 return true;
521} 523}
522 524
523static struct sig_handlers 525static struct sig_handlers
524{ 526{
525 sig_watcher sw_chld, sw_term, sw_int; 527 sig_watcher sw_term, sw_int;
526 528
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 /* 529 /*
542 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
543 */ 531 */
544 void 532 void
545 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
551 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
553 } 541 }
554 542
555 sig_handlers () 543 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
559 { 546 {
560 } 547 }
561} sig_handlers; 548} sig_handlers;
562 549
550char **rxvt_environ; // startup environment
551
563void 552void
564rxvt_init () 553rxvt_init ()
565{ 554{
566 /* 555 uid_t uid = getuid ();
567 * Save and then give up any super-user privileges 556 gid_t gid = getgid ();
568 * If we need privileges in any area then we must specifically request it. 557
569 * We should only need to be root in these cases: 558 // before doing anything else, check for setuid/setgid operation,
570 * 1. write utmp entries on some systems 559 // start the helper process and drop privileges
571 * 2. chown tty on some systems 560 if (uid != geteuid ()
572 */ 561 || gid != getegid ())
573 rxvt_privileges (SAVE); 562 {
574 rxvt_privileges (IGNORE); 563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585
586 rxvt_environ = environ;
575 587
576 signal (SIGHUP, SIG_IGN); 588 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 589 signal (SIGPIPE, SIG_IGN);
578 590
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 591 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 592 sig_handlers.sw_int.start (SIGINT);
582 593
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 595 /* signal (SIGURG, SIG_DFL); */
585 596
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 598 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 599 XSetIOErrorHandler (rxvt_xioerror_handler);
600
601 XrmInitialize ();
589} 602}
590 603
591/* ------------------------------------------------------------------------- * 604/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 605 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 606 * ------------------------------------------------------------------------- */
… …
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 624 rxvt_fatal ("memory allocation failure. aborting.\n");
612 625
613 return p; 626 return p;
614} 627}
615 628
616void * 629void *
617rxvt_realloc (void *ptr, size_t size) 630rxvt_realloc (void *ptr, size_t size)
618{ 631{
619 void *p = realloc (ptr, size); 632 void *p = realloc (ptr, size);
620 633
621 if (!p) 634 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 635 rxvt_fatal ("memory allocation failure. aborting.\n");
623 636
624 return p; 637 return p;
625} 638}
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 639
701/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
702/* 641/*
703 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculcations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
705 */ 644 */
706void 645void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 647{
709 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 649 int x, y, sb_w, flags;
711 unsigned int w, h; 650 unsigned int w, h;
712 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
713 dDisp; 652 dDisp;
714 653
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
776 max_width = MAX_COLS * fwidth; 715 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 716 max_height = MAX_ROWS * fheight;
778 717
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 718 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 719
781 sb_w = mb_h = 0; 720 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 721 window_vt_x = window_vt_y = int_bwidth;
783 722
784 if (scrollbar_visible ()) 723 if (scrollBar.state)
785 { 724 {
786 sb_w = scrollbar_TotalWidth (); 725 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 726 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 727 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 728 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 } 729 }
798 730
799 szHint.width_inc = fwidth; 731 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
821 { 753 {
822 min_it (height, max_height); 754 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
824 } 756 }
825 757
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 758 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
828 760
829 if (recalc_x) 761 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 763 if (recalc_y)
… …
845 * Called after a window size change. 777 * Called after a window size change.
846 */ 778 */
847void 779void
848rxvt_term::tt_winch () 780rxvt_term::tt_winch ()
849{ 781{
850 if (pty.pty < 0) 782 if (pty->pty < 0)
851 return; 783 return;
852 784
853 struct winsize ws; 785 struct winsize ws;
854 786
855 ws.ws_col = ncol; 787 ws.ws_col = ncol;
856 ws.ws_row = nrow; 788 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 789 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 790 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 792
861#if 0 793#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
… …
900 prop.height += lineSpace; 832 prop.height += lineSpace;
901 fs->set_prop (prop); 833 fs->set_prop (prop);
902 834
903 fwidth = prop.width; 835 fwidth = prop.width;
904 fheight = prop.height; 836 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 837 fbase = prop.ascent;
906 838
907 for (int style = 1; style < 4; style++) 839 for (int style = 1; style < 4; style++)
908 { 840 {
909#if ENABLE_STYLES 841#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 842 const char *res = rs[Rs_font + style];
… …
944 return true; 876 return true;
945} 877}
946 878
947void rxvt_term::set_string_property (Atom prop, const char *str, int len) 879void rxvt_term::set_string_property (Atom prop, const char *str, int len)
948{ 880{
949 // TODO: SMART_WINDOW_TITLE
950 XChangeProperty (display->display, parent[0], 881 XChangeProperty (display->display, parent[0],
951 prop, XA_STRING, 8, PropModeReplace, 882 prop, XA_STRING, 8, PropModeReplace,
952 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 883 (const unsigned char *)str, len >= 0 ? len : strlen (str));
953} 884}
954 885
955void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
956{ 887{
957 // TODO: SMART_WINDOW_TITLE
958 wchar_t *ws = rxvt_mbstowcs (str, len); 888 wchar_t *ws = rxvt_mbstowcs (str, len);
959 char *s = rxvt_wcstoutf8 (ws); 889 char *s = rxvt_wcstoutf8 (ws);
960 890
961 XChangeProperty (display->display, parent[0], 891 XChangeProperty (display->display, parent[0],
962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
1003 i = atoi (color); 933 i = atoi (color);
1004 934
1005 if (i >= 8 && i <= 15) 935 if (i >= 8 && i <= 15)
1006 { /* bright colors */ 936 { /* bright colors */
1007 i -= 8; 937 i -= 8;
1008# ifndef NO_BRIGHTCOLOR
1009 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1010 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
1011 goto done; 940 goto done;
1012# endif
1013 } 941 }
1014 942
1015 if (i >= 0 && i <= 7) 943 if (i >= 0 && i <= 7)
1016 { /* normal colors */ 944 { /* normal colors */
1017 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1190 1118
1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1192 1120
1193 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1194 { 1122 {
1195 if (scrollbar_visible ()) 1123 if (scrollBar.state)
1196 { 1124 {
1197 XMoveResizeWindow (disp, scrollBar.win, 1125 XMoveResizeWindow (disp, scrollBar.win,
1198 window_sb_x, 0, 1126 window_sb_x, 0,
1199 scrollbar_TotalWidth (), szHint.height); 1127 scrollbar_TotalWidth (), szHint.height);
1200 resize_scrollbar (); 1128 resize_scrollbar ();
1201 } 1129 }
1202 1130
1203 if (menubar_visible ())
1204 XMoveResizeWindow (disp, menuBar.win,
1205 window_vt_x, 0,
1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1207
1208 XMoveResizeWindow (disp, vt, 1131 XMoveResizeWindow (disp, vt,
1209 window_vt_x, window_vt_y, 1132 window_vt_x, window_vt_y,
1210 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1133 width, height);
1211 1134
1212 scr_clear (); 1135 scr_clear ();
1213#ifdef XPM_BACKGROUND 1136#ifdef XPM_BACKGROUND
1214 resize_pixmap (); 1137 resize_pixmap ();
1215#endif 1138#endif
… …
1395 XRectangle rect, status_rect, needed_rect; 1318 XRectangle rect, status_rect, needed_rect;
1396 unsigned long fg, bg; 1319 unsigned long fg, bg;
1397 const char *p; 1320 const char *p;
1398 char **s; 1321 char **s;
1399 XIMStyles *xim_styles; 1322 XIMStyles *xim_styles;
1323
1324 set_environ (envv);
1400 1325
1401 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1402 return false; 1327 return false;
1403 1328
1404 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1570 int i; 1495 int i;
1571 const char *p; 1496 const char *p;
1572 char **s; 1497 char **s;
1573 char buf[IMBUFSIZ]; 1498 char buf[IMBUFSIZ];
1574 1499
1575 SET_R (this); 1500 make_current ();
1576 1501
1577 im_destroy (); 1502 im_destroy ();
1578 1503
1579 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1580 if (Input_Context) 1505 if (Input_Context)
… …
1657 XFree (preedit_attr); 1582 XFree (preedit_attr);
1658 XFree (status_attr); 1583 XFree (status_attr);
1659} 1584}
1660#endif /* USE_XIM */ 1585#endif /* USE_XIM */
1661 1586
1662/*----------------------------------------------------------------------*/
1663rxvt_t rxvt_current_term;
1664
1665/*----------------------- end-of-file (C source) -----------------------*/ 1587/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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