ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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