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

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