ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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