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.188 by root, Wed Jan 18 08:33:34 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
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66void
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
… …
132#if TRANSPARENT 145#if TRANSPARENT
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 147#endif
135#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif 150#endif
141#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 153#endif
144#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
184void rxvt_term::emergency_cleanup () 194void rxvt_term::emergency_cleanup ()
185{ 195{
186 if (cmd_pid) 196 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 197 kill (-cmd_pid, SIGHUP);
188 198
189#ifdef UTMP_SUPPORT 199 delete pty; pty = 0;
190 privileged_utmp (RESTORE);
191#endif
192
193 pty.put ();
194} 200}
195 201
196rxvt_term::~rxvt_term () 202rxvt_term::~rxvt_term ()
197{ 203{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 206 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 207
200 emergency_cleanup (); 208 emergency_cleanup ();
201 209
202#if ENABLE_STYLES 210#if ENABLE_STYLES
203 for (int i = RS_styleCount; --i; ) 211 for (int i = RS_styleCount; --i; )
204 if (TermWin.fontset[i] != TermWin.fontset[0]) 212 if (fontset[i] != fontset[0])
205 delete TermWin.fontset[i]; 213 delete fontset[i];
206#endif 214#endif
207 delete TermWin.fontset[0]; 215 delete fontset[0];
208 216
209 if (display) 217 if (display)
210 { 218 {
211 dDisp; 219 dDisp;
212 220
213 selection_clear (); 221 selection_clear ();
214 222
215#ifdef USE_XIM 223#ifdef USE_XIM
216 im_destroy (); 224 im_destroy ();
217#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif 225#endif
221#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (disp, ShadowGC);
224#endif 229#endif
… …
235 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (disp, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (disp, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (disp, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (disp, downArrowHi);
239#endif 244#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 249#endif
245 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 250 if (gc) XFreeGC (disp, gc);
246 251
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable; 252 delete drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete TermWin.drawable;
253 // destroy all windows 253 // destroy all windows
254 if (TermWin.parent[0]) 254 if (parent[0])
255 XDestroyWindow (disp, TermWin.parent[0]); 255 XDestroyWindow (disp, parent[0]);
256 } 256 }
257 257
258 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 259 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 261 delete pix_colors_unfocused;
263#endif 262#endif
264 263
… …
287 delete keyboard; 286 delete keyboard;
288#endif 287#endif
289} 288}
290 289
291void 290void
291rxvt_term::child_exit ()
292{
293 cmd_pid = 0;
294
295 if (!OPTION (Opt_hold))
296 destroy ();
297}
298
299void
292rxvt_term::destroy () 300rxvt_term::destroy ()
293{ 301{
294 if (destroy_ev.active) 302 if (destroy_ev.active)
295 return; 303 return;
296 304
… …
303#if USE_XIM 311#if USE_XIM
304 im_ev.stop (display); 312 im_ev.stop (display);
305#endif 313#endif
306#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
308#endif
309#if MENUBAR
310 menubar_ev.stop (display);
311#endif 316#endif
312#if TRANSPARENT 317#if TRANSPARENT
313 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
314#endif 319#endif
315 incr_ev.stop (); 320 incr_ev.stop ();
… …
339} 344}
340 345
341void 346void
342rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
343{ 348{
344 SET_R (this); 349 make_current ();
345 350
346 delete this; 351 delete this;
347} 352}
348 353
349/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
440/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
441bool 446bool
442rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
443{ 448{
444 SET_R (this); 449 SET_R (this);
445
446 set_locale (""); 450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
447 452
448 if (!init_vars ()) 453 if (!init_vars ())
449 return false; 454 return false;
450 455
451 init_secondary (); 456 init_secondary ();
… …
454 459
455#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 461 keyboard->register_done ();
457#endif 462#endif
458 463
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 465 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 467#endif
466 468
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483
467 create_windows (argc, argv); 484 create_windows (argc, argv);
468 485
469 dDisp; 486 dDisp;
470 487
471 init_xlocale (); 488 init_xlocale ();
472 489
473 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
474 491
475#if 0 492#if 0
476 XSynchronize (disp, True); 493 XSynchronize (disp, True);
477#endif 494#endif
478 495
479#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
482#endif 499#endif
483#if (MENUBAR_MAX)
484 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win);
486#endif
487#ifdef TRANSPARENT 500#ifdef TRANSPARENT
488 if (options & Opt_transparent) 501 if (OPTION (Opt_transparent))
489 { 502 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 504 check_our_parents ();
492 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
493 } 506 }
494#endif 507#endif
495 508
496 XMapWindow (disp, TermWin.vt); 509 XMapWindow (disp, vt);
497 XMapWindow (disp, TermWin.parent[0]); 510 XMapWindow (disp, parent[0]);
498 511
499 set_colorfgbg (); 512 set_colorfgbg ();
500 513
501 init_command (cmd_argv); 514 init_command (cmd_argv);
502 515
503 free (cmd_argv); 516 free (cmd_argv);
504 517
518 if (pty->pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
506 520
507 check_ev.start (); 521 check_ev.start ();
522
523 HOOK_INVOKE ((this, HOOK_START, DT_END));
508 524
509 return true; 525 return true;
510} 526}
511 527
512static struct sig_handlers 528static struct sig_handlers
… …
520 536
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 539 if (pid == (*t)->cmd_pid)
524 { 540 {
525 (*t)->destroy (); 541 (*t)->child_exit ();
526 break; 542 break;
527 } 543 }
528 } 544 }
529 545
530 /* 546 /*
… …
547 sw_int (this, &sig_handlers::sig_term) 563 sw_int (this, &sig_handlers::sig_term)
548 { 564 {
549 } 565 }
550} sig_handlers; 566} sig_handlers;
551 567
568char **rxvt_environ; // startup environment
569
552void 570void
553rxvt_init () 571rxvt_init ()
554{ 572{
555 /* 573 uid_t uid = getuid ();
556 * Save and then give up any super-user privileges 574 gid_t gid = getgid ();
557 * If we need privileges in any area then we must specifically request it. 575
558 * We should only need to be root in these cases: 576 // before doing anything else, check for setuid/setgid operation,
559 * 1. write utmp entries on some systems 577 // start the helper process and drop privileges
560 * 2. chown tty on some systems 578 if (uid != geteuid ()
561 */ 579 || gid != getegid ())
562 rxvt_privileges (SAVE); 580 {
563 rxvt_privileges (IGNORE); 581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586
587 // drop privileges
588#if HAVE_SETRESUID
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603
604 rxvt_environ = environ;
564 605
565 signal (SIGHUP, SIG_IGN); 606 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 607 signal (SIGPIPE, SIG_IGN);
567 608
568 sig_handlers.sw_chld.start (SIGCHLD); 609 sig_handlers.sw_chld.start (SIGCHLD);
… …
573 /* signal (SIGURG, SIG_DFL); */ 614 /* signal (SIGURG, SIG_DFL); */
574 615
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 616 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 617 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 618 XSetIOErrorHandler (rxvt_xioerror_handler);
619
620 XrmInitialize ();
578} 621}
579 622
580/* ------------------------------------------------------------------------- * 623/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 624 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 625 * ------------------------------------------------------------------------- */
… …
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
612 655
613 return p; 656 return p;
614} 657}
615 658
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
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__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689
690/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
691/* 660/*
692 * window size/position calculcations for XSizeHint and other storage. 661 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 662 * if width/height are non-zero then override calculated width/height
694 */ 663 */
695void 664void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 666{
698 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, flags;
700 unsigned int w, h; 669 unsigned int w, h;
701 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
702 dDisp; 671 dDisp;
703 672
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 674 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 675
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 676 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 677 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 678 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 679
711 recalc_x = recalc_y = 0; 680 recalc_x = recalc_y = 0;
712 flags = 0; 681 flags = 0;
682
713 if (!parsed_geometry) 683 if (!parsed_geometry)
714 { 684 {
715 parsed_geometry = 1; 685 parsed_geometry = 1;
686
716 if (rs[Rs_geometry]) 687 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 688 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 689
719 if (flags & WidthValue) 690 if (flags & WidthValue)
720 { 691 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 692 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 693 szHint.flags |= USSize;
723 } 694 }
724 695
725 if (flags & HeightValue) 696 if (flags & HeightValue)
726 { 697 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 698 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 699 szHint.flags |= USSize;
729 } 700 }
730 701
731 if (flags & XValue) 702 if (flags & XValue)
732 { 703 {
733 szHint.x = x; 704 szHint.x = x;
734 szHint.flags |= USPosition; 705 szHint.flags |= USPosition;
706
735 if (flags & XNegative) 707 if (flags & XNegative)
736 { 708 {
737 recalc_x = 1; 709 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 710 szHint.win_gravity = NorthEastGravity;
739 } 711 }
… …
741 713
742 if (flags & YValue) 714 if (flags & YValue)
743 { 715 {
744 szHint.y = y; 716 szHint.y = y;
745 szHint.flags |= USPosition; 717 szHint.flags |= USPosition;
718
746 if (flags & YNegative) 719 if (flags & YNegative)
747 { 720 {
748 recalc_y = 1; 721 recalc_y = 1;
722
749 if (szHint.win_gravity == NorthEastGravity) 723 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 724 szHint.win_gravity = SouthEastGravity;
751 else 725 else
752 szHint.win_gravity = SouthWestGravity; 726 szHint.win_gravity = SouthWestGravity;
753 } 727 }
754 } 728 }
755 } 729 }
756 730
757 /* TODO: BOUNDS */ 731 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 732 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 733 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 734 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 735 max_height = MAX_ROWS * fheight;
762 736
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 737 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 738
765 sb_w = mb_h = 0; 739 sb_w = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 740 window_vt_x = window_vt_y = int_bwidth;
767 741
768 if (scrollbar_visible ()) 742 if (scrollBar.state)
769 { 743 {
770 sb_w = scrollbar_TotalWidth (); 744 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 745 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 746 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 747 window_vt_x += sb_w;
774 } 748 }
775 749
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; 750 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 751 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 752 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 753 szHint.min_height = szHint.base_height + szHint.height_inc;
787 754
788 if (width && width - szHint.base_width < max_width) 755 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 756 {
790 szHint.width = width; 757 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 758 width = newwidth - szHint.base_width;
792 } 759 }
793 else 760 else
794 { 761 {
795 MIN_IT (TermWin.width, max_width); 762 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 763 szHint.width = szHint.base_width + width;
797 } 764 }
798 765
799 if (height && height - szHint.base_height < max_height) 766 if (newheight && newheight - szHint.base_height < max_height)
800 { 767 {
801 szHint.height = height; 768 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 769 height = newheight - szHint.base_height;
803 } 770 }
804 else 771 else
805 { 772 {
806 MIN_IT (TermWin.height, max_height); 773 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 774 szHint.height = szHint.base_height + height;
808 } 775 }
809 776
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 777 if (scrollBar.state && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 778 window_sb_x = szHint.width - sb_w;
812 779
813 if (recalc_x) 780 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 782 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 783 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 784
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 785 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 786 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 787 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 788 ncol, nrow, szHint.width,
824 szHint.height)); 789 szHint.height));
825 return; 790 return;
826} 791}
827 792
828/*----------------------------------------------------------------------*/ 793/*----------------------------------------------------------------------*/
… …
831 * Called after a window size change. 796 * Called after a window size change.
832 */ 797 */
833void 798void
834rxvt_term::tt_winch () 799rxvt_term::tt_winch ()
835{ 800{
836 if (pty.pty < 0) 801 if (pty->pty < 0)
837 return; 802 return;
838 803
839 struct winsize ws; 804 struct winsize ws;
840 805
841 ws.ws_col = TermWin.ncol; 806 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 807 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 808 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 809 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 810 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846 811
847#if 0 812#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 813 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 814 if (cmd_pid) /* force through to the command */
850 kill (-cmd_pid, SIGWINCH); 815 kill (-cmd_pid, SIGWINCH);
… …
873 return false; 838 return false;
874 } 839 }
875 840
876#if ENABLE_STYLES 841#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 842 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 843 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 844 delete fontset[i];
880#endif 845#endif
881 846
882 delete TermWin.fontset[0]; 847 delete fontset[0];
883 TermWin.fontset[0] = fs; 848 fontset[0] = fs;
884 849
885 prop = (*fs)[1]->properties (); 850 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 851 prop.height += lineSpace;
887 fs->set_prop (prop); 852 fs->set_prop (prop);
888 853
889 TermWin.fwidth = prop.width; 854 fwidth = prop.width;
890 TermWin.fheight = prop.height; 855 fheight = prop.height;
891 TermWin.fweight = prop.weight; 856 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 857
895 for (int style = 1; style < 4; style++) 858 for (int style = 1; style < 4; style++)
896 { 859 {
897#if ENABLE_STYLES 860#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 861 const char *res = rs[Rs_font + style];
899 862
900 if (res && !*res) 863 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 864 fontset[style] = fontset[0];
902 else 865 else
903 { 866 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 867 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 868 rxvt_fontprop prop2 = prop;
906 869
907 if (res) 870 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 871 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 872 else
910 { 873 {
911 res = TermWin.fontset[0]->fontdesc; 874 res = fontset[0]->fontdesc;
912 875
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 876 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; 877 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 878 }
916 879
917 fs->populate (res); 880 fs->populate (res);
918 fs->set_prop (prop2); 881 fs->set_prop (prop2);
919 } 882 }
920#else 883#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 884 fontset[style] = fontset[0];
922#endif 885#endif
923 } 886 }
924 887
925 if (TermWin.parent[0]) 888 if (parent[0])
926 { 889 {
927 resize_all_windows (0, 0, 0); 890 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 891 scr_remap_chars ();
929 scr_touch (true); 892 scr_touch (true);
930 } 893 }
… …
932 return true; 895 return true;
933} 896}
934 897
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 898void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 899{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 900 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 901 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 902 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 903}
942 904
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 905void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 906{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 907 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 908 char *s = rxvt_wcstoutf8 (ws);
948 909
949 XChangeProperty (display->display, TermWin.parent[0], 910 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 911 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 912 (const unsigned char *)s, strlen (s));
952 913
953 free (s); 914 free (s);
954 free (ws); 915 free (ws);
… …
991 i = atoi (color); 952 i = atoi (color);
992 953
993 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
994 { /* bright colors */ 955 { /* bright colors */
995 i -= 8; 956 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 957 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 958 SET_PIXCOLOR (idx);
999 goto done; 959 goto done;
1000# endif
1001 } 960 }
1002 961
1003 if (i >= 0 && i <= 7) 962 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 963 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 964 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1117 1076
1118/* -------------------------------------------------------------------- * 1077/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 1078 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 1079 * -------------------------------------------------------------------- */
1121void 1080void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 1082{
1124 int fix_screen; 1083 int fix_screen;
1125#ifdef SMART_RESIZE
1126 int old_width = szHint.width, old_height = szHint.height; 1084 int old_width = szHint.width, old_height = szHint.height;
1127#endif
1128 dDisp; 1085 dDisp;
1129 1086
1130 window_calc (width, height); 1087 window_calc (newwidth, newheight);
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1088 XSetWMNormalHints (disp, parent[0], &szHint);
1132 1089
1133 if (!ignoreparent) 1090 if (!ignoreparent)
1134 { 1091 {
1135#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1136 /* 1093 /*
… …
1140 int x, y, x1, y1; 1097 int x, y, x1, y1;
1141 int dx, dy; 1098 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 1100 Window unused_cr;
1144 1101
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1102 XTranslateCoordinates (disp, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 1106 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1152 */ 1109 */
… …
1169 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1170 dy = 0; 1127 dy = 0;
1171 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1172 dy /= 2; 1129 dy /= 2;
1173 1130
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1176#else 1133#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1134 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178#endif 1135#endif
1179 } 1136 }
1180 1137
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 1139
1183 if (fix_screen || width != old_width || height != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 1141 {
1185 if (scrollbar_visible ()) 1142 if (scrollBar.state)
1186 { 1143 {
1187 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (disp, scrollBar.win,
1188 window_sb_x, 0, 1145 window_sb_x, 0,
1189 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1190 resize_scrollbar (); 1147 resize_scrollbar ();
1191 } 1148 }
1192 1149
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, 1150 XMoveResizeWindow (disp, vt,
1199 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1152 width, height);
1201 1153
1202 scr_clear (); 1154 scr_clear ();
1203#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1204 resize_pixmap (); 1156 resize_pixmap ();
1205#endif 1157#endif
… …
1211 int old_ncol = prev_ncol; 1163 int old_ncol = prev_ncol;
1212 1164
1213 /* scr_reset only works on the primary screen */ 1165 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */ 1166 if (old_height) /* this is not the first time through */
1215 { 1167 {
1216 unsigned int ncol = TermWin.ncol; 1168 unsigned int ocol = ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1169 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY); 1170 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol; 1171 ncol = ocol;
1220 } 1172 }
1221 1173
1222 scr_reset (); 1174 scr_reset ();
1223 1175
1224 if (curr_screen >= 0) /* this is not the first time through */ 1176 if (curr_screen >= 0) /* this is not the first time through */
1225 { 1177 {
1226 scr_change_screen (curr_screen); 1178 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1179 selection_check (old_ncol != ncol ? 4 : 0);
1228 } 1180 }
1229 } 1181 }
1230 1182
1231 old_width = szHint.width; 1183 old_width = szHint.width;
1232 old_height = szHint.height; 1184 old_height = szHint.height;
1233 1185
1234#ifdef XPM_BACKGROUND 1186#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap) 1187 if (pixmap)
1236 scr_touch (false); 1188 scr_touch (false);
1237#endif 1189#endif
1238 1190
1239#ifdef USE_XIM 1191#ifdef USE_XIM
1240 IMSetStatusPosition (); 1192 IMSetStatusPosition ();
… …
1244/* 1196/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1197 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1198 * good for toggling 80/132 columns
1247 */ 1199 */
1248void 1200void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1201rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1202{
1251 XWindowAttributes wattr; 1203 XWindowAttributes wattr;
1252 1204
1253 if (width == 0 || height == 0) 1205 if (newwidth == 0 || newheight == 0)
1254 { 1206 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1207 XGetWindowAttributes (display->display, display->root, &wattr);
1256 1208
1257 if (width == 0) 1209 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1210 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1211 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1212 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1213 }
1214
1215 if (newwidth != width || newheight != height)
1216 {
1265 width += szHint.base_width; 1217 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1218 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1219 resize_all_windows (newwidth, newheight, 0);
1268 } 1220 }
1269} 1221}
1270 1222
1271/* -------------------------------------------------------------------- * 1223/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1224 * - X INPUT METHOD ROUTINES - *
… …
1282 1234
1283void 1235void
1284rxvt_term::im_set_size (XRectangle &size) 1236rxvt_term::im_set_size (XRectangle &size)
1285{ 1237{
1286 // the int_bwidth terms make no sense to me 1238 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1239 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1240 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1241 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1242 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1243}
1292 1244
1293void 1245void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1246rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1247 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1248 const XRectangle &needed_rect)
1297{ 1249{
1298 preedit_rect.x = needed_rect.width; 1250 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1251 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1252 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1253 preedit_rect.height = fheight;
1302 1254
1303 status_rect.x = 0; 1255 status_rect.x = 0;
1304 status_rect.y = 0; 1256 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1257 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1258 status_rect.height = fheight;
1307} 1259}
1308 1260
1309/* Checking whether input method is running. */ 1261/* Checking whether input method is running. */
1310bool 1262bool
1311rxvt_term::IMisRunning () 1263rxvt_term::IMisRunning ()
… …
1339{ 1291{
1340 XPoint nspot; 1292 XPoint nspot;
1341 XVaNestedList preedit_attr; 1293 XVaNestedList preedit_attr;
1342 1294
1343 if (!Input_Context 1295 if (!Input_Context
1344 || !TermWin.focus 1296 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1297 || !(input_style & XIMPreeditPosition))
1346 return; 1298 return;
1347 1299
1348 im_set_position (nspot); 1300 im_set_position (nspot);
1349 1301
… …
1385 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1338 unsigned long fg, bg;
1387 const char *p; 1339 const char *p;
1388 char **s; 1340 char **s;
1389 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342
1343 set_environ (envv);
1390 1344
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1346 return false;
1393 1347
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1423 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1424 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1425 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1426 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1427 "*",
1474 TermWin.fheight, 1428 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1429 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1430 fheight - 2, fheight + 2);
1477 1431
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1432 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1433 &missing_charset_list, &missing_charset_count, &def_string);
1480 1434
1481 if (missing_charset_list) 1435 if (missing_charset_list)
… …
1527 NULL); 1481 NULL);
1528 } 1482 }
1529 1483
1530 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1486 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1487 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1489 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1491 status_attr, NULL);
1538 1492
… …
1560 int i; 1514 int i;
1561 const char *p; 1515 const char *p;
1562 char **s; 1516 char **s;
1563 char buf[IMBUFSIZ]; 1517 char buf[IMBUFSIZ];
1564 1518
1565 SET_R (this); 1519 make_current ();
1566 1520
1567 im_destroy (); 1521 im_destroy ();
1568 1522
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1524 if (Input_Context)
… …
1622{ 1576{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1625 1579
1626 if (!Input_Context 1580 if (!Input_Context
1627 || !TermWin.focus 1581 || !focus
1628 || !(input_style & XIMPreeditArea) 1582 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1583 || !IMisRunning ())
1630 return; 1584 return;
1631 1585
1632 /* Getting the necessary width of preedit area */ 1586 /* Getting the necessary width of preedit area */

Diff Legend

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