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

Diff Legend

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