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.338 by root, Tue Dec 7 19:47:02 2010 UTC vs.
Revision 1.371 by sf-exg, Thu Jan 19 15:44:49 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.
… …
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
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
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 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
189#endif 185#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 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); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
232#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 228 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 229#endif
241 230
242 if (display) 231 if (display)
243 { 232 {
244 selection_clear (); 233 selection_clear ();
… …
250 scrollBar.destroy (); 239 scrollBar.destroy ();
251 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
252 241
253 delete drawable; 242 delete drawable;
254 // destroy all windows 243 // destroy all windows
255 if (parent[0]) 244 if (parent)
256 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
257 246
258 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
260 { 249 {
261 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
276 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 266 free (allocated [i]);
278 267
279 free (selection.text); 268 free (selection.text);
280 free (selection.clip_text); 269 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 270 free (locale);
285 free (v_buffer); 271 free (v_buffer);
286 free (incr_buf); 272
273 delete selection_req;
287 274
288 delete envv; 275 delete envv;
289 delete argv; 276 delete argv;
290 277
291#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
327#endif 314#endif
328 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
331#endif 318#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 319 termwin_ev.stop (display);
334 vt_ev.stop (display); 320 vt_ev.stop (display);
335 } 321 }
336 322
337 flush_ev.stop (); 323 flush_ev.stop ();
… …
362 348
363 delete this; 349 delete this;
364} 350}
365 351
366void 352void
367rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{ 354{
369 if (!opt) 355 if (!opt)
370 return; 356 return;
371 357
372 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
394print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
395{ 381{
396 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
398 char number[32]; 384 char number[32];
399 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
715 if (recalc_y) 701 if (recalc_y)
716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
717 703
718 ncol = width / fwidth; 704 ncol = width / fwidth;
719 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;
720} 715}
721 716
722/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
723/* 718/*
724 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
732 727
733 struct winsize ws; 728 struct winsize ws;
734 729
735 ws.ws_col = ncol; 730 ws.ws_col = ncol;
736 ws.ws_row = nrow; 731 ws.ws_row = nrow;
737 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
738 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
739 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
740 735
741#if 0 736#if 0
742 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
743 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
744 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
745#endif 740#endif
746} 741}
747 742
748/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
749/* set_fonts () - load and set the various fonts 744/* load and set the various fonts */
750 *
751 * init = 1 - initialize
752 *
753 * fontname == FONT_UP - switch to bigger font
754 * fontname == FONT_DN - switch to smaller font
755 */
756bool 745bool
757rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
758{ 747{
759 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
760 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
817#else 806#else
818 fontset[style] = fontset[0]; 807 fontset[style] = fontset[0];
819#endif 808#endif
820 } 809 }
821 810
822 if (parent[0]) 811 if (parent)
823 { 812 {
824 resize_all_windows (0, 0, 0); 813 resize_all_windows (0, 0, 0);
825 scr_remap_chars (); 814 scr_remap_chars ();
826 scr_touch (true); 815 scr_touch (true);
827 } 816 }
… …
830} 819}
831 820
832void 821void
833rxvt_term::set_string_property (Atom prop, const char *str, int len) 822rxvt_term::set_string_property (Atom prop, const char *str, int len)
834{ 823{
835 XChangeProperty (dpy, parent[0], 824 XChangeProperty (dpy, parent,
836 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
837 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
838} 827}
839 828
840void 829void
… …
842{ 831{
843 XTextProperty ct; 832 XTextProperty ct;
844 833
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 { 835 {
847 XSetTextProperty (dpy, parent[0], &ct, prop); 836 XSetTextProperty (dpy, parent, &ct, prop);
848 XFree (ct.value); 837 XFree (ct.value);
849 } 838 }
850} 839}
851 840
852void 841void
853rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 843{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
857 846
858 XChangeProperty (dpy, parent[0], 847 XChangeProperty (dpy, parent,
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 849 (const unsigned char *)s, strlen (s));
861 850
862 free (s); 851 free (s);
863 free (ws); 852 free (ws);
… …
953 942
954/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
955/* 944/*
956 * 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
957 */ 946 */
958void 947char *
959rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
960{ 949{
961 unsigned int i; 950 unsigned int i;
962 const char *xpmb = ""; 951 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
954 char *env_colorfgbg;
964 955
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
969 { 958 {
970 sprintf (fstr, "%d", (i - Color_Black)); 959 sprintf (fstr, "%d", i - Color_Black);
971 break; 960 break;
972 } 961 }
973 962
974 for (i = Color_Black; i <= Color_White; i++) 963 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 964 if (pix_colors[Color_bg] == pix_colors[i])
976 { 965 {
977 sprintf (bstr, "%d", (i - Color_Black)); 966 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 967#ifdef BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 968 xpmb = "default;";
980#endif 969#endif
981 break; 970 break;
982 } 971 }
983 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
984 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;
985} 976}
986 977
987/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
988 979
989bool 980bool
… …
1018 1009
1019 // 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
1020 if (set_hint) 1011 if (set_hint)
1021 { 1012 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc); 1013 szHint.flags &= ~(PBaseSize | PResizeInc);
1023 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent, &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc; 1015 szHint.flags |= PBaseSize | PResizeInc;
1025 } 1016 }
1026 1017
1027 if (!ignoreparent) 1018 if (!ignoreparent)
1028 { 1019 {
… …
1034 int x, y, x1, y1; 1025 int x, y, x1, y1;
1035 int dx, dy; 1026 int dx, dy;
1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1037 Window unused_cr; 1028 Window unused_cr;
1038 1029
1039 XTranslateCoordinates (dpy, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent, display->root,
1040 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1043 /* 1034 /*
1044 * 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
1045 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
1046 */ 1037 */
… …
1063 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
1064 dy = 0; 1055 dy = 0;
1065 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
1066 dy /= 2; 1057 dy /= 2;
1067 1058
1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1069 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
1070#else 1061#else
1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1072#endif 1063#endif
1073 } 1064 }
1074 1065
1075 if (set_hint) 1066 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint); 1067 XSetWMNormalHints (dpy, parent, &szHint);
1077 1068
1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1079 1070
1080 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
1081 { 1072 {
1082 if (scrollBar.state) 1073 if (scrollBar.state)
1083 scrollBar.resize (); 1074 scrollBar.resize ();
1084 1075
1085 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1087 width, height); 1078 vt_width, vt_height);
1088 1079
1089#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1090 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1091 update_background (); 1082 update_background ();
1092#endif 1083#endif
1093 } 1084 }
1094 1085
1095 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1096 scr_reset (); 1087 scr_reset ();
1097 1088
1098#ifdef HAVE_BG_PIXMAP
1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100// if (bgPixmap.pixmap)
1101// scr_touch (false);
1102#endif
1103
1104#ifdef USE_XIM 1089#ifdef USE_XIM
1105 IMSetPosition (); 1090 im_set_position ();
1106#endif 1091#endif
1107} 1092}
1108 1093
1109/* 1094/*
1110 * 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.
… …
1123 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1109 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1126 } 1111 }
1127 1112
1128 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1129 { 1114 {
1130 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1131 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1132 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1133 } 1118 }
… …
1171 status_rect.height = fheight; 1156 status_rect.height = fheight;
1172} 1157}
1173 1158
1174/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1175bool 1160bool
1176rxvt_term::IMisRunning () 1161rxvt_term::im_is_running ()
1177{ 1162{
1178 Atom atom; 1163 Atom atom;
1179 Window win; 1164 Window win;
1180 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1181 1166
… …
1190 1175
1191 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1193 1178
1194 if (win != None) 1179 if (win != None)
1195 return True; 1180 return true;
1196 } 1181 }
1197 1182
1198 return False; 1183 return false;
1199} 1184}
1200 1185
1201void 1186void
1202rxvt_term::IMSendSpot () 1187rxvt_term::im_send_spot ()
1203{ 1188{
1204 XPoint nspot; 1189 XPoint nspot;
1205 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1206 1191
1207 if (!Input_Context 1192 if (!Input_Context
… …
1313/* 1298/*
1314 * 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
1315 * open a suitable preedit type 1300 * open a suitable preedit type
1316 */ 1301 */
1317bool 1302bool
1318rxvt_term::IM_get_IC (const char *modifiers) 1303rxvt_term::im_get_ic (const char *modifiers)
1319{ 1304{
1320 int i, j, found; 1305 int i, j, found;
1321 XIM xim; 1306 XIM xim;
1322 XPoint spot; 1307 XPoint spot;
1323 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1324 unsigned long fg, bg; 1309 unsigned long fg, bg;
1325 const char *p; 1310 const char *p;
1326 char **s; 1311 char **s;
1327 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1328#ifdef ENABLE_XIM_ONTHESPOT
1329 XIMCallback xcb[4];
1330#endif
1331 1313
1332 set_environ (envv); 1314 set_environ (envv);
1333 1315
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1317 return false;
… …
1356 p = pet[pi]; 1338 p = pet[pi];
1357 1339
1358 if (!p) 1340 if (!p)
1359 continue; 1341 continue;
1360 1342
1361 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1362 1344
1363 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1364 { 1346 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1361
1380 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1382 { 1364 {
1383 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1384 1366
1385 found = 1; 1367 found = 1;
1386 goto foundpet; 1368 goto foundpet;
1387 } 1369 }
1388 1370
1389 } 1371 }
1390 1372
1391 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1392 } 1374 }
1393 1375
1394foundpet: 1376foundpet:
1395 1377
1396 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1475 NULL); 1457 NULL);
1476 } 1458 }
1477#if ENABLE_XIM_ONTHESPOT 1459#if ENABLE_XIM_ONTHESPOT
1478 else if (input_style & XIMPreeditCallbacks) 1460 else if (input_style & XIMPreeditCallbacks)
1479 { 1461 {
1462 XIMCallback xcb[4];
1463
1480 im_set_position (spot); 1464 im_set_position (spot);
1481 1465
1482 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;
1483 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;
1484 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;
… …
1499#endif 1483#endif
1500 1484
1501 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1502 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1503 XNClientWindow, vt, 1487 XNClientWindow, vt,
1504 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1505 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1506 preedit_attr, 1490 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1492 status_attr, NULL);
1509 1493
… …
1522 // 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
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1508 vt_select_input ();
1525#endif 1509#endif
1526 1510
1527 IMSetPosition (); 1511 im_set_position ();
1528 1512
1529 return true; 1513 return true;
1530} 1514}
1531 1515
1532void 1516void
… …
1542 im_destroy (); 1526 im_destroy ();
1543 1527
1544 if (Input_Context) 1528 if (Input_Context)
1545 return; 1529 return;
1546 1530
1547#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1548 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1549 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1550#endif
1551 1533
1552 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1553 if (p && *p) 1535 if (p && *p)
1554 { 1536 {
1555 bool found = false; 1537 bool found = false;
1556 1538
1557 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1558 1540
1559 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1560 { 1542 {
1561 if (*s[i]) 1543 if (*s[i])
1562 { 1544 {
1563 strcpy (buf, "@im="); 1545 strcpy (buf, "@im=");
1564 strncat (buf, s[i], IMBUFSIZ - 5); 1546 strncat (buf, s[i], IMBUFSIZ - 5);
1565 if (IM_get_IC (buf)) 1547 if (im_get_ic (buf))
1566 { 1548 {
1567 found = true; 1549 found = true;
1568 break; 1550 break;
1569 } 1551 }
1570 } 1552 }
1571 } 1553 }
1572 1554
1573 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1574 1556
1575 if (found) 1557 if (found)
1576 goto done; 1558 goto done;
1577 } 1559 }
1578 1560
1579 /* try with XMODIFIERS env. var. */ 1561 /* try with XMODIFIERS env. var. */
1580 if (IM_get_IC ("")) 1562 if (im_get_ic (""))
1581 goto done; 1563 goto done;
1582 1564
1583 /* 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 */
1584 if (IM_get_IC ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1585 goto done; 1567 goto done;
1586 1568
1587done: 1569done:
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1590 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1591#endif
1592} 1572}
1593 1573
1594void 1574void
1595rxvt_term::IMSetPosition () 1575rxvt_term::im_set_position ()
1596{ 1576{
1597 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1598 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1599 1579
1600 if (!Input_Context 1580 if (!Input_Context
1601 || !focus 1581 || !focus
1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1582 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1603 || !IMisRunning ()) 1583 || !im_is_running ())
1604 return; 1584 return;
1605 1585
1606 if (input_style & XIMPreeditPosition) 1586 if (input_style & XIMPreeditPosition)
1607 { 1587 {
1608 im_set_size (preedit_rect); 1588 im_set_size (preedit_rect);
… …
1638 1618
1639void 1619void
1640rxvt_term::get_window_origin (int &x, int &y) 1620rxvt_term::get_window_origin (int &x, int &y)
1641{ 1621{
1642 Window cr; 1622 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1644} 1624}
1645 1625
1646Pixmap 1626Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1627rxvt_term::get_pixmap_property (Atom property)
1648{ 1628{
1649 if (prop_id > 0 && prop_id < NUM_XA) 1629 Pixmap pixmap = None;
1650 if (xa[prop_id]) 1630
1651 {
1652 int aformat; 1631 int aformat;
1653 unsigned long nitems, bytes_after; 1632 unsigned long nitems, bytes_after;
1654 Atom atype; 1633 Atom atype;
1655 unsigned char *prop = NULL; 1634 unsigned char *prop;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1635 int result = XGetWindowProperty (dpy, display->root, property,
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1636 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop); 1637 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP) 1638 if (result == Success)
1639 {
1640 if (atype == XA_PIXMAP)
1660 return *(Pixmap *)prop; 1641 pixmap = *(Pixmap *)prop;
1642 XFree (prop);
1661 } 1643 }
1662 1644
1663 return None; 1645 return pixmap;
1664} 1646}
1665 1647
1666#ifdef HAVE_BG_PIXMAP 1648#ifdef HAVE_BG_PIXMAP
1667 1649
1668void 1650void
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