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