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

Diff Legend

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