ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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