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