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.137 by root, Tue Feb 15 16:04:45 2005 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19: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 "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
49# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
50#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}
51 65
52vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
53 67
54static char curlocale[128]; 68static char curlocale[128], savelocale[128];
55 69
56bool 70bool
57rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
58{ 72{
59 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 74 return false;
61 75
62 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
64 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);
65} 92}
66 93
67#if ENABLE_COMBINING 94#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
69 96
… …
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 162#endif
136#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 165#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 168#endif
145#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 170 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 183#endif
160#ifdef USE_XIM 184#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 185 im_ev (this, &rxvt_term::im_cb),
162#endif 186#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
166 termwin_ev (this, &rxvt_term::x_cb), 187 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 188 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 190 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 191 destroy_ev (this, &rxvt_term::destroy_cb),
… …
197 pty.put (); 218 pty.put ();
198} 219}
199 220
200rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
201{ 222{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 225 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 226
204 emergency_cleanup (); 227 emergency_cleanup ();
205 228
206#if ENABLE_STYLES 229#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 230 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 231 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 232 delete fontset[i];
210#endif 233#endif
211 delete TermWin.fontset[0]; 234 delete fontset[0];
212 235
213 if (display) 236 if (display)
214 { 237 {
215 dDisp; 238 dDisp;
216 239
217 selection_clear (); 240 selection_clear ();
218 241
219#ifdef USE_XIM 242#ifdef USE_XIM
220 im_destroy (); 243 im_destroy ();
221#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif 244#endif
225#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
228#endif 248#endif
… …
239 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
243#endif 263#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 268#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 269 if (gc) XFreeGC (disp, gc);
250 270
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 271 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 272 // destroy all windows
258 if (TermWin.parent[0] 273 if (parent[0])
259#if ENABLE_FRILLS
260 && !rs[Rs_embed]
261#endif
262 )
263 XDestroyWindow (disp, TermWin.parent[0]); 274 XDestroyWindow (disp, parent[0]);
264 } 275 }
265 276
266 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
267
268 delete pix_colors_focused; 278 delete pix_colors_focused;
269#ifdef OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
270 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
271#endif 281#endif
272 282
273 displays.put (display); 283 displays.put (display);
274 284
… …
295 delete keyboard; 305 delete keyboard;
296#endif 306#endif
297} 307}
298 308
299void 309void
310rxvt_term::child_exit ()
311{
312 cmd_pid = 0;
313
314 if (!OPTION (Opt_hold))
315 destroy ();
316}
317
318void
300rxvt_term::destroy () 319rxvt_term::destroy ()
301{ 320{
302 if (destroy_ev.active) 321 if (destroy_ev.active)
303 return; 322 return;
304 323
… …
311#if USE_XIM 330#if USE_XIM
312 im_ev.stop (display); 331 im_ev.stop (display);
313#endif 332#endif
314#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
316#endif
317#if MENUBAR
318 menubar_ev.stop (display);
319#endif 335#endif
320#if TRANSPARENT 336#if TRANSPARENT
321 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
322#endif 338#endif
323 incr_ev.stop (); 339 incr_ev.stop ();
… …
347} 363}
348 364
349void 365void
350rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
351{ 367{
352 SET_R (this); 368 make_current ();
353 369
354 delete this; 370 delete this;
355} 371}
356 372
357/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
422{ 438{
423 if (GET_R->allowedxerror == -1) 439 if (GET_R->allowedxerror == -1)
424 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
425 else 441 else
426 { 442 {
427 //TODO: GET_R is most likely not the terminal which caused the error 443 // GET_R is most likely not the terminal which caused the error,
428 //TODO: maybe just output the error and continue? 444 // so just output the error and continue
429#if ENABLE_FRILLS 445#if ENABLE_FRILLS
430 print_x_error (display, event); 446 print_x_error (display, event);
431#else 447#else
432 old_xerror_handler (display, event); 448 old_xerror_handler (display, event);
433#endif 449#endif
… …
443 DisplayString (display)); 459 DisplayString (display));
444 rxvt_emergency_cleanup (); 460 rxvt_emergency_cleanup ();
445 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
446} 462}
447 463
448/*
449 * Catch a fatal signal and tidy up before quitting
450 */
451void
452rxvt_term::sig_term (sig_watcher &w)
453{
454#ifdef DEBUG_CMD
455 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
456#endif
457 rxvt_emergency_cleanup ();
458 signal (w.signum, SIG_DFL);
459 kill (getpid (), w.signum);
460}
461
462/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
463/* rxvt_init () */
464bool 465bool
465rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
466{ 467{
467 SET_R (this); 468 SET_R (this);
468
469 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
470 471
471 if (!init_vars ()) 472 if (!init_vars ())
472 return false; 473 return false;
473 474
474 init_secondary (); 475 init_secondary ();
… …
477 478
478#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
479 keyboard->register_done (); 480 keyboard->register_done ();
480#endif 481#endif
481 482
482#if MENUBAR_MAX
483 menubar_read (rs[Rs_menu]);
484#endif
485#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
486 if (options & Opt_scrollBar) 484 if (OPTION (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 486#endif
489 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
490 create_windows (argc, argv); 514 create_windows (argc, argv);
491 515
492 dDisp; 516 dDisp;
493 517
494 init_xlocale (); 518 init_xlocale ();
495 519
496 scr_reset (); /* initialize screen */ 520 scr_reset (); // initialize screen
497 521
498#if 0 522#if 0
499 XSynchronize (disp, True); 523 XSynchronize (disp, True);
500#endif 524#endif
501 525
502#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
503 if (options & Opt_scrollBar) 527 if (OPTION (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
505#endif 529#endif
506#if (MENUBAR_MAX)
507 if (menubar_visible ())
508 XMapWindow (disp, menuBar.win);
509#endif
510#ifdef TRANSPARENT 530#ifdef TRANSPARENT
511 if (options & Opt_transparent) 531 if (OPTION (Opt_transparent))
512 { 532 {
513 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
514 check_our_parents (); 534 check_our_parents ();
515 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
516 } 536 }
517#endif 537#endif
518 538
519 XMapWindow (disp, TermWin.vt); 539 XMapWindow (disp, vt);
520 XMapWindow (disp, TermWin.parent[0]); 540 XMapWindow (disp, parent[0]);
521 541
522 set_colorfgbg (); 542 set_colorfgbg ();
523 543
524 init_command (cmd_argv); 544 init_command (cmd_argv);
525 545
526 free (cmd_argv); 546 free (cmd_argv);
527 547
548 if (pty.pty >= 0)
528 pty_ev.start (pty.pty, EVENT_READ); 549 pty_ev.start (pty.pty, EVENT_READ);
529 550
530 check_ev.start (); 551 check_ev.start ();
531 552
553 HOOK_INVOKE ((this, HOOK_START, DT_END));
554
532 return true; 555 return true;
533} 556}
534 557
558static struct sig_handlers
559{
560 sig_watcher sw_chld, sw_term, sw_int;
561
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /*
577 * Catch a fatal signal and tidy up before quitting
578 */
579 void
580 sig_term (sig_watcher &w)
581 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum);
588 }
589
590 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term)
594 {
595 }
596} sig_handlers;
597
598char **rxvt_environ; // startup environment
599
535void 600void
536rxvt_init () 601rxvt_init ()
537{ 602{
603 rxvt_environ = environ;
604
538 /* 605 /*
539 * Save and then give up any super-user privileges 606 * Save and then give up any super-user privileges
540 * If we need privileges in any area then we must specifically request it. 607 * If we need privileges in any area then we must specifically request it.
541 * We should only need to be root in these cases: 608 * We should only need to be root in these cases:
542 * 1. write utmp entries on some systems 609 * 1. write utmp entries on some systems
… …
546 rxvt_privileges (IGNORE); 613 rxvt_privileges (IGNORE);
547 614
548 signal (SIGHUP, SIG_IGN); 615 signal (SIGHUP, SIG_IGN);
549 signal (SIGPIPE, SIG_IGN); 616 signal (SIGPIPE, SIG_IGN);
550 617
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT);
621
551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
552 /* signal (SIGURG, SIG_DFL); */ 623 /* signal (SIGURG, SIG_DFL); */
553 624
554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 625 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
555 // TODO: handle this with exceptions and tolerate the memory loss 626 // TODO: handle this with exceptions and tolerate the memory loss
556 XSetIOErrorHandler (rxvt_xioerror_handler); 627 XSetIOErrorHandler (rxvt_xioerror_handler);
557}
558 628
559/* ------------------------------------------------------------------------- * 629 XrmInitialize ();
560 * SIGNAL HANDLING & EXIT HANDLER *
561 * ------------------------------------------------------------------------- */
562/*
563 * Catch a SIGCHLD signal and exit if the direct child has died
564 */
565
566void
567rxvt_term::sig_chld (sig_watcher &w)
568{
569 // we are being called for every SIGCHLD, not just ours
570 int pid;
571
572 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
573 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
574 if (pid == (*t)->cmd_pid)
575 {
576 (*t)->destroy ();
577 break;
578 }
579} 630}
580 631
581/* ------------------------------------------------------------------------- * 632/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS * 633 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */ 634 * ------------------------------------------------------------------------- */
… …
590 rxvt_fatal ("memory allocation failure. aborting.\n"); 641 rxvt_fatal ("memory allocation failure. aborting.\n");
591 642
592 return p; 643 return p;
593} 644}
594 645
595/* INTPROTO */ 646void *
596void *
597rxvt_calloc (size_t number, size_t size) 647rxvt_calloc (size_t number, size_t size)
598{ 648{
599 void *p = calloc (number, size); 649 void *p = calloc (number, size);
600 650
601 if (!p) 651 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n"); 652 rxvt_fatal ("memory allocation failure. aborting.\n");
603 653
604 return p; 654 return p;
605} 655}
606 656
607/* INTPROTO */
608void * 657void *
609rxvt_realloc (void *ptr, size_t size) 658rxvt_realloc (void *ptr, size_t size)
610{ 659{
611 void *p = realloc (ptr, size); 660 void *p = realloc (ptr, size);
612 661
… …
621 * ------------------------------------------------------------------------- */ 670 * ------------------------------------------------------------------------- */
622/* take care of suid/sgid super-user (root) privileges */ 671/* take care of suid/sgid super-user (root) privileges */
623void 672void
624rxvt_privileges (rxvt_privaction action) 673rxvt_privileges (rxvt_privaction action)
625{ 674{
626#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
627 static uid_t euid;
628 static gid_t egid;
629#endif
630
631#if ! defined(__CYGWIN32__) 675#if ! defined(__CYGWIN32__)
632# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
633 /* setreuid () is the poor man's setuid (), seteuid () */ 677 /* setreuid () is the poor man's setuid (), seteuid () */
634# define seteuid(a) setreuid(-1, (a)) 678# define seteuid(a) setreuid(-1, (a))
635# define setegid(a) setregid(-1, (a)) 679# define setegid(a) setregid(-1, (a))
… …
641 case IGNORE: 685 case IGNORE:
642 /* 686 /*
643 * change effective uid/gid - not real uid/gid - so we can switch 687 * change effective uid/gid - not real uid/gid - so we can switch
644 * back to root later, as required 688 * back to root later, as required
645 */ 689 */
690 setegid (getgid ());
646 seteuid (getuid ()); 691 seteuid (getuid ());
647 setegid (getgid ());
648 break; 692 break;
649 case SAVE: 693 case SAVE:
650 euid = geteuid ();
651 egid = getegid (); 694 saved_egid = getegid ();
695 saved_euid = geteuid ();
652 break; 696 break;
653 case RESTORE: 697 case RESTORE:
654 seteuid (euid);
655 setegid (egid); 698 setegid (saved_egid);
699 seteuid (saved_euid);
656 break; 700 break;
657 } 701 }
658# else 702# else
659 switch (action) 703 switch (action)
660 { 704 {
661 case IGNORE: 705 case IGNORE:
706 setgid (getgid ());
662 setuid (getuid ()); 707 setuid (getuid ());
663 setgid (getgid ());
664 /* FALLTHROUGH */ 708 /* FALLTHROUGH */
665 case SAVE: 709 case SAVE:
666 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
667 case RESTORE: 711 case RESTORE:
668 break; 712 break;
… …
673 717
674#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
675void 719void
676rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
677{ 721{
678 if ((options & Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit))
679 || !pty.name || !*pty.name)
680 return; 723 return;
681 724
682 rxvt_privileges (RESTORE); 725 rxvt_privileges (RESTORE);
683 726
684 if (action == SAVE) 727 if (action == SAVE)
685 makeutent (pty.name, rs[Rs_display_name]); 728 pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
686 else 729 else
687 cleanutent (); 730 pty.logout ();
688 731
689 rxvt_privileges (IGNORE); 732 rxvt_privileges (IGNORE);
690} 733}
691#endif 734#endif
692 735
… …
694/* 737/*
695 * window size/position calculcations for XSizeHint and other storage. 738 * window size/position calculcations for XSizeHint and other storage.
696 * if width/height are non-zero then override calculated width/height 739 * if width/height are non-zero then override calculated width/height
697 */ 740 */
698void 741void
699rxvt_term::window_calc (unsigned int width, unsigned int height) 742rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
700{ 743{
701 short recalc_x, recalc_y; 744 short recalc_x, recalc_y;
702 int x, y, sb_w, mb_h, flags; 745 int x, y, sb_w, flags;
703 unsigned int w, h; 746 unsigned int w, h;
704 unsigned int max_width, max_height; 747 unsigned int max_width, max_height;
705 dDisp; 748 dDisp;
706 749
707 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 750 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
708 TermWin.ncol, TermWin.nrow, szHint.width, 751 ncol, nrow, szHint.width, szHint.height));
709 szHint.height)); 752
710 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 753 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
711 szHint.win_gravity = NorthWestGravity; 754 szHint.win_gravity = NorthWestGravity;
712 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 755 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
713 756
714 recalc_x = recalc_y = 0; 757 recalc_x = recalc_y = 0;
715 flags = 0; 758 flags = 0;
759
716 if (!parsed_geometry) 760 if (!parsed_geometry)
717 { 761 {
718 parsed_geometry = 1; 762 parsed_geometry = 1;
763
719 if (rs[Rs_geometry]) 764 if (rs[Rs_geometry])
720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 765 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721 766
722 if (flags & WidthValue) 767 if (flags & WidthValue)
723 { 768 {
724 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 769 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 770 szHint.flags |= USSize;
726 } 771 }
727 772
728 if (flags & HeightValue) 773 if (flags & HeightValue)
729 { 774 {
730 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 775 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
731 szHint.flags |= USSize; 776 szHint.flags |= USSize;
732 } 777 }
733 778
734 if (flags & XValue) 779 if (flags & XValue)
735 { 780 {
736 szHint.x = x; 781 szHint.x = x;
737 szHint.flags |= USPosition; 782 szHint.flags |= USPosition;
783
738 if (flags & XNegative) 784 if (flags & XNegative)
739 { 785 {
740 recalc_x = 1; 786 recalc_x = 1;
741 szHint.win_gravity = NorthEastGravity; 787 szHint.win_gravity = NorthEastGravity;
742 } 788 }
… …
744 790
745 if (flags & YValue) 791 if (flags & YValue)
746 { 792 {
747 szHint.y = y; 793 szHint.y = y;
748 szHint.flags |= USPosition; 794 szHint.flags |= USPosition;
795
749 if (flags & YNegative) 796 if (flags & YNegative)
750 { 797 {
751 recalc_y = 1; 798 recalc_y = 1;
799
752 if (szHint.win_gravity == NorthEastGravity) 800 if (szHint.win_gravity == NorthEastGravity)
753 szHint.win_gravity = SouthEastGravity; 801 szHint.win_gravity = SouthEastGravity;
754 else 802 else
755 szHint.win_gravity = SouthWestGravity; 803 szHint.win_gravity = SouthWestGravity;
756 } 804 }
757 } 805 }
758 } 806 }
759 807
760 /* TODO: BOUNDS */ 808 /* TODO: BOUNDS */
761 TermWin.width = TermWin.ncol * TermWin.fwidth; 809 width = ncol * fwidth;
762 TermWin.height = TermWin.nrow * TermWin.fheight; 810 height = nrow * fheight;
763 max_width = MAX_COLS * TermWin.fwidth; 811 max_width = MAX_COLS * fwidth;
764 max_height = MAX_ROWS * TermWin.fheight; 812 max_height = MAX_ROWS * fheight;
765 813
766 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 814 szHint.base_width = szHint.base_height = 2 * int_bwidth;
767 815
768 sb_w = mb_h = 0; 816 sb_w = 0;
769 window_vt_x = window_vt_y = TermWin.int_bwidth; 817 window_vt_x = window_vt_y = int_bwidth;
770 818
771 if (scrollbar_visible ()) 819 if (scrollBar.state)
772 { 820 {
773 sb_w = scrollbar_TotalWidth (); 821 sb_w = scrollbar_TotalWidth ();
774 szHint.base_width += sb_w; 822 szHint.base_width += sb_w;
775 if (!(options & Opt_scrollBar_right)) 823 if (!OPTION (Opt_scrollBar_right))
776 window_vt_x += sb_w; 824 window_vt_x += sb_w;
777 } 825 }
778 826
779 if (menubar_visible ())
780 {
781 mb_h = menuBar_TotalHeight ();
782 szHint.base_height += mb_h;
783 window_vt_y += mb_h;
784 }
785
786 szHint.width_inc = TermWin.fwidth; 827 szHint.width_inc = fwidth;
787 szHint.height_inc = TermWin.fheight; 828 szHint.height_inc = fheight;
788 szHint.min_width = szHint.base_width + szHint.width_inc; 829 szHint.min_width = szHint.base_width + szHint.width_inc;
789 szHint.min_height = szHint.base_height + szHint.height_inc; 830 szHint.min_height = szHint.base_height + szHint.height_inc;
790 831
791 if (width && width - szHint.base_width < max_width) 832 if (newwidth && newwidth - szHint.base_width < max_width)
792 { 833 {
793 szHint.width = width; 834 szHint.width = newwidth;
794 TermWin.width = width - szHint.base_width; 835 width = newwidth - szHint.base_width;
795 } 836 }
796 else 837 else
797 { 838 {
798 MIN_IT (TermWin.width, max_width); 839 min_it (width, max_width);
799 szHint.width = szHint.base_width + TermWin.width; 840 szHint.width = szHint.base_width + width;
800 } 841 }
801 842
802 if (height && height - szHint.base_height < max_height) 843 if (newheight && newheight - szHint.base_height < max_height)
803 { 844 {
804 szHint.height = height; 845 szHint.height = newheight;
805 TermWin.height = height - szHint.base_height; 846 height = newheight - szHint.base_height;
806 } 847 }
807 else 848 else
808 { 849 {
809 MIN_IT (TermWin.height, max_height); 850 min_it (height, max_height);
810 szHint.height = szHint.base_height + TermWin.height; 851 szHint.height = szHint.base_height + height;
811 } 852 }
812 853
813 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 854 if (scrollBar.state && OPTION (Opt_scrollBar_right))
814 window_sb_x = szHint.width - sb_w; 855 window_sb_x = szHint.width - sb_w;
815 856
816 if (recalc_x) 857 if (recalc_x)
817 szHint.x += (DisplayWidth (disp, display->screen) 858 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
818 - szHint.width - 2 * TermWin.ext_bwidth);
819 if (recalc_y) 859 if (recalc_y)
820 szHint.y += (DisplayHeight (disp, display->screen) 860 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
821 - szHint.height - 2 * TermWin.ext_bwidth);
822 861
823 TermWin.ncol = TermWin.width / TermWin.fwidth; 862 ncol = width / fwidth;
824 TermWin.nrow = TermWin.height / TermWin.fheight; 863 nrow = height / fheight;
825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 864 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
826 TermWin.ncol, TermWin.nrow, szHint.width, 865 ncol, nrow, szHint.width,
827 szHint.height)); 866 szHint.height));
828 return; 867 return;
829} 868}
830 869
831/*----------------------------------------------------------------------*/ 870/*----------------------------------------------------------------------*/
… …
839 if (pty.pty < 0) 878 if (pty.pty < 0)
840 return; 879 return;
841 880
842 struct winsize ws; 881 struct winsize ws;
843 882
844 ws.ws_col = TermWin.ncol; 883 ws.ws_col = ncol;
845 ws.ws_row = TermWin.nrow; 884 ws.ws_row = nrow;
846 ws.ws_xpixel = TermWin.width; 885 ws.ws_xpixel = width;
847 ws.ws_ypixel = TermWin.height; 886 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 887 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
849 888
850#if 0 889#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 890 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 891 if (cmd_pid) /* force through to the command */
853 kill (cmd_pid, SIGWINCH); 892 kill (-cmd_pid, SIGWINCH);
854#endif 893#endif
855} 894}
856 895
857/*----------------------------------------------------------------------*/ 896/*----------------------------------------------------------------------*/
858/* set_fonts () - load and set the various fonts 897/* set_fonts () - load and set the various fonts
859/* 898 *
860 * init = 1 - initialize 899 * init = 1 - initialize
861 * 900 *
862 * fontname == FONT_UP - switch to bigger font 901 * fontname == FONT_UP - switch to bigger font
863 * fontname == FONT_DN - switch to smaller font 902 * fontname == FONT_DN - switch to smaller font
864 */ 903 */
… …
876 return false; 915 return false;
877 } 916 }
878 917
879#if ENABLE_STYLES 918#if ENABLE_STYLES
880 for (int i = RS_styleCount; --i; ) 919 for (int i = RS_styleCount; --i; )
881 if (TermWin.fontset[i] != TermWin.fontset[0]) 920 if (fontset[i] != fontset[0])
882 delete TermWin.fontset[i]; 921 delete fontset[i];
883#endif 922#endif
884 923
885 delete TermWin.fontset[0]; 924 delete fontset[0];
886 TermWin.fontset[0] = fs; 925 fontset[0] = fs;
887 926
888 prop = (*fs)[1]->properties (); 927 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace; 928 prop.height += lineSpace;
890 fs->set_prop (prop); 929 fs->set_prop (prop);
891 930
892 TermWin.fwidth = prop.width; 931 fwidth = prop.width;
893 TermWin.fheight = prop.height; 932 fheight = prop.height;
894 TermWin.fweight = prop.weight; 933 fbase = prop.ascent;
895 TermWin.fslant = prop.slant;
896 TermWin.fbase = (*fs)[1]->ascent;
897 934
898 for (int style = 1; style < 4; style++) 935 for (int style = 1; style < 4; style++)
899 { 936 {
900#if ENABLE_STYLES 937#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 938 const char *res = rs[Rs_font + style];
902 939
903 if (res && !*res) 940 if (res && !*res)
904 TermWin.fontset[style] = TermWin.fontset[0]; 941 fontset[style] = fontset[0];
905 else 942 else
906 { 943 {
907 TermWin.fontset[style] = fs = new rxvt_fontset (this); 944 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 945 rxvt_fontprop prop2 = prop;
909 946
910 if (res) 947 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 948 prop2.weight = prop2.slant = rxvt_fontprop::unset;
912 else 949 else
913 { 950 {
914 res = TermWin.fontset[0]->fontdesc; 951 res = fontset[0]->fontdesc;
915 952
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 953 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 954 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
918 } 955 }
919 956
920 fs->populate (res); 957 fs->populate (res);
921 fs->set_prop (prop2); 958 fs->set_prop (prop2);
922 } 959 }
923#else 960#else
924 TermWin.fontset[style] = TermWin.fontset[0]; 961 fontset[style] = fontset[0];
925#endif 962#endif
926 } 963 }
927 964
928 if (TermWin.parent[0]) 965 if (parent[0])
929 { 966 {
930 resize_all_windows (0, 0, 0); 967 resize_all_windows (0, 0, 0);
931 scr_remap_chars (); 968 scr_remap_chars ();
932 scr_touch (true); 969 scr_touch (true);
933 } 970 }
… …
935 return true; 972 return true;
936} 973}
937 974
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 975void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 976{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, TermWin.parent[0], 977 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 978 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 979 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 980}
945 981
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 982void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 983{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 984 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 985 char *s = rxvt_wcstoutf8 (ws);
951 986
952 XChangeProperty (display->display, TermWin.parent[0], 987 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 988 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 989 (const unsigned char *)s, strlen (s));
955 990
956 free (s); 991 free (s);
957 free (ws); 992 free (ws);
… …
962/* xterm sequences - title, iconName, color (exptl) */ 997/* xterm sequences - title, iconName, color (exptl) */
963void 998void
964rxvt_term::set_title (const char *str) 999rxvt_term::set_title (const char *str)
965{ 1000{
966 set_string_property (XA_WM_NAME, str); 1001 set_string_property (XA_WM_NAME, str);
967#if ENABLE_FRILLS 1002#if ENABLE_EWMH
968 set_utf8_property (xa[XA_NET_WM_NAME], str); 1003 set_utf8_property (xa[XA_NET_WM_NAME], str);
969#endif 1004#endif
970} 1005}
971 1006
972void 1007void
973rxvt_term::set_icon_name (const char *str) 1008rxvt_term::set_icon_name (const char *str)
974{ 1009{
975 set_string_property (XA_WM_ICON_NAME, str); 1010 set_string_property (XA_WM_ICON_NAME, str);
976#if ENABLE_FRILLS 1011#if ENABLE_EWMH
977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1012 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
978#endif 1013#endif
979} 1014}
980 1015
981#ifdef XTERM_COLOR_CHANGE 1016#ifdef XTERM_COLOR_CHANGE
… …
994 i = atoi (color); 1029 i = atoi (color);
995 1030
996 if (i >= 8 && i <= 15) 1031 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1032 { /* bright colors */
998 i -= 8; 1033 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1034 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1035 SET_PIXCOLOR (idx);
1002 goto Done; 1036 goto done;
1003# endif
1004 } 1037 }
1005 1038
1006 if (i >= 0 && i <= 7) 1039 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1040 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1041 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx); 1042 SET_PIXCOLOR (idx);
1010 goto Done; 1043 goto done;
1011 } 1044 }
1012 } 1045 }
1013 1046
1014 if (!rXParseAllocColor (&xcol, color)) 1047 if (!rXParseAllocColor (&xcol, color))
1015 return; 1048 return;
… …
1035 pix_colors_focused[idx] = xcol; 1068 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx); 1069 SET_PIXCOLOR (idx);
1037 1070
1038 /* XSetWindowAttributes attr; */ 1071 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 1072 /* Cursor cursor; */
1040Done: 1073done:
1074
1041#ifdef OFF_FOCUS_FADING 1075#if OFF_FOCUS_FADING
1042 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])
1043 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1077 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1044#endif 1078#endif
1045 1079
1046 /*TODO: handle Color_BD, scrollbar background, etc. */ 1080 /*TODO: handle Color_BD, scrollbar background, etc. */
1047 1081
1048 recolour_cursor (); 1082 recolour_cursor ();
… …
1119 1153
1120/* -------------------------------------------------------------------- * 1154/* -------------------------------------------------------------------- *
1121 * - WINDOW RESIZING - * 1155 * - WINDOW RESIZING - *
1122 * -------------------------------------------------------------------- */ 1156 * -------------------------------------------------------------------- */
1123void 1157void
1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1158rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1125{ 1159{
1126 int fix_screen; 1160 int fix_screen;
1127#ifdef SMART_RESIZE
1128 int old_width = szHint.width, old_height = szHint.height; 1161 int old_width = szHint.width, old_height = szHint.height;
1129#endif
1130 dDisp; 1162 dDisp;
1131 1163
1132 window_calc (width, height); 1164 window_calc (newwidth, newheight);
1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1165 XSetWMNormalHints (disp, parent[0], &szHint);
1134 1166
1135 if (!ignoreparent) 1167 if (!ignoreparent)
1136 { 1168 {
1137#ifdef SMART_RESIZE 1169#ifdef SMART_RESIZE
1138 /* 1170 /*
… …
1142 int x, y, x1, y1; 1174 int x, y, x1, y1;
1143 int dx, dy; 1175 int dx, dy;
1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1176 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1145 Window unused_cr; 1177 Window unused_cr;
1146 1178
1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1179 XTranslateCoordinates (disp, parent[0], display->root,
1148 0, 0, &x, &y, &unused_cr); 1180 0, 0, &x, &y, &unused_cr);
1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1181 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1182 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1151 /* 1183 /*
1152 * if display->root isn't the parent window, a WM will probably have offset 1184 * if display->root isn't the parent window, a WM will probably have offset
1153 * our position for handles and decorations. Counter it 1185 * our position for handles and decorations. Counter it
1154 */ 1186 */
… …
1171 if (y < y1) /* top half */ 1203 if (y < y1) /* top half */
1172 dy = 0; 1204 dy = 0;
1173 else if (y == y1) /* exact center */ 1205 else if (y == y1) /* exact center */
1174 dy /= 2; 1206 dy /= 2;
1175 1207
1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1208 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1177 szHint.width, szHint.height); 1209 szHint.width, szHint.height);
1178#else 1210#else
1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1211 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1180#endif 1212#endif
1181 } 1213 }
1182 1214
1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1215 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1184 1216
1185 if (fix_screen || width != old_width || height != old_height) 1217 if (fix_screen || newwidth != old_width || newheight != old_height)
1186 { 1218 {
1187 if (scrollbar_visible ()) 1219 if (scrollBar.state)
1188 { 1220 {
1189 XMoveResizeWindow (disp, scrollBar.win, 1221 XMoveResizeWindow (disp, scrollBar.win,
1190 window_sb_x, 0, 1222 window_sb_x, 0,
1191 scrollbar_TotalWidth (), szHint.height); 1223 scrollbar_TotalWidth (), szHint.height);
1192 resize_scrollbar (); 1224 resize_scrollbar ();
1193 } 1225 }
1194 1226
1195 if (menubar_visible ())
1196 XMoveResizeWindow (disp, menuBar.win,
1197 window_vt_x, 0,
1198 TermWin_TotalWidth (), menuBar_TotalHeight ());
1199
1200 XMoveResizeWindow (disp, TermWin.vt, 1227 XMoveResizeWindow (disp, vt,
1201 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1202 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1229 width, height);
1203 1230
1204 scr_clear (); 1231 scr_clear ();
1205#ifdef XPM_BACKGROUND 1232#ifdef XPM_BACKGROUND
1206 resize_pixmap (); 1233 resize_pixmap ();
1207#endif 1234#endif
… …
1213 int old_ncol = prev_ncol; 1240 int old_ncol = prev_ncol;
1214 1241
1215 /* scr_reset only works on the primary screen */ 1242 /* scr_reset only works on the primary screen */
1216 if (old_height) /* this is not the first time through */ 1243 if (old_height) /* this is not the first time through */
1217 { 1244 {
1218 unsigned int ncol = TermWin.ncol; 1245 unsigned int ocol = ncol;
1219 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1246 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1220 curr_screen = scr_change_screen (PRIMARY); 1247 curr_screen = scr_change_screen (PRIMARY);
1221 TermWin.ncol = ncol; 1248 ncol = ocol;
1222 } 1249 }
1223 1250
1224 scr_reset (); 1251 scr_reset ();
1225 1252
1226 if (curr_screen >= 0) /* this is not the first time through */ 1253 if (curr_screen >= 0) /* this is not the first time through */
1227 { 1254 {
1228 scr_change_screen (curr_screen); 1255 scr_change_screen (curr_screen);
1229 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1256 selection_check (old_ncol != ncol ? 4 : 0);
1230 } 1257 }
1231 } 1258 }
1232 1259
1233 old_width = szHint.width; 1260 old_width = szHint.width;
1234 old_height = szHint.height; 1261 old_height = szHint.height;
1235 1262
1236#ifdef XPM_BACKGROUND 1263#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap) 1264 if (pixmap)
1238 scr_touch (false); 1265 scr_touch (false);
1239#endif 1266#endif
1240 1267
1241#ifdef USE_XIM 1268#ifdef USE_XIM
1242 IMSetStatusPosition (); 1269 IMSetStatusPosition ();
… …
1246/* 1273/*
1247 * Set the width/height of the vt window in characters. Units are pixels. 1274 * Set the width/height of the vt window in characters. Units are pixels.
1248 * good for toggling 80/132 columns 1275 * good for toggling 80/132 columns
1249 */ 1276 */
1250void 1277void
1251rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1278rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1252{ 1279{
1253 XWindowAttributes wattr; 1280 XWindowAttributes wattr;
1254 1281
1255 if (width == 0 || height == 0) 1282 if (newwidth == 0 || newheight == 0)
1256 { 1283 {
1257 XGetWindowAttributes (display->display, display->root, &wattr); 1284 XGetWindowAttributes (display->display, display->root, &wattr);
1285
1258 if (width == 0) 1286 if (newwidth == 0)
1259 width = wattr.width - szHint.base_width; 1287 newwidth = wattr.width - szHint.base_width;
1260 if (height == 0) 1288 if (newheight == 0)
1261 height = wattr.height - szHint.base_height; 1289 newheight = wattr.height - szHint.base_height;
1262 }
1263
1264 if (width != TermWin.width || height != TermWin.height)
1265 { 1290 }
1291
1292 if (newwidth != width || newheight != height)
1293 {
1266 width += szHint.base_width; 1294 newwidth += szHint.base_width;
1267 height += szHint.base_height; 1295 newheight += szHint.base_height;
1268 resize_all_windows (width, height, 0); 1296 resize_all_windows (newwidth, newheight, 0);
1269 } 1297 }
1270} 1298}
1271 1299
1272/* -------------------------------------------------------------------- * 1300/* -------------------------------------------------------------------- *
1273 * - X INPUT METHOD ROUTINES - * 1301 * - X INPUT METHOD ROUTINES - *
… …
1283 1311
1284void 1312void
1285rxvt_term::im_set_size (XRectangle &size) 1313rxvt_term::im_set_size (XRectangle &size)
1286{ 1314{
1287 // the int_bwidth terms make no sense to me 1315 // the int_bwidth terms make no sense to me
1288 size.x = TermWin.int_bwidth; 1316 size.x = int_bwidth;
1289 size.y = TermWin.int_bwidth; 1317 size.y = int_bwidth;
1290 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1318 size.width = Width2Pixel (ncol) + int_bwidth;
1291 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1319 size.height = Height2Pixel (nrow) + int_bwidth;
1292} 1320}
1293 1321
1294void 1322void
1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1323rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1296 XRectangle &status_rect, 1324 XRectangle &status_rect,
1297 const XRectangle &needed_rect) 1325 const XRectangle &needed_rect)
1298{ 1326{
1299 preedit_rect.x = needed_rect.width; 1327 preedit_rect.x = needed_rect.width;
1300 preedit_rect.y = 0; 1328 preedit_rect.y = 0;
1301 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1329 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1302 preedit_rect.height = TermWin.fheight; 1330 preedit_rect.height = fheight;
1303 1331
1304 status_rect.x = 0; 1332 status_rect.x = 0;
1305 status_rect.y = 0; 1333 status_rect.y = 0;
1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1334 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1307 status_rect.height = TermWin.fheight; 1335 status_rect.height = fheight;
1308} 1336}
1309 1337
1310/* Checking whether input method is running. */ 1338/* Checking whether input method is running. */
1311bool 1339bool
1312rxvt_term::IMisRunning () 1340rxvt_term::IMisRunning ()
… …
1340{ 1368{
1341 XPoint nspot; 1369 XPoint nspot;
1342 XVaNestedList preedit_attr; 1370 XVaNestedList preedit_attr;
1343 1371
1344 if (!Input_Context 1372 if (!Input_Context
1345 || !TermWin.focus 1373 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1374 || !(input_style & XIMPreeditPosition))
1347 return; 1375 return;
1348 1376
1349 im_set_position (nspot); 1377 im_set_position (nspot);
1350 1378
… …
1386 XRectangle rect, status_rect, needed_rect; 1414 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1415 unsigned long fg, bg;
1388 const char *p; 1416 const char *p;
1389 char **s; 1417 char **s;
1390 XIMStyles *xim_styles; 1418 XIMStyles *xim_styles;
1419
1420 set_environ (envv);
1391 1421
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1423 return false;
1394 1424
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1474 "*", 1504 "*",
1475 TermWin.fheight, 1505 fheight,
1476 TermWin.fheight + 1, TermWin.fheight - 1, 1506 fheight + 1, fheight - 1,
1477 TermWin.fheight - 2, TermWin.fheight + 2); 1507 fheight - 2, fheight + 2);
1478 1508
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1510 &missing_charset_list, &missing_charset_count, &def_string);
1481 1511
1482 if (missing_charset_list) 1512 if (missing_charset_list)
… …
1528 NULL); 1558 NULL);
1529 } 1559 }
1530 1560
1531 Input_Context = XCreateIC (xim, 1561 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1562 XNInputStyle, input_style,
1533 XNClientWindow, TermWin.vt, 1563 XNClientWindow, vt,
1534 XNFocusWindow, TermWin.parent[0], 1564 XNFocusWindow, parent[0],
1535 preedit_attr ? XNPreeditAttributes : NULL, 1565 preedit_attr ? XNPreeditAttributes : NULL,
1536 preedit_attr, 1566 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1567 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1568 status_attr, NULL);
1539 1569
… …
1556} 1586}
1557 1587
1558void 1588void
1559rxvt_term::im_cb () 1589rxvt_term::im_cb ()
1560{ 1590{
1561 int i, found, had_im; 1591 int i;
1562 const char *p; 1592 const char *p;
1563 char **s; 1593 char **s;
1564 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1565 1595
1566 SET_R (this); 1596 make_current ();
1567 1597
1568 im_destroy (); 1598 im_destroy ();
1569 1599
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1601 if (Input_Context)
… …
1623{ 1653{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1626 1656
1627 if (!Input_Context 1657 if (!Input_Context
1628 || !TermWin.focus 1658 || !focus
1629 || !(input_style & XIMPreeditArea) 1659 || !(input_style & XIMPreeditArea)
1630 || !IMisRunning ()) 1660 || !IMisRunning ())
1631 return; 1661 return;
1632 1662
1633 /* Getting the necessary width of preedit area */ 1663 /* Getting the necessary width of preedit area */

Diff Legend

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