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.369 by sf-exg, Thu Jan 19 13:33:43 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 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <locale.h>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio; 56struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
… …
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) NOTHROW
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);
… …
703 if (recalc_y) 703 if (recalc_y)
704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
705 705
706 ncol = width / fwidth; 706 ncol = width / fwidth;
707 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 vt_width = ncol * fwidth;
716 vt_height = nrow * fheight;
708} 717}
709 718
710/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
711/* 720/*
712 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
720 729
721 struct winsize ws; 730 struct winsize ws;
722 731
723 ws.ws_col = ncol; 732 ws.ws_col = ncol;
724 ws.ws_row = nrow; 733 ws.ws_row = nrow;
725 ws.ws_xpixel = width; 734 ws.ws_xpixel = vt_width;
726 ws.ws_ypixel = height; 735 ws.ws_ypixel = vt_height;
727 ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
728 737
729#if 0 738#if 0
730 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
731 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
732 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
733#endif 742#endif
734} 743}
735 744
736/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
737/* set_fonts () - load and set the various fonts 746/* 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 747bool
745rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
746{ 749{
747 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
748 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
805#else 808#else
806 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
807#endif 810#endif
808 } 811 }
809 812
810 if (parent[0]) 813 if (parent)
811 { 814 {
812 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
813 scr_remap_chars (); 816 scr_remap_chars ();
814 scr_touch (true); 817 scr_touch (true);
815 } 818 }
… …
818} 821}
819 822
820void 823void
821rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
822{ 825{
823 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
824 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
825 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
826} 829}
827 830
828void 831void
… …
830{ 833{
831 XTextProperty ct; 834 XTextProperty ct;
832 835
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 { 837 {
835 XSetTextProperty (dpy, parent[0], &ct, prop); 838 XSetTextProperty (dpy, parent, &ct, prop);
836 XFree (ct.value); 839 XFree (ct.value);
837 } 840 }
838} 841}
839 842
840void 843void
841rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
842{ 845{
843 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
844 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
845 848
846 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
848 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
849 852
850 free (s); 853 free (s);
851 free (ws); 854 free (ws);
… …
941 944
942/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
943/* 946/*
944 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
945 */ 948 */
946void 949char *
947rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
948{ 951{
949 unsigned int i; 952 unsigned int i;
950 const char *xpmb = ""; 953 const char *xpmb = "";
951 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
956 char *env_colorfgbg;
952 957
953 strcpy (fstr, "default");
954 strcpy (bstr, "default");
955 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
956 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
957 { 960 {
958 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
959 break; 962 break;
960 } 963 }
961 964
962 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
964 { 967 {
965 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 970 xpmb = "default;";
968#endif 971#endif
969 break; 972 break;
970 } 973 }
971 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
972 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 976 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
977 return env_colorfgbg;
973} 978}
974 979
975/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
976 981
977bool 982bool
… …
1006 1011
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint) 1013 if (set_hint)
1009 { 1014 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc); 1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1011 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc; 1017 szHint.flags |= PBaseSize | PResizeInc;
1013 } 1018 }
1014 1019
1015 if (!ignoreparent) 1020 if (!ignoreparent)
1016 { 1021 {
… …
1022 int x, y, x1, y1; 1027 int x, y, x1, y1;
1023 int dx, dy; 1028 int dx, dy;
1024 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1025 Window unused_cr; 1030 Window unused_cr;
1026 1031
1027 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1028 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1029 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1030 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1031 /* 1036 /*
1032 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
1033 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1034 */ 1039 */
… …
1051 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1052 dy = 0; 1057 dy = 0;
1053 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1054 dy /= 2; 1059 dy /= 2;
1055 1060
1056 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1057 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1058#else 1063#else
1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1060#endif 1065#endif
1061 } 1066 }
1062 1067
1063 if (set_hint) 1068 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint); 1069 XSetWMNormalHints (dpy, parent, &szHint);
1065 1070
1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1067 1072
1068 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1069 { 1074 {
1070 if (scrollBar.state) 1075 if (scrollBar.state)
1071 scrollBar.resize (); 1076 scrollBar.resize ();
1072 1077
1073 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1074 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1075 width, height); 1080 vt_width, vt_height);
1076 1081
1077#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1078 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1079 update_background (); 1084 update_background ();
1080#endif 1085#endif
1081 } 1086 }
1082 1087
1083 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1084 scr_reset (); 1089 scr_reset ();
1085 1090
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 1091#ifdef USE_XIM
1093 IMSetPosition (); 1092 im_set_position ();
1094#endif 1093#endif
1095} 1094}
1096 1095
1097/* 1096/*
1098 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1111 newwidth = wattr.width - szHint.base_width; 1110 newwidth = wattr.width - szHint.base_width;
1112 if (newheight == 0) 1111 if (newheight == 0)
1113 newheight = wattr.height - szHint.base_height; 1112 newheight = wattr.height - szHint.base_height;
1114 } 1113 }
1115 1114
1116 if (newwidth != width || newheight != height) 1115 if (newwidth != vt_width || newheight != vt_height)
1117 { 1116 {
1118 newwidth += szHint.base_width; 1117 newwidth += szHint.base_width;
1119 newheight += szHint.base_height; 1118 newheight += szHint.base_height;
1120 resize_all_windows (newwidth, newheight, 0); 1119 resize_all_windows (newwidth, newheight, 0);
1121 } 1120 }
… …
1159 status_rect.height = fheight; 1158 status_rect.height = fheight;
1160} 1159}
1161 1160
1162/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1163bool 1162bool
1164rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1165{ 1164{
1166 Atom atom; 1165 Atom atom;
1167 Window win; 1166 Window win;
1168 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1169 1168
… …
1178 1177
1179 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1180 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1181 1180
1182 if (win != None) 1181 if (win != None)
1183 return True; 1182 return true;
1184 } 1183 }
1185 1184
1186 return False; 1185 return false;
1187} 1186}
1188 1187
1189void 1188void
1190rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1191{ 1190{
1192 XPoint nspot; 1191 XPoint nspot;
1193 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1194 1193
1195 if (!Input_Context 1194 if (!Input_Context
… …
1301/* 1300/*
1302 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1303 * open a suitable preedit type 1302 * open a suitable preedit type
1304 */ 1303 */
1305bool 1304bool
1306rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1307{ 1306{
1308 int i, j, found; 1307 int i, j, found;
1309 XIM xim; 1308 XIM xim;
1310 XPoint spot; 1309 XPoint spot;
1311 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1312 unsigned long fg, bg; 1311 unsigned long fg, bg;
1313 const char *p; 1312 const char *p;
1314 char **s; 1313 char **s;
1315 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1316#ifdef ENABLE_XIM_ONTHESPOT
1317 XIMCallback xcb[4];
1318#endif
1319 1315
1320 set_environ (envv); 1316 set_environ (envv);
1321 1317
1322 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1323 return false; 1319 return false;
… …
1344 p = pet[pi]; 1340 p = pet[pi];
1345 1341
1346 if (!p) 1342 if (!p)
1347 continue; 1343 continue;
1348 1344
1349 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1350 1346
1351 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1352 { 1348 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1366 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1367 1363
1368 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1369 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1370 { 1366 {
1371 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1372 1368
1373 found = 1; 1369 found = 1;
1374 goto foundpet; 1370 goto foundpet;
1375 } 1371 }
1376 1372
1377 } 1373 }
1378 1374
1379 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1380 } 1376 }
1381 1377
1382foundpet: 1378foundpet:
1383 1379
1384 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1463 NULL); 1459 NULL);
1464 } 1460 }
1465#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1466 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1467 { 1463 {
1464 XIMCallback xcb[4];
1465
1468 im_set_position (spot); 1466 im_set_position (spot);
1469 1467
1470 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 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; 1469 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; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1487#endif 1485#endif
1488 1486
1489 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1490 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1491 XNClientWindow, vt, 1489 XNClientWindow, vt,
1492 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1493 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1494 preedit_attr, 1492 preedit_attr,
1495 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1496 status_attr, NULL); 1494 status_attr, NULL);
1497 1495
… …
1510 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1512 vt_select_input (); 1510 vt_select_input ();
1513#endif 1511#endif
1514 1512
1515 IMSetPosition (); 1513 im_set_position ();
1516 1514
1517 return true; 1515 return true;
1518} 1516}
1519 1517
1520void 1518void
… …
1540 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1541 if (p && *p) 1539 if (p && *p)
1542 { 1540 {
1543 bool found = false; 1541 bool found = false;
1544 1542
1545 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1546 1544
1547 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1548 { 1546 {
1549 if (*s[i]) 1547 if (*s[i])
1550 { 1548 {
1551 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1552 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1553 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1554 { 1552 {
1555 found = true; 1553 found = true;
1556 break; 1554 break;
1557 } 1555 }
1558 } 1556 }
1559 } 1557 }
1560 1558
1561 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1562 1560
1563 if (found) 1561 if (found)
1564 goto done; 1562 goto done;
1565 } 1563 }
1566 1564
1567 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1568 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1569 goto done; 1567 goto done;
1570 1568
1571 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1572 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1573 goto done; 1571 goto done;
1574 1572
1575done: 1573done: ;
1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1577 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1578 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1579#endif 1577#endif
1580} 1578}
1581 1579
1582void 1580void
1583rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1584{ 1582{
1585 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1586 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1587 1585
1588 if (!Input_Context 1586 if (!Input_Context
1589 || !focus 1587 || !focus
1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1591 || !IMisRunning ()) 1589 || !im_is_running ())
1592 return; 1590 return;
1593 1591
1594 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1595 { 1593 {
1596 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1626 1624
1627void 1625void
1628rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1629{ 1627{
1630 Window cr; 1628 Window cr;
1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1632} 1630}
1633 1631
1634Pixmap 1632Pixmap
1635rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1636{ 1634{
1637 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1638 if (xa[prop_id]) 1636
1639 {
1640 int aformat; 1637 int aformat;
1641 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1642 Atom atype; 1639 Atom atype;
1643 unsigned char *prop = NULL; 1640 unsigned char *prop;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1648 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1649 } 1649 }
1650 1650
1651 return None; 1651 return pixmap;
1652} 1652}
1653 1653
1654#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1655 1655
1656void 1656void
1657rxvt_term::update_background () 1657rxvt_term::update_background ()
1658{ 1658{
1659 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1660 return; 1660 return;
1661 1661
1662 bgPixmap.invalidate (); 1662 bg_invalidate ();
1663 1663
1664 if (!mapped)
1665 return;
1666
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1668
1666 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1667 bgPixmap.render (); 1670 bg_render ();
1668 else 1671 else
1669 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1670} 1673}
1671 1674
1672void 1675void
1673rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1674{ 1677{
1675 make_current (); 1678 make_current ();
1676 1679
1677 update_background_ev.stop (); 1680 update_background_ev.stop ();
1678 bgPixmap.render (); 1681 bg_render ();
1679 refresh_check (); 1682 refresh_check ();
1680} 1683}
1681 1684
1682#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1683 1686

Diff Legend

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