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.197 by root, Sun Jan 22 20:39:47 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),
… …
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 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
212 222
213 selection_clear (); 223 selection_clear ();
214 224
215#ifdef USE_XIM 225#ifdef USE_XIM
216 im_destroy (); 226 im_destroy ();
217#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif 227#endif
221#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
224#endif 231#endif
… …
235 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
239#endif 246#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 251#endif
245 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
246 253
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; 254 delete drawable;
253 // destroy all windows 255 // destroy all windows
254 if (parent[0]) 256 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
256 } 258 }
257 259
258 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 261 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
263#endif 264#endif
264 265
… …
286#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
287 delete keyboard; 288 delete keyboard;
288#endif 289#endif
289} 290}
290 291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
302}
303
291void 304void
292rxvt_term::destroy () 305rxvt_term::destroy ()
293{ 306{
294 if (destroy_ev.active) 307 if (destroy_ev.active)
295 return; 308 return;
296 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
297#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
298 scr_overlay_off (); 314 scr_overlay_off ();
299#endif 315#endif
300 316
301 if (display) 317 if (display)
… …
303#if USE_XIM 319#if USE_XIM
304 im_ev.stop (display); 320 im_ev.stop (display);
305#endif 321#endif
306#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
308#endif
309#if MENUBAR
310 menubar_ev.stop (display);
311#endif 324#endif
312#if TRANSPARENT 325#if TRANSPARENT
313 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
314#endif 327#endif
315 incr_ev.stop (); 328 incr_ev.stop ();
… …
339} 352}
340 353
341void 354void
342rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
343{ 356{
344 SET_R (this); 357 make_current ();
345 358
346 delete this; 359 delete this;
347} 360}
348 361
349/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
437 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
438} 451}
439 452
440/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
441bool 454bool
442rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
443{ 456{
457 this->envv = envv;
458
444 SET_R (this); 459 SET_R (this);
445
446 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
447 462
448 if (!init_vars ()) 463 if (!init_vars ())
449 return false; 464 return false;
450 465
451 init_secondary (); 466 init_secondary ();
… …
454 469
455#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 471 keyboard->register_done ();
457#endif 472#endif
458 473
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 475 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 477#endif
466 478
479 pty = ptytty::create ();
480
467 create_windows (argc, argv); 481 create_windows (argc, argv);
468 482
469 dDisp; 483 dDisp;
470 484
471 init_xlocale (); 485 init_xlocale ();
472 486
473 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
474 488
475#if 0 489#if 0
476 XSynchronize (disp, True); 490 XSynchronize (disp, True);
477#endif 491#endif
478 492
479#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 494 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
482#endif 496#endif
483#if (MENUBAR_MAX)
484 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win);
486#endif
487#ifdef TRANSPARENT 497#ifdef TRANSPARENT
488 if (options & Opt_transparent) 498 if (OPTION (Opt_transparent))
489 { 499 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 501 check_our_parents ();
492 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
493 } 503 }
494#endif 504#endif
495 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
496 XMapWindow (disp, vt); 519 XMapWindow (disp, vt);
497 XMapWindow (disp, parent[0]); 520 XMapWindow (disp, parent[0]);
498 521
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; 522 return true;
510} 523}
511 524
512static struct sig_handlers 525static struct sig_handlers
513{ 526{
514 sig_watcher sw_chld, sw_term, sw_int; 527 sig_watcher sw_term, sw_int;
515 528
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 /* 529 /*
531 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
532 */ 531 */
533 void 532 void
534 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
540 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
542 } 541 }
543 542
544 sig_handlers () 543 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
548 { 546 {
549 } 547 }
550} sig_handlers; 548} sig_handlers;
551 549
550char **rxvt_environ; // startup environment
551
552void 552void
553rxvt_init () 553rxvt_init ()
554{ 554{
555 /* 555 ptytty::init ();
556 * Save and then give up any super-user privileges 556
557 * If we need privileges in any area then we must specifically request it. 557 rxvt_environ = environ;
558 * We should only need to be root in these cases:
559 * 1. write utmp entries on some systems
560 * 2. chown tty on some systems
561 */
562 rxvt_privileges (SAVE);
563 rxvt_privileges (IGNORE);
564 558
565 signal (SIGHUP, SIG_IGN); 559 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 560 signal (SIGPIPE, SIG_IGN);
567 561
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 562 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT); 563 sig_handlers.sw_int.start (SIGINT);
571 564
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 566 /* signal (SIGURG, SIG_DFL); */
574 567
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 569 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 570 XSetIOErrorHandler (rxvt_xioerror_handler);
571
572 XrmInitialize ();
578} 573}
579 574
580/* ------------------------------------------------------------------------- * 575/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 576 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 577 * ------------------------------------------------------------------------- */
… …
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 595 rxvt_fatal ("memory allocation failure. aborting.\n");
601 596
602 return p; 597 return p;
603} 598}
604 599
605void * 600void *
606rxvt_realloc (void *ptr, size_t size) 601rxvt_realloc (void *ptr, size_t size)
607{ 602{
608 void *p = realloc (ptr, size); 603 void *p = realloc (ptr, size);
609 604
610 if (!p) 605 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
612 607
613 return p; 608 return p;
614} 609}
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 610
690/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
691/* 612/*
692 * window size/position calculcations for XSizeHint and other storage. 613 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 614 * if width/height are non-zero then override calculated width/height
694 */ 615 */
695void 616void
696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 618{
698 short recalc_x, recalc_y; 619 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 620 int x, y, sb_w, flags;
700 unsigned int w, h; 621 unsigned int w, h;
701 unsigned int max_width, max_height; 622 unsigned int max_width, max_height;
702 dDisp; 623 dDisp;
703 624
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
718 if (rs[Rs_geometry]) 639 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 640 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 641
721 if (flags & WidthValue) 642 if (flags & WidthValue)
722 { 643 {
723 ncol = BOUND_POSITIVE_INT16 (w); 644 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 645 szHint.flags |= USSize;
725 } 646 }
726 647
727 if (flags & HeightValue) 648 if (flags & HeightValue)
728 { 649 {
729 nrow = BOUND_POSITIVE_INT16 (h); 650 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 651 szHint.flags |= USSize;
731 } 652 }
732 653
733 if (flags & XValue) 654 if (flags & XValue)
734 { 655 {
… …
765 max_width = MAX_COLS * fwidth; 686 max_width = MAX_COLS * fwidth;
766 max_height = MAX_ROWS * fheight; 687 max_height = MAX_ROWS * fheight;
767 688
768 szHint.base_width = szHint.base_height = 2 * int_bwidth; 689 szHint.base_width = szHint.base_height = 2 * int_bwidth;
769 690
770 sb_w = mb_h = 0; 691 sb_w = 0;
771 window_vt_x = window_vt_y = int_bwidth; 692 window_vt_x = window_vt_y = int_bwidth;
772 693
773 if (scrollbar_visible ()) 694 if (scrollBar.state)
774 { 695 {
775 sb_w = scrollbar_TotalWidth (); 696 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 697 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 698 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 699 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 } 700 }
787 701
788 szHint.width_inc = fwidth; 702 szHint.width_inc = fwidth;
789 szHint.height_inc = fheight; 703 szHint.height_inc = fheight;
790 szHint.min_width = szHint.base_width + szHint.width_inc; 704 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
795 szHint.width = newwidth; 709 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 710 width = newwidth - szHint.base_width;
797 } 711 }
798 else 712 else
799 { 713 {
800 MIN_IT (width, max_width); 714 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 715 szHint.width = szHint.base_width + width;
802 } 716 }
803 717
804 if (newheight && newheight - szHint.base_height < max_height) 718 if (newheight && newheight - szHint.base_height < max_height)
805 { 719 {
806 szHint.height = newheight; 720 szHint.height = newheight;
807 height = newheight - szHint.base_height; 721 height = newheight - szHint.base_height;
808 } 722 }
809 else 723 else
810 { 724 {
811 MIN_IT (height, max_height); 725 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 726 szHint.height = szHint.base_height + height;
813 } 727 }
814 728
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 729 if (scrollBar.state && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 730 window_sb_x = szHint.width - sb_w;
817 731
818 if (recalc_x) 732 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 734 if (recalc_y)
… …
834 * Called after a window size change. 748 * Called after a window size change.
835 */ 749 */
836void 750void
837rxvt_term::tt_winch () 751rxvt_term::tt_winch ()
838{ 752{
839 if (pty.pty < 0) 753 if (pty->pty < 0)
840 return; 754 return;
841 755
842 struct winsize ws; 756 struct winsize ws;
843 757
844 ws.ws_col = ncol; 758 ws.ws_col = ncol;
845 ws.ws_row = nrow; 759 ws.ws_row = nrow;
846 ws.ws_xpixel = width; 760 ws.ws_xpixel = width;
847 ws.ws_ypixel = height; 761 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 762 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 763
850#if 0 764#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 765 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 766 if (cmd_pid) /* force through to the command */
853 kill (-cmd_pid, SIGWINCH); 767 kill (-cmd_pid, SIGWINCH);
… …
889 prop.height += lineSpace; 803 prop.height += lineSpace;
890 fs->set_prop (prop); 804 fs->set_prop (prop);
891 805
892 fwidth = prop.width; 806 fwidth = prop.width;
893 fheight = prop.height; 807 fheight = prop.height;
894 fweight = prop.weight; 808 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 809
898 for (int style = 1; style < 4; style++) 810 for (int style = 1; style < 4; style++)
899 { 811 {
900#if ENABLE_STYLES 812#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 813 const char *res = rs[Rs_font + style];
… …
935 return true; 847 return true;
936} 848}
937 849
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 850void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 851{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 852 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 853 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 854 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 855}
945 856
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 858{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 859 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 860 char *s = rxvt_wcstoutf8 (ws);
951 861
952 XChangeProperty (display->display, parent[0], 862 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 904 i = atoi (color);
995 905
996 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
997 { /* bright colors */ 907 { /* bright colors */
998 i -= 8; 908 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 910 SET_PIXCOLOR (idx);
1002 goto done; 911 goto done;
1003# endif
1004 } 912 }
1005 913
1006 if (i >= 0 && i <= 7) 914 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 915 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1123 * -------------------------------------------------------------------- */ 1031 * -------------------------------------------------------------------- */
1124void 1032void
1125rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1126{ 1034{
1127 int fix_screen; 1035 int fix_screen;
1128 int old_width = szHint.width, old_height = szHint.height; 1036 int old_width = szHint.width;
1037 int old_height = szHint.height;
1129 dDisp; 1038 dDisp;
1130 1039
1131 window_calc (newwidth, newheight); 1040 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (disp, parent[0], &szHint);
1133 1042
… …
1155 { 1064 {
1156 x -= x1; 1065 x -= x1;
1157 y -= y1; 1066 y -= y1;
1158 } 1067 }
1159 1068
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1164 1073
1165 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1167 dx = 0; 1076 dx = 0;
… …
1181 1090
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1092
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1094 {
1186 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1187 { 1096 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1098 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1100 resize_scrollbar ();
1192 } 1101 }
1193 1102
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1105 width, height);
1202 1106
1203 scr_clear (); 1107 scr_clear ();
1204#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1109 resize_pixmap ();
1206#endif 1110#endif
1207 } 1111 }
1208 1112
1209 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1210 {
1211 int curr_screen = -1;
1212 int old_ncol = prev_ncol;
1213
1214 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */
1216 {
1217 unsigned int ocol = ncol;
1218 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY);
1220 ncol = ocol;
1221 }
1222
1223 scr_reset (); 1114 scr_reset ();
1224
1225 if (curr_screen >= 0) /* this is not the first time through */
1226 {
1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != ncol ? 4 : 0);
1229 }
1230 }
1231
1232 old_width = szHint.width;
1233 old_height = szHint.height;
1234 1115
1235#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1236 if (pixmap) 1117 if (pixmap)
1237 scr_touch (false); 1118 scr_touch (false);
1238#endif 1119#endif
… …
1386 XRectangle rect, status_rect, needed_rect; 1267 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1268 unsigned long fg, bg;
1388 const char *p; 1269 const char *p;
1389 char **s; 1270 char **s;
1390 XIMStyles *xim_styles; 1271 XIMStyles *xim_styles;
1272
1273 set_environ (envv);
1391 1274
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1276 return false;
1394 1277
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1561 int i; 1444 int i;
1562 const char *p; 1445 const char *p;
1563 char **s; 1446 char **s;
1564 char buf[IMBUFSIZ]; 1447 char buf[IMBUFSIZ];
1565 1448
1566 SET_R (this); 1449 make_current ();
1567 1450
1568 im_destroy (); 1451 im_destroy ();
1569 1452
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1453 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1454 if (Input_Context)
… …
1648 XFree (preedit_attr); 1531 XFree (preedit_attr);
1649 XFree (status_attr); 1532 XFree (status_attr);
1650} 1533}
1651#endif /* USE_XIM */ 1534#endif /* USE_XIM */
1652 1535
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1536/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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