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

Diff Legend

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