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

Diff Legend

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