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.139 by root, Wed Feb 16 21:37:10 2005 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 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
50 55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53static char curlocale[128]; 58static char curlocale[128], savelocale[128];
54 59
55bool 60bool
56rxvt_set_locale (const char *locale) 61rxvt_set_locale (const char *locale)
57{ 62{
58 if (!locale || !strncmp (locale, curlocale, 128)) 63 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 64 return false;
60 65
61 strncpy (curlocale, locale, 128); 66 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 67 setlocale (LC_CTYPE, curlocale);
63 return true; 68 return true;
69}
70
71bool
72rxvt_push_locale (const char *locale)
73{
74 strcpy (savelocale, curlocale);
75 rxvt_set_locale (locale);
76}
77
78void
79rxvt_pop_locale ()
80{
81 rxvt_set_locale (savelocale);
64} 82}
65 83
66#if ENABLE_COMBINING 84#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 85class rxvt_composite_vec rxvt_composite;
68 86
157 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 176#endif
159#ifdef USE_XIM 177#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
161#endif 179#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), 180 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 181 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 182 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 183 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 184 destroy_ev (this, &rxvt_term::destroy_cb),
196 pty.put (); 211 pty.put ();
197} 212}
198 213
199rxvt_term::~rxvt_term () 214rxvt_term::~rxvt_term ()
200{ 215{
216 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
217
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 219
203 emergency_cleanup (); 220 emergency_cleanup ();
204 221
205#if ENABLE_STYLES 222#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 223 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 224 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 225 delete fontset[i];
209#endif 226#endif
210 delete TermWin.fontset[0]; 227 delete fontset[0];
211 228
212 if (display) 229 if (display)
213 { 230 {
214 dDisp; 231 dDisp;
215 232
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 264#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 265 if (gc) XFreeGC (disp, gc);
249 266
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 267#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 268 delete menuBar.drawable;
252 //if (menuBar.win) 269 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 270 // XDestroyWindow (disp, menuBar.win);
254#endif 271#endif
255 delete TermWin.drawable; 272 delete drawable;
256 // destroy all windows 273 // destroy all windows
257 if (TermWin.parent[0] 274 if (parent[0])
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 275 XDestroyWindow (disp, parent[0]);
263 } 276 }
264 277
265 // TODO: free pixcolours, colours should become part of rxvt_display 278 // TODO: free pixcolours, colours should become part of rxvt_display
266 279
267 delete pix_colors_focused; 280 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 281#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 282 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
270#endif 286#endif
271 287
272 displays.put (display); 288 displays.put (display);
273 289
274 scr_release (); 290 scr_release ();
291 delete argv; 307 delete argv;
292 308
293#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
294 delete keyboard; 310 delete keyboard;
295#endif 311#endif
312}
313
314void
315rxvt_term::child_exit ()
316{
317 cmd_pid = 0;
318
319 if (!OPTION (Opt_hold))
320 destroy ();
296} 321}
297 322
298void 323void
299rxvt_term::destroy () 324rxvt_term::destroy ()
300{ 325{
421{ 446{
422 if (GET_R->allowedxerror == -1) 447 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
424 else 449 else
425 { 450 {
426 //TODO: GET_R is most likely not the terminal which caused the error 451 // GET_R is most likely not the terminal which caused the error,
427 //TODO: maybe just output the error and continue? 452 // so just output the error and continue
428#if ENABLE_FRILLS 453#if ENABLE_FRILLS
429 print_x_error (display, event); 454 print_x_error (display, event);
430#else 455#else
431 old_xerror_handler (display, event); 456 old_xerror_handler (display, event);
432#endif 457#endif
442 DisplayString (display)); 467 DisplayString (display));
443 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
445} 470}
446 471
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/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 473bool
464rxvt_term::init (int argc, const char *const *argv) 474rxvt_term::init (int argc, const char *const *argv)
465{ 475{
466 SET_R (this); 476 SET_R (this);
467 477
480 490
481#if MENUBAR_MAX 491#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]); 492 menubar_read (rs[Rs_menu]);
483#endif 493#endif
484#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 495 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
497#endif
498
499#if ENABLE_PERL
500 if (!rs[Rs_perl_ext_1])
501 rs[Rs_perl_ext_1] = "default";
502
503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
524 rxvt_perl.init (tainted);
525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526 }
487#endif 527#endif
488 528
489 create_windows (argc, argv); 529 create_windows (argc, argv);
490 530
491 dDisp; 531 dDisp;
497#if 0 537#if 0
498 XSynchronize (disp, True); 538 XSynchronize (disp, True);
499#endif 539#endif
500 540
501#ifdef HAVE_SCROLLBARS 541#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 542 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 543 resize_scrollbar (); /* create and map scrollbar */
504#endif 544#endif
505#if (MENUBAR_MAX) 545#if (MENUBAR_MAX)
506 if (menubar_visible ()) 546 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win); 547 XMapWindow (disp, menuBar.win);
508#endif 548#endif
509#ifdef TRANSPARENT 549#ifdef TRANSPARENT
510 if (options & Opt_transparent) 550 if (OPTION (Opt_transparent))
511 { 551 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 552 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 553 check_our_parents ();
514 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
515 } 555 }
516#endif 556#endif
517 557
518 XMapWindow (disp, TermWin.vt); 558 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 559 XMapWindow (disp, parent[0]);
520 560
521 set_colorfgbg (); 561 set_colorfgbg ();
522 562
523 init_command (cmd_argv); 563 init_command (cmd_argv);
524 564
525 free (cmd_argv); 565 free (cmd_argv);
526 566
567 if (pty.pty >= 0)
527 pty_ev.start (pty.pty, EVENT_READ); 568 pty_ev.start (pty.pty, EVENT_READ);
528 569
529 check_ev.start (); 570 check_ev.start ();
530 571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
531 return true; 574 return true;
532} 575}
576
577static struct sig_handlers
578{
579 sig_watcher sw_chld, sw_term, sw_int;
580
581 void sig_chld (sig_watcher &w)
582 {
583 // we are being called for every SIGCHLD, find the corresponding term
584 int pid;
585
586 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
587 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
588 if (pid == (*t)->cmd_pid)
589 {
590 (*t)->child_exit ();
591 break;
592 }
593 }
594
595 /*
596 * Catch a fatal signal and tidy up before quitting
597 */
598 void
599 sig_term (sig_watcher &w)
600 {
601#ifdef DEBUG_CMD
602 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
603#endif
604 rxvt_emergency_cleanup ();
605 signal (w.signum, SIG_DFL);
606 kill (getpid (), w.signum);
607 }
608
609 sig_handlers ()
610 : sw_chld (this, &sig_handlers::sig_chld),
611 sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term)
613 {
614 }
615} sig_handlers;
533 616
534void 617void
535rxvt_init () 618rxvt_init ()
536{ 619{
537 /* 620 /*
545 rxvt_privileges (IGNORE); 628 rxvt_privileges (IGNORE);
546 629
547 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
549 632
633 sig_handlers.sw_chld.start (SIGCHLD);
634 sig_handlers.sw_term.start (SIGTERM);
635 sig_handlers.sw_int.start (SIGINT);
636
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
552 639
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 641 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 642 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557 643
558/* ------------------------------------------------------------------------- * 644#ifdef USE_XGETDEFAULT
559 * SIGNAL HANDLING & EXIT HANDLER * 645 XrmInitialize ();
560 * ------------------------------------------------------------------------- */ 646#endif
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} 647}
579 648
580/* ------------------------------------------------------------------------- * 649/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 650 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 651 * ------------------------------------------------------------------------- */
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 658 rxvt_fatal ("memory allocation failure. aborting.\n");
590 659
591 return p; 660 return p;
592} 661}
593 662
594void * 663void *
595rxvt_calloc (size_t number, size_t size) 664rxvt_calloc (size_t number, size_t size)
596{ 665{
597 void *p = calloc (number, size); 666 void *p = calloc (number, size);
598 667
599 if (!p) 668 if (!p)
618 * ------------------------------------------------------------------------- */ 687 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 688/* take care of suid/sgid super-user (root) privileges */
620void 689void
621rxvt_privileges (rxvt_privaction action) 690rxvt_privileges (rxvt_privaction action)
622{ 691{
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__) 692#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 694 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 695# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 696# define setegid(a) setregid(-1, (a))
642 */ 706 */
643 seteuid (getuid ()); 707 seteuid (getuid ());
644 setegid (getgid ()); 708 setegid (getgid ());
645 break; 709 break;
646 case SAVE: 710 case SAVE:
647 euid = geteuid (); 711 saved_euid = geteuid ();
648 egid = getegid (); 712 saved_egid = getegid ();
649 break; 713 break;
650 case RESTORE: 714 case RESTORE:
651 seteuid (euid); 715 seteuid (saved_euid);
652 setegid (egid); 716 setegid (saved_egid);
653 break; 717 break;
654 } 718 }
655# else 719# else
656 switch (action) 720 switch (action)
657 { 721 {
670 734
671#ifdef UTMP_SUPPORT 735#ifdef UTMP_SUPPORT
672void 736void
673rxvt_term::privileged_utmp (rxvt_privaction action) 737rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 738{
675 if ((options & Opt_utmpInhibit) 739 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 740 || !pty.name || !*pty.name)
677 return; 741 return;
678 742
679 rxvt_privileges (RESTORE); 743 rxvt_privileges (RESTORE);
680 744
691/* 755/*
692 * window size/position calculcations for XSizeHint and other storage. 756 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 757 * if width/height are non-zero then override calculated width/height
694 */ 758 */
695void 759void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 760rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 761{
698 short recalc_x, recalc_y; 762 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 763 int x, y, sb_w, mb_h, flags;
700 unsigned int w, h; 764 unsigned int w, h;
701 unsigned int max_width, max_height; 765 unsigned int max_width, max_height;
702 dDisp; 766 dDisp;
703 767
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 768 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 769 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 770
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 771 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 772 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 773 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 774
711 recalc_x = recalc_y = 0; 775 recalc_x = recalc_y = 0;
712 flags = 0; 776 flags = 0;
777
713 if (!parsed_geometry) 778 if (!parsed_geometry)
714 { 779 {
715 parsed_geometry = 1; 780 parsed_geometry = 1;
781
716 if (rs[Rs_geometry]) 782 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 783 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 784
719 if (flags & WidthValue) 785 if (flags & WidthValue)
720 { 786 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 787 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 788 szHint.flags |= USSize;
723 } 789 }
724 790
725 if (flags & HeightValue) 791 if (flags & HeightValue)
726 { 792 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 793 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 794 szHint.flags |= USSize;
729 } 795 }
730 796
731 if (flags & XValue) 797 if (flags & XValue)
732 { 798 {
733 szHint.x = x; 799 szHint.x = x;
734 szHint.flags |= USPosition; 800 szHint.flags |= USPosition;
801
735 if (flags & XNegative) 802 if (flags & XNegative)
736 { 803 {
737 recalc_x = 1; 804 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 805 szHint.win_gravity = NorthEastGravity;
739 } 806 }
741 808
742 if (flags & YValue) 809 if (flags & YValue)
743 { 810 {
744 szHint.y = y; 811 szHint.y = y;
745 szHint.flags |= USPosition; 812 szHint.flags |= USPosition;
813
746 if (flags & YNegative) 814 if (flags & YNegative)
747 { 815 {
748 recalc_y = 1; 816 recalc_y = 1;
817
749 if (szHint.win_gravity == NorthEastGravity) 818 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 819 szHint.win_gravity = SouthEastGravity;
751 else 820 else
752 szHint.win_gravity = SouthWestGravity; 821 szHint.win_gravity = SouthWestGravity;
753 } 822 }
754 } 823 }
755 } 824 }
756 825
757 /* TODO: BOUNDS */ 826 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 827 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 828 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 829 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 830 max_height = MAX_ROWS * fheight;
762 831
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 832 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 833
765 sb_w = mb_h = 0; 834 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 835 window_vt_x = window_vt_y = int_bwidth;
767 836
768 if (scrollbar_visible ()) 837 if (scrollbar_visible ())
769 { 838 {
770 sb_w = scrollbar_TotalWidth (); 839 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 840 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 841 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 842 window_vt_x += sb_w;
774 } 843 }
775 844
776 if (menubar_visible ()) 845 if (menubar_visible ())
777 { 846 {
778 mb_h = menuBar_TotalHeight (); 847 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h; 848 szHint.base_height += mb_h;
780 window_vt_y += mb_h; 849 window_vt_y += mb_h;
781 } 850 }
782 851
783 szHint.width_inc = TermWin.fwidth; 852 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 853 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 854 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 855 szHint.min_height = szHint.base_height + szHint.height_inc;
787 856
788 if (width && width - szHint.base_width < max_width) 857 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 858 {
790 szHint.width = width; 859 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 860 width = newwidth - szHint.base_width;
792 } 861 }
793 else 862 else
794 { 863 {
795 MIN_IT (TermWin.width, max_width); 864 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 865 szHint.width = szHint.base_width + width;
797 } 866 }
798 867
799 if (height && height - szHint.base_height < max_height) 868 if (newheight && newheight - szHint.base_height < max_height)
800 { 869 {
801 szHint.height = height; 870 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 871 height = newheight - szHint.base_height;
803 } 872 }
804 else 873 else
805 { 874 {
806 MIN_IT (TermWin.height, max_height); 875 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 876 szHint.height = szHint.base_height + height;
808 } 877 }
809 878
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 879 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 880 window_sb_x = szHint.width - sb_w;
812 881
813 if (recalc_x) 882 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 883 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 884 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 885 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 886
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 887 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 888 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 889 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 890 ncol, nrow, szHint.width,
824 szHint.height)); 891 szHint.height));
825 return; 892 return;
826} 893}
827 894
828/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
836 if (pty.pty < 0) 903 if (pty.pty < 0)
837 return; 904 return;
838 905
839 struct winsize ws; 906 struct winsize ws;
840 907
841 ws.ws_col = TermWin.ncol; 908 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 909 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 910 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 911 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 912 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846 913
847#if 0 914#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 915 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 916 if (cmd_pid) /* force through to the command */
850 kill (cmd_pid, SIGWINCH); 917 kill (-cmd_pid, SIGWINCH);
851#endif 918#endif
852} 919}
853 920
854/*----------------------------------------------------------------------*/ 921/*----------------------------------------------------------------------*/
855/* set_fonts () - load and set the various fonts 922/* set_fonts () - load and set the various fonts
856/* 923 *
857 * init = 1 - initialize 924 * init = 1 - initialize
858 * 925 *
859 * fontname == FONT_UP - switch to bigger font 926 * fontname == FONT_UP - switch to bigger font
860 * fontname == FONT_DN - switch to smaller font 927 * fontname == FONT_DN - switch to smaller font
861 */ 928 */
873 return false; 940 return false;
874 } 941 }
875 942
876#if ENABLE_STYLES 943#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 944 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 945 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 946 delete fontset[i];
880#endif 947#endif
881 948
882 delete TermWin.fontset[0]; 949 delete fontset[0];
883 TermWin.fontset[0] = fs; 950 fontset[0] = fs;
884 951
885 prop = (*fs)[1]->properties (); 952 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 953 prop.height += lineSpace;
887 fs->set_prop (prop); 954 fs->set_prop (prop);
888 955
889 TermWin.fwidth = prop.width; 956 fwidth = prop.width;
890 TermWin.fheight = prop.height; 957 fheight = prop.height;
891 TermWin.fweight = prop.weight; 958 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 959
895 for (int style = 1; style < 4; style++) 960 for (int style = 1; style < 4; style++)
896 { 961 {
897#if ENABLE_STYLES 962#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 963 const char *res = rs[Rs_font + style];
899 964
900 if (res && !*res) 965 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 966 fontset[style] = fontset[0];
902 else 967 else
903 { 968 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 969 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 970 rxvt_fontprop prop2 = prop;
906 971
907 if (res) 972 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 973 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 974 else
910 { 975 {
911 res = TermWin.fontset[0]->fontdesc; 976 res = fontset[0]->fontdesc;
912 977
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 978 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; 979 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 980 }
916 981
917 fs->populate (res); 982 fs->populate (res);
918 fs->set_prop (prop2); 983 fs->set_prop (prop2);
919 } 984 }
920#else 985#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 986 fontset[style] = fontset[0];
922#endif 987#endif
923 } 988 }
924 989
925 if (TermWin.parent[0]) 990 if (parent[0])
926 { 991 {
927 resize_all_windows (0, 0, 0); 992 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 993 scr_remap_chars ();
929 scr_touch (true); 994 scr_touch (true);
930 } 995 }
932 return true; 997 return true;
933} 998}
934 999
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1000void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 1001{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 1002 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 1003 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1004 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 1005}
942 1006
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1007void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 1008{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 1009 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 1010 char *s = rxvt_wcstoutf8 (ws);
948 1011
949 XChangeProperty (display->display, TermWin.parent[0], 1012 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1013 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 1014 (const unsigned char *)s, strlen (s));
952 1015
953 free (s); 1016 free (s);
954 free (ws); 1017 free (ws);
959/* xterm sequences - title, iconName, color (exptl) */ 1022/* xterm sequences - title, iconName, color (exptl) */
960void 1023void
961rxvt_term::set_title (const char *str) 1024rxvt_term::set_title (const char *str)
962{ 1025{
963 set_string_property (XA_WM_NAME, str); 1026 set_string_property (XA_WM_NAME, str);
964#if ENABLE_FRILLS 1027#if ENABLE_EWMH
965 set_utf8_property (xa[XA_NET_WM_NAME], str); 1028 set_utf8_property (xa[XA_NET_WM_NAME], str);
966#endif 1029#endif
967} 1030}
968 1031
969void 1032void
970rxvt_term::set_icon_name (const char *str) 1033rxvt_term::set_icon_name (const char *str)
971{ 1034{
972 set_string_property (XA_WM_ICON_NAME, str); 1035 set_string_property (XA_WM_ICON_NAME, str);
973#if ENABLE_FRILLS 1036#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1037 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 1038#endif
976} 1039}
977 1040
978#ifdef XTERM_COLOR_CHANGE 1041#ifdef XTERM_COLOR_CHANGE
991 i = atoi (color); 1054 i = atoi (color);
992 1055
993 if (i >= 8 && i <= 15) 1056 if (i >= 8 && i <= 15)
994 { /* bright colors */ 1057 { /* bright colors */
995 i -= 8; 1058 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1059 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 1060 SET_PIXCOLOR (idx);
999 goto Done; 1061 goto done;
1000# endif
1001 } 1062 }
1002 1063
1003 if (i >= 0 && i <= 7) 1064 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 1065 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1066 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx); 1067 SET_PIXCOLOR (idx);
1007 goto Done; 1068 goto done;
1008 } 1069 }
1009 } 1070 }
1010 1071
1011 if (!rXParseAllocColor (&xcol, color)) 1072 if (!rXParseAllocColor (&xcol, color))
1012 return; 1073 return;
1032 pix_colors_focused[idx] = xcol; 1093 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx); 1094 SET_PIXCOLOR (idx);
1034 1095
1035 /* XSetWindowAttributes attr; */ 1096 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */ 1097 /* Cursor cursor; */
1037Done: 1098done:
1099
1038#ifdef OFF_FOCUS_FADING 1100#if OFF_FOCUS_FADING
1039 if (rs[Rs_fade]) 1101 if (rs[Rs_fade])
1040 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1102 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1041#endif 1103#endif
1042 1104
1043 /*TODO: handle Color_BD, scrollbar background, etc. */ 1105 /*TODO: handle Color_BD, scrollbar background, etc. */
1044 1106
1045 recolour_cursor (); 1107 recolour_cursor ();
1116 1178
1117/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1118 * - WINDOW RESIZING - * 1180 * - WINDOW RESIZING - *
1119 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1120void 1182void
1121rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1183rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1122{ 1184{
1123 int fix_screen; 1185 int fix_screen;
1124#ifdef SMART_RESIZE
1125 int old_width = szHint.width, old_height = szHint.height; 1186 int old_width = szHint.width, old_height = szHint.height;
1126#endif
1127 dDisp; 1187 dDisp;
1128 1188
1129 window_calc (width, height); 1189 window_calc (newwidth, newheight);
1130 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1190 XSetWMNormalHints (disp, parent[0], &szHint);
1131 1191
1132 if (!ignoreparent) 1192 if (!ignoreparent)
1133 { 1193 {
1134#ifdef SMART_RESIZE 1194#ifdef SMART_RESIZE
1135 /* 1195 /*
1139 int x, y, x1, y1; 1199 int x, y, x1, y1;
1140 int dx, dy; 1200 int dx, dy;
1141 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1201 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1142 Window unused_cr; 1202 Window unused_cr;
1143 1203
1144 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1204 XTranslateCoordinates (disp, parent[0], display->root,
1145 0, 0, &x, &y, &unused_cr); 1205 0, 0, &x, &y, &unused_cr);
1146 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1206 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1147 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1207 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1148 /* 1208 /*
1149 * if display->root isn't the parent window, a WM will probably have offset 1209 * if display->root isn't the parent window, a WM will probably have offset
1150 * our position for handles and decorations. Counter it 1210 * our position for handles and decorations. Counter it
1151 */ 1211 */
1168 if (y < y1) /* top half */ 1228 if (y < y1) /* top half */
1169 dy = 0; 1229 dy = 0;
1170 else if (y == y1) /* exact center */ 1230 else if (y == y1) /* exact center */
1171 dy /= 2; 1231 dy /= 2;
1172 1232
1173 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1233 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1174 szHint.width, szHint.height); 1234 szHint.width, szHint.height);
1175#else 1235#else
1176 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1236 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1177#endif 1237#endif
1178 } 1238 }
1179 1239
1180 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1240 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1181 1241
1182 if (fix_screen || width != old_width || height != old_height) 1242 if (fix_screen || newwidth != old_width || newheight != old_height)
1183 { 1243 {
1184 if (scrollbar_visible ()) 1244 if (scrollbar_visible ())
1185 { 1245 {
1186 XMoveResizeWindow (disp, scrollBar.win, 1246 XMoveResizeWindow (disp, scrollBar.win,
1187 window_sb_x, 0, 1247 window_sb_x, 0,
1190 } 1250 }
1191 1251
1192 if (menubar_visible ()) 1252 if (menubar_visible ())
1193 XMoveResizeWindow (disp, menuBar.win, 1253 XMoveResizeWindow (disp, menuBar.win,
1194 window_vt_x, 0, 1254 window_vt_x, 0,
1195 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1255 width, menuBar_TotalHeight ());
1196 1256
1197 XMoveResizeWindow (disp, TermWin.vt, 1257 XMoveResizeWindow (disp, vt,
1198 window_vt_x, window_vt_y, 1258 window_vt_x, window_vt_y,
1199 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1259 width, height);
1200 1260
1201 scr_clear (); 1261 scr_clear ();
1202#ifdef XPM_BACKGROUND 1262#ifdef XPM_BACKGROUND
1203 resize_pixmap (); 1263 resize_pixmap ();
1204#endif 1264#endif
1210 int old_ncol = prev_ncol; 1270 int old_ncol = prev_ncol;
1211 1271
1212 /* scr_reset only works on the primary screen */ 1272 /* scr_reset only works on the primary screen */
1213 if (old_height) /* this is not the first time through */ 1273 if (old_height) /* this is not the first time through */
1214 { 1274 {
1215 unsigned int ncol = TermWin.ncol; 1275 unsigned int ocol = ncol;
1216 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1217 curr_screen = scr_change_screen (PRIMARY); 1277 curr_screen = scr_change_screen (PRIMARY);
1218 TermWin.ncol = ncol; 1278 ncol = ocol;
1219 } 1279 }
1220 1280
1221 scr_reset (); 1281 scr_reset ();
1222 1282
1223 if (curr_screen >= 0) /* this is not the first time through */ 1283 if (curr_screen >= 0) /* this is not the first time through */
1224 { 1284 {
1225 scr_change_screen (curr_screen); 1285 scr_change_screen (curr_screen);
1226 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1286 selection_check (old_ncol != ncol ? 4 : 0);
1227 } 1287 }
1228 } 1288 }
1229 1289
1230 old_width = szHint.width; 1290 old_width = szHint.width;
1231 old_height = szHint.height; 1291 old_height = szHint.height;
1232 1292
1233#ifdef XPM_BACKGROUND 1293#ifdef XPM_BACKGROUND
1234 if (TermWin.pixmap) 1294 if (pixmap)
1235 scr_touch (false); 1295 scr_touch (false);
1236#endif 1296#endif
1237 1297
1238#ifdef USE_XIM 1298#ifdef USE_XIM
1239 IMSetStatusPosition (); 1299 IMSetStatusPosition ();
1243/* 1303/*
1244 * Set the width/height of the vt window in characters. Units are pixels. 1304 * Set the width/height of the vt window in characters. Units are pixels.
1245 * good for toggling 80/132 columns 1305 * good for toggling 80/132 columns
1246 */ 1306 */
1247void 1307void
1248rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1308rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1249{ 1309{
1250 XWindowAttributes wattr; 1310 XWindowAttributes wattr;
1251 1311
1252 if (width == 0 || height == 0) 1312 if (newwidth == 0 || newheight == 0)
1253 { 1313 {
1254 XGetWindowAttributes (display->display, display->root, &wattr); 1314 XGetWindowAttributes (display->display, display->root, &wattr);
1315
1255 if (width == 0) 1316 if (newwidth == 0)
1256 width = wattr.width - szHint.base_width; 1317 newwidth = wattr.width - szHint.base_width;
1257 if (height == 0) 1318 if (newheight == 0)
1258 height = wattr.height - szHint.base_height; 1319 newheight = wattr.height - szHint.base_height;
1259 }
1260
1261 if (width != TermWin.width || height != TermWin.height)
1262 { 1320 }
1321
1322 if (newwidth != width || newheight != height)
1323 {
1263 width += szHint.base_width; 1324 newwidth += szHint.base_width;
1264 height += szHint.base_height; 1325 newheight += szHint.base_height;
1265 resize_all_windows (width, height, 0); 1326 resize_all_windows (newwidth, newheight, 0);
1266 } 1327 }
1267} 1328}
1268 1329
1269/* -------------------------------------------------------------------- * 1330/* -------------------------------------------------------------------- *
1270 * - X INPUT METHOD ROUTINES - * 1331 * - X INPUT METHOD ROUTINES - *
1280 1341
1281void 1342void
1282rxvt_term::im_set_size (XRectangle &size) 1343rxvt_term::im_set_size (XRectangle &size)
1283{ 1344{
1284 // the int_bwidth terms make no sense to me 1345 // the int_bwidth terms make no sense to me
1285 size.x = TermWin.int_bwidth; 1346 size.x = int_bwidth;
1286 size.y = TermWin.int_bwidth; 1347 size.y = int_bwidth;
1287 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1348 size.width = Width2Pixel (ncol) + int_bwidth;
1288 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1349 size.height = Height2Pixel (nrow) + int_bwidth;
1289} 1350}
1290 1351
1291void 1352void
1292rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1353rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293 XRectangle &status_rect, 1354 XRectangle &status_rect,
1294 const XRectangle &needed_rect) 1355 const XRectangle &needed_rect)
1295{ 1356{
1296 preedit_rect.x = needed_rect.width; 1357 preedit_rect.x = needed_rect.width;
1297 preedit_rect.y = 0; 1358 preedit_rect.y = 0;
1298 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1359 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1299 preedit_rect.height = TermWin.fheight; 1360 preedit_rect.height = fheight;
1300 1361
1301 status_rect.x = 0; 1362 status_rect.x = 0;
1302 status_rect.y = 0; 1363 status_rect.y = 0;
1303 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1364 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1304 status_rect.height = TermWin.fheight; 1365 status_rect.height = fheight;
1305} 1366}
1306 1367
1307/* Checking whether input method is running. */ 1368/* Checking whether input method is running. */
1308bool 1369bool
1309rxvt_term::IMisRunning () 1370rxvt_term::IMisRunning ()
1337{ 1398{
1338 XPoint nspot; 1399 XPoint nspot;
1339 XVaNestedList preedit_attr; 1400 XVaNestedList preedit_attr;
1340 1401
1341 if (!Input_Context 1402 if (!Input_Context
1342 || !TermWin.focus 1403 || !focus
1343 || !(input_style & XIMPreeditPosition)) 1404 || !(input_style & XIMPreeditPosition))
1344 return; 1405 return;
1345 1406
1346 im_set_position (nspot); 1407 im_set_position (nspot);
1347 1408
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1528 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1529 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1530 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1531 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "*", 1532 "*",
1472 TermWin.fheight, 1533 fheight,
1473 TermWin.fheight + 1, TermWin.fheight - 1, 1534 fheight + 1, fheight - 1,
1474 TermWin.fheight - 2, TermWin.fheight + 2); 1535 fheight - 2, fheight + 2);
1475 1536
1476 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1537 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477 &missing_charset_list, &missing_charset_count, &def_string); 1538 &missing_charset_list, &missing_charset_count, &def_string);
1478 1539
1479 if (missing_charset_list) 1540 if (missing_charset_list)
1525 NULL); 1586 NULL);
1526 } 1587 }
1527 1588
1528 Input_Context = XCreateIC (xim, 1589 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style, 1590 XNInputStyle, input_style,
1530 XNClientWindow, TermWin.vt, 1591 XNClientWindow, vt,
1531 XNFocusWindow, TermWin.parent[0], 1592 XNFocusWindow, parent[0],
1532 preedit_attr ? XNPreeditAttributes : NULL, 1593 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr, 1594 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL, 1595 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL); 1596 status_attr, NULL);
1536 1597
1553} 1614}
1554 1615
1555void 1616void
1556rxvt_term::im_cb () 1617rxvt_term::im_cb ()
1557{ 1618{
1558 int i, found, had_im; 1619 int i;
1559 const char *p; 1620 const char *p;
1560 char **s; 1621 char **s;
1561 char buf[IMBUFSIZ]; 1622 char buf[IMBUFSIZ];
1562 1623
1563 SET_R (this); 1624 SET_R (this);
1620{ 1681{
1621 XRectangle preedit_rect, status_rect, *needed_rect; 1682 XRectangle preedit_rect, status_rect, *needed_rect;
1622 XVaNestedList preedit_attr, status_attr; 1683 XVaNestedList preedit_attr, status_attr;
1623 1684
1624 if (!Input_Context 1685 if (!Input_Context
1625 || !TermWin.focus 1686 || !focus
1626 || !(input_style & XIMPreeditArea) 1687 || !(input_style & XIMPreeditArea)
1627 || !IMisRunning ()) 1688 || !IMisRunning ())
1628 return; 1689 return;
1629 1690
1630 /* Getting the necessary width of preedit area */ 1691 /* Getting the necessary width of preedit area */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines