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.121 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC

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

Diff Legend

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