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