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.174 by root, Thu Jan 12 00:11:13 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);
350 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
351 set_locale (""); 489 set_locale ("");
352 490
353 if (!init_vars ()) 491 if (!init_vars ())
354 return false; 492 return false;
355 493
356 init_secondary (); 494 init_secondary ();
357 495
358 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
359 497
360#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
361 keyboard->register_done (); 499 keyboard->register_done ();
362#endif 500#endif
363 501
364#if MENUBAR_MAX 502#if MENUBAR_MAX
365 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
366#endif 504#endif
367#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
368 if (options & Opt_scrollBar) 506 if (OPTION (Opt_scrollBar))
369 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
370#endif 508#endif
509 }
371 510
511#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 }
536#endif
537
538 {
539 TEMP_ENV;
540
372 create_windows (argc, argv); 541 create_windows (argc, argv);
373 542
543 dDisp;
544
374 init_xlocale (); 545 init_xlocale ();
375 546
376 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
377 548
378#if 0 549#if 0
379 XSynchronize (display->display, True); 550 XSynchronize (disp, True);
380#endif 551#endif
381 552
382#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar) 554 if (OPTION (Opt_scrollBar))
384 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
385#endif 556#endif
386#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
387 if (menubar_visible ()) 558 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win); 559 XMapWindow (disp, menuBar.win);
389#endif 560#endif
390#ifdef TRANSPARENT 561#ifdef TRANSPARENT
391 if (options & Opt_transparent) 562 if (OPTION (Opt_transparent))
392 { 563 {
393 XSelectInput (display->display, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
394 check_our_parents (); 565 check_our_parents ();
395 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
396 } 567 }
397#endif 568#endif
398 569
399 XMapWindow (display->display, TermWin.vt); 570 XMapWindow (disp, vt);
400 XMapWindow (display->display, TermWin.parent[0]); 571 XMapWindow (disp, parent[0]);
401 572
402 set_colorfgbg (); 573 set_colorfgbg ();
403 574
404 init_command (cmd_argv); 575 init_command (cmd_argv);
405 576
406 free (cmd_argv); 577 free (cmd_argv);
407 578
579 if (pty.pty >= 0)
408 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
409 581
410 check_ev.start (); 582 check_ev.start ();
583
584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
411 586
412 return true; 587 return true;
413} 588}
414 589
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 590static struct sig_handlers
591{
592 sig_watcher sw_chld, sw_term, sw_int;
593
594 void sig_chld (sig_watcher &w)
595 {
596 // we are being called for every SIGCHLD, find the corresponding term
597 int pid;
598
599 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
600 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
601 if (pid == (*t)->cmd_pid)
602 {
603 (*t)->child_exit ();
604 break;
605 }
606 }
607
608 /*
609 * Catch a fatal signal and tidy up before quitting
610 */
611 void
612 sig_term (sig_watcher &w)
613 {
614#ifdef DEBUG_CMD
615 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
616#endif
617 rxvt_emergency_cleanup ();
618 signal (w.signum, SIG_DFL);
619 kill (getpid (), w.signum);
620 }
621
622 sig_handlers ()
623 : sw_chld (this, &sig_handlers::sig_chld),
624 sw_term (this, &sig_handlers::sig_term),
625 sw_int (this, &sig_handlers::sig_term)
626 {
627 }
628} sig_handlers;
416 629
417void 630void
418rxvt_init () 631rxvt_init ()
419{ 632{
420 /* 633 /*
… …
428 rxvt_privileges (IGNORE); 641 rxvt_privileges (IGNORE);
429 642
430 signal (SIGHUP, SIG_IGN); 643 signal (SIGHUP, SIG_IGN);
431 signal (SIGPIPE, SIG_IGN); 644 signal (SIGPIPE, SIG_IGN);
432 645
646 sig_handlers.sw_chld.start (SIGCHLD);
647 sig_handlers.sw_term.start (SIGTERM);
648 sig_handlers.sw_int.start (SIGINT);
649
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 650 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
435 652
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
439}
440 656
441/* ------------------------------------------------------------------------- * 657 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} 658}
504 659
505/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
506 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
507 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
514 rxvt_fatal ("memory allocation failure. aborting.\n"); 669 rxvt_fatal ("memory allocation failure. aborting.\n");
515 670
516 return p; 671 return p;
517} 672}
518 673
519/* INTPROTO */ 674void *
520void *
521rxvt_calloc (size_t number, size_t size) 675rxvt_calloc (size_t number, size_t size)
522{ 676{
523 void *p = calloc (number, size); 677 void *p = calloc (number, size);
524 678
525 if (!p) 679 if (!p)
526 rxvt_fatal ("memory allocation failure. aborting.\n"); 680 rxvt_fatal ("memory allocation failure. aborting.\n");
527 681
528 return p; 682 return p;
529} 683}
530 684
531/* INTPROTO */
532void * 685void *
533rxvt_realloc (void *ptr, size_t size) 686rxvt_realloc (void *ptr, size_t size)
534{ 687{
535 void *p = realloc (ptr, size); 688 void *p = realloc (ptr, size);
536 689
… …
545 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
546/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
547void 700void
548rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
549{ 702{
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__) 703#if ! defined(__CYGWIN32__)
556# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
557 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
558# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
559# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
565 case IGNORE: 713 case IGNORE:
566 /* 714 /*
567 * change effective uid/gid - not real uid/gid - so we can switch 715 * change effective uid/gid - not real uid/gid - so we can switch
568 * back to root later, as required 716 * back to root later, as required
569 */ 717 */
718 setegid (getgid ());
570 seteuid (getuid ()); 719 seteuid (getuid ());
571 setegid (getgid ());
572 break; 720 break;
573 case SAVE: 721 case SAVE:
574 euid = geteuid ();
575 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
576 break; 724 break;
577 case RESTORE: 725 case RESTORE:
578 seteuid (euid);
579 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
580 break; 728 break;
581 } 729 }
582# else 730# else
583 switch (action) 731 switch (action)
584 { 732 {
585 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
586 setuid (getuid ()); 735 setuid (getuid ());
587 setgid (getgid ());
588 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
589 case SAVE: 737 case SAVE:
590 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
591 case RESTORE: 739 case RESTORE:
592 break; 740 break;
… …
597 745
598#ifdef UTMP_SUPPORT 746#ifdef UTMP_SUPPORT
599void 747void
600rxvt_term::privileged_utmp (rxvt_privaction action) 748rxvt_term::privileged_utmp (rxvt_privaction action)
601{ 749{
602 if ((options & Opt_utmpInhibit) 750 if (OPTION (Opt_utmpInhibit)
603 || !pty.name || !*pty.name) 751 || !pty.name || !*pty.name)
604 return; 752 return;
605 753
606 rxvt_privileges (RESTORE); 754 rxvt_privileges (RESTORE);
607 755
… …
618/* 766/*
619 * window size/position calculcations for XSizeHint and other storage. 767 * window size/position calculcations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 768 * if width/height are non-zero then override calculated width/height
621 */ 769 */
622void 770void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 771rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 772{
625 short recalc_x, recalc_y; 773 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 774 int x, y, sb_w, mb_h, flags;
627 unsigned int w, h; 775 unsigned int w, h;
628 unsigned int max_width, max_height; 776 unsigned int max_width, max_height;
777 dDisp;
629 778
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 779 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 780 ncol, nrow, szHint.width, szHint.height));
632 szHint.height)); 781
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 782 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
634 szHint.win_gravity = NorthWestGravity; 783 szHint.win_gravity = NorthWestGravity;
635 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 784 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
636 785
637 recalc_x = recalc_y = 0; 786 recalc_x = recalc_y = 0;
638 flags = 0; 787 flags = 0;
788
639 if (!parsed_geometry) 789 if (!parsed_geometry)
640 { 790 {
641 parsed_geometry = 1; 791 parsed_geometry = 1;
792
642 if (rs[Rs_geometry]) 793 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 794 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
795
644 if (flags & WidthValue) 796 if (flags & WidthValue)
645 { 797 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 798 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
647 szHint.flags |= USSize; 799 szHint.flags |= USSize;
648 } 800 }
801
649 if (flags & HeightValue) 802 if (flags & HeightValue)
650 { 803 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 804 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 805 szHint.flags |= USSize;
653 } 806 }
807
654 if (flags & XValue) 808 if (flags & XValue)
655 { 809 {
656 szHint.x = x; 810 szHint.x = x;
657 szHint.flags |= USPosition; 811 szHint.flags |= USPosition;
812
658 if (flags & XNegative) 813 if (flags & XNegative)
659 { 814 {
660 recalc_x = 1; 815 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 816 szHint.win_gravity = NorthEastGravity;
662 } 817 }
663 } 818 }
819
664 if (flags & YValue) 820 if (flags & YValue)
665 { 821 {
666 szHint.y = y; 822 szHint.y = y;
667 szHint.flags |= USPosition; 823 szHint.flags |= USPosition;
824
668 if (flags & YNegative) 825 if (flags & YNegative)
669 { 826 {
670 recalc_y = 1; 827 recalc_y = 1;
828
671 if (szHint.win_gravity == NorthEastGravity) 829 if (szHint.win_gravity == NorthEastGravity)
672 szHint.win_gravity = SouthEastGravity; 830 szHint.win_gravity = SouthEastGravity;
673 else 831 else
674 szHint.win_gravity = SouthWestGravity; 832 szHint.win_gravity = SouthWestGravity;
675 } 833 }
676 } 834 }
677 } 835 }
678 836
679 /* TODO: BOUNDS */ 837 /* TODO: BOUNDS */
680 TermWin.width = TermWin.ncol * TermWin.fwidth; 838 width = ncol * fwidth;
681 TermWin.height = TermWin.nrow * TermWin.fheight; 839 height = nrow * fheight;
682 max_width = MAX_COLS * TermWin.fwidth; 840 max_width = MAX_COLS * fwidth;
683 max_height = MAX_ROWS * TermWin.fheight; 841 max_height = MAX_ROWS * fheight;
684 842
685 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 843 szHint.base_width = szHint.base_height = 2 * int_bwidth;
686 844
687 sb_w = mb_h = 0; 845 sb_w = mb_h = 0;
688 window_vt_x = window_vt_y = TermWin.int_bwidth; 846 window_vt_x = window_vt_y = int_bwidth;
689 847
690 if (scrollbar_visible ()) 848 if (scrollbar_visible ())
691 { 849 {
692 sb_w = scrollbar_TotalWidth (); 850 sb_w = scrollbar_TotalWidth ();
693 szHint.base_width += sb_w; 851 szHint.base_width += sb_w;
694 if (!(options & Opt_scrollBar_right)) 852 if (!OPTION (Opt_scrollBar_right))
695 window_vt_x += sb_w; 853 window_vt_x += sb_w;
696 } 854 }
697 855
698 if (menubar_visible ()) 856 if (menubar_visible ())
699 { 857 {
700 mb_h = menuBar_TotalHeight (); 858 mb_h = menuBar_TotalHeight ();
701 szHint.base_height += mb_h; 859 szHint.base_height += mb_h;
702 window_vt_y += mb_h; 860 window_vt_y += mb_h;
703 } 861 }
704 862
705 szHint.width_inc = TermWin.fwidth; 863 szHint.width_inc = fwidth;
706 szHint.height_inc = TermWin.fheight; 864 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 865 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 866 szHint.min_height = szHint.base_height + szHint.height_inc;
709 867
710 if (width && width - szHint.base_width < max_width) 868 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 869 {
712 szHint.width = width; 870 szHint.width = newwidth;
713 TermWin.width = width - szHint.base_width; 871 width = newwidth - szHint.base_width;
714 } 872 }
715 else 873 else
716 { 874 {
717 MIN_IT (TermWin.width, max_width); 875 min_it (width, max_width);
718 szHint.width = szHint.base_width + TermWin.width; 876 szHint.width = szHint.base_width + width;
719 } 877 }
720 878
721 if (height && height - szHint.base_height < max_height) 879 if (newheight && newheight - szHint.base_height < max_height)
722 { 880 {
723 szHint.height = height; 881 szHint.height = newheight;
724 TermWin.height = height - szHint.base_height; 882 height = newheight - szHint.base_height;
725 } 883 }
726 else 884 else
727 { 885 {
728 MIN_IT (TermWin.height, max_height); 886 min_it (height, max_height);
729 szHint.height = szHint.base_height + TermWin.height; 887 szHint.height = szHint.base_height + height;
730 } 888 }
731 889
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 891 window_sb_x = szHint.width - sb_w;
734 892
735 if (recalc_x) 893 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
737 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 895 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 896 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
740 - szHint.height - 2 * TermWin.ext_bwidth);
741 897
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 898 ncol = width / fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 899 nrow = height / fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 900 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745 TermWin.ncol, TermWin.nrow, szHint.width, 901 ncol, nrow, szHint.width,
746 szHint.height)); 902 szHint.height));
747 return; 903 return;
748} 904}
749 905
750/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
… …
758 if (pty.pty < 0) 914 if (pty.pty < 0)
759 return; 915 return;
760 916
761 struct winsize ws; 917 struct winsize ws;
762 918
763 ws.ws_col = TermWin.ncol; 919 ws.ws_col = ncol;
764 ws.ws_row = TermWin.nrow; 920 ws.ws_row = nrow;
765 ws.ws_xpixel = TermWin.width; 921 ws.ws_xpixel = width;
766 ws.ws_ypixel = TermWin.height; 922 ws.ws_ypixel = height;
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 923 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
768 924
769#if 0 925#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 926 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 927 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 928 kill (-cmd_pid, SIGWINCH);
773#endif 929#endif
774} 930}
775 931
776/*----------------------------------------------------------------------*/ 932/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 933/* set_fonts () - load and set the various fonts
778/* 934 *
779 * init = 1 - initialize 935 * init = 1 - initialize
780 * 936 *
781 * fontname == FONT_UP - switch to bigger font 937 * fontname == FONT_UP - switch to bigger font
782 * fontname == FONT_DN - switch to smaller font 938 * fontname == FONT_DN - switch to smaller font
783 */ 939 */
… …
795 return false; 951 return false;
796 } 952 }
797 953
798#if ENABLE_STYLES 954#if ENABLE_STYLES
799 for (int i = RS_styleCount; --i; ) 955 for (int i = RS_styleCount; --i; )
800 if (TermWin.fontset[i] != TermWin.fontset[0]) 956 if (fontset[i] != fontset[0])
801 delete TermWin.fontset[i]; 957 delete fontset[i];
802#endif 958#endif
803 959
804 delete TermWin.fontset[0]; 960 delete fontset[0];
805 TermWin.fontset[0] = fs; 961 fontset[0] = fs;
806 962
807 prop = (*fs)[1]->properties (); 963 prop = (*fs)[1]->properties ();
808 prop.height += TermWin.lineSpace; 964 prop.height += lineSpace;
809 fs->set_prop (prop); 965 fs->set_prop (prop);
810 966
811 TermWin.fwidth = prop.width; 967 fwidth = prop.width;
812 TermWin.fheight = prop.height; 968 fheight = prop.height;
813 TermWin.fweight = prop.weight; 969 fbase = prop.ascent;
814 TermWin.fslant = prop.slant;
815 TermWin.fbase = (*fs)[1]->ascent;
816 970
817 for (int style = 1; style < 4; style++) 971 for (int style = 1; style < 4; style++)
818 { 972 {
819#if ENABLE_STYLES 973#if ENABLE_STYLES
820 const char *res = rs[Rs_font + style]; 974 const char *res = rs[Rs_font + style];
821 975
822 if (res && !*res) 976 if (res && !*res)
823 TermWin.fontset[style] = TermWin.fontset[0]; 977 fontset[style] = fontset[0];
824 else 978 else
825 { 979 {
826 TermWin.fontset[style] = fs = new rxvt_fontset (this); 980 fontset[style] = fs = new rxvt_fontset (this);
827 rxvt_fontprop prop2 = prop; 981 rxvt_fontprop prop2 = prop;
828 982
829 if (res) 983 if (res)
830 prop2.weight = prop2.slant = rxvt_fontprop::unset; 984 prop2.weight = prop2.slant = rxvt_fontprop::unset;
831 else 985 else
832 { 986 {
833 res = TermWin.fontset[0]->fontdesc; 987 res = fontset[0]->fontdesc;
834 988
835 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 989 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; 990 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
837 } 991 }
838 992
839 fs->populate (res); 993 fs->populate (res);
840 fs->set_prop (prop2); 994 fs->set_prop (prop2);
841 } 995 }
842#else 996#else
843 TermWin.fontset[style] = TermWin.fontset[0]; 997 fontset[style] = fontset[0];
844#endif 998#endif
845 } 999 }
846 1000
847 if (TermWin.parent[0]) 1001 if (parent[0])
848 { 1002 {
849 resize_all_windows (0, 0, 0); 1003 resize_all_windows (0, 0, 0);
850 scr_remap_chars (); 1004 scr_remap_chars ();
851 scr_touch (true); 1005 scr_touch (true);
852 } 1006 }
… …
854 return true; 1008 return true;
855} 1009}
856 1010
857void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1011void rxvt_term::set_string_property (Atom prop, const char *str, int len)
858{ 1012{
859 // TODO: SMART_WINDOW_TITLE
860 XChangeProperty (display->display, TermWin.parent[0], 1013 XChangeProperty (display->display, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 1014 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1015 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 1016}
864 1017
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1018void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 1019{
867 // TODO: SMART_WINDOW_TITLE
868 wchar_t *ws = rxvt_mbstowcs (str, len); 1020 wchar_t *ws = rxvt_mbstowcs (str, len);
869 char *s = rxvt_wcstoutf8 (ws); 1021 char *s = rxvt_wcstoutf8 (ws);
870 1022
871 XChangeProperty (display->display, TermWin.parent[0], 1023 XChangeProperty (display->display, parent[0],
872 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1024 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
873 (const unsigned char *)s, strlen (s)); 1025 (const unsigned char *)s, strlen (s));
874 1026
875 free (s); 1027 free (s);
876 free (ws); 1028 free (ws);
… …
881/* xterm sequences - title, iconName, color (exptl) */ 1033/* xterm sequences - title, iconName, color (exptl) */
882void 1034void
883rxvt_term::set_title (const char *str) 1035rxvt_term::set_title (const char *str)
884{ 1036{
885 set_string_property (XA_WM_NAME, str); 1037 set_string_property (XA_WM_NAME, str);
886#if ENABLE_FRILLS 1038#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_NAME], str); 1039 set_utf8_property (xa[XA_NET_WM_NAME], str);
888#endif 1040#endif
889} 1041}
890 1042
891void 1043void
892rxvt_term::set_icon_name (const char *str) 1044rxvt_term::set_icon_name (const char *str)
893{ 1045{
894 set_string_property (XA_WM_ICON_NAME, str); 1046 set_string_property (XA_WM_ICON_NAME, str);
895#if ENABLE_FRILLS 1047#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1048 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
897#endif 1049#endif
898} 1050}
899 1051
900#ifdef XTERM_COLOR_CHANGE 1052#ifdef XTERM_COLOR_CHANGE
… …
909 1061
910 /* handle color aliases */ 1062 /* handle color aliases */
911 if (isdigit (*color)) 1063 if (isdigit (*color))
912 { 1064 {
913 i = atoi (color); 1065 i = atoi (color);
1066
914 if (i >= 8 && i <= 15) 1067 if (i >= 8 && i <= 15)
915 { /* bright colors */ 1068 { /* bright colors */
916 i -= 8; 1069 i -= 8;
917# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
920 goto Done; 1072 goto done;
921# endif
922
923 } 1073 }
1074
924 if (i >= 0 && i <= 7) 1075 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1076 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1077 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1078 SET_PIXCOLOR (idx);
928 goto Done; 1079 goto done;
929 } 1080 }
930 } 1081 }
931 1082
932 if (!rXParseAllocColor (& xcol, color)) 1083 if (!rXParseAllocColor (&xcol, color))
933 return; 1084 return;
934 1085
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1086 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1087
937 /* 1088 /*
… …
953 pix_colors_focused[idx] = xcol; 1104 pix_colors_focused[idx] = xcol;
954 SET_PIXCOLOR (idx); 1105 SET_PIXCOLOR (idx);
955 1106
956 /* XSetWindowAttributes attr; */ 1107 /* XSetWindowAttributes attr; */
957 /* Cursor cursor; */ 1108 /* Cursor cursor; */
958Done: 1109done:
1110
959#ifdef OFF_FOCUS_FADING 1111#if OFF_FOCUS_FADING
960 if (rs[Rs_fade]) 1112 if (rs[Rs_fade])
961 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1113 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
962#endif 1114#endif
963 1115
964 /*TODO: handle Color_BD, scrollbar background, etc. */ 1116 /*TODO: handle Color_BD, scrollbar background, etc. */
965 1117
966 recolour_cursor (); 1118 recolour_cursor ();
… …
1037 1189
1038/* -------------------------------------------------------------------- * 1190/* -------------------------------------------------------------------- *
1039 * - WINDOW RESIZING - * 1191 * - WINDOW RESIZING - *
1040 * -------------------------------------------------------------------- */ 1192 * -------------------------------------------------------------------- */
1041void 1193void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1194rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1043{ 1195{
1044 int fix_screen; 1196 int fix_screen;
1045
1046#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1197 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1198 dDisp;
1049 1199
1050 window_calc (width, height); 1200 window_calc (newwidth, newheight);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1201 XSetWMNormalHints (disp, parent[0], &szHint);
1052 1202
1053 if (!ignoreparent) 1203 if (!ignoreparent)
1054 { 1204 {
1055#ifdef SMART_RESIZE 1205#ifdef SMART_RESIZE
1056 /* 1206 /*
… …
1060 int x, y, x1, y1; 1210 int x, y, x1, y1;
1061 int dx, dy; 1211 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1212 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1213 Window unused_cr;
1064 1214
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1215 XTranslateCoordinates (disp, parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1216 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1217 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1218 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1219 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1220 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1221 * our position for handles and decorations. Counter it
1072 */ 1222 */
… …
1074 { 1224 {
1075 x -= x1; 1225 x -= x1;
1076 y -= y1; 1226 y -= y1;
1077 } 1227 }
1078 1228
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1229 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1230 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1231 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1232 dy = old_height - szHint.height;
1083 1233
1084 /* Check position of the center of the window */ 1234 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1235 if (x < x1) /* left half */
… …
1089 if (y < y1) /* top half */ 1239 if (y < y1) /* top half */
1090 dy = 0; 1240 dy = 0;
1091 else if (y == y1) /* exact center */ 1241 else if (y == y1) /* exact center */
1092 dy /= 2; 1242 dy /= 2;
1093 1243
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1244 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1245 szHint.width, szHint.height);
1096#else 1246#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1247 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1098#endif 1248#endif
1099 } 1249 }
1100 1250
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1251 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1102 1252
1103 if (fix_screen || width != old_width || height != old_height) 1253 if (fix_screen || newwidth != old_width || newheight != old_height)
1104 { 1254 {
1105 if (scrollbar_visible ()) 1255 if (scrollbar_visible ())
1106 { 1256 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1257 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1258 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1259 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1260 resize_scrollbar ();
1111 } 1261 }
1112 1262
1113 if (menubar_visible ()) 1263 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win, 1264 XMoveResizeWindow (disp, menuBar.win,
1115 window_vt_x, 0, 1265 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1266 width, menuBar_TotalHeight ());
1117 1267
1118 XMoveResizeWindow (display->display, TermWin.vt, 1268 XMoveResizeWindow (disp, vt,
1119 window_vt_x, window_vt_y, 1269 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1270 width, height);
1121 1271
1122 scr_clear (); 1272 scr_clear ();
1123#ifdef XPM_BACKGROUND 1273#ifdef XPM_BACKGROUND
1124 resize_pixmap (); 1274 resize_pixmap ();
1125#endif 1275#endif
… …
1131 int old_ncol = prev_ncol; 1281 int old_ncol = prev_ncol;
1132 1282
1133 /* scr_reset only works on the primary screen */ 1283 /* scr_reset only works on the primary screen */
1134 if (old_height) /* this is not the first time through */ 1284 if (old_height) /* this is not the first time through */
1135 { 1285 {
1136 unsigned int ncol = TermWin.ncol; 1286 unsigned int ocol = ncol;
1137 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1287 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1138 curr_screen = scr_change_screen (PRIMARY); 1288 curr_screen = scr_change_screen (PRIMARY);
1139 TermWin.ncol = ncol; 1289 ncol = ocol;
1140 } 1290 }
1141 1291
1142 scr_reset (); 1292 scr_reset ();
1143 1293
1144 if (curr_screen >= 0) /* this is not the first time through */ 1294 if (curr_screen >= 0) /* this is not the first time through */
1145 { 1295 {
1146 scr_change_screen (curr_screen); 1296 scr_change_screen (curr_screen);
1147 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1297 selection_check (old_ncol != ncol ? 4 : 0);
1148 } 1298 }
1149 } 1299 }
1150 1300
1151 old_width = szHint.width; 1301 old_width = szHint.width;
1152 old_height = szHint.height; 1302 old_height = szHint.height;
1153 1303
1154#ifdef XPM_BACKGROUND 1304#ifdef XPM_BACKGROUND
1155 if (TermWin.pixmap) 1305 if (pixmap)
1156 scr_touch (false); 1306 scr_touch (false);
1157#endif 1307#endif
1158 1308
1159#ifdef USE_XIM 1309#ifdef USE_XIM
1160 IMSetStatusPosition (); 1310 IMSetStatusPosition ();
… …
1164/* 1314/*
1165 * Set the width/height of the vt window in characters. Units are pixels. 1315 * Set the width/height of the vt window in characters. Units are pixels.
1166 * good for toggling 80/132 columns 1316 * good for toggling 80/132 columns
1167 */ 1317 */
1168void 1318void
1169rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1319rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1170{ 1320{
1171 XWindowAttributes wattr; 1321 XWindowAttributes wattr;
1172 1322
1173 if (width == 0 || height == 0) 1323 if (newwidth == 0 || newheight == 0)
1174 { 1324 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1325 XGetWindowAttributes (display->display, display->root, &wattr);
1326
1176 if (width == 0) 1327 if (newwidth == 0)
1177 width = wattr.width - szHint.base_width; 1328 newwidth = wattr.width - szHint.base_width;
1178 if (height == 0) 1329 if (newheight == 0)
1179 height = wattr.height - szHint.base_height; 1330 newheight = wattr.height - szHint.base_height;
1180 }
1181
1182 if (width != TermWin.width || height != TermWin.height)
1183 { 1331 }
1332
1333 if (newwidth != width || newheight != height)
1334 {
1184 width += szHint.base_width; 1335 newwidth += szHint.base_width;
1185 height += szHint.base_height; 1336 newheight += szHint.base_height;
1186 resize_all_windows (width, height, 0); 1337 resize_all_windows (newwidth, newheight, 0);
1187 } 1338 }
1188} 1339}
1189 1340
1190/* -------------------------------------------------------------------- * 1341/* -------------------------------------------------------------------- *
1191 * - X INPUT METHOD ROUTINES - * 1342 * - X INPUT METHOD ROUTINES - *
… …
1201 1352
1202void 1353void
1203rxvt_term::im_set_size (XRectangle &size) 1354rxvt_term::im_set_size (XRectangle &size)
1204{ 1355{
1205 // the int_bwidth terms make no sense to me 1356 // the int_bwidth terms make no sense to me
1206 size.x = TermWin.int_bwidth; 1357 size.x = int_bwidth;
1207 size.y = TermWin.int_bwidth; 1358 size.y = int_bwidth;
1208 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1359 size.width = Width2Pixel (ncol) + int_bwidth;
1209 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1360 size.height = Height2Pixel (nrow) + int_bwidth;
1210} 1361}
1211 1362
1212void 1363void
1213rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1364rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1214 XRectangle &status_rect, 1365 XRectangle &status_rect,
1215 const XRectangle &needed_rect) 1366 const XRectangle &needed_rect)
1216{ 1367{
1217 preedit_rect.x = needed_rect.width; 1368 preedit_rect.x = needed_rect.width;
1218 preedit_rect.y = 0; 1369 preedit_rect.y = 0;
1219 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1370 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1220 preedit_rect.height = TermWin.fheight; 1371 preedit_rect.height = fheight;
1221 1372
1222 status_rect.x = 0; 1373 status_rect.x = 0;
1223 status_rect.y = 0; 1374 status_rect.y = 0;
1224 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1375 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1225 status_rect.height = TermWin.fheight; 1376 status_rect.height = fheight;
1226} 1377}
1227 1378
1228/* Checking whether input method is running. */ 1379/* Checking whether input method is running. */
1229bool 1380bool
1230rxvt_term::IMisRunning () 1381rxvt_term::IMisRunning ()
… …
1258{ 1409{
1259 XPoint nspot; 1410 XPoint nspot;
1260 XVaNestedList preedit_attr; 1411 XVaNestedList preedit_attr;
1261 1412
1262 if (!Input_Context 1413 if (!Input_Context
1263 || !TermWin.focus 1414 || !focus
1264 || !(input_style & XIMPreeditPosition)) 1415 || !(input_style & XIMPreeditPosition))
1265 return; 1416 return;
1266 1417
1267 im_set_position (nspot); 1418 im_set_position (nspot);
1268 1419
… …
1304 XRectangle rect, status_rect, needed_rect; 1455 XRectangle rect, status_rect, needed_rect;
1305 unsigned long fg, bg; 1456 unsigned long fg, bg;
1306 const char *p; 1457 const char *p;
1307 char **s; 1458 char **s;
1308 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1460
1461 TEMP_ENV;
1309 1462
1310 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1311 return false; 1464 return false;
1312 1465
1313 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1541 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1542 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1543 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1391 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1544 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1392 "*", 1545 "*",
1393 TermWin.fheight, 1546 fheight,
1394 TermWin.fheight + 1, TermWin.fheight - 1, 1547 fheight + 1, fheight - 1,
1395 TermWin.fheight - 2, TermWin.fheight + 2); 1548 fheight - 2, fheight + 2);
1396 1549
1397 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1550 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1398 &missing_charset_list, &missing_charset_count, &def_string); 1551 &missing_charset_list, &missing_charset_count, &def_string);
1399 1552
1400 if (missing_charset_list) 1553 if (missing_charset_list)
… …
1446 NULL); 1599 NULL);
1447 } 1600 }
1448 1601
1449 Input_Context = XCreateIC (xim, 1602 Input_Context = XCreateIC (xim,
1450 XNInputStyle, input_style, 1603 XNInputStyle, input_style,
1451 XNClientWindow, TermWin.vt, 1604 XNClientWindow, vt,
1452 XNFocusWindow, TermWin.parent[0], 1605 XNFocusWindow, parent[0],
1453 preedit_attr ? XNPreeditAttributes : NULL, 1606 preedit_attr ? XNPreeditAttributes : NULL,
1454 preedit_attr, 1607 preedit_attr,
1455 status_attr ? XNStatusAttributes : NULL, 1608 status_attr ? XNStatusAttributes : NULL,
1456 status_attr, NULL); 1609 status_attr, NULL);
1457 1610
… …
1474} 1627}
1475 1628
1476void 1629void
1477rxvt_term::im_cb () 1630rxvt_term::im_cb ()
1478{ 1631{
1479 int i, found, had_im; 1632 int i;
1480 const char *p; 1633 const char *p;
1481 char **s; 1634 char **s;
1482 char buf[IMBUFSIZ]; 1635 char buf[IMBUFSIZ];
1636
1637 SET_R (this);
1483 1638
1484 im_destroy (); 1639 im_destroy ();
1485 1640
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1641 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1642 if (Input_Context)
… …
1539{ 1694{
1540 XRectangle preedit_rect, status_rect, *needed_rect; 1695 XRectangle preedit_rect, status_rect, *needed_rect;
1541 XVaNestedList preedit_attr, status_attr; 1696 XVaNestedList preedit_attr, status_attr;
1542 1697
1543 if (!Input_Context 1698 if (!Input_Context
1544 || !TermWin.focus 1699 || !focus
1545 || !(input_style & XIMPreeditArea) 1700 || !(input_style & XIMPreeditArea)
1546 || !IMisRunning ()) 1701 || !IMisRunning ())
1547 return; 1702 return;
1548 1703
1549 /* Getting the necessary width of preedit area */ 1704 /* Getting the necessary width of preedit area */

Diff Legend

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