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.139 by root, Wed Feb 16 21:37:10 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
594void * 648void *
595rxvt_calloc (size_t number, size_t size) 649rxvt_calloc (size_t number, size_t size)
596{ 650{
597 void *p = calloc (number, size); 651 void *p = calloc (number, size);
598 652
599 if (!p) 653 if (!p)
… …
618 * ------------------------------------------------------------------------- */ 672 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 673/* take care of suid/sgid super-user (root) privileges */
620void 674void
621rxvt_privileges (rxvt_privaction action) 675rxvt_privileges (rxvt_privaction action)
622{ 676{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__) 677#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 679 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 680# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 681# define setegid(a) setregid(-1, (a))
… …
638 case IGNORE: 687 case IGNORE:
639 /* 688 /*
640 * 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
641 * back to root later, as required 690 * back to root later, as required
642 */ 691 */
692 setegid (getgid ());
643 seteuid (getuid ()); 693 seteuid (getuid ());
644 setegid (getgid ());
645 break; 694 break;
646 case SAVE: 695 case SAVE:
647 euid = geteuid ();
648 egid = getegid (); 696 saved_egid = getegid ();
697 saved_euid = geteuid ();
649 break; 698 break;
650 case RESTORE: 699 case RESTORE:
651 seteuid (euid);
652 setegid (egid); 700 setegid (saved_egid);
701 seteuid (saved_euid);
653 break; 702 break;
654 } 703 }
655# else 704# else
656 switch (action) 705 switch (action)
657 { 706 {
658 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
659 setuid (getuid ()); 709 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
662 case SAVE: 711 case SAVE:
663 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
664 case RESTORE: 713 case RESTORE:
665 break; 714 break;
… …
670 719
671#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
672void 721void
673rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 723{
675 if ((options & Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
676 || !pty.name || !*pty.name)
677 return; 725 return;
678 726
679 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
680 728
681 if (action == SAVE) 729 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
683 else 731 else
684 cleanutent (); 732 pty->logout ();
685 733
686 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
687} 735}
688#endif 736#endif
689 737
… …
691/* 739/*
692 * window size/position calculcations for XSizeHint and other storage. 740 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 741 * if width/height are non-zero then override calculated width/height
694 */ 742 */
695void 743void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 745{
698 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
700 unsigned int w, h; 748 unsigned int w, h;
701 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
702 dDisp; 750 dDisp;
703 751
704 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",
705 TermWin.ncol, TermWin.nrow, szHint.width, 753 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 754
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 755 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 756 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 757 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 758
711 recalc_x = recalc_y = 0; 759 recalc_x = recalc_y = 0;
712 flags = 0; 760 flags = 0;
761
713 if (!parsed_geometry) 762 if (!parsed_geometry)
714 { 763 {
715 parsed_geometry = 1; 764 parsed_geometry = 1;
765
716 if (rs[Rs_geometry]) 766 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 767 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 768
719 if (flags & WidthValue) 769 if (flags & WidthValue)
720 { 770 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 771 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 772 szHint.flags |= USSize;
723 } 773 }
724 774
725 if (flags & HeightValue) 775 if (flags & HeightValue)
726 { 776 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 777 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 778 szHint.flags |= USSize;
729 } 779 }
730 780
731 if (flags & XValue) 781 if (flags & XValue)
732 { 782 {
733 szHint.x = x; 783 szHint.x = x;
734 szHint.flags |= USPosition; 784 szHint.flags |= USPosition;
785
735 if (flags & XNegative) 786 if (flags & XNegative)
736 { 787 {
737 recalc_x = 1; 788 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 789 szHint.win_gravity = NorthEastGravity;
739 } 790 }
… …
741 792
742 if (flags & YValue) 793 if (flags & YValue)
743 { 794 {
744 szHint.y = y; 795 szHint.y = y;
745 szHint.flags |= USPosition; 796 szHint.flags |= USPosition;
797
746 if (flags & YNegative) 798 if (flags & YNegative)
747 { 799 {
748 recalc_y = 1; 800 recalc_y = 1;
801
749 if (szHint.win_gravity == NorthEastGravity) 802 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 803 szHint.win_gravity = SouthEastGravity;
751 else 804 else
752 szHint.win_gravity = SouthWestGravity; 805 szHint.win_gravity = SouthWestGravity;
753 } 806 }
754 } 807 }
755 } 808 }
756 809
757 /* TODO: BOUNDS */ 810 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 811 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 812 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 813 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 814 max_height = MAX_ROWS * fheight;
762 815
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 817
765 sb_w = mb_h = 0; 818 sb_w = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
767 820
768 if (scrollbar_visible ()) 821 if (scrollBar.state)
769 { 822 {
770 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 826 window_vt_x += sb_w;
774 } 827 }
775 828
776 if (menubar_visible ())
777 {
778 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h;
780 window_vt_y += mb_h;
781 }
782
783 szHint.width_inc = TermWin.fwidth; 829 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 830 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
787 833
788 if (width && width - szHint.base_width < max_width) 834 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 835 {
790 szHint.width = width; 836 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 837 width = newwidth - szHint.base_width;
792 } 838 }
793 else 839 else
794 { 840 {
795 MIN_IT (TermWin.width, max_width); 841 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 842 szHint.width = szHint.base_width + width;
797 } 843 }
798 844
799 if (height && height - szHint.base_height < max_height) 845 if (newheight && newheight - szHint.base_height < max_height)
800 { 846 {
801 szHint.height = height; 847 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 848 height = newheight - szHint.base_height;
803 } 849 }
804 else 850 else
805 { 851 {
806 MIN_IT (TermWin.height, max_height); 852 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 853 szHint.height = szHint.base_height + height;
808 } 854 }
809 855
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
812 858
813 if (recalc_x) 859 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 861 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 862 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 863
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 864 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 865 nrow = height / fheight;
822 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",
823 TermWin.ncol, TermWin.nrow, szHint.width, 867 ncol, nrow, szHint.width,
824 szHint.height)); 868 szHint.height));
825 return; 869 return;
826} 870}
827 871
828/*----------------------------------------------------------------------*/ 872/*----------------------------------------------------------------------*/
… …
831 * Called after a window size change. 875 * Called after a window size change.
832 */ 876 */
833void 877void
834rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
835{ 879{
836 if (pty.pty < 0) 880 if (pty->pty < 0)
837 return; 881 return;
838 882
839 struct winsize ws; 883 struct winsize ws;
840 884
841 ws.ws_col = TermWin.ncol; 885 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 886 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 887 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 888 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846 890
847#if 0 891#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
850 kill (cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
851#endif 895#endif
852} 896}
853 897
854/*----------------------------------------------------------------------*/ 898/*----------------------------------------------------------------------*/
855/* set_fonts () - load and set the various fonts 899/* set_fonts () - load and set the various fonts
856/* 900 *
857 * init = 1 - initialize 901 * init = 1 - initialize
858 * 902 *
859 * fontname == FONT_UP - switch to bigger font 903 * fontname == FONT_UP - switch to bigger font
860 * fontname == FONT_DN - switch to smaller font 904 * fontname == FONT_DN - switch to smaller font
861 */ 905 */
… …
873 return false; 917 return false;
874 } 918 }
875 919
876#if ENABLE_STYLES 920#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 921 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 922 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 923 delete fontset[i];
880#endif 924#endif
881 925
882 delete TermWin.fontset[0]; 926 delete fontset[0];
883 TermWin.fontset[0] = fs; 927 fontset[0] = fs;
884 928
885 prop = (*fs)[1]->properties (); 929 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 930 prop.height += lineSpace;
887 fs->set_prop (prop); 931 fs->set_prop (prop);
888 932
889 TermWin.fwidth = prop.width; 933 fwidth = prop.width;
890 TermWin.fheight = prop.height; 934 fheight = prop.height;
891 TermWin.fweight = prop.weight; 935 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 936
895 for (int style = 1; style < 4; style++) 937 for (int style = 1; style < 4; style++)
896 { 938 {
897#if ENABLE_STYLES 939#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 940 const char *res = rs[Rs_font + style];
899 941
900 if (res && !*res) 942 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 943 fontset[style] = fontset[0];
902 else 944 else
903 { 945 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 946 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 947 rxvt_fontprop prop2 = prop;
906 948
907 if (res) 949 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 950 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 951 else
910 { 952 {
911 res = TermWin.fontset[0]->fontdesc; 953 res = fontset[0]->fontdesc;
912 954
913 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;
914 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;
915 } 957 }
916 958
917 fs->populate (res); 959 fs->populate (res);
918 fs->set_prop (prop2); 960 fs->set_prop (prop2);
919 } 961 }
920#else 962#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 963 fontset[style] = fontset[0];
922#endif 964#endif
923 } 965 }
924 966
925 if (TermWin.parent[0]) 967 if (parent[0])
926 { 968 {
927 resize_all_windows (0, 0, 0); 969 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 970 scr_remap_chars ();
929 scr_touch (true); 971 scr_touch (true);
930 } 972 }
… …
932 return true; 974 return true;
933} 975}
934 976
935void 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)
936{ 978{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 979 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 980 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 981 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 982}
942 983
943void 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)
944{ 985{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 986 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 987 char *s = rxvt_wcstoutf8 (ws);
948 988
949 XChangeProperty (display->display, TermWin.parent[0], 989 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 990 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 991 (const unsigned char *)s, strlen (s));
952 992
953 free (s); 993 free (s);
954 free (ws); 994 free (ws);
… …
959/* xterm sequences - title, iconName, color (exptl) */ 999/* xterm sequences - title, iconName, color (exptl) */
960void 1000void
961rxvt_term::set_title (const char *str) 1001rxvt_term::set_title (const char *str)
962{ 1002{
963 set_string_property (XA_WM_NAME, str); 1003 set_string_property (XA_WM_NAME, str);
964#if ENABLE_FRILLS 1004#if ENABLE_EWMH
965 set_utf8_property (xa[XA_NET_WM_NAME], str); 1005 set_utf8_property (xa[XA_NET_WM_NAME], str);
966#endif 1006#endif
967} 1007}
968 1008
969void 1009void
970rxvt_term::set_icon_name (const char *str) 1010rxvt_term::set_icon_name (const char *str)
971{ 1011{
972 set_string_property (XA_WM_ICON_NAME, str); 1012 set_string_property (XA_WM_ICON_NAME, str);
973#if ENABLE_FRILLS 1013#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1014 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 1015#endif
976} 1016}
977 1017
978#ifdef XTERM_COLOR_CHANGE 1018#ifdef XTERM_COLOR_CHANGE
… …
991 i = atoi (color); 1031 i = atoi (color);
992 1032
993 if (i >= 8 && i <= 15) 1033 if (i >= 8 && i <= 15)
994 { /* bright colors */ 1034 { /* bright colors */
995 i -= 8; 1035 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1036 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 1037 SET_PIXCOLOR (idx);
999 goto Done; 1038 goto done;
1000# endif
1001 } 1039 }
1002 1040
1003 if (i >= 0 && i <= 7) 1041 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 1042 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1043 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx); 1044 SET_PIXCOLOR (idx);
1007 goto Done; 1045 goto done;
1008 } 1046 }
1009 } 1047 }
1010 1048
1011 if (!rXParseAllocColor (&xcol, color)) 1049 if (!rXParseAllocColor (&xcol, color))
1012 return; 1050 return;
… …
1032 pix_colors_focused[idx] = xcol; 1070 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
1034 1072
1035 /* XSetWindowAttributes attr; */ 1073 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */ 1074 /* Cursor cursor; */
1037Done: 1075done:
1076
1038#ifdef OFF_FOCUS_FADING 1077#if OFF_FOCUS_FADING
1039 if (rs[Rs_fade]) 1078 if (rs[Rs_fade])
1040 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]);
1041#endif 1080#endif
1042 1081
1043 /*TODO: handle Color_BD, scrollbar background, etc. */ 1082 /*TODO: handle Color_BD, scrollbar background, etc. */
1044 1083
1045 recolour_cursor (); 1084 recolour_cursor ();
… …
1116 1155
1117/* -------------------------------------------------------------------- * 1156/* -------------------------------------------------------------------- *
1118 * - WINDOW RESIZING - * 1157 * - WINDOW RESIZING - *
1119 * -------------------------------------------------------------------- */ 1158 * -------------------------------------------------------------------- */
1120void 1159void
1121rxvt_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)
1122{ 1161{
1123 int fix_screen; 1162 int fix_screen;
1124#ifdef SMART_RESIZE
1125 int old_width = szHint.width, old_height = szHint.height; 1163 int old_width = szHint.width, old_height = szHint.height;
1126#endif
1127 dDisp; 1164 dDisp;
1128 1165
1129 window_calc (width, height); 1166 window_calc (newwidth, newheight);
1130 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1167 XSetWMNormalHints (disp, parent[0], &szHint);
1131 1168
1132 if (!ignoreparent) 1169 if (!ignoreparent)
1133 { 1170 {
1134#ifdef SMART_RESIZE 1171#ifdef SMART_RESIZE
1135 /* 1172 /*
… …
1139 int x, y, x1, y1; 1176 int x, y, x1, y1;
1140 int dx, dy; 1177 int dx, dy;
1141 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1178 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1142 Window unused_cr; 1179 Window unused_cr;
1143 1180
1144 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1181 XTranslateCoordinates (disp, parent[0], display->root,
1145 0, 0, &x, &y, &unused_cr); 1182 0, 0, &x, &y, &unused_cr);
1146 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1183 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1147 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1184 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1148 /* 1185 /*
1149 * 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
1150 * our position for handles and decorations. Counter it 1187 * our position for handles and decorations. Counter it
1151 */ 1188 */
… …
1168 if (y < y1) /* top half */ 1205 if (y < y1) /* top half */
1169 dy = 0; 1206 dy = 0;
1170 else if (y == y1) /* exact center */ 1207 else if (y == y1) /* exact center */
1171 dy /= 2; 1208 dy /= 2;
1172 1209
1173 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1210 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1174 szHint.width, szHint.height); 1211 szHint.width, szHint.height);
1175#else 1212#else
1176 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1213 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1177#endif 1214#endif
1178 } 1215 }
1179 1216
1180 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1181 1218
1182 if (fix_screen || width != old_width || height != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1183 { 1220 {
1184 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1185 { 1222 {
1186 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1187 window_sb_x, 0, 1224 window_sb_x, 0,
1188 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1189 resize_scrollbar (); 1226 resize_scrollbar ();
1190 } 1227 }
1191 1228
1192 if (menubar_visible ())
1193 XMoveResizeWindow (disp, menuBar.win,
1194 window_vt_x, 0,
1195 TermWin_TotalWidth (), menuBar_TotalHeight ());
1196
1197 XMoveResizeWindow (disp, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1198 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1199 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 width, height);
1200 1232
1201 scr_clear (); 1233 scr_clear ();
1202#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
1203 resize_pixmap (); 1235 resize_pixmap ();
1204#endif 1236#endif
… …
1210 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1211 1243
1212 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1213 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1214 { 1246 {
1215 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1216 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
1217 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1218 TermWin.ncol = ncol; 1250 ncol = ocol;
1219 } 1251 }
1220 1252
1221 scr_reset (); 1253 scr_reset ();
1222 1254
1223 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1224 { 1256 {
1225 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1226 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1227 } 1259 }
1228 } 1260 }
1229 1261
1230 old_width = szHint.width; 1262 old_width = szHint.width;
1231 old_height = szHint.height; 1263 old_height = szHint.height;
1232 1264
1233#ifdef XPM_BACKGROUND 1265#ifdef XPM_BACKGROUND
1234 if (TermWin.pixmap) 1266 if (pixmap)
1235 scr_touch (false); 1267 scr_touch (false);
1236#endif 1268#endif
1237 1269
1238#ifdef USE_XIM 1270#ifdef USE_XIM
1239 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
… …
1243/* 1275/*
1244 * 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.
1245 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1246 */ 1278 */
1247void 1279void
1248rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1249{ 1281{
1250 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1251 1283
1252 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1253 { 1285 {
1254 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1287
1255 if (width == 0) 1288 if (newwidth == 0)
1256 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1257 if (height == 0) 1290 if (newheight == 0)
1258 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1259 }
1260
1261 if (width != TermWin.width || height != TermWin.height)
1262 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1263 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1264 height += szHint.base_height; 1297 newheight += szHint.base_height;
1265 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1266 } 1299 }
1267} 1300}
1268 1301
1269/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1270 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1280 1313
1281void 1314void
1282rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1283{ 1316{
1284 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1285 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1286 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1287 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1288 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1289} 1322}
1290 1323
1291void 1324void
1292rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293 XRectangle &status_rect, 1326 XRectangle &status_rect,
1294 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1295{ 1328{
1296 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1297 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1298 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1299 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1300 1333
1301 status_rect.x = 0; 1334 status_rect.x = 0;
1302 status_rect.y = 0; 1335 status_rect.y = 0;
1303 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;
1304 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1305} 1338}
1306 1339
1307/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1308bool 1341bool
1309rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1337{ 1370{
1338 XPoint nspot; 1371 XPoint nspot;
1339 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1340 1373
1341 if (!Input_Context 1374 if (!Input_Context
1342 || !TermWin.focus 1375 || !focus
1343 || !(input_style & XIMPreeditPosition)) 1376 || !(input_style & XIMPreeditPosition))
1344 return; 1377 return;
1345 1378
1346 im_set_position (nspot); 1379 im_set_position (nspot);
1347 1380
… …
1383 XRectangle rect, status_rect, needed_rect; 1416 XRectangle rect, status_rect, needed_rect;
1384 unsigned long fg, bg; 1417 unsigned long fg, bg;
1385 const char *p; 1418 const char *p;
1386 char **s; 1419 char **s;
1387 XIMStyles *xim_styles; 1420 XIMStyles *xim_styles;
1421
1422 set_environ (envv);
1388 1423
1389 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1390 return false; 1425 return false;
1391 1426
1392 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1504 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1505 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "*", 1506 "*",
1472 TermWin.fheight, 1507 fheight,
1473 TermWin.fheight + 1, TermWin.fheight - 1, 1508 fheight + 1, fheight - 1,
1474 TermWin.fheight - 2, TermWin.fheight + 2); 1509 fheight - 2, fheight + 2);
1475 1510
1476 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1511 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477 &missing_charset_list, &missing_charset_count, &def_string); 1512 &missing_charset_list, &missing_charset_count, &def_string);
1478 1513
1479 if (missing_charset_list) 1514 if (missing_charset_list)
… …
1525 NULL); 1560 NULL);
1526 } 1561 }
1527 1562
1528 Input_Context = XCreateIC (xim, 1563 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style, 1564 XNInputStyle, input_style,
1530 XNClientWindow, TermWin.vt, 1565 XNClientWindow, vt,
1531 XNFocusWindow, TermWin.parent[0], 1566 XNFocusWindow, parent[0],
1532 preedit_attr ? XNPreeditAttributes : NULL, 1567 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr, 1568 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL, 1569 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL); 1570 status_attr, NULL);
1536 1571
… …
1553} 1588}
1554 1589
1555void 1590void
1556rxvt_term::im_cb () 1591rxvt_term::im_cb ()
1557{ 1592{
1558 int i, found, had_im; 1593 int i;
1559 const char *p; 1594 const char *p;
1560 char **s; 1595 char **s;
1561 char buf[IMBUFSIZ]; 1596 char buf[IMBUFSIZ];
1562 1597
1563 SET_R (this); 1598 make_current ();
1564 1599
1565 im_destroy (); 1600 im_destroy ();
1566 1601
1567 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1568 if (Input_Context) 1603 if (Input_Context)
… …
1620{ 1655{
1621 XRectangle preedit_rect, status_rect, *needed_rect; 1656 XRectangle preedit_rect, status_rect, *needed_rect;
1622 XVaNestedList preedit_attr, status_attr; 1657 XVaNestedList preedit_attr, status_attr;
1623 1658
1624 if (!Input_Context 1659 if (!Input_Context
1625 || !TermWin.focus 1660 || !focus
1626 || !(input_style & XIMPreeditArea) 1661 || !(input_style & XIMPreeditArea)
1627 || !IMisRunning ()) 1662 || !IMisRunning ())
1628 return; 1663 return;
1629 1664
1630 /* 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