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.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
49# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
50#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
51 65
52vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
53 67
54static char curlocale[128]; 68static char curlocale[128], savelocale[128];
55 69
56bool 70bool
57rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
58{ 72{
59 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 74 return false;
61 75
62 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
64 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
65} 92}
66 93
67#if ENABLE_COMBINING 94#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
69 96
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 186#endif
160#ifdef USE_XIM 187#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 188 im_ev (this, &rxvt_term::im_cb),
162#endif 189#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
166 termwin_ev (this, &rxvt_term::x_cb), 190 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 191 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 192 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 193 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 194 destroy_ev (this, &rxvt_term::destroy_cb),
… …
197 pty.put (); 221 pty.put ();
198} 222}
199 223
200rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
201{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 229
204 emergency_cleanup (); 230 emergency_cleanup ();
205 231
206#if ENABLE_STYLES 232#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 233 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 234 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 235 delete fontset[i];
210#endif 236#endif
211 delete TermWin.fontset[0]; 237 delete fontset[0];
212 238
213 if (display) 239 if (display)
214 { 240 {
215 dDisp; 241 dDisp;
216 242
… …
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 271 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 272 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 273 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 274#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 275 if (gc) XFreeGC (disp, gc);
250 276
251#if defined(MENUBAR) && (MENUBAR_MAX > 1) 277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 278 delete menuBar.drawable;
253 //if (menuBar.win) 279 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win); 280 // XDestroyWindow (disp, menuBar.win);
255#endif 281#endif
256 delete TermWin.drawable; 282 delete drawable;
257 // destroy all windows 283 // destroy all windows
258 if (TermWin.parent[0]) 284 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 285 XDestroyWindow (disp, parent[0]);
260 } 286 }
261 287
262 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
263
264 delete pix_colors_focused; 289 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
267#endif 292#endif
268 293
269 displays.put (display); 294 displays.put (display);
270 295
… …
291 delete keyboard; 316 delete keyboard;
292#endif 317#endif
293} 318}
294 319
295void 320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
327}
328
329void
296rxvt_term::destroy () 330rxvt_term::destroy ()
297{ 331{
298 if (destroy_ev.active) 332 if (destroy_ev.active)
299 return; 333 return;
300 334
… …
362{ 396{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 397 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup (); 398 (*t)->emergency_cleanup ();
365} 399}
366 400
401#if ENABLE_FRILLS
402static void
403print_x_error (Display *dpy, XErrorEvent *event)
404{
405 char buffer[BUFSIZ];
406 char mesg[BUFSIZ];
407 char number[32];
408 char *mtype = "XlibMessage";
409 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
410 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
411 rxvt_warn ("An X Error occured, trying to continue after report.\n");
412 rxvt_warn ("%s: %s\n", mesg, buffer);
413 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
415 sprintf(number, "%d", event->request_code);
416 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
417 rxvt_warn ("(which is %s)\n", buffer);
418 if (event->request_code >= 128) {
419 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
422 }
423 if ((event->error_code == BadWindow) ||
424 (event->error_code == BadPixmap) ||
425 (event->error_code == BadCursor) ||
426 (event->error_code == BadFont) ||
427 (event->error_code == BadDrawable) ||
428 (event->error_code == BadColor) ||
429 (event->error_code == BadGC) ||
430 (event->error_code == BadIDChoice) ||
431 (event->error_code == BadValue) ||
432 (event->error_code == BadAtom)) {
433 if (event->error_code == BadValue)
434 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
435 mesg, BUFSIZ);
436 else if (event->error_code == BadAtom)
437 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
438 mesg, BUFSIZ);
439 else
440 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
441 mesg, BUFSIZ);
442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
443 }
444 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
445 mesg, BUFSIZ);
446 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
447}
448#endif
449
367int 450int
368rxvt_xerror_handler (Display *display, XErrorEvent *event) 451rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{ 452{
370 if (GET_R->allowedxerror == -1) 453 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code; 454 GET_R->allowedxerror = event->error_code;
372 else 455 else
373 { 456 {
374 //TODO: GET_R is most likely not the terminal which caused the error 457 // GET_R is most likely not the terminal which caused the error,
375 //TODO: maybe just output the error and continue? 458 // so just output the error and continue
459#if ENABLE_FRILLS
460 print_x_error (display, event);
461#else
376 old_xerror_handler (display, event); 462 old_xerror_handler (display, event);
377 GET_R->destroy (); 463#endif
378 } 464 }
379 465
380 return 0; 466 return 0;
381} 467}
382 468
… …
387 DisplayString (display)); 473 DisplayString (display));
388 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE); 475 _exit (EXIT_FAILURE);
390} 476}
391 477
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
407/* rxvt_init () */
408bool 479bool
409rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
410{ 481{
411 SET_R (this); 482 SET_R (this);
483 TEMP_ENV; // few things in X do not call setlocale :(
412 484
413 set_locale (""); 485 set_locale ("");
414 486
415 if (!init_vars ()) 487 if (!init_vars ())
416 return false; 488 return false;
… …
425 497
426#if MENUBAR_MAX 498#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]); 499 menubar_read (rs[Rs_menu]);
428#endif 500#endif
429#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar) 502 if (OPTION (Opt_scrollBar))
431 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
432#endif 504#endif
433 505
506#if ENABLE_PERL
507 if (!rs[Rs_perl_ext_1])
508 rs[Rs_perl_ext_1] = "default";
509
510 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
511 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
512 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
513 {
514#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
515 // ignore some perl-related arguments if some bozo installed us set[ug]id
516 if (rxvt_tainted ())
517 {
518 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 {
521 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
522 rs[Rs_perl_lib] = 0;
523 rs[Rs_perl_eval] = 0;
524 }
525 }
526#endif
527 rxvt_perl.init ();
528 setlocale (LC_CTYPE, curlocale); // perl init destroys this info
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 }
531#endif
532
434 create_windows (argc, argv); 533 create_windows (argc, argv);
435 534
436 dDisp; 535 dDisp;
437 536
438 init_xlocale (); 537 init_xlocale ();
439 538
440 scr_reset (); /* initialize screen */ 539 scr_reset (); // initialize screen
441 540
442#if 0 541#if 0
443 XSynchronize (disp, True); 542 XSynchronize (disp, True);
444#endif 543#endif
445 544
446#ifdef HAVE_SCROLLBARS 545#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar) 546 if (OPTION (Opt_scrollBar))
448 resize_scrollbar (); /* create and map scrollbar */ 547 resize_scrollbar (); /* create and map scrollbar */
449#endif 548#endif
450#if (MENUBAR_MAX) 549#if (MENUBAR_MAX)
451 if (menubar_visible ()) 550 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win); 551 XMapWindow (disp, menuBar.win);
453#endif 552#endif
454#ifdef TRANSPARENT 553#ifdef TRANSPARENT
455 if (options & Opt_transparent) 554 if (OPTION (Opt_transparent))
456 { 555 {
457 XSelectInput (disp, display->root, PropertyChangeMask); 556 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents (); 557 check_our_parents ();
459 rootwin_ev.start (display, display->root); 558 rootwin_ev.start (display, display->root);
460 } 559 }
461#endif 560#endif
462 561
463 XMapWindow (disp, TermWin.vt); 562 XMapWindow (disp, vt);
464 XMapWindow (disp, TermWin.parent[0]); 563 XMapWindow (disp, parent[0]);
465 564
466 set_colorfgbg (); 565 set_colorfgbg ();
467 566
468 init_command (cmd_argv); 567 init_command (cmd_argv);
469 568
470 free (cmd_argv); 569 free (cmd_argv);
471 570
571 if (pty.pty >= 0)
472 pty_ev.start (pty.pty, EVENT_READ); 572 pty_ev.start (pty.pty, EVENT_READ);
473 573
474 check_ev.start (); 574 check_ev.start ();
475 575
576 HOOK_INVOKE ((this, HOOK_START, DT_END));
577
476 return true; 578 return true;
477} 579}
478 580
581static struct sig_handlers
582{
583 sig_watcher sw_chld, sw_term, sw_int;
584
585 void sig_chld (sig_watcher &w)
586 {
587 // we are being called for every SIGCHLD, find the corresponding term
588 int pid;
589
590 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
591 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
592 if (pid == (*t)->cmd_pid)
593 {
594 (*t)->child_exit ();
595 break;
596 }
597 }
598
599 /*
600 * Catch a fatal signal and tidy up before quitting
601 */
602 void
603 sig_term (sig_watcher &w)
604 {
605#ifdef DEBUG_CMD
606 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
607#endif
608 rxvt_emergency_cleanup ();
609 signal (w.signum, SIG_DFL);
610 kill (getpid (), w.signum);
611 }
612
613 sig_handlers ()
614 : sw_chld (this, &sig_handlers::sig_chld),
615 sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term)
617 {
618 }
619} sig_handlers;
620
621char **rxvt_environ; // startup environment
622
479void 623void
480rxvt_init () 624rxvt_init ()
481{ 625{
626 rxvt_environ = environ;
627
482 /* 628 /*
483 * Save and then give up any super-user privileges 629 * Save and then give up any super-user privileges
484 * If we need privileges in any area then we must specifically request it. 630 * If we need privileges in any area then we must specifically request it.
485 * We should only need to be root in these cases: 631 * We should only need to be root in these cases:
486 * 1. write utmp entries on some systems 632 * 1. write utmp entries on some systems
… …
490 rxvt_privileges (IGNORE); 636 rxvt_privileges (IGNORE);
491 637
492 signal (SIGHUP, SIG_IGN); 638 signal (SIGHUP, SIG_IGN);
493 signal (SIGPIPE, SIG_IGN); 639 signal (SIGPIPE, SIG_IGN);
494 640
641 sig_handlers.sw_chld.start (SIGCHLD);
642 sig_handlers.sw_term.start (SIGTERM);
643 sig_handlers.sw_int.start (SIGINT);
644
495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 645 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
496 /* signal (SIGURG, SIG_DFL); */ 646 /* signal (SIGURG, SIG_DFL); */
497 647
498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 648 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499 // TODO: handle this with exceptions and tolerate the memory loss 649 // TODO: handle this with exceptions and tolerate the memory loss
500 XSetIOErrorHandler (rxvt_xioerror_handler); 650 XSetIOErrorHandler (rxvt_xioerror_handler);
501}
502 651
503/* ------------------------------------------------------------------------- * 652 XrmInitialize ();
504 * SIGNAL HANDLING & EXIT HANDLER *
505 * ------------------------------------------------------------------------- */
506/*
507 * Catch a SIGCHLD signal and exit if the direct child has died
508 */
509
510void
511rxvt_term::sig_chld (sig_watcher &w)
512{
513 // we are being called for every SIGCHLD, not just ours
514 int pid;
515
516 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
517 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
518 if (pid == (*t)->cmd_pid)
519 {
520 (*t)->destroy ();
521 break;
522 }
523} 653}
524 654
525/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
526 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
527 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 664 rxvt_fatal ("memory allocation failure. aborting.\n");
535 665
536 return p; 666 return p;
537} 667}
538 668
539/* INTPROTO */ 669void *
540void *
541rxvt_calloc (size_t number, size_t size) 670rxvt_calloc (size_t number, size_t size)
542{ 671{
543 void *p = calloc (number, size); 672 void *p = calloc (number, size);
544 673
545 if (!p) 674 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n"); 675 rxvt_fatal ("memory allocation failure. aborting.\n");
547 676
548 return p; 677 return p;
549} 678}
550 679
551/* INTPROTO */
552void * 680void *
553rxvt_realloc (void *ptr, size_t size) 681rxvt_realloc (void *ptr, size_t size)
554{ 682{
555 void *p = realloc (ptr, size); 683 void *p = realloc (ptr, size);
556 684
… …
565 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
566/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
567void 695void
568rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
569{ 697{
570#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
571 static uid_t euid;
572 static gid_t egid;
573#endif
574
575#if ! defined(__CYGWIN32__) 698#if ! defined(__CYGWIN32__)
576# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
577 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
578# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
579# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
585 case IGNORE: 708 case IGNORE:
586 /* 709 /*
587 * change effective uid/gid - not real uid/gid - so we can switch 710 * change effective uid/gid - not real uid/gid - so we can switch
588 * back to root later, as required 711 * back to root later, as required
589 */ 712 */
713 setegid (getgid ());
590 seteuid (getuid ()); 714 seteuid (getuid ());
591 setegid (getgid ());
592 break; 715 break;
593 case SAVE: 716 case SAVE:
594 euid = geteuid ();
595 egid = getegid (); 717 saved_egid = getegid ();
718 saved_euid = geteuid ();
596 break; 719 break;
597 case RESTORE: 720 case RESTORE:
598 seteuid (euid);
599 setegid (egid); 721 setegid (saved_egid);
722 seteuid (saved_euid);
600 break; 723 break;
601 } 724 }
602# else 725# else
603 switch (action) 726 switch (action)
604 { 727 {
605 case IGNORE: 728 case IGNORE:
729 setgid (getgid ());
606 setuid (getuid ()); 730 setuid (getuid ());
607 setgid (getgid ());
608 /* FALLTHROUGH */ 731 /* FALLTHROUGH */
609 case SAVE: 732 case SAVE:
610 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
611 case RESTORE: 734 case RESTORE:
612 break; 735 break;
… …
617 740
618#ifdef UTMP_SUPPORT 741#ifdef UTMP_SUPPORT
619void 742void
620rxvt_term::privileged_utmp (rxvt_privaction action) 743rxvt_term::privileged_utmp (rxvt_privaction action)
621{ 744{
622 if ((options & Opt_utmpInhibit) 745 if (OPTION (Opt_utmpInhibit)
623 || !pty.name || !*pty.name) 746 || !pty.name || !*pty.name)
624 return; 747 return;
625 748
626 rxvt_privileges (RESTORE); 749 rxvt_privileges (RESTORE);
627 750
… …
638/* 761/*
639 * window size/position calculcations for XSizeHint and other storage. 762 * window size/position calculcations for XSizeHint and other storage.
640 * if width/height are non-zero then override calculated width/height 763 * if width/height are non-zero then override calculated width/height
641 */ 764 */
642void 765void
643rxvt_term::window_calc (unsigned int width, unsigned int height) 766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
644{ 767{
645 short recalc_x, recalc_y; 768 short recalc_x, recalc_y;
646 int x, y, sb_w, mb_h, flags; 769 int x, y, sb_w, mb_h, flags;
647 unsigned int w, h; 770 unsigned int w, h;
648 unsigned int max_width, max_height; 771 unsigned int max_width, max_height;
649 dDisp; 772 dDisp;
650 773
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 775 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 776
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 777 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 778 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 779 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 780
658 recalc_x = recalc_y = 0; 781 recalc_x = recalc_y = 0;
659 flags = 0; 782 flags = 0;
783
660 if (!parsed_geometry) 784 if (!parsed_geometry)
661 { 785 {
662 parsed_geometry = 1; 786 parsed_geometry = 1;
787
663 if (rs[Rs_geometry]) 788 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 789 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
790
665 if (flags & WidthValue) 791 if (flags & WidthValue)
666 { 792 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 793 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 794 szHint.flags |= USSize;
669 } 795 }
796
670 if (flags & HeightValue) 797 if (flags & HeightValue)
671 { 798 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 799 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 800 szHint.flags |= USSize;
674 } 801 }
802
675 if (flags & XValue) 803 if (flags & XValue)
676 { 804 {
677 szHint.x = x; 805 szHint.x = x;
678 szHint.flags |= USPosition; 806 szHint.flags |= USPosition;
807
679 if (flags & XNegative) 808 if (flags & XNegative)
680 { 809 {
681 recalc_x = 1; 810 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 811 szHint.win_gravity = NorthEastGravity;
683 } 812 }
684 } 813 }
814
685 if (flags & YValue) 815 if (flags & YValue)
686 { 816 {
687 szHint.y = y; 817 szHint.y = y;
688 szHint.flags |= USPosition; 818 szHint.flags |= USPosition;
819
689 if (flags & YNegative) 820 if (flags & YNegative)
690 { 821 {
691 recalc_y = 1; 822 recalc_y = 1;
823
692 if (szHint.win_gravity == NorthEastGravity) 824 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 825 szHint.win_gravity = SouthEastGravity;
694 else 826 else
695 szHint.win_gravity = SouthWestGravity; 827 szHint.win_gravity = SouthWestGravity;
696 } 828 }
697 } 829 }
698 } 830 }
699 831
700 /* TODO: BOUNDS */ 832 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 833 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 834 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 835 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 836 max_height = MAX_ROWS * fheight;
705 837
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 838 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 839
708 sb_w = mb_h = 0; 840 sb_w = mb_h = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 841 window_vt_x = window_vt_y = int_bwidth;
710 842
711 if (scrollbar_visible ()) 843 if (scrollbar_visible ())
712 { 844 {
713 sb_w = scrollbar_TotalWidth (); 845 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 846 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 847 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 848 window_vt_x += sb_w;
717 } 849 }
718 850
719 if (menubar_visible ()) 851 if (menubar_visible ())
720 { 852 {
721 mb_h = menuBar_TotalHeight (); 853 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h; 854 szHint.base_height += mb_h;
723 window_vt_y += mb_h; 855 window_vt_y += mb_h;
724 } 856 }
725 857
726 szHint.width_inc = TermWin.fwidth; 858 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 859 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 860 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 861 szHint.min_height = szHint.base_height + szHint.height_inc;
730 862
731 if (width && width - szHint.base_width < max_width) 863 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 864 {
733 szHint.width = width; 865 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 866 width = newwidth - szHint.base_width;
735 } 867 }
736 else 868 else
737 { 869 {
738 MIN_IT (TermWin.width, max_width); 870 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 871 szHint.width = szHint.base_width + width;
740 } 872 }
741 873
742 if (height && height - szHint.base_height < max_height) 874 if (newheight && newheight - szHint.base_height < max_height)
743 { 875 {
744 szHint.height = height; 876 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 877 height = newheight - szHint.base_height;
746 } 878 }
747 else 879 else
748 { 880 {
749 MIN_IT (TermWin.height, max_height); 881 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 882 szHint.height = szHint.base_height + height;
751 } 883 }
752 884
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 886 window_sb_x = szHint.width - sb_w;
755 887
756 if (recalc_x) 888 if (recalc_x)
757 szHint.x += (DisplayWidth (disp, display->screen) 889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 890 if (recalc_y)
760 szHint.y += (DisplayHeight (disp, display->screen) 891 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 892
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 893 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 894 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 895 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 896 ncol, nrow, szHint.width,
767 szHint.height)); 897 szHint.height));
768 return; 898 return;
769} 899}
770 900
771/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
… …
779 if (pty.pty < 0) 909 if (pty.pty < 0)
780 return; 910 return;
781 911
782 struct winsize ws; 912 struct winsize ws;
783 913
784 ws.ws_col = TermWin.ncol; 914 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 915 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 916 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 917 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
789 919
790#if 0 920#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 922 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 923 kill (-cmd_pid, SIGWINCH);
794#endif 924#endif
795} 925}
796 926
797/*----------------------------------------------------------------------*/ 927/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 928/* set_fonts () - load and set the various fonts
799/* 929 *
800 * init = 1 - initialize 930 * init = 1 - initialize
801 * 931 *
802 * fontname == FONT_UP - switch to bigger font 932 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 933 * fontname == FONT_DN - switch to smaller font
804 */ 934 */
… …
816 return false; 946 return false;
817 } 947 }
818 948
819#if ENABLE_STYLES 949#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; ) 950 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0]) 951 if (fontset[i] != fontset[0])
822 delete TermWin.fontset[i]; 952 delete fontset[i];
823#endif 953#endif
824 954
825 delete TermWin.fontset[0]; 955 delete fontset[0];
826 TermWin.fontset[0] = fs; 956 fontset[0] = fs;
827 957
828 prop = (*fs)[1]->properties (); 958 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace; 959 prop.height += lineSpace;
830 fs->set_prop (prop); 960 fs->set_prop (prop);
831 961
832 TermWin.fwidth = prop.width; 962 fwidth = prop.width;
833 TermWin.fheight = prop.height; 963 fheight = prop.height;
834 TermWin.fweight = prop.weight; 964 fbase = prop.ascent;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837 965
838 for (int style = 1; style < 4; style++) 966 for (int style = 1; style < 4; style++)
839 { 967 {
840#if ENABLE_STYLES 968#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style]; 969 const char *res = rs[Rs_font + style];
842 970
843 if (res && !*res) 971 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0]; 972 fontset[style] = fontset[0];
845 else 973 else
846 { 974 {
847 TermWin.fontset[style] = fs = new rxvt_fontset (this); 975 fontset[style] = fs = new rxvt_fontset (this);
848 rxvt_fontprop prop2 = prop; 976 rxvt_fontprop prop2 = prop;
849 977
850 if (res) 978 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset; 979 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else 980 else
853 { 981 {
854 res = TermWin.fontset[0]->fontdesc; 982 res = fontset[0]->fontdesc;
855 983
856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 984 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 985 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858 } 986 }
859 987
860 fs->populate (res); 988 fs->populate (res);
861 fs->set_prop (prop2); 989 fs->set_prop (prop2);
862 } 990 }
863#else 991#else
864 TermWin.fontset[style] = TermWin.fontset[0]; 992 fontset[style] = fontset[0];
865#endif 993#endif
866 } 994 }
867 995
868 if (TermWin.parent[0]) 996 if (parent[0])
869 { 997 {
870 resize_all_windows (0, 0, 0); 998 resize_all_windows (0, 0, 0);
871 scr_remap_chars (); 999 scr_remap_chars ();
872 scr_touch (true); 1000 scr_touch (true);
873 } 1001 }
… …
875 return true; 1003 return true;
876} 1004}
877 1005
878void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1006void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{ 1007{
880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0], 1008 XChangeProperty (display->display, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 1009 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1010 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 1011}
885 1012
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1013void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 1014{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len); 1015 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws); 1016 char *s = rxvt_wcstoutf8 (ws);
891 1017
892 XChangeProperty (display->display, TermWin.parent[0], 1018 XChangeProperty (display->display, parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1019 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s)); 1020 (const unsigned char *)s, strlen (s));
895 1021
896 free (s); 1022 free (s);
897 free (ws); 1023 free (ws);
… …
902/* xterm sequences - title, iconName, color (exptl) */ 1028/* xterm sequences - title, iconName, color (exptl) */
903void 1029void
904rxvt_term::set_title (const char *str) 1030rxvt_term::set_title (const char *str)
905{ 1031{
906 set_string_property (XA_WM_NAME, str); 1032 set_string_property (XA_WM_NAME, str);
907#if ENABLE_FRILLS 1033#if ENABLE_EWMH
908 set_utf8_property (xa[XA_NET_WM_NAME], str); 1034 set_utf8_property (xa[XA_NET_WM_NAME], str);
909#endif 1035#endif
910} 1036}
911 1037
912void 1038void
913rxvt_term::set_icon_name (const char *str) 1039rxvt_term::set_icon_name (const char *str)
914{ 1040{
915 set_string_property (XA_WM_ICON_NAME, str); 1041 set_string_property (XA_WM_ICON_NAME, str);
916#if ENABLE_FRILLS 1042#if ENABLE_EWMH
917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1043 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
918#endif 1044#endif
919} 1045}
920 1046
921#ifdef XTERM_COLOR_CHANGE 1047#ifdef XTERM_COLOR_CHANGE
… …
934 i = atoi (color); 1060 i = atoi (color);
935 1061
936 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
937 { /* bright colors */ 1063 { /* bright colors */
938 i -= 8; 1064 i -= 8;
939# ifndef NO_BRIGHTCOLOR
940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
942 goto Done; 1067 goto done;
943# endif
944 } 1068 }
945 1069
946 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
947 { /* normal colors */ 1071 { /* normal colors */
948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949 SET_PIXCOLOR (idx); 1073 SET_PIXCOLOR (idx);
950 goto Done; 1074 goto done;
951 } 1075 }
952 } 1076 }
953 1077
954 if (!rXParseAllocColor (&xcol, color)) 1078 if (!rXParseAllocColor (&xcol, color))
955 return; 1079 return;
… …
975 pix_colors_focused[idx] = xcol; 1099 pix_colors_focused[idx] = xcol;
976 SET_PIXCOLOR (idx); 1100 SET_PIXCOLOR (idx);
977 1101
978 /* XSetWindowAttributes attr; */ 1102 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */ 1103 /* Cursor cursor; */
980Done: 1104done:
1105
981#ifdef OFF_FOCUS_FADING 1106#if OFF_FOCUS_FADING
982 if (rs[Rs_fade]) 1107 if (rs[Rs_fade])
983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1108 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
984#endif 1109#endif
985 1110
986 /*TODO: handle Color_BD, scrollbar background, etc. */ 1111 /*TODO: handle Color_BD, scrollbar background, etc. */
987 1112
988 recolour_cursor (); 1113 recolour_cursor ();
… …
1059 1184
1060/* -------------------------------------------------------------------- * 1185/* -------------------------------------------------------------------- *
1061 * - WINDOW RESIZING - * 1186 * - WINDOW RESIZING - *
1062 * -------------------------------------------------------------------- */ 1187 * -------------------------------------------------------------------- */
1063void 1188void
1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1189rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1065{ 1190{
1066 int fix_screen; 1191 int fix_screen;
1067#ifdef SMART_RESIZE
1068 int old_width = szHint.width, old_height = szHint.height; 1192 int old_width = szHint.width, old_height = szHint.height;
1069#endif
1070 dDisp; 1193 dDisp;
1071 1194
1072 window_calc (width, height); 1195 window_calc (newwidth, newheight);
1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1196 XSetWMNormalHints (disp, parent[0], &szHint);
1074 1197
1075 if (!ignoreparent) 1198 if (!ignoreparent)
1076 { 1199 {
1077#ifdef SMART_RESIZE 1200#ifdef SMART_RESIZE
1078 /* 1201 /*
… …
1082 int x, y, x1, y1; 1205 int x, y, x1, y1;
1083 int dx, dy; 1206 int dx, dy;
1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1207 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1085 Window unused_cr; 1208 Window unused_cr;
1086 1209
1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1210 XTranslateCoordinates (disp, parent[0], display->root,
1088 0, 0, &x, &y, &unused_cr); 1211 0, 0, &x, &y, &unused_cr);
1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1212 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1213 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1091 /* 1214 /*
1092 * if display->root isn't the parent window, a WM will probably have offset 1215 * if display->root isn't the parent window, a WM will probably have offset
1093 * our position for handles and decorations. Counter it 1216 * our position for handles and decorations. Counter it
1094 */ 1217 */
… …
1111 if (y < y1) /* top half */ 1234 if (y < y1) /* top half */
1112 dy = 0; 1235 dy = 0;
1113 else if (y == y1) /* exact center */ 1236 else if (y == y1) /* exact center */
1114 dy /= 2; 1237 dy /= 2;
1115 1238
1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1239 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1117 szHint.width, szHint.height); 1240 szHint.width, szHint.height);
1118#else 1241#else
1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1242 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1120#endif 1243#endif
1121 } 1244 }
1122 1245
1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1124 1247
1125 if (fix_screen || width != old_width || height != old_height) 1248 if (fix_screen || newwidth != old_width || newheight != old_height)
1126 { 1249 {
1127 if (scrollbar_visible ()) 1250 if (scrollbar_visible ())
1128 { 1251 {
1129 XMoveResizeWindow (disp, scrollBar.win, 1252 XMoveResizeWindow (disp, scrollBar.win,
1130 window_sb_x, 0, 1253 window_sb_x, 0,
… …
1133 } 1256 }
1134 1257
1135 if (menubar_visible ()) 1258 if (menubar_visible ())
1136 XMoveResizeWindow (disp, menuBar.win, 1259 XMoveResizeWindow (disp, menuBar.win,
1137 window_vt_x, 0, 1260 window_vt_x, 0,
1138 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1261 width, menuBar_TotalHeight ());
1139 1262
1140 XMoveResizeWindow (disp, TermWin.vt, 1263 XMoveResizeWindow (disp, vt,
1141 window_vt_x, window_vt_y, 1264 window_vt_x, window_vt_y,
1142 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1265 width, height);
1143 1266
1144 scr_clear (); 1267 scr_clear ();
1145#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1146 resize_pixmap (); 1269 resize_pixmap ();
1147#endif 1270#endif
… …
1153 int old_ncol = prev_ncol; 1276 int old_ncol = prev_ncol;
1154 1277
1155 /* scr_reset only works on the primary screen */ 1278 /* scr_reset only works on the primary screen */
1156 if (old_height) /* this is not the first time through */ 1279 if (old_height) /* this is not the first time through */
1157 { 1280 {
1158 unsigned int ncol = TermWin.ncol; 1281 unsigned int ocol = ncol;
1159 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1282 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1160 curr_screen = scr_change_screen (PRIMARY); 1283 curr_screen = scr_change_screen (PRIMARY);
1161 TermWin.ncol = ncol; 1284 ncol = ocol;
1162 } 1285 }
1163 1286
1164 scr_reset (); 1287 scr_reset ();
1165 1288
1166 if (curr_screen >= 0) /* this is not the first time through */ 1289 if (curr_screen >= 0) /* this is not the first time through */
1167 { 1290 {
1168 scr_change_screen (curr_screen); 1291 scr_change_screen (curr_screen);
1169 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1292 selection_check (old_ncol != ncol ? 4 : 0);
1170 } 1293 }
1171 } 1294 }
1172 1295
1173 old_width = szHint.width; 1296 old_width = szHint.width;
1174 old_height = szHint.height; 1297 old_height = szHint.height;
1175 1298
1176#ifdef XPM_BACKGROUND 1299#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap) 1300 if (pixmap)
1178 scr_touch (false); 1301 scr_touch (false);
1179#endif 1302#endif
1180 1303
1181#ifdef USE_XIM 1304#ifdef USE_XIM
1182 IMSetStatusPosition (); 1305 IMSetStatusPosition ();
… …
1186/* 1309/*
1187 * Set the width/height of the vt window in characters. Units are pixels. 1310 * Set the width/height of the vt window in characters. Units are pixels.
1188 * good for toggling 80/132 columns 1311 * good for toggling 80/132 columns
1189 */ 1312 */
1190void 1313void
1191rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1314rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1192{ 1315{
1193 XWindowAttributes wattr; 1316 XWindowAttributes wattr;
1194 1317
1195 if (width == 0 || height == 0) 1318 if (newwidth == 0 || newheight == 0)
1196 { 1319 {
1197 XGetWindowAttributes (display->display, display->root, &wattr); 1320 XGetWindowAttributes (display->display, display->root, &wattr);
1321
1198 if (width == 0) 1322 if (newwidth == 0)
1199 width = wattr.width - szHint.base_width; 1323 newwidth = wattr.width - szHint.base_width;
1200 if (height == 0) 1324 if (newheight == 0)
1201 height = wattr.height - szHint.base_height; 1325 newheight = wattr.height - szHint.base_height;
1202 }
1203
1204 if (width != TermWin.width || height != TermWin.height)
1205 { 1326 }
1327
1328 if (newwidth != width || newheight != height)
1329 {
1206 width += szHint.base_width; 1330 newwidth += szHint.base_width;
1207 height += szHint.base_height; 1331 newheight += szHint.base_height;
1208 resize_all_windows (width, height, 0); 1332 resize_all_windows (newwidth, newheight, 0);
1209 } 1333 }
1210} 1334}
1211 1335
1212/* -------------------------------------------------------------------- * 1336/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1337 * - X INPUT METHOD ROUTINES - *
… …
1223 1347
1224void 1348void
1225rxvt_term::im_set_size (XRectangle &size) 1349rxvt_term::im_set_size (XRectangle &size)
1226{ 1350{
1227 // the int_bwidth terms make no sense to me 1351 // the int_bwidth terms make no sense to me
1228 size.x = TermWin.int_bwidth; 1352 size.x = int_bwidth;
1229 size.y = TermWin.int_bwidth; 1353 size.y = int_bwidth;
1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1354 size.width = Width2Pixel (ncol) + int_bwidth;
1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1355 size.height = Height2Pixel (nrow) + int_bwidth;
1232} 1356}
1233 1357
1234void 1358void
1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1359rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect, 1360 XRectangle &status_rect,
1237 const XRectangle &needed_rect) 1361 const XRectangle &needed_rect)
1238{ 1362{
1239 preedit_rect.x = needed_rect.width; 1363 preedit_rect.x = needed_rect.width;
1240 preedit_rect.y = 0; 1364 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1365 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight; 1366 preedit_rect.height = fheight;
1243 1367
1244 status_rect.x = 0; 1368 status_rect.x = 0;
1245 status_rect.y = 0; 1369 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1370 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1247 status_rect.height = TermWin.fheight; 1371 status_rect.height = fheight;
1248} 1372}
1249 1373
1250/* Checking whether input method is running. */ 1374/* Checking whether input method is running. */
1251bool 1375bool
1252rxvt_term::IMisRunning () 1376rxvt_term::IMisRunning ()
… …
1280{ 1404{
1281 XPoint nspot; 1405 XPoint nspot;
1282 XVaNestedList preedit_attr; 1406 XVaNestedList preedit_attr;
1283 1407
1284 if (!Input_Context 1408 if (!Input_Context
1285 || !TermWin.focus 1409 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1410 || !(input_style & XIMPreeditPosition))
1287 return; 1411 return;
1288 1412
1289 im_set_position (nspot); 1413 im_set_position (nspot);
1290 1414
… …
1326 XRectangle rect, status_rect, needed_rect; 1450 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1451 unsigned long fg, bg;
1328 const char *p; 1452 const char *p;
1329 char **s; 1453 char **s;
1330 XIMStyles *xim_styles; 1454 XIMStyles *xim_styles;
1455
1456 TEMP_ENV;
1331 1457
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1458 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1459 return false;
1334 1460
1335 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1461 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1538 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1539 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*", 1540 "*",
1415 TermWin.fheight, 1541 fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1, 1542 fheight + 1, fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2); 1543 fheight - 2, fheight + 2);
1418 1544
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1545 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string); 1546 &missing_charset_list, &missing_charset_count, &def_string);
1421 1547
1422 if (missing_charset_list) 1548 if (missing_charset_list)
… …
1468 NULL); 1594 NULL);
1469 } 1595 }
1470 1596
1471 Input_Context = XCreateIC (xim, 1597 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style, 1598 XNInputStyle, input_style,
1473 XNClientWindow, TermWin.vt, 1599 XNClientWindow, vt,
1474 XNFocusWindow, TermWin.parent[0], 1600 XNFocusWindow, parent[0],
1475 preedit_attr ? XNPreeditAttributes : NULL, 1601 preedit_attr ? XNPreeditAttributes : NULL,
1476 preedit_attr, 1602 preedit_attr,
1477 status_attr ? XNStatusAttributes : NULL, 1603 status_attr ? XNStatusAttributes : NULL,
1478 status_attr, NULL); 1604 status_attr, NULL);
1479 1605
… …
1496} 1622}
1497 1623
1498void 1624void
1499rxvt_term::im_cb () 1625rxvt_term::im_cb ()
1500{ 1626{
1501 int i, found, had_im; 1627 int i;
1502 const char *p; 1628 const char *p;
1503 char **s; 1629 char **s;
1504 char buf[IMBUFSIZ]; 1630 char buf[IMBUFSIZ];
1631
1632 SET_R (this);
1505 1633
1506 im_destroy (); 1634 im_destroy ();
1507 1635
1508 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1509 if (Input_Context) 1637 if (Input_Context)
… …
1561{ 1689{
1562 XRectangle preedit_rect, status_rect, *needed_rect; 1690 XRectangle preedit_rect, status_rect, *needed_rect;
1563 XVaNestedList preedit_attr, status_attr; 1691 XVaNestedList preedit_attr, status_attr;
1564 1692
1565 if (!Input_Context 1693 if (!Input_Context
1566 || !TermWin.focus 1694 || !focus
1567 || !(input_style & XIMPreeditArea) 1695 || !(input_style & XIMPreeditArea)
1568 || !IMisRunning ()) 1696 || !IMisRunning ())
1569 return; 1697 return;
1570 1698
1571 /* Getting the necessary width of preedit area */ 1699 /* Getting the necessary width of preedit area */

Diff Legend

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