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.147 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.196 by root, Sun Jan 22 04:01:52 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),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
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 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
163 sw_int (this, &rxvt_term::sig_term), 176 bell_ev (this, &rxvt_term::bell_cb),
164 sw_chld (this, &rxvt_term::sig_chld), 177#endif
165 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
167 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
170 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
171 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
174 188
175 termlist.push_back (this); 189 termlist.push_back (this);
176 190
177#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
178 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
179
180 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n");
182#endif 193#endif
183} 194}
184 195
185// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
186// for use before an emergency exit 197// for use before an emergency exit
187void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
188{ 199{
189 if (cmd_pid) 200 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
191 202
192#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
193 privileged_utmp (RESTORE);
194#endif
195
196 pty.put ();
197} 204}
198 205
199rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
200{ 207{
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 209
203 emergency_cleanup (); 210 emergency_cleanup ();
204 211
205#if ENABLE_STYLES 212#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 215 delete fontset[i];
209#endif 216#endif
210 delete TermWin.fontset[0]; 217 delete fontset[0];
211 218
212 if (display) 219 if (display)
213 { 220 {
214 dDisp; 221 dDisp;
215 222
216 selection_clear (); 223 selection_clear ();
217 224
218#ifdef USE_XIM 225#ifdef USE_XIM
219 im_destroy (); 226 im_destroy ();
220#endif
221#ifdef MENUBAR
222 if (menubarGC) XFreeGC (disp, menubarGC);
223#endif 227#endif
224#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
225 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
226 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
227#endif 231#endif
… …
238 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
239 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
240 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
241 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
242#endif 246#endif
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 251#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
249 253
250#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 254 delete drawable;
252 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win);
254#endif
255 delete TermWin.drawable;
256 // destroy all windows 255 // destroy all windows
257 if (TermWin.parent[0]) 256 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
259 } 258 }
260 259
261 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
262
263 delete pix_colors_focused; 261 delete pix_colors_focused;
264#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
265 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
266#endif 264#endif
267 265
… …
289#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
290 delete keyboard; 288 delete keyboard;
291#endif 289#endif
292} 290}
293 291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
302}
303
294void 304void
295rxvt_term::destroy () 305rxvt_term::destroy ()
296{ 306{
297 if (destroy_ev.active) 307 if (destroy_ev.active)
298 return; 308 return;
299 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
300#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
301 scr_overlay_off (); 314 scr_overlay_off ();
302#endif 315#endif
303 316
304 if (display) 317 if (display)
… …
306#if USE_XIM 319#if USE_XIM
307 im_ev.stop (display); 320 im_ev.stop (display);
308#endif 321#endif
309#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
310 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
311#endif
312#if MENUBAR
313 menubar_ev.stop (display);
314#endif 324#endif
315#if TRANSPARENT 325#if TRANSPARENT
316 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
317#endif 327#endif
318 incr_ev.stop (); 328 incr_ev.stop ();
… …
342} 352}
343 353
344void 354void
345rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
346{ 356{
347 SET_R (this); 357 make_current ();
348 358
349 delete this; 359 delete this;
350} 360}
351 361
352/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
438 DisplayString (display)); 448 DisplayString (display));
439 rxvt_emergency_cleanup (); 449 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
441} 451}
442 452
443/*
444 * Catch a fatal signal and tidy up before quitting
445 */
446void
447rxvt_term::sig_term (sig_watcher &w)
448{
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
451#endif
452 rxvt_emergency_cleanup ();
453 signal (w.signum, SIG_DFL);
454 kill (getpid (), w.signum);
455}
456
457/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 454bool
460rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
461{ 456{
457 this->envv = envv;
458
462 SET_R (this); 459 SET_R (this);
463
464 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
465 462
466 if (!init_vars ()) 463 if (!init_vars ())
467 return false; 464 return false;
468 465
469 init_secondary (); 466 init_secondary ();
… …
472 469
473#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
474 keyboard->register_done (); 471 keyboard->register_done ();
475#endif 472#endif
476 473
477#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]);
479#endif
480#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 475 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 477#endif
484 478
479 pty = ptytty::create ();
480
485 create_windows (argc, argv); 481 create_windows (argc, argv);
486 482
487 dDisp; 483 dDisp;
488 484
489 init_xlocale (); 485 init_xlocale ();
490 486
491 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
492 488
493#if 0 489#if 0
494 XSynchronize (disp, True); 490 XSynchronize (disp, True);
495#endif 491#endif
496 492
497#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 494 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
500#endif 496#endif
501#if (MENUBAR_MAX)
502 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win);
504#endif
505#ifdef TRANSPARENT 497#ifdef TRANSPARENT
506 if (options & Opt_transparent) 498 if (OPTION (Opt_transparent))
507 { 499 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 501 check_our_parents ();
510 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
511 } 503 }
512#endif 504#endif
513 505
514 XMapWindow (disp, TermWin.vt);
515 XMapWindow (disp, TermWin.parent[0]);
516
517 set_colorfgbg (); 506 set_colorfgbg ();
518 507
519 init_command (cmd_argv); 508 init_command (cmd_argv);
520 509
521 free (cmd_argv); 510 free (cmd_argv);
522 511
512 if (pty->pty >= 0)
523 pty_ev.start (pty.pty, EVENT_READ); 513 pty_ev.start (pty->pty, EVENT_READ);
524 514
525 check_ev.start (); 515 check_ev.start ();
526 516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
527 return true; 522 return true;
528} 523}
529 524
525static struct sig_handlers
526{
527 sig_watcher sw_term, sw_int;
528
529 /*
530 * Catch a fatal signal and tidy up before quitting
531 */
532 void
533 sig_term (sig_watcher &w)
534 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term)
546 {
547 }
548} sig_handlers;
549
550char **rxvt_environ; // startup environment
551
530void 552void
531rxvt_init () 553rxvt_init ()
532{ 554{
533 /* 555 ptytty::init ();
534 * Save and then give up any super-user privileges 556
535 * If we need privileges in any area then we must specifically request it. 557 rxvt_environ = environ;
536 * We should only need to be root in these cases:
537 * 1. write utmp entries on some systems
538 * 2. chown tty on some systems
539 */
540 rxvt_privileges (SAVE);
541 rxvt_privileges (IGNORE);
542 558
543 signal (SIGHUP, SIG_IGN); 559 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 560 signal (SIGPIPE, SIG_IGN);
561
562 sig_handlers.sw_term.start (SIGTERM);
563 sig_handlers.sw_int.start (SIGINT);
545 564
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 566 /* signal (SIGURG, SIG_DFL); */
548 567
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 569 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 570 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553 571
554/* ------------------------------------------------------------------------- * 572 XrmInitialize ();
555 * SIGNAL HANDLING & EXIT HANDLER *
556 * ------------------------------------------------------------------------- */
557/*
558 * Catch a SIGCHLD signal and exit if the direct child has died
559 */
560
561void
562rxvt_term::sig_chld (sig_watcher &w)
563{
564 // we are being called for every SIGCHLD, not just ours
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->destroy ();
572 break;
573 }
574} 573}
575 574
576/* ------------------------------------------------------------------------- * 575/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 576 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 577 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 584 rxvt_fatal ("memory allocation failure. aborting.\n");
586 585
587 return p; 586 return p;
588} 587}
589 588
590void * 589void *
591rxvt_calloc (size_t number, size_t size) 590rxvt_calloc (size_t number, size_t size)
592{ 591{
593 void *p = calloc (number, size); 592 void *p = calloc (number, size);
594 593
595 if (!p) 594 if (!p)
596 rxvt_fatal ("memory allocation failure. aborting.\n"); 595 rxvt_fatal ("memory allocation failure. aborting.\n");
597 596
598 return p; 597 return p;
599} 598}
600 599
601void * 600void *
602rxvt_realloc (void *ptr, size_t size) 601rxvt_realloc (void *ptr, size_t size)
603{ 602{
604 void *p = realloc (ptr, size); 603 void *p = realloc (ptr, size);
605 604
606 if (!p) 605 if (!p)
607 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
608 607
609 return p; 608 return p;
610} 609}
611
612/* ------------------------------------------------------------------------- *
613 * PRIVILEGED OPERATIONS *
614 * ------------------------------------------------------------------------- */
615/* take care of suid/sgid super-user (root) privileges */
616void
617rxvt_privileges (rxvt_privaction action)
618{
619#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
620 static uid_t euid;
621 static gid_t egid;
622#endif
623
624#if ! defined(__CYGWIN32__)
625# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
626 /* setreuid () is the poor man's setuid (), seteuid () */
627# define seteuid(a) setreuid(-1, (a))
628# define setegid(a) setregid(-1, (a))
629# define HAVE_SETEUID
630# endif
631# ifdef HAVE_SETEUID
632 switch (action)
633 {
634 case IGNORE:
635 /*
636 * change effective uid/gid - not real uid/gid - so we can switch
637 * back to root later, as required
638 */
639 seteuid (getuid ());
640 setegid (getgid ());
641 break;
642 case SAVE:
643 euid = geteuid ();
644 egid = getegid ();
645 break;
646 case RESTORE:
647 seteuid (euid);
648 setegid (egid);
649 break;
650 }
651# else
652 switch (action)
653 {
654 case IGNORE:
655 setuid (getuid ());
656 setgid (getgid ());
657 /* FALLTHROUGH */
658 case SAVE:
659 /* FALLTHROUGH */
660 case RESTORE:
661 break;
662 }
663# endif
664#endif
665}
666
667#ifdef UTMP_SUPPORT
668void
669rxvt_term::privileged_utmp (rxvt_privaction action)
670{
671 if ((options & Opt_utmpInhibit)
672 || !pty.name || !*pty.name)
673 return;
674
675 rxvt_privileges (RESTORE);
676
677 if (action == SAVE)
678 makeutent (pty.name, rs[Rs_display_name]);
679 else
680 cleanutent ();
681
682 rxvt_privileges (IGNORE);
683}
684#endif
685 610
686/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
687/* 612/*
688 * window size/position calculcations for XSizeHint and other storage. 613 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 614 * if width/height are non-zero then override calculated width/height
690 */ 615 */
691void 616void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 618{
694 short recalc_x, recalc_y; 619 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 620 int x, y, sb_w, flags;
696 unsigned int w, h; 621 unsigned int w, h;
697 unsigned int max_width, max_height; 622 unsigned int max_width, max_height;
698 dDisp; 623 dDisp;
699 624
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 626 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 627
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 629 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 631
707 recalc_x = recalc_y = 0; 632 recalc_x = recalc_y = 0;
708 flags = 0; 633 flags = 0;
634
709 if (!parsed_geometry) 635 if (!parsed_geometry)
710 { 636 {
711 parsed_geometry = 1; 637 parsed_geometry = 1;
638
712 if (rs[Rs_geometry]) 639 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 640 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 641
715 if (flags & WidthValue) 642 if (flags & WidthValue)
716 { 643 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 644 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 645 szHint.flags |= USSize;
719 } 646 }
720 647
721 if (flags & HeightValue) 648 if (flags & HeightValue)
722 { 649 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 650 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 651 szHint.flags |= USSize;
725 } 652 }
726 653
727 if (flags & XValue) 654 if (flags & XValue)
728 { 655 {
729 szHint.x = x; 656 szHint.x = x;
730 szHint.flags |= USPosition; 657 szHint.flags |= USPosition;
658
731 if (flags & XNegative) 659 if (flags & XNegative)
732 { 660 {
733 recalc_x = 1; 661 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 662 szHint.win_gravity = NorthEastGravity;
735 } 663 }
… …
737 665
738 if (flags & YValue) 666 if (flags & YValue)
739 { 667 {
740 szHint.y = y; 668 szHint.y = y;
741 szHint.flags |= USPosition; 669 szHint.flags |= USPosition;
670
742 if (flags & YNegative) 671 if (flags & YNegative)
743 { 672 {
744 recalc_y = 1; 673 recalc_y = 1;
674
745 if (szHint.win_gravity == NorthEastGravity) 675 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 676 szHint.win_gravity = SouthEastGravity;
747 else 677 else
748 szHint.win_gravity = SouthWestGravity; 678 szHint.win_gravity = SouthWestGravity;
749 } 679 }
750 } 680 }
751 } 681 }
752 682
753 /* TODO: BOUNDS */ 683 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 684 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 685 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 686 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 687 max_height = MAX_ROWS * fheight;
758 688
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 689 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 690
761 sb_w = mb_h = 0; 691 sb_w = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 692 window_vt_x = window_vt_y = int_bwidth;
763 693
764 if (scrollbar_visible ()) 694 if (scrollBar.state)
765 { 695 {
766 sb_w = scrollbar_TotalWidth (); 696 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 697 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 698 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 699 window_vt_x += sb_w;
770 } 700 }
771 701
772 if (menubar_visible ())
773 {
774 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h;
776 window_vt_y += mb_h;
777 }
778
779 szHint.width_inc = TermWin.fwidth; 702 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 703 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 704 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 705 szHint.min_height = szHint.base_height + szHint.height_inc;
783 706
784 if (width && width - szHint.base_width < max_width) 707 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 708 {
786 szHint.width = width; 709 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 710 width = newwidth - szHint.base_width;
788 } 711 }
789 else 712 else
790 { 713 {
791 MIN_IT (TermWin.width, max_width); 714 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 715 szHint.width = szHint.base_width + width;
793 } 716 }
794 717
795 if (height && height - szHint.base_height < max_height) 718 if (newheight && newheight - szHint.base_height < max_height)
796 { 719 {
797 szHint.height = height; 720 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 721 height = newheight - szHint.base_height;
799 } 722 }
800 else 723 else
801 { 724 {
802 MIN_IT (TermWin.height, max_height); 725 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 726 szHint.height = szHint.base_height + height;
804 } 727 }
805 728
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 729 if (scrollBar.state && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 730 window_sb_x = szHint.width - sb_w;
808 731
809 if (recalc_x) 732 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 734 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 736
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 737 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 738 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 740 ncol, nrow, szHint.width,
820 szHint.height)); 741 szHint.height));
821 return; 742 return;
822} 743}
823 744
824/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
… …
827 * Called after a window size change. 748 * Called after a window size change.
828 */ 749 */
829void 750void
830rxvt_term::tt_winch () 751rxvt_term::tt_winch ()
831{ 752{
832 if (pty.pty < 0) 753 if (pty->pty < 0)
833 return; 754 return;
834 755
835 struct winsize ws; 756 struct winsize ws;
836 757
837 ws.ws_col = TermWin.ncol; 758 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 759 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 760 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 761 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 762 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
842 763
843#if 0 764#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 765 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 766 if (cmd_pid) /* force through to the command */
846 kill (-cmd_pid, SIGWINCH); 767 kill (-cmd_pid, SIGWINCH);
… …
869 return false; 790 return false;
870 } 791 }
871 792
872#if ENABLE_STYLES 793#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 794 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 795 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 796 delete fontset[i];
876#endif 797#endif
877 798
878 delete TermWin.fontset[0]; 799 delete fontset[0];
879 TermWin.fontset[0] = fs; 800 fontset[0] = fs;
880 801
881 prop = (*fs)[1]->properties (); 802 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 803 prop.height += lineSpace;
883 fs->set_prop (prop); 804 fs->set_prop (prop);
884 805
885 TermWin.fwidth = prop.width; 806 fwidth = prop.width;
886 TermWin.fheight = prop.height; 807 fheight = prop.height;
887 TermWin.fweight = prop.weight; 808 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 809
891 for (int style = 1; style < 4; style++) 810 for (int style = 1; style < 4; style++)
892 { 811 {
893#if ENABLE_STYLES 812#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 813 const char *res = rs[Rs_font + style];
895 814
896 if (res && !*res) 815 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 816 fontset[style] = fontset[0];
898 else 817 else
899 { 818 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 819 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 820 rxvt_fontprop prop2 = prop;
902 821
903 if (res) 822 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 823 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 824 else
906 { 825 {
907 res = TermWin.fontset[0]->fontdesc; 826 res = fontset[0]->fontdesc;
908 827
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 828 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
910 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 829 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 830 }
912 831
913 fs->populate (res); 832 fs->populate (res);
914 fs->set_prop (prop2); 833 fs->set_prop (prop2);
915 } 834 }
916#else 835#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 836 fontset[style] = fontset[0];
918#endif 837#endif
919 } 838 }
920 839
921 if (TermWin.parent[0]) 840 if (parent[0])
922 { 841 {
923 resize_all_windows (0, 0, 0); 842 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 843 scr_remap_chars ();
925 scr_touch (true); 844 scr_touch (true);
926 } 845 }
… …
928 return true; 847 return true;
929} 848}
930 849
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 850void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 851{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 852 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 853 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 854 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 855}
938 856
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 858{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 859 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 860 char *s = rxvt_wcstoutf8 (ws);
944 861
945 XChangeProperty (display->display, TermWin.parent[0], 862 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 864 (const unsigned char *)s, strlen (s));
948 865
949 free (s); 866 free (s);
950 free (ws); 867 free (ws);
… …
987 i = atoi (color); 904 i = atoi (color);
988 905
989 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
990 { /* bright colors */ 907 { /* bright colors */
991 i -= 8; 908 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 910 SET_PIXCOLOR (idx);
995 goto done; 911 goto done;
996# endif
997 } 912 }
998 913
999 if (i >= 0 && i <= 7) 914 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 915 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1113 1028
1114/* -------------------------------------------------------------------- * 1029/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1030 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1031 * -------------------------------------------------------------------- */
1117void 1032void
1118rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1119{ 1034{
1120 int fix_screen; 1035 int fix_screen;
1121#ifdef SMART_RESIZE
1122 int old_width = szHint.width, old_height = szHint.height; 1036 int old_width = szHint.width, old_height = szHint.height;
1123#endif
1124 dDisp; 1037 dDisp;
1125 1038
1126 window_calc (width, height); 1039 window_calc (newwidth, newheight);
1127 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1040 XSetWMNormalHints (disp, parent[0], &szHint);
1128 1041
1129 if (!ignoreparent) 1042 if (!ignoreparent)
1130 { 1043 {
1131#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1132 /* 1045 /*
… …
1136 int x, y, x1, y1; 1049 int x, y, x1, y1;
1137 int dx, dy; 1050 int dx, dy;
1138 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1139 Window unused_cr; 1052 Window unused_cr;
1140 1053
1141 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1054 XTranslateCoordinates (disp, parent[0], display->root,
1142 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1143 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1144 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1145 /* 1058 /*
1146 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1147 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1148 */ 1061 */
… …
1165 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1166 dy = 0; 1079 dy = 0;
1167 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1168 dy /= 2; 1081 dy /= 2;
1169 1082
1170 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1171 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1172#else 1085#else
1173 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1174#endif 1087#endif
1175 } 1088 }
1176 1089
1177 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1178 1091
1179 if (fix_screen || width != old_width || height != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1180 { 1093 {
1181 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1182 { 1095 {
1183 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (disp, scrollBar.win,
1184 window_sb_x, 0, 1097 window_sb_x, 0,
1185 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1186 resize_scrollbar (); 1099 resize_scrollbar ();
1187 } 1100 }
1188 1101
1189 if (menubar_visible ())
1190 XMoveResizeWindow (disp, menuBar.win,
1191 window_vt_x, 0,
1192 TermWin_TotalWidth (), menuBar_TotalHeight ());
1193
1194 XMoveResizeWindow (disp, TermWin.vt, 1102 XMoveResizeWindow (disp, vt,
1195 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1196 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1104 width, height);
1197 1105
1198 scr_clear (); 1106 scr_clear ();
1199#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1200 resize_pixmap (); 1108 resize_pixmap ();
1201#endif 1109#endif
… …
1207 int old_ncol = prev_ncol; 1115 int old_ncol = prev_ncol;
1208 1116
1209 /* scr_reset only works on the primary screen */ 1117 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */ 1118 if (old_height) /* this is not the first time through */
1211 { 1119 {
1212 unsigned int ncol = TermWin.ncol; 1120 unsigned int ocol = ncol;
1213 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1121 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1214 curr_screen = scr_change_screen (PRIMARY); 1122 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol; 1123 ncol = ocol;
1216 } 1124 }
1217 1125
1218 scr_reset (); 1126 scr_reset ();
1219 1127
1220 if (curr_screen >= 0) /* this is not the first time through */ 1128 if (curr_screen >= 0) /* this is not the first time through */
1221 { 1129 {
1222 scr_change_screen (curr_screen); 1130 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1131 selection_check (old_ncol != ncol ? 4 : 0);
1224 } 1132 }
1225 } 1133 }
1226 1134
1227 old_width = szHint.width; 1135 old_width = szHint.width;
1228 old_height = szHint.height; 1136 old_height = szHint.height;
1229 1137
1230#ifdef XPM_BACKGROUND 1138#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1139 if (pixmap)
1232 scr_touch (false); 1140 scr_touch (false);
1233#endif 1141#endif
1234 1142
1235#ifdef USE_XIM 1143#ifdef USE_XIM
1236 IMSetStatusPosition (); 1144 IMSetStatusPosition ();
… …
1240/* 1148/*
1241 * Set the width/height of the vt window in characters. Units are pixels. 1149 * Set the width/height of the vt window in characters. Units are pixels.
1242 * good for toggling 80/132 columns 1150 * good for toggling 80/132 columns
1243 */ 1151 */
1244void 1152void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1153rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1154{
1247 XWindowAttributes wattr; 1155 XWindowAttributes wattr;
1248 1156
1249 if (width == 0 || height == 0) 1157 if (newwidth == 0 || newheight == 0)
1250 { 1158 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1159 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1160
1253 if (width == 0) 1161 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1163 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1165 }
1166
1167 if (newwidth != width || newheight != height)
1168 {
1261 width += szHint.base_width; 1169 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1170 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1264 } 1172 }
1265} 1173}
1266 1174
1267/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
… …
1278 1186
1279void 1187void
1280rxvt_term::im_set_size (XRectangle &size) 1188rxvt_term::im_set_size (XRectangle &size)
1281{ 1189{
1282 // the int_bwidth terms make no sense to me 1190 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1191 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1192 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1193 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1194 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1195}
1288 1196
1289void 1197void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1198rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1199 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1200 const XRectangle &needed_rect)
1293{ 1201{
1294 preedit_rect.x = needed_rect.width; 1202 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1203 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1204 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1205 preedit_rect.height = fheight;
1298 1206
1299 status_rect.x = 0; 1207 status_rect.x = 0;
1300 status_rect.y = 0; 1208 status_rect.y = 0;
1301 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1209 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1302 status_rect.height = TermWin.fheight; 1210 status_rect.height = fheight;
1303} 1211}
1304 1212
1305/* Checking whether input method is running. */ 1213/* Checking whether input method is running. */
1306bool 1214bool
1307rxvt_term::IMisRunning () 1215rxvt_term::IMisRunning ()
… …
1335{ 1243{
1336 XPoint nspot; 1244 XPoint nspot;
1337 XVaNestedList preedit_attr; 1245 XVaNestedList preedit_attr;
1338 1246
1339 if (!Input_Context 1247 if (!Input_Context
1340 || !TermWin.focus 1248 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1249 || !(input_style & XIMPreeditPosition))
1342 return; 1250 return;
1343 1251
1344 im_set_position (nspot); 1252 im_set_position (nspot);
1345 1253
… …
1381 XRectangle rect, status_rect, needed_rect; 1289 XRectangle rect, status_rect, needed_rect;
1382 unsigned long fg, bg; 1290 unsigned long fg, bg;
1383 const char *p; 1291 const char *p;
1384 char **s; 1292 char **s;
1385 XIMStyles *xim_styles; 1293 XIMStyles *xim_styles;
1294
1295 set_environ (envv);
1386 1296
1387 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1297 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1388 return false; 1298 return false;
1389 1299
1390 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1300 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1379 "*",
1470 TermWin.fheight, 1380 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1381 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1382 fheight - 2, fheight + 2);
1473 1383
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1384 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1385 &missing_charset_list, &missing_charset_count, &def_string);
1476 1386
1477 if (missing_charset_list) 1387 if (missing_charset_list)
… …
1523 NULL); 1433 NULL);
1524 } 1434 }
1525 1435
1526 Input_Context = XCreateIC (xim, 1436 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1437 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1438 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1439 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1440 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1441 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1442 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1443 status_attr, NULL);
1534 1444
… …
1556 int i; 1466 int i;
1557 const char *p; 1467 const char *p;
1558 char **s; 1468 char **s;
1559 char buf[IMBUFSIZ]; 1469 char buf[IMBUFSIZ];
1560 1470
1561 SET_R (this); 1471 make_current ();
1562 1472
1563 im_destroy (); 1473 im_destroy ();
1564 1474
1565 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1475 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1566 if (Input_Context) 1476 if (Input_Context)
… …
1618{ 1528{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1529 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1530 XVaNestedList preedit_attr, status_attr;
1621 1531
1622 if (!Input_Context 1532 if (!Input_Context
1623 || !TermWin.focus 1533 || !focus
1624 || !(input_style & XIMPreeditArea) 1534 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1535 || !IMisRunning ())
1626 return; 1536 return;
1627 1537
1628 /* Getting the necessary width of preedit area */ 1538 /* Getting the necessary width of preedit area */
… …
1643 XFree (preedit_attr); 1553 XFree (preedit_attr);
1644 XFree (status_attr); 1554 XFree (status_attr);
1645} 1555}
1646#endif /* USE_XIM */ 1556#endif /* USE_XIM */
1647 1557
1648/*----------------------------------------------------------------------*/
1649rxvt_t rxvt_current_term;
1650
1651/*----------------------- end-of-file (C source) -----------------------*/ 1558/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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