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.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.185 by root, Tue Jan 17 15:17:39 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 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
50# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
51#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
52 65
53vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
54 67
55static char curlocale[128]; 68static char curlocale[128], savelocale[128];
56 69
57bool 70bool
58rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
59{ 72{
60 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 74 return false;
62 75
63 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
65 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
66} 92}
67 93
68#if ENABLE_COMBINING 94#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
70 96
… …
134#if TRANSPARENT 160#if TRANSPARENT
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
136#endif 162#endif
137#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif 165#endif
143#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 168#endif
146#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
190 213
191#ifdef UTMP_SUPPORT 214#ifdef UTMP_SUPPORT
192 privileged_utmp (RESTORE); 215 privileged_utmp (RESTORE);
193#endif 216#endif
194 217
195 pty.put (); 218 delete pty; pty = 0;
196} 219}
197 220
198rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
199{ 222{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 225 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 226
202 emergency_cleanup (); 227 emergency_cleanup ();
203 228
204#if ENABLE_STYLES 229#if ENABLE_STYLES
… …
214 239
215 selection_clear (); 240 selection_clear ();
216 241
217#ifdef USE_XIM 242#ifdef USE_XIM
218 im_destroy (); 243 im_destroy ();
219#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif 244#endif
223#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
226#endif 248#endif
… …
237 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
241#endif 263#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246#endif 268#endif
247 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
248 270
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; 271 delete drawable;
255 // destroy all windows 272 // destroy all windows
256 if (parent[0]) 273 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
258 } 275 }
259 276
260 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 278 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
265#endif 281#endif
266 282
… …
289 delete keyboard; 305 delete keyboard;
290#endif 306#endif
291} 307}
292 308
293void 309void
310rxvt_term::child_exit ()
311{
312 cmd_pid = 0;
313
314 if (!OPTION (Opt_hold))
315 destroy ();
316}
317
318void
294rxvt_term::destroy () 319rxvt_term::destroy ()
295{ 320{
296 if (destroy_ev.active) 321 if (destroy_ev.active)
297 return; 322 return;
298 323
… …
305#if USE_XIM 330#if USE_XIM
306 im_ev.stop (display); 331 im_ev.stop (display);
307#endif 332#endif
308#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
309 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
310#endif
311#if MENUBAR
312 menubar_ev.stop (display);
313#endif 335#endif
314#if TRANSPARENT 336#if TRANSPARENT
315 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
316#endif 338#endif
317 incr_ev.stop (); 339 incr_ev.stop ();
… …
341} 363}
342 364
343void 365void
344rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
345{ 367{
346 SET_R (this); 368 make_current ();
347 369
348 delete this; 370 delete this;
349} 371}
350 372
351/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
442/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
443bool 465bool
444rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
445{ 467{
446 SET_R (this); 468 SET_R (this);
447
448 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
449 471
450 if (!init_vars ()) 472 if (!init_vars ())
451 return false; 473 return false;
452 474
453 init_secondary (); 475 init_secondary ();
… …
456 478
457#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
458 keyboard->register_done (); 480 keyboard->register_done ();
459#endif 481#endif
460 482
461#if MENUBAR_MAX
462 menubar_read (rs[Rs_menu]);
463#endif
464#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
465 if (options & Opt_scrollBar) 484 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 486#endif
468 487
488#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 pty = rxvt_new_ptytty ();
515
469 create_windows (argc, argv); 516 create_windows (argc, argv);
470 517
471 dDisp; 518 dDisp;
472 519
473 init_xlocale (); 520 init_xlocale ();
474 521
475 scr_reset (); /* initialize screen */ 522 scr_reset (); // initialize screen
476 523
477#if 0 524#if 0
478 XSynchronize (disp, True); 525 XSynchronize (disp, True);
479#endif 526#endif
480 527
481#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 529 if (OPTION (Opt_scrollBar))
483 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
484#endif 531#endif
485#if (MENUBAR_MAX)
486 if (menubar_visible ())
487 XMapWindow (disp, menuBar.win);
488#endif
489#ifdef TRANSPARENT 532#ifdef TRANSPARENT
490 if (options & Opt_transparent) 533 if (OPTION (Opt_transparent))
491 { 534 {
492 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
493 check_our_parents (); 536 check_our_parents ();
494 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
495 } 538 }
… …
502 545
503 init_command (cmd_argv); 546 init_command (cmd_argv);
504 547
505 free (cmd_argv); 548 free (cmd_argv);
506 549
550 if (pty->pty >= 0)
507 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
508 552
509 check_ev.start (); 553 check_ev.start ();
554
555 HOOK_INVOKE ((this, HOOK_START, DT_END));
510 556
511 return true; 557 return true;
512} 558}
513 559
514static struct sig_handlers 560static struct sig_handlers
… …
522 568
523 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525 if (pid == (*t)->cmd_pid) 571 if (pid == (*t)->cmd_pid)
526 { 572 {
527 (*t)->destroy (); 573 (*t)->child_exit ();
528 break; 574 break;
529 } 575 }
530 } 576 }
531 577
532 /* 578 /*
… …
549 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
550 { 596 {
551 } 597 }
552} sig_handlers; 598} sig_handlers;
553 599
600char **rxvt_environ; // startup environment
601
554void 602void
555rxvt_init () 603rxvt_init ()
556{ 604{
605 rxvt_environ = environ;
606
557 /* 607 /*
558 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
559 * If we need privileges in any area then we must specifically request it. 609 * If we need privileges in any area then we must specifically request it.
560 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
561 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
575 /* signal (SIGURG, SIG_DFL); */ 625 /* signal (SIGURG, SIG_DFL); */
576 626
577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
579 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
630
631 XrmInitialize ();
580} 632}
581 633
582/* ------------------------------------------------------------------------- * 634/* ------------------------------------------------------------------------- *
583 * MEMORY ALLOCATION WRAPPERS * 635 * MEMORY ALLOCATION WRAPPERS *
584 * ------------------------------------------------------------------------- */ 636 * ------------------------------------------------------------------------- */
… …
620 * ------------------------------------------------------------------------- */ 672 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */ 673/* take care of suid/sgid super-user (root) privileges */
622void 674void
623rxvt_privileges (rxvt_privaction action) 675rxvt_privileges (rxvt_privaction action)
624{ 676{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__) 677#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */ 679 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a)) 680# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a)) 681# define setegid(a) setregid(-1, (a))
… …
640 case IGNORE: 687 case IGNORE:
641 /* 688 /*
642 * change effective uid/gid - not real uid/gid - so we can switch 689 * change effective uid/gid - not real uid/gid - so we can switch
643 * back to root later, as required 690 * back to root later, as required
644 */ 691 */
692 setegid (getgid ());
645 seteuid (getuid ()); 693 seteuid (getuid ());
646 setegid (getgid ());
647 break; 694 break;
648 case SAVE: 695 case SAVE:
649 euid = geteuid ();
650 egid = getegid (); 696 saved_egid = getegid ();
697 saved_euid = geteuid ();
651 break; 698 break;
652 case RESTORE: 699 case RESTORE:
653 seteuid (euid);
654 setegid (egid); 700 setegid (saved_egid);
701 seteuid (saved_euid);
655 break; 702 break;
656 } 703 }
657# else 704# else
658 switch (action) 705 switch (action)
659 { 706 {
660 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
661 setuid (getuid ()); 709 setuid (getuid ());
662 setgid (getgid ());
663 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
664 case SAVE: 711 case SAVE:
665 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
666 case RESTORE: 713 case RESTORE:
667 break; 714 break;
668 } 715 }
669# endif 716# endif
670#endif 717#endif
671} 718}
672 719
673#ifdef UTMP_SUPPORT
674void
675rxvt_term::privileged_utmp (rxvt_privaction action)
676{
677 if ((options & Opt_utmpInhibit)
678 || !pty.name || !*pty.name)
679 return;
680
681 rxvt_privileges (RESTORE);
682
683 if (action == SAVE)
684 makeutent (pty.name, rs[Rs_display_name]);
685 else
686 cleanutent ();
687
688 rxvt_privileges (IGNORE);
689}
690#endif
691
692/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
693/* 721/*
694 * window size/position calculcations for XSizeHint and other storage. 722 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 723 * if width/height are non-zero then override calculated width/height
696 */ 724 */
697void 725void
698rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 727{
700 short recalc_x, recalc_y; 728 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 729 int x, y, sb_w, flags;
702 unsigned int w, h; 730 unsigned int w, h;
703 unsigned int max_width, max_height; 731 unsigned int max_width, max_height;
704 dDisp; 732 dDisp;
705 733
706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
767 max_width = MAX_COLS * fwidth; 795 max_width = MAX_COLS * fwidth;
768 max_height = MAX_ROWS * fheight; 796 max_height = MAX_ROWS * fheight;
769 797
770 szHint.base_width = szHint.base_height = 2 * int_bwidth; 798 szHint.base_width = szHint.base_height = 2 * int_bwidth;
771 799
772 sb_w = mb_h = 0; 800 sb_w = 0;
773 window_vt_x = window_vt_y = int_bwidth; 801 window_vt_x = window_vt_y = int_bwidth;
774 802
775 if (scrollbar_visible ()) 803 if (scrollBar.state)
776 { 804 {
777 sb_w = scrollbar_TotalWidth (); 805 sb_w = scrollbar_TotalWidth ();
778 szHint.base_width += sb_w; 806 szHint.base_width += sb_w;
779 if (!(options & Opt_scrollBar_right)) 807 if (!OPTION (Opt_scrollBar_right))
780 window_vt_x += sb_w; 808 window_vt_x += sb_w;
781 }
782
783 if (menubar_visible ())
784 {
785 mb_h = menuBar_TotalHeight ();
786 szHint.base_height += mb_h;
787 window_vt_y += mb_h;
788 } 809 }
789 810
790 szHint.width_inc = fwidth; 811 szHint.width_inc = fwidth;
791 szHint.height_inc = fheight; 812 szHint.height_inc = fheight;
792 szHint.min_width = szHint.base_width + szHint.width_inc; 813 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
812 { 833 {
813 min_it (height, max_height); 834 min_it (height, max_height);
814 szHint.height = szHint.base_height + height; 835 szHint.height = szHint.base_height + height;
815 } 836 }
816 837
817 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 838 if (scrollBar.state && OPTION (Opt_scrollBar_right))
818 window_sb_x = szHint.width - sb_w; 839 window_sb_x = szHint.width - sb_w;
819 840
820 if (recalc_x) 841 if (recalc_x)
821 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
822 if (recalc_y) 843 if (recalc_y)
… …
836 * Called after a window size change. 857 * Called after a window size change.
837 */ 858 */
838void 859void
839rxvt_term::tt_winch () 860rxvt_term::tt_winch ()
840{ 861{
841 if (pty.pty < 0) 862 if (pty->pty < 0)
842 return; 863 return;
843 864
844 struct winsize ws; 865 struct winsize ws;
845 866
846 ws.ws_col = ncol; 867 ws.ws_col = ncol;
847 ws.ws_row = nrow; 868 ws.ws_row = nrow;
848 ws.ws_xpixel = width; 869 ws.ws_xpixel = width;
849 ws.ws_ypixel = height; 870 ws.ws_ypixel = height;
850 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 871 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
851 872
852#if 0 873#if 0
853 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 874 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
854 if (cmd_pid) /* force through to the command */ 875 if (cmd_pid) /* force through to the command */
855 kill (-cmd_pid, SIGWINCH); 876 kill (-cmd_pid, SIGWINCH);
… …
891 prop.height += lineSpace; 912 prop.height += lineSpace;
892 fs->set_prop (prop); 913 fs->set_prop (prop);
893 914
894 fwidth = prop.width; 915 fwidth = prop.width;
895 fheight = prop.height; 916 fheight = prop.height;
896 fbase = (*fs)[1]->ascent; 917 fbase = prop.ascent;
897 918
898 for (int style = 1; style < 4; style++) 919 for (int style = 1; style < 4; style++)
899 { 920 {
900#if ENABLE_STYLES 921#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 922 const char *res = rs[Rs_font + style];
… …
935 return true; 956 return true;
936} 957}
937 958
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 959void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 960{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 961 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 962 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 963 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 964}
945 965
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 967{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 968 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 969 char *s = rxvt_wcstoutf8 (ws);
951 970
952 XChangeProperty (display->display, parent[0], 971 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 1013 i = atoi (color);
995 1014
996 if (i >= 8 && i <= 15) 1015 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1016 { /* bright colors */
998 i -= 8; 1017 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1019 SET_PIXCOLOR (idx);
1002 goto done; 1020 goto done;
1003# endif
1004 } 1021 }
1005 1022
1006 if (i >= 0 && i <= 7) 1023 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1024 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1181 1198
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1200
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1201 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1202 {
1186 if (scrollbar_visible ()) 1203 if (scrollBar.state)
1187 { 1204 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1205 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1206 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1207 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1208 resize_scrollbar ();
1192 } 1209 }
1193 1210
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1211 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1212 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1213 width, height);
1202 1214
1203 scr_clear (); 1215 scr_clear ();
1204#ifdef XPM_BACKGROUND 1216#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1217 resize_pixmap ();
1206#endif 1218#endif
… …
1386 XRectangle rect, status_rect, needed_rect; 1398 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1399 unsigned long fg, bg;
1388 const char *p; 1400 const char *p;
1389 char **s; 1401 char **s;
1390 XIMStyles *xim_styles; 1402 XIMStyles *xim_styles;
1403
1404 set_environ (envv);
1391 1405
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1407 return false;
1394 1408
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1561 int i; 1575 int i;
1562 const char *p; 1576 const char *p;
1563 char **s; 1577 char **s;
1564 char buf[IMBUFSIZ]; 1578 char buf[IMBUFSIZ];
1565 1579
1566 SET_R (this); 1580 make_current ();
1567 1581
1568 im_destroy (); 1582 im_destroy ();
1569 1583
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1585 if (Input_Context)

Diff Legend

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