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.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.322 by root, Tue Mar 30 23:00:35 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-2007 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.
… …
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::rootwin_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);
… …
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 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
231 if (display) 239 if (display)
232 { 240 {
233 selection_clear (); 241 selection_clear ();
242 selection_clear (true);
234 243
235#ifdef USE_XIM 244#ifdef USE_XIM
236 im_destroy (); 245 im_destroy ();
237#endif 246#endif
238#ifdef XTERM_SCROLLBAR 247 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 248 if (gc) XFreeGC (dpy, gc);
263 249
264 delete drawable; 250 delete drawable;
265 // destroy all windows 251 // destroy all windows
266 if (parent[0]) 252 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
275#endif 261#endif
276 } 262 }
277 263
278 clear (); 264 clear ();
279 }
280 265
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 266 display->flush (); /* ideally .put should do this */
290 displays.put (display); 267 displays.put (display);
268 }
291 269
292 scr_release (); 270 scr_release ();
293 271
294 /* clear all resources */ 272 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 274 free (allocated [i]);
297 275
298 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
300 free (env_display); 279 free (env_display);
301 free (env_term); 280 free (env_term);
302 free (locale); 281 free (locale);
303 free (v_buffer); 282 free (v_buffer);
… …
341 if (display) 320 if (display)
342 { 321 {
343#if USE_XIM 322#if USE_XIM
344 im_ev.stop (display); 323 im_ev.stop (display);
345#endif 324#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
351#endif 328#endif
352 incr_ev.stop (); 329 incr_ev.stop ();
353 termwin_ev.stop (display); 330 termwin_ev.stop (display);
… …
472 DisplayString (display)); 449 DisplayString (display));
473 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
475} 452}
476 453
477/*----------------------------------------------------------------------*/
478void
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 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526
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
534 if (rs [Rs_shade])
535 bgPixmap.set_shade (rs [Rs_shade]);
536
537 bgPixmap.set_root_pixmap ();
538 XSelectInput (dpy, display->root, PropertyChangeMask);
539 rootwin_ev.start (display, display->root);
540 }
541#endif
542
543#ifdef BG_IMAGE_FROM_FILE
544 if (rs[Rs_backgroundPixmap])
545 {
546 const char *p = rs[Rs_backgroundPixmap];
547
548 if ((p = strchr (p, ';')) != 0)
549 {
550 p++;
551 bgPixmap.set_geometry (p);
552 }
553 else
554 bgPixmap.set_defaultGeometry ();
555
556 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557 if (!bgPixmap.window_position_sensitive ())
558 update_background ();
559 }
560#endif
561 }
562#endif
563
564#if ENABLE_PERL
565 rootwin_ev.start (display, display->root);
566#endif
567
568 set_colorfgbg ();
569
570 init_command (cmd_argv);
571
572 free (cmd_argv);
573
574 if (pty->pty >= 0)
575 pty_ev.start (pty->pty, ev::READ);
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591}
592
593static struct sig_handlers 454static struct sig_handlers
594{ 455{
595 ev::sig sw_term, sw_int; 456 ev::sig sw_term, sw_int;
596 457
597 /* 458 /*
… …
649 */ 510 */
650void 511void
651rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652{ 513{
653 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
654 int x, y, sb_w, flags; 515 int x, y, flags;
655 unsigned int w, h; 516 unsigned int w, h;
656 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
657 518
658 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
659 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
669 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
670 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
671 532
672 if (flags & WidthValue) 533 if (flags & WidthValue)
673 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
674 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
675 szHint.flags |= USSize; 539 szHint.flags |= USSize;
676 } 540 }
677 541
678 if (flags & HeightValue) 542 if (flags & HeightValue)
679 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
680 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
681 szHint.flags |= USSize; 548 szHint.flags |= USSize;
682 } 549 }
683 550
684 if (flags & XValue) 551 if (flags & XValue)
685 { 552 {
… …
716 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
717 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
718 585
719 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
720 587
721 sb_w = 0;
722 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
723 589
724 if (scrollBar.state) 590 if (scrollBar.state)
725 { 591 {
726 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
727 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
728 594
729 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
730 window_vt_x += sb_w; 596 window_vt_x += sb_w;
731 } 597 }
… …
755 { 621 {
756 min_it (height, max_height); 622 min_it (height, max_height);
757 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
758 } 624 }
759 625
760 if (scrollBar.state && option (Opt_scrollBar_right))
761 window_sb_x = szHint.width - sb_w;
762
763 if (recalc_x) 626 if (recalc_x)
764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765 628
766 if (recalc_y) 629 if (recalc_y)
767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
768 631
769 ncol = width / fwidth; 632 ncol = width / fwidth;
770 nrow = height / fheight; 633 nrow = height / fheight;
771} 634}
772 635
773/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
774/* 637/*
… …
785 648
786 ws.ws_col = ncol; 649 ws.ws_col = ncol;
787 ws.ws_row = nrow; 650 ws.ws_row = nrow;
788 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
789 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
790 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
791 654
792#if 0 655#if 0
793 // TIOCSWINSZ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
794 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
795 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
… …
825#endif 688#endif
826 689
827 delete fontset[0]; 690 delete fontset[0];
828 fontset[0] = fs; 691 fontset[0] = fs;
829 692
830 prop = (*fs)[1]->properties (); 693 prop = fs->get (0, 1)->properties ();
831 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
832 696
833 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
834 698
835 fwidth = prop.width; 699 fwidth = prop.width;
836 fheight = prop.height; 700 fheight = prop.height;
… …
925void 789void
926rxvt_term::set_window_color (int idx, const char *color) 790rxvt_term::set_window_color (int idx, const char *color)
927{ 791{
928#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
929 rxvt_color xcol; 793 rxvt_color xcol;
930 int i;
931 794
932 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
933 return; 796 return;
934 797
935 color = strdup (color); 798 color = strdup (color);
… …
937 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
938 801
939 /* handle color aliases */ 802 /* handle color aliases */
940 if (isdigit (*color)) 803 if (isdigit (*color))
941 { 804 {
942 i = atoi (color); 805 int i = atoi (color);
943 806
944 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
945 { 808 {
946 /* bright colors */ 809 /* bright colors */
947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1051 int old_width = szHint.width; 914 int old_width = szHint.width;
1052 int old_height = szHint.height; 915 int old_height = szHint.height;
1053 916
1054 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1055 918
1056 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 919 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
920
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint)
923 {
924 szHint.flags &= ~(PBaseSize | PResizeInc);
1057 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1058 928
1059 if (!ignoreparent) 929 if (!ignoreparent)
1060 { 930 {
1061#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1062 /* 932 /*
… …
1102#else 972#else
1103 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1104#endif 974#endif
1105 } 975 }
1106 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1107 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1108 981
1109 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1110 { 983 {
1111 if (scrollBar.state) 984 if (scrollBar.state)
1112 { 985 scrollBar.resize ();
1113 XMoveResizeWindow (dpy, scrollBar.win,
1114 window_sb_x, 0,
1115 scrollbar_TotalWidth (), szHint.height);
1116 resize_scrollbar ();
1117 }
1118 986
1119 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1120 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1121 width, height); 989 width, height);
1122 990
1123#ifdef HAVE_BG_PIXMAP 991#ifdef HAVE_BG_PIXMAP
1124 if (bgPixmap.window_size_sensitive ()) 992 if (bgPixmap.window_size_sensitive ())
1125 update_background (); 993 update_background ();
1126#endif 994#endif
1127
1128 scr_clear ();
1129 } 995 }
1130 996
1131 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1132 scr_reset (); 998 scr_reset ();
1133
1134 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1135 //scr_touch (false);
1136 999
1137#ifdef HAVE_BG_PIXMAP 1000#ifdef HAVE_BG_PIXMAP
1138// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139// if (bgPixmap.pixmap) 1002// if (bgPixmap.pixmap)
1140// scr_touch (false); 1003// scr_touch (false);
… …
1212 1075
1213/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1214bool 1077bool
1215rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1216{ 1079{
1217 char *p;
1218 Atom atom; 1080 Atom atom;
1219 Window win; 1081 Window win;
1220 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1221 1083
1222 /* get current locale modifier */ 1084 /* get current locale modifier */
1223 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1224 { 1086 {
1225 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1226 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1227 1089
1228 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1229 *p = '\0'; 1091 *p = '\0';
1230 1092
1231 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1232 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1233 1095
… …
1300 1162
1301 term->make_current (); 1163 term->make_current ();
1302 1164
1303 if (text) 1165 if (text)
1304 { 1166 {
1305 void *str; 1167 wchar_t *str;
1306 1168
1307 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1308 { 1170 {
1309 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1310 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1311 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1312 1174
1313 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1314 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1315 1177
1316 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1317 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1318 } 1180 }
1319 else 1181 else
1320 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1321 1183
1322 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1323 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1324 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1325 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
… …
1716# endif 1578# endif
1717 1579
1718void 1580void
1719rxvt_term::update_background () 1581rxvt_term::update_background ()
1720{ 1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1721 bgPixmap.invalidate (); 1586 bgPixmap.invalidate ();
1722 1587
1723 /* no chance of real time refresh if we are blurring! */ 1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1724 if (bgPixmap.invalid_since + 0.50 < ev::now () 1589
1725 && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1590 if (to_wait <= 0.)
1726 {
1727 update_background_ev.stop ();
1728 bgPixmap.render (); 1591 bgPixmap.render ();
1729 }
1730 else 1592 else
1731 {
1732 ev_tstamp refresh;
1733
1734 if (!bgPixmap.need_client_side_rendering ())
1735 refresh = .05;
1736 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1737 refresh = .20; /* very slow !!! */
1738 else
1739 refresh = .07;
1740
1741 update_background_ev.start (refresh); 1593 update_background_ev.start (to_wait);
1742 }
1743} 1594}
1744 1595
1745void 1596void
1746rxvt_term::update_background_cb (ev::timer &w, int revents) 1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1747{ 1598{
1748 make_current (); 1599 make_current ();
1600
1601 update_background_ev.stop ();
1749 bgPixmap.render (); 1602 bgPixmap.render ();
1750 refresh_check (); 1603 refresh_check ();
1751} 1604}
1752 1605
1753#endif /* HAVE_BG_PIXMAP */ 1606#endif /* HAVE_BG_PIXMAP */

Diff Legend

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