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.345 by root, Sat Jan 8 10:17:43 2011 UTC vs.
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 2011 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-2010 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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.
… …
187#endif 187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 194
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 196
… …
226 delete fontset[i]; 225 delete fontset[i];
227#endif 226#endif
228 delete fontset[0]; 227 delete fontset[0];
229 228
230#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 230 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 231#endif
239 232
240 if (display) 233 if (display)
241 { 234 {
242 selection_clear (); 235 selection_clear ();
… …
248 scrollBar.destroy (); 241 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
250 243
251 delete drawable; 244 delete drawable;
252 // destroy all windows 245 // destroy all windows
253 if (parent[0]) 246 if (parent)
254 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
255 248
256 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
258 { 251 {
259 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
279 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
280 free (env_display); 273 free (env_display);
281 free (env_term); 274 free (env_term);
282 free (locale); 275 free (locale);
283 free (v_buffer); 276 free (v_buffer);
284 free (incr_buf); 277
278 delete selection_req;
285 279
286 delete envv; 280 delete envv;
287 delete argv; 281 delete argv;
288 282
289#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
325#endif 319#endif
326 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
329#endif 323#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 324 termwin_ev.stop (display);
332 vt_ev.stop (display); 325 vt_ev.stop (display);
333 } 326 }
334 327
335 flush_ev.stop (); 328 flush_ev.stop ();
… …
742 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
743#endif 736#endif
744} 737}
745 738
746/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
748 *
749 * init = 1 - initialize
750 *
751 * fontname == FONT_UP - switch to bigger font
752 * fontname == FONT_DN - switch to smaller font
753 */
754bool 741bool
755rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
756{ 743{
757 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
815#else 802#else
816 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
817#endif 804#endif
818 } 805 }
819 806
820 if (parent[0]) 807 if (parent)
821 { 808 {
822 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 810 scr_remap_chars ();
824 scr_touch (true); 811 scr_touch (true);
825 } 812 }
… …
828} 815}
829 816
830void 817void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 819{
833 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 823}
837 824
838void 825void
… …
840{ 827{
841 XTextProperty ct; 828 XTextProperty ct;
842 829
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 831 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 832 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 833 XFree (ct.value);
847 } 834 }
848} 835}
849 836
850void 837void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 839{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
855 842
856 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
859 846
860 free (s); 847 free (s);
861 free (ws); 848 free (ws);
… …
956void 943void
957rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
958{ 945{
959 unsigned int i; 946 unsigned int i;
960 const char *xpmb = ""; 947 const char *xpmb = "";
961 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
962 950
963 strcpy (fstr, "default");
964 strcpy (bstr, "default");
965 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
967 { 953 {
968 sprintf (fstr, "%d", i - Color_Black); 954 sprintf (fstr, "%d", i - Color_Black);
969 break; 955 break;
… …
1016 1002
1017 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1018 if (set_hint) 1004 if (set_hint)
1019 { 1005 {
1020 szHint.flags &= ~(PBaseSize | PResizeInc); 1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1021 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1022 szHint.flags |= PBaseSize | PResizeInc; 1008 szHint.flags |= PBaseSize | PResizeInc;
1023 } 1009 }
1024 1010
1025 if (!ignoreparent) 1011 if (!ignoreparent)
1026 { 1012 {
… …
1032 int x, y, x1, y1; 1018 int x, y, x1, y1;
1033 int dx, dy; 1019 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1021 Window unused_cr;
1036 1022
1037 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1038 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1027 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1044 */ 1030 */
… …
1061 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1062 dy = 0; 1048 dy = 0;
1063 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1064 dy /= 2; 1050 dy /= 2;
1065 1051
1066 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1067 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1068#else 1054#else
1069 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1070#endif 1056#endif
1071 } 1057 }
1072 1058
1073 if (set_hint) 1059 if (set_hint)
1074 XSetWMNormalHints (dpy, parent[0], &szHint); 1060 XSetWMNormalHints (dpy, parent, &szHint);
1075 1061
1076 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1077 1063
1078 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1079 { 1065 {
… …
1083 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1084 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1085 width, height); 1071 width, height);
1086 1072
1087#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1088 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1089 update_background (); 1075 update_background ();
1090#endif 1076#endif
1091 } 1077 }
1092 1078
1093 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1094 scr_reset (); 1080 scr_reset ();
1095 1081
1096#ifdef HAVE_BG_PIXMAP
1097// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1098// if (bgPixmap.pixmap)
1099// scr_touch (false);
1100#endif
1101
1102#ifdef USE_XIM 1082#ifdef USE_XIM
1103 IMSetPosition (); 1083 im_set_position ();
1104#endif 1084#endif
1105} 1085}
1106 1086
1107/* 1087/*
1108 * Set the width/height of the vt window in characters. Units are pixels. 1088 * Set the width/height of the vt window in characters. Units are pixels.
… …
1169 status_rect.height = fheight; 1149 status_rect.height = fheight;
1170} 1150}
1171 1151
1172/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1173bool 1153bool
1174rxvt_term::IMisRunning () 1154rxvt_term::im_is_running ()
1175{ 1155{
1176 Atom atom; 1156 Atom atom;
1177 Window win; 1157 Window win;
1178 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1179 1159
… …
1188 1168
1189 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1190 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1191 1171
1192 if (win != None) 1172 if (win != None)
1193 return True; 1173 return true;
1194 } 1174 }
1195 1175
1196 return False; 1176 return false;
1197} 1177}
1198 1178
1199void 1179void
1200rxvt_term::IMSendSpot () 1180rxvt_term::im_send_spot ()
1201{ 1181{
1202 XPoint nspot; 1182 XPoint nspot;
1203 XVaNestedList preedit_attr; 1183 XVaNestedList preedit_attr;
1204 1184
1205 if (!Input_Context 1185 if (!Input_Context
… …
1311/* 1291/*
1312 * Try to open a XIM with the current modifiers, then see if we can 1292 * Try to open a XIM with the current modifiers, then see if we can
1313 * open a suitable preedit type 1293 * open a suitable preedit type
1314 */ 1294 */
1315bool 1295bool
1316rxvt_term::IM_get_IC (const char *modifiers) 1296rxvt_term::im_get_ic (const char *modifiers)
1317{ 1297{
1318 int i, j, found; 1298 int i, j, found;
1319 XIM xim; 1299 XIM xim;
1320 XPoint spot; 1300 XPoint spot;
1321 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1322 unsigned long fg, bg; 1302 unsigned long fg, bg;
1323 const char *p; 1303 const char *p;
1324 char **s; 1304 char **s;
1325 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1326#ifdef ENABLE_XIM_ONTHESPOT
1327 XIMCallback xcb[4];
1328#endif
1329 1306
1330 set_environ (envv); 1307 set_environ (envv);
1331 1308
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1310 return false;
… …
1354 p = pet[pi]; 1331 p = pet[pi];
1355 1332
1356 if (!p) 1333 if (!p)
1357 continue; 1334 continue;
1358 1335
1359 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1360 1337
1361 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1362 { 1339 {
1363 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1364 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1376 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1377 1354
1378 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1379 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1380 { 1357 {
1381 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1382 1359
1383 found = 1; 1360 found = 1;
1384 goto foundpet; 1361 goto foundpet;
1385 } 1362 }
1386 1363
1387 } 1364 }
1388 1365
1389 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1390 } 1367 }
1391 1368
1392foundpet: 1369foundpet:
1393 1370
1394 XFree (xim_styles); 1371 XFree (xim_styles);
… …
1473 NULL); 1450 NULL);
1474 } 1451 }
1475#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1476 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1477 { 1454 {
1455 XIMCallback xcb[4];
1456
1478 im_set_position (spot); 1457 im_set_position (spot);
1479 1458
1480 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1481 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1482 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1497#endif 1476#endif
1498 1477
1499 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1500 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1501 XNClientWindow, vt, 1480 XNClientWindow, vt,
1502 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1503 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1504 preedit_attr, 1483 preedit_attr,
1505 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1506 status_attr, NULL); 1485 status_attr, NULL);
1507 1486
… …
1520 // unfortunately, only the focus window is used by XIM, hard to fix 1499 // unfortunately, only the focus window is used by XIM, hard to fix
1521 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1500 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1522 vt_select_input (); 1501 vt_select_input ();
1523#endif 1502#endif
1524 1503
1525 IMSetPosition (); 1504 im_set_position ();
1526 1505
1527 return true; 1506 return true;
1528} 1507}
1529 1508
1530void 1509void
… …
1550 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1551 if (p && *p) 1530 if (p && *p)
1552 { 1531 {
1553 bool found = false; 1532 bool found = false;
1554 1533
1555 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1556 1535
1557 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1558 { 1537 {
1559 if (*s[i]) 1538 if (*s[i])
1560 { 1539 {
1561 strcpy (buf, "@im="); 1540 strcpy (buf, "@im=");
1562 strncat (buf, s[i], IMBUFSIZ - 5); 1541 strncat (buf, s[i], IMBUFSIZ - 5);
1563 if (IM_get_IC (buf)) 1542 if (im_get_ic (buf))
1564 { 1543 {
1565 found = true; 1544 found = true;
1566 break; 1545 break;
1567 } 1546 }
1568 } 1547 }
1569 } 1548 }
1570 1549
1571 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1572 1551
1573 if (found) 1552 if (found)
1574 goto done; 1553 goto done;
1575 } 1554 }
1576 1555
1577 /* try with XMODIFIERS env. var. */ 1556 /* try with XMODIFIERS env. var. */
1578 if (IM_get_IC ("")) 1557 if (im_get_ic (""))
1579 goto done; 1558 goto done;
1580 1559
1581 /* try with no modifiers base IF the user didn't specify an IM */ 1560 /* try with no modifiers base IF the user didn't specify an IM */
1582 if (IM_get_IC ("@im=none")) 1561 if (im_get_ic ("@im=none"))
1583 goto done; 1562 goto done;
1584 1563
1585done: 1564done:
1586#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1565#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1587 if (rs[Rs_imLocale]) 1566 if (rs[Rs_imLocale])
1588 SET_LOCALE (locale); 1567 SET_LOCALE (locale);
1589#endif 1568#endif
1590} 1569}
1591 1570
1592void 1571void
1593rxvt_term::IMSetPosition () 1572rxvt_term::im_set_position ()
1594{ 1573{
1595 XRectangle preedit_rect, status_rect, *needed_rect; 1574 XRectangle preedit_rect, status_rect, *needed_rect;
1596 XVaNestedList preedit_attr, status_attr; 1575 XVaNestedList preedit_attr, status_attr;
1597 1576
1598 if (!Input_Context 1577 if (!Input_Context
1599 || !focus 1578 || !focus
1600 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1579 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1601 || !IMisRunning ()) 1580 || !im_is_running ())
1602 return; 1581 return;
1603 1582
1604 if (input_style & XIMPreeditPosition) 1583 if (input_style & XIMPreeditPosition)
1605 { 1584 {
1606 im_set_size (preedit_rect); 1585 im_set_size (preedit_rect);
… …
1636 1615
1637void 1616void
1638rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1639{ 1618{
1640 Window cr; 1619 Window cr;
1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1642} 1621}
1643 1622
1644Pixmap 1623Pixmap
1645rxvt_term::get_pixmap_property (Atom property) 1624rxvt_term::get_pixmap_property (Atom property)
1646{ 1625{
… …
1669rxvt_term::update_background () 1648rxvt_term::update_background ()
1670{ 1649{
1671 if (update_background_ev.is_active ()) 1650 if (update_background_ev.is_active ())
1672 return; 1651 return;
1673 1652
1674 bgPixmap.invalidate (); 1653 bg_invalidate ();
1675 1654
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1656
1678 if (to_wait <= 0.) 1657 if (to_wait <= 0.)
1679 bgPixmap.render (); 1658 bg_render ();
1680 else 1659 else
1681 update_background_ev.start (to_wait); 1660 update_background_ev.start (to_wait);
1682} 1661}
1683 1662
1684void 1663void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1665{
1687 make_current (); 1666 make_current ();
1688 1667
1689 update_background_ev.stop (); 1668 update_background_ev.stop ();
1690 bgPixmap.render (); 1669 bg_render ();
1691 refresh_check (); 1670 refresh_check ();
1692} 1671}
1693 1672
1694#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1695 1674

Diff Legend

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