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