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.119 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 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);
261 free (env_term); 275 free (env_term);
262 free (env_colorfgbg); 276 free (env_colorfgbg);
263 free (locale); 277 free (locale);
278 free (v_buffer);
264 free (incr_buf); 279 free (incr_buf);
265 280
266 delete envv; 281 delete envv;
267 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 ();
268} 299}
269 300
270void 301void
271rxvt_term::destroy () 302rxvt_term::destroy ()
272{ 303{
273 if (destroy_ev.active) 304 if (destroy_ev.active)
274 return; 305 return;
275 306
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
308 return;
309
276#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
277 scr_overlay_off (); 311 scr_overlay_off ();
278#endif 312#endif
279 313
280 if (display) 314 if (display)
… …
282#if USE_XIM 316#if USE_XIM
283 im_ev.stop (display); 317 im_ev.stop (display);
284#endif 318#endif
285#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
286 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
287#endif
288#if MENUBAR
289 menubar_ev.stop (display);
290#endif 321#endif
291#if TRANSPARENT 322#if TRANSPARENT
292 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
293#endif 324#endif
294 incr_ev.stop (); 325 incr_ev.stop ();
… …
318} 349}
319 350
320void 351void
321rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
322{ 353{
323 SET_R (this); 354 make_current ();
324 355
325 delete this; 356 delete this;
326}
327
328/*----------------------------------------------------------------------*/
329/* rxvt_init () */
330bool
331rxvt_term::init (int argc, const char *const *argv)
332{
333 SET_R (this);
334
335 if (!init_vars ())
336 return false;
337
338 init_secondary ();
339
340 const char **cmd_argv = init_resources (argc, argv);
341
342 set_locale ("");
343
344#if MENUBAR_MAX
345 menubar_read (rs[Rs_menu]);
346#endif
347#ifdef HAVE_SCROLLBARS
348 if (options & Opt_scrollBar)
349 scrollBar.setIdle (); /* set existence for size calculations */
350#endif
351
352 create_windows (argc, argv);
353
354 init_xlocale ();
355
356 scr_reset (); /* initialize screen */
357
358#if 0
359 XSynchronize (display->display, True);
360#endif
361
362#ifdef HAVE_SCROLLBARS
363 if (options & Opt_scrollBar)
364 resize_scrollbar (); /* create and map scrollbar */
365#endif
366#if (MENUBAR_MAX)
367 if (menubar_visible ())
368 XMapWindow (display->display, menuBar.win);
369#endif
370#ifdef TRANSPARENT
371 if (options & Opt_transparent)
372 {
373 XSelectInput (display->display, display->root, PropertyChangeMask);
374 check_our_parents ();
375 rootwin_ev.start (display, display->root);
376 }
377#endif
378
379 XMapWindow (display->display, TermWin.vt);
380 XMapWindow (display->display, TermWin.parent[0]);
381
382 set_colorfgbg ();
383
384 init_command (cmd_argv);
385
386 pty_ev.start (pty.pty, EVENT_READ);
387
388 check_ev.start ();
389
390 return true;
391}
392
393static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
394
395void
396rxvt_init ()
397{
398 /*
399 * Save and then give up any super-user privileges
400 * If we need privileges in any area then we must specifically request it.
401 * We should only need to be root in these cases:
402 * 1. write utmp entries on some systems
403 * 2. chown tty on some systems
404 */
405 rxvt_privileges (SAVE);
406 rxvt_privileges (IGNORE);
407
408 signal (SIGHUP, SIG_IGN);
409 signal (SIGPIPE, SIG_IGN);
410
411 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
412 /* signal (SIGURG, SIG_DFL); */
413
414 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
415 // TODO: handle this with exceptions and tolerate the memory loss
416 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
417}
418
419/* ------------------------------------------------------------------------- *
420 * SIGNAL HANDLING & EXIT HANDLER *
421 * ------------------------------------------------------------------------- */
422/*
423 * Catch a SIGCHLD signal and exit if the direct child has died
424 */
425
426void
427rxvt_term::sig_chld (sig_watcher &w)
428{
429 // we are being called for every SIGCHLD, not just ours
430 int pid;
431
432 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
433 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
434 if (pid == (*t)->cmd_pid)
435 {
436 (*t)->destroy ();
437 break;
438 }
439} 357}
440 358
441/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
442/* 360/*
443 * Exit gracefully, clearing the utmp entry and restoring tty attributes 361 * Exit gracefully, clearing the utmp entry and restoring tty attributes
444 * 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
445 */ 363 */
446void 364static XErrorHandler old_xerror_handler;
447rxvt_destroy_all () 365
366static void
367rxvt_emergency_cleanup ()
448{ 368{
449 // TODO: rxvtd should clean up all ressources
450 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++)
451 (*t)->destroy (); 370 (*t)->emergency_cleanup ();
452} 371}
453 372
454/* 373#if ENABLE_FRILLS
455 * Catch a fatal signal and tidy up before quitting 374static void
456 */ 375print_x_error (Display *dpy, XErrorEvent *event)
457void
458rxvt_term::sig_term (sig_watcher &w)
459{ 376{
460#ifdef DEBUG_CMD 377 char buffer[BUFSIZ];
461 rxvt_warn ("caught signal %d, exiting.\n", w.signum); 378 char mesg[BUFSIZ];
462#endif 379 char number[32];
463 rxvt_destroy_all (); 380 char *mtype = "XlibMessage";
464 signal (w.signum, SIG_DFL); 381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
465 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);
466} 419}
420#endif
467 421
468/* INTPROTO */
469int 422int
470rxvt_xerror_handler (Display *display, XErrorEvent *event) 423rxvt_xerror_handler (Display *display, XErrorEvent *event)
471{ 424{
472 if (GET_R->allowedxerror == -1) 425 if (GET_R->allowedxerror == -1)
473 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
474 else 427 else
475 { 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
476 old_xerror_handler (display, event); 434 old_xerror_handler (display, event);
477 GET_R->destroy (); 435#endif
478 } 436 }
479 437
480 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#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#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */
485#endif
486
487 pty = rxvt_new_ptytty ();
488
489 create_windows (argc, argv);
490
491 dDisp;
492
493 init_xlocale ();
494
495 scr_reset (); // initialize screen
496
497#if 0
498 XSynchronize (disp, True);
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */
504#endif
505#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent))
507 {
508 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents ();
510 rootwin_ev.start (display, display->root);
511 }
512#endif
513
514 set_colorfgbg ();
515
516 init_command (cmd_argv);
517
518 free (cmd_argv);
519
520 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ);
522
523 check_ev.start ();
524
525 HOOK_INVOKE ((this, HOOK_START, DT_END));
526
527 XMapWindow (disp, vt);
528 XMapWindow (disp, parent[0]);
529
530 return true;
531}
532
533static struct sig_handlers
534{
535 sig_watcher sw_term, sw_int;
536
537 /*
538 * Catch a fatal signal and tidy up before quitting
539 */
540 void
541 sig_term (sig_watcher &w)
542 {
543#ifdef DEBUG_CMD
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum);
549 }
550
551 sig_handlers ()
552 : sw_term (this, &sig_handlers::sig_term),
553 sw_int (this, &sig_handlers::sig_term)
554 {
555 }
556} sig_handlers;
557
558char **rxvt_environ; // startup environment
559
560void
561rxvt_init ()
562{
563 uid_t uid = getuid ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593
594 rxvt_environ = environ;
595
596 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN);
598
599 sig_handlers.sw_term.start (SIGTERM);
600 sig_handlers.sw_int.start (SIGINT);
601
602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
603 /* signal (SIGURG, SIG_DFL); */
604
605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
606 // TODO: handle this with exceptions and tolerate the memory loss
607 XSetIOErrorHandler (rxvt_xioerror_handler);
608
609 XrmInitialize ();
481} 610}
482 611
483/* ------------------------------------------------------------------------- * 612/* ------------------------------------------------------------------------- *
484 * MEMORY ALLOCATION WRAPPERS * 613 * MEMORY ALLOCATION WRAPPERS *
485 * ------------------------------------------------------------------------- */ 614 * ------------------------------------------------------------------------- */
… …
492 rxvt_fatal ("memory allocation failure. aborting.\n"); 621 rxvt_fatal ("memory allocation failure. aborting.\n");
493 622
494 return p; 623 return p;
495} 624}
496 625
497/* INTPROTO */ 626void *
498void *
499rxvt_calloc (size_t number, size_t size) 627rxvt_calloc (size_t number, size_t size)
500{ 628{
501 void *p = calloc (number, size); 629 void *p = calloc (number, size);
502 630
503 if (!p) 631 if (!p)
504 rxvt_fatal ("memory allocation failure. aborting.\n"); 632 rxvt_fatal ("memory allocation failure. aborting.\n");
505 633
506 return p; 634 return p;
507} 635}
508 636
509/* INTPROTO */ 637void *
510void *
511rxvt_realloc (void *ptr, size_t size) 638rxvt_realloc (void *ptr, size_t size)
512{ 639{
513 void *p = realloc (ptr, size); 640 void *p = realloc (ptr, size);
514 641
515 if (!p) 642 if (!p)
516 rxvt_fatal ("memory allocation failure. aborting.\n"); 643 rxvt_fatal ("memory allocation failure. aborting.\n");
517 644
518 return p; 645 return p;
519} 646}
520
521/* ------------------------------------------------------------------------- *
522 * PRIVILEGED OPERATIONS *
523 * ------------------------------------------------------------------------- */
524/* take care of suid/sgid super-user (root) privileges */
525void
526rxvt_privileges (rxvt_privaction action)
527{
528#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
529 static uid_t euid;
530 static gid_t egid;
531#endif
532
533#if ! defined(__CYGWIN32__)
534# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
535 /* setreuid () is the poor man's setuid (), seteuid () */
536# define seteuid(a) setreuid(-1, (a))
537# define setegid(a) setregid(-1, (a))
538# define HAVE_SETEUID
539# endif
540# ifdef HAVE_SETEUID
541 switch (action)
542 {
543 case IGNORE:
544 /*
545 * change effective uid/gid - not real uid/gid - so we can switch
546 * back to root later, as required
547 */
548 seteuid (getuid ());
549 setegid (getgid ());
550 break;
551 case SAVE:
552 euid = geteuid ();
553 egid = getegid ();
554 break;
555 case RESTORE:
556 seteuid (euid);
557 setegid (egid);
558 break;
559 }
560# else
561 switch (action)
562 {
563 case IGNORE:
564 setuid (getuid ());
565 setgid (getgid ());
566 /* FALLTHROUGH */
567 case SAVE:
568 /* FALLTHROUGH */
569 case RESTORE:
570 break;
571 }
572# endif
573#endif
574}
575
576#ifdef UTMP_SUPPORT
577void
578rxvt_term::privileged_utmp (rxvt_privaction action)
579{
580 if ((options & Opt_utmpInhibit)
581 || !pty.name || !*pty.name)
582 return;
583
584 rxvt_privileges (RESTORE);
585
586 if (action == SAVE)
587 makeutent (pty.name, rs[Rs_display_name]);
588 else
589 cleanutent ();
590
591 rxvt_privileges (IGNORE);
592}
593#endif
594 647
595/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
596/* 649/*
597 * window size/position calculcations for XSizeHint and other storage. 650 * window size/position calculcations for XSizeHint and other storage.
598 * if width/height are non-zero then override calculated width/height 651 * if width/height are non-zero then override calculated width/height
599 */ 652 */
600void 653void
601rxvt_term::window_calc (unsigned int width, unsigned int height) 654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
602{ 655{
603 short recalc_x, recalc_y; 656 short recalc_x, recalc_y;
604 int x, y, sb_w, mb_h, flags; 657 int x, y, sb_w, flags;
605 unsigned int w, h; 658 unsigned int w, h;
606 unsigned int max_width, max_height; 659 unsigned int max_width, max_height;
660 dDisp;
607 661
608 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 TermWin.ncol, TermWin.nrow, szHint.width, 663 ncol, nrow, szHint.width, szHint.height));
610 szHint.height)); 664
611 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
612 szHint.win_gravity = NorthWestGravity; 666 szHint.win_gravity = NorthWestGravity;
613 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
614 668
615 recalc_x = recalc_y = 0; 669 recalc_x = recalc_y = 0;
616 flags = 0; 670 flags = 0;
671
617 if (!parsed_geometry) 672 if (!parsed_geometry)
618 { 673 {
619 parsed_geometry = 1; 674 parsed_geometry = 1;
675
620 if (rs[Rs_geometry]) 676 if (rs[Rs_geometry])
621 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 677 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
678
622 if (flags & WidthValue) 679 if (flags & WidthValue)
623 { 680 {
624 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 681 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
625 szHint.flags |= USSize; 682 szHint.flags |= USSize;
626 } 683 }
684
627 if (flags & HeightValue) 685 if (flags & HeightValue)
628 { 686 {
629 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 687 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
630 szHint.flags |= USSize; 688 szHint.flags |= USSize;
631 } 689 }
690
632 if (flags & XValue) 691 if (flags & XValue)
633 { 692 {
634 szHint.x = x; 693 szHint.x = x;
635 szHint.flags |= USPosition; 694 szHint.flags |= USPosition;
695
636 if (flags & XNegative) 696 if (flags & XNegative)
637 { 697 {
638 recalc_x = 1; 698 recalc_x = 1;
639 szHint.win_gravity = NorthEastGravity; 699 szHint.win_gravity = NorthEastGravity;
640 } 700 }
641 } 701 }
702
642 if (flags & YValue) 703 if (flags & YValue)
643 { 704 {
644 szHint.y = y; 705 szHint.y = y;
645 szHint.flags |= USPosition; 706 szHint.flags |= USPosition;
707
646 if (flags & YNegative) 708 if (flags & YNegative)
647 { 709 {
648 recalc_y = 1; 710 recalc_y = 1;
711
649 if (szHint.win_gravity == NorthEastGravity) 712 if (szHint.win_gravity == NorthEastGravity)
650 szHint.win_gravity = SouthEastGravity; 713 szHint.win_gravity = SouthEastGravity;
651 else 714 else
652 szHint.win_gravity = SouthWestGravity; 715 szHint.win_gravity = SouthWestGravity;
653 } 716 }
654 } 717 }
655 } 718 }
656 719
657 /* TODO: BOUNDS */ 720 /* TODO: BOUNDS */
658 TermWin.width = TermWin.ncol * TermWin.fwidth; 721 width = ncol * fwidth;
659 TermWin.height = TermWin.nrow * TermWin.fheight; 722 height = nrow * fheight;
660 max_width = MAX_COLS * TermWin.fwidth; 723 max_width = MAX_COLS * fwidth;
661 max_height = MAX_ROWS * TermWin.fheight; 724 max_height = MAX_ROWS * fheight;
662 725
663 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 726 szHint.base_width = szHint.base_height = 2 * int_bwidth;
664 727
665 sb_w = mb_h = 0; 728 sb_w = 0;
666 window_vt_x = window_vt_y = TermWin.int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
667 730
668 if (scrollbar_visible ()) 731 if (scrollBar.state)
669 { 732 {
670 sb_w = scrollbar_TotalWidth (); 733 sb_w = scrollbar_TotalWidth ();
671 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
672 if (!(options & Opt_scrollBar_right)) 735 if (!OPTION (Opt_scrollBar_right))
673 window_vt_x += sb_w; 736 window_vt_x += sb_w;
674 } 737 }
675 738
676 if (menubar_visible ())
677 {
678 mb_h = menuBar_TotalHeight ();
679 szHint.base_height += mb_h;
680 window_vt_y += mb_h;
681 }
682
683 szHint.width_inc = TermWin.fwidth; 739 szHint.width_inc = fwidth;
684 szHint.height_inc = TermWin.fheight; 740 szHint.height_inc = fheight;
685 szHint.min_width = szHint.base_width + szHint.width_inc; 741 szHint.min_width = szHint.base_width + szHint.width_inc;
686 szHint.min_height = szHint.base_height + szHint.height_inc; 742 szHint.min_height = szHint.base_height + szHint.height_inc;
687 743
688 if (width && width - szHint.base_width < max_width) 744 if (newwidth && newwidth - szHint.base_width < max_width)
689 { 745 {
690 szHint.width = width; 746 szHint.width = newwidth;
691 TermWin.width = width - szHint.base_width; 747 width = newwidth - szHint.base_width;
692 } 748 }
693 else 749 else
694 { 750 {
695 MIN_IT (TermWin.width, max_width); 751 min_it (width, max_width);
696 szHint.width = szHint.base_width + TermWin.width; 752 szHint.width = szHint.base_width + width;
697 } 753 }
698 754
699 if (height && height - szHint.base_height < max_height) 755 if (newheight && newheight - szHint.base_height < max_height)
700 { 756 {
701 szHint.height = height; 757 szHint.height = newheight;
702 TermWin.height = height - szHint.base_height; 758 height = newheight - szHint.base_height;
703 } 759 }
704 else 760 else
705 { 761 {
706 MIN_IT (TermWin.height, max_height); 762 min_it (height, max_height);
707 szHint.height = szHint.base_height + TermWin.height; 763 szHint.height = szHint.base_height + height;
708 } 764 }
709 765
710 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 766 if (scrollBar.state && OPTION (Opt_scrollBar_right))
711 window_sb_x = szHint.width - sb_w; 767 window_sb_x = szHint.width - sb_w;
712 768
713 if (recalc_x) 769 if (recalc_x)
714 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
715 - szHint.width - 2 * TermWin.ext_bwidth);
716 if (recalc_y) 771 if (recalc_y)
717 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
718 - szHint.height - 2 * TermWin.ext_bwidth);
719 773
720 TermWin.ncol = TermWin.width / TermWin.fwidth; 774 ncol = width / fwidth;
721 TermWin.nrow = TermWin.height / TermWin.fheight; 775 nrow = height / fheight;
722 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
723 TermWin.ncol, TermWin.nrow, szHint.width, 777 ncol, nrow, szHint.width,
724 szHint.height)); 778 szHint.height));
725 return; 779 return;
726} 780}
727 781
728/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
… …
731 * Called after a window size change. 785 * Called after a window size change.
732 */ 786 */
733void 787void
734rxvt_term::tt_winch () 788rxvt_term::tt_winch ()
735{ 789{
736 if (pty.pty < 0) 790 if (pty->pty < 0)
737 return; 791 return;
738 792
739 struct winsize ws; 793 struct winsize ws;
740 794
741 ws.ws_col = TermWin.ncol; 795 ws.ws_col = ncol;
742 ws.ws_row = TermWin.nrow; 796 ws.ws_row = nrow;
743 ws.ws_xpixel = TermWin.width; 797 ws.ws_xpixel = width;
744 ws.ws_ypixel = TermWin.height; 798 ws.ws_ypixel = height;
745 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
746 800
747#if 0 801#if 0
748 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
749 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
750 kill (cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
751#endif 805#endif
752} 806}
753 807
754/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
755/* set_fonts () - load and set the various fonts 809/* set_fonts () - load and set the various fonts
756/* 810 *
757 * init = 1 - initialize 811 * init = 1 - initialize
758 * 812 *
759 * fontname == FONT_UP - switch to bigger font 813 * fontname == FONT_UP - switch to bigger font
760 * fontname == FONT_DN - switch to smaller font 814 * fontname == FONT_DN - switch to smaller font
761 */ 815 */
… …
773 return false; 827 return false;
774 } 828 }
775 829
776#if ENABLE_STYLES 830#if ENABLE_STYLES
777 for (int i = RS_styleCount; --i; ) 831 for (int i = RS_styleCount; --i; )
778 if (TermWin.fontset[i] != TermWin.fontset[0]) 832 if (fontset[i] != fontset[0])
779 delete TermWin.fontset[i]; 833 delete fontset[i];
780#endif 834#endif
781 835
782 delete TermWin.fontset[0]; 836 delete fontset[0];
783 TermWin.fontset[0] = fs; 837 fontset[0] = fs;
784 838
785 prop = (*fs)[1]->properties (); 839 prop = (*fs)[1]->properties ();
840 prop.height += lineSpace;
786 fs->set_prop (prop); 841 fs->set_prop (prop);
787 842
788 TermWin.fwidth = prop.width; 843 fwidth = prop.width;
789 TermWin.fheight = prop.height; 844 fheight = prop.height;
790 TermWin.fweight = prop.weight; 845 fbase = prop.ascent;
791 TermWin.fslant = prop.slant;
792 TermWin.fbase = (*fs)[1]->ascent;
793 846
794 for (int style = 1; style < 4; style++) 847 for (int style = 1; style < 4; style++)
795 { 848 {
796#if ENABLE_STYLES 849#if ENABLE_STYLES
797 const char *res = rs[Rs_font + style]; 850 const char *res = rs[Rs_font + style];
798 851
799 if (res && !*res) 852 if (res && !*res)
800 TermWin.fontset[style] = TermWin.fontset[0]; 853 fontset[style] = fontset[0];
801 else 854 else
802 { 855 {
803 TermWin.fontset[style] = fs = new rxvt_fontset (this); 856 fontset[style] = fs = new rxvt_fontset (this);
804 rxvt_fontprop prop2 = prop; 857 rxvt_fontprop prop2 = prop;
805 858
806 if (res) 859 if (res)
807 prop2.weight = prop2.slant = rxvt_fontprop::unset; 860 prop2.weight = prop2.slant = rxvt_fontprop::unset;
808 else 861 else
809 { 862 {
810 res = TermWin.fontset[0]->fontdesc; 863 res = fontset[0]->fontdesc;
811 864
812 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 865 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
813 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 866 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
814 } 867 }
815 868
816 fs->populate (res); 869 fs->populate (res);
817 fs->set_prop (prop2); 870 fs->set_prop (prop2);
818 } 871 }
819#else 872#else
820 TermWin.fontset[style] = TermWin.fontset[0]; 873 fontset[style] = fontset[0];
821#endif 874#endif
822 } 875 }
823 876
824 if (TermWin.parent[0]) 877 if (parent[0])
825 { 878 {
826 resize_all_windows (0, 0, 0); 879 resize_all_windows (0, 0, 0);
827 scr_remap_chars (); 880 scr_remap_chars ();
828 scr_touch (true); 881 scr_touch (true);
829 } 882 }
… …
831 return true; 884 return true;
832} 885}
833 886
834void rxvt_term::set_string_property (Atom prop, const char *str, int len) 887void rxvt_term::set_string_property (Atom prop, const char *str, int len)
835{ 888{
836 // TODO: SMART_WINDOW_TITLE
837 XChangeProperty (display->display, TermWin.parent[0], 889 XChangeProperty (display->display, parent[0],
838 prop, XA_STRING, 8, PropModeReplace, 890 prop, XA_STRING, 8, PropModeReplace,
839 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 891 (const unsigned char *)str, len >= 0 ? len : strlen (str));
840} 892}
841 893
842void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
843{ 895{
844 // TODO: SMART_WINDOW_TITLE
845 wchar_t *ws = rxvt_mbstowcs (str, len); 896 wchar_t *ws = rxvt_mbstowcs (str, len);
846 char *s = rxvt_wcstoutf8 (ws); 897 char *s = rxvt_wcstoutf8 (ws);
847 898
848 XChangeProperty (display->display, TermWin.parent[0], 899 XChangeProperty (display->display, parent[0],
849 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
850 (const unsigned char *)s, strlen (s)); 901 (const unsigned char *)s, strlen (s));
851 902
852 free (s); 903 free (s);
853 free (ws); 904 free (ws);
… …
858/* xterm sequences - title, iconName, color (exptl) */ 909/* xterm sequences - title, iconName, color (exptl) */
859void 910void
860rxvt_term::set_title (const char *str) 911rxvt_term::set_title (const char *str)
861{ 912{
862 set_string_property (XA_WM_NAME, str); 913 set_string_property (XA_WM_NAME, str);
863#if ENABLE_FRILLS 914#if ENABLE_EWMH
864 set_utf8_property (display->atom ("_NET_WM_NAME"), str); 915 set_utf8_property (xa[XA_NET_WM_NAME], str);
865#endif 916#endif
866} 917}
867 918
868void 919void
869rxvt_term::set_icon_name (const char *str) 920rxvt_term::set_icon_name (const char *str)
870{ 921{
871 set_string_property (XA_WM_ICON_NAME, str); 922 set_string_property (XA_WM_ICON_NAME, str);
872#if ENABLE_FRILLS 923#if ENABLE_EWMH
873 set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str); 924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
874#endif 925#endif
875} 926}
876 927
877#ifdef XTERM_COLOR_CHANGE 928#ifdef XTERM_COLOR_CHANGE
878void 929void
… …
886 937
887 /* handle color aliases */ 938 /* handle color aliases */
888 if (isdigit (*color)) 939 if (isdigit (*color))
889 { 940 {
890 i = atoi (color); 941 i = atoi (color);
942
891 if (i >= 8 && i <= 15) 943 if (i >= 8 && i <= 15)
892 { /* bright colors */ 944 { /* bright colors */
893 i -= 8; 945 i -= 8;
894# ifndef NO_BRIGHTCOLOR
895 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
896 SET_PIXCOLOR (idx); 947 SET_PIXCOLOR (idx);
897 goto Done; 948 goto done;
898# endif
899
900 } 949 }
950
901 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
902 { /* normal colors */ 952 { /* normal colors */
903 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
904 SET_PIXCOLOR (idx); 954 SET_PIXCOLOR (idx);
905 goto Done; 955 goto done;
906 } 956 }
907 } 957 }
908 958
909 if (!rXParseAllocColor (& xcol, color)) 959 if (!rXParseAllocColor (&xcol, color))
910 return; 960 return;
911 961
912 /* XStoreColor (display->display, display->cmap, XColor*); */ 962 /* XStoreColor (display->display, display->cmap, XColor*); */
913 963
914 /* 964 /*
… …
930 pix_colors_focused[idx] = xcol; 980 pix_colors_focused[idx] = xcol;
931 SET_PIXCOLOR (idx); 981 SET_PIXCOLOR (idx);
932 982
933 /* XSetWindowAttributes attr; */ 983 /* XSetWindowAttributes attr; */
934 /* Cursor cursor; */ 984 /* Cursor cursor; */
935Done: 985done:
986
936#ifdef OFF_FOCUS_FADING 987#if OFF_FOCUS_FADING
937 if (rs[Rs_fade]) 988 if (rs[Rs_fade])
938 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
939#endif 990#endif
940 991
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
942 993
943 recolour_cursor (); 994 recolour_cursor ();
… …
997 1048
998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
999} 1050}
1000 1051
1001/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1002/*
1003 * Colour determination for low colour displays, routine from
1004 * Hans de Goede <hans@highrise.nl>
1005 */
1006 1053
1007int 1054int
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1009{ 1056{
1010 if (!screen_in_out->set (display, colour)) 1057 if (!screen_in_out->set (display, colour))
… …
1018 1065
1019/* -------------------------------------------------------------------- * 1066/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1067 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1068 * -------------------------------------------------------------------- */
1022void 1069void
1023rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 1071{
1025 int fix_screen; 1072 int fix_screen;
1026
1027#ifdef SMART_RESIZE
1028 int old_width = szHint.width, old_height = szHint.height; 1073 int old_width = szHint.width, old_height = szHint.height;
1029#endif 1074 dDisp;
1030 1075
1031 window_calc (width, height); 1076 window_calc (newwidth, newheight);
1032 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1077 XSetWMNormalHints (disp, parent[0], &szHint);
1033 1078
1034 if (!ignoreparent) 1079 if (!ignoreparent)
1035 { 1080 {
1036#ifdef SMART_RESIZE 1081#ifdef SMART_RESIZE
1037 /* 1082 /*
… …
1041 int x, y, x1, y1; 1086 int x, y, x1, y1;
1042 int dx, dy; 1087 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 1089 Window unused_cr;
1045 1090
1046 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1091 XTranslateCoordinates (disp, parent[0], display->root,
1047 0, 0, &x, &y, &unused_cr); 1092 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 1095 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 1096 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 1097 * our position for handles and decorations. Counter it
1053 */ 1098 */
… …
1055 { 1100 {
1056 x -= x1; 1101 x -= x1;
1057 y -= y1; 1102 y -= y1;
1058 } 1103 }
1059 1104
1060 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1061 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1062 dx = old_width - szHint.width; 1107 dx = old_width - szHint.width;
1063 dy = old_height - szHint.height; 1108 dy = old_height - szHint.height;
1064 1109
1065 /* Check position of the center of the window */ 1110 /* Check position of the center of the window */
1066 if (x < x1) /* left half */ 1111 if (x < x1) /* left half */
… …
1070 if (y < y1) /* top half */ 1115 if (y < y1) /* top half */
1071 dy = 0; 1116 dy = 0;
1072 else if (y == y1) /* exact center */ 1117 else if (y == y1) /* exact center */
1073 dy /= 2; 1118 dy /= 2;
1074 1119
1075 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1076 szHint.width, szHint.height); 1121 szHint.width, szHint.height);
1077#else 1122#else
1078 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1079#endif 1124#endif
1080 } 1125 }
1081 1126
1082 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 1128
1084 if (fix_screen || width != old_width || height != old_height) 1129 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 1130 {
1086 if (scrollbar_visible ()) 1131 if (scrollBar.state)
1087 { 1132 {
1088 XMoveResizeWindow (display->display, scrollBar.win, 1133 XMoveResizeWindow (disp, scrollBar.win,
1089 window_sb_x, 0, 1134 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height); 1135 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar (); 1136 resize_scrollbar ();
1092 } 1137 }
1093 1138
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, 1139 XMoveResizeWindow (disp, vt,
1100 window_vt_x, window_vt_y, 1140 window_vt_x, window_vt_y,
1101 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1141 width, height);
1142
1102 scr_clear (); 1143 scr_clear ();
1103#ifdef XPM_BACKGROUND 1144#ifdef XPM_BACKGROUND
1104 resize_pixmap (); 1145 resize_pixmap ();
1105#endif 1146#endif
1106 } 1147 }
… …
1111 int old_ncol = prev_ncol; 1152 int old_ncol = prev_ncol;
1112 1153
1113 /* scr_reset only works on the primary screen */ 1154 /* scr_reset only works on the primary screen */
1114 if (old_height) /* this is not the first time through */ 1155 if (old_height) /* this is not the first time through */
1115 { 1156 {
1116 unsigned int ncol = TermWin.ncol; 1157 unsigned int ocol = ncol;
1117 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1118 curr_screen = scr_change_screen (PRIMARY); 1159 curr_screen = scr_change_screen (PRIMARY);
1119 TermWin.ncol = ncol; 1160 ncol = ocol;
1120 } 1161 }
1121 1162
1122 scr_reset (); 1163 scr_reset ();
1123 1164
1124 if (curr_screen >= 0) /* this is not the first time through */ 1165 if (curr_screen >= 0) /* this is not the first time through */
1125 { 1166 {
1126 scr_change_screen (curr_screen); 1167 scr_change_screen (curr_screen);
1127 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1168 selection_check (old_ncol != ncol ? 4 : 0);
1128 } 1169 }
1129 } 1170 }
1130 1171
1131 old_width = szHint.width; 1172 old_width = szHint.width;
1132 old_height = szHint.height; 1173 old_height = szHint.height;
1174
1175#ifdef XPM_BACKGROUND
1176 if (pixmap)
1177 scr_touch (false);
1178#endif
1133 1179
1134#ifdef USE_XIM 1180#ifdef USE_XIM
1135 IMSetStatusPosition (); 1181 IMSetStatusPosition ();
1136#endif 1182#endif
1137} 1183}
… …
1139/* 1185/*
1140 * Set the width/height of the vt window in characters. Units are pixels. 1186 * Set the width/height of the vt window in characters. Units are pixels.
1141 * good for toggling 80/132 columns 1187 * good for toggling 80/132 columns
1142 */ 1188 */
1143void 1189void
1144rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1190rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1145{ 1191{
1146 XWindowAttributes wattr; 1192 XWindowAttributes wattr;
1147 1193
1148 if (width == 0 || height == 0) 1194 if (newwidth == 0 || newheight == 0)
1149 { 1195 {
1150 XGetWindowAttributes (display->display, display->root, &wattr); 1196 XGetWindowAttributes (display->display, display->root, &wattr);
1197
1151 if (width == 0) 1198 if (newwidth == 0)
1152 width = wattr.width - szHint.base_width; 1199 newwidth = wattr.width - szHint.base_width;
1153 if (height == 0) 1200 if (newheight == 0)
1154 height = wattr.height - szHint.base_height; 1201 newheight = wattr.height - szHint.base_height;
1155 }
1156
1157 if (width != TermWin.width || height != TermWin.height)
1158 { 1202 }
1203
1204 if (newwidth != width || newheight != height)
1205 {
1159 width += szHint.base_width; 1206 newwidth += szHint.base_width;
1160 height += szHint.base_height; 1207 newheight += szHint.base_height;
1161 resize_all_windows (width, height, 0); 1208 resize_all_windows (newwidth, newheight, 0);
1162 } 1209 }
1163} 1210}
1164 1211
1165/* -------------------------------------------------------------------- * 1212/* -------------------------------------------------------------------- *
1166 * - X INPUT METHOD ROUTINES - * 1213 * - X INPUT METHOD ROUTINES - *
… …
1176 1223
1177void 1224void
1178rxvt_term::im_set_size (XRectangle &size) 1225rxvt_term::im_set_size (XRectangle &size)
1179{ 1226{
1180 // the int_bwidth terms make no sense to me 1227 // the int_bwidth terms make no sense to me
1181 size.x = TermWin.int_bwidth; 1228 size.x = int_bwidth;
1182 size.y = TermWin.int_bwidth; 1229 size.y = int_bwidth;
1183 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1230 size.width = Width2Pixel (ncol) + int_bwidth;
1184 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1231 size.height = Height2Pixel (nrow) + int_bwidth;
1185} 1232}
1186 1233
1187void 1234void
1188rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1189 XRectangle &status_rect, 1236 XRectangle &status_rect,
1190 const XRectangle &needed_rect) 1237 const XRectangle &needed_rect)
1191{ 1238{
1192 preedit_rect.x = needed_rect.width; 1239 preedit_rect.x = needed_rect.width;
1193 preedit_rect.y = 0; 1240 preedit_rect.y = 0;
1194 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1241 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1195 preedit_rect.height = TermWin.fheight; 1242 preedit_rect.height = fheight;
1196 1243
1197 status_rect.x = 0; 1244 status_rect.x = 0;
1198 status_rect.y = 0; 1245 status_rect.y = 0;
1199 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1200 status_rect.height = TermWin.fheight; 1247 status_rect.height = fheight;
1201} 1248}
1202 1249
1203/* Checking whether input method is running. */ 1250/* Checking whether input method is running. */
1204bool 1251bool
1205rxvt_term::IMisRunning () 1252rxvt_term::IMisRunning ()
… …
1233{ 1280{
1234 XPoint nspot; 1281 XPoint nspot;
1235 XVaNestedList preedit_attr; 1282 XVaNestedList preedit_attr;
1236 1283
1237 if (!Input_Context 1284 if (!Input_Context
1238 || !TermWin.focus 1285 || !focus
1239 || !(input_style & XIMPreeditPosition)) 1286 || !(input_style & XIMPreeditPosition))
1240 return; 1287 return;
1241 1288
1242 im_set_position (nspot); 1289 im_set_position (nspot);
1243 1290
… …
1279 XRectangle rect, status_rect, needed_rect; 1326 XRectangle rect, status_rect, needed_rect;
1280 unsigned long fg, bg; 1327 unsigned long fg, bg;
1281 const char *p; 1328 const char *p;
1282 char **s; 1329 char **s;
1283 XIMStyles *xim_styles; 1330 XIMStyles *xim_styles;
1331
1332 set_environ (envv);
1284 1333
1285 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1286 return false; 1335 return false;
1287 1336
1288 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1363 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1364 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1414 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1415 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "*", 1416 "*",
1368 TermWin.fheight, 1417 fheight,
1369 TermWin.fheight + 1, TermWin.fheight - 1, 1418 fheight + 1, fheight - 1,
1370 TermWin.fheight - 2, TermWin.fheight + 2); 1419 fheight - 2, fheight + 2);
1371 1420
1372 fs = XCreateFontSet (display->display, pat, 1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1373 &missing_charset_list, &missing_charset_count, &def_string); 1422 &missing_charset_list, &missing_charset_count, &def_string);
1374 1423
1375 if (missing_charset_list) 1424 if (missing_charset_list)
1376 XFreeStringList (missing_charset_list); 1425 XFreeStringList (missing_charset_list);
1377 1426
… …
1421 NULL); 1470 NULL);
1422 } 1471 }
1423 1472
1424 Input_Context = XCreateIC (xim, 1473 Input_Context = XCreateIC (xim,
1425 XNInputStyle, input_style, 1474 XNInputStyle, input_style,
1426 XNClientWindow, TermWin.vt, 1475 XNClientWindow, vt,
1427 XNFocusWindow, TermWin.parent[0], 1476 XNFocusWindow, parent[0],
1428 preedit_attr ? XNPreeditAttributes : NULL, 1477 preedit_attr ? XNPreeditAttributes : NULL,
1429 preedit_attr, 1478 preedit_attr,
1430 status_attr ? XNStatusAttributes : NULL, 1479 status_attr ? XNStatusAttributes : NULL,
1431 status_attr, NULL); 1480 status_attr, NULL);
1432 1481
… …
1449} 1498}
1450 1499
1451void 1500void
1452rxvt_term::im_cb () 1501rxvt_term::im_cb ()
1453{ 1502{
1454 int i, found, had_im; 1503 int i;
1455 const char *p; 1504 const char *p;
1456 char **s; 1505 char **s;
1457 char buf[IMBUFSIZ]; 1506 char buf[IMBUFSIZ];
1507
1508 make_current ();
1458 1509
1459 im_destroy (); 1510 im_destroy ();
1460 1511
1461 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1462 if (Input_Context) 1513 if (Input_Context)
… …
1514{ 1565{
1515 XRectangle preedit_rect, status_rect, *needed_rect; 1566 XRectangle preedit_rect, status_rect, *needed_rect;
1516 XVaNestedList preedit_attr, status_attr; 1567 XVaNestedList preedit_attr, status_attr;
1517 1568
1518 if (!Input_Context 1569 if (!Input_Context
1519 || !TermWin.focus 1570 || !focus
1520 || !(input_style & XIMPreeditArea) 1571 || !(input_style & XIMPreeditArea)
1521 || !IMisRunning ()) 1572 || !IMisRunning ())
1522 return; 1573 return;
1523 1574
1524 /* Getting the necessary width of preedit area */ 1575 /* Getting the necessary width of preedit area */
… …
1539 XFree (preedit_attr); 1590 XFree (preedit_attr);
1540 XFree (status_attr); 1591 XFree (status_attr);
1541} 1592}
1542#endif /* USE_XIM */ 1593#endif /* USE_XIM */
1543 1594
1544/*----------------------------------------------------------------------*/
1545rxvt_t rxvt_current_term;
1546
1547/*----------------------- end-of-file (C source) -----------------------*/ 1595/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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