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.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs.
Revision 1.372 by sf-exg, Sat Jan 28 15:18:29 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 ();
… …
359rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
360{ 346{
361 make_current (); 347 make_current ();
362 348
363 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
364} 362}
365 363
366/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
367/* 365/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
382print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
383{ 381{
384 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
386 char number[32]; 384 char number[32];
387 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 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");
391 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
703 if (recalc_y) 701 if (recalc_y)
704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
705 703
706 ncol = width / fwidth; 704 ncol = width / fwidth;
707 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;
708} 715}
709 716
710/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
711/* 718/*
712 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
720 727
721 struct winsize ws; 728 struct winsize ws;
722 729
723 ws.ws_col = ncol; 730 ws.ws_col = ncol;
724 ws.ws_row = nrow; 731 ws.ws_row = nrow;
725 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
726 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
727 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
728 735
729#if 0 736#if 0
730 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
731 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
732 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
733#endif 740#endif
734} 741}
735 742
736/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
737/* set_fonts () - load and set the various fonts 744/* load and set the various fonts */
738 *
739 * init = 1 - initialize
740 *
741 * fontname == FONT_UP - switch to bigger font
742 * fontname == FONT_DN - switch to smaller font
743 */
744bool 745bool
745rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
746{ 747{
747 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
748 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
763 764
764 delete fontset[0]; 765 delete fontset[0];
765 fontset[0] = fs; 766 fontset[0] = fs;
766 767
767 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
768 prop.height += lineSpace;
769 prop.width += letterSpace; 769 prop.width += letterSpace;
770 770
771 fs->set_prop (prop, false); 771 fs->set_prop (prop, false);
772 772
773 fwidth = prop.width; 773 fwidth = prop.width;
774 fheight = prop.height; 774 fheight = prop.height + lineSpace;
775 fbase = prop.ascent; 775 fbase = prop.ascent;
776 776
777 for (int style = 1; style < 4; style++) 777 for (int style = 1; style < 4; style++)
778 { 778 {
779#if ENABLE_STYLES 779#if ENABLE_STYLES
… …
805#else 805#else
806 fontset[style] = fontset[0]; 806 fontset[style] = fontset[0];
807#endif 807#endif
808 } 808 }
809 809
810 if (parent[0]) 810 if (parent)
811 { 811 {
812 resize_all_windows (0, 0, 0); 812 resize_all_windows (0, 0, 0);
813 scr_remap_chars (); 813 scr_remap_chars ();
814 scr_touch (true); 814 scr_touch (true);
815 } 815 }
… …
818} 818}
819 819
820void 820void
821rxvt_term::set_string_property (Atom prop, const char *str, int len) 821rxvt_term::set_string_property (Atom prop, const char *str, int len)
822{ 822{
823 XChangeProperty (dpy, parent[0], 823 XChangeProperty (dpy, parent,
824 prop, XA_STRING, 8, PropModeReplace, 824 prop, XA_STRING, 8, PropModeReplace,
825 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 825 (const unsigned char *)str, len >= 0 ? len : strlen (str));
826} 826}
827 827
828void 828void
… …
830{ 830{
831 XTextProperty ct; 831 XTextProperty ct;
832 832
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 { 834 {
835 XSetTextProperty (dpy, parent[0], &ct, prop); 835 XSetTextProperty (dpy, parent, &ct, prop);
836 XFree (ct.value); 836 XFree (ct.value);
837 } 837 }
838} 838}
839 839
840void 840void
841rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 841rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
842{ 842{
843 wchar_t *ws = rxvt_mbstowcs (str, len); 843 wchar_t *ws = rxvt_mbstowcs (str, len);
844 char *s = rxvt_wcstoutf8 (ws); 844 char *s = rxvt_wcstoutf8 (ws);
845 845
846 XChangeProperty (dpy, parent[0], 846 XChangeProperty (dpy, parent,
847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
848 (const unsigned char *)s, strlen (s)); 848 (const unsigned char *)s, strlen (s));
849 849
850 free (s); 850 free (s);
851 free (ws); 851 free (ws);
… …
941 941
942/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
943/* 943/*
944 * find if fg/bg matches any of the normal (low-intensity) colors 944 * find if fg/bg matches any of the normal (low-intensity) colors
945 */ 945 */
946void 946char *
947rxvt_term::set_colorfgbg () 947rxvt_term::get_colorfgbg ()
948{ 948{
949 unsigned int i; 949 unsigned int i;
950 const char *xpmb = ""; 950 const char *xpmb = "";
951 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 951 char fstr[] = "default";
952 char bstr[] = "default";
953 char *env_colorfgbg;
952 954
953 strcpy (fstr, "default");
954 strcpy (bstr, "default");
955 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
956 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
957 { 957 {
958 sprintf (fstr, "%d", (i - Color_Black)); 958 sprintf (fstr, "%d", i - Color_Black);
959 break; 959 break;
960 } 960 }
961 961
962 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
964 { 964 {
965 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 966#ifdef BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 967 xpmb = "default;";
968#endif 968#endif
969 break; 969 break;
970 } 970 }
971 971
972 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
972 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 973 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
974 return env_colorfgbg;
973} 975}
974 976
975/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
976 978
977bool 979bool
… …
1006 1008
1007 // 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
1008 if (set_hint) 1010 if (set_hint)
1009 { 1011 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc); 1012 szHint.flags &= ~(PBaseSize | PResizeInc);
1011 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc; 1014 szHint.flags |= PBaseSize | PResizeInc;
1013 } 1015 }
1014 1016
1015 if (!ignoreparent) 1017 if (!ignoreparent)
1016 { 1018 {
… …
1022 int x, y, x1, y1; 1024 int x, y, x1, y1;
1023 int dx, dy; 1025 int dx, dy;
1024 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1025 Window unused_cr; 1027 Window unused_cr;
1026 1028
1027 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
1028 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
1029 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1030 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1031 /* 1033 /*
1032 * 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
1033 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
1034 */ 1036 */
… …
1051 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1052 dy = 0; 1054 dy = 0;
1053 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1054 dy /= 2; 1056 dy /= 2;
1055 1057
1056 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1057 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1058#else 1060#else
1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1060#endif 1062#endif
1061 } 1063 }
1062 1064
1063 if (set_hint) 1065 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1065 1067
1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1067 1069
1068 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1069 { 1071 {
1070 if (scrollBar.state) 1072 if (scrollBar.state)
1071 scrollBar.resize (); 1073 scrollBar.resize ();
1072 1074
1073 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1074 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1075 width, height); 1077 vt_width, vt_height);
1076 1078
1077#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1078 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1079 update_background (); 1081 update_background ();
1080#endif 1082#endif
1081 } 1083 }
1082 1084
1083 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1084 scr_reset (); 1086 scr_reset ();
1085 1087
1086#ifdef HAVE_BG_PIXMAP
1087// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1088// if (bgPixmap.pixmap)
1089// scr_touch (false);
1090#endif
1091
1092#ifdef USE_XIM 1088#ifdef USE_XIM
1093 IMSetPosition (); 1089 im_set_position ();
1094#endif 1090#endif
1095} 1091}
1096 1092
1097/* 1093/*
1098 * 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.
… …
1111 newwidth = wattr.width - szHint.base_width; 1107 newwidth = wattr.width - szHint.base_width;
1112 if (newheight == 0) 1108 if (newheight == 0)
1113 newheight = wattr.height - szHint.base_height; 1109 newheight = wattr.height - szHint.base_height;
1114 } 1110 }
1115 1111
1116 if (newwidth != width || newheight != height) 1112 if (newwidth != vt_width || newheight != vt_height)
1117 { 1113 {
1118 newwidth += szHint.base_width; 1114 newwidth += szHint.base_width;
1119 newheight += szHint.base_height; 1115 newheight += szHint.base_height;
1120 resize_all_windows (newwidth, newheight, 0); 1116 resize_all_windows (newwidth, newheight, 0);
1121 } 1117 }
… …
1159 status_rect.height = fheight; 1155 status_rect.height = fheight;
1160} 1156}
1161 1157
1162/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1163bool 1159bool
1164rxvt_term::IMisRunning () 1160rxvt_term::im_is_running ()
1165{ 1161{
1166 Atom atom; 1162 Atom atom;
1167 Window win; 1163 Window win;
1168 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1169 1165
… …
1178 1174
1179 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1180 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1181 1177
1182 if (win != None) 1178 if (win != None)
1183 return True; 1179 return true;
1184 } 1180 }
1185 1181
1186 return False; 1182 return false;
1187} 1183}
1188 1184
1189void 1185void
1190rxvt_term::IMSendSpot () 1186rxvt_term::im_send_spot ()
1191{ 1187{
1192 XPoint nspot; 1188 XPoint nspot;
1193 XVaNestedList preedit_attr; 1189 XVaNestedList preedit_attr;
1194 1190
1195 if (!Input_Context 1191 if (!Input_Context
… …
1301/* 1297/*
1302 * 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
1303 * open a suitable preedit type 1299 * open a suitable preedit type
1304 */ 1300 */
1305bool 1301bool
1306rxvt_term::IM_get_IC (const char *modifiers) 1302rxvt_term::im_get_ic (const char *modifiers)
1307{ 1303{
1308 int i, j, found; 1304 int i, j, found;
1309 XIM xim; 1305 XIM xim;
1310 XPoint spot; 1306 XPoint spot;
1311 XRectangle rect, status_rect, needed_rect; 1307 XRectangle rect, status_rect, needed_rect;
1312 unsigned long fg, bg; 1308 unsigned long fg, bg;
1313 const char *p; 1309 const char *p;
1314 char **s; 1310 char **s;
1315 XIMStyles *xim_styles; 1311 XIMStyles *xim_styles;
1316#ifdef ENABLE_XIM_ONTHESPOT
1317 XIMCallback xcb[4];
1318#endif
1319 1312
1320 set_environ (envv); 1313 set_environ (envv);
1321 1314
1322 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1323 return false; 1316 return false;
… …
1344 p = pet[pi]; 1337 p = pet[pi];
1345 1338
1346 if (!p) 1339 if (!p)
1347 continue; 1340 continue;
1348 1341
1349 s = rxvt_splitcommastring (p); 1342 s = rxvt_strsplit (',', p);
1350 1343
1351 for (i = found = 0; !found && s[i]; i++) 1344 for (i = found = 0; !found && s[i]; i++)
1352 { 1345 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1346 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = XIMPreeditPosition | XIMStatusNothing; 1347 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1366 input_style = XIMPreeditNothing | XIMStatusNothing; 1359 input_style = XIMPreeditNothing | XIMStatusNothing;
1367 1360
1368 for (j = 0; j < xim_styles->count_styles; j++) 1361 for (j = 0; j < xim_styles->count_styles; j++)
1369 if (input_style == xim_styles->supported_styles[j]) 1362 if (input_style == xim_styles->supported_styles[j])
1370 { 1363 {
1371 rxvt_freecommastring (s); 1364 rxvt_free_strsplit (s);
1372 1365
1373 found = 1; 1366 found = 1;
1374 goto foundpet; 1367 goto foundpet;
1375 } 1368 }
1376 1369
1377 } 1370 }
1378 1371
1379 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1380 } 1373 }
1381 1374
1382foundpet: 1375foundpet:
1383 1376
1384 XFree (xim_styles); 1377 XFree (xim_styles);
… …
1463 NULL); 1456 NULL);
1464 } 1457 }
1465#if ENABLE_XIM_ONTHESPOT 1458#if ENABLE_XIM_ONTHESPOT
1466 else if (input_style & XIMPreeditCallbacks) 1459 else if (input_style & XIMPreeditCallbacks)
1467 { 1460 {
1461 XIMCallback xcb[4];
1462
1468 im_set_position (spot); 1463 im_set_position (spot);
1469 1464
1470 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;
1471 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;
1472 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;
… …
1487#endif 1482#endif
1488 1483
1489 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1490 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1491 XNClientWindow, vt, 1486 XNClientWindow, vt,
1492 XNFocusWindow, parent[0], 1487 XNFocusWindow, parent,
1493 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1494 preedit_attr, 1489 preedit_attr,
1495 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1496 status_attr, NULL); 1491 status_attr, NULL);
1497 1492
… …
1510 // 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
1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1506 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1512 vt_select_input (); 1507 vt_select_input ();
1513#endif 1508#endif
1514 1509
1515 IMSetPosition (); 1510 im_set_position ();
1516 1511
1517 return true; 1512 return true;
1518} 1513}
1519 1514
1520void 1515void
… …
1530 im_destroy (); 1525 im_destroy ();
1531 1526
1532 if (Input_Context) 1527 if (Input_Context)
1533 return; 1528 return;
1534 1529
1535#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1536 if (rs[Rs_imLocale]) 1530 if (rs[Rs_imLocale])
1537 SET_LOCALE (rs[Rs_imLocale]); 1531 SET_LOCALE (rs[Rs_imLocale]);
1538#endif
1539 1532
1540 p = rs[Rs_inputMethod]; 1533 p = rs[Rs_inputMethod];
1541 if (p && *p) 1534 if (p && *p)
1542 { 1535 {
1543 bool found = false; 1536 bool found = false;
1544 1537
1545 s = rxvt_splitcommastring (p); 1538 s = rxvt_strsplit (',', p);
1546 1539
1547 for (i = 0; s[i]; i++) 1540 for (i = 0; s[i]; i++)
1548 { 1541 {
1549 if (*s[i]) 1542 if (*s[i])
1550 { 1543 {
1551 strcpy (buf, "@im="); 1544 strcpy (buf, "@im=");
1552 strncat (buf, s[i], IMBUFSIZ - 5); 1545 strncat (buf, s[i], IMBUFSIZ - 5);
1553 if (IM_get_IC (buf)) 1546 if (im_get_ic (buf))
1554 { 1547 {
1555 found = true; 1548 found = true;
1556 break; 1549 break;
1557 } 1550 }
1558 } 1551 }
1559 } 1552 }
1560 1553
1561 rxvt_freecommastring (s); 1554 rxvt_free_strsplit (s);
1562 1555
1563 if (found) 1556 if (found)
1564 goto done; 1557 goto done;
1565 } 1558 }
1566 1559
1567 /* try with XMODIFIERS env. var. */ 1560 /* try with XMODIFIERS env. var. */
1568 if (IM_get_IC ("")) 1561 if (im_get_ic (""))
1569 goto done; 1562 goto done;
1570 1563
1571 /* try with no modifiers base IF the user didn't specify an IM */ 1564 /* try with no modifiers base IF the user didn't specify an IM */
1572 if (IM_get_IC ("@im=none")) 1565 if (im_get_ic ("@im=none"))
1573 goto done; 1566 goto done;
1574 1567
1575done: 1568done:
1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1577 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
1578 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1579#endif
1580} 1571}
1581 1572
1582void 1573void
1583rxvt_term::IMSetPosition () 1574rxvt_term::im_set_position ()
1584{ 1575{
1585 XRectangle preedit_rect, status_rect, *needed_rect; 1576 XRectangle preedit_rect, status_rect, *needed_rect;
1586 XVaNestedList preedit_attr, status_attr; 1577 XVaNestedList preedit_attr, status_attr;
1587 1578
1588 if (!Input_Context 1579 if (!Input_Context
1589 || !focus 1580 || !focus
1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1581 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1591 || !IMisRunning ()) 1582 || !im_is_running ())
1592 return; 1583 return;
1593 1584
1594 if (input_style & XIMPreeditPosition) 1585 if (input_style & XIMPreeditPosition)
1595 { 1586 {
1596 im_set_size (preedit_rect); 1587 im_set_size (preedit_rect);
… …
1626 1617
1627void 1618void
1628rxvt_term::get_window_origin (int &x, int &y) 1619rxvt_term::get_window_origin (int &x, int &y)
1629{ 1620{
1630 Window cr; 1621 Window cr;
1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1622 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1632} 1623}
1633 1624
1634Pixmap 1625Pixmap
1635rxvt_term::get_pixmap_property (int prop_id) 1626rxvt_term::get_pixmap_property (Atom property)
1636{ 1627{
1637 if (prop_id > 0 && prop_id < NUM_XA) 1628 Pixmap pixmap = None;
1638 if (xa[prop_id]) 1629
1639 {
1640 int aformat; 1630 int aformat;
1641 unsigned long nitems, bytes_after; 1631 unsigned long nitems, bytes_after;
1642 Atom atype; 1632 Atom atype;
1643 unsigned char *prop = NULL; 1633 unsigned char *prop;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1634 int result = XGetWindowProperty (dpy, display->root, property,
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1635 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop); 1636 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP) 1637 if (result == Success)
1638 {
1639 if (atype == XA_PIXMAP)
1648 return *(Pixmap *)prop; 1640 pixmap = *(Pixmap *)prop;
1641 XFree (prop);
1649 } 1642 }
1650 1643
1651 return None; 1644 return pixmap;
1652} 1645}
1653 1646
1654#ifdef HAVE_BG_PIXMAP 1647#ifdef HAVE_BG_PIXMAP
1655 1648
1656void 1649void
1657rxvt_term::update_background () 1650rxvt_term::update_background ()
1658{ 1651{
1659 if (update_background_ev.is_active ()) 1652 if (update_background_ev.is_active ())
1660 return; 1653 return;
1661 1654
1662 bgPixmap.invalidate (); 1655 bg_invalidate ();
1663 1656
1657 if (!mapped)
1658 return;
1659
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1661
1666 if (to_wait <= 0.) 1662 if (to_wait <= 0.)
1667 bgPixmap.render (); 1663 bg_render ();
1668 else 1664 else
1669 update_background_ev.start (to_wait); 1665 update_background_ev.start (to_wait);
1670} 1666}
1671 1667
1672void 1668void
1673rxvt_term::update_background_cb (ev::timer &w, int revents) 1669rxvt_term::update_background_cb (ev::timer &w, int revents)
1674{ 1670{
1675 make_current (); 1671 make_current ();
1676 1672
1677 update_background_ev.stop (); 1673 update_background_ev.stop ();
1678 bgPixmap.render (); 1674 bg_render ();
1679 refresh_check (); 1675 refresh_check ();
1680} 1676}
1681 1677
1682#endif /* HAVE_BG_PIXMAP */ 1678#endif /* HAVE_BG_PIXMAP */
1683 1679

Diff Legend

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