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.362 by sf-exg, Tue Dec 6 11:29:52 2011 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
… …
197 termlist.push_back (this); 195 termlist.push_back (this);
198 196
199#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 198 keyboard = new keyboard_manager;
201#endif 199#endif
202
203 // this->envv = 0;
204} 200}
205 201
206// clean up the most important stuff, do *not* call x or free mem etc. 202// clean up the most important stuff, do *not* call x or free mem etc.
207// for use before an emergency exit 203// for use before an emergency exit
208void 204void
… …
230 226
231#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
232 bg_destroy (); 228 bg_destroy ();
233#endif 229#endif
234 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
235 if (display) 235 if (display)
236 { 236 {
237 selection_clear (); 237 selection_clear ();
238 selection_clear (true); 238 selection_clear (true);
239 239
240#ifdef USE_XIM 240#if USE_XIM
241 im_destroy (); 241 im_destroy ();
242#endif 242#endif
243 scrollBar.destroy (); 243 scrollBar.destroy ();
244 if (gc) XFreeGC (dpy, gc); 244 if (gc) XFreeGC (dpy, gc);
245 245
… …
269 for (int i = 0; i < allocated.size (); i++) 269 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 270 free (allocated [i]);
271 271
272 free (selection.text); 272 free (selection.text);
273 free (selection.clip_text); 273 free (selection.clip_text);
274 // TODO: manage env vars in child only(!)
275 free (env_display);
276 free (env_term);
277 free (locale); 274 free (locale);
278 free (v_buffer); 275 free (v_buffer);
279 276
280 delete selection_req; 277 delete selection_req;
281 278
… …
318 { 315 {
319#if USE_XIM 316#if USE_XIM
320 im_ev.stop (display); 317 im_ev.stop (display);
321#endif 318#endif
322 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
323#if ENABLE_TRANSPARENCY || ENABLE_PERL 320#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
324 rootwin_ev.stop (display); 321 rootwin_ev.stop (display);
325#endif 322#endif
326 termwin_ev.stop (display); 323 termwin_ev.stop (display);
327 vt_ev.stop (display); 324 vt_ev.stop (display);
328 } 325 }
… …
355 352
356 delete this; 353 delete this;
357} 354}
358 355
359void 356void
360rxvt_term::set_option (uint8_t opt, bool set) 357rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
361{ 358{
362 if (!opt) 359 if (!opt)
363 return; 360 return;
364 361
365 uint8_t mask = 1 << (opt & 7); 362 uint8_t mask = 1 << (opt & 7);
… …
369} 366}
370 367
371/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
372/* 369/*
373 * Exit gracefully, clearing the utmp entry and restoring tty attributes 370 * Exit gracefully, clearing the utmp entry and restoring tty attributes
374 * TODO: if debugging, this should free up any known resources if we can
375 */ 371 */
376static XErrorHandler old_xerror_handler; 372static XErrorHandler old_xerror_handler;
377 373
378static void 374static void
379rxvt_emergency_cleanup () 375rxvt_emergency_cleanup ()
… …
381 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++)
382 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
383} 379}
384 380
385#if !ENABLE_MINIMAL 381#if !ENABLE_MINIMAL
386static void 382static void ecb_cold
387print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
388{ 384{
389 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
390 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
391 char number[32]; 387 char number[32];
392 const char mtype[] = "XlibMessage"; 388
393 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
394 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
395 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);
396 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("+ %s: %s\n", mesg, buffer);
397
397 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 399 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
399 sprintf(number, "%d", event->request_code); 400
400 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
401 rxvt_warn ("(which is %s)\n", buffer);
402 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
403 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 438 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
404 mesg, BUFSIZ); 439 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
405 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);
406 } 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
407 if ((event->error_code == BadWindow) || 457 if (event->error_code == BadWindow
408 (event->error_code == BadPixmap) || 458 || event->error_code == BadPixmap
409 (event->error_code == BadCursor) || 459 || event->error_code == BadCursor
410 (event->error_code == BadFont) || 460 || event->error_code == BadFont
411 (event->error_code == BadDrawable) || 461 || event->error_code == BadDrawable
412 (event->error_code == BadColor) || 462 || event->error_code == BadColor
413 (event->error_code == BadGC) || 463 || event->error_code == BadGC
414 (event->error_code == BadIDChoice) || 464 || event->error_code == BadIDChoice
415 (event->error_code == BadValue) || 465 || event->error_code == BadValue
416 (event->error_code == BadAtom)) { 466 || event->error_code == BadAtom)
467 {
417 if (event->error_code == BadValue) 468 if (event->error_code == BadValue)
418 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
419 mesg, BUFSIZ);
420 else if (event->error_code == BadAtom) 470 else if (event->error_code == BadAtom)
421 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 471 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
422 mesg, BUFSIZ);
423 else 472 else
424 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 473 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
425 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
427 }
428 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
429 mesg, BUFSIZ);
430 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
431}
432#endif
433 474
434int 475 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
476 }
477}
478#endif
479
480int ecb_cold
435rxvt_xerror_handler (Display *display, XErrorEvent *event) 481rxvt_xerror_handler (Display *display, XErrorEvent *event)
436{ 482{
437 if (GET_R->allowedxerror == -1) 483 if (GET_R->allowedxerror == -1)
438 GET_R->allowedxerror = event->error_code; 484 GET_R->allowedxerror = event->error_code;
439 else 485 else
… …
448 } 494 }
449 495
450 return 0; 496 return 0;
451} 497}
452 498
453int 499int ecb_cold
454rxvt_xioerror_handler (Display *display) 500rxvt_xioerror_handler (Display *display)
455{ 501{
456 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",
457 DisplayString (display)); 503 DisplayString (display));
458 rxvt_emergency_cleanup (); 504 rxvt_emergency_cleanup ();
… …
578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 624 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
579 // TODO: handle this with exceptions and tolerate the memory loss 625 // TODO: handle this with exceptions and tolerate the memory loss
580 XSetIOErrorHandler (rxvt_xioerror_handler); 626 XSetIOErrorHandler (rxvt_xioerror_handler);
581 627
582 XrmInitialize (); 628 XrmInitialize ();
629
630#if HAVE_PIXBUF
631 g_type_init ();
632#endif
583} 633}
584 634
585/*----------------------------------------------------------------------*/ 635/*----------------------------------------------------------------------*/
586/* 636/*
587 * window size/position calculations for XSizeHint and other storage. 637 * window size/position calculations for XSizeHint and other storage.
… …
715 // 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
716 // 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
717 // 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
718 // refresh the background. We take the simpler route and shrink the 768 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps. 769 // vt window so as to avoid creating gaps.
720 width = ncol * fwidth; 770 vt_width = ncol * fwidth;
721 height = nrow * fheight; 771 vt_height = nrow * fheight;
722} 772}
723 773
724/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
725/* 775/*
726 * Tell the teletype handler what size the window is. 776 * Tell the teletype handler what size the window is.
… …
734 784
735 struct winsize ws; 785 struct winsize ws;
736 786
737 ws.ws_col = ncol; 787 ws.ws_col = ncol;
738 ws.ws_row = nrow; 788 ws.ws_row = nrow;
739 ws.ws_xpixel = width; 789 ws.ws_xpixel = vt_width;
740 ws.ws_ypixel = height; 790 ws.ws_ypixel = vt_height;
741 ioctl (pty->pty, TIOCSWINSZ, &ws); 791 ioctl (pty->pty, TIOCSWINSZ, &ws);
742 792
743#if 0 793#if 0
744 // TIOCSWINSZ is supposed to do this automatically and correctly 794 // TIOCSWINSZ is supposed to do this automatically and correctly
745 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
… …
771 821
772 delete fontset[0]; 822 delete fontset[0];
773 fontset[0] = fs; 823 fontset[0] = fs;
774 824
775 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 825 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
776 prop.height += lineSpace; 826 prop.width = max (prop.width + letterSpace, 1);
777 prop.width += letterSpace;
778 827
779 fs->set_prop (prop, false); 828 fs->set_prop (prop, false);
780 829
781 fwidth = prop.width; 830 fwidth = prop.width;
782 fheight = prop.height; 831 fheight = prop.height + lineSpace;
783 fbase = prop.ascent; 832 fbase = prop.ascent;
784 833
785 for (int style = 1; style < 4; style++) 834 for (int style = 1; style < 4; style++)
786 { 835 {
787#if ENABLE_STYLES 836#if ENABLE_STYLES
… …
949 998
950/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
951/* 1000/*
952 * 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
953 */ 1002 */
954void 1003char *
955rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
956{ 1005{
957 unsigned int i; 1006 unsigned int i;
958 const char *xpmb = ""; 1007 const char *xpmb = "";
959 char fstr[] = "default"; 1008 char fstr[] = "default";
960 char bstr[] = "default"; 1009 char bstr[] = "default";
1010 char *env_colorfgbg;
961 1011
962 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
964 { 1014 {
965 sprintf (fstr, "%d", i - Color_Black); 1015 sprintf (fstr, "%d", i - Color_Black);
… …
968 1018
969 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
970 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
971 { 1021 {
972 sprintf (bstr, "%d", i - Color_Black); 1022 sprintf (bstr, "%d", i - Color_Black);
973#ifdef BG_IMAGE_FROM_FILE 1023#if BG_IMAGE_FROM_FILE
974 xpmb = "default;"; 1024 xpmb = "default;";
975#endif 1025#endif
976 break; 1026 break;
977 } 1027 }
978 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
979 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;
980} 1032}
981 1033
982/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
983 1035
984bool 1036bool
… …
1077 if (scrollBar.state) 1129 if (scrollBar.state)
1078 scrollBar.resize (); 1130 scrollBar.resize ();
1079 1131
1080 XMoveResizeWindow (dpy, vt, 1132 XMoveResizeWindow (dpy, vt,
1081 window_vt_x, window_vt_y, 1133 window_vt_x, window_vt_y,
1082 width, height); 1134 vt_width, vt_height);
1135
1136 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1083 1137
1084#ifdef HAVE_BG_PIXMAP 1138#ifdef HAVE_BG_PIXMAP
1085 if (bg_window_size_sensitive ()) 1139 if (bg_window_size_sensitive ())
1086 update_background (); 1140 update_background ();
1087#endif 1141#endif
1088 } 1142 }
1089 1143
1090 if (fix_screen || old_height == 0) 1144 if (fix_screen || old_height == 0)
1091 scr_reset (); 1145 scr_reset ();
1092 1146
1093#ifdef USE_XIM 1147#if USE_XIM
1094 im_set_position (); 1148 im_set_position ();
1095#endif 1149#endif
1096} 1150}
1097 1151
1098/* 1152/*
… …
1112 newwidth = wattr.width - szHint.base_width; 1166 newwidth = wattr.width - szHint.base_width;
1113 if (newheight == 0) 1167 if (newheight == 0)
1114 newheight = wattr.height - szHint.base_height; 1168 newheight = wattr.height - szHint.base_height;
1115 } 1169 }
1116 1170
1117 if (newwidth != width || newheight != height) 1171 if (newwidth != vt_width || newheight != vt_height)
1118 { 1172 {
1119 newwidth += szHint.base_width; 1173 newwidth += szHint.base_width;
1120 newheight += szHint.base_height; 1174 newheight += szHint.base_height;
1121 resize_all_windows (newwidth, newheight, 0); 1175 resize_all_windows (newwidth, newheight, 0);
1122 } 1176 }
1123} 1177}
1124 1178
1125/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1126 * - X INPUT METHOD ROUTINES - * 1180 * - X INPUT METHOD ROUTINES - *
1127 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1128#ifdef USE_XIM 1182#if USE_XIM
1129 1183
1130void 1184void
1131rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1185rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1132{ 1186{
1133 fg = pix_colors [Color_fg]; 1187 fg = pix_colors [Color_fg];
… …
1530 im_destroy (); 1584 im_destroy ();
1531 1585
1532 if (Input_Context) 1586 if (Input_Context)
1533 return; 1587 return;
1534 1588
1535#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1536 if (rs[Rs_imLocale]) 1589 if (rs[Rs_imLocale])
1537 SET_LOCALE (rs[Rs_imLocale]); 1590 SET_LOCALE (rs[Rs_imLocale]);
1538#endif
1539 1591
1540 p = rs[Rs_inputMethod]; 1592 p = rs[Rs_inputMethod];
1541 if (p && *p) 1593 if (p && *p)
1542 { 1594 {
1543 bool found = false; 1595 bool found = false;
… …
1571 /* 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 */
1572 if (im_get_ic ("@im=none")) 1624 if (im_get_ic ("@im=none"))
1573 goto done; 1625 goto done;
1574 1626
1575done: 1627done:
1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1577 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
1578 SET_LOCALE (locale); 1629 SET_LOCALE (locale);
1579#endif
1580} 1630}
1581 1631
1582void 1632void
1583rxvt_term::im_set_position () 1633rxvt_term::im_set_position ()
1584{ 1634{
… …
1629{ 1679{
1630 Window cr; 1680 Window cr;
1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1632} 1682}
1633 1683
1634Pixmap
1635rxvt_term::get_pixmap_property (Atom property)
1636{
1637 Pixmap pixmap = None;
1638
1639 int aformat;
1640 unsigned long nitems, bytes_after;
1641 Atom atype;
1642 unsigned char *prop;
1643 int result = XGetWindowProperty (dpy, display->root, property,
1644 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1645 &nitems, &bytes_after, &prop);
1646 if (result == Success)
1647 {
1648 if (atype == XA_PIXMAP)
1649 pixmap = *(Pixmap *)prop;
1650 XFree (prop);
1651 }
1652
1653 return pixmap;
1654}
1655
1656#ifdef HAVE_BG_PIXMAP 1684#ifdef HAVE_BG_PIXMAP
1657 1685
1658void 1686void
1659rxvt_term::update_background () 1687rxvt_term::update_background ()
1660{ 1688{
1661 if (update_background_ev.is_active ()) 1689 if (update_background_ev.is_active ())
1662 return;
1663
1664 bg_invalidate ();
1665
1666 if (!mapped)
1667 return; 1690 return;
1668 1691
1669 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1692 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1670 1693
1671 if (to_wait <= 0.) 1694 if (to_wait <= 0.)

Diff Legend

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