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.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
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 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 229#endif
239 230
240 if (display) 231 if (display)
241 { 232 {
242 selection_clear (); 233 selection_clear ();
… …
248 scrollBar.destroy (); 239 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
250 241
251 delete drawable; 242 delete drawable;
252 // destroy all windows 243 // destroy all windows
253 if (parent[0]) 244 if (parent)
254 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
255 246
256 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
258 { 249 {
259 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 266 free (allocated [i]);
276 267
277 free (selection.text); 268 free (selection.text);
278 free (selection.clip_text); 269 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 270 free (locale);
283 free (v_buffer); 271 free (v_buffer);
284 free (incr_buf); 272
273 delete selection_req;
285 274
286 delete envv; 275 delete envv;
287 delete argv; 276 delete argv;
288 277
289#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
325#endif 314#endif
326 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
329#endif 318#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 319 termwin_ev.stop (display);
332 vt_ev.stop (display); 320 vt_ev.stop (display);
333 } 321 }
334 322
335 flush_ev.stop (); 323 flush_ev.stop ();
… …
360 348
361 delete this; 349 delete this;
362} 350}
363 351
364void 352void
365rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 354{
367 if (!opt) 355 if (!opt)
368 return; 356 return;
369 357
370 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
713 if (recalc_y) 701 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 703
716 ncol = width / fwidth; 704 ncol = width / fwidth;
717 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;
718} 715}
719 716
720/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
721/* 718/*
722 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
730 727
731 struct winsize ws; 728 struct winsize ws;
732 729
733 ws.ws_col = ncol; 730 ws.ws_col = ncol;
734 ws.ws_row = nrow; 731 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 735
739#if 0 736#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
743#endif 740#endif
744} 741}
745 742
746/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 744/* 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 745bool
755rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
756{ 747{
757 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
815#else 806#else
816 fontset[style] = fontset[0]; 807 fontset[style] = fontset[0];
817#endif 808#endif
818 } 809 }
819 810
820 if (parent[0]) 811 if (parent)
821 { 812 {
822 resize_all_windows (0, 0, 0); 813 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 814 scr_remap_chars ();
824 scr_touch (true); 815 scr_touch (true);
825 } 816 }
… …
828} 819}
829 820
830void 821void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 822rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 823{
833 XChangeProperty (dpy, parent[0], 824 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 827}
837 828
838void 829void
… …
840{ 831{
841 XTextProperty ct; 832 XTextProperty ct;
842 833
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 835 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 836 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 837 XFree (ct.value);
847 } 838 }
848} 839}
849 840
850void 841void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 843{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
855 846
856 XChangeProperty (dpy, parent[0], 847 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 849 (const unsigned char *)s, strlen (s));
859 850
860 free (s); 851 free (s);
861 free (ws); 852 free (ws);
… …
951 942
952/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
953/* 944/*
954 * 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
955 */ 946 */
956void 947char *
957rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
958{ 949{
959 unsigned int i; 950 unsigned int i;
960 const char *xpmb = ""; 951 const char *xpmb = "";
961 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
954 char *env_colorfgbg;
962 955
963 strcpy (fstr, "default");
964 strcpy (bstr, "default");
965 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
967 { 958 {
968 sprintf (fstr, "%d", i - Color_Black); 959 sprintf (fstr, "%d", i - Color_Black);
969 break; 960 break;
… …
977 xpmb = "default;"; 968 xpmb = "default;";
978#endif 969#endif
979 break; 970 break;
980 } 971 }
981 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
982 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;
983} 976}
984 977
985/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
986 979
987bool 980bool
… …
1016 1009
1017 // 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
1018 if (set_hint) 1011 if (set_hint)
1019 { 1012 {
1020 szHint.flags &= ~(PBaseSize | PResizeInc); 1013 szHint.flags &= ~(PBaseSize | PResizeInc);
1021 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent, &szHint);
1022 szHint.flags |= PBaseSize | PResizeInc; 1015 szHint.flags |= PBaseSize | PResizeInc;
1023 } 1016 }
1024 1017
1025 if (!ignoreparent) 1018 if (!ignoreparent)
1026 { 1019 {
… …
1032 int x, y, x1, y1; 1025 int x, y, x1, y1;
1033 int dx, dy; 1026 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1028 Window unused_cr;
1036 1029
1037 XTranslateCoordinates (dpy, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent, display->root,
1038 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1034 /*
1042 * 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
1043 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
1044 */ 1037 */
… …
1061 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
1062 dy = 0; 1055 dy = 0;
1063 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
1064 dy /= 2; 1057 dy /= 2;
1065 1058
1066 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1067 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
1068#else 1061#else
1069 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1070#endif 1063#endif
1071 } 1064 }
1072 1065
1073 if (set_hint) 1066 if (set_hint)
1074 XSetWMNormalHints (dpy, parent[0], &szHint); 1067 XSetWMNormalHints (dpy, parent, &szHint);
1075 1068
1076 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1077 1070
1078 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
1079 { 1072 {
1080 if (scrollBar.state) 1073 if (scrollBar.state)
1081 scrollBar.resize (); 1074 scrollBar.resize ();
1082 1075
1083 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1084 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1085 width, height); 1078 vt_width, vt_height);
1086 1079
1087#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1088 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1089 update_background (); 1082 update_background ();
1090#endif 1083#endif
1091 } 1084 }
1092 1085
1093 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1094 scr_reset (); 1087 scr_reset ();
1095 1088
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 1089#ifdef USE_XIM
1103 IMSetPosition (); 1090 im_set_position ();
1104#endif 1091#endif
1105} 1092}
1106 1093
1107/* 1094/*
1108 * 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.
… …
1121 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1122 if (newheight == 0) 1109 if (newheight == 0)
1123 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1124 } 1111 }
1125 1112
1126 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1127 { 1114 {
1128 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1129 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1130 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1131 } 1118 }
… …
1169 status_rect.height = fheight; 1156 status_rect.height = fheight;
1170} 1157}
1171 1158
1172/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1173bool 1160bool
1174rxvt_term::IMisRunning () 1161rxvt_term::im_is_running ()
1175{ 1162{
1176 Atom atom; 1163 Atom atom;
1177 Window win; 1164 Window win;
1178 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1179 1166
… …
1188 1175
1189 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1190 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1191 1178
1192 if (win != None) 1179 if (win != None)
1193 return True; 1180 return true;
1194 } 1181 }
1195 1182
1196 return False; 1183 return false;
1197} 1184}
1198 1185
1199void 1186void
1200rxvt_term::IMSendSpot () 1187rxvt_term::im_send_spot ()
1201{ 1188{
1202 XPoint nspot; 1189 XPoint nspot;
1203 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1204 1191
1205 if (!Input_Context 1192 if (!Input_Context
… …
1311/* 1298/*
1312 * 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
1313 * open a suitable preedit type 1300 * open a suitable preedit type
1314 */ 1301 */
1315bool 1302bool
1316rxvt_term::IM_get_IC (const char *modifiers) 1303rxvt_term::im_get_ic (const char *modifiers)
1317{ 1304{
1318 int i, j, found; 1305 int i, j, found;
1319 XIM xim; 1306 XIM xim;
1320 XPoint spot; 1307 XPoint spot;
1321 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1322 unsigned long fg, bg; 1309 unsigned long fg, bg;
1323 const char *p; 1310 const char *p;
1324 char **s; 1311 char **s;
1325 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1326#ifdef ENABLE_XIM_ONTHESPOT
1327 XIMCallback xcb[4];
1328#endif
1329 1313
1330 set_environ (envv); 1314 set_environ (envv);
1331 1315
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1317 return false;
… …
1354 p = pet[pi]; 1338 p = pet[pi];
1355 1339
1356 if (!p) 1340 if (!p)
1357 continue; 1341 continue;
1358 1342
1359 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1360 1344
1361 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1362 { 1346 {
1363 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1364 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1376 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1377 1361
1378 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1379 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1380 { 1364 {
1381 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1382 1366
1383 found = 1; 1367 found = 1;
1384 goto foundpet; 1368 goto foundpet;
1385 } 1369 }
1386 1370
1387 } 1371 }
1388 1372
1389 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1390 } 1374 }
1391 1375
1392foundpet: 1376foundpet:
1393 1377
1394 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1473 NULL); 1457 NULL);
1474 } 1458 }
1475#if ENABLE_XIM_ONTHESPOT 1459#if ENABLE_XIM_ONTHESPOT
1476 else if (input_style & XIMPreeditCallbacks) 1460 else if (input_style & XIMPreeditCallbacks)
1477 { 1461 {
1462 XIMCallback xcb[4];
1463
1478 im_set_position (spot); 1464 im_set_position (spot);
1479 1465
1480 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;
1481 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;
1482 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;
… …
1497#endif 1483#endif
1498 1484
1499 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1500 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1501 XNClientWindow, vt, 1487 XNClientWindow, vt,
1502 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1503 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1504 preedit_attr, 1490 preedit_attr,
1505 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1506 status_attr, NULL); 1492 status_attr, NULL);
1507 1493
… …
1520 // 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
1521 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1522 vt_select_input (); 1508 vt_select_input ();
1523#endif 1509#endif
1524 1510
1525 IMSetPosition (); 1511 im_set_position ();
1526 1512
1527 return true; 1513 return true;
1528} 1514}
1529 1515
1530void 1516void
… …
1540 im_destroy (); 1526 im_destroy ();
1541 1527
1542 if (Input_Context) 1528 if (Input_Context)
1543 return; 1529 return;
1544 1530
1545#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1546 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1547 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1548#endif
1549 1533
1550 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1551 if (p && *p) 1535 if (p && *p)
1552 { 1536 {
1553 bool found = false; 1537 bool found = false;
1554 1538
1555 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1556 1540
1557 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1558 { 1542 {
1559 if (*s[i]) 1543 if (*s[i])
1560 { 1544 {
1561 strcpy (buf, "@im="); 1545 strcpy (buf, "@im=");
1562 strncat (buf, s[i], IMBUFSIZ - 5); 1546 strncat (buf, s[i], IMBUFSIZ - 5);
1563 if (IM_get_IC (buf)) 1547 if (im_get_ic (buf))
1564 { 1548 {
1565 found = true; 1549 found = true;
1566 break; 1550 break;
1567 } 1551 }
1568 } 1552 }
1569 } 1553 }
1570 1554
1571 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1572 1556
1573 if (found) 1557 if (found)
1574 goto done; 1558 goto done;
1575 } 1559 }
1576 1560
1577 /* try with XMODIFIERS env. var. */ 1561 /* try with XMODIFIERS env. var. */
1578 if (IM_get_IC ("")) 1562 if (im_get_ic (""))
1579 goto done; 1563 goto done;
1580 1564
1581 /* 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 */
1582 if (IM_get_IC ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1583 goto done; 1567 goto done;
1584 1568
1585done: 1569done: ;
1586#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1587 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1588 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1589#endif
1590} 1572}
1591 1573
1592void 1574void
1593rxvt_term::IMSetPosition () 1575rxvt_term::im_set_position ()
1594{ 1576{
1595 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1596 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1597 1579
1598 if (!Input_Context 1580 if (!Input_Context
1599 || !focus 1581 || !focus
1600 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1582 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1601 || !IMisRunning ()) 1583 || !im_is_running ())
1602 return; 1584 return;
1603 1585
1604 if (input_style & XIMPreeditPosition) 1586 if (input_style & XIMPreeditPosition)
1605 { 1587 {
1606 im_set_size (preedit_rect); 1588 im_set_size (preedit_rect);
… …
1636 1618
1637void 1619void
1638rxvt_term::get_window_origin (int &x, int &y) 1620rxvt_term::get_window_origin (int &x, int &y)
1639{ 1621{
1640 Window cr; 1622 Window cr;
1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1642} 1624}
1643 1625
1644Pixmap 1626Pixmap
1645rxvt_term::get_pixmap_property (Atom property) 1627rxvt_term::get_pixmap_property (Atom property)
1646{ 1628{
… …
1669rxvt_term::update_background () 1651rxvt_term::update_background ()
1670{ 1652{
1671 if (update_background_ev.is_active ()) 1653 if (update_background_ev.is_active ())
1672 return; 1654 return;
1673 1655
1674 bgPixmap.invalidate (); 1656 bg_invalidate ();
1675 1657
1658 if (!mapped)
1659 return;
1660
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1662
1678 if (to_wait <= 0.) 1663 if (to_wait <= 0.)
1679 bgPixmap.render (); 1664 bg_render ();
1680 else 1665 else
1681 update_background_ev.start (to_wait); 1666 update_background_ev.start (to_wait);
1682} 1667}
1683 1668
1684void 1669void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1671{
1687 make_current (); 1672 make_current ();
1688 1673
1689 update_background_ev.stop (); 1674 update_background_ev.stop ();
1690 bgPixmap.render (); 1675 bg_render ();
1691 refresh_check (); 1676 refresh_check ();
1692} 1677}
1693 1678
1694#endif /* HAVE_BG_PIXMAP */ 1679#endif /* HAVE_BG_PIXMAP */
1695 1680

Diff Legend

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