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

Diff Legend

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