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

Diff Legend

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