… | |
… | |
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. |
… | |
… | |
96 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
96 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
97 | { |
97 | { |
98 | compose_char *cc; |
98 | compose_char *cc; |
99 | |
99 | |
100 | // break compose chains, as stupid readline really likes to duplicate |
100 | // break compose chains, as stupid readline really likes to duplicate |
101 | // composing characters for some reason near the end of a line. |
101 | // composing characters for some reason, near the end of a line. |
102 | cc = (*this)[c1]; |
102 | cc = (*this)[c1]; |
103 | while (cc) |
103 | while (cc) |
104 | { |
104 | { |
105 | if (cc->c2 == c2) return c1; |
105 | if (cc->c2 == c2) return c1; |
106 | cc = (*this)[cc->c1]; |
106 | cc = (*this)[cc->c1]; |
107 | } |
107 | } |
108 | |
108 | |
109 | // check to see whether this combination already exists otherwise |
109 | // check to see whether this combination already exists otherwise |
110 | for (cc = v.end (); cc-- > v.begin (); ) |
110 | for (cc = v.end (); cc-- > v.begin (); ) |
111 | { |
|
|
112 | if (cc->c1 == c1 && cc->c2 == c2) |
111 | if (cc->c1 == c1 && cc->c2 == c2) |
113 | return COMPOSE_LO + (cc - v.begin ()); |
112 | return COMPOSE_LO + (cc - v.begin ()); |
114 | } |
|
|
115 | |
113 | |
116 | // allocate a new combination |
114 | // allocate a new combination |
117 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
115 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
118 | { |
116 | { |
119 | static int seen; |
117 | static int seen; |
120 | |
118 | |
121 | if (!seen++) |
119 | if (!seen++) |
122 | fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); |
120 | rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n"); |
123 | |
121 | |
124 | return REPLACEMENT_CHAR; |
122 | return REPLACEMENT_CHAR; |
125 | } |
123 | } |
126 | |
124 | |
127 | v.push_back (compose_char (c1, c2)); |
125 | v.push_back (compose_char (c1, c2)); |
… | |
… | |
189 | #endif |
187 | #endif |
190 | child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); |
188 | child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); |
191 | flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); |
189 | flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); |
192 | destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); |
190 | destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); |
193 | pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); |
191 | pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); |
194 | incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); |
|
|
195 | termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
192 | termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
196 | vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
193 | vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
197 | |
194 | |
198 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
195 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
199 | |
196 | |
… | |
… | |
228 | delete fontset[i]; |
225 | delete fontset[i]; |
229 | #endif |
226 | #endif |
230 | delete fontset[0]; |
227 | delete fontset[0]; |
231 | |
228 | |
232 | #ifdef HAVE_BG_PIXMAP |
229 | #ifdef HAVE_BG_PIXMAP |
233 | bgPixmap.destroy (); |
230 | bg_destroy (); |
234 | #endif |
|
|
235 | #ifdef HAVE_AFTERIMAGE |
|
|
236 | if (asv) |
|
|
237 | destroy_asvisual (asv, 0); |
|
|
238 | if (asimman) |
|
|
239 | destroy_image_manager (asimman, 0); |
|
|
240 | #endif |
231 | #endif |
241 | |
232 | |
242 | if (display) |
233 | if (display) |
243 | { |
234 | { |
244 | selection_clear (); |
235 | selection_clear (); |
… | |
… | |
250 | scrollBar.destroy (); |
241 | scrollBar.destroy (); |
251 | if (gc) XFreeGC (dpy, gc); |
242 | if (gc) XFreeGC (dpy, gc); |
252 | |
243 | |
253 | delete drawable; |
244 | delete drawable; |
254 | // destroy all windows |
245 | // destroy all windows |
255 | if (parent[0]) |
246 | if (parent) |
256 | XDestroyWindow (dpy, parent[0]); |
247 | XDestroyWindow (dpy, parent); |
257 | |
248 | |
258 | for (int i = 0; i < TOTAL_COLORS; i++) |
249 | for (int i = 0; i < TOTAL_COLORS; i++) |
259 | if (ISSET_PIXCOLOR (i)) |
250 | if (ISSET_PIXCOLOR (i)) |
260 | { |
251 | { |
261 | pix_colors_focused [i].free (this); |
252 | pix_colors_focused [i].free (this); |
… | |
… | |
281 | // TODO: manage env vars in child only(!) |
272 | // TODO: manage env vars in child only(!) |
282 | free (env_display); |
273 | free (env_display); |
283 | free (env_term); |
274 | free (env_term); |
284 | free (locale); |
275 | free (locale); |
285 | free (v_buffer); |
276 | free (v_buffer); |
286 | free (incr_buf); |
277 | |
|
|
278 | delete selection_req; |
287 | |
279 | |
288 | delete envv; |
280 | delete envv; |
289 | delete argv; |
281 | delete argv; |
290 | |
282 | |
291 | #ifdef KEYSYM_RESOURCE |
283 | #ifdef KEYSYM_RESOURCE |
… | |
… | |
327 | #endif |
319 | #endif |
328 | scrollbar_ev.stop (display); |
320 | scrollbar_ev.stop (display); |
329 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
321 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
330 | rootwin_ev.stop (display); |
322 | rootwin_ev.stop (display); |
331 | #endif |
323 | #endif |
332 | incr_ev.stop (); |
|
|
333 | termwin_ev.stop (display); |
324 | termwin_ev.stop (display); |
334 | vt_ev.stop (display); |
325 | vt_ev.stop (display); |
335 | } |
326 | } |
336 | |
327 | |
337 | flush_ev.stop (); |
328 | flush_ev.stop (); |
… | |
… | |
744 | kill (-cmd_pid, SIGWINCH); |
735 | kill (-cmd_pid, SIGWINCH); |
745 | #endif |
736 | #endif |
746 | } |
737 | } |
747 | |
738 | |
748 | /*----------------------------------------------------------------------*/ |
739 | /*----------------------------------------------------------------------*/ |
749 | /* set_fonts () - load and set the various fonts |
740 | /* load and set the various fonts */ |
750 | * |
|
|
751 | * init = 1 - initialize |
|
|
752 | * |
|
|
753 | * fontname == FONT_UP - switch to bigger font |
|
|
754 | * fontname == FONT_DN - switch to smaller font |
|
|
755 | */ |
|
|
756 | bool |
741 | bool |
757 | rxvt_term::set_fonts () |
742 | rxvt_term::set_fonts () |
758 | { |
743 | { |
759 | rxvt_fontset *fs = new rxvt_fontset (this); |
744 | rxvt_fontset *fs = new rxvt_fontset (this); |
760 | rxvt_fontprop prop; |
745 | rxvt_fontprop prop; |
… | |
… | |
817 | #else |
802 | #else |
818 | fontset[style] = fontset[0]; |
803 | fontset[style] = fontset[0]; |
819 | #endif |
804 | #endif |
820 | } |
805 | } |
821 | |
806 | |
822 | if (parent[0]) |
807 | if (parent) |
823 | { |
808 | { |
824 | resize_all_windows (0, 0, 0); |
809 | resize_all_windows (0, 0, 0); |
825 | scr_remap_chars (); |
810 | scr_remap_chars (); |
826 | scr_touch (true); |
811 | scr_touch (true); |
827 | } |
812 | } |
… | |
… | |
830 | } |
815 | } |
831 | |
816 | |
832 | void |
817 | void |
833 | rxvt_term::set_string_property (Atom prop, const char *str, int len) |
818 | rxvt_term::set_string_property (Atom prop, const char *str, int len) |
834 | { |
819 | { |
835 | XChangeProperty (dpy, parent[0], |
820 | XChangeProperty (dpy, parent, |
836 | prop, XA_STRING, 8, PropModeReplace, |
821 | prop, XA_STRING, 8, PropModeReplace, |
837 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
822 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
838 | } |
823 | } |
839 | |
824 | |
840 | void |
825 | void |
… | |
… | |
842 | { |
827 | { |
843 | XTextProperty ct; |
828 | XTextProperty ct; |
844 | |
829 | |
845 | if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) |
830 | if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) |
846 | { |
831 | { |
847 | XSetTextProperty (dpy, parent[0], &ct, prop); |
832 | XSetTextProperty (dpy, parent, &ct, prop); |
848 | XFree (ct.value); |
833 | XFree (ct.value); |
849 | } |
834 | } |
850 | } |
835 | } |
851 | |
836 | |
852 | void |
837 | void |
853 | rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
838 | rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
854 | { |
839 | { |
855 | wchar_t *ws = rxvt_mbstowcs (str, len); |
840 | wchar_t *ws = rxvt_mbstowcs (str, len); |
856 | char *s = rxvt_wcstoutf8 (ws); |
841 | char *s = rxvt_wcstoutf8 (ws); |
857 | |
842 | |
858 | XChangeProperty (dpy, parent[0], |
843 | XChangeProperty (dpy, parent, |
859 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
844 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
860 | (const unsigned char *)s, strlen (s)); |
845 | (const unsigned char *)s, strlen (s)); |
861 | |
846 | |
862 | free (s); |
847 | free (s); |
863 | free (ws); |
848 | free (ws); |
… | |
… | |
958 | void |
943 | void |
959 | rxvt_term::set_colorfgbg () |
944 | rxvt_term::set_colorfgbg () |
960 | { |
945 | { |
961 | unsigned int i; |
946 | unsigned int i; |
962 | const char *xpmb = ""; |
947 | const char *xpmb = ""; |
963 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
948 | char fstr[] = "default"; |
|
|
949 | char bstr[] = "default"; |
964 | |
950 | |
965 | strcpy (fstr, "default"); |
|
|
966 | strcpy (bstr, "default"); |
|
|
967 | for (i = Color_Black; i <= Color_White; i++) |
951 | for (i = Color_Black; i <= Color_White; i++) |
968 | if (pix_colors[Color_fg] == pix_colors[i]) |
952 | if (pix_colors[Color_fg] == pix_colors[i]) |
969 | { |
953 | { |
970 | sprintf (fstr, "%d", (i - Color_Black)); |
954 | sprintf (fstr, "%d", i - Color_Black); |
971 | break; |
955 | break; |
972 | } |
956 | } |
973 | |
957 | |
974 | for (i = Color_Black; i <= Color_White; i++) |
958 | for (i = Color_Black; i <= Color_White; i++) |
975 | if (pix_colors[Color_bg] == pix_colors[i]) |
959 | if (pix_colors[Color_bg] == pix_colors[i]) |
976 | { |
960 | { |
977 | sprintf (bstr, "%d", (i - Color_Black)); |
961 | sprintf (bstr, "%d", i - Color_Black); |
978 | #ifdef BG_IMAGE_FROM_FILE |
962 | #ifdef BG_IMAGE_FROM_FILE |
979 | xpmb = "default;"; |
963 | xpmb = "default;"; |
980 | #endif |
964 | #endif |
981 | break; |
965 | break; |
982 | } |
966 | } |
… | |
… | |
1018 | |
1002 | |
1019 | // 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 |
1020 | if (set_hint) |
1004 | if (set_hint) |
1021 | { |
1005 | { |
1022 | szHint.flags &= ~(PBaseSize | PResizeInc); |
1006 | szHint.flags &= ~(PBaseSize | PResizeInc); |
1023 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1007 | XSetWMNormalHints (dpy, parent, &szHint); |
1024 | szHint.flags |= PBaseSize | PResizeInc; |
1008 | szHint.flags |= PBaseSize | PResizeInc; |
1025 | } |
1009 | } |
1026 | |
1010 | |
1027 | if (!ignoreparent) |
1011 | if (!ignoreparent) |
1028 | { |
1012 | { |
… | |
… | |
1034 | int x, y, x1, y1; |
1018 | int x, y, x1, y1; |
1035 | int dx, dy; |
1019 | int dx, dy; |
1036 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1020 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1037 | Window unused_cr; |
1021 | Window unused_cr; |
1038 | |
1022 | |
1039 | XTranslateCoordinates (dpy, parent[0], display->root, |
1023 | XTranslateCoordinates (dpy, parent, display->root, |
1040 | 0, 0, &x, &y, &unused_cr); |
1024 | 0, 0, &x, &y, &unused_cr); |
1041 | XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, |
1025 | XGetGeometry (dpy, parent, &unused_cr, &x1, &y1, |
1042 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1026 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1043 | /* |
1027 | /* |
1044 | * 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 |
1045 | * our position for handles and decorations. Counter it |
1029 | * our position for handles and decorations. Counter it |
1046 | */ |
1030 | */ |
… | |
… | |
1063 | if (y < y1) /* top half */ |
1047 | if (y < y1) /* top half */ |
1064 | dy = 0; |
1048 | dy = 0; |
1065 | else if (y == y1) /* exact center */ |
1049 | else if (y == y1) /* exact center */ |
1066 | dy /= 2; |
1050 | dy /= 2; |
1067 | |
1051 | |
1068 | XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, |
1052 | XMoveResizeWindow (dpy, parent, x + dx, y + dy, |
1069 | szHint.width, szHint.height); |
1053 | szHint.width, szHint.height); |
1070 | #else |
1054 | #else |
1071 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
1055 | XResizeWindow (dpy, parent, szHint.width, szHint.height); |
1072 | #endif |
1056 | #endif |
1073 | } |
1057 | } |
1074 | |
1058 | |
1075 | if (set_hint) |
1059 | if (set_hint) |
1076 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1060 | XSetWMNormalHints (dpy, parent, &szHint); |
1077 | |
1061 | |
1078 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1062 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1079 | |
1063 | |
1080 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1064 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1081 | { |
1065 | { |
… | |
… | |
1085 | XMoveResizeWindow (dpy, vt, |
1069 | XMoveResizeWindow (dpy, vt, |
1086 | window_vt_x, window_vt_y, |
1070 | window_vt_x, window_vt_y, |
1087 | width, height); |
1071 | width, height); |
1088 | |
1072 | |
1089 | #ifdef HAVE_BG_PIXMAP |
1073 | #ifdef HAVE_BG_PIXMAP |
1090 | if (bgPixmap.window_size_sensitive ()) |
1074 | if (bg_window_size_sensitive ()) |
1091 | update_background (); |
1075 | update_background (); |
1092 | #endif |
1076 | #endif |
1093 | } |
1077 | } |
1094 | |
1078 | |
1095 | if (fix_screen || old_height == 0) |
1079 | if (fix_screen || old_height == 0) |
1096 | scr_reset (); |
1080 | scr_reset (); |
1097 | |
|
|
1098 | #ifdef HAVE_BG_PIXMAP |
|
|
1099 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
|
|
1100 | // if (bgPixmap.pixmap) |
|
|
1101 | // scr_touch (false); |
|
|
1102 | #endif |
|
|
1103 | |
1081 | |
1104 | #ifdef USE_XIM |
1082 | #ifdef USE_XIM |
1105 | IMSetPosition (); |
1083 | IMSetPosition (); |
1106 | #endif |
1084 | #endif |
1107 | } |
1085 | } |
… | |
… | |
1190 | |
1168 | |
1191 | atom = XInternAtom (dpy, server, False); |
1169 | atom = XInternAtom (dpy, server, False); |
1192 | win = XGetSelectionOwner (dpy, atom); |
1170 | win = XGetSelectionOwner (dpy, atom); |
1193 | |
1171 | |
1194 | if (win != None) |
1172 | if (win != None) |
1195 | return True; |
1173 | return true; |
1196 | } |
1174 | } |
1197 | |
1175 | |
1198 | return False; |
1176 | return false; |
1199 | } |
1177 | } |
1200 | |
1178 | |
1201 | void |
1179 | void |
1202 | rxvt_term::IMSendSpot () |
1180 | rxvt_term::IMSendSpot () |
1203 | { |
1181 | { |
… | |
… | |
1356 | p = pet[pi]; |
1334 | p = pet[pi]; |
1357 | |
1335 | |
1358 | if (!p) |
1336 | if (!p) |
1359 | continue; |
1337 | continue; |
1360 | |
1338 | |
1361 | s = rxvt_splitcommastring (p); |
1339 | s = rxvt_strsplit (',', p); |
1362 | |
1340 | |
1363 | for (i = found = 0; !found && s[i]; i++) |
1341 | for (i = found = 0; !found && s[i]; i++) |
1364 | { |
1342 | { |
1365 | if (!strcmp (s[i], "OverTheSpot")) |
1343 | if (!strcmp (s[i], "OverTheSpot")) |
1366 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1344 | input_style = XIMPreeditPosition | XIMStatusNothing; |
… | |
… | |
1378 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1356 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1379 | |
1357 | |
1380 | for (j = 0; j < xim_styles->count_styles; j++) |
1358 | for (j = 0; j < xim_styles->count_styles; j++) |
1381 | if (input_style == xim_styles->supported_styles[j]) |
1359 | if (input_style == xim_styles->supported_styles[j]) |
1382 | { |
1360 | { |
1383 | rxvt_freecommastring (s); |
1361 | rxvt_free_strsplit (s); |
1384 | |
1362 | |
1385 | found = 1; |
1363 | found = 1; |
1386 | goto foundpet; |
1364 | goto foundpet; |
1387 | } |
1365 | } |
1388 | |
1366 | |
1389 | } |
1367 | } |
1390 | |
1368 | |
1391 | rxvt_freecommastring (s); |
1369 | rxvt_free_strsplit (s); |
1392 | } |
1370 | } |
1393 | |
1371 | |
1394 | foundpet: |
1372 | foundpet: |
1395 | |
1373 | |
1396 | XFree (xim_styles); |
1374 | XFree (xim_styles); |
… | |
… | |
1499 | #endif |
1477 | #endif |
1500 | |
1478 | |
1501 | Input_Context = XCreateIC (xim, |
1479 | Input_Context = XCreateIC (xim, |
1502 | XNInputStyle, input_style, |
1480 | XNInputStyle, input_style, |
1503 | XNClientWindow, vt, |
1481 | XNClientWindow, vt, |
1504 | XNFocusWindow, parent[0], |
1482 | XNFocusWindow, parent, |
1505 | preedit_attr ? XNPreeditAttributes : NULL, |
1483 | preedit_attr ? XNPreeditAttributes : NULL, |
1506 | preedit_attr, |
1484 | preedit_attr, |
1507 | status_attr ? XNStatusAttributes : NULL, |
1485 | status_attr ? XNStatusAttributes : NULL, |
1508 | status_attr, NULL); |
1486 | status_attr, NULL); |
1509 | |
1487 | |
… | |
… | |
1552 | p = rs[Rs_inputMethod]; |
1530 | p = rs[Rs_inputMethod]; |
1553 | if (p && *p) |
1531 | if (p && *p) |
1554 | { |
1532 | { |
1555 | bool found = false; |
1533 | bool found = false; |
1556 | |
1534 | |
1557 | s = rxvt_splitcommastring (p); |
1535 | s = rxvt_strsplit (',', p); |
1558 | |
1536 | |
1559 | for (i = 0; s[i]; i++) |
1537 | for (i = 0; s[i]; i++) |
1560 | { |
1538 | { |
1561 | if (*s[i]) |
1539 | if (*s[i]) |
1562 | { |
1540 | { |
… | |
… | |
1568 | break; |
1546 | break; |
1569 | } |
1547 | } |
1570 | } |
1548 | } |
1571 | } |
1549 | } |
1572 | |
1550 | |
1573 | rxvt_freecommastring (s); |
1551 | rxvt_free_strsplit (s); |
1574 | |
1552 | |
1575 | if (found) |
1553 | if (found) |
1576 | goto done; |
1554 | goto done; |
1577 | } |
1555 | } |
1578 | |
1556 | |
… | |
… | |
1638 | |
1616 | |
1639 | void |
1617 | void |
1640 | rxvt_term::get_window_origin (int &x, int &y) |
1618 | rxvt_term::get_window_origin (int &x, int &y) |
1641 | { |
1619 | { |
1642 | Window cr; |
1620 | Window cr; |
1643 | XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); |
1621 | XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); |
1644 | } |
1622 | } |
1645 | |
1623 | |
1646 | Pixmap |
1624 | Pixmap |
1647 | rxvt_term::get_pixmap_property (Atom property) |
1625 | rxvt_term::get_pixmap_property (Atom property) |
1648 | { |
1626 | { |
… | |
… | |
1671 | rxvt_term::update_background () |
1649 | rxvt_term::update_background () |
1672 | { |
1650 | { |
1673 | if (update_background_ev.is_active ()) |
1651 | if (update_background_ev.is_active ()) |
1674 | return; |
1652 | return; |
1675 | |
1653 | |
1676 | bgPixmap.invalidate (); |
1654 | bg_invalidate (); |
1677 | |
1655 | |
1678 | ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); |
1656 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1679 | |
1657 | |
1680 | if (to_wait <= 0.) |
1658 | if (to_wait <= 0.) |
1681 | bgPixmap.render (); |
1659 | bg_render (); |
1682 | else |
1660 | else |
1683 | update_background_ev.start (to_wait); |
1661 | update_background_ev.start (to_wait); |
1684 | } |
1662 | } |
1685 | |
1663 | |
1686 | void |
1664 | void |
1687 | rxvt_term::update_background_cb (ev::timer &w, int revents) |
1665 | rxvt_term::update_background_cb (ev::timer &w, int revents) |
1688 | { |
1666 | { |
1689 | make_current (); |
1667 | make_current (); |
1690 | |
1668 | |
1691 | update_background_ev.stop (); |
1669 | update_background_ev.stop (); |
1692 | bgPixmap.render (); |
1670 | bg_render (); |
1693 | refresh_check (); |
1671 | refresh_check (); |
1694 | } |
1672 | } |
1695 | |
1673 | |
1696 | #endif /* HAVE_BG_PIXMAP */ |
1674 | #endif /* HAVE_BG_PIXMAP */ |
1697 | |
1675 | |