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.143 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
64} 80}
65 81
66#if ENABLE_COMBINING 82#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
68 84
… …
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 150#endif
135#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 153#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 156#endif
144#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#endif
162 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
163 sw_int (this, &rxvt_term::sig_term), 176 bell_ev (this, &rxvt_term::bell_cb),
164 sw_chld (this, &rxvt_term::sig_chld), 177#endif
165 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
167 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
170 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
171 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
174 188
175 termlist.push_back (this); 189 termlist.push_back (this);
176 190
177#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
178 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
179
180 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n");
182#endif 193#endif
183} 194}
184 195
185// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
186// for use before an emergency exit 197// for use before an emergency exit
187void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
188{ 199{
189 if (cmd_pid) 200 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
191 202
192#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
193 privileged_utmp (RESTORE);
194#endif
195
196 pty.put ();
197} 204}
198 205
199rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
200{ 207{
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 209
203 emergency_cleanup (); 210 emergency_cleanup ();
204 211
205#if ENABLE_STYLES 212#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 215 delete fontset[i];
209#endif 216#endif
210 delete TermWin.fontset[0]; 217 delete fontset[0];
211 218
212 if (display) 219 if (display)
213 { 220 {
214 dDisp; 221 dDisp;
215 222
216 selection_clear (); 223 selection_clear ();
217 224
218#ifdef USE_XIM 225#ifdef USE_XIM
219 im_destroy (); 226 im_destroy ();
220#endif
221#ifdef MENUBAR
222 if (menubarGC) XFreeGC (disp, menubarGC);
223#endif 227#endif
224#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
225 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
226 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
227#endif 231#endif
… …
238 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
239 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
240 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
241 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
242#endif 246#endif
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 251#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
249 253
250#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 254 delete drawable;
252 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win);
254#endif
255 delete TermWin.drawable;
256 // destroy all windows 255 // destroy all windows
257 if (TermWin.parent[0]) 256 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
259 } 258 }
260 259
261 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
262
263 delete pix_colors_focused; 261 delete pix_colors_focused;
264#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
265 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
266#endif 264#endif
267 265
268 displays.put (display); 266 displays.put (display);
269 267
… …
289#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
290 delete keyboard; 288 delete keyboard;
291#endif 289#endif
292} 290}
293 291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
302}
303
294void 304void
295rxvt_term::destroy () 305rxvt_term::destroy ()
296{ 306{
297 if (destroy_ev.active) 307 if (destroy_ev.active)
298 return; 308 return;
299 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
300#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
301 scr_overlay_off (); 314 scr_overlay_off ();
302#endif 315#endif
303 316
304 if (display) 317 if (display)
… …
306#if USE_XIM 319#if USE_XIM
307 im_ev.stop (display); 320 im_ev.stop (display);
308#endif 321#endif
309#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
310 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
311#endif
312#if MENUBAR
313 menubar_ev.stop (display);
314#endif 324#endif
315#if TRANSPARENT 325#if TRANSPARENT
316 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
317#endif 327#endif
318 incr_ev.stop (); 328 incr_ev.stop ();
… …
342} 352}
343 353
344void 354void
345rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
346{ 356{
347 SET_R (this); 357 make_current ();
348 358
349 delete this; 359 delete this;
350} 360}
351 361
352/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
417{ 427{
418 if (GET_R->allowedxerror == -1) 428 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code; 429 GET_R->allowedxerror = event->error_code;
420 else 430 else
421 { 431 {
422 //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,
423 //TODO: maybe just output the error and continue? 433 // so just output the error and continue
424#if ENABLE_FRILLS 434#if ENABLE_FRILLS
425 print_x_error (display, event); 435 print_x_error (display, event);
426#else 436#else
427 old_xerror_handler (display, event); 437 old_xerror_handler (display, event);
428#endif 438#endif
… …
438 DisplayString (display)); 448 DisplayString (display));
439 rxvt_emergency_cleanup (); 449 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
441} 451}
442 452
443/*
444 * Catch a fatal signal and tidy up before quitting
445 */
446void
447rxvt_term::sig_term (sig_watcher &w)
448{
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
451#endif
452 rxvt_emergency_cleanup ();
453 signal (w.signum, SIG_DFL);
454 kill (getpid (), w.signum);
455}
456
457/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 454bool
460rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv)
461{ 456{
462 SET_R (this); 457 SET_R (this);
463
464 set_locale (""); 458 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :(
465 460
466 if (!init_vars ()) 461 if (!init_vars ())
467 return false; 462 return false;
468 463
469 init_secondary (); 464 init_secondary ();
… …
472 467
473#ifdef KEYSYM_RESOURCE 468#ifdef KEYSYM_RESOURCE
474 keyboard->register_done (); 469 keyboard->register_done ();
475#endif 470#endif
476 471
477#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]);
479#endif
480#ifdef HAVE_SCROLLBARS 472#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 473 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 474 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 475#endif
484 476
477 pty = rxvt_new_ptytty ();
478
485 create_windows (argc, argv); 479 create_windows (argc, argv);
486 480
487 dDisp; 481 dDisp;
488 482
489 init_xlocale (); 483 init_xlocale ();
490 484
491 scr_reset (); /* initialize screen */ 485 scr_reset (); // initialize screen
492 486
493#if 0 487#if 0
494 XSynchronize (disp, True); 488 XSynchronize (disp, True);
495#endif 489#endif
496 490
497#ifdef HAVE_SCROLLBARS 491#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 492 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 493 resize_scrollbar (); /* create and map scrollbar */
500#endif 494#endif
501#if (MENUBAR_MAX)
502 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win);
504#endif
505#ifdef TRANSPARENT 495#ifdef TRANSPARENT
506 if (options & Opt_transparent) 496 if (OPTION (Opt_transparent))
507 { 497 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 498 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 499 check_our_parents ();
510 rootwin_ev.start (display, display->root); 500 rootwin_ev.start (display, display->root);
511 } 501 }
512#endif 502#endif
513 503
514 XMapWindow (disp, TermWin.vt);
515 XMapWindow (disp, TermWin.parent[0]);
516
517 set_colorfgbg (); 504 set_colorfgbg ();
518 505
519 init_command (cmd_argv); 506 init_command (cmd_argv);
520 507
521 free (cmd_argv); 508 free (cmd_argv);
522 509
510 if (pty->pty >= 0)
523 pty_ev.start (pty.pty, EVENT_READ); 511 pty_ev.start (pty->pty, EVENT_READ);
524 512
525 check_ev.start (); 513 check_ev.start ();
526 514
515 HOOK_INVOKE ((this, HOOK_START, DT_END));
516
517 XMapWindow (disp, vt);
518 XMapWindow (disp, parent[0]);
519
527 return true; 520 return true;
528} 521}
529 522
523static struct sig_handlers
524{
525 sig_watcher sw_term, sw_int;
526
527 /*
528 * Catch a fatal signal and tidy up before quitting
529 */
530 void
531 sig_term (sig_watcher &w)
532 {
533#ifdef DEBUG_CMD
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum);
539 }
540
541 sig_handlers ()
542 : sw_term (this, &sig_handlers::sig_term),
543 sw_int (this, &sig_handlers::sig_term)
544 {
545 }
546} sig_handlers;
547
548char **rxvt_environ; // startup environment
549
530void 550void
531rxvt_init () 551rxvt_init ()
532{ 552{
533 /* 553 uid_t uid = getuid ();
534 * Save and then give up any super-user privileges 554 gid_t gid = getgid ();
535 * If we need privileges in any area then we must specifically request it. 555
536 * We should only need to be root in these cases: 556 // before doing anything else, check for setuid/setgid operation,
537 * 1. write utmp entries on some systems 557 // start the helper process and drop privileges
538 * 2. chown tty on some systems 558 if (uid != geteuid ()
539 */ 559 || gid != getegid ())
540 rxvt_privileges (SAVE); 560 {
541 rxvt_privileges (IGNORE); 561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566
567 // drop privileges
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583
584 rxvt_environ = environ;
542 585
543 signal (SIGHUP, SIG_IGN); 586 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 587 signal (SIGPIPE, SIG_IGN);
588
589 sig_handlers.sw_term.start (SIGTERM);
590 sig_handlers.sw_int.start (SIGINT);
545 591
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 593 /* signal (SIGURG, SIG_DFL); */
548 594
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 596 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 597 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553 598
554/* ------------------------------------------------------------------------- * 599 XrmInitialize ();
555 * SIGNAL HANDLING & EXIT HANDLER *
556 * ------------------------------------------------------------------------- */
557/*
558 * Catch a SIGCHLD signal and exit if the direct child has died
559 */
560
561void
562rxvt_term::sig_chld (sig_watcher &w)
563{
564 // we are being called for every SIGCHLD, not just ours
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->destroy ();
572 break;
573 }
574} 600}
575 601
576/* ------------------------------------------------------------------------- * 602/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 603 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 604 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 611 rxvt_fatal ("memory allocation failure. aborting.\n");
586 612
587 return p; 613 return p;
588} 614}
589 615
590void * 616void *
591rxvt_calloc (size_t number, size_t size) 617rxvt_calloc (size_t number, size_t size)
592{ 618{
593 void *p = calloc (number, size); 619 void *p = calloc (number, size);
594 620
595 if (!p) 621 if (!p)
596 rxvt_fatal ("memory allocation failure. aborting.\n"); 622 rxvt_fatal ("memory allocation failure. aborting.\n");
597 623
598 return p; 624 return p;
599} 625}
600 626
601void * 627void *
602rxvt_realloc (void *ptr, size_t size) 628rxvt_realloc (void *ptr, size_t size)
603{ 629{
604 void *p = realloc (ptr, size); 630 void *p = realloc (ptr, size);
605 631
606 if (!p) 632 if (!p)
607 rxvt_fatal ("memory allocation failure. aborting.\n"); 633 rxvt_fatal ("memory allocation failure. aborting.\n");
608 634
609 return p; 635 return p;
610} 636}
611
612/* ------------------------------------------------------------------------- *
613 * PRIVILEGED OPERATIONS *
614 * ------------------------------------------------------------------------- */
615/* take care of suid/sgid super-user (root) privileges */
616void
617rxvt_privileges (rxvt_privaction action)
618{
619#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
620 static uid_t euid;
621 static gid_t egid;
622#endif
623
624#if ! defined(__CYGWIN32__)
625# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
626 /* setreuid () is the poor man's setuid (), seteuid () */
627# define seteuid(a) setreuid(-1, (a))
628# define setegid(a) setregid(-1, (a))
629# define HAVE_SETEUID
630# endif
631# ifdef HAVE_SETEUID
632 switch (action)
633 {
634 case IGNORE:
635 /*
636 * change effective uid/gid - not real uid/gid - so we can switch
637 * back to root later, as required
638 */
639 seteuid (getuid ());
640 setegid (getgid ());
641 break;
642 case SAVE:
643 euid = geteuid ();
644 egid = getegid ();
645 break;
646 case RESTORE:
647 seteuid (euid);
648 setegid (egid);
649 break;
650 }
651# else
652 switch (action)
653 {
654 case IGNORE:
655 setuid (getuid ());
656 setgid (getgid ());
657 /* FALLTHROUGH */
658 case SAVE:
659 /* FALLTHROUGH */
660 case RESTORE:
661 break;
662 }
663# endif
664#endif
665}
666
667#ifdef UTMP_SUPPORT
668void
669rxvt_term::privileged_utmp (rxvt_privaction action)
670{
671 if ((options & Opt_utmpInhibit)
672 || !pty.name || !*pty.name)
673 return;
674
675 rxvt_privileges (RESTORE);
676
677 if (action == SAVE)
678 makeutent (pty.name, rs[Rs_display_name]);
679 else
680 cleanutent ();
681
682 rxvt_privileges (IGNORE);
683}
684#endif
685 637
686/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
687/* 639/*
688 * window size/position calculcations for XSizeHint and other storage. 640 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 641 * if width/height are non-zero then override calculated width/height
690 */ 642 */
691void 643void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 645{
694 short recalc_x, recalc_y; 646 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 647 int x, y, sb_w, flags;
696 unsigned int w, h; 648 unsigned int w, h;
697 unsigned int max_width, max_height; 649 unsigned int max_width, max_height;
698 dDisp; 650 dDisp;
699 651
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 653 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 654
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 656 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 658
707 recalc_x = recalc_y = 0; 659 recalc_x = recalc_y = 0;
708 flags = 0; 660 flags = 0;
661
709 if (!parsed_geometry) 662 if (!parsed_geometry)
710 { 663 {
711 parsed_geometry = 1; 664 parsed_geometry = 1;
665
712 if (rs[Rs_geometry]) 666 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 667 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 668
715 if (flags & WidthValue) 669 if (flags & WidthValue)
716 { 670 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 671 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 672 szHint.flags |= USSize;
719 } 673 }
720 674
721 if (flags & HeightValue) 675 if (flags & HeightValue)
722 { 676 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 677 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 678 szHint.flags |= USSize;
725 } 679 }
726 680
727 if (flags & XValue) 681 if (flags & XValue)
728 { 682 {
729 szHint.x = x; 683 szHint.x = x;
730 szHint.flags |= USPosition; 684 szHint.flags |= USPosition;
685
731 if (flags & XNegative) 686 if (flags & XNegative)
732 { 687 {
733 recalc_x = 1; 688 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 689 szHint.win_gravity = NorthEastGravity;
735 } 690 }
… …
737 692
738 if (flags & YValue) 693 if (flags & YValue)
739 { 694 {
740 szHint.y = y; 695 szHint.y = y;
741 szHint.flags |= USPosition; 696 szHint.flags |= USPosition;
697
742 if (flags & YNegative) 698 if (flags & YNegative)
743 { 699 {
744 recalc_y = 1; 700 recalc_y = 1;
701
745 if (szHint.win_gravity == NorthEastGravity) 702 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 703 szHint.win_gravity = SouthEastGravity;
747 else 704 else
748 szHint.win_gravity = SouthWestGravity; 705 szHint.win_gravity = SouthWestGravity;
749 } 706 }
750 } 707 }
751 } 708 }
752 709
753 /* TODO: BOUNDS */ 710 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 711 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 712 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 713 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 714 max_height = MAX_ROWS * fheight;
758 715
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 716 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 717
761 sb_w = mb_h = 0; 718 sb_w = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 719 window_vt_x = window_vt_y = int_bwidth;
763 720
764 if (scrollbar_visible ()) 721 if (scrollBar.state)
765 { 722 {
766 sb_w = scrollbar_TotalWidth (); 723 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 724 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 725 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 726 window_vt_x += sb_w;
770 } 727 }
771 728
772 if (menubar_visible ())
773 {
774 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h;
776 window_vt_y += mb_h;
777 }
778
779 szHint.width_inc = TermWin.fwidth; 729 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 730 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 731 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 732 szHint.min_height = szHint.base_height + szHint.height_inc;
783 733
784 if (width && width - szHint.base_width < max_width) 734 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 735 {
786 szHint.width = width; 736 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 737 width = newwidth - szHint.base_width;
788 } 738 }
789 else 739 else
790 { 740 {
791 MIN_IT (TermWin.width, max_width); 741 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 742 szHint.width = szHint.base_width + width;
793 } 743 }
794 744
795 if (height && height - szHint.base_height < max_height) 745 if (newheight && newheight - szHint.base_height < max_height)
796 { 746 {
797 szHint.height = height; 747 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 748 height = newheight - szHint.base_height;
799 } 749 }
800 else 750 else
801 { 751 {
802 MIN_IT (TermWin.height, max_height); 752 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 753 szHint.height = szHint.base_height + height;
804 } 754 }
805 755
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 757 window_sb_x = szHint.width - sb_w;
808 758
809 if (recalc_x) 759 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 761 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 763
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 764 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 765 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 767 ncol, nrow, szHint.width,
820 szHint.height)); 768 szHint.height));
821 return; 769 return;
822} 770}
823 771
824/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
… …
827 * Called after a window size change. 775 * Called after a window size change.
828 */ 776 */
829void 777void
830rxvt_term::tt_winch () 778rxvt_term::tt_winch ()
831{ 779{
832 if (pty.pty < 0) 780 if (pty->pty < 0)
833 return; 781 return;
834 782
835 struct winsize ws; 783 struct winsize ws;
836 784
837 ws.ws_col = TermWin.ncol; 785 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 786 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 787 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 788 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
842 790
843#if 0 791#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 793 if (cmd_pid) /* force through to the command */
846 kill (-cmd_pid, SIGWINCH); 794 kill (-cmd_pid, SIGWINCH);
847#endif 795#endif
848} 796}
849 797
850/*----------------------------------------------------------------------*/ 798/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 799/* set_fonts () - load and set the various fonts
852/* 800 *
853 * init = 1 - initialize 801 * init = 1 - initialize
854 * 802 *
855 * fontname == FONT_UP - switch to bigger font 803 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 804 * fontname == FONT_DN - switch to smaller font
857 */ 805 */
… …
869 return false; 817 return false;
870 } 818 }
871 819
872#if ENABLE_STYLES 820#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 821 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 822 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 823 delete fontset[i];
876#endif 824#endif
877 825
878 delete TermWin.fontset[0]; 826 delete fontset[0];
879 TermWin.fontset[0] = fs; 827 fontset[0] = fs;
880 828
881 prop = (*fs)[1]->properties (); 829 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 830 prop.height += lineSpace;
883 fs->set_prop (prop); 831 fs->set_prop (prop);
884 832
885 TermWin.fwidth = prop.width; 833 fwidth = prop.width;
886 TermWin.fheight = prop.height; 834 fheight = prop.height;
887 TermWin.fweight = prop.weight; 835 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 836
891 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
892 { 838 {
893#if ENABLE_STYLES 839#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 840 const char *res = rs[Rs_font + style];
895 841
896 if (res && !*res) 842 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 843 fontset[style] = fontset[0];
898 else 844 else
899 { 845 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 846 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 847 rxvt_fontprop prop2 = prop;
902 848
903 if (res) 849 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 850 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 851 else
906 { 852 {
907 res = TermWin.fontset[0]->fontdesc; 853 res = fontset[0]->fontdesc;
908 854
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
910 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 857 }
912 858
913 fs->populate (res); 859 fs->populate (res);
914 fs->set_prop (prop2); 860 fs->set_prop (prop2);
915 } 861 }
916#else 862#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 863 fontset[style] = fontset[0];
918#endif 864#endif
919 } 865 }
920 866
921 if (TermWin.parent[0]) 867 if (parent[0])
922 { 868 {
923 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 870 scr_remap_chars ();
925 scr_touch (true); 871 scr_touch (true);
926 } 872 }
… …
928 return true; 874 return true;
929} 875}
930 876
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 877void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 878{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 879 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 880 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 881 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 882}
938 883
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 884void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 885{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 886 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 887 char *s = rxvt_wcstoutf8 (ws);
944 888
945 XChangeProperty (display->display, TermWin.parent[0], 889 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 891 (const unsigned char *)s, strlen (s));
948 892
949 free (s); 893 free (s);
950 free (ws); 894 free (ws);
… …
955/* xterm sequences - title, iconName, color (exptl) */ 899/* xterm sequences - title, iconName, color (exptl) */
956void 900void
957rxvt_term::set_title (const char *str) 901rxvt_term::set_title (const char *str)
958{ 902{
959 set_string_property (XA_WM_NAME, str); 903 set_string_property (XA_WM_NAME, str);
960#if ENABLE_FRILLS 904#if ENABLE_EWMH
961 set_utf8_property (xa[XA_NET_WM_NAME], str); 905 set_utf8_property (xa[XA_NET_WM_NAME], str);
962#endif 906#endif
963} 907}
964 908
965void 909void
966rxvt_term::set_icon_name (const char *str) 910rxvt_term::set_icon_name (const char *str)
967{ 911{
968 set_string_property (XA_WM_ICON_NAME, str); 912 set_string_property (XA_WM_ICON_NAME, str);
969#if ENABLE_FRILLS 913#if ENABLE_EWMH
970 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 914 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
971#endif 915#endif
972} 916}
973 917
974#ifdef XTERM_COLOR_CHANGE 918#ifdef XTERM_COLOR_CHANGE
… …
987 i = atoi (color); 931 i = atoi (color);
988 932
989 if (i >= 8 && i <= 15) 933 if (i >= 8 && i <= 15)
990 { /* bright colors */ 934 { /* bright colors */
991 i -= 8; 935 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 937 SET_PIXCOLOR (idx);
995 goto Done; 938 goto done;
996# endif
997 } 939 }
998 940
999 if (i >= 0 && i <= 7) 941 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 942 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1002 SET_PIXCOLOR (idx); 944 SET_PIXCOLOR (idx);
1003 goto Done; 945 goto done;
1004 } 946 }
1005 } 947 }
1006 948
1007 if (!rXParseAllocColor (&xcol, color)) 949 if (!rXParseAllocColor (&xcol, color))
1008 return; 950 return;
… …
1028 pix_colors_focused[idx] = xcol; 970 pix_colors_focused[idx] = xcol;
1029 SET_PIXCOLOR (idx); 971 SET_PIXCOLOR (idx);
1030 972
1031 /* XSetWindowAttributes attr; */ 973 /* XSetWindowAttributes attr; */
1032 /* Cursor cursor; */ 974 /* Cursor cursor; */
1033Done: 975done:
976
1034#ifdef OFF_FOCUS_FADING 977#if OFF_FOCUS_FADING
1035 if (rs[Rs_fade]) 978 if (rs[Rs_fade])
1036 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1037#endif 980#endif
1038 981
1039 /*TODO: handle Color_BD, scrollbar background, etc. */ 982 /*TODO: handle Color_BD, scrollbar background, etc. */
1040 983
1041 recolour_cursor (); 984 recolour_cursor ();
… …
1112 1055
1113/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
1114 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
1115 * -------------------------------------------------------------------- */ 1058 * -------------------------------------------------------------------- */
1116void 1059void
1117rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1118{ 1061{
1119 int fix_screen; 1062 int fix_screen;
1120#ifdef SMART_RESIZE
1121 int old_width = szHint.width, old_height = szHint.height; 1063 int old_width = szHint.width, old_height = szHint.height;
1122#endif
1123 dDisp; 1064 dDisp;
1124 1065
1125 window_calc (width, height); 1066 window_calc (newwidth, newheight);
1126 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1067 XSetWMNormalHints (disp, parent[0], &szHint);
1127 1068
1128 if (!ignoreparent) 1069 if (!ignoreparent)
1129 { 1070 {
1130#ifdef SMART_RESIZE 1071#ifdef SMART_RESIZE
1131 /* 1072 /*
… …
1135 int x, y, x1, y1; 1076 int x, y, x1, y1;
1136 int dx, dy; 1077 int dx, dy;
1137 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1138 Window unused_cr; 1079 Window unused_cr;
1139 1080
1140 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1081 XTranslateCoordinates (disp, parent[0], display->root,
1141 0, 0, &x, &y, &unused_cr); 1082 0, 0, &x, &y, &unused_cr);
1142 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1143 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1144 /* 1085 /*
1145 * if display->root isn't the parent window, a WM will probably have offset 1086 * if display->root isn't the parent window, a WM will probably have offset
1146 * our position for handles and decorations. Counter it 1087 * our position for handles and decorations. Counter it
1147 */ 1088 */
… …
1164 if (y < y1) /* top half */ 1105 if (y < y1) /* top half */
1165 dy = 0; 1106 dy = 0;
1166 else if (y == y1) /* exact center */ 1107 else if (y == y1) /* exact center */
1167 dy /= 2; 1108 dy /= 2;
1168 1109
1169 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1170 szHint.width, szHint.height); 1111 szHint.width, szHint.height);
1171#else 1112#else
1172 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1173#endif 1114#endif
1174 } 1115 }
1175 1116
1176 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1177 1118
1178 if (fix_screen || width != old_width || height != old_height) 1119 if (fix_screen || newwidth != old_width || newheight != old_height)
1179 { 1120 {
1180 if (scrollbar_visible ()) 1121 if (scrollBar.state)
1181 { 1122 {
1182 XMoveResizeWindow (disp, scrollBar.win, 1123 XMoveResizeWindow (disp, scrollBar.win,
1183 window_sb_x, 0, 1124 window_sb_x, 0,
1184 scrollbar_TotalWidth (), szHint.height); 1125 scrollbar_TotalWidth (), szHint.height);
1185 resize_scrollbar (); 1126 resize_scrollbar ();
1186 } 1127 }
1187 1128
1188 if (menubar_visible ())
1189 XMoveResizeWindow (disp, menuBar.win,
1190 window_vt_x, 0,
1191 TermWin_TotalWidth (), menuBar_TotalHeight ());
1192
1193 XMoveResizeWindow (disp, TermWin.vt, 1129 XMoveResizeWindow (disp, vt,
1194 window_vt_x, window_vt_y, 1130 window_vt_x, window_vt_y,
1195 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1131 width, height);
1196 1132
1197 scr_clear (); 1133 scr_clear ();
1198#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1199 resize_pixmap (); 1135 resize_pixmap ();
1200#endif 1136#endif
… …
1206 int old_ncol = prev_ncol; 1142 int old_ncol = prev_ncol;
1207 1143
1208 /* scr_reset only works on the primary screen */ 1144 /* scr_reset only works on the primary screen */
1209 if (old_height) /* this is not the first time through */ 1145 if (old_height) /* this is not the first time through */
1210 { 1146 {
1211 unsigned int ncol = TermWin.ncol; 1147 unsigned int ocol = ncol;
1212 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1213 curr_screen = scr_change_screen (PRIMARY); 1149 curr_screen = scr_change_screen (PRIMARY);
1214 TermWin.ncol = ncol; 1150 ncol = ocol;
1215 } 1151 }
1216 1152
1217 scr_reset (); 1153 scr_reset ();
1218 1154
1219 if (curr_screen >= 0) /* this is not the first time through */ 1155 if (curr_screen >= 0) /* this is not the first time through */
1220 { 1156 {
1221 scr_change_screen (curr_screen); 1157 scr_change_screen (curr_screen);
1222 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1158 selection_check (old_ncol != ncol ? 4 : 0);
1223 } 1159 }
1224 } 1160 }
1225 1161
1226 old_width = szHint.width; 1162 old_width = szHint.width;
1227 old_height = szHint.height; 1163 old_height = szHint.height;
1228 1164
1229#ifdef XPM_BACKGROUND 1165#ifdef XPM_BACKGROUND
1230 if (TermWin.pixmap) 1166 if (pixmap)
1231 scr_touch (false); 1167 scr_touch (false);
1232#endif 1168#endif
1233 1169
1234#ifdef USE_XIM 1170#ifdef USE_XIM
1235 IMSetStatusPosition (); 1171 IMSetStatusPosition ();
… …
1239/* 1175/*
1240 * Set the width/height of the vt window in characters. Units are pixels. 1176 * Set the width/height of the vt window in characters. Units are pixels.
1241 * good for toggling 80/132 columns 1177 * good for toggling 80/132 columns
1242 */ 1178 */
1243void 1179void
1244rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1180rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1245{ 1181{
1246 XWindowAttributes wattr; 1182 XWindowAttributes wattr;
1247 1183
1248 if (width == 0 || height == 0) 1184 if (newwidth == 0 || newheight == 0)
1249 { 1185 {
1250 XGetWindowAttributes (display->display, display->root, &wattr); 1186 XGetWindowAttributes (display->display, display->root, &wattr);
1251 1187
1252 if (width == 0) 1188 if (newwidth == 0)
1253 width = wattr.width - szHint.base_width; 1189 newwidth = wattr.width - szHint.base_width;
1254 if (height == 0) 1190 if (newheight == 0)
1255 height = wattr.height - szHint.base_height; 1191 newheight = wattr.height - szHint.base_height;
1256 }
1257
1258 if (width != TermWin.width || height != TermWin.height)
1259 { 1192 }
1193
1194 if (newwidth != width || newheight != height)
1195 {
1260 width += szHint.base_width; 1196 newwidth += szHint.base_width;
1261 height += szHint.base_height; 1197 newheight += szHint.base_height;
1262 resize_all_windows (width, height, 0); 1198 resize_all_windows (newwidth, newheight, 0);
1263 } 1199 }
1264} 1200}
1265 1201
1266/* -------------------------------------------------------------------- * 1202/* -------------------------------------------------------------------- *
1267 * - X INPUT METHOD ROUTINES - * 1203 * - X INPUT METHOD ROUTINES - *
… …
1277 1213
1278void 1214void
1279rxvt_term::im_set_size (XRectangle &size) 1215rxvt_term::im_set_size (XRectangle &size)
1280{ 1216{
1281 // the int_bwidth terms make no sense to me 1217 // the int_bwidth terms make no sense to me
1282 size.x = TermWin.int_bwidth; 1218 size.x = int_bwidth;
1283 size.y = TermWin.int_bwidth; 1219 size.y = int_bwidth;
1284 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1220 size.width = Width2Pixel (ncol) + int_bwidth;
1285 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1221 size.height = Height2Pixel (nrow) + int_bwidth;
1286} 1222}
1287 1223
1288void 1224void
1289rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1225rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1290 XRectangle &status_rect, 1226 XRectangle &status_rect,
1291 const XRectangle &needed_rect) 1227 const XRectangle &needed_rect)
1292{ 1228{
1293 preedit_rect.x = needed_rect.width; 1229 preedit_rect.x = needed_rect.width;
1294 preedit_rect.y = 0; 1230 preedit_rect.y = 0;
1295 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1231 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1296 preedit_rect.height = TermWin.fheight; 1232 preedit_rect.height = fheight;
1297 1233
1298 status_rect.x = 0; 1234 status_rect.x = 0;
1299 status_rect.y = 0; 1235 status_rect.y = 0;
1300 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1236 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1301 status_rect.height = TermWin.fheight; 1237 status_rect.height = fheight;
1302} 1238}
1303 1239
1304/* Checking whether input method is running. */ 1240/* Checking whether input method is running. */
1305bool 1241bool
1306rxvt_term::IMisRunning () 1242rxvt_term::IMisRunning ()
… …
1334{ 1270{
1335 XPoint nspot; 1271 XPoint nspot;
1336 XVaNestedList preedit_attr; 1272 XVaNestedList preedit_attr;
1337 1273
1338 if (!Input_Context 1274 if (!Input_Context
1339 || !TermWin.focus 1275 || !focus
1340 || !(input_style & XIMPreeditPosition)) 1276 || !(input_style & XIMPreeditPosition))
1341 return; 1277 return;
1342 1278
1343 im_set_position (nspot); 1279 im_set_position (nspot);
1344 1280
… …
1380 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1381 unsigned long fg, bg; 1317 unsigned long fg, bg;
1382 const char *p; 1318 const char *p;
1383 char **s; 1319 char **s;
1384 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1321
1322 set_environ (envv);
1385 1323
1386 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1387 return false; 1325 return false;
1388 1326
1389 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1402 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1403 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1404 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1405 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "*", 1406 "*",
1469 TermWin.fheight, 1407 fheight,
1470 TermWin.fheight + 1, TermWin.fheight - 1, 1408 fheight + 1, fheight - 1,
1471 TermWin.fheight - 2, TermWin.fheight + 2); 1409 fheight - 2, fheight + 2);
1472 1410
1473 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1474 &missing_charset_list, &missing_charset_count, &def_string); 1412 &missing_charset_list, &missing_charset_count, &def_string);
1475 1413
1476 if (missing_charset_list) 1414 if (missing_charset_list)
… …
1522 NULL); 1460 NULL);
1523 } 1461 }
1524 1462
1525 Input_Context = XCreateIC (xim, 1463 Input_Context = XCreateIC (xim,
1526 XNInputStyle, input_style, 1464 XNInputStyle, input_style,
1527 XNClientWindow, TermWin.vt, 1465 XNClientWindow, vt,
1528 XNFocusWindow, TermWin.parent[0], 1466 XNFocusWindow, parent[0],
1529 preedit_attr ? XNPreeditAttributes : NULL, 1467 preedit_attr ? XNPreeditAttributes : NULL,
1530 preedit_attr, 1468 preedit_attr,
1531 status_attr ? XNStatusAttributes : NULL, 1469 status_attr ? XNStatusAttributes : NULL,
1532 status_attr, NULL); 1470 status_attr, NULL);
1533 1471
… …
1550} 1488}
1551 1489
1552void 1490void
1553rxvt_term::im_cb () 1491rxvt_term::im_cb ()
1554{ 1492{
1555 int i, found, had_im; 1493 int i;
1556 const char *p; 1494 const char *p;
1557 char **s; 1495 char **s;
1558 char buf[IMBUFSIZ]; 1496 char buf[IMBUFSIZ];
1559 1497
1560 SET_R (this); 1498 make_current ();
1561 1499
1562 im_destroy (); 1500 im_destroy ();
1563 1501
1564 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1565 if (Input_Context) 1503 if (Input_Context)
… …
1617{ 1555{
1618 XRectangle preedit_rect, status_rect, *needed_rect; 1556 XRectangle preedit_rect, status_rect, *needed_rect;
1619 XVaNestedList preedit_attr, status_attr; 1557 XVaNestedList preedit_attr, status_attr;
1620 1558
1621 if (!Input_Context 1559 if (!Input_Context
1622 || !TermWin.focus 1560 || !focus
1623 || !(input_style & XIMPreeditArea) 1561 || !(input_style & XIMPreeditArea)
1624 || !IMisRunning ()) 1562 || !IMisRunning ())
1625 return; 1563 return;
1626 1564
1627 /* Getting the necessary width of preedit area */ 1565 /* Getting the necessary width of preedit area */
… …
1642 XFree (preedit_attr); 1580 XFree (preedit_attr);
1643 XFree (status_attr); 1581 XFree (status_attr);
1644} 1582}
1645#endif /* USE_XIM */ 1583#endif /* USE_XIM */
1646 1584
1647/*----------------------------------------------------------------------*/
1648rxvt_t rxvt_current_term;
1649
1650/*----------------------- end-of-file (C source) -----------------------*/ 1585/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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