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.143 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 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),
… …
187void rxvt_term::emergency_cleanup () 209void rxvt_term::emergency_cleanup ()
188{ 210{
189 if (cmd_pid) 211 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
191 213
192#ifdef UTMP_SUPPORT 214 delete pty; pty = 0;
193 privileged_utmp (RESTORE);
194#endif
195
196 pty.put ();
197} 215}
198 216
199rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
200{ 218{
219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 221 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 222
203 emergency_cleanup (); 223 emergency_cleanup ();
204 224
205#if ENABLE_STYLES 225#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 226 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 227 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 228 delete fontset[i];
209#endif 229#endif
210 delete TermWin.fontset[0]; 230 delete fontset[0];
211 231
212 if (display) 232 if (display)
213 { 233 {
214 dDisp; 234 dDisp;
215 235
216 selection_clear (); 236 selection_clear ();
217 237
218#ifdef USE_XIM 238#ifdef USE_XIM
219 im_destroy (); 239 im_destroy ();
220#endif
221#ifdef MENUBAR
222 if (menubarGC) XFreeGC (disp, menubarGC);
223#endif 240#endif
224#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
225 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
226 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (disp, ShadowGC);
227#endif 244#endif
… …
238 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (disp, upArrow);
239 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (disp, downArrow);
240 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (disp, upArrowHi);
241 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (disp, downArrowHi);
242#endif 259#endif
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 264#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 265 if (gc) XFreeGC (disp, gc);
249 266
250#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 267 delete drawable;
252 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win);
254#endif
255 delete TermWin.drawable;
256 // destroy all windows 268 // destroy all windows
257 if (TermWin.parent[0]) 269 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
259 } 271 }
260 272
261 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
262
263 delete pix_colors_focused; 274 delete pix_colors_focused;
264#ifdef OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
265 delete pix_colors_unfocused; 276 delete pix_colors_unfocused;
266#endif 277#endif
267 278
268 displays.put (display); 279 displays.put (display);
269 280
… …
290 delete keyboard; 301 delete keyboard;
291#endif 302#endif
292} 303}
293 304
294void 305void
306rxvt_term::child_exit ()
307{
308 cmd_pid = 0;
309
310 if (!OPTION (Opt_hold))
311 destroy ();
312}
313
314void
295rxvt_term::destroy () 315rxvt_term::destroy ()
296{ 316{
297 if (destroy_ev.active) 317 if (destroy_ev.active)
298 return; 318 return;
299 319
… …
306#if USE_XIM 326#if USE_XIM
307 im_ev.stop (display); 327 im_ev.stop (display);
308#endif 328#endif
309#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
310 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
311#endif
312#if MENUBAR
313 menubar_ev.stop (display);
314#endif 331#endif
315#if TRANSPARENT 332#if TRANSPARENT
316 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
317#endif 334#endif
318 incr_ev.stop (); 335 incr_ev.stop ();
… …
342} 359}
343 360
344void 361void
345rxvt_term::destroy_cb (time_watcher &w) 362rxvt_term::destroy_cb (time_watcher &w)
346{ 363{
347 SET_R (this); 364 make_current ();
348 365
349 delete this; 366 delete this;
350} 367}
351 368
352/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
… …
417{ 434{
418 if (GET_R->allowedxerror == -1) 435 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code; 436 GET_R->allowedxerror = event->error_code;
420 else 437 else
421 { 438 {
422 //TODO: GET_R is most likely not the terminal which caused the error 439 // GET_R is most likely not the terminal which caused the error,
423 //TODO: maybe just output the error and continue? 440 // so just output the error and continue
424#if ENABLE_FRILLS 441#if ENABLE_FRILLS
425 print_x_error (display, event); 442 print_x_error (display, event);
426#else 443#else
427 old_xerror_handler (display, event); 444 old_xerror_handler (display, event);
428#endif 445#endif
… …
438 DisplayString (display)); 455 DisplayString (display));
439 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
441} 458}
442 459
443/*
444 * Catch a fatal signal and tidy up before quitting
445 */
446void
447rxvt_term::sig_term (sig_watcher &w)
448{
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
451#endif
452 rxvt_emergency_cleanup ();
453 signal (w.signum, SIG_DFL);
454 kill (getpid (), w.signum);
455}
456
457/*----------------------------------------------------------------------*/ 460/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 461bool
460rxvt_term::init (int argc, const char *const *argv) 462rxvt_term::init (int argc, const char *const *argv)
461{ 463{
462 SET_R (this); 464 SET_R (this);
463
464 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
465 467
466 if (!init_vars ()) 468 if (!init_vars ())
467 return false; 469 return false;
468 470
469 init_secondary (); 471 init_secondary ();
… …
472 474
473#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
474 keyboard->register_done (); 476 keyboard->register_done ();
475#endif 477#endif
476 478
477#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]);
479#endif
480#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 480 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 482#endif
484 483
484#if ENABLE_PERL
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
505 rxvt_perl.init (this);
506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507 }
508#endif
509
510 pty = rxvt_new_ptytty ();
511
485 create_windows (argc, argv); 512 create_windows (argc, argv);
486 513
487 dDisp; 514 dDisp;
488 515
489 init_xlocale (); 516 init_xlocale ();
490 517
491 scr_reset (); /* initialize screen */ 518 scr_reset (); // initialize screen
492 519
493#if 0 520#if 0
494 XSynchronize (disp, True); 521 XSynchronize (disp, True);
495#endif 522#endif
496 523
497#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 525 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
500#endif 527#endif
501#if (MENUBAR_MAX)
502 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win);
504#endif
505#ifdef TRANSPARENT 528#ifdef TRANSPARENT
506 if (options & Opt_transparent) 529 if (OPTION (Opt_transparent))
507 { 530 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 532 check_our_parents ();
510 rootwin_ev.start (display, display->root); 533 rootwin_ev.start (display, display->root);
511 } 534 }
512#endif 535#endif
513 536
514 XMapWindow (disp, TermWin.vt); 537 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 538 XMapWindow (disp, parent[0]);
516 539
517 set_colorfgbg (); 540 set_colorfgbg ();
518 541
519 init_command (cmd_argv); 542 init_command (cmd_argv);
520 543
521 free (cmd_argv); 544 free (cmd_argv);
522 545
546 if (pty->pty >= 0)
523 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
524 548
525 check_ev.start (); 549 check_ev.start ();
526 550
551 HOOK_INVOKE ((this, HOOK_START, DT_END));
552
527 return true; 553 return true;
528} 554}
529 555
556static struct sig_handlers
557{
558 sig_watcher sw_chld, sw_term, sw_int;
559
560 void sig_chld (sig_watcher &w)
561 {
562 // we are being called for every SIGCHLD, find the corresponding term
563 int pid;
564
565 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567 if (pid == (*t)->cmd_pid)
568 {
569 (*t)->child_exit ();
570 break;
571 }
572 }
573
574 /*
575 * Catch a fatal signal and tidy up before quitting
576 */
577 void
578 sig_term (sig_watcher &w)
579 {
580#ifdef DEBUG_CMD
581 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582#endif
583 rxvt_emergency_cleanup ();
584 signal (w.signum, SIG_DFL);
585 kill (getpid (), w.signum);
586 }
587
588 sig_handlers ()
589 : sw_chld (this, &sig_handlers::sig_chld),
590 sw_term (this, &sig_handlers::sig_term),
591 sw_int (this, &sig_handlers::sig_term)
592 {
593 }
594} sig_handlers;
595
596char **rxvt_environ; // startup environment
597
530void 598void
531rxvt_init () 599rxvt_init ()
532{ 600{
601 uid_t uid = getuid ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632
633 rxvt_environ = environ;
634
533 /* 635 /*
534 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
535 * If we need privileges in any area then we must specifically request it. 637 * If we need privileges in any area then we must specifically request it.
536 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
537 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
… …
541 rxvt_privileges (IGNORE); 643 rxvt_privileges (IGNORE);
542 644
543 signal (SIGHUP, SIG_IGN); 645 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 646 signal (SIGPIPE, SIG_IGN);
545 647
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT);
651
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 653 /* signal (SIGURG, SIG_DFL); */
548 654
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 656 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 657 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553 658
554/* ------------------------------------------------------------------------- * 659 XrmInitialize ();
555 * SIGNAL HANDLING & EXIT HANDLER *
556 * ------------------------------------------------------------------------- */
557/*
558 * Catch a SIGCHLD signal and exit if the direct child has died
559 */
560
561void
562rxvt_term::sig_chld (sig_watcher &w)
563{
564 // we are being called for every SIGCHLD, not just ours
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->destroy ();
572 break;
573 }
574} 660}
575 661
576/* ------------------------------------------------------------------------- * 662/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 663 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 664 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 671 rxvt_fatal ("memory allocation failure. aborting.\n");
586 672
587 return p; 673 return p;
588} 674}
589 675
590void * 676void *
591rxvt_calloc (size_t number, size_t size) 677rxvt_calloc (size_t number, size_t size)
592{ 678{
593 void *p = calloc (number, size); 679 void *p = calloc (number, size);
594 680
595 if (!p) 681 if (!p)
… …
614 * ------------------------------------------------------------------------- */ 700 * ------------------------------------------------------------------------- */
615/* take care of suid/sgid super-user (root) privileges */ 701/* take care of suid/sgid super-user (root) privileges */
616void 702void
617rxvt_privileges (rxvt_privaction action) 703rxvt_privileges (rxvt_privaction action)
618{ 704{
619#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
620 static uid_t euid;
621 static gid_t egid;
622#endif
623
624#if ! defined(__CYGWIN32__) 705#if ! defined(__CYGWIN32__)
625# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
626 /* setreuid () is the poor man's setuid (), seteuid () */ 707 /* setreuid () is the poor man's setuid (), seteuid () */
627# define seteuid(a) setreuid(-1, (a)) 708# define seteuid(a) setreuid(-1, (a))
628# define setegid(a) setregid(-1, (a)) 709# define setegid(a) setregid(-1, (a))
… …
634 case IGNORE: 715 case IGNORE:
635 /* 716 /*
636 * change effective uid/gid - not real uid/gid - so we can switch 717 * change effective uid/gid - not real uid/gid - so we can switch
637 * back to root later, as required 718 * back to root later, as required
638 */ 719 */
720 setegid (getgid ());
639 seteuid (getuid ()); 721 seteuid (getuid ());
640 setegid (getgid ());
641 break; 722 break;
642 case SAVE: 723 case SAVE:
643 euid = geteuid ();
644 egid = getegid (); 724 saved_egid = getegid ();
725 saved_euid = geteuid ();
645 break; 726 break;
646 case RESTORE: 727 case RESTORE:
647 seteuid (euid);
648 setegid (egid); 728 setegid (saved_egid);
729 seteuid (saved_euid);
649 break; 730 break;
650 } 731 }
651# else 732# else
652 switch (action) 733 switch (action)
653 { 734 {
654 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
655 setuid (getuid ()); 737 setuid (getuid ());
656 setgid (getgid ());
657 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
658 case SAVE: 739 case SAVE:
659 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
660 case RESTORE: 741 case RESTORE:
661 break; 742 break;
662 } 743 }
663# endif 744# endif
664#endif 745#endif
665} 746}
666 747
667#ifdef UTMP_SUPPORT
668void
669rxvt_term::privileged_utmp (rxvt_privaction action)
670{
671 if ((options & Opt_utmpInhibit)
672 || !pty.name || !*pty.name)
673 return;
674
675 rxvt_privileges (RESTORE);
676
677 if (action == SAVE)
678 makeutent (pty.name, rs[Rs_display_name]);
679 else
680 cleanutent ();
681
682 rxvt_privileges (IGNORE);
683}
684#endif
685
686/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
687/* 749/*
688 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
690 */ 752 */
691void 753void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 755{
694 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
696 unsigned int w, h; 758 unsigned int w, h;
697 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
698 dDisp; 760 dDisp;
699 761
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 763 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 764
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 766 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 768
707 recalc_x = recalc_y = 0; 769 recalc_x = recalc_y = 0;
708 flags = 0; 770 flags = 0;
771
709 if (!parsed_geometry) 772 if (!parsed_geometry)
710 { 773 {
711 parsed_geometry = 1; 774 parsed_geometry = 1;
775
712 if (rs[Rs_geometry]) 776 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 777 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 778
715 if (flags & WidthValue) 779 if (flags & WidthValue)
716 { 780 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 781 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 782 szHint.flags |= USSize;
719 } 783 }
720 784
721 if (flags & HeightValue) 785 if (flags & HeightValue)
722 { 786 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 787 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 788 szHint.flags |= USSize;
725 } 789 }
726 790
727 if (flags & XValue) 791 if (flags & XValue)
728 { 792 {
729 szHint.x = x; 793 szHint.x = x;
730 szHint.flags |= USPosition; 794 szHint.flags |= USPosition;
795
731 if (flags & XNegative) 796 if (flags & XNegative)
732 { 797 {
733 recalc_x = 1; 798 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 799 szHint.win_gravity = NorthEastGravity;
735 } 800 }
… …
737 802
738 if (flags & YValue) 803 if (flags & YValue)
739 { 804 {
740 szHint.y = y; 805 szHint.y = y;
741 szHint.flags |= USPosition; 806 szHint.flags |= USPosition;
807
742 if (flags & YNegative) 808 if (flags & YNegative)
743 { 809 {
744 recalc_y = 1; 810 recalc_y = 1;
811
745 if (szHint.win_gravity == NorthEastGravity) 812 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 813 szHint.win_gravity = SouthEastGravity;
747 else 814 else
748 szHint.win_gravity = SouthWestGravity; 815 szHint.win_gravity = SouthWestGravity;
749 } 816 }
750 } 817 }
751 } 818 }
752 819
753 /* TODO: BOUNDS */ 820 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 821 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 822 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 823 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 824 max_height = MAX_ROWS * fheight;
758 825
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 827
761 sb_w = mb_h = 0; 828 sb_w = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
763 830
764 if (scrollbar_visible ()) 831 if (scrollBar.state)
765 { 832 {
766 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 836 window_vt_x += sb_w;
770 } 837 }
771 838
772 if (menubar_visible ())
773 {
774 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h;
776 window_vt_y += mb_h;
777 }
778
779 szHint.width_inc = TermWin.fwidth; 839 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 840 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
783 843
784 if (width && width - szHint.base_width < max_width) 844 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 845 {
786 szHint.width = width; 846 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 847 width = newwidth - szHint.base_width;
788 } 848 }
789 else 849 else
790 { 850 {
791 MIN_IT (TermWin.width, max_width); 851 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 852 szHint.width = szHint.base_width + width;
793 } 853 }
794 854
795 if (height && height - szHint.base_height < max_height) 855 if (newheight && newheight - szHint.base_height < max_height)
796 { 856 {
797 szHint.height = height; 857 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 858 height = newheight - szHint.base_height;
799 } 859 }
800 else 860 else
801 { 861 {
802 MIN_IT (TermWin.height, max_height); 862 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 863 szHint.height = szHint.base_height + height;
804 } 864 }
805 865
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
808 868
809 if (recalc_x) 869 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 871 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 873
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 874 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 875 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 876 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 877 ncol, nrow, szHint.width,
820 szHint.height)); 878 szHint.height));
821 return; 879 return;
822} 880}
823 881
824/*----------------------------------------------------------------------*/ 882/*----------------------------------------------------------------------*/
… …
827 * Called after a window size change. 885 * Called after a window size change.
828 */ 886 */
829void 887void
830rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
831{ 889{
832 if (pty.pty < 0) 890 if (pty->pty < 0)
833 return; 891 return;
834 892
835 struct winsize ws; 893 struct winsize ws;
836 894
837 ws.ws_col = TermWin.ncol; 895 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 896 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 897 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 898 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
842 900
843#if 0 901#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
846 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
847#endif 905#endif
848} 906}
849 907
850/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 909/* set_fonts () - load and set the various fonts
852/* 910 *
853 * init = 1 - initialize 911 * init = 1 - initialize
854 * 912 *
855 * fontname == FONT_UP - switch to bigger font 913 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 914 * fontname == FONT_DN - switch to smaller font
857 */ 915 */
… …
869 return false; 927 return false;
870 } 928 }
871 929
872#if ENABLE_STYLES 930#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 931 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 932 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 933 delete fontset[i];
876#endif 934#endif
877 935
878 delete TermWin.fontset[0]; 936 delete fontset[0];
879 TermWin.fontset[0] = fs; 937 fontset[0] = fs;
880 938
881 prop = (*fs)[1]->properties (); 939 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 940 prop.height += lineSpace;
883 fs->set_prop (prop); 941 fs->set_prop (prop);
884 942
885 TermWin.fwidth = prop.width; 943 fwidth = prop.width;
886 TermWin.fheight = prop.height; 944 fheight = prop.height;
887 TermWin.fweight = prop.weight; 945 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 946
891 for (int style = 1; style < 4; style++) 947 for (int style = 1; style < 4; style++)
892 { 948 {
893#if ENABLE_STYLES 949#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 950 const char *res = rs[Rs_font + style];
895 951
896 if (res && !*res) 952 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 953 fontset[style] = fontset[0];
898 else 954 else
899 { 955 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 956 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 957 rxvt_fontprop prop2 = prop;
902 958
903 if (res) 959 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 960 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 961 else
906 { 962 {
907 res = TermWin.fontset[0]->fontdesc; 963 res = fontset[0]->fontdesc;
908 964
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 965 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
910 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 966 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 967 }
912 968
913 fs->populate (res); 969 fs->populate (res);
914 fs->set_prop (prop2); 970 fs->set_prop (prop2);
915 } 971 }
916#else 972#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 973 fontset[style] = fontset[0];
918#endif 974#endif
919 } 975 }
920 976
921 if (TermWin.parent[0]) 977 if (parent[0])
922 { 978 {
923 resize_all_windows (0, 0, 0); 979 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 980 scr_remap_chars ();
925 scr_touch (true); 981 scr_touch (true);
926 } 982 }
… …
928 return true; 984 return true;
929} 985}
930 986
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 987void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 988{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 989 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 990 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 991 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 992}
938 993
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 994void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 995{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 996 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 997 char *s = rxvt_wcstoutf8 (ws);
944 998
945 XChangeProperty (display->display, TermWin.parent[0], 999 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 1001 (const unsigned char *)s, strlen (s));
948 1002
949 free (s); 1003 free (s);
950 free (ws); 1004 free (ws);
… …
955/* xterm sequences - title, iconName, color (exptl) */ 1009/* xterm sequences - title, iconName, color (exptl) */
956void 1010void
957rxvt_term::set_title (const char *str) 1011rxvt_term::set_title (const char *str)
958{ 1012{
959 set_string_property (XA_WM_NAME, str); 1013 set_string_property (XA_WM_NAME, str);
960#if ENABLE_FRILLS 1014#if ENABLE_EWMH
961 set_utf8_property (xa[XA_NET_WM_NAME], str); 1015 set_utf8_property (xa[XA_NET_WM_NAME], str);
962#endif 1016#endif
963} 1017}
964 1018
965void 1019void
966rxvt_term::set_icon_name (const char *str) 1020rxvt_term::set_icon_name (const char *str)
967{ 1021{
968 set_string_property (XA_WM_ICON_NAME, str); 1022 set_string_property (XA_WM_ICON_NAME, str);
969#if ENABLE_FRILLS 1023#if ENABLE_EWMH
970 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1024 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
971#endif 1025#endif
972} 1026}
973 1027
974#ifdef XTERM_COLOR_CHANGE 1028#ifdef XTERM_COLOR_CHANGE
… …
987 i = atoi (color); 1041 i = atoi (color);
988 1042
989 if (i >= 8 && i <= 15) 1043 if (i >= 8 && i <= 15)
990 { /* bright colors */ 1044 { /* bright colors */
991 i -= 8; 1045 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 1047 SET_PIXCOLOR (idx);
995 goto Done; 1048 goto done;
996# endif
997 } 1049 }
998 1050
999 if (i >= 0 && i <= 7) 1051 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 1052 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1002 SET_PIXCOLOR (idx); 1054 SET_PIXCOLOR (idx);
1003 goto Done; 1055 goto done;
1004 } 1056 }
1005 } 1057 }
1006 1058
1007 if (!rXParseAllocColor (&xcol, color)) 1059 if (!rXParseAllocColor (&xcol, color))
1008 return; 1060 return;
… …
1028 pix_colors_focused[idx] = xcol; 1080 pix_colors_focused[idx] = xcol;
1029 SET_PIXCOLOR (idx); 1081 SET_PIXCOLOR (idx);
1030 1082
1031 /* XSetWindowAttributes attr; */ 1083 /* XSetWindowAttributes attr; */
1032 /* Cursor cursor; */ 1084 /* Cursor cursor; */
1033Done: 1085done:
1086
1034#ifdef OFF_FOCUS_FADING 1087#if OFF_FOCUS_FADING
1035 if (rs[Rs_fade]) 1088 if (rs[Rs_fade])
1036 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1089 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1037#endif 1090#endif
1038 1091
1039 /*TODO: handle Color_BD, scrollbar background, etc. */ 1092 /*TODO: handle Color_BD, scrollbar background, etc. */
1040 1093
1041 recolour_cursor (); 1094 recolour_cursor ();
… …
1112 1165
1113/* -------------------------------------------------------------------- * 1166/* -------------------------------------------------------------------- *
1114 * - WINDOW RESIZING - * 1167 * - WINDOW RESIZING - *
1115 * -------------------------------------------------------------------- */ 1168 * -------------------------------------------------------------------- */
1116void 1169void
1117rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1170rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1118{ 1171{
1119 int fix_screen; 1172 int fix_screen;
1120#ifdef SMART_RESIZE
1121 int old_width = szHint.width, old_height = szHint.height; 1173 int old_width = szHint.width, old_height = szHint.height;
1122#endif
1123 dDisp; 1174 dDisp;
1124 1175
1125 window_calc (width, height); 1176 window_calc (newwidth, newheight);
1126 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1177 XSetWMNormalHints (disp, parent[0], &szHint);
1127 1178
1128 if (!ignoreparent) 1179 if (!ignoreparent)
1129 { 1180 {
1130#ifdef SMART_RESIZE 1181#ifdef SMART_RESIZE
1131 /* 1182 /*
… …
1135 int x, y, x1, y1; 1186 int x, y, x1, y1;
1136 int dx, dy; 1187 int dx, dy;
1137 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1188 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1138 Window unused_cr; 1189 Window unused_cr;
1139 1190
1140 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1191 XTranslateCoordinates (disp, parent[0], display->root,
1141 0, 0, &x, &y, &unused_cr); 1192 0, 0, &x, &y, &unused_cr);
1142 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1193 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1143 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1194 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1144 /* 1195 /*
1145 * if display->root isn't the parent window, a WM will probably have offset 1196 * if display->root isn't the parent window, a WM will probably have offset
1146 * our position for handles and decorations. Counter it 1197 * our position for handles and decorations. Counter it
1147 */ 1198 */
… …
1164 if (y < y1) /* top half */ 1215 if (y < y1) /* top half */
1165 dy = 0; 1216 dy = 0;
1166 else if (y == y1) /* exact center */ 1217 else if (y == y1) /* exact center */
1167 dy /= 2; 1218 dy /= 2;
1168 1219
1169 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1220 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1170 szHint.width, szHint.height); 1221 szHint.width, szHint.height);
1171#else 1222#else
1172 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1223 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1173#endif 1224#endif
1174 } 1225 }
1175 1226
1176 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1177 1228
1178 if (fix_screen || width != old_width || height != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1179 { 1230 {
1180 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1181 { 1232 {
1182 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1183 window_sb_x, 0, 1234 window_sb_x, 0,
1184 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1185 resize_scrollbar (); 1236 resize_scrollbar ();
1186 } 1237 }
1187 1238
1188 if (menubar_visible ())
1189 XMoveResizeWindow (disp, menuBar.win,
1190 window_vt_x, 0,
1191 TermWin_TotalWidth (), menuBar_TotalHeight ());
1192
1193 XMoveResizeWindow (disp, TermWin.vt, 1239 XMoveResizeWindow (disp, vt,
1194 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1195 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1241 width, height);
1196 1242
1197 scr_clear (); 1243 scr_clear ();
1198#ifdef XPM_BACKGROUND 1244#ifdef XPM_BACKGROUND
1199 resize_pixmap (); 1245 resize_pixmap ();
1200#endif 1246#endif
… …
1206 int old_ncol = prev_ncol; 1252 int old_ncol = prev_ncol;
1207 1253
1208 /* scr_reset only works on the primary screen */ 1254 /* scr_reset only works on the primary screen */
1209 if (old_height) /* this is not the first time through */ 1255 if (old_height) /* this is not the first time through */
1210 { 1256 {
1211 unsigned int ncol = TermWin.ncol; 1257 unsigned int ocol = ncol;
1212 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1258 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1213 curr_screen = scr_change_screen (PRIMARY); 1259 curr_screen = scr_change_screen (PRIMARY);
1214 TermWin.ncol = ncol; 1260 ncol = ocol;
1215 } 1261 }
1216 1262
1217 scr_reset (); 1263 scr_reset ();
1218 1264
1219 if (curr_screen >= 0) /* this is not the first time through */ 1265 if (curr_screen >= 0) /* this is not the first time through */
1220 { 1266 {
1221 scr_change_screen (curr_screen); 1267 scr_change_screen (curr_screen);
1222 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1268 selection_check (old_ncol != ncol ? 4 : 0);
1223 } 1269 }
1224 } 1270 }
1225 1271
1226 old_width = szHint.width; 1272 old_width = szHint.width;
1227 old_height = szHint.height; 1273 old_height = szHint.height;
1228 1274
1229#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1230 if (TermWin.pixmap) 1276 if (pixmap)
1231 scr_touch (false); 1277 scr_touch (false);
1232#endif 1278#endif
1233 1279
1234#ifdef USE_XIM 1280#ifdef USE_XIM
1235 IMSetStatusPosition (); 1281 IMSetStatusPosition ();
… …
1239/* 1285/*
1240 * Set the width/height of the vt window in characters. Units are pixels. 1286 * Set the width/height of the vt window in characters. Units are pixels.
1241 * good for toggling 80/132 columns 1287 * good for toggling 80/132 columns
1242 */ 1288 */
1243void 1289void
1244rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1290rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1245{ 1291{
1246 XWindowAttributes wattr; 1292 XWindowAttributes wattr;
1247 1293
1248 if (width == 0 || height == 0) 1294 if (newwidth == 0 || newheight == 0)
1249 { 1295 {
1250 XGetWindowAttributes (display->display, display->root, &wattr); 1296 XGetWindowAttributes (display->display, display->root, &wattr);
1251 1297
1252 if (width == 0) 1298 if (newwidth == 0)
1253 width = wattr.width - szHint.base_width; 1299 newwidth = wattr.width - szHint.base_width;
1254 if (height == 0) 1300 if (newheight == 0)
1255 height = wattr.height - szHint.base_height; 1301 newheight = wattr.height - szHint.base_height;
1256 }
1257
1258 if (width != TermWin.width || height != TermWin.height)
1259 { 1302 }
1303
1304 if (newwidth != width || newheight != height)
1305 {
1260 width += szHint.base_width; 1306 newwidth += szHint.base_width;
1261 height += szHint.base_height; 1307 newheight += szHint.base_height;
1262 resize_all_windows (width, height, 0); 1308 resize_all_windows (newwidth, newheight, 0);
1263 } 1309 }
1264} 1310}
1265 1311
1266/* -------------------------------------------------------------------- * 1312/* -------------------------------------------------------------------- *
1267 * - X INPUT METHOD ROUTINES - * 1313 * - X INPUT METHOD ROUTINES - *
… …
1277 1323
1278void 1324void
1279rxvt_term::im_set_size (XRectangle &size) 1325rxvt_term::im_set_size (XRectangle &size)
1280{ 1326{
1281 // the int_bwidth terms make no sense to me 1327 // the int_bwidth terms make no sense to me
1282 size.x = TermWin.int_bwidth; 1328 size.x = int_bwidth;
1283 size.y = TermWin.int_bwidth; 1329 size.y = int_bwidth;
1284 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1330 size.width = Width2Pixel (ncol) + int_bwidth;
1285 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1331 size.height = Height2Pixel (nrow) + int_bwidth;
1286} 1332}
1287 1333
1288void 1334void
1289rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1335rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1290 XRectangle &status_rect, 1336 XRectangle &status_rect,
1291 const XRectangle &needed_rect) 1337 const XRectangle &needed_rect)
1292{ 1338{
1293 preedit_rect.x = needed_rect.width; 1339 preedit_rect.x = needed_rect.width;
1294 preedit_rect.y = 0; 1340 preedit_rect.y = 0;
1295 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1341 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1296 preedit_rect.height = TermWin.fheight; 1342 preedit_rect.height = fheight;
1297 1343
1298 status_rect.x = 0; 1344 status_rect.x = 0;
1299 status_rect.y = 0; 1345 status_rect.y = 0;
1300 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1346 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1301 status_rect.height = TermWin.fheight; 1347 status_rect.height = fheight;
1302} 1348}
1303 1349
1304/* Checking whether input method is running. */ 1350/* Checking whether input method is running. */
1305bool 1351bool
1306rxvt_term::IMisRunning () 1352rxvt_term::IMisRunning ()
… …
1334{ 1380{
1335 XPoint nspot; 1381 XPoint nspot;
1336 XVaNestedList preedit_attr; 1382 XVaNestedList preedit_attr;
1337 1383
1338 if (!Input_Context 1384 if (!Input_Context
1339 || !TermWin.focus 1385 || !focus
1340 || !(input_style & XIMPreeditPosition)) 1386 || !(input_style & XIMPreeditPosition))
1341 return; 1387 return;
1342 1388
1343 im_set_position (nspot); 1389 im_set_position (nspot);
1344 1390
… …
1380 XRectangle rect, status_rect, needed_rect; 1426 XRectangle rect, status_rect, needed_rect;
1381 unsigned long fg, bg; 1427 unsigned long fg, bg;
1382 const char *p; 1428 const char *p;
1383 char **s; 1429 char **s;
1384 XIMStyles *xim_styles; 1430 XIMStyles *xim_styles;
1431
1432 set_environ (envv);
1385 1433
1386 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1387 return false; 1435 return false;
1388 1436
1389 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1512 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1513 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1514 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1515 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "*", 1516 "*",
1469 TermWin.fheight, 1517 fheight,
1470 TermWin.fheight + 1, TermWin.fheight - 1, 1518 fheight + 1, fheight - 1,
1471 TermWin.fheight - 2, TermWin.fheight + 2); 1519 fheight - 2, fheight + 2);
1472 1520
1473 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1521 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1474 &missing_charset_list, &missing_charset_count, &def_string); 1522 &missing_charset_list, &missing_charset_count, &def_string);
1475 1523
1476 if (missing_charset_list) 1524 if (missing_charset_list)
… …
1522 NULL); 1570 NULL);
1523 } 1571 }
1524 1572
1525 Input_Context = XCreateIC (xim, 1573 Input_Context = XCreateIC (xim,
1526 XNInputStyle, input_style, 1574 XNInputStyle, input_style,
1527 XNClientWindow, TermWin.vt, 1575 XNClientWindow, vt,
1528 XNFocusWindow, TermWin.parent[0], 1576 XNFocusWindow, parent[0],
1529 preedit_attr ? XNPreeditAttributes : NULL, 1577 preedit_attr ? XNPreeditAttributes : NULL,
1530 preedit_attr, 1578 preedit_attr,
1531 status_attr ? XNStatusAttributes : NULL, 1579 status_attr ? XNStatusAttributes : NULL,
1532 status_attr, NULL); 1580 status_attr, NULL);
1533 1581
… …
1550} 1598}
1551 1599
1552void 1600void
1553rxvt_term::im_cb () 1601rxvt_term::im_cb ()
1554{ 1602{
1555 int i, found, had_im; 1603 int i;
1556 const char *p; 1604 const char *p;
1557 char **s; 1605 char **s;
1558 char buf[IMBUFSIZ]; 1606 char buf[IMBUFSIZ];
1559 1607
1560 SET_R (this); 1608 make_current ();
1561 1609
1562 im_destroy (); 1610 im_destroy ();
1563 1611
1564 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1565 if (Input_Context) 1613 if (Input_Context)
… …
1617{ 1665{
1618 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1619 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1620 1668
1621 if (!Input_Context 1669 if (!Input_Context
1622 || !TermWin.focus 1670 || !focus
1623 || !(input_style & XIMPreeditArea) 1671 || !(input_style & XIMPreeditArea)
1624 || !IMisRunning ()) 1672 || !IMisRunning ())
1625 return; 1673 return;
1626 1674
1627 /* Getting the necessary width of preedit area */ 1675 /* Getting the necessary width of preedit area */

Diff Legend

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