ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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