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.138 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 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#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
263 } 258 }
264 259
265 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
266
267 delete pix_colors_focused; 261 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
270#endif 264#endif
271 265
272 displays.put (display); 266 displays.put (display);
273 267
… …
293#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
294 delete keyboard; 288 delete keyboard;
295#endif 289#endif
296} 290}
297 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
298void 304void
299rxvt_term::destroy () 305rxvt_term::destroy ()
300{ 306{
301 if (destroy_ev.active) 307 if (destroy_ev.active)
302 return; 308 return;
303 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
304#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
305 scr_overlay_off (); 314 scr_overlay_off ();
306#endif 315#endif
307 316
308 if (display) 317 if (display)
… …
310#if USE_XIM 319#if USE_XIM
311 im_ev.stop (display); 320 im_ev.stop (display);
312#endif 321#endif
313#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
314 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
315#endif
316#if MENUBAR
317 menubar_ev.stop (display);
318#endif 324#endif
319#if TRANSPARENT 325#if TRANSPARENT
320 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
321#endif 327#endif
322 incr_ev.stop (); 328 incr_ev.stop ();
… …
346} 352}
347 353
348void 354void
349rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
350{ 356{
351 SET_R (this); 357 make_current ();
352 358
353 delete this; 359 delete this;
354} 360}
355 361
356/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
421{ 427{
422 if (GET_R->allowedxerror == -1) 428 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 429 GET_R->allowedxerror = event->error_code;
424 else 430 else
425 { 431 {
426 //TODO: GET_R is most likely not the terminal which caused the error 432 // GET_R is most likely not the terminal which caused the error,
427 //TODO: maybe just output the error and continue? 433 // so just output the error and continue
428#if ENABLE_FRILLS 434#if ENABLE_FRILLS
429 print_x_error (display, event); 435 print_x_error (display, event);
430#else 436#else
431 old_xerror_handler (display, event); 437 old_xerror_handler (display, event);
432#endif 438#endif
… …
442 DisplayString (display)); 448 DisplayString (display));
443 rxvt_emergency_cleanup (); 449 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
445} 451}
446 452
447/*
448 * Catch a fatal signal and tidy up before quitting
449 */
450void
451rxvt_term::sig_term (sig_watcher &w)
452{
453#ifdef DEBUG_CMD
454 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455#endif
456 rxvt_emergency_cleanup ();
457 signal (w.signum, SIG_DFL);
458 kill (getpid (), w.signum);
459}
460
461/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 454bool
464rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
465{ 456{
457 this->envv = envv;
458
466 SET_R (this); 459 SET_R (this);
467
468 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
469 462
470 if (!init_vars ()) 463 if (!init_vars ())
471 return false; 464 return false;
472 465
473 init_secondary (); 466 init_secondary ();
… …
476 469
477#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
478 keyboard->register_done (); 471 keyboard->register_done ();
479#endif 472#endif
480 473
481#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]);
483#endif
484#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 475 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
487#endif 477#endif
488 478
479 pty = ptytty::create ();
480
489 create_windows (argc, argv); 481 create_windows (argc, argv);
490 482
491 dDisp; 483 dDisp;
492 484
493 init_xlocale (); 485 init_xlocale ();
494 486
495 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
496 488
497#if 0 489#if 0
498 XSynchronize (disp, True); 490 XSynchronize (disp, True);
499#endif 491#endif
500 492
501#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 494 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
504#endif 496#endif
505#if (MENUBAR_MAX)
506 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win);
508#endif
509#ifdef TRANSPARENT 497#ifdef TRANSPARENT
510 if (options & Opt_transparent) 498 if (OPTION (Opt_transparent))
511 { 499 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 501 check_our_parents ();
514 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
515 } 503 }
516#endif 504#endif
517 505
518 XMapWindow (disp, TermWin.vt);
519 XMapWindow (disp, TermWin.parent[0]);
520
521 set_colorfgbg (); 506 set_colorfgbg ();
522 507
523 init_command (cmd_argv); 508 init_command (cmd_argv);
524 509
525 free (cmd_argv); 510 free (cmd_argv);
526 511
512 if (pty->pty >= 0)
527 pty_ev.start (pty.pty, EVENT_READ); 513 pty_ev.start (pty->pty, EVENT_READ);
528 514
529 check_ev.start (); 515 check_ev.start ();
530 516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
531 return true; 522 return true;
532} 523}
533 524
525static struct sig_handlers
526{
527 sig_watcher sw_term, sw_int;
528
529 /*
530 * Catch a fatal signal and tidy up before quitting
531 */
532 void
533 sig_term (sig_watcher &w)
534 {
535 rxvt_emergency_cleanup ();
536 signal (w.signum, SIG_DFL);
537 kill (getpid (), w.signum);
538 }
539
540 sig_handlers ()
541 : sw_term (this, &sig_handlers::sig_term),
542 sw_int (this, &sig_handlers::sig_term)
543 {
544 }
545} sig_handlers;
546
547char **rxvt_environ; // startup environment
548
534void 549void
535rxvt_init () 550rxvt_init ()
536{ 551{
537 /* 552 ptytty::init ();
538 * Save and then give up any super-user privileges 553
539 * If we need privileges in any area then we must specifically request it. 554 rxvt_environ = environ;
540 * We should only need to be root in these cases:
541 * 1. write utmp entries on some systems
542 * 2. chown tty on some systems
543 */
544 rxvt_privileges (SAVE);
545 rxvt_privileges (IGNORE);
546 555
547 signal (SIGHUP, SIG_IGN); 556 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 557 signal (SIGPIPE, SIG_IGN);
558
559 sig_handlers.sw_term.start (SIGTERM);
560 sig_handlers.sw_int.start (SIGINT);
549 561
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 563 /* signal (SIGURG, SIG_DFL); */
552 564
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 566 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 567 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557 568
558/* ------------------------------------------------------------------------- * 569 XrmInitialize ();
559 * SIGNAL HANDLING & EXIT HANDLER *
560 * ------------------------------------------------------------------------- */
561/*
562 * Catch a SIGCHLD signal and exit if the direct child has died
563 */
564
565void
566rxvt_term::sig_chld (sig_watcher &w)
567{
568 // we are being called for every SIGCHLD, not just ours
569 int pid;
570
571 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
572 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
573 if (pid == (*t)->cmd_pid)
574 {
575 (*t)->destroy ();
576 break;
577 }
578} 570}
579 571
580/* ------------------------------------------------------------------------- * 572/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 573 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 574 * ------------------------------------------------------------------------- */
… …
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 581 rxvt_fatal ("memory allocation failure. aborting.\n");
590 582
591 return p; 583 return p;
592} 584}
593 585
594/* INTPROTO */ 586void *
595void *
596rxvt_calloc (size_t number, size_t size) 587rxvt_calloc (size_t number, size_t size)
597{ 588{
598 void *p = calloc (number, size); 589 void *p = calloc (number, size);
599 590
600 if (!p) 591 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n"); 592 rxvt_fatal ("memory allocation failure. aborting.\n");
602 593
603 return p; 594 return p;
604} 595}
605 596
606/* INTPROTO */ 597void *
607void *
608rxvt_realloc (void *ptr, size_t size) 598rxvt_realloc (void *ptr, size_t size)
609{ 599{
610 void *p = realloc (ptr, size); 600 void *p = realloc (ptr, size);
611 601
612 if (!p) 602 if (!p)
613 rxvt_fatal ("memory allocation failure. aborting.\n"); 603 rxvt_fatal ("memory allocation failure. aborting.\n");
614 604
615 return p; 605 return p;
616} 606}
617
618/* ------------------------------------------------------------------------- *
619 * PRIVILEGED OPERATIONS *
620 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */
622void
623rxvt_privileges (rxvt_privaction action)
624{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a))
635# define HAVE_SETEUID
636# endif
637# ifdef HAVE_SETEUID
638 switch (action)
639 {
640 case IGNORE:
641 /*
642 * change effective uid/gid - not real uid/gid - so we can switch
643 * back to root later, as required
644 */
645 seteuid (getuid ());
646 setegid (getgid ());
647 break;
648 case SAVE:
649 euid = geteuid ();
650 egid = getegid ();
651 break;
652 case RESTORE:
653 seteuid (euid);
654 setegid (egid);
655 break;
656 }
657# else
658 switch (action)
659 {
660 case IGNORE:
661 setuid (getuid ());
662 setgid (getgid ());
663 /* FALLTHROUGH */
664 case SAVE:
665 /* FALLTHROUGH */
666 case RESTORE:
667 break;
668 }
669# endif
670#endif
671}
672
673#ifdef UTMP_SUPPORT
674void
675rxvt_term::privileged_utmp (rxvt_privaction action)
676{
677 if ((options & Opt_utmpInhibit)
678 || !pty.name || !*pty.name)
679 return;
680
681 rxvt_privileges (RESTORE);
682
683 if (action == SAVE)
684 makeutent (pty.name, rs[Rs_display_name]);
685 else
686 cleanutent ();
687
688 rxvt_privileges (IGNORE);
689}
690#endif
691 607
692/*----------------------------------------------------------------------*/ 608/*----------------------------------------------------------------------*/
693/* 609/*
694 * window size/position calculcations for XSizeHint and other storage. 610 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 611 * if width/height are non-zero then override calculated width/height
696 */ 612 */
697void 613void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 615{
700 short recalc_x, recalc_y; 616 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 617 int x, y, sb_w, flags;
702 unsigned int w, h; 618 unsigned int w, h;
703 unsigned int max_width, max_height; 619 unsigned int max_width, max_height;
704 dDisp; 620 dDisp;
705 621
706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
707 TermWin.ncol, TermWin.nrow, szHint.width,
708 szHint.height));
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 623 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 625
713 recalc_x = recalc_y = 0; 626 recalc_x = recalc_y = 0;
714 flags = 0; 627 flags = 0;
628
715 if (!parsed_geometry) 629 if (!parsed_geometry)
716 { 630 {
717 parsed_geometry = 1; 631 parsed_geometry = 1;
632
718 if (rs[Rs_geometry]) 633 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 634 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 635
721 if (flags & WidthValue) 636 if (flags & WidthValue)
722 { 637 {
723 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 638 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 639 szHint.flags |= USSize;
725 } 640 }
726 641
727 if (flags & HeightValue) 642 if (flags & HeightValue)
728 { 643 {
729 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 644 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 645 szHint.flags |= USSize;
731 } 646 }
732 647
733 if (flags & XValue) 648 if (flags & XValue)
734 { 649 {
735 szHint.x = x; 650 szHint.x = x;
736 szHint.flags |= USPosition; 651 szHint.flags |= USPosition;
652
737 if (flags & XNegative) 653 if (flags & XNegative)
738 { 654 {
739 recalc_x = 1; 655 recalc_x = 1;
740 szHint.win_gravity = NorthEastGravity; 656 szHint.win_gravity = NorthEastGravity;
741 } 657 }
… …
743 659
744 if (flags & YValue) 660 if (flags & YValue)
745 { 661 {
746 szHint.y = y; 662 szHint.y = y;
747 szHint.flags |= USPosition; 663 szHint.flags |= USPosition;
664
748 if (flags & YNegative) 665 if (flags & YNegative)
749 { 666 {
750 recalc_y = 1; 667 recalc_y = 1;
668
751 if (szHint.win_gravity == NorthEastGravity) 669 if (szHint.win_gravity == NorthEastGravity)
752 szHint.win_gravity = SouthEastGravity; 670 szHint.win_gravity = SouthEastGravity;
753 else 671 else
754 szHint.win_gravity = SouthWestGravity; 672 szHint.win_gravity = SouthWestGravity;
755 } 673 }
756 } 674 }
757 } 675 }
758 676
759 /* TODO: BOUNDS */ 677 /* TODO: BOUNDS */
760 TermWin.width = TermWin.ncol * TermWin.fwidth; 678 width = ncol * fwidth;
761 TermWin.height = TermWin.nrow * TermWin.fheight; 679 height = nrow * fheight;
762 max_width = MAX_COLS * TermWin.fwidth; 680 max_width = MAX_COLS * fwidth;
763 max_height = MAX_ROWS * TermWin.fheight; 681 max_height = MAX_ROWS * fheight;
764 682
765 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 683 szHint.base_width = szHint.base_height = 2 * int_bwidth;
766 684
767 sb_w = mb_h = 0; 685 sb_w = 0;
768 window_vt_x = window_vt_y = TermWin.int_bwidth; 686 window_vt_x = window_vt_y = int_bwidth;
769 687
770 if (scrollbar_visible ()) 688 if (scrollBar.state)
771 { 689 {
772 sb_w = scrollbar_TotalWidth (); 690 sb_w = scrollbar_TotalWidth ();
773 szHint.base_width += sb_w; 691 szHint.base_width += sb_w;
774 if (!(options & Opt_scrollBar_right)) 692 if (!OPTION (Opt_scrollBar_right))
775 window_vt_x += sb_w; 693 window_vt_x += sb_w;
776 } 694 }
777 695
778 if (menubar_visible ())
779 {
780 mb_h = menuBar_TotalHeight ();
781 szHint.base_height += mb_h;
782 window_vt_y += mb_h;
783 }
784
785 szHint.width_inc = TermWin.fwidth; 696 szHint.width_inc = fwidth;
786 szHint.height_inc = TermWin.fheight; 697 szHint.height_inc = fheight;
787 szHint.min_width = szHint.base_width + szHint.width_inc; 698 szHint.min_width = szHint.base_width + szHint.width_inc;
788 szHint.min_height = szHint.base_height + szHint.height_inc; 699 szHint.min_height = szHint.base_height + szHint.height_inc;
789 700
790 if (width && width - szHint.base_width < max_width) 701 if (newwidth && newwidth - szHint.base_width < max_width)
791 { 702 {
792 szHint.width = width; 703 szHint.width = newwidth;
793 TermWin.width = width - szHint.base_width; 704 width = newwidth - szHint.base_width;
794 } 705 }
795 else 706 else
796 { 707 {
797 MIN_IT (TermWin.width, max_width); 708 min_it (width, max_width);
798 szHint.width = szHint.base_width + TermWin.width; 709 szHint.width = szHint.base_width + width;
799 } 710 }
800 711
801 if (height && height - szHint.base_height < max_height) 712 if (newheight && newheight - szHint.base_height < max_height)
802 { 713 {
803 szHint.height = height; 714 szHint.height = newheight;
804 TermWin.height = height - szHint.base_height; 715 height = newheight - szHint.base_height;
805 } 716 }
806 else 717 else
807 { 718 {
808 MIN_IT (TermWin.height, max_height); 719 min_it (height, max_height);
809 szHint.height = szHint.base_height + TermWin.height; 720 szHint.height = szHint.base_height + height;
810 } 721 }
811 722
812 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 723 if (scrollBar.state && OPTION (Opt_scrollBar_right))
813 window_sb_x = szHint.width - sb_w; 724 window_sb_x = szHint.width - sb_w;
814 725
815 if (recalc_x) 726 if (recalc_x)
816 szHint.x += (DisplayWidth (disp, display->screen) 727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
817 - szHint.width - 2 * TermWin.ext_bwidth);
818 if (recalc_y) 728 if (recalc_y)
819 szHint.y += (DisplayHeight (disp, display->screen) 729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
820 - szHint.height - 2 * TermWin.ext_bwidth);
821 730
822 TermWin.ncol = TermWin.width / TermWin.fwidth; 731 ncol = width / fwidth;
823 TermWin.nrow = TermWin.height / TermWin.fheight; 732 nrow = height / fheight;
824 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
825 TermWin.ncol, TermWin.nrow, szHint.width,
826 szHint.height));
827 return;
828} 733}
829 734
830/*----------------------------------------------------------------------*/ 735/*----------------------------------------------------------------------*/
831/* 736/*
832 * Tell the teletype handler what size the window is. 737 * Tell the teletype handler what size the window is.
833 * Called after a window size change. 738 * Called after a window size change.
834 */ 739 */
835void 740void
836rxvt_term::tt_winch () 741rxvt_term::tt_winch ()
837{ 742{
838 if (pty.pty < 0) 743 if (pty->pty < 0)
839 return; 744 return;
840 745
841 struct winsize ws; 746 struct winsize ws;
842 747
843 ws.ws_col = TermWin.ncol; 748 ws.ws_col = ncol;
844 ws.ws_row = TermWin.nrow; 749 ws.ws_row = nrow;
845 ws.ws_xpixel = TermWin.width; 750 ws.ws_xpixel = width;
846 ws.ws_ypixel = TermWin.height; 751 ws.ws_ypixel = height;
847 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
848 753
849#if 0 754#if 0
850 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
851 if (cmd_pid) /* force through to the command */ 756 if (cmd_pid) /* force through to the command */
852 kill (cmd_pid, SIGWINCH); 757 kill (-cmd_pid, SIGWINCH);
853#endif 758#endif
854} 759}
855 760
856/*----------------------------------------------------------------------*/ 761/*----------------------------------------------------------------------*/
857/* set_fonts () - load and set the various fonts 762/* set_fonts () - load and set the various fonts
858/* 763 *
859 * init = 1 - initialize 764 * init = 1 - initialize
860 * 765 *
861 * fontname == FONT_UP - switch to bigger font 766 * fontname == FONT_UP - switch to bigger font
862 * fontname == FONT_DN - switch to smaller font 767 * fontname == FONT_DN - switch to smaller font
863 */ 768 */
… …
875 return false; 780 return false;
876 } 781 }
877 782
878#if ENABLE_STYLES 783#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; ) 784 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0]) 785 if (fontset[i] != fontset[0])
881 delete TermWin.fontset[i]; 786 delete fontset[i];
882#endif 787#endif
883 788
884 delete TermWin.fontset[0]; 789 delete fontset[0];
885 TermWin.fontset[0] = fs; 790 fontset[0] = fs;
886 791
887 prop = (*fs)[1]->properties (); 792 prop = (*fs)[1]->properties ();
888 prop.height += TermWin.lineSpace; 793 prop.height += lineSpace;
889 fs->set_prop (prop); 794 fs->set_prop (prop);
890 795
891 TermWin.fwidth = prop.width; 796 fwidth = prop.width;
892 TermWin.fheight = prop.height; 797 fheight = prop.height;
893 TermWin.fweight = prop.weight; 798 fbase = prop.ascent;
894 TermWin.fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent;
896 799
897 for (int style = 1; style < 4; style++) 800 for (int style = 1; style < 4; style++)
898 { 801 {
899#if ENABLE_STYLES 802#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style]; 803 const char *res = rs[Rs_font + style];
901 804
902 if (res && !*res) 805 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0]; 806 fontset[style] = fontset[0];
904 else 807 else
905 { 808 {
906 TermWin.fontset[style] = fs = new rxvt_fontset (this); 809 fontset[style] = fs = new rxvt_fontset (this);
907 rxvt_fontprop prop2 = prop; 810 rxvt_fontprop prop2 = prop;
908 811
909 if (res) 812 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset; 813 prop2.weight = prop2.slant = rxvt_fontprop::unset;
911 else 814 else
912 { 815 {
913 res = TermWin.fontset[0]->fontdesc; 816 res = fontset[0]->fontdesc;
914 817
915 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
916 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
917 } 820 }
918 821
919 fs->populate (res); 822 fs->populate (res);
920 fs->set_prop (prop2); 823 fs->set_prop (prop2);
921 } 824 }
922#else 825#else
923 TermWin.fontset[style] = TermWin.fontset[0]; 826 fontset[style] = fontset[0];
924#endif 827#endif
925 } 828 }
926 829
927 if (TermWin.parent[0]) 830 if (parent[0])
928 { 831 {
929 resize_all_windows (0, 0, 0); 832 resize_all_windows (0, 0, 0);
930 scr_remap_chars (); 833 scr_remap_chars ();
931 scr_touch (true); 834 scr_touch (true);
932 } 835 }
… …
934 return true; 837 return true;
935} 838}
936 839
937void rxvt_term::set_string_property (Atom prop, const char *str, int len) 840void rxvt_term::set_string_property (Atom prop, const char *str, int len)
938{ 841{
939 // TODO: SMART_WINDOW_TITLE
940 XChangeProperty (display->display, TermWin.parent[0], 842 XChangeProperty (display->display, parent[0],
941 prop, XA_STRING, 8, PropModeReplace, 843 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 844 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943} 845}
944 846
945void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
946{ 848{
947 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
950 851
951 XChangeProperty (display->display, TermWin.parent[0], 852 XChangeProperty (display->display, parent[0],
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
954 855
955 free (s); 856 free (s);
956 free (ws); 857 free (ws);
… …
961/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
962void 863void
963rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
964{ 865{
965 set_string_property (XA_WM_NAME, str); 866 set_string_property (XA_WM_NAME, str);
966#if ENABLE_FRILLS 867#if ENABLE_EWMH
967 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
968#endif 869#endif
969} 870}
970 871
971void 872void
972rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
973{ 874{
974 set_string_property (XA_WM_ICON_NAME, str); 875 set_string_property (XA_WM_ICON_NAME, str);
975#if ENABLE_FRILLS 876#if ENABLE_EWMH
976 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977#endif 878#endif
978} 879}
979 880
980#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
… …
993 i = atoi (color); 894 i = atoi (color);
994 895
995 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
996 { /* bright colors */ 897 { /* bright colors */
997 i -= 8; 898 i -= 8;
998# ifndef NO_BRIGHTCOLOR
999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000 SET_PIXCOLOR (idx); 900 SET_PIXCOLOR (idx);
1001 goto Done; 901 goto done;
1002# endif
1003 } 902 }
1004 903
1005 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
1006 { /* normal colors */ 905 { /* normal colors */
1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1008 SET_PIXCOLOR (idx); 907 SET_PIXCOLOR (idx);
1009 goto Done; 908 goto done;
1010 } 909 }
1011 } 910 }
1012 911
1013 if (!rXParseAllocColor (&xcol, color)) 912 if (!rXParseAllocColor (&xcol, color))
1014 return; 913 return;
… …
1034 pix_colors_focused[idx] = xcol; 933 pix_colors_focused[idx] = xcol;
1035 SET_PIXCOLOR (idx); 934 SET_PIXCOLOR (idx);
1036 935
1037 /* XSetWindowAttributes attr; */ 936 /* XSetWindowAttributes attr; */
1038 /* Cursor cursor; */ 937 /* Cursor cursor; */
1039Done: 938done:
939
1040#ifdef OFF_FOCUS_FADING 940#if OFF_FOCUS_FADING
1041 if (rs[Rs_fade]) 941 if (rs[Rs_fade])
1042 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1043#endif 943#endif
1044 944
1045 /*TODO: handle Color_BD, scrollbar background, etc. */ 945 /*TODO: handle Color_BD, scrollbar background, etc. */
1046 946
1047 recolour_cursor (); 947 recolour_cursor ();
… …
1118 1018
1119/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1120 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1121 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
1122void 1022void
1123rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1124{ 1024{
1125 int fix_screen; 1025 int fix_screen;
1126#ifdef SMART_RESIZE 1026 int old_width = szHint.width;
1127 int old_width = szHint.width, old_height = szHint.height; 1027 int old_height = szHint.height;
1128#endif
1129 dDisp; 1028 dDisp;
1130 1029
1131 window_calc (width, height); 1030 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1031 XSetWMNormalHints (disp, parent[0], &szHint);
1133 1032
1134 if (!ignoreparent) 1033 if (!ignoreparent)
1135 { 1034 {
1136#ifdef SMART_RESIZE 1035#ifdef SMART_RESIZE
1137 /* 1036 /*
… …
1141 int x, y, x1, y1; 1040 int x, y, x1, y1;
1142 int dx, dy; 1041 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1043 Window unused_cr;
1145 1044
1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1045 XTranslateCoordinates (disp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1046 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1049 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1050 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1051 * our position for handles and decorations. Counter it
1153 */ 1052 */
… …
1155 { 1054 {
1156 x -= x1; 1055 x -= x1;
1157 y -= y1; 1056 y -= y1;
1158 } 1057 }
1159 1058
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1061 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1062 dy = old_height - szHint.height;
1164 1063
1165 /* Check position of the center of the window */ 1064 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1065 if (x < x1) /* left half */
1167 dx = 0; 1066 dx = 0;
… …
1170 if (y < y1) /* top half */ 1069 if (y < y1) /* top half */
1171 dy = 0; 1070 dy = 0;
1172 else if (y == y1) /* exact center */ 1071 else if (y == y1) /* exact center */
1173 dy /= 2; 1072 dy /= 2;
1174 1073
1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1075 szHint.width, szHint.height);
1177#else 1076#else
1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1179#endif 1078#endif
1180 } 1079 }
1181 1080
1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1082
1184 if (fix_screen || width != old_width || height != old_height) 1083 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1084 {
1186 if (scrollbar_visible ()) 1085 if (scrollBar.state)
1187 { 1086 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1087 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1088 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1089 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1090 resize_scrollbar ();
1192 } 1091 }
1193 1092
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, TermWin.vt, 1093 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1094 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1095 width, height);
1202 1096
1203 scr_clear (); 1097 scr_clear ();
1204#ifdef XPM_BACKGROUND 1098#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1099 resize_pixmap ();
1206#endif 1100#endif
1207 } 1101 }
1208 1102
1209 if (fix_screen || old_height == 0) 1103 if (fix_screen || old_height == 0)
1210 {
1211 int curr_screen = -1;
1212 int old_ncol = prev_ncol;
1213
1214 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */
1216 {
1217 unsigned int ncol = TermWin.ncol;
1218 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY);
1220 TermWin.ncol = ncol;
1221 }
1222
1223 scr_reset (); 1104 scr_reset ();
1224
1225 if (curr_screen >= 0) /* this is not the first time through */
1226 {
1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1229 }
1230 }
1231
1232 old_width = szHint.width;
1233 old_height = szHint.height;
1234 1105
1235#ifdef XPM_BACKGROUND 1106#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap) 1107 if (pixmap)
1237 scr_touch (false); 1108 scr_touch (false);
1238#endif 1109#endif
1239 1110
1240#ifdef USE_XIM 1111#ifdef USE_XIM
1241 IMSetStatusPosition (); 1112 IMSetStatusPosition ();
… …
1245/* 1116/*
1246 * Set the width/height of the vt window in characters. Units are pixels. 1117 * Set the width/height of the vt window in characters. Units are pixels.
1247 * good for toggling 80/132 columns 1118 * good for toggling 80/132 columns
1248 */ 1119 */
1249void 1120void
1250rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1121rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251{ 1122{
1252 XWindowAttributes wattr; 1123 XWindowAttributes wattr;
1253 1124
1254 if (width == 0 || height == 0) 1125 if (newwidth == 0 || newheight == 0)
1255 { 1126 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1127 XGetWindowAttributes (display->display, display->root, &wattr);
1128
1257 if (width == 0) 1129 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1130 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1131 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1132 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1133 }
1134
1135 if (newwidth != width || newheight != height)
1136 {
1265 width += szHint.base_width; 1137 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1138 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1139 resize_all_windows (newwidth, newheight, 0);
1268 } 1140 }
1269} 1141}
1270 1142
1271/* -------------------------------------------------------------------- * 1143/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1144 * - X INPUT METHOD ROUTINES - *
… …
1282 1154
1283void 1155void
1284rxvt_term::im_set_size (XRectangle &size) 1156rxvt_term::im_set_size (XRectangle &size)
1285{ 1157{
1286 // the int_bwidth terms make no sense to me 1158 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1159 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1160 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1161 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1162 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1163}
1292 1164
1293void 1165void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1166rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1167 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1168 const XRectangle &needed_rect)
1297{ 1169{
1298 preedit_rect.x = needed_rect.width; 1170 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1171 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1172 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1173 preedit_rect.height = fheight;
1302 1174
1303 status_rect.x = 0; 1175 status_rect.x = 0;
1304 status_rect.y = 0; 1176 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1177 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1178 status_rect.height = fheight;
1307} 1179}
1308 1180
1309/* Checking whether input method is running. */ 1181/* Checking whether input method is running. */
1310bool 1182bool
1311rxvt_term::IMisRunning () 1183rxvt_term::IMisRunning ()
… …
1339{ 1211{
1340 XPoint nspot; 1212 XPoint nspot;
1341 XVaNestedList preedit_attr; 1213 XVaNestedList preedit_attr;
1342 1214
1343 if (!Input_Context 1215 if (!Input_Context
1344 || !TermWin.focus 1216 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1217 || !(input_style & XIMPreeditPosition))
1346 return; 1218 return;
1347 1219
1348 im_set_position (nspot); 1220 im_set_position (nspot);
1349 1221
… …
1386 unsigned long fg, bg; 1258 unsigned long fg, bg;
1387 const char *p; 1259 const char *p;
1388 char **s; 1260 char **s;
1389 XIMStyles *xim_styles; 1261 XIMStyles *xim_styles;
1390 1262
1263 set_environ (envv);
1264
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1266 return false;
1393 1267
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1395 input_method = display->get_xim (locale, modifiers); 1268 input_method = display->get_xim (locale, modifiers);
1396 if (input_method == NULL) 1269 if (input_method == NULL)
1397 return false; 1270 return false;
1398 1271
1399 xim = input_method->xim; 1272 xim = input_method->xim;
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1342 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1343 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1344 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1345 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1346 "*",
1474 TermWin.fheight, 1347 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1348 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1349 fheight - 2, fheight + 2);
1477 1350
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1352 &missing_charset_list, &missing_charset_count, &def_string);
1480 1353
1481 if (missing_charset_list) 1354 if (missing_charset_list)
… …
1527 NULL); 1400 NULL);
1528 } 1401 }
1529 1402
1530 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1405 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1406 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1407 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1408 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1410 status_attr, NULL);
1538 1411
… …
1545 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1546 im_destroy (); 1419 im_destroy ();
1547 return false; 1420 return false;
1548 } 1421 }
1549 1422
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input ();
1425
1550 if (input_style & XIMPreeditArea) 1426 if (input_style & XIMPreeditArea)
1551 IMSetStatusPosition (); 1427 IMSetStatusPosition ();
1552 1428
1553 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1554 return true; 1429 return true;
1555} 1430}
1556 1431
1557void 1432void
1558rxvt_term::im_cb () 1433rxvt_term::im_cb ()
1559{ 1434{
1560 int i, found, had_im; 1435 int i;
1561 const char *p; 1436 const char *p;
1562 char **s; 1437 char **s;
1563 char buf[IMBUFSIZ]; 1438 char buf[IMBUFSIZ];
1564 1439
1565 SET_R (this); 1440 make_current ();
1566 1441
1567 im_destroy (); 1442 im_destroy ();
1568 1443
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1444 if (Input_Context)
1571 return; 1445 return;
1572 1446
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1447#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1448 if (rs[Rs_imLocale])
… …
1622{ 1496{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1497 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1498 XVaNestedList preedit_attr, status_attr;
1625 1499
1626 if (!Input_Context 1500 if (!Input_Context
1627 || !TermWin.focus 1501 || !focus
1628 || !(input_style & XIMPreeditArea) 1502 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1503 || !IMisRunning ())
1630 return; 1504 return;
1631 1505
1632 /* Getting the necessary width of preedit area */ 1506 /* Getting the necessary width of preedit area */
… …
1647 XFree (preedit_attr); 1521 XFree (preedit_attr);
1648 XFree (status_attr); 1522 XFree (status_attr);
1649} 1523}
1650#endif /* USE_XIM */ 1524#endif /* USE_XIM */
1651 1525
1652/*----------------------------------------------------------------------*/
1653rxvt_t rxvt_current_term;
1654
1655/*----------------------- end-of-file (C source) -----------------------*/ 1526/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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