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.119 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

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

Diff Legend

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