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.351 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 2012 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
… …
242 scrollBar.destroy (); 241 scrollBar.destroy ();
243 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
244 243
245 delete drawable; 244 delete drawable;
246 // destroy all windows 245 // destroy all windows
247 if (parent[0]) 246 if (parent)
248 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
249 248
250 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
251 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
252 { 251 {
253 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
268 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 268 free (allocated [i]);
270 269
271 free (selection.text); 270 free (selection.text);
272 free (selection.clip_text); 271 free (selection.clip_text);
273 // TODO: manage env vars in child only(!)
274 free (env_display);
275 free (env_term);
276 free (locale); 272 free (locale);
277 free (v_buffer); 273 free (v_buffer);
278 free (incr_buf); 274
275 delete selection_req;
279 276
280 delete envv; 277 delete envv;
281 delete argv; 278 delete argv;
282 279
283#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
… …
319#endif 316#endif
320 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
323#endif 320#endif
324 incr_ev.stop ();
325 termwin_ev.stop (display); 321 termwin_ev.stop (display);
326 vt_ev.stop (display); 322 vt_ev.stop (display);
327 } 323 }
328 324
329 flush_ev.stop (); 325 flush_ev.stop ();
… …
707 if (recalc_y) 703 if (recalc_y)
708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
709 705
710 ncol = width / fwidth; 706 ncol = width / fwidth;
711 nrow = height / fheight; 707 nrow = height / fheight;
708
709 // When the size of the vt window is not a multiple of the cell
710 // 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
712 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps.
715 vt_width = ncol * fwidth;
716 vt_height = nrow * fheight;
712} 717}
713 718
714/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
715/* 720/*
716 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
724 729
725 struct winsize ws; 730 struct winsize ws;
726 731
727 ws.ws_col = ncol; 732 ws.ws_col = ncol;
728 ws.ws_row = nrow; 733 ws.ws_row = nrow;
729 ws.ws_xpixel = width; 734 ws.ws_xpixel = vt_width;
730 ws.ws_ypixel = height; 735 ws.ws_ypixel = vt_height;
731 ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
732 737
733#if 0 738#if 0
734 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
735 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
736 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
737#endif 742#endif
738} 743}
739 744
740/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
741/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
742 *
743 * init = 1 - initialize
744 *
745 * fontname == FONT_UP - switch to bigger font
746 * fontname == FONT_DN - switch to smaller font
747 */
748bool 747bool
749rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
750{ 749{
751 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
752 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
809#else 808#else
810 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
811#endif 810#endif
812 } 811 }
813 812
814 if (parent[0]) 813 if (parent)
815 { 814 {
816 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
817 scr_remap_chars (); 816 scr_remap_chars ();
818 scr_touch (true); 817 scr_touch (true);
819 } 818 }
… …
822} 821}
823 822
824void 823void
825rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
826{ 825{
827 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
828 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
829 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
830} 829}
831 830
832void 831void
… …
834{ 833{
835 XTextProperty ct; 834 XTextProperty ct;
836 835
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 { 837 {
839 XSetTextProperty (dpy, parent[0], &ct, prop); 838 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value); 839 XFree (ct.value);
841 } 840 }
842} 841}
843 842
844void 843void
845rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
846{ 845{
847 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
849 848
850 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
853 852
854 free (s); 853 free (s);
855 free (ws); 854 free (ws);
… …
945 944
946/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
947/* 946/*
948 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
949 */ 948 */
950void 949char *
951rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
952{ 951{
953 unsigned int i; 952 unsigned int i;
954 const char *xpmb = ""; 953 const char *xpmb = "";
955 char fstr[] = "default"; 954 char fstr[] = "default";
956 char bstr[] = "default"; 955 char bstr[] = "default";
956 char *env_colorfgbg;
957 957
958 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
959 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
960 { 960 {
961 sprintf (fstr, "%d", i - Color_Black); 961 sprintf (fstr, "%d", i - Color_Black);
… …
970 xpmb = "default;"; 970 xpmb = "default;";
971#endif 971#endif
972 break; 972 break;
973 } 973 }
974 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
975 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 976 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
977 return env_colorfgbg;
976} 978}
977 979
978/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
979 981
980bool 982bool
… …
1009 1011
1010 // 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
1011 if (set_hint) 1013 if (set_hint)
1012 { 1014 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc); 1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1014 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc; 1017 szHint.flags |= PBaseSize | PResizeInc;
1016 } 1018 }
1017 1019
1018 if (!ignoreparent) 1020 if (!ignoreparent)
1019 { 1021 {
… …
1025 int x, y, x1, y1; 1027 int x, y, x1, y1;
1026 int dx, dy; 1028 int dx, dy;
1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1028 Window unused_cr; 1030 Window unused_cr;
1029 1031
1030 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1031 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1034 /* 1036 /*
1035 * 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
1036 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1037 */ 1039 */
… …
1054 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1055 dy = 0; 1057 dy = 0;
1056 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1057 dy /= 2; 1059 dy /= 2;
1058 1060
1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1060 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1061#else 1063#else
1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1063#endif 1065#endif
1064 } 1066 }
1065 1067
1066 if (set_hint) 1068 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint); 1069 XSetWMNormalHints (dpy, parent, &szHint);
1068 1070
1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1070 1072
1071 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1072 { 1074 {
1073 if (scrollBar.state) 1075 if (scrollBar.state)
1074 scrollBar.resize (); 1076 scrollBar.resize ();
1075 1077
1076 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1077 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1078 width, height); 1080 vt_width, vt_height);
1079 1081
1080#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1081 if (bg_window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1082 update_background (); 1084 update_background ();
1083#endif 1085#endif
… …
1085 1087
1086 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1087 scr_reset (); 1089 scr_reset ();
1088 1090
1089#ifdef USE_XIM 1091#ifdef USE_XIM
1090 IMSetPosition (); 1092 im_set_position ();
1091#endif 1093#endif
1092} 1094}
1093 1095
1094/* 1096/*
1095 * 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.
… …
1108 newwidth = wattr.width - szHint.base_width; 1110 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1111 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1112 newheight = wattr.height - szHint.base_height;
1111 } 1113 }
1112 1114
1113 if (newwidth != width || newheight != height) 1115 if (newwidth != vt_width || newheight != vt_height)
1114 { 1116 {
1115 newwidth += szHint.base_width; 1117 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1118 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1119 resize_all_windows (newwidth, newheight, 0);
1118 } 1120 }
… …
1156 status_rect.height = fheight; 1158 status_rect.height = fheight;
1157} 1159}
1158 1160
1159/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1160bool 1162bool
1161rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1162{ 1164{
1163 Atom atom; 1165 Atom atom;
1164 Window win; 1166 Window win;
1165 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1166 1168
… …
1182 1184
1183 return false; 1185 return false;
1184} 1186}
1185 1187
1186void 1188void
1187rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1188{ 1190{
1189 XPoint nspot; 1191 XPoint nspot;
1190 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1191 1193
1192 if (!Input_Context 1194 if (!Input_Context
… …
1298/* 1300/*
1299 * 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
1300 * open a suitable preedit type 1302 * open a suitable preedit type
1301 */ 1303 */
1302bool 1304bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1304{ 1306{
1305 int i, j, found; 1307 int i, j, found;
1306 XIM xim; 1308 XIM xim;
1307 XPoint spot; 1309 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1311 unsigned long fg, bg;
1310 const char *p; 1312 const char *p;
1311 char **s; 1313 char **s;
1312 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1315
1317 set_environ (envv); 1316 set_environ (envv);
1318 1317
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1319 return false;
… …
1460 NULL); 1459 NULL);
1461 } 1460 }
1462#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1464 { 1463 {
1464 XIMCallback xcb[4];
1465
1465 im_set_position (spot); 1466 im_set_position (spot);
1466 1467
1467 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;
1468 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;
1469 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;
… …
1484#endif 1485#endif
1485 1486
1486 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1489 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1492 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1494 status_attr, NULL);
1494 1495
… …
1507 // 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
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1510 vt_select_input ();
1510#endif 1511#endif
1511 1512
1512 IMSetPosition (); 1513 im_set_position ();
1513 1514
1514 return true; 1515 return true;
1515} 1516}
1516 1517
1517void 1518void
… …
1545 { 1546 {
1546 if (*s[i]) 1547 if (*s[i])
1547 { 1548 {
1548 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1551 { 1552 {
1552 found = true; 1553 found = true;
1553 break; 1554 break;
1554 } 1555 }
1555 } 1556 }
… …
1560 if (found) 1561 if (found)
1561 goto done; 1562 goto done;
1562 } 1563 }
1563 1564
1564 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1566 goto done; 1567 goto done;
1567 1568
1568 /* 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 */
1569 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1570 goto done; 1571 goto done;
1571 1572
1572done: 1573done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1576#endif 1577#endif
1577} 1578}
1578 1579
1579void 1580void
1580rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1581{ 1582{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1584 1585
1585 if (!Input_Context 1586 if (!Input_Context
1586 || !focus 1587 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1589 || !im_is_running ())
1589 return; 1590 return;
1590 1591
1591 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1592 { 1593 {
1593 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1623 1624
1624void 1625void
1625rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1626{ 1627{
1627 Window cr; 1628 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629} 1630}
1630 1631
1631Pixmap 1632Pixmap
1632rxvt_term::get_pixmap_property (Atom property) 1633rxvt_term::get_pixmap_property (Atom property)
1633{ 1634{
… …
1658 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1659 return; 1660 return;
1660 1661
1661 bg_invalidate (); 1662 bg_invalidate ();
1662 1663
1664 if (!mapped)
1665 return;
1666
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664 1668
1665 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1666 bg_render (); 1670 bg_render ();
1667 else 1671 else

Diff Legend

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