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

Diff Legend

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