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

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

Diff Legend

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