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.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC

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

Diff Legend

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