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

Diff Legend

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