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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines