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

Diff Legend

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