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.117 by root, Mon Nov 29 01:20:42 2004 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC

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

Diff Legend

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