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

Diff Legend

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