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.128 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.176 by root, Thu Jan 12 01:30:53 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 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
49# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
50#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
51 65
52vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
53 67
54static char curlocale[128]; 68static char curlocale[128], savelocale[128];
55 69
56bool 70bool
57rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
58{ 72{
59 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 74 return false;
61 75
62 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
64 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
65} 92}
66 93
67#if ENABLE_COMBINING 94#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
69 96
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 186#endif
160#ifdef USE_XIM 187#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 188 im_ev (this, &rxvt_term::im_cb),
162#endif 189#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb), 190 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 191 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 192 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 193 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 194 destroy_ev (this, &rxvt_term::destroy_cb),
… …
180 if (!keyboard) 205 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n"); 206 rxvt_fatal ("out of memory, aborting.\n");
182#endif 207#endif
183} 208}
184 209
185rxvt_term::~rxvt_term () 210// clean up the most important stuff, do *not* call x or free mem etc.
211// for use before an emergency exit
212void rxvt_term::emergency_cleanup ()
186{ 213{
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188
189 if (cmd_pid) 214 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
191 216
192 pty.put ();
193
194#ifdef UTMP_SUPPORT 217#ifdef UTMP_SUPPORT
195 privileged_utmp (RESTORE); 218 privileged_utmp (RESTORE);
196#endif 219#endif
197 220
221 pty.put ();
222}
223
224rxvt_term::~rxvt_term ()
225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this));
229
230 emergency_cleanup ();
231
198#if ENABLE_STYLES 232#if ENABLE_STYLES
199 for (int i = RS_styleCount; --i; ) 233 for (int i = RS_styleCount; --i; )
200 if (TermWin.fontset[i] != TermWin.fontset[0]) 234 if (fontset[i] != fontset[0])
201 delete TermWin.fontset[i]; 235 delete fontset[i];
202#endif 236#endif
203 delete TermWin.fontset[0]; 237 delete fontset[0];
204 238
205 if (display) 239 if (display)
206 { 240 {
241 dDisp;
242
207 selection_clear (); 243 selection_clear ();
208 244
209#ifdef USE_XIM 245#ifdef USE_XIM
210 im_destroy (); 246 im_destroy ();
211#endif 247#endif
212#ifdef MENUBAR 248#ifdef MENUBAR
213 if (menubarGC) XFreeGC (display->display, menubarGC); 249 if (menubarGC) XFreeGC (disp, menubarGC);
214#endif 250#endif
215#ifdef XTERM_SCROLLBAR 251#ifdef XTERM_SCROLLBAR
216 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
217 if (ShadowGC) XFreeGC (display->display, ShadowGC); 253 if (ShadowGC) XFreeGC (disp, ShadowGC);
218#endif 254#endif
219#ifdef PLAIN_SCROLLBAR 255#ifdef PLAIN_SCROLLBAR
220 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 256 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
221#endif 257#endif
222#ifdef NEXT_SCROLLBAR 258#ifdef NEXT_SCROLLBAR
223 if (blackGC) XFreeGC (display->display, blackGC); 259 if (blackGC) XFreeGC (disp, blackGC);
224 if (whiteGC) XFreeGC (display->display, whiteGC); 260 if (whiteGC) XFreeGC (disp, whiteGC);
225 if (grayGC) XFreeGC (display->display, grayGC); 261 if (grayGC) XFreeGC (disp, grayGC);
226 if (darkGC) XFreeGC (display->display, darkGC); 262 if (darkGC) XFreeGC (disp, darkGC);
227 if (stippleGC) XFreeGC (display->display, stippleGC); 263 if (stippleGC) XFreeGC (disp, stippleGC);
228 if (dimple) XFreePixmap (display->display, dimple); 264 if (dimple) XFreePixmap (disp, dimple);
229 if (upArrow) XFreePixmap (display->display, upArrow); 265 if (upArrow) XFreePixmap (disp, upArrow);
230 if (downArrow) XFreePixmap (display->display, downArrow); 266 if (downArrow) XFreePixmap (disp, downArrow);
231 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 267 if (upArrowHi) XFreePixmap (disp, upArrowHi);
232 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 268 if (downArrowHi) XFreePixmap (disp, downArrowHi);
233#endif 269#endif
234#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
235 if (topShadowGC) XFreeGC (display->display, topShadowGC); 271 if (topShadowGC) XFreeGC (disp, topShadowGC);
236 if (botShadowGC) XFreeGC (display->display, botShadowGC); 272 if (botShadowGC) XFreeGC (disp, botShadowGC);
237 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 273 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
238#endif 274#endif
239 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 275 if (gc) XFreeGC (disp, gc);
240 276
241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
242 delete menuBar.drawable; 278 delete menuBar.drawable;
243 //if (menuBar.win) 279 //if (menuBar.win)
244 // XDestroyWindow (display->display, menuBar.win); 280 // XDestroyWindow (disp, menuBar.win);
245#endif 281#endif
246 delete TermWin.drawable; 282 delete drawable;
247 // destroy all windows 283 // destroy all windows
248 if (TermWin.parent[0]) 284 if (parent[0])
249 XDestroyWindow (display->display, TermWin.parent[0]); 285 XDestroyWindow (disp, parent[0]);
250 } 286 }
251 287
252 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
253
254 delete pix_colors_focused; 289 delete pix_colors_focused;
255#ifdef OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
256 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
257#endif 292#endif
258 293
259 displays.put (display); 294 displays.put (display);
260 295
261 scr_release (); 296 scr_release ();
262 297
263 /* clear all resources */ 298 /* clear all resources */
264 for (int i = 0; i < allocated.size (); i++) 299 for (int i = 0; i < allocated.size (); i++)
265 free (allocated[i]); 300 free (allocated [i]);
266 301
267 free (selection.text); 302 free (selection.text);
268 // TODO: manage env vars in child only(!) 303 // TODO: manage env vars in child only(!)
269 free (env_windowid); 304 free (env_windowid);
270 free (env_display); 305 free (env_display);
… …
276 311
277 delete envv; 312 delete envv;
278 delete argv; 313 delete argv;
279 314
280#ifdef KEYSYM_RESOURCE 315#ifdef KEYSYM_RESOURCE
281 delete keyboard; 316 delete keyboard;
282#endif 317#endif
318}
319
320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
283} 327}
284 328
285void 329void
286rxvt_term::destroy () 330rxvt_term::destroy ()
287{ 331{
… …
339 383
340 delete this; 384 delete this;
341} 385}
342 386
343/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
344/* rxvt_init () */ 388/*
389 * Exit gracefully, clearing the utmp entry and restoring tty attributes
390 * TODO: if debugging, this should free up any known resources if we can
391 */
392static XErrorHandler old_xerror_handler;
393
394static void
395rxvt_emergency_cleanup ()
396{
397 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
398 (*t)->emergency_cleanup ();
399}
400
401#if ENABLE_FRILLS
402static void
403print_x_error (Display *dpy, XErrorEvent *event)
404{
405 char buffer[BUFSIZ];
406 char mesg[BUFSIZ];
407 char number[32];
408 char *mtype = "XlibMessage";
409 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
410 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
411 rxvt_warn ("An X Error occured, trying to continue after report.\n");
412 rxvt_warn ("%s: %s\n", mesg, buffer);
413 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
415 sprintf(number, "%d", event->request_code);
416 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
417 rxvt_warn ("(which is %s)\n", buffer);
418 if (event->request_code >= 128) {
419 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
422 }
423 if ((event->error_code == BadWindow) ||
424 (event->error_code == BadPixmap) ||
425 (event->error_code == BadCursor) ||
426 (event->error_code == BadFont) ||
427 (event->error_code == BadDrawable) ||
428 (event->error_code == BadColor) ||
429 (event->error_code == BadGC) ||
430 (event->error_code == BadIDChoice) ||
431 (event->error_code == BadValue) ||
432 (event->error_code == BadAtom)) {
433 if (event->error_code == BadValue)
434 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
435 mesg, BUFSIZ);
436 else if (event->error_code == BadAtom)
437 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
438 mesg, BUFSIZ);
439 else
440 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
441 mesg, BUFSIZ);
442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
443 }
444 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
445 mesg, BUFSIZ);
446 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
447}
448#endif
449
450int
451rxvt_xerror_handler (Display *display, XErrorEvent *event)
452{
453 if (GET_R->allowedxerror == -1)
454 GET_R->allowedxerror = event->error_code;
455 else
456 {
457 // GET_R is most likely not the terminal which caused the error,
458 // so just output the error and continue
459#if ENABLE_FRILLS
460 print_x_error (display, event);
461#else
462 old_xerror_handler (display, event);
463#endif
464 }
465
466 return 0;
467}
468
469int
470rxvt_xioerror_handler (Display *display)
471{
472 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
473 DisplayString (display));
474 rxvt_emergency_cleanup ();
475 _exit (EXIT_FAILURE);
476}
477
478/*----------------------------------------------------------------------*/
345bool 479bool
346rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
347{ 481{
348 SET_R (this); 482 SET_R (this);
483 set_environ (envv); // few things in X do not call setlocale :(
349 484
350 set_locale (""); 485 set_locale ("");
351 486
352 if (!init_vars ()) 487 if (!init_vars ())
353 return false; 488 return false;
… …
362 497
363#if MENUBAR_MAX 498#if MENUBAR_MAX
364 menubar_read (rs[Rs_menu]); 499 menubar_read (rs[Rs_menu]);
365#endif 500#endif
366#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
367 if (options & Opt_scrollBar) 502 if (OPTION (Opt_scrollBar))
368 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
369#endif 504#endif
370 505
506#if ENABLE_PERL
507 if (!rs[Rs_perl_ext_1])
508 rs[Rs_perl_ext_1] = "default";
509
510 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
511 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
512 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
513 {
514#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
515 // ignore some perl-related arguments if some bozo installed us set[ug]id
516 if (rxvt_tainted ())
517 {
518 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 {
521 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
522 rs[Rs_perl_lib] = 0;
523 rs[Rs_perl_eval] = 0;
524 }
525 }
526#endif
527 rxvt_perl.init ();
528 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 }
531#endif
532
371 create_windows (argc, argv); 533 create_windows (argc, argv);
372 534
535 dDisp;
536
373 init_xlocale (); 537 init_xlocale ();
374 538
375 scr_reset (); /* initialize screen */ 539 scr_reset (); // initialize screen
376 540
377#if 0 541#if 0
378 XSynchronize (display->display, True); 542 XSynchronize (disp, True);
379#endif 543#endif
380 544
381#ifdef HAVE_SCROLLBARS 545#ifdef HAVE_SCROLLBARS
382 if (options & Opt_scrollBar) 546 if (OPTION (Opt_scrollBar))
383 resize_scrollbar (); /* create and map scrollbar */ 547 resize_scrollbar (); /* create and map scrollbar */
384#endif 548#endif
385#if (MENUBAR_MAX) 549#if (MENUBAR_MAX)
386 if (menubar_visible ()) 550 if (menubar_visible ())
387 XMapWindow (display->display, menuBar.win); 551 XMapWindow (disp, menuBar.win);
388#endif 552#endif
389#ifdef TRANSPARENT 553#ifdef TRANSPARENT
390 if (options & Opt_transparent) 554 if (OPTION (Opt_transparent))
391 { 555 {
392 XSelectInput (display->display, display->root, PropertyChangeMask); 556 XSelectInput (disp, display->root, PropertyChangeMask);
393 check_our_parents (); 557 check_our_parents ();
394 rootwin_ev.start (display, display->root); 558 rootwin_ev.start (display, display->root);
395 } 559 }
396#endif 560#endif
397 561
398 XMapWindow (display->display, TermWin.vt); 562 XMapWindow (disp, vt);
399 XMapWindow (display->display, TermWin.parent[0]); 563 XMapWindow (disp, parent[0]);
400 564
401 set_colorfgbg (); 565 set_colorfgbg ();
402 566
403 init_command (cmd_argv); 567 init_command (cmd_argv);
404 568
405 free (cmd_argv); 569 free (cmd_argv);
406 570
571 if (pty.pty >= 0)
407 pty_ev.start (pty.pty, EVENT_READ); 572 pty_ev.start (pty.pty, EVENT_READ);
408 573
409 check_ev.start (); 574 check_ev.start ();
410 575
576 HOOK_INVOKE ((this, HOOK_START, DT_END));
577
411 return true; 578 return true;
412} 579}
413 580
414static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 581static struct sig_handlers
582{
583 sig_watcher sw_chld, sw_term, sw_int;
584
585 void sig_chld (sig_watcher &w)
586 {
587 // we are being called for every SIGCHLD, find the corresponding term
588 int pid;
589
590 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
591 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
592 if (pid == (*t)->cmd_pid)
593 {
594 (*t)->child_exit ();
595 break;
596 }
597 }
598
599 /*
600 * Catch a fatal signal and tidy up before quitting
601 */
602 void
603 sig_term (sig_watcher &w)
604 {
605#ifdef DEBUG_CMD
606 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
607#endif
608 rxvt_emergency_cleanup ();
609 signal (w.signum, SIG_DFL);
610 kill (getpid (), w.signum);
611 }
612
613 sig_handlers ()
614 : sw_chld (this, &sig_handlers::sig_chld),
615 sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term)
617 {
618 }
619} sig_handlers;
620
621char **rxvt_environ; // startup environment
415 622
416void 623void
417rxvt_init () 624rxvt_init ()
418{ 625{
626 rxvt_environ = environ;
627
419 /* 628 /*
420 * Save and then give up any super-user privileges 629 * Save and then give up any super-user privileges
421 * If we need privileges in any area then we must specifically request it. 630 * If we need privileges in any area then we must specifically request it.
422 * We should only need to be root in these cases: 631 * We should only need to be root in these cases:
423 * 1. write utmp entries on some systems 632 * 1. write utmp entries on some systems
… …
427 rxvt_privileges (IGNORE); 636 rxvt_privileges (IGNORE);
428 637
429 signal (SIGHUP, SIG_IGN); 638 signal (SIGHUP, SIG_IGN);
430 signal (SIGPIPE, SIG_IGN); 639 signal (SIGPIPE, SIG_IGN);
431 640
641 sig_handlers.sw_chld.start (SIGCHLD);
642 sig_handlers.sw_term.start (SIGTERM);
643 sig_handlers.sw_int.start (SIGINT);
644
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 645 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */ 646 /* signal (SIGURG, SIG_DFL); */
434 647
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 648 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 // TODO: handle this with exceptions and tolerate the memory loss 649 // TODO: handle this with exceptions and tolerate the memory loss
437 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 650 XSetIOErrorHandler (rxvt_xioerror_handler);
438}
439 651
440/* ------------------------------------------------------------------------- * 652 XrmInitialize ();
441 * SIGNAL HANDLING & EXIT HANDLER *
442 * ------------------------------------------------------------------------- */
443/*
444 * Catch a SIGCHLD signal and exit if the direct child has died
445 */
446
447void
448rxvt_term::sig_chld (sig_watcher &w)
449{
450 // we are being called for every SIGCHLD, not just ours
451 int pid;
452
453 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
454 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
455 if (pid == (*t)->cmd_pid)
456 {
457 (*t)->destroy ();
458 break;
459 }
460}
461
462/*----------------------------------------------------------------------*/
463/*
464 * Exit gracefully, clearing the utmp entry and restoring tty attributes
465 * TODO: if debugging, this should free up any known resources if we can
466 */
467void
468rxvt_destroy_all ()
469{
470 // TODO: rxvtd should clean up all ressources
471 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
472 (*t)->destroy ();
473}
474
475/*
476 * Catch a fatal signal and tidy up before quitting
477 */
478void
479rxvt_term::sig_term (sig_watcher &w)
480{
481#ifdef DEBUG_CMD
482 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
483#endif
484 rxvt_destroy_all ();
485 signal (w.signum, SIG_DFL);
486 kill (getpid (), w.signum);
487}
488
489/* INTPROTO */
490int
491rxvt_xerror_handler (Display *display, XErrorEvent *event)
492{
493 if (GET_R->allowedxerror == -1)
494 GET_R->allowedxerror = event->error_code;
495 else
496 {
497 old_xerror_handler (display, event);
498 GET_R->destroy ();
499 }
500
501 return 0;
502} 653}
503 654
504/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
505 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
506 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
513 rxvt_fatal ("memory allocation failure. aborting.\n"); 664 rxvt_fatal ("memory allocation failure. aborting.\n");
514 665
515 return p; 666 return p;
516} 667}
517 668
518/* INTPROTO */ 669void *
519void *
520rxvt_calloc (size_t number, size_t size) 670rxvt_calloc (size_t number, size_t size)
521{ 671{
522 void *p = calloc (number, size); 672 void *p = calloc (number, size);
523 673
524 if (!p) 674 if (!p)
525 rxvt_fatal ("memory allocation failure. aborting.\n"); 675 rxvt_fatal ("memory allocation failure. aborting.\n");
526 676
527 return p; 677 return p;
528} 678}
529 679
530/* INTPROTO */
531void * 680void *
532rxvt_realloc (void *ptr, size_t size) 681rxvt_realloc (void *ptr, size_t size)
533{ 682{
534 void *p = realloc (ptr, size); 683 void *p = realloc (ptr, size);
535 684
… …
544 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
545/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
546void 695void
547rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
548{ 697{
549#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
550 static uid_t euid;
551 static gid_t egid;
552#endif
553
554#if ! defined(__CYGWIN32__) 698#if ! defined(__CYGWIN32__)
555# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
556 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
557# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
558# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
564 case IGNORE: 708 case IGNORE:
565 /* 709 /*
566 * change effective uid/gid - not real uid/gid - so we can switch 710 * change effective uid/gid - not real uid/gid - so we can switch
567 * back to root later, as required 711 * back to root later, as required
568 */ 712 */
713 setegid (getgid ());
569 seteuid (getuid ()); 714 seteuid (getuid ());
570 setegid (getgid ());
571 break; 715 break;
572 case SAVE: 716 case SAVE:
573 euid = geteuid ();
574 egid = getegid (); 717 saved_egid = getegid ();
718 saved_euid = geteuid ();
575 break; 719 break;
576 case RESTORE: 720 case RESTORE:
577 seteuid (euid);
578 setegid (egid); 721 setegid (saved_egid);
722 seteuid (saved_euid);
579 break; 723 break;
580 } 724 }
581# else 725# else
582 switch (action) 726 switch (action)
583 { 727 {
584 case IGNORE: 728 case IGNORE:
729 setgid (getgid ());
585 setuid (getuid ()); 730 setuid (getuid ());
586 setgid (getgid ());
587 /* FALLTHROUGH */ 731 /* FALLTHROUGH */
588 case SAVE: 732 case SAVE:
589 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
590 case RESTORE: 734 case RESTORE:
591 break; 735 break;
… …
596 740
597#ifdef UTMP_SUPPORT 741#ifdef UTMP_SUPPORT
598void 742void
599rxvt_term::privileged_utmp (rxvt_privaction action) 743rxvt_term::privileged_utmp (rxvt_privaction action)
600{ 744{
601 if ((options & Opt_utmpInhibit) 745 if (OPTION (Opt_utmpInhibit)
602 || !pty.name || !*pty.name) 746 || !pty.name || !*pty.name)
603 return; 747 return;
604 748
605 rxvt_privileges (RESTORE); 749 rxvt_privileges (RESTORE);
606 750
… …
617/* 761/*
618 * window size/position calculcations for XSizeHint and other storage. 762 * window size/position calculcations for XSizeHint and other storage.
619 * if width/height are non-zero then override calculated width/height 763 * if width/height are non-zero then override calculated width/height
620 */ 764 */
621void 765void
622rxvt_term::window_calc (unsigned int width, unsigned int height) 766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
623{ 767{
624 short recalc_x, recalc_y; 768 short recalc_x, recalc_y;
625 int x, y, sb_w, mb_h, flags; 769 int x, y, sb_w, mb_h, flags;
626 unsigned int w, h; 770 unsigned int w, h;
627 unsigned int max_width, max_height; 771 unsigned int max_width, max_height;
772 dDisp;
628 773
629 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
630 TermWin.ncol, TermWin.nrow, szHint.width, 775 ncol, nrow, szHint.width, szHint.height));
631 szHint.height)); 776
632 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 777 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
633 szHint.win_gravity = NorthWestGravity; 778 szHint.win_gravity = NorthWestGravity;
634 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 779 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
635 780
636 recalc_x = recalc_y = 0; 781 recalc_x = recalc_y = 0;
637 flags = 0; 782 flags = 0;
783
638 if (!parsed_geometry) 784 if (!parsed_geometry)
639 { 785 {
640 parsed_geometry = 1; 786 parsed_geometry = 1;
787
641 if (rs[Rs_geometry]) 788 if (rs[Rs_geometry])
642 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 789 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
790
643 if (flags & WidthValue) 791 if (flags & WidthValue)
644 { 792 {
645 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 793 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
646 szHint.flags |= USSize; 794 szHint.flags |= USSize;
647 } 795 }
796
648 if (flags & HeightValue) 797 if (flags & HeightValue)
649 { 798 {
650 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 799 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
651 szHint.flags |= USSize; 800 szHint.flags |= USSize;
652 } 801 }
802
653 if (flags & XValue) 803 if (flags & XValue)
654 { 804 {
655 szHint.x = x; 805 szHint.x = x;
656 szHint.flags |= USPosition; 806 szHint.flags |= USPosition;
807
657 if (flags & XNegative) 808 if (flags & XNegative)
658 { 809 {
659 recalc_x = 1; 810 recalc_x = 1;
660 szHint.win_gravity = NorthEastGravity; 811 szHint.win_gravity = NorthEastGravity;
661 } 812 }
662 } 813 }
814
663 if (flags & YValue) 815 if (flags & YValue)
664 { 816 {
665 szHint.y = y; 817 szHint.y = y;
666 szHint.flags |= USPosition; 818 szHint.flags |= USPosition;
819
667 if (flags & YNegative) 820 if (flags & YNegative)
668 { 821 {
669 recalc_y = 1; 822 recalc_y = 1;
823
670 if (szHint.win_gravity == NorthEastGravity) 824 if (szHint.win_gravity == NorthEastGravity)
671 szHint.win_gravity = SouthEastGravity; 825 szHint.win_gravity = SouthEastGravity;
672 else 826 else
673 szHint.win_gravity = SouthWestGravity; 827 szHint.win_gravity = SouthWestGravity;
674 } 828 }
675 } 829 }
676 } 830 }
677 831
678 /* TODO: BOUNDS */ 832 /* TODO: BOUNDS */
679 TermWin.width = TermWin.ncol * TermWin.fwidth; 833 width = ncol * fwidth;
680 TermWin.height = TermWin.nrow * TermWin.fheight; 834 height = nrow * fheight;
681 max_width = MAX_COLS * TermWin.fwidth; 835 max_width = MAX_COLS * fwidth;
682 max_height = MAX_ROWS * TermWin.fheight; 836 max_height = MAX_ROWS * fheight;
683 837
684 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 838 szHint.base_width = szHint.base_height = 2 * int_bwidth;
685 839
686 sb_w = mb_h = 0; 840 sb_w = mb_h = 0;
687 window_vt_x = window_vt_y = TermWin.int_bwidth; 841 window_vt_x = window_vt_y = int_bwidth;
688 842
689 if (scrollbar_visible ()) 843 if (scrollbar_visible ())
690 { 844 {
691 sb_w = scrollbar_TotalWidth (); 845 sb_w = scrollbar_TotalWidth ();
692 szHint.base_width += sb_w; 846 szHint.base_width += sb_w;
693 if (!(options & Opt_scrollBar_right)) 847 if (!OPTION (Opt_scrollBar_right))
694 window_vt_x += sb_w; 848 window_vt_x += sb_w;
695 } 849 }
696 850
697 if (menubar_visible ()) 851 if (menubar_visible ())
698 { 852 {
699 mb_h = menuBar_TotalHeight (); 853 mb_h = menuBar_TotalHeight ();
700 szHint.base_height += mb_h; 854 szHint.base_height += mb_h;
701 window_vt_y += mb_h; 855 window_vt_y += mb_h;
702 } 856 }
703 857
704 szHint.width_inc = TermWin.fwidth; 858 szHint.width_inc = fwidth;
705 szHint.height_inc = TermWin.fheight; 859 szHint.height_inc = fheight;
706 szHint.min_width = szHint.base_width + szHint.width_inc; 860 szHint.min_width = szHint.base_width + szHint.width_inc;
707 szHint.min_height = szHint.base_height + szHint.height_inc; 861 szHint.min_height = szHint.base_height + szHint.height_inc;
708 862
709 if (width && width - szHint.base_width < max_width) 863 if (newwidth && newwidth - szHint.base_width < max_width)
710 { 864 {
711 szHint.width = width; 865 szHint.width = newwidth;
712 TermWin.width = width - szHint.base_width; 866 width = newwidth - szHint.base_width;
713 } 867 }
714 else 868 else
715 { 869 {
716 MIN_IT (TermWin.width, max_width); 870 min_it (width, max_width);
717 szHint.width = szHint.base_width + TermWin.width; 871 szHint.width = szHint.base_width + width;
718 } 872 }
719 873
720 if (height && height - szHint.base_height < max_height) 874 if (newheight && newheight - szHint.base_height < max_height)
721 { 875 {
722 szHint.height = height; 876 szHint.height = newheight;
723 TermWin.height = height - szHint.base_height; 877 height = newheight - szHint.base_height;
724 } 878 }
725 else 879 else
726 { 880 {
727 MIN_IT (TermWin.height, max_height); 881 min_it (height, max_height);
728 szHint.height = szHint.base_height + TermWin.height; 882 szHint.height = szHint.base_height + height;
729 } 883 }
730 884
731 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
732 window_sb_x = szHint.width - sb_w; 886 window_sb_x = szHint.width - sb_w;
733 887
734 if (recalc_x) 888 if (recalc_x)
735 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
736 - szHint.width - 2 * TermWin.ext_bwidth);
737 if (recalc_y) 890 if (recalc_y)
738 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 891 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
739 - szHint.height - 2 * TermWin.ext_bwidth);
740 892
741 TermWin.ncol = TermWin.width / TermWin.fwidth; 893 ncol = width / fwidth;
742 TermWin.nrow = TermWin.height / TermWin.fheight; 894 nrow = height / fheight;
743 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 895 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
744 TermWin.ncol, TermWin.nrow, szHint.width, 896 ncol, nrow, szHint.width,
745 szHint.height)); 897 szHint.height));
746 return; 898 return;
747} 899}
748 900
749/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
… …
757 if (pty.pty < 0) 909 if (pty.pty < 0)
758 return; 910 return;
759 911
760 struct winsize ws; 912 struct winsize ws;
761 913
762 ws.ws_col = TermWin.ncol; 914 ws.ws_col = ncol;
763 ws.ws_row = TermWin.nrow; 915 ws.ws_row = nrow;
764 ws.ws_xpixel = TermWin.width; 916 ws.ws_xpixel = width;
765 ws.ws_ypixel = TermWin.height; 917 ws.ws_ypixel = height;
766 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
767 919
768#if 0 920#if 0
769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
770 if (cmd_pid) /* force through to the command */ 922 if (cmd_pid) /* force through to the command */
771 kill (cmd_pid, SIGWINCH); 923 kill (-cmd_pid, SIGWINCH);
772#endif 924#endif
773} 925}
774 926
775/*----------------------------------------------------------------------*/ 927/*----------------------------------------------------------------------*/
776/* set_fonts () - load and set the various fonts 928/* set_fonts () - load and set the various fonts
777/* 929 *
778 * init = 1 - initialize 930 * init = 1 - initialize
779 * 931 *
780 * fontname == FONT_UP - switch to bigger font 932 * fontname == FONT_UP - switch to bigger font
781 * fontname == FONT_DN - switch to smaller font 933 * fontname == FONT_DN - switch to smaller font
782 */ 934 */
… …
794 return false; 946 return false;
795 } 947 }
796 948
797#if ENABLE_STYLES 949#if ENABLE_STYLES
798 for (int i = RS_styleCount; --i; ) 950 for (int i = RS_styleCount; --i; )
799 if (TermWin.fontset[i] != TermWin.fontset[0]) 951 if (fontset[i] != fontset[0])
800 delete TermWin.fontset[i]; 952 delete fontset[i];
801#endif 953#endif
802 954
803 delete TermWin.fontset[0]; 955 delete fontset[0];
804 TermWin.fontset[0] = fs; 956 fontset[0] = fs;
805 957
806 prop = (*fs)[1]->properties (); 958 prop = (*fs)[1]->properties ();
807 prop.height += TermWin.lineSpace; 959 prop.height += lineSpace;
808 fs->set_prop (prop); 960 fs->set_prop (prop);
809 961
810 TermWin.fwidth = prop.width; 962 fwidth = prop.width;
811 TermWin.fheight = prop.height; 963 fheight = prop.height;
812 TermWin.fweight = prop.weight; 964 fbase = prop.ascent;
813 TermWin.fslant = prop.slant;
814 TermWin.fbase = (*fs)[1]->ascent;
815 965
816 for (int style = 1; style < 4; style++) 966 for (int style = 1; style < 4; style++)
817 { 967 {
818#if ENABLE_STYLES 968#if ENABLE_STYLES
819 const char *res = rs[Rs_font + style]; 969 const char *res = rs[Rs_font + style];
820 970
821 if (res && !*res) 971 if (res && !*res)
822 TermWin.fontset[style] = TermWin.fontset[0]; 972 fontset[style] = fontset[0];
823 else 973 else
824 { 974 {
825 TermWin.fontset[style] = fs = new rxvt_fontset (this); 975 fontset[style] = fs = new rxvt_fontset (this);
826 rxvt_fontprop prop2 = prop; 976 rxvt_fontprop prop2 = prop;
827 977
828 if (res) 978 if (res)
829 prop2.weight = prop2.slant = rxvt_fontprop::unset; 979 prop2.weight = prop2.slant = rxvt_fontprop::unset;
830 else 980 else
831 { 981 {
832 res = TermWin.fontset[0]->fontdesc; 982 res = fontset[0]->fontdesc;
833 983
834 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 984 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
835 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 985 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
836 } 986 }
837 987
838 fs->populate (res); 988 fs->populate (res);
839 fs->set_prop (prop2); 989 fs->set_prop (prop2);
840 } 990 }
841#else 991#else
842 TermWin.fontset[style] = TermWin.fontset[0]; 992 fontset[style] = fontset[0];
843#endif 993#endif
844 } 994 }
845 995
846 if (TermWin.parent[0]) 996 if (parent[0])
847 { 997 {
848 resize_all_windows (0, 0, 0); 998 resize_all_windows (0, 0, 0);
849 scr_remap_chars (); 999 scr_remap_chars ();
850 scr_touch (true); 1000 scr_touch (true);
851 } 1001 }
… …
853 return true; 1003 return true;
854} 1004}
855 1005
856void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1006void rxvt_term::set_string_property (Atom prop, const char *str, int len)
857{ 1007{
858 // TODO: SMART_WINDOW_TITLE
859 XChangeProperty (display->display, TermWin.parent[0], 1008 XChangeProperty (display->display, parent[0],
860 prop, XA_STRING, 8, PropModeReplace, 1009 prop, XA_STRING, 8, PropModeReplace,
861 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1010 (const unsigned char *)str, len >= 0 ? len : strlen (str));
862} 1011}
863 1012
864void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1013void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
865{ 1014{
866 // TODO: SMART_WINDOW_TITLE
867 wchar_t *ws = rxvt_mbstowcs (str, len); 1015 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws); 1016 char *s = rxvt_wcstoutf8 (ws);
869 1017
870 XChangeProperty (display->display, TermWin.parent[0], 1018 XChangeProperty (display->display, parent[0],
871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1019 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
872 (const unsigned char *)s, strlen (s)); 1020 (const unsigned char *)s, strlen (s));
873 1021
874 free (s); 1022 free (s);
875 free (ws); 1023 free (ws);
… …
880/* xterm sequences - title, iconName, color (exptl) */ 1028/* xterm sequences - title, iconName, color (exptl) */
881void 1029void
882rxvt_term::set_title (const char *str) 1030rxvt_term::set_title (const char *str)
883{ 1031{
884 set_string_property (XA_WM_NAME, str); 1032 set_string_property (XA_WM_NAME, str);
885#if ENABLE_FRILLS 1033#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_NAME], str); 1034 set_utf8_property (xa[XA_NET_WM_NAME], str);
887#endif 1035#endif
888} 1036}
889 1037
890void 1038void
891rxvt_term::set_icon_name (const char *str) 1039rxvt_term::set_icon_name (const char *str)
892{ 1040{
893 set_string_property (XA_WM_ICON_NAME, str); 1041 set_string_property (XA_WM_ICON_NAME, str);
894#if ENABLE_FRILLS 1042#if ENABLE_EWMH
895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1043 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896#endif 1044#endif
897} 1045}
898 1046
899#ifdef XTERM_COLOR_CHANGE 1047#ifdef XTERM_COLOR_CHANGE
… …
908 1056
909 /* handle color aliases */ 1057 /* handle color aliases */
910 if (isdigit (*color)) 1058 if (isdigit (*color))
911 { 1059 {
912 i = atoi (color); 1060 i = atoi (color);
1061
913 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
914 { /* bright colors */ 1063 { /* bright colors */
915 i -= 8; 1064 i -= 8;
916# ifndef NO_BRIGHTCOLOR
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
918 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
919 goto Done; 1067 goto done;
920# endif
921
922 } 1068 }
1069
923 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
924 { /* normal colors */ 1071 { /* normal colors */
925 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
926 SET_PIXCOLOR (idx); 1073 SET_PIXCOLOR (idx);
927 goto Done; 1074 goto done;
928 } 1075 }
929 } 1076 }
930 1077
931 if (!rXParseAllocColor (& xcol, color)) 1078 if (!rXParseAllocColor (&xcol, color))
932 return; 1079 return;
933 1080
934 /* XStoreColor (display->display, display->cmap, XColor*); */ 1081 /* XStoreColor (display->display, display->cmap, XColor*); */
935 1082
936 /* 1083 /*
… …
952 pix_colors_focused[idx] = xcol; 1099 pix_colors_focused[idx] = xcol;
953 SET_PIXCOLOR (idx); 1100 SET_PIXCOLOR (idx);
954 1101
955 /* XSetWindowAttributes attr; */ 1102 /* XSetWindowAttributes attr; */
956 /* Cursor cursor; */ 1103 /* Cursor cursor; */
957Done: 1104done:
1105
958#ifdef OFF_FOCUS_FADING 1106#if OFF_FOCUS_FADING
959 if (rs[Rs_fade]) 1107 if (rs[Rs_fade])
960 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1108 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
961#endif 1109#endif
962 1110
963 /*TODO: handle Color_BD, scrollbar background, etc. */ 1111 /*TODO: handle Color_BD, scrollbar background, etc. */
964 1112
965 recolour_cursor (); 1113 recolour_cursor ();
… …
1036 1184
1037/* -------------------------------------------------------------------- * 1185/* -------------------------------------------------------------------- *
1038 * - WINDOW RESIZING - * 1186 * - WINDOW RESIZING - *
1039 * -------------------------------------------------------------------- */ 1187 * -------------------------------------------------------------------- */
1040void 1188void
1041rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1189rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1042{ 1190{
1043 int fix_screen; 1191 int fix_screen;
1044
1045#ifdef SMART_RESIZE
1046 int old_width = szHint.width, old_height = szHint.height; 1192 int old_width = szHint.width, old_height = szHint.height;
1047#endif 1193 dDisp;
1048 1194
1049 window_calc (width, height); 1195 window_calc (newwidth, newheight);
1050 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1196 XSetWMNormalHints (disp, parent[0], &szHint);
1051 1197
1052 if (!ignoreparent) 1198 if (!ignoreparent)
1053 { 1199 {
1054#ifdef SMART_RESIZE 1200#ifdef SMART_RESIZE
1055 /* 1201 /*
… …
1059 int x, y, x1, y1; 1205 int x, y, x1, y1;
1060 int dx, dy; 1206 int dx, dy;
1061 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1207 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1062 Window unused_cr; 1208 Window unused_cr;
1063 1209
1064 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1210 XTranslateCoordinates (disp, parent[0], display->root,
1065 0, 0, &x, &y, &unused_cr); 1211 0, 0, &x, &y, &unused_cr);
1066 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1212 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1067 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1213 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1068 /* 1214 /*
1069 * if display->root isn't the parent window, a WM will probably have offset 1215 * if display->root isn't the parent window, a WM will probably have offset
1070 * our position for handles and decorations. Counter it 1216 * our position for handles and decorations. Counter it
1071 */ 1217 */
… …
1073 { 1219 {
1074 x -= x1; 1220 x -= x1;
1075 y -= y1; 1221 y -= y1;
1076 } 1222 }
1077 1223
1078 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1224 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1079 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1225 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1080 dx = old_width - szHint.width; 1226 dx = old_width - szHint.width;
1081 dy = old_height - szHint.height; 1227 dy = old_height - szHint.height;
1082 1228
1083 /* Check position of the center of the window */ 1229 /* Check position of the center of the window */
1084 if (x < x1) /* left half */ 1230 if (x < x1) /* left half */
… …
1088 if (y < y1) /* top half */ 1234 if (y < y1) /* top half */
1089 dy = 0; 1235 dy = 0;
1090 else if (y == y1) /* exact center */ 1236 else if (y == y1) /* exact center */
1091 dy /= 2; 1237 dy /= 2;
1092 1238
1093 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1239 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1094 szHint.width, szHint.height); 1240 szHint.width, szHint.height);
1095#else 1241#else
1096 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1242 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1097#endif 1243#endif
1098 } 1244 }
1099 1245
1100 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1101 1247
1102 if (fix_screen || width != old_width || height != old_height) 1248 if (fix_screen || newwidth != old_width || newheight != old_height)
1103 { 1249 {
1104 if (scrollbar_visible ()) 1250 if (scrollbar_visible ())
1105 { 1251 {
1106 XMoveResizeWindow (display->display, scrollBar.win, 1252 XMoveResizeWindow (disp, scrollBar.win,
1107 window_sb_x, 0, 1253 window_sb_x, 0,
1108 scrollbar_TotalWidth (), szHint.height); 1254 scrollbar_TotalWidth (), szHint.height);
1109 resize_scrollbar (); 1255 resize_scrollbar ();
1110 } 1256 }
1111 1257
1112 if (menubar_visible ()) 1258 if (menubar_visible ())
1113 XMoveResizeWindow (display->display, menuBar.win, 1259 XMoveResizeWindow (disp, menuBar.win,
1114 window_vt_x, 0, 1260 window_vt_x, 0,
1115 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1261 width, menuBar_TotalHeight ());
1116 1262
1117 XMoveResizeWindow (display->display, TermWin.vt, 1263 XMoveResizeWindow (disp, vt,
1118 window_vt_x, window_vt_y, 1264 window_vt_x, window_vt_y,
1119 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1265 width, height);
1266
1120 scr_clear (); 1267 scr_clear ();
1121#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1122 resize_pixmap (); 1269 resize_pixmap ();
1123#endif 1270#endif
1124 } 1271 }
… …
1129 int old_ncol = prev_ncol; 1276 int old_ncol = prev_ncol;
1130 1277
1131 /* scr_reset only works on the primary screen */ 1278 /* scr_reset only works on the primary screen */
1132 if (old_height) /* this is not the first time through */ 1279 if (old_height) /* this is not the first time through */
1133 { 1280 {
1134 unsigned int ncol = TermWin.ncol; 1281 unsigned int ocol = ncol;
1135 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1282 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1136 curr_screen = scr_change_screen (PRIMARY); 1283 curr_screen = scr_change_screen (PRIMARY);
1137 TermWin.ncol = ncol; 1284 ncol = ocol;
1138 } 1285 }
1139 1286
1140 scr_reset (); 1287 scr_reset ();
1141 1288
1142 if (curr_screen >= 0) /* this is not the first time through */ 1289 if (curr_screen >= 0) /* this is not the first time through */
1143 { 1290 {
1144 scr_change_screen (curr_screen); 1291 scr_change_screen (curr_screen);
1145 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1292 selection_check (old_ncol != ncol ? 4 : 0);
1146 } 1293 }
1147 } 1294 }
1148 1295
1149 old_width = szHint.width; 1296 old_width = szHint.width;
1150 old_height = szHint.height; 1297 old_height = szHint.height;
1298
1299#ifdef XPM_BACKGROUND
1300 if (pixmap)
1301 scr_touch (false);
1302#endif
1151 1303
1152#ifdef USE_XIM 1304#ifdef USE_XIM
1153 IMSetStatusPosition (); 1305 IMSetStatusPosition ();
1154#endif 1306#endif
1155} 1307}
… …
1157/* 1309/*
1158 * Set the width/height of the vt window in characters. Units are pixels. 1310 * Set the width/height of the vt window in characters. Units are pixels.
1159 * good for toggling 80/132 columns 1311 * good for toggling 80/132 columns
1160 */ 1312 */
1161void 1313void
1162rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1314rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1163{ 1315{
1164 XWindowAttributes wattr; 1316 XWindowAttributes wattr;
1165 1317
1166 if (width == 0 || height == 0) 1318 if (newwidth == 0 || newheight == 0)
1167 { 1319 {
1168 XGetWindowAttributes (display->display, display->root, &wattr); 1320 XGetWindowAttributes (display->display, display->root, &wattr);
1321
1169 if (width == 0) 1322 if (newwidth == 0)
1170 width = wattr.width - szHint.base_width; 1323 newwidth = wattr.width - szHint.base_width;
1171 if (height == 0) 1324 if (newheight == 0)
1172 height = wattr.height - szHint.base_height; 1325 newheight = wattr.height - szHint.base_height;
1173 }
1174
1175 if (width != TermWin.width || height != TermWin.height)
1176 { 1326 }
1327
1328 if (newwidth != width || newheight != height)
1329 {
1177 width += szHint.base_width; 1330 newwidth += szHint.base_width;
1178 height += szHint.base_height; 1331 newheight += szHint.base_height;
1179 resize_all_windows (width, height, 0); 1332 resize_all_windows (newwidth, newheight, 0);
1180 } 1333 }
1181} 1334}
1182 1335
1183/* -------------------------------------------------------------------- * 1336/* -------------------------------------------------------------------- *
1184 * - X INPUT METHOD ROUTINES - * 1337 * - X INPUT METHOD ROUTINES - *
… …
1194 1347
1195void 1348void
1196rxvt_term::im_set_size (XRectangle &size) 1349rxvt_term::im_set_size (XRectangle &size)
1197{ 1350{
1198 // the int_bwidth terms make no sense to me 1351 // the int_bwidth terms make no sense to me
1199 size.x = TermWin.int_bwidth; 1352 size.x = int_bwidth;
1200 size.y = TermWin.int_bwidth; 1353 size.y = int_bwidth;
1201 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1354 size.width = Width2Pixel (ncol) + int_bwidth;
1202 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1355 size.height = Height2Pixel (nrow) + int_bwidth;
1203} 1356}
1204 1357
1205void 1358void
1206rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1359rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1207 XRectangle &status_rect, 1360 XRectangle &status_rect,
1208 const XRectangle &needed_rect) 1361 const XRectangle &needed_rect)
1209{ 1362{
1210 preedit_rect.x = needed_rect.width; 1363 preedit_rect.x = needed_rect.width;
1211 preedit_rect.y = 0; 1364 preedit_rect.y = 0;
1212 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1365 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1213 preedit_rect.height = TermWin.fheight; 1366 preedit_rect.height = fheight;
1214 1367
1215 status_rect.x = 0; 1368 status_rect.x = 0;
1216 status_rect.y = 0; 1369 status_rect.y = 0;
1217 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1370 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1218 status_rect.height = TermWin.fheight; 1371 status_rect.height = fheight;
1219} 1372}
1220 1373
1221/* Checking whether input method is running. */ 1374/* Checking whether input method is running. */
1222bool 1375bool
1223rxvt_term::IMisRunning () 1376rxvt_term::IMisRunning ()
… …
1251{ 1404{
1252 XPoint nspot; 1405 XPoint nspot;
1253 XVaNestedList preedit_attr; 1406 XVaNestedList preedit_attr;
1254 1407
1255 if (!Input_Context 1408 if (!Input_Context
1256 || !TermWin.focus 1409 || !focus
1257 || !(input_style & XIMPreeditPosition)) 1410 || !(input_style & XIMPreeditPosition))
1258 return; 1411 return;
1259 1412
1260 im_set_position (nspot); 1413 im_set_position (nspot);
1261 1414
… …
1297 XRectangle rect, status_rect, needed_rect; 1450 XRectangle rect, status_rect, needed_rect;
1298 unsigned long fg, bg; 1451 unsigned long fg, bg;
1299 const char *p; 1452 const char *p;
1300 char **s; 1453 char **s;
1301 XIMStyles *xim_styles; 1454 XIMStyles *xim_styles;
1455
1456 set_environ (envv);
1302 1457
1303 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1458 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1304 return false; 1459 return false;
1305 1460
1306 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1461 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1381 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1382 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1383 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1538 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1384 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1539 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1385 "*", 1540 "*",
1386 TermWin.fheight, 1541 fheight,
1387 TermWin.fheight + 1, TermWin.fheight - 1, 1542 fheight + 1, fheight - 1,
1388 TermWin.fheight - 2, TermWin.fheight + 2); 1543 fheight - 2, fheight + 2);
1389 1544
1390 fs = XCreateFontSet (display->display, pat, 1545 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1391 &missing_charset_list, &missing_charset_count, &def_string); 1546 &missing_charset_list, &missing_charset_count, &def_string);
1392 1547
1393 if (missing_charset_list) 1548 if (missing_charset_list)
1394 XFreeStringList (missing_charset_list); 1549 XFreeStringList (missing_charset_list);
1395 1550
… …
1439 NULL); 1594 NULL);
1440 } 1595 }
1441 1596
1442 Input_Context = XCreateIC (xim, 1597 Input_Context = XCreateIC (xim,
1443 XNInputStyle, input_style, 1598 XNInputStyle, input_style,
1444 XNClientWindow, TermWin.vt, 1599 XNClientWindow, vt,
1445 XNFocusWindow, TermWin.parent[0], 1600 XNFocusWindow, parent[0],
1446 preedit_attr ? XNPreeditAttributes : NULL, 1601 preedit_attr ? XNPreeditAttributes : NULL,
1447 preedit_attr, 1602 preedit_attr,
1448 status_attr ? XNStatusAttributes : NULL, 1603 status_attr ? XNStatusAttributes : NULL,
1449 status_attr, NULL); 1604 status_attr, NULL);
1450 1605
… …
1467} 1622}
1468 1623
1469void 1624void
1470rxvt_term::im_cb () 1625rxvt_term::im_cb ()
1471{ 1626{
1472 int i, found, had_im; 1627 int i;
1473 const char *p; 1628 const char *p;
1474 char **s; 1629 char **s;
1475 char buf[IMBUFSIZ]; 1630 char buf[IMBUFSIZ];
1631
1632 SET_R (this);
1476 1633
1477 im_destroy (); 1634 im_destroy ();
1478 1635
1479 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1480 if (Input_Context) 1637 if (Input_Context)
… …
1532{ 1689{
1533 XRectangle preedit_rect, status_rect, *needed_rect; 1690 XRectangle preedit_rect, status_rect, *needed_rect;
1534 XVaNestedList preedit_attr, status_attr; 1691 XVaNestedList preedit_attr, status_attr;
1535 1692
1536 if (!Input_Context 1693 if (!Input_Context
1537 || !TermWin.focus 1694 || !focus
1538 || !(input_style & XIMPreeditArea) 1695 || !(input_style & XIMPreeditArea)
1539 || !IMisRunning ()) 1696 || !IMisRunning ())
1540 return; 1697 return;
1541 1698
1542 /* Getting the necessary width of preedit area */ 1699 /* Getting the necessary width of preedit area */

Diff Legend

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