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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.338 by root, Tue Dec 7 19:47:02 2010 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 { 111 {
111 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
113 } 114 }
152 153
153} 154}
154#endif 155#endif
155 156
156rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
157 : 158{
159#if HAVE_BG_PIXMAP
160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 179#endif
161#if HAVE_BG_PIXMAP 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 181#ifdef USE_XIM
163#endif 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 183#endif
182#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 186#endif
188#ifndef NO_BELL 187#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 189#endif
191 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 197
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 199
202 termlist.push_back (this); 200 termlist.push_back (this);
203 201
204#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
229 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
230 delete fontset[i]; 228 delete fontset[i];
231#endif 229#endif
232 delete fontset[0]; 230 delete fontset[0];
233 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
234 if (display) 242 if (display)
235 { 243 {
236 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
237 246
238#ifdef USE_XIM 247#ifdef USE_XIM
239 im_destroy (); 248 im_destroy ();
240#endif 249#endif
241#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
266 252
267 delete drawable; 253 delete drawable;
268 // destroy all windows 254 // destroy all windows
269 if (parent[0]) 255 if (parent[0])
277 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
278#endif 264#endif
279 } 265 }
280 266
281 clear (); 267 clear ();
282 }
283 268
284 delete [] pix_colors_focused; 269 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 bgPixmap.destroy ();
290 displays.put (display); 270 displays.put (display);
271 }
291 272
292 scr_release (); 273 scr_release ();
293 274
294 /* clear all resources */ 275 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 277 free (allocated [i]);
297 278
298 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
300 free (env_display); 282 free (env_display);
301 free (env_term); 283 free (env_term);
302 free (locale); 284 free (locale);
303 free (v_buffer); 285 free (v_buffer);
307 delete argv; 289 delete argv;
308 290
309#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
310 delete keyboard; 292 delete keyboard;
311#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
312} 297}
313 298
314// child has exited, usually destroys 299// child has exited, usually destroys
315void 300void
316rxvt_term::child_cb (ev::child &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
324} 309}
325 310
326void 311void
327rxvt_term::destroy () 312rxvt_term::destroy ()
328{ 313{
329 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
330 return; 315 return;
331 316
332 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
333 318
334#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
338 if (display) 323 if (display)
339 { 324 {
340#if USE_XIM 325#if USE_XIM
341 im_ev.stop (display); 326 im_ev.stop (display);
342#endif 327#endif
343#if HAVE_SCROLLBARS
344 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
345#endif
346#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
347 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
348#endif 331#endif
349 incr_ev.stop (); 332 incr_ev.stop ();
350 termwin_ev.stop (display); 333 termwin_ev.stop (display);
351 vt_ev.stop (display); 334 vt_ev.stop (display);
352 } 335 }
353 336
354 prepare_ev.stop (); 337 flush_ev.stop ();
355 pty_ev.stop (); 338 pty_ev.stop ();
356#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
357 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
358#endif 341#endif
359#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
376rxvt_term::destroy_cb (ev::idle &w, int revents) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
377{ 360{
378 make_current (); 361 make_current ();
379 362
380 delete this; 363 delete this;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
381} 376}
382 377
383/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
384/* 379/*
385 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
402 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
403 char number[32]; 398 char number[32];
404 char *mtype = "XlibMessage"; 399 char *mtype = "XlibMessage";
405 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
407 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
408 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
409 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
411 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
412 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
413 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
414 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
415 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
416 mesg, BUFSIZ); 411 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
418 } 413 }
419 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
420 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
421 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
422 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
423 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
424 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
425 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
426 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
427 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
428 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
429 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
430 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
431 mesg, BUFSIZ); 426 mesg, BUFSIZ);
432 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
433 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
434 mesg, BUFSIZ); 429 mesg, BUFSIZ);
435 else 430 else
436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
437 mesg, BUFSIZ); 432 mesg, BUFSIZ);
438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
439 } 434 }
440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
441 mesg, BUFSIZ); 436 mesg, BUFSIZ);
442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
443} 438}
444#endif 439#endif
445 440
446int 441int
469 DisplayString (display)); 464 DisplayString (display));
470 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
471 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
472} 467}
473 468
474/*----------------------------------------------------------------------*/
475bool
476rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
477{
478 this->envv = envv;
479
480 SET_R (this);
481 set_locale ("");
482 set_environ (envv); // few things in X do not call setlocale :(
483
484 if (!init_vars ())
485 return false;
486
487 init_secondary ();
488
489 const char **cmd_argv = init_resources (argc, argv);
490
491#ifdef KEYSYM_RESOURCE
492 keyboard->register_done ();
493#endif
494
495#ifdef HAVE_SCROLLBARS
496 if (option (Opt_scrollBar))
497 scrollBar.setIdle (); /* set existence for size calculations */
498#endif
499
500 pty = ptytty::create ();
501
502 create_windows (argc, argv);
503
504 init_xlocale ();
505
506 scr_reset (); // initialize screen
507
508#if 0
509 XSynchronize (dpy, True);
510#endif
511
512#ifdef HAVE_SCROLLBARS
513 if (option (Opt_scrollBar))
514 resize_scrollbar (); /* create and map scrollbar */
515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
520#ifdef ENABLE_TRANSPARENCY
521 if (option (Opt_transparent))
522 {
523 bgPixmap.set_transparent ();
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap] != NULL)
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != NULL)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
562#endif
563
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty->pty >= 0)
571 pty_ev.start (pty->pty, ev::READ);
572
573 prepare_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589
590 return true;
591}
592
593static struct sig_handlers 469static struct sig_handlers
594{ 470{
595 ev::sig sw_term, sw_int; 471 ev::sig sw_term, sw_int;
596 472
597 /* 473 /*
598 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
599 */ 475 */
600 void
601 sig_term (ev::sig &w, int revents) 476 void sig_term (ev::sig &w, int revents);
477
478 sig_handlers ()
602 { 479 {
603 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
604 w.stop ();
605 kill (getpid (), w.signum);
606 }
607
608 sig_handlers ()
609 : sw_term (this, &sig_handlers::sig_term),
610 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
611 {
612 } 482 }
613} sig_handlers; 483} sig_handlers;
614 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
615char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
616 561
617void 562void
618rxvt_init () 563rxvt_init ()
619{ 564{
620 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
621 567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
622 if (!ev::ev_default_loop (0)) 574 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 576
625 rxvt_environ = environ; 577 rxvt_environ = environ;
626 578
627 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
629 581
630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 584
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
639 588
640 XrmInitialize (); 589 XrmInitialize ();
641}
642
643/* ------------------------------------------------------------------------- *
644 * MEMORY ALLOCATION WRAPPERS *
645 * ------------------------------------------------------------------------- */
646void *
647rxvt_malloc (size_t size)
648{
649 void *p = malloc (size);
650
651 if (!p)
652 rxvt_fatal ("memory allocation failure. aborting.\n");
653
654 return p;
655}
656
657void *
658rxvt_calloc (size_t number, size_t size)
659{
660 void *p = calloc (number, size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_realloc (void *ptr, size_t size)
670{
671 void *p = realloc (ptr, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677} 590}
678 591
679/*----------------------------------------------------------------------*/ 592/*----------------------------------------------------------------------*/
680/* 593/*
681 * window size/position calculations for XSizeHint and other storage. 594 * window size/position calculations for XSizeHint and other storage.
683 */ 596 */
684void 597void
685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
686{ 599{
687 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
688 int x, y, sb_w, flags; 601 int x, y, flags;
689 unsigned int w, h; 602 unsigned int w, h;
690 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
691 604
692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
693 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
703 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
704 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
705 618
706 if (flags & WidthValue) 619 if (flags & WidthValue)
707 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
708 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 625 szHint.flags |= USSize;
710 } 626 }
711 627
712 if (flags & HeightValue) 628 if (flags & HeightValue)
713 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
714 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 634 szHint.flags |= USSize;
716 } 635 }
717 636
718 if (flags & XValue) 637 if (flags & XValue)
719 { 638 {
750 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
751 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
752 671
753 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
754 673
755 sb_w = 0;
756 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
757 675
758 if (scrollBar.state) 676 if (scrollBar.state)
759 { 677 {
760 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
761 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
762 680
763 if (!option (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
764 window_vt_x += sb_w; 682 window_vt_x += sb_w;
765 } 683 }
789 { 707 {
790 min_it (height, max_height); 708 min_it (height, max_height);
791 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
792 } 710 }
793 711
794 if (scrollBar.state && option (Opt_scrollBar_right))
795 window_sb_x = szHint.width - sb_w;
796
797 if (recalc_x) 712 if (recalc_x)
798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799 714
800 if (recalc_y) 715 if (recalc_y)
801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
802 717
803 ncol = width / fwidth; 718 ncol = width / fwidth;
804 nrow = height / fheight; 719 nrow = height / fheight;
805} 720}
806 721
807/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
808/* 723/*
819 734
820 ws.ws_col = ncol; 735 ws.ws_col = ncol;
821 ws.ws_row = nrow; 736 ws.ws_row = nrow;
822 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
823 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
825 740
826#if 0 741#if 0
827 // TIOCSWINSZ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
828 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
829 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
830#endif 745#endif
831} 746}
832 747
859#endif 774#endif
860 775
861 delete fontset[0]; 776 delete fontset[0];
862 fontset[0] = fs; 777 fontset[0] = fs;
863 778
864 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
865 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
866 782
867 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
868 784
869 fwidth = prop.width; 785 fwidth = prop.width;
870 fheight = prop.height; 786 fheight = prop.height;
920 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
921 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
922} 838}
923 839
924void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
925rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
926{ 854{
927 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
928 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
929 857
939/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
940/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
941void 869void
942rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
943{ 871{
944 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
945#if ENABLE_EWMH 873#if ENABLE_EWMH
946 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
947#endif 875#endif
948} 876}
949 877
950void 878void
951rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
952{ 880{
953 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
954#if ENABLE_EWMH 882#if ENABLE_EWMH
955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
956#endif 884#endif
957} 885}
958 886
959void 887void
960rxvt_term::set_window_color (int idx, const char *color) 888rxvt_term::set_window_color (int idx, const char *color)
961{ 889{
962#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
963 rxvt_color xcol; 891 rxvt_color xcol;
964 int i;
965 892
966 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
967 return; 894 return;
968 895
969 color = strdup (color); 896 color = strdup (color);
971 rs[Rs_color + idx] = color; 898 rs[Rs_color + idx] = color;
972 899
973 /* handle color aliases */ 900 /* handle color aliases */
974 if (isdigit (*color)) 901 if (isdigit (*color))
975 { 902 {
976 i = atoi (color); 903 int i = atoi (color);
977 904
978 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
906 {
979 { /* bright colors */ 907 /* bright colors */
980 i -= 8;
981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
982 goto done; 909 goto done;
983 } 910 }
984 911
985 if (i >= 0 && i <= 7) 912 if (i >= 0 && i <= 7)
913 {
986 { /* normal colors */ 914 /* normal colors */
987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
988 goto done; 916 goto done;
989 } 917 }
990 } 918 }
991 919
996 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
997 */ 925 */
998 926
999 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
1000 928
1001 /* XSetWindowAttributes attr; */
1002 /* Cursor cursor; */
1003done: 929done:
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 930 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 931
1006 update_fade_color (idx); 932 update_fade_color (idx);
1007 recolour_cursor (); 933 recolour_cursor ();
1031 */ 957 */
1032void 958void
1033rxvt_term::set_colorfgbg () 959rxvt_term::set_colorfgbg ()
1034{ 960{
1035 unsigned int i; 961 unsigned int i;
1036 const char *xpmb = "\0"; 962 const char *xpmb = "";
1037 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1038 964
1039 strcpy (fstr, "default"); 965 strcpy (fstr, "default");
1040 strcpy (bstr, "default"); 966 strcpy (bstr, "default");
1041 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
1086 int old_width = szHint.width; 1012 int old_width = szHint.width;
1087 int old_height = szHint.height; 1013 int old_height = szHint.height;
1088 1014
1089 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1090 1016
1091 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1092 XSetWMNormalHints (dpy, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1093 1026
1094 if (!ignoreparent) 1027 if (!ignoreparent)
1095 { 1028 {
1096#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1097 /* 1030 /*
1137#else 1070#else
1138 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1139#endif 1072#endif
1140 } 1073 }
1141 1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1077
1142 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1143 1079
1144 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1145 { 1081 {
1146 if (scrollBar.state) 1082 if (scrollBar.state)
1147 { 1083 scrollBar.resize ();
1148 XMoveResizeWindow (dpy, scrollBar.win,
1149 window_sb_x, 0,
1150 scrollbar_TotalWidth (), szHint.height);
1151 resize_scrollbar ();
1152 }
1153 1084
1154 XMoveResizeWindow (dpy, vt, 1085 XMoveResizeWindow (dpy, vt,
1155 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1156 width, height); 1087 width, height);
1157 1088
1158#ifdef HAVE_BG_PIXMAP 1089#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ()) 1090 if (bgPixmap.window_size_sensitive ())
1160 update_background (); 1091 update_background ();
1161#endif 1092#endif
1162
1163 scr_clear ();
1164 } 1093 }
1165 1094
1166 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1167 scr_reset (); 1096 scr_reset ();
1168
1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1170 //scr_touch (false);
1171 1097
1172#ifdef HAVE_BG_PIXMAP 1098#ifdef HAVE_BG_PIXMAP
1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174// if (bgPixmap.pixmap) 1100// if (bgPixmap.pixmap)
1175// scr_touch (false); 1101// scr_touch (false);
1247 1173
1248/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1249bool 1175bool
1250rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1251{ 1177{
1252 char *p;
1253 Atom atom; 1178 Atom atom;
1254 Window win; 1179 Window win;
1255 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1256 1181
1257 /* get current locale modifier */ 1182 /* get current locale modifier */
1258 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1259 { 1184 {
1260 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1261 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1262 1187
1263 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1264 *p = '\0'; 1189 *p = '\0';
1265 1190
1266 atom = XInternAtom (dpy, server, False); 1191 atom = XInternAtom (dpy, server, False);
1267 win = XGetSelectionOwner (dpy, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1268 1193
1335 1260
1336 term->make_current (); 1261 term->make_current ();
1337 1262
1338 if (text) 1263 if (text)
1339 { 1264 {
1340 void *str; 1265 wchar_t *str;
1341 1266
1342 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1343 { 1268 {
1344 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1345 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1347 1272
1348 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1349 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1350 1275
1351 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1353 } 1278 }
1354 else 1279 else
1355 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1356 1281
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
1714void 1639void
1715rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1716{ 1641{
1717 Window cr; 1642 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720} 1644}
1721 1645
1722Pixmap 1646Pixmap
1723rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (int prop_id)
1724{ 1648{
1731 unsigned char *prop = NULL; 1655 unsigned char *prop = NULL;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop); 1658 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP) 1659 if (result == Success && prop && atype == XA_PIXMAP)
1736 {
1737 return *(Pixmap *)prop; 1660 return *(Pixmap *)prop;
1738 }
1739 } 1661 }
1662
1740 return None; 1663 return None;
1741} 1664}
1742 1665
1743#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS 1667
1745# undef update_background 1668void
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background () 1669rxvt_term::update_background ()
1754{ 1670{
1671 if (update_background_ev.is_active ())
1672 return;
1673
1755 bgPixmap.invalidate (); 1674 bgPixmap.invalidate ();
1756 1675
1757 /* no chance of real time refresh if we are blurring! */ 1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1677
1678 if (to_wait <= 0.)
1759 bgPixmap.render (); 1679 bgPixmap.render ();
1760 else 1680 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05); 1681 update_background_ev.start (to_wait);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773} 1682}
1774 1683
1775void 1684void
1776rxvt_term::update_background_cb (ev::timer &w, int revents) 1685rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{ 1686{
1687 make_current ();
1688
1689 update_background_ev.stop ();
1778 bgPixmap.render (); 1690 bgPixmap.render ();
1691 refresh_check ();
1779} 1692}
1780 1693
1781#endif /* HAVE_BG_PIXMAP */ 1694#endif /* HAVE_BG_PIXMAP */
1782 1695
1783/*----------------------- end-of-file (C source) -----------------------*/ 1696/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines