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.335 by root, Sun Oct 24 17:52:50 2010 UTC vs.
Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 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-2008 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.
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 97{
98 compose_char *cc; 98 compose_char *cc;
99 99
100 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 102 cc = (*this)[c1];
103 while (cc) 103 while (cc)
104 { 104 {
105 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
107 } 107 }
108 108
109 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
114 }
115 113
116 // allocate a new combination 114 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 116 {
119 static int seen; 117 static int seen;
120 118
121 if (!seen++) 119 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 121
124 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
125 } 123 }
126 124
127 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
189#endif 187#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 194
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 196
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
232#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 230 bg_destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 231#endif
241 232
242 if (display) 233 if (display)
243 { 234 {
244 selection_clear (); 235 selection_clear ();
250 scrollBar.destroy (); 241 scrollBar.destroy ();
251 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
252 243
253 delete drawable; 244 delete drawable;
254 // destroy all windows 245 // destroy all windows
255 if (parent[0]) 246 if (parent)
256 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
257 248
258 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
260 { 251 {
261 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
276 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 268 free (allocated [i]);
278 269
279 free (selection.text); 270 free (selection.text);
280 free (selection.clip_text); 271 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 272 free (locale);
285 free (v_buffer); 273 free (v_buffer);
286 free (incr_buf); 274
275 delete selection_req;
287 276
288 delete envv; 277 delete envv;
289 delete argv; 278 delete argv;
290 279
291#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
327#endif 316#endif
328 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
331#endif 320#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 321 termwin_ev.stop (display);
334 vt_ev.stop (display); 322 vt_ev.stop (display);
335 } 323 }
336 324
337 flush_ev.stop (); 325 flush_ev.stop ();
359rxvt_term::destroy_cb (ev::idle &w, int revents) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
360{ 348{
361 make_current (); 349 make_current ();
362 350
363 delete this; 351 delete this;
352}
353
354void
355rxvt_term::set_option (uint8_t opt, bool set)
356{
357 if (!opt)
358 return;
359
360 uint8_t mask = 1 << (opt & 7);
361 uint8_t &val = options [opt >> 3];
362
363 val = val & ~mask | (set ? mask : 0);
364} 364}
365 365
366/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
367/* 367/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
382print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
383{ 383{
384 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
386 char number[32]; 386 char number[32];
387 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
391 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
511 tio->c_cc[VWERSE] = CWERASE; 511 tio->c_cc[VWERSE] = CWERASE;
512# endif 512# endif
513# ifdef VLNEXT 513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
516 519
517# if VMIN != VEOF 520# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 521 tio->c_cc[VMIN] = 1;
519# endif 522# endif
520# if VTIME != VEOL 523# if VTIME != VEOL
700 if (recalc_y) 703 if (recalc_y)
701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
702 705
703 ncol = width / fwidth; 706 ncol = width / fwidth;
704 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 width = ncol * fwidth;
716 height = nrow * fheight;
705} 717}
706 718
707/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
708/* 720/*
709 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
729 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
730#endif 742#endif
731} 743}
732 744
733/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
734/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
735 *
736 * init = 1 - initialize
737 *
738 * fontname == FONT_UP - switch to bigger font
739 * fontname == FONT_DN - switch to smaller font
740 */
741bool 747bool
742rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
743{ 749{
744 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
745 rxvt_fontprop prop; 751 rxvt_fontprop prop;
802#else 808#else
803 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
804#endif 810#endif
805 } 811 }
806 812
807 if (parent[0]) 813 if (parent)
808 { 814 {
809 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
810 scr_remap_chars (); 816 scr_remap_chars ();
811 scr_touch (true); 817 scr_touch (true);
812 } 818 }
815} 821}
816 822
817void 823void
818rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
819{ 825{
820 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
821 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
822 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
823} 829}
824 830
825void 831void
827{ 833{
828 XTextProperty ct; 834 XTextProperty ct;
829 835
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 { 837 {
832 XSetTextProperty (dpy, parent[0], &ct, prop); 838 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value); 839 XFree (ct.value);
834 } 840 }
835} 841}
836 842
837void 843void
838rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
839{ 845{
840 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
841 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
842 848
843 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
845 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
846 852
847 free (s); 853 free (s);
848 free (ws); 854 free (ws);
943void 949void
944rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
945{ 951{
946 unsigned int i; 952 unsigned int i;
947 const char *xpmb = ""; 953 const char *xpmb = "";
948 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
949 956
950 strcpy (fstr, "default");
951 strcpy (bstr, "default");
952 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
953 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
954 { 959 {
955 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
956 break; 961 break;
957 } 962 }
958 963
959 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
961 { 966 {
962 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
963#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
964 xpmb = "default;"; 969 xpmb = "default;";
965#endif 970#endif
966 break; 971 break;
967 } 972 }
1003 1008
1004 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1005 if (set_hint) 1010 if (set_hint)
1006 { 1011 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc); 1012 szHint.flags &= ~(PBaseSize | PResizeInc);
1008 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc; 1014 szHint.flags |= PBaseSize | PResizeInc;
1010 } 1015 }
1011 1016
1012 if (!ignoreparent) 1017 if (!ignoreparent)
1013 { 1018 {
1019 int x, y, x1, y1; 1024 int x, y, x1, y1;
1020 int dx, dy; 1025 int dx, dy;
1021 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1022 Window unused_cr; 1027 Window unused_cr;
1023 1028
1024 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
1025 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
1026 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1027 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1028 /* 1033 /*
1029 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
1030 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
1031 */ 1036 */
1048 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1049 dy = 0; 1054 dy = 0;
1050 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1051 dy /= 2; 1056 dy /= 2;
1052 1057
1053 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1054 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1055#else 1060#else
1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1057#endif 1062#endif
1058 } 1063 }
1059 1064
1060 if (set_hint) 1065 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1062 1067
1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1064 1069
1065 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1066 { 1071 {
1070 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1071 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1072 width, height); 1077 width, height);
1073 1078
1074#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1075 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1076 update_background (); 1081 update_background ();
1077#endif 1082#endif
1078 } 1083 }
1079 1084
1080 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1081 scr_reset (); 1086 scr_reset ();
1082 1087
1083#ifdef HAVE_BG_PIXMAP
1084// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1085// if (bgPixmap.pixmap)
1086// scr_touch (false);
1087#endif
1088
1089#ifdef USE_XIM 1088#ifdef USE_XIM
1090 IMSetPosition (); 1089 im_set_position ();
1091#endif 1090#endif
1092} 1091}
1093 1092
1094/* 1093/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1094 * Set the width/height of the vt window in characters. Units are pixels.
1156 status_rect.height = fheight; 1155 status_rect.height = fheight;
1157} 1156}
1158 1157
1159/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1160bool 1159bool
1161rxvt_term::IMisRunning () 1160rxvt_term::im_is_running ()
1162{ 1161{
1163 Atom atom; 1162 Atom atom;
1164 Window win; 1163 Window win;
1165 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1166 1165
1175 1174
1176 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1177 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1178 1177
1179 if (win != None) 1178 if (win != None)
1180 return True; 1179 return true;
1181 } 1180 }
1182 1181
1183 return False; 1182 return false;
1184} 1183}
1185 1184
1186void 1185void
1187rxvt_term::IMSendSpot () 1186rxvt_term::im_send_spot ()
1188{ 1187{
1189 XPoint nspot; 1188 XPoint nspot;
1190 XVaNestedList preedit_attr; 1189 XVaNestedList preedit_attr;
1191 1190
1192 if (!Input_Context 1191 if (!Input_Context
1298/* 1297/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1298 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1299 * open a suitable preedit type
1301 */ 1300 */
1302bool 1301bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1302rxvt_term::im_get_ic (const char *modifiers)
1304{ 1303{
1305 int i, j, found; 1304 int i, j, found;
1306 XIM xim; 1305 XIM xim;
1307 XPoint spot; 1306 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1307 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1308 unsigned long fg, bg;
1310 const char *p; 1309 const char *p;
1311 char **s; 1310 char **s;
1312 XIMStyles *xim_styles; 1311 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1312
1317 set_environ (envv); 1313 set_environ (envv);
1318 1314
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1316 return false;
1341 p = pet[pi]; 1337 p = pet[pi];
1342 1338
1343 if (!p) 1339 if (!p)
1344 continue; 1340 continue;
1345 1341
1346 s = rxvt_splitcommastring (p); 1342 s = rxvt_strsplit (',', p);
1347 1343
1348 for (i = found = 0; !found && s[i]; i++) 1344 for (i = found = 0; !found && s[i]; i++)
1349 { 1345 {
1350 if (!strcmp (s[i], "OverTheSpot")) 1346 if (!strcmp (s[i], "OverTheSpot"))
1351 input_style = XIMPreeditPosition | XIMStatusNothing; 1347 input_style = XIMPreeditPosition | XIMStatusNothing;
1363 input_style = XIMPreeditNothing | XIMStatusNothing; 1359 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1360
1365 for (j = 0; j < xim_styles->count_styles; j++) 1361 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1362 if (input_style == xim_styles->supported_styles[j])
1367 { 1363 {
1368 rxvt_freecommastring (s); 1364 rxvt_free_strsplit (s);
1369 1365
1370 found = 1; 1366 found = 1;
1371 goto foundpet; 1367 goto foundpet;
1372 } 1368 }
1373 1369
1374 } 1370 }
1375 1371
1376 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1377 } 1373 }
1378 1374
1379foundpet: 1375foundpet:
1380 1376
1381 XFree (xim_styles); 1377 XFree (xim_styles);
1460 NULL); 1456 NULL);
1461 } 1457 }
1462#if ENABLE_XIM_ONTHESPOT 1458#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1459 else if (input_style & XIMPreeditCallbacks)
1464 { 1460 {
1461 XIMCallback xcb[4];
1462
1465 im_set_position (spot); 1463 im_set_position (spot);
1466 1464
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1465 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; 1466 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; 1467 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1484#endif 1482#endif
1485 1483
1486 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1486 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1487 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1489 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1491 status_attr, NULL);
1494 1492
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1505 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1506 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1507 vt_select_input ();
1510#endif 1508#endif
1511 1509
1512 IMSetPosition (); 1510 im_set_position ();
1513 1511
1514 return true; 1512 return true;
1515} 1513}
1516 1514
1517void 1515void
1537 p = rs[Rs_inputMethod]; 1535 p = rs[Rs_inputMethod];
1538 if (p && *p) 1536 if (p && *p)
1539 { 1537 {
1540 bool found = false; 1538 bool found = false;
1541 1539
1542 s = rxvt_splitcommastring (p); 1540 s = rxvt_strsplit (',', p);
1543 1541
1544 for (i = 0; s[i]; i++) 1542 for (i = 0; s[i]; i++)
1545 { 1543 {
1546 if (*s[i]) 1544 if (*s[i])
1547 { 1545 {
1548 strcpy (buf, "@im="); 1546 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1547 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1548 if (im_get_ic (buf))
1551 { 1549 {
1552 found = true; 1550 found = true;
1553 break; 1551 break;
1554 } 1552 }
1555 } 1553 }
1556 } 1554 }
1557 1555
1558 rxvt_freecommastring (s); 1556 rxvt_free_strsplit (s);
1559 1557
1560 if (found) 1558 if (found)
1561 goto done; 1559 goto done;
1562 } 1560 }
1563 1561
1564 /* try with XMODIFIERS env. var. */ 1562 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1563 if (im_get_ic (""))
1566 goto done; 1564 goto done;
1567 1565
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1566 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1567 if (im_get_ic ("@im=none"))
1570 goto done; 1568 goto done;
1571 1569
1572done: 1570done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1573 SET_LOCALE (locale);
1576#endif 1574#endif
1577} 1575}
1578 1576
1579void 1577void
1580rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1581{ 1579{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1584 1582
1585 if (!Input_Context 1583 if (!Input_Context
1586 || !focus 1584 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1586 || !im_is_running ())
1589 return; 1587 return;
1590 1588
1591 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1592 { 1590 {
1593 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
1623 1621
1624void 1622void
1625rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1626{ 1624{
1627 Window cr; 1625 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629} 1627}
1630 1628
1631Pixmap 1629Pixmap
1632rxvt_term::get_pixmap_property (int prop_id) 1630rxvt_term::get_pixmap_property (Atom property)
1633{ 1631{
1634 if (prop_id > 0 && prop_id < NUM_XA) 1632 Pixmap pixmap = None;
1635 if (xa[prop_id]) 1633
1636 {
1637 int aformat; 1634 int aformat;
1638 unsigned long nitems, bytes_after; 1635 unsigned long nitems, bytes_after;
1639 Atom atype; 1636 Atom atype;
1640 unsigned char *prop = NULL; 1637 unsigned char *prop;
1641 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1638 int result = XGetWindowProperty (dpy, display->root, property,
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop); 1640 &nitems, &bytes_after, &prop);
1644 if (result == Success && prop && atype == XA_PIXMAP) 1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1645 return *(Pixmap *)prop; 1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1646 } 1646 }
1647 1647
1648 return None; 1648 return pixmap;
1649} 1649}
1650 1650
1651#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1652 1652
1653void 1653void
1654rxvt_term::update_background () 1654rxvt_term::update_background ()
1655{ 1655{
1656 if (update_background_ev.is_active ()) 1656 if (update_background_ev.is_active ())
1657 return; 1657 return;
1658 1658
1659 bgPixmap.invalidate (); 1659 bg_invalidate ();
1660 1660
1661 if (!mapped)
1662 return;
1663
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1662 1665
1663 if (to_wait <= 0.) 1666 if (to_wait <= 0.)
1664 bgPixmap.render (); 1667 bg_render ();
1665 else 1668 else
1666 update_background_ev.start (to_wait); 1669 update_background_ev.start (to_wait);
1667} 1670}
1668 1671
1669void 1672void
1670rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1671{ 1674{
1672 make_current (); 1675 make_current ();
1673 1676
1674 update_background_ev.stop (); 1677 update_background_ev.stop ();
1675 bgPixmap.render (); 1678 bg_render ();
1676 refresh_check (); 1679 refresh_check ();
1677} 1680}
1678 1681
1679#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1680 1683

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines