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.346 by sf-exg, Sat Jan 8 10:37:21 2011 UTC vs.
Revision 1.361 by sf-exg, Sun Aug 21 20:13:58 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.
… …
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.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 113
114 // allocate a new combination 114 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
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 ();
… …
713 if (recalc_y) 706 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 708
716 ncol = width / fwidth; 709 ncol = width / fwidth;
717 nrow = height / fheight; 710 nrow = height / fheight;
711
712 // When the size of the vt window is not a multiple of the cell
713 // size, i.e., when the wm does not honour our size hints, there are
714 // extra areas not covered by the terminal screen. Such gaps, when a
715 // bg pixmap is set, would have to be cleared manually to properly
716 // refresh the background. We take the simpler route and shrink the
717 // vt window so as to avoid creating gaps.
718 width = ncol * fwidth;
719 height = nrow * fheight;
718} 720}
719 721
720/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
721/* 723/*
722 * Tell the teletype handler what size the window is. 724 * Tell the teletype handler what size the window is.
… …
742 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
743#endif 745#endif
744} 746}
745 747
746/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 749/* 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 750bool
755rxvt_term::set_fonts () 751rxvt_term::set_fonts ()
756{ 752{
757 rxvt_fontset *fs = new rxvt_fontset (this); 753 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 754 rxvt_fontprop prop;
… …
815#else 811#else
816 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
817#endif 813#endif
818 } 814 }
819 815
820 if (parent[0]) 816 if (parent)
821 { 817 {
822 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 819 scr_remap_chars ();
824 scr_touch (true); 820 scr_touch (true);
825 } 821 }
… …
828} 824}
829 825
830void 826void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 828{
833 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 832}
837 833
838void 834void
… …
840{ 836{
841 XTextProperty ct; 837 XTextProperty ct;
842 838
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 840 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 841 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 842 XFree (ct.value);
847 } 843 }
848} 844}
849 845
850void 846void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 848{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
855 851
856 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
859 855
860 free (s); 856 free (s);
861 free (ws); 857 free (ws);
… …
1015 1011
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint) 1013 if (set_hint)
1018 { 1014 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1017 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1018 }
1023 1019
1024 if (!ignoreparent) 1020 if (!ignoreparent)
1025 { 1021 {
… …
1031 int x, y, x1, y1; 1027 int x, y, x1, y1;
1032 int dx, dy; 1028 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1030 Window unused_cr;
1035 1031
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1036 /*
1041 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
1042 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1043 */ 1039 */
… …
1060 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1061 dy = 0; 1057 dy = 0;
1062 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1063 dy /= 2; 1059 dy /= 2;
1064 1060
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1067#else 1063#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1065#endif
1070 } 1066 }
1071 1067
1072 if (set_hint) 1068 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1069 XSetWMNormalHints (dpy, parent, &szHint);
1074 1070
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1072
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1074 {
… …
1082 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1084 width, height); 1080 width, height);
1085 1081
1086#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1088 update_background (); 1084 update_background ();
1089#endif 1085#endif
1090 } 1086 }
1091 1087
1092 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1093 scr_reset (); 1089 scr_reset ();
1094 1090
1095#ifdef HAVE_BG_PIXMAP
1096// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1097// if (bgPixmap.pixmap)
1098// scr_touch (false);
1099#endif
1100
1101#ifdef USE_XIM 1091#ifdef USE_XIM
1102 IMSetPosition (); 1092 im_set_position ();
1103#endif 1093#endif
1104} 1094}
1105 1095
1106/* 1096/*
1107 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1168 status_rect.height = fheight; 1158 status_rect.height = fheight;
1169} 1159}
1170 1160
1171/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1172bool 1162bool
1173rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1174{ 1164{
1175 Atom atom; 1165 Atom atom;
1176 Window win; 1166 Window win;
1177 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1178 1168
… …
1187 1177
1188 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1189 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1190 1180
1191 if (win != None) 1181 if (win != None)
1192 return True; 1182 return true;
1193 } 1183 }
1194 1184
1195 return False; 1185 return false;
1196} 1186}
1197 1187
1198void 1188void
1199rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1200{ 1190{
1201 XPoint nspot; 1191 XPoint nspot;
1202 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1203 1193
1204 if (!Input_Context 1194 if (!Input_Context
… …
1310/* 1300/*
1311 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1312 * open a suitable preedit type 1302 * open a suitable preedit type
1313 */ 1303 */
1314bool 1304bool
1315rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1316{ 1306{
1317 int i, j, found; 1307 int i, j, found;
1318 XIM xim; 1308 XIM xim;
1319 XPoint spot; 1309 XPoint spot;
1320 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1321 unsigned long fg, bg; 1311 unsigned long fg, bg;
1322 const char *p; 1312 const char *p;
1323 char **s; 1313 char **s;
1324 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1325#ifdef ENABLE_XIM_ONTHESPOT
1326 XIMCallback xcb[4];
1327#endif
1328 1315
1329 set_environ (envv); 1316 set_environ (envv);
1330 1317
1331 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1332 return false; 1319 return false;
… …
1353 p = pet[pi]; 1340 p = pet[pi];
1354 1341
1355 if (!p) 1342 if (!p)
1356 continue; 1343 continue;
1357 1344
1358 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1359 1346
1360 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1361 { 1348 {
1362 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1363 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1375 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1376 1363
1377 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1378 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1379 { 1366 {
1380 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1381 1368
1382 found = 1; 1369 found = 1;
1383 goto foundpet; 1370 goto foundpet;
1384 } 1371 }
1385 1372
1386 } 1373 }
1387 1374
1388 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1389 } 1376 }
1390 1377
1391foundpet: 1378foundpet:
1392 1379
1393 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1472 NULL); 1459 NULL);
1473 } 1460 }
1474#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1475 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1476 { 1463 {
1464 XIMCallback xcb[4];
1465
1477 im_set_position (spot); 1466 im_set_position (spot);
1478 1467
1479 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1480 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1481 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1496#endif 1485#endif
1497 1486
1498 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1499 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1500 XNClientWindow, vt, 1489 XNClientWindow, vt,
1501 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1502 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1503 preedit_attr, 1492 preedit_attr,
1504 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1505 status_attr, NULL); 1494 status_attr, NULL);
1506 1495
… …
1519 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1520 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1521 vt_select_input (); 1510 vt_select_input ();
1522#endif 1511#endif
1523 1512
1524 IMSetPosition (); 1513 im_set_position ();
1525 1514
1526 return true; 1515 return true;
1527} 1516}
1528 1517
1529void 1518void
… …
1549 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1550 if (p && *p) 1539 if (p && *p)
1551 { 1540 {
1552 bool found = false; 1541 bool found = false;
1553 1542
1554 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1555 1544
1556 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1557 { 1546 {
1558 if (*s[i]) 1547 if (*s[i])
1559 { 1548 {
1560 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1561 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1562 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1563 { 1552 {
1564 found = true; 1553 found = true;
1565 break; 1554 break;
1566 } 1555 }
1567 } 1556 }
1568 } 1557 }
1569 1558
1570 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1571 1560
1572 if (found) 1561 if (found)
1573 goto done; 1562 goto done;
1574 } 1563 }
1575 1564
1576 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1577 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1578 goto done; 1567 goto done;
1579 1568
1580 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1581 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1582 goto done; 1571 goto done;
1583 1572
1584done: 1573done:
1585#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1586 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1587 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1588#endif 1577#endif
1589} 1578}
1590 1579
1591void 1580void
1592rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1593{ 1582{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1596 1585
1597 if (!Input_Context 1586 if (!Input_Context
1598 || !focus 1587 || !focus
1599 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1589 || !im_is_running ())
1601 return; 1590 return;
1602 1591
1603 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1604 { 1593 {
1605 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1635 1624
1636void 1625void
1637rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1638{ 1627{
1639 Window cr; 1628 Window cr;
1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1641} 1630}
1642 1631
1643Pixmap 1632Pixmap
1644rxvt_term::get_pixmap_property (Atom property) 1633rxvt_term::get_pixmap_property (Atom property)
1645{ 1634{
… …
1668rxvt_term::update_background () 1657rxvt_term::update_background ()
1669{ 1658{
1670 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1671 return; 1660 return;
1672 1661
1673 bgPixmap.invalidate (); 1662 bg_invalidate ();
1674 1663
1664 if (!mapped)
1665 return;
1666
1675 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1676 1668
1677 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1678 bgPixmap.render (); 1670 bg_render ();
1679 else 1671 else
1680 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1681} 1673}
1682 1674
1683void 1675void
1684rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1685{ 1677{
1686 make_current (); 1678 make_current ();
1687 1679
1688 update_background_ev.stop (); 1680 update_background_ev.stop ();
1689 bgPixmap.render (); 1681 bg_render ();
1690 refresh_check (); 1682 refresh_check ();
1691} 1683}
1692 1684
1693#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1694 1686

Diff Legend

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