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

Diff Legend

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