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.139 by root, Wed Feb 16 21:37:10 2005 UTC vs.
Revision 1.197 by root, Sun Jan 22 20:39:47 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#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term)
546 {
547 }
548} sig_handlers;
549
550char **rxvt_environ; // startup environment
551
534void 552void
535rxvt_init () 553rxvt_init ()
536{ 554{
537 /* 555 ptytty::init ();
538 * Save and then give up any super-user privileges 556
539 * If we need privileges in any area then we must specifically request it. 557 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 558
547 signal (SIGHUP, SIG_IGN); 559 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 560 signal (SIGPIPE, SIG_IGN);
561
562 sig_handlers.sw_term.start (SIGTERM);
563 sig_handlers.sw_int.start (SIGINT);
549 564
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 566 /* signal (SIGURG, SIG_DFL); */
552 567
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 569 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 570 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557 571
558/* ------------------------------------------------------------------------- * 572 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} 573}
579 574
580/* ------------------------------------------------------------------------- * 575/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 576 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 577 * ------------------------------------------------------------------------- */
… …
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 584 rxvt_fatal ("memory allocation failure. aborting.\n");
590 585
591 return p; 586 return p;
592} 587}
593 588
594void * 589void *
595rxvt_calloc (size_t number, size_t size) 590rxvt_calloc (size_t number, size_t size)
596{ 591{
597 void *p = calloc (number, size); 592 void *p = calloc (number, size);
598 593
599 if (!p) 594 if (!p)
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 595 rxvt_fatal ("memory allocation failure. aborting.\n");
601 596
602 return p; 597 return p;
603} 598}
604 599
605void * 600void *
606rxvt_realloc (void *ptr, size_t size) 601rxvt_realloc (void *ptr, size_t size)
607{ 602{
608 void *p = realloc (ptr, size); 603 void *p = realloc (ptr, size);
609 604
610 if (!p) 605 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
612 607
613 return p; 608 return p;
614} 609}
615
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689 610
690/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
691/* 612/*
692 * window size/position calculcations for XSizeHint and other storage. 613 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 614 * if width/height are non-zero then override calculated width/height
694 */ 615 */
695void 616void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 618{
698 short recalc_x, recalc_y; 619 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 620 int x, y, sb_w, flags;
700 unsigned int w, h; 621 unsigned int w, h;
701 unsigned int max_width, max_height; 622 unsigned int max_width, max_height;
702 dDisp; 623 dDisp;
703 624
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 626 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 627
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 629 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 631
711 recalc_x = recalc_y = 0; 632 recalc_x = recalc_y = 0;
712 flags = 0; 633 flags = 0;
634
713 if (!parsed_geometry) 635 if (!parsed_geometry)
714 { 636 {
715 parsed_geometry = 1; 637 parsed_geometry = 1;
638
716 if (rs[Rs_geometry]) 639 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 640 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 641
719 if (flags & WidthValue) 642 if (flags & WidthValue)
720 { 643 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 644 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 645 szHint.flags |= USSize;
723 } 646 }
724 647
725 if (flags & HeightValue) 648 if (flags & HeightValue)
726 { 649 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 650 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 651 szHint.flags |= USSize;
729 } 652 }
730 653
731 if (flags & XValue) 654 if (flags & XValue)
732 { 655 {
733 szHint.x = x; 656 szHint.x = x;
734 szHint.flags |= USPosition; 657 szHint.flags |= USPosition;
658
735 if (flags & XNegative) 659 if (flags & XNegative)
736 { 660 {
737 recalc_x = 1; 661 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 662 szHint.win_gravity = NorthEastGravity;
739 } 663 }
… …
741 665
742 if (flags & YValue) 666 if (flags & YValue)
743 { 667 {
744 szHint.y = y; 668 szHint.y = y;
745 szHint.flags |= USPosition; 669 szHint.flags |= USPosition;
670
746 if (flags & YNegative) 671 if (flags & YNegative)
747 { 672 {
748 recalc_y = 1; 673 recalc_y = 1;
674
749 if (szHint.win_gravity == NorthEastGravity) 675 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 676 szHint.win_gravity = SouthEastGravity;
751 else 677 else
752 szHint.win_gravity = SouthWestGravity; 678 szHint.win_gravity = SouthWestGravity;
753 } 679 }
754 } 680 }
755 } 681 }
756 682
757 /* TODO: BOUNDS */ 683 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 684 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 685 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 686 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 687 max_height = MAX_ROWS * fheight;
762 688
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 689 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 690
765 sb_w = mb_h = 0; 691 sb_w = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 692 window_vt_x = window_vt_y = int_bwidth;
767 693
768 if (scrollbar_visible ()) 694 if (scrollBar.state)
769 { 695 {
770 sb_w = scrollbar_TotalWidth (); 696 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 697 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 698 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 699 window_vt_x += sb_w;
774 } 700 }
775 701
776 if (menubar_visible ())
777 {
778 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h;
780 window_vt_y += mb_h;
781 }
782
783 szHint.width_inc = TermWin.fwidth; 702 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 703 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 704 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 705 szHint.min_height = szHint.base_height + szHint.height_inc;
787 706
788 if (width && width - szHint.base_width < max_width) 707 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 708 {
790 szHint.width = width; 709 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 710 width = newwidth - szHint.base_width;
792 } 711 }
793 else 712 else
794 { 713 {
795 MIN_IT (TermWin.width, max_width); 714 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 715 szHint.width = szHint.base_width + width;
797 } 716 }
798 717
799 if (height && height - szHint.base_height < max_height) 718 if (newheight && newheight - szHint.base_height < max_height)
800 { 719 {
801 szHint.height = height; 720 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 721 height = newheight - szHint.base_height;
803 } 722 }
804 else 723 else
805 { 724 {
806 MIN_IT (TermWin.height, max_height); 725 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 726 szHint.height = szHint.base_height + height;
808 } 727 }
809 728
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 729 if (scrollBar.state && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 730 window_sb_x = szHint.width - sb_w;
812 731
813 if (recalc_x) 732 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 734 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 736
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 737 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 738 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 740 ncol, nrow, szHint.width,
824 szHint.height)); 741 szHint.height));
825 return; 742 return;
826} 743}
827 744
828/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
… …
831 * Called after a window size change. 748 * Called after a window size change.
832 */ 749 */
833void 750void
834rxvt_term::tt_winch () 751rxvt_term::tt_winch ()
835{ 752{
836 if (pty.pty < 0) 753 if (pty->pty < 0)
837 return; 754 return;
838 755
839 struct winsize ws; 756 struct winsize ws;
840 757
841 ws.ws_col = TermWin.ncol; 758 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 759 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 760 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 761 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 762 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846 763
847#if 0 764#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 765 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 766 if (cmd_pid) /* force through to the command */
850 kill (cmd_pid, SIGWINCH); 767 kill (-cmd_pid, SIGWINCH);
851#endif 768#endif
852} 769}
853 770
854/*----------------------------------------------------------------------*/ 771/*----------------------------------------------------------------------*/
855/* set_fonts () - load and set the various fonts 772/* set_fonts () - load and set the various fonts
856/* 773 *
857 * init = 1 - initialize 774 * init = 1 - initialize
858 * 775 *
859 * fontname == FONT_UP - switch to bigger font 776 * fontname == FONT_UP - switch to bigger font
860 * fontname == FONT_DN - switch to smaller font 777 * fontname == FONT_DN - switch to smaller font
861 */ 778 */
… …
873 return false; 790 return false;
874 } 791 }
875 792
876#if ENABLE_STYLES 793#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 794 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 795 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 796 delete fontset[i];
880#endif 797#endif
881 798
882 delete TermWin.fontset[0]; 799 delete fontset[0];
883 TermWin.fontset[0] = fs; 800 fontset[0] = fs;
884 801
885 prop = (*fs)[1]->properties (); 802 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 803 prop.height += lineSpace;
887 fs->set_prop (prop); 804 fs->set_prop (prop);
888 805
889 TermWin.fwidth = prop.width; 806 fwidth = prop.width;
890 TermWin.fheight = prop.height; 807 fheight = prop.height;
891 TermWin.fweight = prop.weight; 808 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 809
895 for (int style = 1; style < 4; style++) 810 for (int style = 1; style < 4; style++)
896 { 811 {
897#if ENABLE_STYLES 812#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 813 const char *res = rs[Rs_font + style];
899 814
900 if (res && !*res) 815 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 816 fontset[style] = fontset[0];
902 else 817 else
903 { 818 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 819 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 820 rxvt_fontprop prop2 = prop;
906 821
907 if (res) 822 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 823 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 824 else
910 { 825 {
911 res = TermWin.fontset[0]->fontdesc; 826 res = fontset[0]->fontdesc;
912 827
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 828 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 829 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 830 }
916 831
917 fs->populate (res); 832 fs->populate (res);
918 fs->set_prop (prop2); 833 fs->set_prop (prop2);
919 } 834 }
920#else 835#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 836 fontset[style] = fontset[0];
922#endif 837#endif
923 } 838 }
924 839
925 if (TermWin.parent[0]) 840 if (parent[0])
926 { 841 {
927 resize_all_windows (0, 0, 0); 842 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 843 scr_remap_chars ();
929 scr_touch (true); 844 scr_touch (true);
930 } 845 }
… …
932 return true; 847 return true;
933} 848}
934 849
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 850void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 851{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 852 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 853 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 854 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 855}
942 856
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 858{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 859 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 860 char *s = rxvt_wcstoutf8 (ws);
948 861
949 XChangeProperty (display->display, TermWin.parent[0], 862 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 864 (const unsigned char *)s, strlen (s));
952 865
953 free (s); 866 free (s);
954 free (ws); 867 free (ws);
… …
959/* xterm sequences - title, iconName, color (exptl) */ 872/* xterm sequences - title, iconName, color (exptl) */
960void 873void
961rxvt_term::set_title (const char *str) 874rxvt_term::set_title (const char *str)
962{ 875{
963 set_string_property (XA_WM_NAME, str); 876 set_string_property (XA_WM_NAME, str);
964#if ENABLE_FRILLS 877#if ENABLE_EWMH
965 set_utf8_property (xa[XA_NET_WM_NAME], str); 878 set_utf8_property (xa[XA_NET_WM_NAME], str);
966#endif 879#endif
967} 880}
968 881
969void 882void
970rxvt_term::set_icon_name (const char *str) 883rxvt_term::set_icon_name (const char *str)
971{ 884{
972 set_string_property (XA_WM_ICON_NAME, str); 885 set_string_property (XA_WM_ICON_NAME, str);
973#if ENABLE_FRILLS 886#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 887 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 888#endif
976} 889}
977 890
978#ifdef XTERM_COLOR_CHANGE 891#ifdef XTERM_COLOR_CHANGE
… …
991 i = atoi (color); 904 i = atoi (color);
992 905
993 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
994 { /* bright colors */ 907 { /* bright colors */
995 i -= 8; 908 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 910 SET_PIXCOLOR (idx);
999 goto Done; 911 goto done;
1000# endif
1001 } 912 }
1002 913
1003 if (i >= 0 && i <= 7) 914 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 915 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx); 917 SET_PIXCOLOR (idx);
1007 goto Done; 918 goto done;
1008 } 919 }
1009 } 920 }
1010 921
1011 if (!rXParseAllocColor (&xcol, color)) 922 if (!rXParseAllocColor (&xcol, color))
1012 return; 923 return;
… …
1032 pix_colors_focused[idx] = xcol; 943 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx); 944 SET_PIXCOLOR (idx);
1034 945
1035 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */ 947 /* Cursor cursor; */
1037Done: 948done:
949
1038#ifdef OFF_FOCUS_FADING 950#if OFF_FOCUS_FADING
1039 if (rs[Rs_fade]) 951 if (rs[Rs_fade])
1040 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1041#endif 953#endif
1042 954
1043 /*TODO: handle Color_BD, scrollbar background, etc. */ 955 /*TODO: handle Color_BD, scrollbar background, etc. */
1044 956
1045 recolour_cursor (); 957 recolour_cursor ();
… …
1116 1028
1117/* -------------------------------------------------------------------- * 1029/* -------------------------------------------------------------------- *
1118 * - WINDOW RESIZING - * 1030 * - WINDOW RESIZING - *
1119 * -------------------------------------------------------------------- */ 1031 * -------------------------------------------------------------------- */
1120void 1032void
1121rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1122{ 1034{
1123 int fix_screen; 1035 int fix_screen;
1124#ifdef SMART_RESIZE 1036 int old_width = szHint.width;
1125 int old_width = szHint.width, old_height = szHint.height; 1037 int old_height = szHint.height;
1126#endif
1127 dDisp; 1038 dDisp;
1128 1039
1129 window_calc (width, height); 1040 window_calc (newwidth, newheight);
1130 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1041 XSetWMNormalHints (disp, parent[0], &szHint);
1131 1042
1132 if (!ignoreparent) 1043 if (!ignoreparent)
1133 { 1044 {
1134#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1135 /* 1046 /*
… …
1139 int x, y, x1, y1; 1050 int x, y, x1, y1;
1140 int dx, dy; 1051 int dx, dy;
1141 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1142 Window unused_cr; 1053 Window unused_cr;
1143 1054
1144 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1055 XTranslateCoordinates (disp, parent[0], display->root,
1145 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1146 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1147 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1148 /* 1059 /*
1149 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1150 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1151 */ 1062 */
… …
1153 { 1064 {
1154 x -= x1; 1065 x -= x1;
1155 y -= y1; 1066 y -= y1;
1156 } 1067 }
1157 1068
1158 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1159 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1160 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1161 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1162 1073
1163 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1164 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1165 dx = 0; 1076 dx = 0;
… …
1168 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1169 dy = 0; 1080 dy = 0;
1170 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1171 dy /= 2; 1082 dy /= 2;
1172 1083
1173 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1174 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1175#else 1086#else
1176 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1177#endif 1088#endif
1178 } 1089 }
1179 1090
1180 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1181 1092
1182 if (fix_screen || width != old_width || height != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1183 { 1094 {
1184 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1185 { 1096 {
1186 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (disp, scrollBar.win,
1187 window_sb_x, 0, 1098 window_sb_x, 0,
1188 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1189 resize_scrollbar (); 1100 resize_scrollbar ();
1190 } 1101 }
1191 1102
1192 if (menubar_visible ())
1193 XMoveResizeWindow (disp, menuBar.win,
1194 window_vt_x, 0,
1195 TermWin_TotalWidth (), menuBar_TotalHeight ());
1196
1197 XMoveResizeWindow (disp, TermWin.vt, 1103 XMoveResizeWindow (disp, vt,
1198 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1199 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1105 width, height);
1200 1106
1201 scr_clear (); 1107 scr_clear ();
1202#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1203 resize_pixmap (); 1109 resize_pixmap ();
1204#endif 1110#endif
1205 } 1111 }
1206 1112
1207 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1208 {
1209 int curr_screen = -1;
1210 int old_ncol = prev_ncol;
1211
1212 /* scr_reset only works on the primary screen */
1213 if (old_height) /* this is not the first time through */
1214 {
1215 unsigned int ncol = TermWin.ncol;
1216 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1217 curr_screen = scr_change_screen (PRIMARY);
1218 TermWin.ncol = ncol;
1219 }
1220
1221 scr_reset (); 1114 scr_reset ();
1222
1223 if (curr_screen >= 0) /* this is not the first time through */
1224 {
1225 scr_change_screen (curr_screen);
1226 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1227 }
1228 }
1229
1230 old_width = szHint.width;
1231 old_height = szHint.height;
1232 1115
1233#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1234 if (TermWin.pixmap) 1117 if (pixmap)
1235 scr_touch (false); 1118 scr_touch (false);
1236#endif 1119#endif
1237 1120
1238#ifdef USE_XIM 1121#ifdef USE_XIM
1239 IMSetStatusPosition (); 1122 IMSetStatusPosition ();
… …
1243/* 1126/*
1244 * Set the width/height of the vt window in characters. Units are pixels. 1127 * Set the width/height of the vt window in characters. Units are pixels.
1245 * good for toggling 80/132 columns 1128 * good for toggling 80/132 columns
1246 */ 1129 */
1247void 1130void
1248rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1131rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1249{ 1132{
1250 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1251 1134
1252 if (width == 0 || height == 0) 1135 if (newwidth == 0 || newheight == 0)
1253 { 1136 {
1254 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (display->display, display->root, &wattr);
1138
1255 if (width == 0) 1139 if (newwidth == 0)
1256 width = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1257 if (height == 0) 1141 if (newheight == 0)
1258 height = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
1259 }
1260
1261 if (width != TermWin.width || height != TermWin.height)
1262 { 1143 }
1144
1145 if (newwidth != width || newheight != height)
1146 {
1263 width += szHint.base_width; 1147 newwidth += szHint.base_width;
1264 height += szHint.base_height; 1148 newheight += szHint.base_height;
1265 resize_all_windows (width, height, 0); 1149 resize_all_windows (newwidth, newheight, 0);
1266 } 1150 }
1267} 1151}
1268 1152
1269/* -------------------------------------------------------------------- * 1153/* -------------------------------------------------------------------- *
1270 * - X INPUT METHOD ROUTINES - * 1154 * - X INPUT METHOD ROUTINES - *
… …
1280 1164
1281void 1165void
1282rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1283{ 1167{
1284 // the int_bwidth terms make no sense to me 1168 // the int_bwidth terms make no sense to me
1285 size.x = TermWin.int_bwidth; 1169 size.x = int_bwidth;
1286 size.y = TermWin.int_bwidth; 1170 size.y = int_bwidth;
1287 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1171 size.width = Width2Pixel (ncol) + int_bwidth;
1288 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1172 size.height = Height2Pixel (nrow) + int_bwidth;
1289} 1173}
1290 1174
1291void 1175void
1292rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1176rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293 XRectangle &status_rect, 1177 XRectangle &status_rect,
1294 const XRectangle &needed_rect) 1178 const XRectangle &needed_rect)
1295{ 1179{
1296 preedit_rect.x = needed_rect.width; 1180 preedit_rect.x = needed_rect.width;
1297 preedit_rect.y = 0; 1181 preedit_rect.y = 0;
1298 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1182 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1299 preedit_rect.height = TermWin.fheight; 1183 preedit_rect.height = fheight;
1300 1184
1301 status_rect.x = 0; 1185 status_rect.x = 0;
1302 status_rect.y = 0; 1186 status_rect.y = 0;
1303 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1187 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1304 status_rect.height = TermWin.fheight; 1188 status_rect.height = fheight;
1305} 1189}
1306 1190
1307/* Checking whether input method is running. */ 1191/* Checking whether input method is running. */
1308bool 1192bool
1309rxvt_term::IMisRunning () 1193rxvt_term::IMisRunning ()
… …
1337{ 1221{
1338 XPoint nspot; 1222 XPoint nspot;
1339 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1340 1224
1341 if (!Input_Context 1225 if (!Input_Context
1342 || !TermWin.focus 1226 || !focus
1343 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & XIMPreeditPosition))
1344 return; 1228 return;
1345 1229
1346 im_set_position (nspot); 1230 im_set_position (nspot);
1347 1231
… …
1383 XRectangle rect, status_rect, needed_rect; 1267 XRectangle rect, status_rect, needed_rect;
1384 unsigned long fg, bg; 1268 unsigned long fg, bg;
1385 const char *p; 1269 const char *p;
1386 char **s; 1270 char **s;
1387 XIMStyles *xim_styles; 1271 XIMStyles *xim_styles;
1272
1273 set_environ (envv);
1388 1274
1389 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1390 return false; 1276 return false;
1391 1277
1392 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1353 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1354 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1355 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1356 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "*", 1357 "*",
1472 TermWin.fheight, 1358 fheight,
1473 TermWin.fheight + 1, TermWin.fheight - 1, 1359 fheight + 1, fheight - 1,
1474 TermWin.fheight - 2, TermWin.fheight + 2); 1360 fheight - 2, fheight + 2);
1475 1361
1476 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477 &missing_charset_list, &missing_charset_count, &def_string); 1363 &missing_charset_list, &missing_charset_count, &def_string);
1478 1364
1479 if (missing_charset_list) 1365 if (missing_charset_list)
… …
1525 NULL); 1411 NULL);
1526 } 1412 }
1527 1413
1528 Input_Context = XCreateIC (xim, 1414 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style, 1415 XNInputStyle, input_style,
1530 XNClientWindow, TermWin.vt, 1416 XNClientWindow, vt,
1531 XNFocusWindow, TermWin.parent[0], 1417 XNFocusWindow, parent[0],
1532 preedit_attr ? XNPreeditAttributes : NULL, 1418 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr, 1419 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL, 1420 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL); 1421 status_attr, NULL);
1536 1422
… …
1553} 1439}
1554 1440
1555void 1441void
1556rxvt_term::im_cb () 1442rxvt_term::im_cb ()
1557{ 1443{
1558 int i, found, had_im; 1444 int i;
1559 const char *p; 1445 const char *p;
1560 char **s; 1446 char **s;
1561 char buf[IMBUFSIZ]; 1447 char buf[IMBUFSIZ];
1562 1448
1563 SET_R (this); 1449 make_current ();
1564 1450
1565 im_destroy (); 1451 im_destroy ();
1566 1452
1567 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1453 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1568 if (Input_Context) 1454 if (Input_Context)
… …
1620{ 1506{
1621 XRectangle preedit_rect, status_rect, *needed_rect; 1507 XRectangle preedit_rect, status_rect, *needed_rect;
1622 XVaNestedList preedit_attr, status_attr; 1508 XVaNestedList preedit_attr, status_attr;
1623 1509
1624 if (!Input_Context 1510 if (!Input_Context
1625 || !TermWin.focus 1511 || !focus
1626 || !(input_style & XIMPreeditArea) 1512 || !(input_style & XIMPreeditArea)
1627 || !IMisRunning ()) 1513 || !IMisRunning ())
1628 return; 1514 return;
1629 1515
1630 /* Getting the necessary width of preedit area */ 1516 /* Getting the necessary width of preedit area */
… …
1645 XFree (preedit_attr); 1531 XFree (preedit_attr);
1646 XFree (status_attr); 1532 XFree (status_attr);
1647} 1533}
1648#endif /* USE_XIM */ 1534#endif /* USE_XIM */
1649 1535
1650/*----------------------------------------------------------------------*/
1651rxvt_t rxvt_current_term;
1652
1653/*----------------------- end-of-file (C source) -----------------------*/ 1536/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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