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