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

Diff Legend

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