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.145 by root, Thu Aug 11 02:05:07 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 XDestroyWindow (disp, TermWin.parent[0]); 275 XDestroyWindow (disp, parent[0]);
259 } 276 }
260 277
261 // TODO: free pixcolours, colours should become part of rxvt_display 278 // TODO: free pixcolours, colours should become part of rxvt_display
262 279
263 delete pix_colors_focused; 280 delete pix_colors_focused;
264#if OFF_FOCUS_FADING 281#if OFF_FOCUS_FADING
265 delete pix_colors_unfocused; 282 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
266#endif 286#endif
267 287
268 displays.put (display); 288 displays.put (display);
269 289
270 scr_release (); 290 scr_release ();
… …
287 delete argv; 307 delete argv;
288 308
289#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
290 delete keyboard; 310 delete keyboard;
291#endif 311#endif
312}
313
314void
315rxvt_term::child_exit ()
316{
317 cmd_pid = 0;
318
319 if (!OPTION (Opt_hold))
320 destroy ();
292} 321}
293 322
294void 323void
295rxvt_term::destroy () 324rxvt_term::destroy ()
296{ 325{
… …
417{ 446{
418 if (GET_R->allowedxerror == -1) 447 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
420 else 449 else
421 { 450 {
422 //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,
423 //TODO: maybe just output the error and continue? 452 // so just output the error and continue
424#if ENABLE_FRILLS 453#if ENABLE_FRILLS
425 print_x_error (display, event); 454 print_x_error (display, event);
426#else 455#else
427 old_xerror_handler (display, event); 456 old_xerror_handler (display, event);
428#endif 457#endif
… …
438 DisplayString (display)); 467 DisplayString (display));
439 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
441} 470}
442 471
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/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 473bool
460rxvt_term::init (int argc, const char *const *argv) 474rxvt_term::init (int argc, const char *const *argv)
461{ 475{
462 SET_R (this); 476 SET_R (this);
463 477
… …
476 490
477#if MENUBAR_MAX 491#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]); 492 menubar_read (rs[Rs_menu]);
479#endif 493#endif
480#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 495 if (OPTION (Opt_scrollBar))
482 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 }
483#endif 527#endif
484 528
485 create_windows (argc, argv); 529 create_windows (argc, argv);
486 530
487 dDisp; 531 dDisp;
… …
493#if 0 537#if 0
494 XSynchronize (disp, True); 538 XSynchronize (disp, True);
495#endif 539#endif
496 540
497#ifdef HAVE_SCROLLBARS 541#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 542 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 543 resize_scrollbar (); /* create and map scrollbar */
500#endif 544#endif
501#if (MENUBAR_MAX) 545#if (MENUBAR_MAX)
502 if (menubar_visible ()) 546 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win); 547 XMapWindow (disp, menuBar.win);
504#endif 548#endif
505#ifdef TRANSPARENT 549#ifdef TRANSPARENT
506 if (options & Opt_transparent) 550 if (OPTION (Opt_transparent))
507 { 551 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 552 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 553 check_our_parents ();
510 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
511 } 555 }
512#endif 556#endif
513 557
514 XMapWindow (disp, TermWin.vt); 558 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 559 XMapWindow (disp, parent[0]);
516 560
517 set_colorfgbg (); 561 set_colorfgbg ();
518 562
519 init_command (cmd_argv); 563 init_command (cmd_argv);
520 564
521 free (cmd_argv); 565 free (cmd_argv);
522 566
567 if (pty.pty >= 0)
523 pty_ev.start (pty.pty, EVENT_READ); 568 pty_ev.start (pty.pty, EVENT_READ);
524 569
525 check_ev.start (); 570 check_ev.start ();
526 571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
527 return true; 574 return true;
528} 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;
529 616
530void 617void
531rxvt_init () 618rxvt_init ()
532{ 619{
533 /* 620 /*
… …
541 rxvt_privileges (IGNORE); 628 rxvt_privileges (IGNORE);
542 629
543 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
545 632
633 sig_handlers.sw_chld.start (SIGCHLD);
634 sig_handlers.sw_term.start (SIGTERM);
635 sig_handlers.sw_int.start (SIGINT);
636
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
548 639
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 641 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 642 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553 643
554/* ------------------------------------------------------------------------- * 644#ifdef USE_XGETDEFAULT
555 * SIGNAL HANDLING & EXIT HANDLER * 645 XrmInitialize ();
556 * ------------------------------------------------------------------------- */ 646#endif
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} 647}
575 648
576/* ------------------------------------------------------------------------- * 649/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 650 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 651 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 658 rxvt_fatal ("memory allocation failure. aborting.\n");
586 659
587 return p; 660 return p;
588} 661}
589 662
590void * 663void *
591rxvt_calloc (size_t number, size_t size) 664rxvt_calloc (size_t number, size_t size)
592{ 665{
593 void *p = calloc (number, size); 666 void *p = calloc (number, size);
594 667
595 if (!p) 668 if (!p)
… …
614 * ------------------------------------------------------------------------- */ 687 * ------------------------------------------------------------------------- */
615/* take care of suid/sgid super-user (root) privileges */ 688/* take care of suid/sgid super-user (root) privileges */
616void 689void
617rxvt_privileges (rxvt_privaction action) 690rxvt_privileges (rxvt_privaction action)
618{ 691{
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__) 692#if ! defined(__CYGWIN32__)
625# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
626 /* setreuid () is the poor man's setuid (), seteuid () */ 694 /* setreuid () is the poor man's setuid (), seteuid () */
627# define seteuid(a) setreuid(-1, (a)) 695# define seteuid(a) setreuid(-1, (a))
628# define setegid(a) setregid(-1, (a)) 696# define setegid(a) setregid(-1, (a))
… …
638 */ 706 */
639 seteuid (getuid ()); 707 seteuid (getuid ());
640 setegid (getgid ()); 708 setegid (getgid ());
641 break; 709 break;
642 case SAVE: 710 case SAVE:
643 euid = geteuid (); 711 saved_euid = geteuid ();
644 egid = getegid (); 712 saved_egid = getegid ();
645 break; 713 break;
646 case RESTORE: 714 case RESTORE:
647 seteuid (euid); 715 seteuid (saved_euid);
648 setegid (egid); 716 setegid (saved_egid);
649 break; 717 break;
650 } 718 }
651# else 719# else
652 switch (action) 720 switch (action)
653 { 721 {
… …
666 734
667#ifdef UTMP_SUPPORT 735#ifdef UTMP_SUPPORT
668void 736void
669rxvt_term::privileged_utmp (rxvt_privaction action) 737rxvt_term::privileged_utmp (rxvt_privaction action)
670{ 738{
671 if ((options & Opt_utmpInhibit) 739 if (OPTION (Opt_utmpInhibit)
672 || !pty.name || !*pty.name) 740 || !pty.name || !*pty.name)
673 return; 741 return;
674 742
675 rxvt_privileges (RESTORE); 743 rxvt_privileges (RESTORE);
676 744
… …
687/* 755/*
688 * window size/position calculcations for XSizeHint and other storage. 756 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 757 * if width/height are non-zero then override calculated width/height
690 */ 758 */
691void 759void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 760rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 761{
694 short recalc_x, recalc_y; 762 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 763 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 764 unsigned int w, h;
697 unsigned int max_width, max_height; 765 unsigned int max_width, max_height;
698 dDisp; 766 dDisp;
699 767
700 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",
701 TermWin.ncol, TermWin.nrow, szHint.width, 769 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 770
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 771 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 772 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 773 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 774
707 recalc_x = recalc_y = 0; 775 recalc_x = recalc_y = 0;
708 flags = 0; 776 flags = 0;
777
709 if (!parsed_geometry) 778 if (!parsed_geometry)
710 { 779 {
711 parsed_geometry = 1; 780 parsed_geometry = 1;
781
712 if (rs[Rs_geometry]) 782 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 783 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 784
715 if (flags & WidthValue) 785 if (flags & WidthValue)
716 { 786 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 787 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 788 szHint.flags |= USSize;
719 } 789 }
720 790
721 if (flags & HeightValue) 791 if (flags & HeightValue)
722 { 792 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 793 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 794 szHint.flags |= USSize;
725 } 795 }
726 796
727 if (flags & XValue) 797 if (flags & XValue)
728 { 798 {
729 szHint.x = x; 799 szHint.x = x;
730 szHint.flags |= USPosition; 800 szHint.flags |= USPosition;
801
731 if (flags & XNegative) 802 if (flags & XNegative)
732 { 803 {
733 recalc_x = 1; 804 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 805 szHint.win_gravity = NorthEastGravity;
735 } 806 }
… …
737 808
738 if (flags & YValue) 809 if (flags & YValue)
739 { 810 {
740 szHint.y = y; 811 szHint.y = y;
741 szHint.flags |= USPosition; 812 szHint.flags |= USPosition;
813
742 if (flags & YNegative) 814 if (flags & YNegative)
743 { 815 {
744 recalc_y = 1; 816 recalc_y = 1;
817
745 if (szHint.win_gravity == NorthEastGravity) 818 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 819 szHint.win_gravity = SouthEastGravity;
747 else 820 else
748 szHint.win_gravity = SouthWestGravity; 821 szHint.win_gravity = SouthWestGravity;
749 } 822 }
750 } 823 }
751 } 824 }
752 825
753 /* TODO: BOUNDS */ 826 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 827 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 828 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 829 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 830 max_height = MAX_ROWS * fheight;
758 831
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 832 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 833
761 sb_w = mb_h = 0; 834 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 835 window_vt_x = window_vt_y = int_bwidth;
763 836
764 if (scrollbar_visible ()) 837 if (scrollbar_visible ())
765 { 838 {
766 sb_w = scrollbar_TotalWidth (); 839 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 840 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 841 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 842 window_vt_x += sb_w;
770 } 843 }
771 844
772 if (menubar_visible ()) 845 if (menubar_visible ())
773 { 846 {
774 mb_h = menuBar_TotalHeight (); 847 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 848 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 849 window_vt_y += mb_h;
777 } 850 }
778 851
779 szHint.width_inc = TermWin.fwidth; 852 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 853 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 854 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 855 szHint.min_height = szHint.base_height + szHint.height_inc;
783 856
784 if (width && width - szHint.base_width < max_width) 857 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 858 {
786 szHint.width = width; 859 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 860 width = newwidth - szHint.base_width;
788 } 861 }
789 else 862 else
790 { 863 {
791 MIN_IT (TermWin.width, max_width); 864 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 865 szHint.width = szHint.base_width + width;
793 } 866 }
794 867
795 if (height && height - szHint.base_height < max_height) 868 if (newheight && newheight - szHint.base_height < max_height)
796 { 869 {
797 szHint.height = height; 870 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 871 height = newheight - szHint.base_height;
799 } 872 }
800 else 873 else
801 { 874 {
802 MIN_IT (TermWin.height, max_height); 875 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 876 szHint.height = szHint.base_height + height;
804 } 877 }
805 878
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 879 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 880 window_sb_x = szHint.width - sb_w;
808 881
809 if (recalc_x) 882 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 883 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 884 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 885 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 886
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 887 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 888 nrow = height / fheight;
818 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",
819 TermWin.ncol, TermWin.nrow, szHint.width, 890 ncol, nrow, szHint.width,
820 szHint.height)); 891 szHint.height));
821 return; 892 return;
822} 893}
823 894
824/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 903 if (pty.pty < 0)
833 return; 904 return;
834 905
835 struct winsize ws; 906 struct winsize ws;
836 907
837 ws.ws_col = TermWin.ncol; 908 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 909 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 910 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 911 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 912 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 913
843#if 0 914#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 915 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 916 if (cmd_pid) /* force through to the command */
… …
847#endif 918#endif
848} 919}
849 920
850/*----------------------------------------------------------------------*/ 921/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 922/* set_fonts () - load and set the various fonts
852/* 923 *
853 * init = 1 - initialize 924 * init = 1 - initialize
854 * 925 *
855 * fontname == FONT_UP - switch to bigger font 926 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 927 * fontname == FONT_DN - switch to smaller font
857 */ 928 */
… …
869 return false; 940 return false;
870 } 941 }
871 942
872#if ENABLE_STYLES 943#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 944 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 945 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 946 delete fontset[i];
876#endif 947#endif
877 948
878 delete TermWin.fontset[0]; 949 delete fontset[0];
879 TermWin.fontset[0] = fs; 950 fontset[0] = fs;
880 951
881 prop = (*fs)[1]->properties (); 952 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 953 prop.height += lineSpace;
883 fs->set_prop (prop); 954 fs->set_prop (prop);
884 955
885 TermWin.fwidth = prop.width; 956 fwidth = prop.width;
886 TermWin.fheight = prop.height; 957 fheight = prop.height;
887 TermWin.fweight = prop.weight; 958 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 959
891 for (int style = 1; style < 4; style++) 960 for (int style = 1; style < 4; style++)
892 { 961 {
893#if ENABLE_STYLES 962#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 963 const char *res = rs[Rs_font + style];
895 964
896 if (res && !*res) 965 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 966 fontset[style] = fontset[0];
898 else 967 else
899 { 968 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 969 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 970 rxvt_fontprop prop2 = prop;
902 971
903 if (res) 972 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 973 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 974 else
906 { 975 {
907 res = TermWin.fontset[0]->fontdesc; 976 res = fontset[0]->fontdesc;
908 977
909 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;
910 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;
911 } 980 }
912 981
913 fs->populate (res); 982 fs->populate (res);
914 fs->set_prop (prop2); 983 fs->set_prop (prop2);
915 } 984 }
916#else 985#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 986 fontset[style] = fontset[0];
918#endif 987#endif
919 } 988 }
920 989
921 if (TermWin.parent[0]) 990 if (parent[0])
922 { 991 {
923 resize_all_windows (0, 0, 0); 992 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 993 scr_remap_chars ();
925 scr_touch (true); 994 scr_touch (true);
926 } 995 }
… …
928 return true; 997 return true;
929} 998}
930 999
931void 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)
932{ 1001{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 1002 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 1003 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1004 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 1005}
938 1006
939void 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)
940{ 1008{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 1009 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 1010 char *s = rxvt_wcstoutf8 (ws);
944 1011
945 XChangeProperty (display->display, TermWin.parent[0], 1012 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1013 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 1014 (const unsigned char *)s, strlen (s));
948 1015
949 free (s); 1016 free (s);
950 free (ws); 1017 free (ws);
… …
987 i = atoi (color); 1054 i = atoi (color);
988 1055
989 if (i >= 8 && i <= 15) 1056 if (i >= 8 && i <= 15)
990 { /* bright colors */ 1057 { /* bright colors */
991 i -= 8; 1058 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1059 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 1060 SET_PIXCOLOR (idx);
995 goto done; 1061 goto done;
996# endif
997 } 1062 }
998 1063
999 if (i >= 0 && i <= 7) 1064 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 1065 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1066 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1113 1178
1114/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1180 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1117void 1182void
1118rxvt_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)
1119{ 1184{
1120 int fix_screen; 1185 int fix_screen;
1121#ifdef SMART_RESIZE
1122 int old_width = szHint.width, old_height = szHint.height; 1186 int old_width = szHint.width, old_height = szHint.height;
1123#endif
1124 dDisp; 1187 dDisp;
1125 1188
1126 window_calc (width, height); 1189 window_calc (newwidth, newheight);
1127 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1190 XSetWMNormalHints (disp, parent[0], &szHint);
1128 1191
1129 if (!ignoreparent) 1192 if (!ignoreparent)
1130 { 1193 {
1131#ifdef SMART_RESIZE 1194#ifdef SMART_RESIZE
1132 /* 1195 /*
… …
1136 int x, y, x1, y1; 1199 int x, y, x1, y1;
1137 int dx, dy; 1200 int dx, dy;
1138 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1201 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1139 Window unused_cr; 1202 Window unused_cr;
1140 1203
1141 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1204 XTranslateCoordinates (disp, parent[0], display->root,
1142 0, 0, &x, &y, &unused_cr); 1205 0, 0, &x, &y, &unused_cr);
1143 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1206 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1144 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1207 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1145 /* 1208 /*
1146 * 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
1147 * our position for handles and decorations. Counter it 1210 * our position for handles and decorations. Counter it
1148 */ 1211 */
… …
1165 if (y < y1) /* top half */ 1228 if (y < y1) /* top half */
1166 dy = 0; 1229 dy = 0;
1167 else if (y == y1) /* exact center */ 1230 else if (y == y1) /* exact center */
1168 dy /= 2; 1231 dy /= 2;
1169 1232
1170 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1233 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1171 szHint.width, szHint.height); 1234 szHint.width, szHint.height);
1172#else 1235#else
1173 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1236 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1174#endif 1237#endif
1175 } 1238 }
1176 1239
1177 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1240 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1178 1241
1179 if (fix_screen || width != old_width || height != old_height) 1242 if (fix_screen || newwidth != old_width || newheight != old_height)
1180 { 1243 {
1181 if (scrollbar_visible ()) 1244 if (scrollbar_visible ())
1182 { 1245 {
1183 XMoveResizeWindow (disp, scrollBar.win, 1246 XMoveResizeWindow (disp, scrollBar.win,
1184 window_sb_x, 0, 1247 window_sb_x, 0,
… …
1187 } 1250 }
1188 1251
1189 if (menubar_visible ()) 1252 if (menubar_visible ())
1190 XMoveResizeWindow (disp, menuBar.win, 1253 XMoveResizeWindow (disp, menuBar.win,
1191 window_vt_x, 0, 1254 window_vt_x, 0,
1192 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1255 width, menuBar_TotalHeight ());
1193 1256
1194 XMoveResizeWindow (disp, TermWin.vt, 1257 XMoveResizeWindow (disp, vt,
1195 window_vt_x, window_vt_y, 1258 window_vt_x, window_vt_y,
1196 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1259 width, height);
1197 1260
1198 scr_clear (); 1261 scr_clear ();
1199#ifdef XPM_BACKGROUND 1262#ifdef XPM_BACKGROUND
1200 resize_pixmap (); 1263 resize_pixmap ();
1201#endif 1264#endif
… …
1207 int old_ncol = prev_ncol; 1270 int old_ncol = prev_ncol;
1208 1271
1209 /* scr_reset only works on the primary screen */ 1272 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */ 1273 if (old_height) /* this is not the first time through */
1211 { 1274 {
1212 unsigned int ncol = TermWin.ncol; 1275 unsigned int ocol = ncol;
1213 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
1214 curr_screen = scr_change_screen (PRIMARY); 1277 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol; 1278 ncol = ocol;
1216 } 1279 }
1217 1280
1218 scr_reset (); 1281 scr_reset ();
1219 1282
1220 if (curr_screen >= 0) /* this is not the first time through */ 1283 if (curr_screen >= 0) /* this is not the first time through */
1221 { 1284 {
1222 scr_change_screen (curr_screen); 1285 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1286 selection_check (old_ncol != ncol ? 4 : 0);
1224 } 1287 }
1225 } 1288 }
1226 1289
1227 old_width = szHint.width; 1290 old_width = szHint.width;
1228 old_height = szHint.height; 1291 old_height = szHint.height;
1229 1292
1230#ifdef XPM_BACKGROUND 1293#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1294 if (pixmap)
1232 scr_touch (false); 1295 scr_touch (false);
1233#endif 1296#endif
1234 1297
1235#ifdef USE_XIM 1298#ifdef USE_XIM
1236 IMSetStatusPosition (); 1299 IMSetStatusPosition ();
… …
1240/* 1303/*
1241 * 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.
1242 * good for toggling 80/132 columns 1305 * good for toggling 80/132 columns
1243 */ 1306 */
1244void 1307void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1308rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1309{
1247 XWindowAttributes wattr; 1310 XWindowAttributes wattr;
1248 1311
1249 if (width == 0 || height == 0) 1312 if (newwidth == 0 || newheight == 0)
1250 { 1313 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1314 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1315
1253 if (width == 0) 1316 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1317 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1318 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1319 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1320 }
1321
1322 if (newwidth != width || newheight != height)
1323 {
1261 width += szHint.base_width; 1324 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1325 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1326 resize_all_windows (newwidth, newheight, 0);
1264 } 1327 }
1265} 1328}
1266 1329
1267/* -------------------------------------------------------------------- * 1330/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1331 * - X INPUT METHOD ROUTINES - *
… …
1278 1341
1279void 1342void
1280rxvt_term::im_set_size (XRectangle &size) 1343rxvt_term::im_set_size (XRectangle &size)
1281{ 1344{
1282 // the int_bwidth terms make no sense to me 1345 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1346 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1347 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1348 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1349 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1350}
1288 1351
1289void 1352void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1353rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1354 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1355 const XRectangle &needed_rect)
1293{ 1356{
1294 preedit_rect.x = needed_rect.width; 1357 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1358 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1359 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1360 preedit_rect.height = fheight;
1298 1361
1299 status_rect.x = 0; 1362 status_rect.x = 0;
1300 status_rect.y = 0; 1363 status_rect.y = 0;
1301 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;
1302 status_rect.height = TermWin.fheight; 1365 status_rect.height = fheight;
1303} 1366}
1304 1367
1305/* Checking whether input method is running. */ 1368/* Checking whether input method is running. */
1306bool 1369bool
1307rxvt_term::IMisRunning () 1370rxvt_term::IMisRunning ()
… …
1335{ 1398{
1336 XPoint nspot; 1399 XPoint nspot;
1337 XVaNestedList preedit_attr; 1400 XVaNestedList preedit_attr;
1338 1401
1339 if (!Input_Context 1402 if (!Input_Context
1340 || !TermWin.focus 1403 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1404 || !(input_style & XIMPreeditPosition))
1342 return; 1405 return;
1343 1406
1344 im_set_position (nspot); 1407 im_set_position (nspot);
1345 1408
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1528 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1529 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1530 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1531 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1532 "*",
1470 TermWin.fheight, 1533 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1534 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1535 fheight - 2, fheight + 2);
1473 1536
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1537 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1538 &missing_charset_list, &missing_charset_count, &def_string);
1476 1539
1477 if (missing_charset_list) 1540 if (missing_charset_list)
… …
1523 NULL); 1586 NULL);
1524 } 1587 }
1525 1588
1526 Input_Context = XCreateIC (xim, 1589 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1590 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1591 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1592 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1593 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1594 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1595 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1596 status_attr, NULL);
1534 1597
… …
1551} 1614}
1552 1615
1553void 1616void
1554rxvt_term::im_cb () 1617rxvt_term::im_cb ()
1555{ 1618{
1556 int i, found, had_im; 1619 int i;
1557 const char *p; 1620 const char *p;
1558 char **s; 1621 char **s;
1559 char buf[IMBUFSIZ]; 1622 char buf[IMBUFSIZ];
1560 1623
1561 SET_R (this); 1624 SET_R (this);
… …
1618{ 1681{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1682 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1683 XVaNestedList preedit_attr, status_attr;
1621 1684
1622 if (!Input_Context 1685 if (!Input_Context
1623 || !TermWin.focus 1686 || !focus
1624 || !(input_style & XIMPreeditArea) 1687 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1688 || !IMisRunning ())
1626 return; 1689 return;
1627 1690
1628 /* 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