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.203 by root, Wed Jan 25 02:42:06 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 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311
300#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
301 scr_overlay_off (); 313 scr_overlay_off ();
302#endif 314#endif
303 315
304 if (display) 316 if (display)
… …
306#if USE_XIM 318#if USE_XIM
307 im_ev.stop (display); 319 im_ev.stop (display);
308#endif 320#endif
309#if HAVE_SCROLLBARS 321#if HAVE_SCROLLBARS
310 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
311#endif
312#if MENUBAR
313 menubar_ev.stop (display);
314#endif 323#endif
315#if TRANSPARENT 324#if TRANSPARENT
316 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
317#endif 326#endif
318 incr_ev.stop (); 327 incr_ev.stop ();
… …
342} 351}
343 352
344void 353void
345rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (time_watcher &w)
346{ 355{
347 SET_R (this); 356 make_current ();
348 357
349 delete this; 358 delete this;
350} 359}
351 360
352/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
… …
438 DisplayString (display)); 447 DisplayString (display));
439 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
441} 450}
442 451
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/*----------------------------------------------------------------------*/ 452/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 453bool
460rxvt_term::init (int argc, const char *const *argv) 454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
461{ 455{
456 this->envv = envv;
457
462 SET_R (this); 458 SET_R (this);
463
464 set_locale (""); 459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
465 461
466 if (!init_vars ()) 462 if (!init_vars ())
467 return false; 463 return false;
468 464
469 init_secondary (); 465 init_secondary ();
… …
472 468
473#ifdef KEYSYM_RESOURCE 469#ifdef KEYSYM_RESOURCE
474 keyboard->register_done (); 470 keyboard->register_done ();
475#endif 471#endif
476 472
477#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]);
479#endif
480#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 474 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 476#endif
484 477
478 pty = ptytty::create ();
479
485 create_windows (argc, argv); 480 create_windows (argc, argv);
486 481
487 dDisp; 482 dDisp;
488 483
489 init_xlocale (); 484 init_xlocale ();
490 485
491 scr_reset (); /* initialize screen */ 486 scr_reset (); // initialize screen
492 487
493#if 0 488#if 0
494 XSynchronize (disp, True); 489 XSynchronize (disp, True);
495#endif 490#endif
496 491
497#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 493 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 494 resize_scrollbar (); /* create and map scrollbar */
500#endif 495#endif
501#if (MENUBAR_MAX)
502 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win);
504#endif
505#ifdef TRANSPARENT 496#ifdef TRANSPARENT
506 if (options & Opt_transparent) 497 if (OPTION (Opt_transparent))
507 { 498 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 499 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 500 check_our_parents ();
510 rootwin_ev.start (display, display->root); 501 rootwin_ev.start (display, display->root);
511 } 502 }
512#endif 503#endif
513 504
514 XMapWindow (disp, TermWin.vt);
515 XMapWindow (disp, TermWin.parent[0]);
516
517 set_colorfgbg (); 505 set_colorfgbg ();
518 506
519 init_command (cmd_argv); 507 init_command (cmd_argv);
520 508
521 free (cmd_argv); 509 free (cmd_argv);
522 510
511 if (pty->pty >= 0)
523 pty_ev.start (pty.pty, EVENT_READ); 512 pty_ev.start (pty->pty, EVENT_READ);
524 513
525 check_ev.start (); 514 check_ev.start ();
526 515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
527 return true; 531 return true;
528} 532}
529 533
534static struct sig_handlers
535{
536 sig_watcher sw_term, sw_int;
537
538 /*
539 * Catch a fatal signal and tidy up before quitting
540 */
541 void
542 sig_term (sig_watcher &w)
543 {
544 rxvt_emergency_cleanup ();
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term)
552 {
553 }
554} sig_handlers;
555
556char **rxvt_environ; // startup environment
557
530void 558void
531rxvt_init () 559rxvt_init ()
532{ 560{
533 /* 561 ptytty::init ();
534 * Save and then give up any super-user privileges 562
535 * If we need privileges in any area then we must specifically request it. 563 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 564
543 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
567
568 sig_handlers.sw_term.start (SIGTERM);
569 sig_handlers.sw_int.start (SIGINT);
545 570
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 572 /* signal (SIGURG, SIG_DFL); */
548 573
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553 577
554/* ------------------------------------------------------------------------- * 578 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} 579}
575 580
576/* ------------------------------------------------------------------------- * 581/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 582 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 583 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 590 rxvt_fatal ("memory allocation failure. aborting.\n");
586 591
587 return p; 592 return p;
588} 593}
589 594
590void * 595void *
591rxvt_calloc (size_t number, size_t size) 596rxvt_calloc (size_t number, size_t size)
592{ 597{
593 void *p = calloc (number, size); 598 void *p = calloc (number, size);
594 599
595 if (!p) 600 if (!p)
596 rxvt_fatal ("memory allocation failure. aborting.\n"); 601 rxvt_fatal ("memory allocation failure. aborting.\n");
597 602
598 return p; 603 return p;
599} 604}
600 605
601void * 606void *
602rxvt_realloc (void *ptr, size_t size) 607rxvt_realloc (void *ptr, size_t size)
603{ 608{
604 void *p = realloc (ptr, size); 609 void *p = realloc (ptr, size);
605 610
606 if (!p) 611 if (!p)
607 rxvt_fatal ("memory allocation failure. aborting.\n"); 612 rxvt_fatal ("memory allocation failure. aborting.\n");
608 613
609 return p; 614 return p;
610} 615}
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 616
686/*----------------------------------------------------------------------*/ 617/*----------------------------------------------------------------------*/
687/* 618/*
688 * window size/position calculcations for XSizeHint and other storage. 619 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 620 * if width/height are non-zero then override calculated width/height
690 */ 621 */
691void 622void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 624{
694 short recalc_x, recalc_y; 625 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 626 int x, y, sb_w, flags;
696 unsigned int w, h; 627 unsigned int w, h;
697 unsigned int max_width, max_height; 628 unsigned int max_width, max_height;
698 dDisp; 629 dDisp;
699 630
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width,
702 szHint.height));
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 632 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 634
707 recalc_x = recalc_y = 0; 635 recalc_x = recalc_y = 0;
708 flags = 0; 636 flags = 0;
637
709 if (!parsed_geometry) 638 if (!parsed_geometry)
710 { 639 {
711 parsed_geometry = 1; 640 parsed_geometry = 1;
641
712 if (rs[Rs_geometry]) 642 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 644
715 if (flags & WidthValue) 645 if (flags & WidthValue)
716 { 646 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 647 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 648 szHint.flags |= USSize;
719 } 649 }
720 650
721 if (flags & HeightValue) 651 if (flags & HeightValue)
722 { 652 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 653 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 654 szHint.flags |= USSize;
725 } 655 }
726 656
727 if (flags & XValue) 657 if (flags & XValue)
728 { 658 {
729 szHint.x = x; 659 szHint.x = x;
730 szHint.flags |= USPosition; 660 szHint.flags |= USPosition;
661
731 if (flags & XNegative) 662 if (flags & XNegative)
732 { 663 {
733 recalc_x = 1; 664 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 665 szHint.win_gravity = NorthEastGravity;
735 } 666 }
… …
737 668
738 if (flags & YValue) 669 if (flags & YValue)
739 { 670 {
740 szHint.y = y; 671 szHint.y = y;
741 szHint.flags |= USPosition; 672 szHint.flags |= USPosition;
673
742 if (flags & YNegative) 674 if (flags & YNegative)
743 { 675 {
744 recalc_y = 1; 676 recalc_y = 1;
677
745 if (szHint.win_gravity == NorthEastGravity) 678 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 679 szHint.win_gravity = SouthEastGravity;
747 else 680 else
748 szHint.win_gravity = SouthWestGravity; 681 szHint.win_gravity = SouthWestGravity;
749 } 682 }
750 } 683 }
751 } 684 }
752 685
753 /* TODO: BOUNDS */ 686 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 687 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 688 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 689 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 690 max_height = MAX_ROWS * fheight;
758 691
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 692 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 693
761 sb_w = mb_h = 0; 694 sb_w = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 695 window_vt_x = window_vt_y = int_bwidth;
763 696
764 if (scrollbar_visible ()) 697 if (scrollBar.state)
765 { 698 {
766 sb_w = scrollbar_TotalWidth (); 699 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 700 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 701 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 702 window_vt_x += sb_w;
770 } 703 }
771 704
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; 705 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 706 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 707 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 708 szHint.min_height = szHint.base_height + szHint.height_inc;
783 709
784 if (width && width - szHint.base_width < max_width) 710 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 711 {
786 szHint.width = width; 712 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 713 width = newwidth - szHint.base_width;
788 } 714 }
789 else 715 else
790 { 716 {
791 MIN_IT (TermWin.width, max_width); 717 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 718 szHint.width = szHint.base_width + width;
793 } 719 }
794 720
795 if (height && height - szHint.base_height < max_height) 721 if (newheight && newheight - szHint.base_height < max_height)
796 { 722 {
797 szHint.height = height; 723 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 724 height = newheight - szHint.base_height;
799 } 725 }
800 else 726 else
801 { 727 {
802 MIN_IT (TermWin.height, max_height); 728 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 729 szHint.height = szHint.base_height + height;
804 } 730 }
805 731
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 732 if (scrollBar.state && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 733 window_sb_x = szHint.width - sb_w;
808 734
809 if (recalc_x) 735 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 737 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 739
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 740 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 741 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width,
820 szHint.height));
821 return;
822} 742}
823 743
824/*----------------------------------------------------------------------*/ 744/*----------------------------------------------------------------------*/
825/* 745/*
826 * Tell the teletype handler what size the window is. 746 * Tell the teletype handler what size the window is.
827 * Called after a window size change. 747 * Called after a window size change.
828 */ 748 */
829void 749void
830rxvt_term::tt_winch () 750rxvt_term::tt_winch ()
831{ 751{
832 if (pty.pty < 0) 752 if (pty->pty < 0)
833 return; 753 return;
834 754
835 struct winsize ws; 755 struct winsize ws;
836 756
837 ws.ws_col = TermWin.ncol; 757 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 758 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 759 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 760 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
842 762
843#if 0 763#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 765 if (cmd_pid) /* force through to the command */
846 kill (-cmd_pid, SIGWINCH); 766 kill (-cmd_pid, SIGWINCH);
… …
869 return false; 789 return false;
870 } 790 }
871 791
872#if ENABLE_STYLES 792#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 793 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 794 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 795 delete fontset[i];
876#endif 796#endif
877 797
878 delete TermWin.fontset[0]; 798 delete fontset[0];
879 TermWin.fontset[0] = fs; 799 fontset[0] = fs;
880 800
881 prop = (*fs)[1]->properties (); 801 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 802 prop.height += lineSpace;
883 fs->set_prop (prop); 803 fs->set_prop (prop);
884 804
885 TermWin.fwidth = prop.width; 805 fwidth = prop.width;
886 TermWin.fheight = prop.height; 806 fheight = prop.height;
887 TermWin.fweight = prop.weight; 807 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 808
891 for (int style = 1; style < 4; style++) 809 for (int style = 1; style < 4; style++)
892 { 810 {
893#if ENABLE_STYLES 811#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 812 const char *res = rs[Rs_font + style];
895 813
896 if (res && !*res) 814 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 815 fontset[style] = fontset[0];
898 else 816 else
899 { 817 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 818 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 819 rxvt_fontprop prop2 = prop;
902 820
903 if (res) 821 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 822 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 823 else
906 { 824 {
907 res = TermWin.fontset[0]->fontdesc; 825 res = fontset[0]->fontdesc;
908 826
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 827 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; 828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 829 }
912 830
913 fs->populate (res); 831 fs->populate (res);
914 fs->set_prop (prop2); 832 fs->set_prop (prop2);
915 } 833 }
916#else 834#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 835 fontset[style] = fontset[0];
918#endif 836#endif
919 } 837 }
920 838
921 if (TermWin.parent[0]) 839 if (parent[0])
922 { 840 {
923 resize_all_windows (0, 0, 0); 841 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 842 scr_remap_chars ();
925 scr_touch (true); 843 scr_touch (true);
926 } 844 }
… …
928 return true; 846 return true;
929} 847}
930 848
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 849void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 850{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 851 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 852 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 853 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 854}
938 855
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 857{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 858 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 859 char *s = rxvt_wcstoutf8 (ws);
944 860
945 XChangeProperty (display->display, TermWin.parent[0], 861 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 863 (const unsigned char *)s, strlen (s));
948 864
949 free (s); 865 free (s);
950 free (ws); 866 free (ws);
… …
987 i = atoi (color); 903 i = atoi (color);
988 904
989 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
990 { /* bright colors */ 906 { /* bright colors */
991 i -= 8; 907 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 909 SET_PIXCOLOR (idx);
995 goto done; 910 goto done;
996# endif
997 } 911 }
998 912
999 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 914 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1113 1027
1114/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1117void 1031void
1118rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1119{ 1033{
1120 int fix_screen; 1034 int fix_screen;
1121#ifdef SMART_RESIZE 1035 int old_width = szHint.width;
1122 int old_width = szHint.width, old_height = szHint.height; 1036 int 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 */
… …
1150 { 1063 {
1151 x -= x1; 1064 x -= x1;
1152 y -= y1; 1065 y -= y1;
1153 } 1066 }
1154 1067
1155 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1156 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1157 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1158 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1159 1072
1160 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1161 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1162 dx = 0; 1075 dx = 0;
… …
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
1202 } 1110 }
1203 1111
1204 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1205 {
1206 int curr_screen = -1;
1207 int old_ncol = prev_ncol;
1208
1209 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */
1211 {
1212 unsigned int ncol = TermWin.ncol;
1213 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1214 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol;
1216 }
1217
1218 scr_reset (); 1113 scr_reset ();
1219
1220 if (curr_screen >= 0) /* this is not the first time through */
1221 {
1222 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1224 }
1225 }
1226
1227 old_width = szHint.width;
1228 old_height = szHint.height;
1229 1114
1230#ifdef XPM_BACKGROUND 1115#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1116 if (pixmap)
1232 scr_touch (false); 1117 scr_touch (false);
1233#endif 1118#endif
1234 1119
1235#ifdef USE_XIM 1120#ifdef USE_XIM
1236 IMSetStatusPosition (); 1121 IMSetStatusPosition ();
… …
1240/* 1125/*
1241 * Set the width/height of the vt window in characters. Units are pixels. 1126 * Set the width/height of the vt window in characters. Units are pixels.
1242 * good for toggling 80/132 columns 1127 * good for toggling 80/132 columns
1243 */ 1128 */
1244void 1129void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1130rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1131{
1247 XWindowAttributes wattr; 1132 XWindowAttributes wattr;
1248 1133
1249 if (width == 0 || height == 0) 1134 if (newwidth == 0 || newheight == 0)
1250 { 1135 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1136 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1137
1253 if (width == 0) 1138 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1139 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1140 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1141 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1142 }
1143
1144 if (newwidth != width || newheight != height)
1145 {
1261 width += szHint.base_width; 1146 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1147 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1148 resize_all_windows (newwidth, newheight, 0);
1264 } 1149 }
1265} 1150}
1266 1151
1267/* -------------------------------------------------------------------- * 1152/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1153 * - X INPUT METHOD ROUTINES - *
… …
1278 1163
1279void 1164void
1280rxvt_term::im_set_size (XRectangle &size) 1165rxvt_term::im_set_size (XRectangle &size)
1281{ 1166{
1282 // the int_bwidth terms make no sense to me 1167 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1168 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1169 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1170 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1171 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1172}
1288 1173
1289void 1174void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1175rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1176 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1177 const XRectangle &needed_rect)
1293{ 1178{
1294 preedit_rect.x = needed_rect.width; 1179 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1180 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1181 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1182 preedit_rect.height = fheight;
1298 1183
1299 status_rect.x = 0; 1184 status_rect.x = 0;
1300 status_rect.y = 0; 1185 status_rect.y = 0;
1301 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1186 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1302 status_rect.height = TermWin.fheight; 1187 status_rect.height = fheight;
1303} 1188}
1304 1189
1305/* Checking whether input method is running. */ 1190/* Checking whether input method is running. */
1306bool 1191bool
1307rxvt_term::IMisRunning () 1192rxvt_term::IMisRunning ()
… …
1335{ 1220{
1336 XPoint nspot; 1221 XPoint nspot;
1337 XVaNestedList preedit_attr; 1222 XVaNestedList preedit_attr;
1338 1223
1339 if (!Input_Context 1224 if (!Input_Context
1340 || !TermWin.focus 1225 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1226 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1342 return; 1227 return;
1343 1228
1344 im_set_position (nspot); 1229 im_set_position (nspot);
1345 1230
1346 if (nspot.x == spot.x && nspot.y == spot.y) 1231 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1365 input_method = 0; 1250 input_method = 0;
1366 } 1251 }
1367 1252
1368 Input_Context = 0; 1253 Input_Context = 0;
1369} 1254}
1255
1256#ifdef ENABLE_XIM_ONTHESPOT
1257
1258static void
1259xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1260{
1261 ((rxvt_term *)client_data)->make_current ();
1262 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1263}
1264
1265static void
1266xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1270}
1271
1272static void
1273xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1274{
1275 rxvt_term *term = (rxvt_term *)client_data;
1276 XIMText *text = call_data->text;
1277
1278 term->make_current ();
1279
1280 if (text)
1281 {
1282 void *str;
1283
1284 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 {
1286 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]);
1289
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1292
1293 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale);
1295 }
1296 else
1297 str = (void *)text->string.wide_char;
1298
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1304 DT_WCS_LEN, str, str ? (int)text->length : 0,
1305 DT_END));
1306 }
1307 else
1308 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1309 DT_INT, call_data->caret,
1310 DT_INT, call_data->chg_first,
1311 DT_INT, call_data->chg_length,
1312 DT_END));
1313}
1314
1315#if 0
1316static void
1317xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1318{
1319 ((rxvt_term *)client_data)->make_current ();
1320 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1321 DT_INT, call_data->position,
1322 DT_INT, call_data->direction,
1323 DT_INT, call_data->style,
1324 DT_END));
1325}
1326#endif
1327
1328#endif
1370 1329
1371/* 1330/*
1372 * Try to open a XIM with the current modifiers, then see if we can 1331 * Try to open a XIM with the current modifiers, then see if we can
1373 * open a suitable preedit type 1332 * open a suitable preedit type
1374 */ 1333 */
… …
1381 XRectangle rect, status_rect, needed_rect; 1340 XRectangle rect, status_rect, needed_rect;
1382 unsigned long fg, bg; 1341 unsigned long fg, bg;
1383 const char *p; 1342 const char *p;
1384 char **s; 1343 char **s;
1385 XIMStyles *xim_styles; 1344 XIMStyles *xim_styles;
1345#ifdef ENABLE_XIM_ONTHESPOT
1346 XIMCallback xcb[4];
1347#endif
1348
1349 set_environ (envv);
1386 1350
1387 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1351 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1388 return false; 1352 return false;
1389 1353
1390 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1391 input_method = display->get_xim (locale, modifiers); 1354 input_method = display->get_xim (locale, modifiers);
1392 if (input_method == NULL) 1355 if (input_method == NULL)
1393 return false; 1356 return false;
1394 1357
1395 xim = input_method->xim; 1358 xim = input_method->xim;
… …
1415 s = rxvt_splitcommastring (p); 1378 s = rxvt_splitcommastring (p);
1416 1379
1417 for (i = found = 0; !found && s[i]; i++) 1380 for (i = found = 0; !found && s[i]; i++)
1418 { 1381 {
1419 if (!strcmp (s[i], "OverTheSpot")) 1382 if (!strcmp (s[i], "OverTheSpot"))
1420 input_style = (XIMPreeditPosition | XIMStatusNothing); 1383 input_style = XIMPreeditPosition | XIMStatusNothing;
1421 else if (!strcmp (s[i], "OffTheSpot")) 1384 else if (!strcmp (s[i], "OffTheSpot"))
1422 input_style = (XIMPreeditArea | XIMStatusArea); 1385 input_style = XIMPreeditArea | XIMStatusArea;
1423 else if (!strcmp (s[i], "Root")) 1386 else if (!strcmp (s[i], "Root"))
1424 input_style = (XIMPreeditNothing | XIMStatusNothing); 1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1425 else if (!strcmp (s[i], "None")) 1388 else if (!strcmp (s[i], "None"))
1426 input_style = (XIMPreeditNone | XIMStatusNone); 1389 input_style = XIMPreeditNone | XIMStatusNone;
1390#ifdef ENABLE_XIM_ONTHESPOT
1391 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1392 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1393#endif
1394 else
1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1427 1396
1428 for (j = 0; j < xim_styles->count_styles; j++) 1397 for (j = 0; j < xim_styles->count_styles; j++)
1429 if (input_style == xim_styles->supported_styles[j]) 1398 if (input_style == xim_styles->supported_styles[j])
1430 { 1399 {
1431 rxvt_freecommastring (s); 1400 rxvt_freecommastring (s);
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1434 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1435 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1436 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1437 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1438 "*",
1470 TermWin.fheight, 1439 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1440 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1441 fheight - 2, fheight + 2);
1473 1442
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1444 &missing_charset_list, &missing_charset_count, &def_string);
1476 1445
1477 if (missing_charset_list) 1446 if (missing_charset_list)
… …
1520 XNBackground, bg, 1489 XNBackground, bg,
1521 XNArea, &status_rect, 1490 XNArea, &status_rect,
1522 XNFontSet, fs, 1491 XNFontSet, fs,
1523 NULL); 1492 NULL);
1524 } 1493 }
1494 else if (input_style & XIMPreeditCallbacks)
1495 {
1496 im_set_position (spot);
1497
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif
1504
1505 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2],
1510#if 0
1511 XNPreeditCaretCallback, &xcb[3],
1512#endif
1513 NULL);
1514 }
1525 1515
1526 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1518 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1519 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1520 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1521 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1523 status_attr, NULL);
1534 1524
… …
1541 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1542 im_destroy (); 1532 im_destroy ();
1543 return false; 1533 return false;
1544 } 1534 }
1545 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1546 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1547 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1548 1544
1549 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1550 return true; 1545 return true;
1551} 1546}
1552 1547
1553void 1548void
1554rxvt_term::im_cb () 1549rxvt_term::im_cb ()
… …
1556 int i; 1551 int i;
1557 const char *p; 1552 const char *p;
1558 char **s; 1553 char **s;
1559 char buf[IMBUFSIZ]; 1554 char buf[IMBUFSIZ];
1560 1555
1561 SET_R (this); 1556 make_current ();
1562 1557
1563 im_destroy (); 1558 im_destroy ();
1564 1559
1565 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1566 if (Input_Context) 1560 if (Input_Context)
1567 return; 1561 return;
1568 1562
1569#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1570 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])
… …
1618{ 1612{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1613 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1614 XVaNestedList preedit_attr, status_attr;
1621 1615
1622 if (!Input_Context 1616 if (!Input_Context
1623 || !TermWin.focus 1617 || !focus
1624 || !(input_style & XIMPreeditArea) 1618 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1619 || !IMisRunning ())
1626 return; 1620 return;
1627 1621
1628 /* Getting the necessary width of preedit area */ 1622 /* Getting the necessary width of preedit area */
… …
1643 XFree (preedit_attr); 1637 XFree (preedit_attr);
1644 XFree (status_attr); 1638 XFree (status_attr);
1645} 1639}
1646#endif /* USE_XIM */ 1640#endif /* USE_XIM */
1647 1641
1648/*----------------------------------------------------------------------*/
1649rxvt_t rxvt_current_term;
1650
1651/*----------------------- end-of-file (C source) -----------------------*/ 1642/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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