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