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

Diff Legend

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