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.364 by sf-exg, Mon Jan 9 15:30:17 2012 UTC vs.
Revision 1.387 by sf-exg, Sun Dec 30 15:38:04 2012 UTC

… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
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
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
236 selection_clear (true); 238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241 scrollBar.destroy (); 243 scrollBar.destroy ();
242 if (gc) XFreeGC (dpy, gc); 244 if (gc) XFreeGC (dpy, gc);
243 245
… …
313 { 315 {
314#if USE_XIM 316#if USE_XIM
315 im_ev.stop (display); 317 im_ev.stop (display);
316#endif 318#endif
317 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 320#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
319 rootwin_ev.stop (display); 321 rootwin_ev.stop (display);
320#endif 322#endif
321 termwin_ev.stop (display); 323 termwin_ev.stop (display);
322 vt_ev.stop (display); 324 vt_ev.stop (display);
323 } 325 }
… …
350 352
351 delete this; 353 delete this;
352} 354}
353 355
354void 356void
355rxvt_term::set_option (uint8_t opt, bool set) 357rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356{ 358{
357 if (!opt) 359 if (!opt)
358 return; 360 return;
359 361
360 uint8_t mask = 1 << (opt & 7); 362 uint8_t mask = 1 << (opt & 7);
… …
364} 366}
365 367
366/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
367/* 369/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 370 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 371 */
371static XErrorHandler old_xerror_handler; 372static XErrorHandler old_xerror_handler;
372 373
373static void 374static void
374rxvt_emergency_cleanup () 375rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
378} 379}
379 380
380#if !ENABLE_MINIMAL 381#if !ENABLE_MINIMAL
381static void 382static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
383{ 384{
384 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
386 char number[32]; 387 char number[32];
387 const char mtype[] = "XlibMessage"; 388
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
390
391 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
392 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
393
394 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
395 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("+ %s: %s\n", mesg, buffer);
397
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 399 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
394 sprintf(number, "%d", event->request_code); 400
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer);
397 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
402 {
403#if 0
404 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
405 int nexts;
406 char **exts = XListExtensions (dpy, &nexts);
407
408 while (nexts)
409 {
410 char *extname = exts [nexts - 1];
411 int major, first_event, first_error;
412
413 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
414 {
415 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
416 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
417
418 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
419 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
420 rxvt_warn ("+ (which is %s)\n", buffer);
421
422 break;
423 }
424
425 printf ("nextss %d %s\n", nexts, extname);//D
426 --nexts;
427 ++exts;
428 }
429#else
430 int nexts = 0;
431 char **exts = 0;
432#endif
433
434 if (!nexts)
435 {
436 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
437
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 438 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 439 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 440
441#if 0
442 sprintf (number, "RENDER.%d", event->minor_code);
443 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
444 rxvt_warn ("+ (which is %s)\n", buffer);
445#endif
446 }
447
448 XFreeExtensionList (exts);
401 } 449 }
450 else
451 {
452 sprintf (number, "%d", event->request_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455 }
456
402 if ((event->error_code == BadWindow) || 457 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 458 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 459 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 460 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 461 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 462 || event->error_code == BadColor
408 (event->error_code == BadGC) || 463 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 464 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 465 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 466 || event->error_code == BadAtom)
467 {
412 if (event->error_code == BadValue) 468 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 470 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 471 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 472 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 473 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 474
429int 475 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
476 }
477}
478#endif
479
480int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 481rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 482{
432 if (GET_R->allowedxerror == -1) 483 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 484 GET_R->allowedxerror = event->error_code;
434 else 485 else
… …
443 } 494 }
444 495
445 return 0; 496 return 0;
446} 497}
447 498
448int 499int ecb_cold
449rxvt_xioerror_handler (Display *display) 500rxvt_xioerror_handler (Display *display)
450{ 501{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 502 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 503 DisplayString (display));
453 rxvt_emergency_cleanup (); 504 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 624 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 625 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 626 XSetIOErrorHandler (rxvt_xioerror_handler);
576 627
577 XrmInitialize (); 628 XrmInitialize ();
629
630#if HAVE_PIXBUF
631 g_type_init ();
632#endif
578} 633}
579 634
580/*----------------------------------------------------------------------*/ 635/*----------------------------------------------------------------------*/
581/* 636/*
582 * window size/position calculations for XSizeHint and other storage. 637 * window size/position calculations for XSizeHint and other storage.
… …
710 // size, i.e., when the wm does not honour our size hints, there are 765 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a 766 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly 767 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the 768 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps. 769 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth; 770 vt_width = ncol * fwidth;
716 height = nrow * fheight; 771 vt_height = nrow * fheight;
717} 772}
718 773
719/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
720/* 775/*
721 * Tell the teletype handler what size the window is. 776 * Tell the teletype handler what size the window is.
… …
729 784
730 struct winsize ws; 785 struct winsize ws;
731 786
732 ws.ws_col = ncol; 787 ws.ws_col = ncol;
733 ws.ws_row = nrow; 788 ws.ws_row = nrow;
734 ws.ws_xpixel = width; 789 ws.ws_xpixel = vt_width;
735 ws.ws_ypixel = height; 790 ws.ws_ypixel = vt_height;
736 ioctl (pty->pty, TIOCSWINSZ, &ws); 791 ioctl (pty->pty, TIOCSWINSZ, &ws);
737 792
738#if 0 793#if 0
739 // TIOCSWINSZ is supposed to do this automatically and correctly 794 // TIOCSWINSZ is supposed to do this automatically and correctly
740 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
… …
766 821
767 delete fontset[0]; 822 delete fontset[0];
768 fontset[0] = fs; 823 fontset[0] = fs;
769 824
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 825 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 826 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 827
774 fs->set_prop (prop, false); 828 fs->set_prop (prop, false);
775 829
776 fwidth = prop.width; 830 fwidth = prop.width;
777 fheight = prop.height; 831 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 832 fbase = prop.ascent;
779 833
780 for (int style = 1; style < 4; style++) 834 for (int style = 1; style < 4; style++)
781 { 835 {
782#if ENABLE_STYLES 836#if ENABLE_STYLES
… …
944 998
945/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
946/* 1000/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 1002 */
949void 1003char *
950rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
951{ 1005{
952 unsigned int i; 1006 unsigned int i;
953 const char *xpmb = ""; 1007 const char *xpmb = "";
954 char fstr[] = "default"; 1008 char fstr[] = "default";
955 char bstr[] = "default"; 1009 char bstr[] = "default";
1010 char *env_colorfgbg;
956 1011
957 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1014 {
960 sprintf (fstr, "%d", i - Color_Black); 1015 sprintf (fstr, "%d", i - Color_Black);
… …
963 1018
964 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1021 {
967 sprintf (bstr, "%d", i - Color_Black); 1022 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1023#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1024 xpmb = "default;";
970#endif 1025#endif
971 break; 1026 break;
972 } 1027 }
973 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
975} 1032}
976 1033
977/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
978 1035
979bool 1036bool
… …
1072 if (scrollBar.state) 1129 if (scrollBar.state)
1073 scrollBar.resize (); 1130 scrollBar.resize ();
1074 1131
1075 XMoveResizeWindow (dpy, vt, 1132 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1133 window_vt_x, window_vt_y,
1077 width, height); 1134 vt_width, vt_height);
1135
1136 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1137
1079#ifdef HAVE_BG_PIXMAP 1138#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1139 if (bg_window_size_sensitive ())
1081 update_background (); 1140 update_background ();
1082#endif 1141#endif
1083 } 1142 }
1084 1143
1085 if (fix_screen || old_height == 0) 1144 if (fix_screen || old_height == 0)
1086 scr_reset (); 1145 scr_reset ();
1087 1146
1088#ifdef USE_XIM 1147#if USE_XIM
1089 im_set_position (); 1148 im_set_position ();
1090#endif 1149#endif
1091} 1150}
1092 1151
1093/* 1152/*
… …
1107 newwidth = wattr.width - szHint.base_width; 1166 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1167 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1168 newheight = wattr.height - szHint.base_height;
1110 } 1169 }
1111 1170
1112 if (newwidth != width || newheight != height) 1171 if (newwidth != vt_width || newheight != vt_height)
1113 { 1172 {
1114 newwidth += szHint.base_width; 1173 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1174 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1175 resize_all_windows (newwidth, newheight, 0);
1117 } 1176 }
1118} 1177}
1119 1178
1120/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1180 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1182#if USE_XIM
1124 1183
1125void 1184void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1185rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1186{
1128 fg = pix_colors [Color_fg]; 1187 fg = pix_colors [Color_fg];
… …
1525 im_destroy (); 1584 im_destroy ();
1526 1585
1527 if (Input_Context) 1586 if (Input_Context)
1528 return; 1587 return;
1529 1588
1530#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1531 if (rs[Rs_imLocale]) 1589 if (rs[Rs_imLocale])
1532 SET_LOCALE (rs[Rs_imLocale]); 1590 SET_LOCALE (rs[Rs_imLocale]);
1533#endif
1534 1591
1535 p = rs[Rs_inputMethod]; 1592 p = rs[Rs_inputMethod];
1536 if (p && *p) 1593 if (p && *p)
1537 { 1594 {
1538 bool found = false; 1595 bool found = false;
… …
1566 /* try with no modifiers base IF the user didn't specify an IM */ 1623 /* try with no modifiers base IF the user didn't specify an IM */
1567 if (im_get_ic ("@im=none")) 1624 if (im_get_ic ("@im=none"))
1568 goto done; 1625 goto done;
1569 1626
1570done: 1627done:
1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1572 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
1573 SET_LOCALE (locale); 1629 SET_LOCALE (locale);
1574#endif
1575} 1630}
1576 1631
1577void 1632void
1578rxvt_term::im_set_position () 1633rxvt_term::im_set_position ()
1579{ 1634{
… …
1624{ 1679{
1625 Window cr; 1680 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627} 1682}
1628 1683
1629Pixmap
1630rxvt_term::get_pixmap_property (Atom property)
1631{
1632 Pixmap pixmap = None;
1633
1634 int aformat;
1635 unsigned long nitems, bytes_after;
1636 Atom atype;
1637 unsigned char *prop;
1638 int result = XGetWindowProperty (dpy, display->root, property,
1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1640 &nitems, &bytes_after, &prop);
1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1646 }
1647
1648 return pixmap;
1649}
1650
1651#ifdef HAVE_BG_PIXMAP 1684#ifdef HAVE_BG_PIXMAP
1652 1685
1653void 1686void
1654rxvt_term::update_background () 1687rxvt_term::update_background ()
1655{ 1688{
1656 if (update_background_ev.is_active ()) 1689 if (update_background_ev.is_active ())
1657 return;
1658
1659 bg_invalidate ();
1660
1661 if (!mapped)
1662 return; 1690 return;
1663 1691
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1692 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1693
1666 if (to_wait <= 0.) 1694 if (to_wait <= 0.)

Diff Legend

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