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.173 by root, Wed Jan 11 19:55:34 2006 UTC

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

Diff Legend

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