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

Diff Legend

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