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

Diff Legend

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