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.275 by root, Tue Dec 11 15:42:51 2007 UTC vs.
Revision 1.311 by root, Tue Nov 4 13:28:40 2008 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43# include <termios.h> 43#include <termios.h>
44 44
45#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 46# define X_LOCALE
47# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
48#else 48#else
… …
155{ 155{
156#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif 158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 183#endif
186#ifndef NO_BELL 184#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188#endif 186#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); flush_ev.set (0., 1. / 60.); // refresh at max. 60 Hz normally
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
227 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
232 if (display) 239 if (display)
233 { 240 {
234 selection_clear (); 241 selection_clear ();
235 242
236#ifdef USE_XIM 243#ifdef USE_XIM
237 im_destroy (); 244 im_destroy ();
238#endif 245#endif
239#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 247 if (gc) XFreeGC (dpy, gc);
264 248
265 delete drawable; 249 delete drawable;
266 // destroy all windows 250 // destroy all windows
267 if (parent[0]) 251 if (parent[0])
… …
275 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
276#endif 260#endif
277 } 261 }
278 262
279 clear (); 263 clear ();
280 }
281 264
282 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 266 displays.put (display);
267 }
291 268
292 scr_release (); 269 scr_release ();
293 270
294 /* clear all resources */ 271 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
327} 304}
328 305
329void 306void
330rxvt_term::destroy () 307rxvt_term::destroy ()
331{ 308{
332 if (ev_is_active (&destroy_ev)) 309 if (destroy_ev.is_active ())
333 return; 310 return;
334 311
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 313
337#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
… …
341 if (display) 318 if (display)
342 { 319 {
343#if USE_XIM 320#if USE_XIM
344 im_ev.stop (display); 321 im_ev.stop (display);
345#endif 322#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
351#endif 326#endif
352 incr_ev.stop (); 327 incr_ev.stop ();
353 termwin_ev.stop (display); 328 termwin_ev.stop (display);
354 vt_ev.stop (display); 329 vt_ev.stop (display);
355 } 330 }
356 331
357 prepare_ev.stop (); 332 flush_ev.stop ();
358 pty_ev.stop (); 333 pty_ev.stop ();
359#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
361#endif 336#endif
362#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
472 DisplayString (display)); 447 DisplayString (display));
473 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
475} 450}
476 451
477/*----------------------------------------------------------------------*/
478bool
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 if (!init_vars ())
488 return false;
489
490 init_secondary ();
491
492 const char **cmd_argv = init_resources (argc, argv);
493
494#ifdef KEYSYM_RESOURCE
495 keyboard->register_done ();
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (option (Opt_scrollBar))
500 scrollBar.setIdle (); /* set existence for size calculations */
501#endif
502
503 pty = ptytty::create ();
504
505 create_windows (argc, argv);
506
507 init_xlocale ();
508
509 scr_reset (); // initialize screen
510
511#if 0
512 XSynchronize (dpy, True);
513#endif
514
515#ifdef HAVE_SCROLLBARS
516 if (option (Opt_scrollBar))
517 resize_scrollbar (); /* create and map scrollbar */
518#endif
519#ifdef HAVE_BG_PIXMAP
520 {
521 bgPixmap.set_target (this);
522
523#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent))
525 {
526 bgPixmap.set_transparent ();
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]);
535
536 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root);
539 }
540#endif
541
542#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL)
544 {
545 const char *p = rs[Rs_backgroundPixmap];
546
547 if ((p = strchr (p, ';')) != NULL)
548 {
549 p++;
550 bgPixmap.set_geometry (p);
551 }
552 else
553 bgPixmap.set_defaultGeometry ();
554
555 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556 if (!bgPixmap.window_position_sensitive ())
557 update_background ();
558 }
559#endif
560 }
561#endif
562
563#if ENABLE_PERL
564 rootwin_ev.start (display, display->root);
565#endif
566
567 set_colorfgbg ();
568
569 init_command (cmd_argv);
570
571 free (cmd_argv);
572
573 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ);
575
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580#if ENABLE_XEMBED
581 if (rs[Rs_embed])
582 {
583 long info[2] = { 0, XEMBED_MAPPED };
584
585 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586 32, PropModeReplace, (unsigned char *)&info, 2);
587 }
588#endif
589
590 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]);
592
593 return true;
594}
595
596static struct sig_handlers 452static struct sig_handlers
597{ 453{
598 ev::sig sw_term, sw_int; 454 ev::sig sw_term, sw_int;
599 455
600 /* 456 /*
… …
643 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
644 500
645 XrmInitialize (); 501 XrmInitialize ();
646} 502}
647 503
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682}
683
684/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
685/* 505/*
686 * window size/position calculations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
687 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
688 */ 508 */
689void 509void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 511{
692 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 513 int x, y, flags;
694 unsigned int w, h; 514 unsigned int w, h;
695 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
696 516
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 530
711 if (flags & WidthValue) 531 if (flags & WidthValue)
712 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 537 szHint.flags |= USSize;
715 } 538 }
716 539
717 if (flags & HeightValue) 540 if (flags & HeightValue)
718 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 546 szHint.flags |= USSize;
721 } 547 }
722 548
723 if (flags & XValue) 549 if (flags & XValue)
724 { 550 {
… …
755 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
757 583
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 585
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
762 587
763 if (scrollBar.state) 588 if (scrollBar.state)
764 { 589 {
765 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
767 592
768 if (!option (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 594 window_vt_x += sb_w;
770 } 595 }
… …
793 else 618 else
794 { 619 {
795 min_it (height, max_height); 620 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
797 } 622 }
798
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801 623
802 if (recalc_x) 624 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 626
805 if (recalc_y) 627 if (recalc_y)
… …
964void 786void
965rxvt_term::set_window_color (int idx, const char *color) 787rxvt_term::set_window_color (int idx, const char *color)
966{ 788{
967#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 790 rxvt_color xcol;
969 int i;
970 791
971 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
972 return; 793 return;
973 794
974 color = strdup (color); 795 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 797 rs[Rs_color + idx] = color;
977 798
978 /* handle color aliases */ 799 /* handle color aliases */
979 if (isdigit (*color)) 800 if (isdigit (*color))
980 { 801 {
981 i = atoi (color); 802 int i = atoi (color);
982 803
983 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
984 { 805 {
985 /* bright colors */ 806 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 967 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 968
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 969 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 970 {
1150 if (scrollBar.state) 971 if (scrollBar.state)
1151 { 972 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 973
1158 XMoveResizeWindow (dpy, vt, 974 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 975 window_vt_x, window_vt_y,
1160 width, height); 976 width, height);
1161 977
… …
1718void 1534void
1719rxvt_term::get_window_origin (int &x, int &y) 1535rxvt_term::get_window_origin (int &x, int &y)
1720{ 1536{
1721 Window cr; 1537 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1538 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1539/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1724} 1540}
1725 1541
1726Pixmap 1542Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1543rxvt_term::get_pixmap_property (int prop_id)
1728{ 1544{
… …
1735 unsigned char *prop = NULL; 1551 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1552 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1553 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1554 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1555 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop; 1556 return *(Pixmap *)prop;
1742 }
1743 } 1557 }
1558
1744 return None; 1559 return None;
1745} 1560}
1746 1561
1747#ifdef HAVE_BG_PIXMAP 1562#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS 1563# if TRACE_PIXMAPS
1749# undef update_background 1564# undef update_background
1565void
1750int rxvt_term::trace_update_background (const char *file, int line) 1566rxvt_term::trace_update_background (const char *file, int line)
1751{ 1567{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1568 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background (); 1569 update_background ();
1754} 1570}
1755# endif 1571# endif
1756 1572
1757int 1573void
1758rxvt_term::update_background () 1574rxvt_term::update_background ()
1759{ 1575{
1576 if (update_background_ev.is_active ())
1577 return;
1578
1760 bgPixmap.invalidate (); 1579 bgPixmap.invalidate ();
1761 1580
1762 /* no chance of real time refresh if we are blurring! */ 1581 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1582
1583 if (to_wait <= 0.)
1764 bgPixmap.render (); 1584 bgPixmap.render ();
1765 else 1585 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1586 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1587}
1779 1588
1780void 1589void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1590rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1591{
1592 make_current ();
1593
1594 update_background_ev.stop ();
1783 bgPixmap.render (); 1595 bgPixmap.render ();
1596 refresh_check ();
1784} 1597}
1785 1598
1786#endif /* HAVE_BG_PIXMAP */ 1599#endif /* HAVE_BG_PIXMAP */
1787 1600
1788/*----------------------- end-of-file (C source) -----------------------*/ 1601/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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