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

Diff Legend

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