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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 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"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
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),
… …
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
162 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 178 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 179 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 180 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 181 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 182 incr_ev (this, &rxvt_term::incr_cb)
… …
171 185
172 termlist.push_back (this); 186 termlist.push_back (this);
173 187
174#ifdef KEYSYM_RESOURCE 188#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 189 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 190#endif
180} 191}
181 192
182// clean up the most important stuff, do *not* call x or free mem etc. 193// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit 194// for use before an emergency exit
184void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
185{ 196{
186 if (cmd_pid) 197 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
188 199
189#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
190 privileged_utmp (RESTORE);
191#endif
192
193 pty.put ();
194} 201}
195 202
196rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
197{ 204{
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 205 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
212 219
213 selection_clear (); 220 selection_clear ();
214 221
215#ifdef USE_XIM 222#ifdef USE_XIM
216 im_destroy (); 223 im_destroy ();
217#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif 224#endif
221#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
224#endif 228#endif
… …
235 if (upArrow) XFreePixmap (disp, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
239#endif 243#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 248#endif
245 if (gc) XFreeGC (disp, gc); 249 if (gc) XFreeGC (disp, gc);
246 250
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete drawable; 251 delete drawable;
253 // destroy all windows 252 // destroy all windows
254 if (parent[0]) 253 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 254 XDestroyWindow (disp, parent[0]);
256 } 255 }
257 256
258 // TODO: free pixcolours, colours should become part of rxvt_display 257 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 258 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 260 delete pix_colors_unfocused;
263#endif 261#endif
264 262
… …
286#ifdef KEYSYM_RESOURCE 284#ifdef KEYSYM_RESOURCE
287 delete keyboard; 285 delete keyboard;
288#endif 286#endif
289} 287}
290 288
289// child has exited, usually destroys
290void
291rxvt_term::child_cb (child_watcher &w, int status)
292{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294
295 cmd_pid = 0;
296
297 if (!OPTION (Opt_hold))
298 destroy ();
299}
300
291void 301void
292rxvt_term::destroy () 302rxvt_term::destroy ()
293{ 303{
294 if (destroy_ev.active) 304 if (destroy_ev.active)
295 return; 305 return;
296 306
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
308 return;
309
297#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
298 scr_overlay_off (); 311 scr_overlay_off ();
299#endif 312#endif
300 313
301 if (display) 314 if (display)
… …
303#if USE_XIM 316#if USE_XIM
304 im_ev.stop (display); 317 im_ev.stop (display);
305#endif 318#endif
306#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
308#endif
309#if MENUBAR
310 menubar_ev.stop (display);
311#endif 321#endif
312#if TRANSPARENT 322#if TRANSPARENT
313 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
314#endif 324#endif
315 incr_ev.stop (); 325 incr_ev.stop ();
… …
339} 349}
340 350
341void 351void
342rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
343{ 353{
344 SET_R (this); 354 make_current ();
345 355
346 delete this; 356 delete this;
347} 357}
348 358
349/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
440/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
441bool 451bool
442rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv)
443{ 453{
444 SET_R (this); 454 SET_R (this);
445
446 set_locale (""); 455 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :(
447 457
448 if (!init_vars ()) 458 if (!init_vars ())
449 return false; 459 return false;
450 460
451 init_secondary (); 461 init_secondary ();
… …
454 464
455#ifdef KEYSYM_RESOURCE 465#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 466 keyboard->register_done ();
457#endif 467#endif
458 468
459#if MENUBAR_MAX 469#if ENABLE_PERL
460 menubar_read (rs[Rs_menu]); 470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
461#endif 480#endif
481
462#ifdef HAVE_SCROLLBARS 482#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 483 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 484 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 485#endif
466 486
487 pty = rxvt_new_ptytty ();
488
467 create_windows (argc, argv); 489 create_windows (argc, argv);
468 490
469 dDisp; 491 dDisp;
470 492
471 init_xlocale (); 493 init_xlocale ();
472 494
473 scr_reset (); /* initialize screen */ 495 scr_reset (); // initialize screen
474 496
475#if 0 497#if 0
476 XSynchronize (disp, True); 498 XSynchronize (disp, True);
477#endif 499#endif
478 500
479#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 502 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 503 resize_scrollbar (); /* create and map scrollbar */
482#endif 504#endif
483#if (MENUBAR_MAX)
484 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win);
486#endif
487#ifdef TRANSPARENT 505#ifdef TRANSPARENT
488 if (options & Opt_transparent) 506 if (OPTION (Opt_transparent))
489 { 507 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 508 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 509 check_our_parents ();
492 rootwin_ev.start (display, display->root); 510 rootwin_ev.start (display, display->root);
493 } 511 }
494#endif 512#endif
495 513
514 set_colorfgbg ();
515
516 init_command (cmd_argv);
517
518 free (cmd_argv);
519
520 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ);
522
523 check_ev.start ();
524
525 HOOK_INVOKE ((this, HOOK_START, DT_END));
526
496 XMapWindow (disp, vt); 527 XMapWindow (disp, vt);
497 XMapWindow (disp, parent[0]); 528 XMapWindow (disp, parent[0]);
498 529
499 set_colorfgbg ();
500
501 init_command (cmd_argv);
502
503 free (cmd_argv);
504
505 pty_ev.start (pty.pty, EVENT_READ);
506
507 check_ev.start ();
508
509 return true; 530 return true;
510} 531}
511 532
512static struct sig_handlers 533static struct sig_handlers
513{ 534{
514 sig_watcher sw_chld, sw_term, sw_int; 535 sig_watcher sw_term, sw_int;
515 536
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529
530 /* 537 /*
531 * Catch a fatal signal and tidy up before quitting 538 * Catch a fatal signal and tidy up before quitting
532 */ 539 */
533 void 540 void
534 sig_term (sig_watcher &w) 541 sig_term (sig_watcher &w)
… …
540 signal (w.signum, SIG_DFL); 547 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum); 548 kill (getpid (), w.signum);
542 } 549 }
543 550
544 sig_handlers () 551 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 552 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 553 sw_int (this, &sig_handlers::sig_term)
548 { 554 {
549 } 555 }
550} sig_handlers; 556} sig_handlers;
551 557
558char **rxvt_environ; // startup environment
559
552void 560void
553rxvt_init () 561rxvt_init ()
554{ 562{
555 /* 563 uid_t uid = getuid ();
556 * Save and then give up any super-user privileges 564 gid_t gid = getgid ();
557 * If we need privileges in any area then we must specifically request it. 565
558 * We should only need to be root in these cases: 566 // before doing anything else, check for setuid/setgid operation,
559 * 1. write utmp entries on some systems 567 // start the helper process and drop privileges
560 * 2. chown tty on some systems 568 if (uid != geteuid ()
561 */ 569 || gid != getegid ())
562 rxvt_privileges (SAVE); 570 {
563 rxvt_privileges (IGNORE); 571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593
594 rxvt_environ = environ;
564 595
565 signal (SIGHUP, SIG_IGN); 596 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 597 signal (SIGPIPE, SIG_IGN);
567 598
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 599 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT); 600 sig_handlers.sw_int.start (SIGINT);
571 601
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 603 /* signal (SIGURG, SIG_DFL); */
574 604
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 606 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 607 XSetIOErrorHandler (rxvt_xioerror_handler);
608
609 XrmInitialize ();
578} 610}
579 611
580/* ------------------------------------------------------------------------- * 612/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 613 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 614 * ------------------------------------------------------------------------- */
… …
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 632 rxvt_fatal ("memory allocation failure. aborting.\n");
601 633
602 return p; 634 return p;
603} 635}
604 636
605void * 637void *
606rxvt_realloc (void *ptr, size_t size) 638rxvt_realloc (void *ptr, size_t size)
607{ 639{
608 void *p = realloc (ptr, size); 640 void *p = realloc (ptr, size);
609 641
610 if (!p) 642 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 643 rxvt_fatal ("memory allocation failure. aborting.\n");
612 644
613 return p; 645 return p;
614} 646}
615
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689 647
690/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
691/* 649/*
692 * window size/position calculcations for XSizeHint and other storage. 650 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 651 * if width/height are non-zero then override calculated width/height
694 */ 652 */
695void 653void
696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 655{
698 short recalc_x, recalc_y; 656 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 657 int x, y, sb_w, flags;
700 unsigned int w, h; 658 unsigned int w, h;
701 unsigned int max_width, max_height; 659 unsigned int max_width, max_height;
702 dDisp; 660 dDisp;
703 661
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
718 if (rs[Rs_geometry]) 676 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 677 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 678
721 if (flags & WidthValue) 679 if (flags & WidthValue)
722 { 680 {
723 ncol = BOUND_POSITIVE_INT16 (w); 681 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 682 szHint.flags |= USSize;
725 } 683 }
726 684
727 if (flags & HeightValue) 685 if (flags & HeightValue)
728 { 686 {
729 nrow = BOUND_POSITIVE_INT16 (h); 687 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 688 szHint.flags |= USSize;
731 } 689 }
732 690
733 if (flags & XValue) 691 if (flags & XValue)
734 { 692 {
… …
765 max_width = MAX_COLS * fwidth; 723 max_width = MAX_COLS * fwidth;
766 max_height = MAX_ROWS * fheight; 724 max_height = MAX_ROWS * fheight;
767 725
768 szHint.base_width = szHint.base_height = 2 * int_bwidth; 726 szHint.base_width = szHint.base_height = 2 * int_bwidth;
769 727
770 sb_w = mb_h = 0; 728 sb_w = 0;
771 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
772 730
773 if (scrollbar_visible ()) 731 if (scrollBar.state)
774 { 732 {
775 sb_w = scrollbar_TotalWidth (); 733 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 735 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 736 window_vt_x += sb_w;
779 }
780
781 if (menubar_visible ())
782 {
783 mb_h = menuBar_TotalHeight ();
784 szHint.base_height += mb_h;
785 window_vt_y += mb_h;
786 } 737 }
787 738
788 szHint.width_inc = fwidth; 739 szHint.width_inc = fwidth;
789 szHint.height_inc = fheight; 740 szHint.height_inc = fheight;
790 szHint.min_width = szHint.base_width + szHint.width_inc; 741 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
795 szHint.width = newwidth; 746 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 747 width = newwidth - szHint.base_width;
797 } 748 }
798 else 749 else
799 { 750 {
800 MIN_IT (width, max_width); 751 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 752 szHint.width = szHint.base_width + width;
802 } 753 }
803 754
804 if (newheight && newheight - szHint.base_height < max_height) 755 if (newheight && newheight - szHint.base_height < max_height)
805 { 756 {
806 szHint.height = newheight; 757 szHint.height = newheight;
807 height = newheight - szHint.base_height; 758 height = newheight - szHint.base_height;
808 } 759 }
809 else 760 else
810 { 761 {
811 MIN_IT (height, max_height); 762 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 763 szHint.height = szHint.base_height + height;
813 } 764 }
814 765
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 766 if (scrollBar.state && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 767 window_sb_x = szHint.width - sb_w;
817 768
818 if (recalc_x) 769 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 771 if (recalc_y)
… …
834 * Called after a window size change. 785 * Called after a window size change.
835 */ 786 */
836void 787void
837rxvt_term::tt_winch () 788rxvt_term::tt_winch ()
838{ 789{
839 if (pty.pty < 0) 790 if (pty->pty < 0)
840 return; 791 return;
841 792
842 struct winsize ws; 793 struct winsize ws;
843 794
844 ws.ws_col = ncol; 795 ws.ws_col = ncol;
845 ws.ws_row = nrow; 796 ws.ws_row = nrow;
846 ws.ws_xpixel = width; 797 ws.ws_xpixel = width;
847 ws.ws_ypixel = height; 798 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 800
850#if 0 801#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
853 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
… …
889 prop.height += lineSpace; 840 prop.height += lineSpace;
890 fs->set_prop (prop); 841 fs->set_prop (prop);
891 842
892 fwidth = prop.width; 843 fwidth = prop.width;
893 fheight = prop.height; 844 fheight = prop.height;
894 fweight = prop.weight; 845 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 846
898 for (int style = 1; style < 4; style++) 847 for (int style = 1; style < 4; style++)
899 { 848 {
900#if ENABLE_STYLES 849#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 850 const char *res = rs[Rs_font + style];
… …
935 return true; 884 return true;
936} 885}
937 886
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 887void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 888{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 889 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 890 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 891 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 892}
945 893
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 895{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 896 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 897 char *s = rxvt_wcstoutf8 (ws);
951 898
952 XChangeProperty (display->display, parent[0], 899 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 941 i = atoi (color);
995 942
996 if (i >= 8 && i <= 15) 943 if (i >= 8 && i <= 15)
997 { /* bright colors */ 944 { /* bright colors */
998 i -= 8; 945 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 947 SET_PIXCOLOR (idx);
1002 goto done; 948 goto done;
1003# endif
1004 } 949 }
1005 950
1006 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 952 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1181 1126
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1128
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1129 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1130 {
1186 if (scrollbar_visible ()) 1131 if (scrollBar.state)
1187 { 1132 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1133 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1134 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1135 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1136 resize_scrollbar ();
1192 } 1137 }
1193 1138
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1139 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1140 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1141 width, height);
1202 1142
1203 scr_clear (); 1143 scr_clear ();
1204#ifdef XPM_BACKGROUND 1144#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1145 resize_pixmap ();
1206#endif 1146#endif
… …
1386 XRectangle rect, status_rect, needed_rect; 1326 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1327 unsigned long fg, bg;
1388 const char *p; 1328 const char *p;
1389 char **s; 1329 char **s;
1390 XIMStyles *xim_styles; 1330 XIMStyles *xim_styles;
1331
1332 set_environ (envv);
1391 1333
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1335 return false;
1394 1336
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1561 int i; 1503 int i;
1562 const char *p; 1504 const char *p;
1563 char **s; 1505 char **s;
1564 char buf[IMBUFSIZ]; 1506 char buf[IMBUFSIZ];
1565 1507
1566 SET_R (this); 1508 make_current ();
1567 1509
1568 im_destroy (); 1510 im_destroy ();
1569 1511
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1513 if (Input_Context)
… …
1648 XFree (preedit_attr); 1590 XFree (preedit_attr);
1649 XFree (status_attr); 1591 XFree (status_attr);
1650} 1592}
1651#endif /* USE_XIM */ 1593#endif /* USE_XIM */
1652 1594
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1595/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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