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.370 by sf-exg, Thu Jan 19 15:08:55 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.
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
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 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); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
242 scrollBar.destroy (); 239 scrollBar.destroy ();
243 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
244 241
245 delete drawable; 242 delete drawable;
246 // destroy all windows 243 // destroy all windows
247 if (parent[0]) 244 if (parent)
248 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
249 246
250 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
251 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
252 { 249 {
253 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
268 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 266 free (allocated [i]);
270 267
271 free (selection.text); 268 free (selection.text);
272 free (selection.clip_text); 269 free (selection.clip_text);
273 // TODO: manage env vars in child only(!)
274 free (env_display);
275 free (env_term);
276 free (locale); 270 free (locale);
277 free (v_buffer); 271 free (v_buffer);
278 free (incr_buf); 272
273 delete selection_req;
279 274
280 delete envv; 275 delete envv;
281 delete argv; 276 delete argv;
282 277
283#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
319#endif 314#endif
320 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
323#endif 318#endif
324 incr_ev.stop ();
325 termwin_ev.stop (display); 319 termwin_ev.stop (display);
326 vt_ev.stop (display); 320 vt_ev.stop (display);
327 } 321 }
328 322
329 flush_ev.stop (); 323 flush_ev.stop ();
354 348
355 delete this; 349 delete this;
356} 350}
357 351
358void 352void
359rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
360{ 354{
361 if (!opt) 355 if (!opt)
362 return; 356 return;
363 357
364 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
707 if (recalc_y) 701 if (recalc_y)
708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
709 703
710 ncol = width / fwidth; 704 ncol = width / fwidth;
711 nrow = height / fheight; 705 nrow = height / fheight;
706
707 // When the size of the vt window is not a multiple of the cell
708 // size, i.e., when the wm does not honour our size hints, there are
709 // extra areas not covered by the terminal screen. Such gaps, when a
710 // bg pixmap is set, would have to be cleared manually to properly
711 // refresh the background. We take the simpler route and shrink the
712 // vt window so as to avoid creating gaps.
713 vt_width = ncol * fwidth;
714 vt_height = nrow * fheight;
712} 715}
713 716
714/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
715/* 718/*
716 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
724 727
725 struct winsize ws; 728 struct winsize ws;
726 729
727 ws.ws_col = ncol; 730 ws.ws_col = ncol;
728 ws.ws_row = nrow; 731 ws.ws_row = nrow;
729 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
730 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
731 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
732 735
733#if 0 736#if 0
734 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
735 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
736 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
737#endif 740#endif
738} 741}
739 742
740/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
741/* set_fonts () - load and set the various fonts 744/* 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 745bool
749rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
750{ 747{
751 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
752 rxvt_fontprop prop; 749 rxvt_fontprop prop;
809#else 806#else
810 fontset[style] = fontset[0]; 807 fontset[style] = fontset[0];
811#endif 808#endif
812 } 809 }
813 810
814 if (parent[0]) 811 if (parent)
815 { 812 {
816 resize_all_windows (0, 0, 0); 813 resize_all_windows (0, 0, 0);
817 scr_remap_chars (); 814 scr_remap_chars ();
818 scr_touch (true); 815 scr_touch (true);
819 } 816 }
822} 819}
823 820
824void 821void
825rxvt_term::set_string_property (Atom prop, const char *str, int len) 822rxvt_term::set_string_property (Atom prop, const char *str, int len)
826{ 823{
827 XChangeProperty (dpy, parent[0], 824 XChangeProperty (dpy, parent,
828 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
829 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
830} 827}
831 828
832void 829void
834{ 831{
835 XTextProperty ct; 832 XTextProperty ct;
836 833
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 { 835 {
839 XSetTextProperty (dpy, parent[0], &ct, prop); 836 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value); 837 XFree (ct.value);
841 } 838 }
842} 839}
843 840
844void 841void
845rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
846{ 843{
847 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
849 846
850 XChangeProperty (dpy, parent[0], 847 XChangeProperty (dpy, parent,
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 849 (const unsigned char *)s, strlen (s));
853 850
854 free (s); 851 free (s);
855 free (ws); 852 free (ws);
945 942
946/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
947/* 944/*
948 * find if fg/bg matches any of the normal (low-intensity) colors 945 * find if fg/bg matches any of the normal (low-intensity) colors
949 */ 946 */
950void 947char *
951rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
952{ 949{
953 unsigned int i; 950 unsigned int i;
954 const char *xpmb = ""; 951 const char *xpmb = "";
955 char fstr[] = "default"; 952 char fstr[] = "default";
956 char bstr[] = "default"; 953 char bstr[] = "default";
954 char *env_colorfgbg;
957 955
958 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
959 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
960 { 958 {
961 sprintf (fstr, "%d", i - Color_Black); 959 sprintf (fstr, "%d", i - Color_Black);
970 xpmb = "default;"; 968 xpmb = "default;";
971#endif 969#endif
972 break; 970 break;
973 } 971 }
974 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
975 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
975 return env_colorfgbg;
976} 976}
977 977
978/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
979 979
980bool 980bool
1009 1009
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint) 1011 if (set_hint)
1012 { 1012 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc); 1013 szHint.flags &= ~(PBaseSize | PResizeInc);
1014 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc; 1015 szHint.flags |= PBaseSize | PResizeInc;
1016 } 1016 }
1017 1017
1018 if (!ignoreparent) 1018 if (!ignoreparent)
1019 { 1019 {
1025 int x, y, x1, y1; 1025 int x, y, x1, y1;
1026 int dx, dy; 1026 int dx, dy;
1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1028 Window unused_cr; 1028 Window unused_cr;
1029 1029
1030 XTranslateCoordinates (dpy, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent, display->root,
1031 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1034 /* 1034 /*
1035 * if display->root isn't the parent window, a WM will probably have offset 1035 * if display->root isn't the parent window, a WM will probably have offset
1036 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
1037 */ 1037 */
1054 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
1055 dy = 0; 1055 dy = 0;
1056 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
1057 dy /= 2; 1057 dy /= 2;
1058 1058
1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1060 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
1061#else 1061#else
1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1063#endif 1063#endif
1064 } 1064 }
1065 1065
1066 if (set_hint) 1066 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint); 1067 XSetWMNormalHints (dpy, parent, &szHint);
1068 1068
1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1070 1070
1071 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
1072 { 1072 {
1073 if (scrollBar.state) 1073 if (scrollBar.state)
1074 scrollBar.resize (); 1074 scrollBar.resize ();
1075 1075
1076 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1077 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1078 width, height); 1078 vt_width, vt_height);
1079 1079
1080#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1081 if (bg_window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1082 update_background (); 1082 update_background ();
1083#endif 1083#endif
1085 1085
1086 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1087 scr_reset (); 1087 scr_reset ();
1088 1088
1089#ifdef USE_XIM 1089#ifdef USE_XIM
1090 IMSetPosition (); 1090 im_set_position ();
1091#endif 1091#endif
1092} 1092}
1093 1093
1094/* 1094/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1095 * Set the width/height of the vt window in characters. Units are pixels.
1108 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1109 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1111 } 1111 }
1112 1112
1113 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1114 { 1114 {
1115 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1118 } 1118 }
1156 status_rect.height = fheight; 1156 status_rect.height = fheight;
1157} 1157}
1158 1158
1159/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1160bool 1160bool
1161rxvt_term::IMisRunning () 1161rxvt_term::im_is_running ()
1162{ 1162{
1163 Atom atom; 1163 Atom atom;
1164 Window win; 1164 Window win;
1165 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1166 1166
1182 1182
1183 return false; 1183 return false;
1184} 1184}
1185 1185
1186void 1186void
1187rxvt_term::IMSendSpot () 1187rxvt_term::im_send_spot ()
1188{ 1188{
1189 XPoint nspot; 1189 XPoint nspot;
1190 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1191 1191
1192 if (!Input_Context 1192 if (!Input_Context
1298/* 1298/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1299 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1300 * open a suitable preedit type
1301 */ 1301 */
1302bool 1302bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1303rxvt_term::im_get_ic (const char *modifiers)
1304{ 1304{
1305 int i, j, found; 1305 int i, j, found;
1306 XIM xim; 1306 XIM xim;
1307 XPoint spot; 1307 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1309 unsigned long fg, bg;
1310 const char *p; 1310 const char *p;
1311 char **s; 1311 char **s;
1312 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1313
1317 set_environ (envv); 1314 set_environ (envv);
1318 1315
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1317 return false;
1460 NULL); 1457 NULL);
1461 } 1458 }
1462#if ENABLE_XIM_ONTHESPOT 1459#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1460 else if (input_style & XIMPreeditCallbacks)
1464 { 1461 {
1462 XIMCallback xcb[4];
1463
1465 im_set_position (spot); 1464 im_set_position (spot);
1466 1465
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1466 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; 1467 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; 1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1484#endif 1483#endif
1485 1484
1486 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1487 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1490 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1492 status_attr, NULL);
1494 1493
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1506 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1508 vt_select_input ();
1510#endif 1509#endif
1511 1510
1512 IMSetPosition (); 1511 im_set_position ();
1513 1512
1514 return true; 1513 return true;
1515} 1514}
1516 1515
1517void 1516void
1527 im_destroy (); 1526 im_destroy ();
1528 1527
1529 if (Input_Context) 1528 if (Input_Context)
1530 return; 1529 return;
1531 1530
1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1533 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1534 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1535#endif
1536 1533
1537 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1538 if (p && *p) 1535 if (p && *p)
1539 { 1536 {
1540 bool found = false; 1537 bool found = false;
1545 { 1542 {
1546 if (*s[i]) 1543 if (*s[i])
1547 { 1544 {
1548 strcpy (buf, "@im="); 1545 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1546 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1547 if (im_get_ic (buf))
1551 { 1548 {
1552 found = true; 1549 found = true;
1553 break; 1550 break;
1554 } 1551 }
1555 } 1552 }
1560 if (found) 1557 if (found)
1561 goto done; 1558 goto done;
1562 } 1559 }
1563 1560
1564 /* try with XMODIFIERS env. var. */ 1561 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1562 if (im_get_ic (""))
1566 goto done; 1563 goto done;
1567 1564
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1565 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1570 goto done; 1567 goto done;
1571 1568
1572done: 1569done: ;
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1576#endif
1577} 1572}
1578 1573
1579void 1574void
1580rxvt_term::IMSetPosition () 1575rxvt_term::im_set_position ()
1581{ 1576{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1584 1579
1585 if (!Input_Context 1580 if (!Input_Context
1586 || !focus 1581 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1582 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1583 || !im_is_running ())
1589 return; 1584 return;
1590 1585
1591 if (input_style & XIMPreeditPosition) 1586 if (input_style & XIMPreeditPosition)
1592 { 1587 {
1593 im_set_size (preedit_rect); 1588 im_set_size (preedit_rect);
1623 1618
1624void 1619void
1625rxvt_term::get_window_origin (int &x, int &y) 1620rxvt_term::get_window_origin (int &x, int &y)
1626{ 1621{
1627 Window cr; 1622 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629} 1624}
1630 1625
1631Pixmap 1626Pixmap
1632rxvt_term::get_pixmap_property (Atom property) 1627rxvt_term::get_pixmap_property (Atom property)
1633{ 1628{
1658 if (update_background_ev.is_active ()) 1653 if (update_background_ev.is_active ())
1659 return; 1654 return;
1660 1655
1661 bg_invalidate (); 1656 bg_invalidate ();
1662 1657
1658 if (!mapped)
1659 return;
1660
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664 1662
1665 if (to_wait <= 0.) 1663 if (to_wait <= 0.)
1666 bg_render (); 1664 bg_render ();
1667 else 1665 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines