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.270 by root, Tue Dec 4 16:24:00 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 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#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
45#endif
46 44
47#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 46# define X_LOCALE
49# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
50#else 48#else
… …
157{ 155{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 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);
160#endif 158#endif
161#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
162 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);
163#endif 161#endif
164#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 164#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 167#endif
170#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
… …
172#endif 170#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 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);
175#endif 173#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
178#endif 176#endif
179#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif
182#ifdef USE_XIM 178#ifdef USE_XIM
183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
184#endif 180#endif
185#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
187#endif 183#endif
188#ifndef NO_BELL 184#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 186#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
229 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
230 delete fontset[i]; 225 delete fontset[i];
231#endif 226#endif
232 delete fontset[0]; 227 delete fontset[0];
233 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
234 if (display) 233 if (display)
235 { 234 {
236 selection_clear (); 235 selection_clear ();
237 236
238#ifdef USE_XIM 237#ifdef USE_XIM
239 im_destroy (); 238 im_destroy ();
240#endif 239#endif
241#ifdef XTERM_SCROLLBAR 240 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); 241 if (gc) XFreeGC (dpy, gc);
266 242
267 delete drawable; 243 delete drawable;
268 // destroy all windows 244 // destroy all windows
269 if (parent[0]) 245 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 253 pix_colors_unfocused [i].free (this);
278#endif 254#endif
279 } 255 }
280 256
281 clear (); 257 clear ();
282 }
283 258
284 delete [] pix_colors_focused; 259 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 260 displays.put (display);
261 }
293 262
294 scr_release (); 263 scr_release ();
295 264
296 /* clear all resources */ 265 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 266 for (int i = 0; i < allocated.size (); i++)
… …
329} 298}
330 299
331void 300void
332rxvt_term::destroy () 301rxvt_term::destroy ()
333{ 302{
334 if (destroy_ev.active) 303 if (destroy_ev.is_active ())
335 return; 304 return;
336 305
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 307
339#if ENABLE_OVERLAY 308#if ENABLE_OVERLAY
… …
343 if (display) 312 if (display)
344 { 313 {
345#if USE_XIM 314#if USE_XIM
346 im_ev.stop (display); 315 im_ev.stop (display);
347#endif 316#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
350#endif
351#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
353#endif 320#endif
354 incr_ev.stop (); 321 incr_ev.stop ();
355 termwin_ev.stop (display); 322 termwin_ev.stop (display);
356 vt_ev.stop (display); 323 vt_ev.stop (display);
357 } 324 }
358 325
359 prepare_ev.stop (); 326 flush_ev.stop ();
360 pty_ev.stop (); 327 pty_ev.stop ();
361#ifdef CURSOR_BLINK 328#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 329 cursor_blink_ev.stop ();
363#endif 330#endif
364#ifdef TEXT_BLINK 331#ifdef TEXT_BLINK
… …
474 DisplayString (display)); 441 DisplayString (display));
475 rxvt_emergency_cleanup (); 442 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 443 _exit (EXIT_FAILURE);
477} 444}
478 445
479/*----------------------------------------------------------------------*/
480bool
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{
483 this->envv = envv;
484
485 SET_R (this);
486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
488
489 if (!init_vars ())
490 return false;
491
492 init_secondary ();
493
494 const char **cmd_argv = init_resources (argc, argv);
495
496#ifdef KEYSYM_RESOURCE
497 keyboard->register_done ();
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
568
569 set_colorfgbg ();
570
571 init_command (cmd_argv);
572
573 free (cmd_argv);
574
575 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ);
577
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
595 return true;
596}
597
598static struct sig_handlers 446static struct sig_handlers
599{ 447{
600 ev::sig sw_term, sw_int; 448 ev::sig sw_term, sw_int;
601 449
602 /* 450 /*
603 * Catch a fatal signal and tidy up before quitting 451 * Catch a fatal signal and tidy up before quitting
604 */ 452 */
605 void
606 sig_term (ev::sig &w, int revents) 453 void sig_term (ev::sig &w, int revents);
607 {
608 rxvt_emergency_cleanup ();
609 w.stop ();
610 kill (getpid (), w.signum);
611 }
612 454
613 sig_handlers () 455 sig_handlers ()
614 { 456 {
615 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this); 457 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
616 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this); 458 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 } 459 }
618} sig_handlers; 460} sig_handlers;
619 461
462void
463sig_handlers::sig_term (ev::sig &w, int revents)
464{
465 rxvt_emergency_cleanup ();
466 w.stop ();
467 kill (getpid (), w.signum);
468}
469
620char **rxvt_environ; // startup environment 470char **rxvt_environ; // startup environment
621 471
622void 472void
623rxvt_init () 473rxvt_init ()
624{ 474{
… …
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 492 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 493 XSetIOErrorHandler (rxvt_xioerror_handler);
644 494
645 XrmInitialize (); 495 XrmInitialize ();
646}
647
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} 496}
683 497
684/*----------------------------------------------------------------------*/ 498/*----------------------------------------------------------------------*/
685/* 499/*
686 * window size/position calculations for XSizeHint and other storage. 500 * window size/position calculations for XSizeHint and other storage.
… …
688 */ 502 */
689void 503void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 504rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 505{
692 short recalc_x, recalc_y; 506 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 507 int x, y, flags;
694 unsigned int w, h; 508 unsigned int w, h;
695 unsigned int max_width, max_height; 509 unsigned int max_width, max_height;
696 510
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 511 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 512 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 522 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 523 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 524
711 if (flags & WidthValue) 525 if (flags & WidthValue)
712 { 526 {
527 if (!w)
528 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
529
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 530 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 531 szHint.flags |= USSize;
715 } 532 }
716 533
717 if (flags & HeightValue) 534 if (flags & HeightValue)
718 { 535 {
536 if (!h)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 539 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 540 szHint.flags |= USSize;
721 } 541 }
722 542
723 if (flags & XValue) 543 if (flags & XValue)
724 { 544 {
… …
755 max_width = MAX_COLS * fwidth; 575 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 576 max_height = MAX_ROWS * fheight;
757 577
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 578 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 579
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 580 window_vt_x = window_vt_y = int_bwidth;
762 581
763 if (scrollBar.state) 582 if (scrollBar.state)
764 { 583 {
765 sb_w = scrollbar_TotalWidth (); 584 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 585 szHint.base_width += sb_w;
767 586
768 if (!option (Opt_scrollBar_right)) 587 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 588 window_vt_x += sb_w;
770 } 589 }
… …
793 else 612 else
794 { 613 {
795 min_it (height, max_height); 614 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 615 szHint.height = szHint.base_height + height;
797 } 616 }
798
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801 617
802 if (recalc_x) 618 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 619 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 620
805 if (recalc_y) 621 if (recalc_y)
… …
827 ws.ws_xpixel = width; 643 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 644 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 645 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830 646
831#if 0 647#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 648 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 649 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 650 kill (-cmd_pid, SIGWINCH);
835#endif 651#endif
836} 652}
837 653
… …
964void 780void
965rxvt_term::set_window_color (int idx, const char *color) 781rxvt_term::set_window_color (int idx, const char *color)
966{ 782{
967#ifdef XTERM_COLOR_CHANGE 783#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 784 rxvt_color xcol;
969 int i;
970 785
971 if (color == NULL || *color == '\0') 786 if (color == NULL || *color == '\0')
972 return; 787 return;
973 788
974 color = strdup (color); 789 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 791 rs[Rs_color + idx] = color;
977 792
978 /* handle color aliases */ 793 /* handle color aliases */
979 if (isdigit (*color)) 794 if (isdigit (*color))
980 { 795 {
981 i = atoi (color); 796 int i = atoi (color);
982 797
983 if (i >= 8 && i <= 15) 798 if (i >= 8 && i <= 15)
984 { 799 {
985 /* bright colors */ 800 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 801 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 961 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 962
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 963 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 964 {
1150 if (scrollBar.state) 965 if (scrollBar.state)
1151 { 966 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 967
1158 XMoveResizeWindow (dpy, vt, 968 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 969 window_vt_x, window_vt_y,
1160 width, height); 970 width, height);
1161 971
… …
1718void 1528void
1719rxvt_term::get_window_origin (int &x, int &y) 1529rxvt_term::get_window_origin (int &x, int &y)
1720{ 1530{
1721 Window cr; 1531 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1532 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1533/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1724} 1534}
1725 1535
1726Pixmap 1536Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1537rxvt_term::get_pixmap_property (int prop_id)
1728{ 1538{
… …
1735 unsigned char *prop = NULL; 1545 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1546 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1547 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1548 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1549 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop; 1550 return *(Pixmap *)prop;
1742 }
1743 } 1551 }
1552
1744 return None; 1553 return None;
1745} 1554}
1746 1555
1747#ifdef HAVE_BG_PIXMAP 1556#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS 1557# if TRACE_PIXMAPS
1749# undef update_background 1558# undef update_background
1559void
1750int rxvt_term::trace_update_background (const char *file, int line) 1560rxvt_term::trace_update_background (const char *file, int line)
1751{ 1561{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1562 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background (); 1563 update_background ();
1754} 1564}
1755# endif 1565# endif
1756 1566
1757int 1567void
1758rxvt_term::update_background () 1568rxvt_term::update_background ()
1759{ 1569{
1570 if (update_background_ev.is_active ())
1571 return;
1572
1760 bgPixmap.invalidate (); 1573 bgPixmap.invalidate ();
1761 1574
1762 /* no chance of real time refresh if we are blurring! */ 1575 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)) 1576
1577 if (to_wait <= 0.)
1764 bgPixmap.render (); 1578 bgPixmap.render ();
1765 else 1579 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1580 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} 1581}
1779 1582
1780void 1583void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1584rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1585{
1586 make_current ();
1587
1588 update_background_ev.stop ();
1783 bgPixmap.render (); 1589 bgPixmap.render ();
1590 refresh_check ();
1784} 1591}
1785 1592
1786#endif /* HAVE_BG_PIXMAP */ 1593#endif /* HAVE_BG_PIXMAP */
1787 1594
1788/*----------------------- end-of-file (C source) -----------------------*/ 1595/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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