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