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.146 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.182 by root, Tue Jan 17 10:14:26 2006 UTC

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

Diff Legend

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