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.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC vs.
Revision 1.375 by sf-exg, Sun Jun 3 17:48:28 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
242 scrollBar.destroy (); 239 scrollBar.destroy ();
243 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
244 241
245 delete drawable; 242 delete drawable;
246 // destroy all windows 243 // destroy all windows
247 if (parent[0]) 244 if (parent)
248 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
249 246
250 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
251 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
252 { 249 {
253 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
268 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 266 free (allocated [i]);
270 267
271 free (selection.text); 268 free (selection.text);
272 free (selection.clip_text); 269 free (selection.clip_text);
273 // TODO: manage env vars in child only(!)
274 free (env_display);
275 free (env_term);
276 free (locale); 270 free (locale);
277 free (v_buffer); 271 free (v_buffer);
278 free (incr_buf); 272
273 delete selection_req;
279 274
280 delete envv; 275 delete envv;
281 delete argv; 276 delete argv;
282 277
283#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
319#endif 314#endif
320 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
323#endif 318#endif
324 incr_ev.stop ();
325 termwin_ev.stop (display); 319 termwin_ev.stop (display);
326 vt_ev.stop (display); 320 vt_ev.stop (display);
327 } 321 }
328 322
329 flush_ev.stop (); 323 flush_ev.stop ();
… …
354 348
355 delete this; 349 delete this;
356} 350}
357 351
358void 352void
359rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
360{ 354{
361 if (!opt) 355 if (!opt)
362 return; 356 return;
363 357
364 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
381 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
382} 376}
383 377
384#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
385static void 379static void ecb_cold
386print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
387{ 381{
388 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
389 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
390 char number[32]; 384 char number[32];
… …
428 mesg, BUFSIZ); 422 mesg, BUFSIZ);
429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
430} 424}
431#endif 425#endif
432 426
433int 427int ecb_cold
434rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
435{ 429{
436 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
437 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
438 else 432 else
… …
447 } 441 }
448 442
449 return 0; 443 return 0;
450} 444}
451 445
452int 446int ecb_cold
453rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
454{ 448{
455 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
456 DisplayString (display)); 450 DisplayString (display));
457 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
579 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
580 574
581 XrmInitialize (); 575 XrmInitialize ();
576
577#ifdef HAVE_PIXBUF
578 g_type_init ();
579#endif
582} 580}
583 581
584/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
585/* 583/*
586 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
707 if (recalc_y) 705 if (recalc_y)
708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
709 707
710 ncol = width / fwidth; 708 ncol = width / fwidth;
711 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
712} 719}
713 720
714/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
715/* 722/*
716 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
724 731
725 struct winsize ws; 732 struct winsize ws;
726 733
727 ws.ws_col = ncol; 734 ws.ws_col = ncol;
728 ws.ws_row = nrow; 735 ws.ws_row = nrow;
729 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
730 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
731 ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
732 739
733#if 0 740#if 0
734 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
735 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
736 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
737#endif 744#endif
738} 745}
739 746
740/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
741/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
742 *
743 * init = 1 - initialize
744 *
745 * fontname == FONT_UP - switch to bigger font
746 * fontname == FONT_DN - switch to smaller font
747 */
748bool 749bool
749rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
750{ 751{
751 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
752 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
767 768
768 delete fontset[0]; 769 delete fontset[0];
769 fontset[0] = fs; 770 fontset[0] = fs;
770 771
771 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
772 prop.height += lineSpace;
773 prop.width += letterSpace; 773 prop.width += letterSpace;
774 774
775 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
776 776
777 fwidth = prop.width; 777 fwidth = prop.width;
778 fheight = prop.height; 778 fheight = prop.height + lineSpace;
779 fbase = prop.ascent; 779 fbase = prop.ascent;
780 780
781 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
782 { 782 {
783#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
809#else 809#else
810 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
811#endif 811#endif
812 } 812 }
813 813
814 if (parent[0]) 814 if (parent)
815 { 815 {
816 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
817 scr_remap_chars (); 817 scr_remap_chars ();
818 scr_touch (true); 818 scr_touch (true);
819 } 819 }
… …
822} 822}
823 823
824void 824void
825rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
826{ 826{
827 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
828 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
829 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
830} 830}
831 831
832void 832void
… …
834{ 834{
835 XTextProperty ct; 835 XTextProperty ct;
836 836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 { 838 {
839 XSetTextProperty (dpy, parent[0], &ct, prop); 839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value); 840 XFree (ct.value);
841 } 841 }
842} 842}
843 843
844void 844void
845rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
846{ 846{
847 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
849 849
850 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
853 853
854 free (s); 854 free (s);
855 free (ws); 855 free (ws);
… …
945 945
946/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
947/* 947/*
948 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
949 */ 949 */
950void 950char *
951rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
952{ 952{
953 unsigned int i; 953 unsigned int i;
954 const char *xpmb = ""; 954 const char *xpmb = "";
955 char fstr[] = "default"; 955 char fstr[] = "default";
956 char bstr[] = "default"; 956 char bstr[] = "default";
957 char *env_colorfgbg;
957 958
958 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
959 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
960 { 961 {
961 sprintf (fstr, "%d", i - Color_Black); 962 sprintf (fstr, "%d", i - Color_Black);
… …
970 xpmb = "default;"; 971 xpmb = "default;";
971#endif 972#endif
972 break; 973 break;
973 } 974 }
974 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
975 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
976} 979}
977 980
978/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
979 982
980bool 983bool
… …
1009 1012
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint) 1014 if (set_hint)
1012 { 1015 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc); 1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1014 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc; 1018 szHint.flags |= PBaseSize | PResizeInc;
1016 } 1019 }
1017 1020
1018 if (!ignoreparent) 1021 if (!ignoreparent)
1019 { 1022 {
… …
1025 int x, y, x1, y1; 1028 int x, y, x1, y1;
1026 int dx, dy; 1029 int dx, dy;
1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1028 Window unused_cr; 1031 Window unused_cr;
1029 1032
1030 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1031 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1034 /* 1037 /*
1035 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
1036 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1037 */ 1040 */
… …
1054 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1055 dy = 0; 1058 dy = 0;
1056 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1057 dy /= 2; 1060 dy /= 2;
1058 1061
1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1060 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1061#else 1064#else
1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1063#endif 1066#endif
1064 } 1067 }
1065 1068
1066 if (set_hint) 1069 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
1068 1071
1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1070 1073
1071 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1072 { 1075 {
1073 if (scrollBar.state) 1076 if (scrollBar.state)
1074 scrollBar.resize (); 1077 scrollBar.resize ();
1075 1078
1076 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1077 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1078 width, height); 1081 vt_width, vt_height);
1079 1082
1080#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1081 if (bg_window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1082 update_background (); 1085 update_background ();
1083#endif 1086#endif
… …
1085 1088
1086 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1087 scr_reset (); 1090 scr_reset ();
1088 1091
1089#ifdef USE_XIM 1092#ifdef USE_XIM
1090 IMSetPosition (); 1093 im_set_position ();
1091#endif 1094#endif
1092} 1095}
1093 1096
1094/* 1097/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1108 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1112 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1111 } 1114 }
1112 1115
1113 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1114 { 1117 {
1115 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1118 } 1121 }
… …
1156 status_rect.height = fheight; 1159 status_rect.height = fheight;
1157} 1160}
1158 1161
1159/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1160bool 1163bool
1161rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1162{ 1165{
1163 Atom atom; 1166 Atom atom;
1164 Window win; 1167 Window win;
1165 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1166 1169
… …
1175 1178
1176 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1177 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1178 1181
1179 if (win != None) 1182 if (win != None)
1180 return True; 1183 return true;
1181 } 1184 }
1182 1185
1183 return False; 1186 return false;
1184} 1187}
1185 1188
1186void 1189void
1187rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1188{ 1191{
1189 XPoint nspot; 1192 XPoint nspot;
1190 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1191 1194
1192 if (!Input_Context 1195 if (!Input_Context
… …
1298/* 1301/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1303 * open a suitable preedit type
1301 */ 1304 */
1302bool 1305bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1304{ 1307{
1305 int i, j, found; 1308 int i, j, found;
1306 XIM xim; 1309 XIM xim;
1307 XPoint spot; 1310 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1312 unsigned long fg, bg;
1310 const char *p; 1313 const char *p;
1311 char **s; 1314 char **s;
1312 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1316
1317 set_environ (envv); 1317 set_environ (envv);
1318 1318
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1320 return false;
… …
1460 NULL); 1460 NULL);
1461 } 1461 }
1462#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1464 { 1464 {
1465 XIMCallback xcb[4];
1466
1465 im_set_position (spot); 1467 im_set_position (spot);
1466 1468
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 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; 1470 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; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1486#endif
1485 1487
1486 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1490 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1493 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1495 status_attr, NULL);
1494 1496
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1511 vt_select_input ();
1510#endif 1512#endif
1511 1513
1512 IMSetPosition (); 1514 im_set_position ();
1513 1515
1514 return true; 1516 return true;
1515} 1517}
1516 1518
1517void 1519void
… …
1527 im_destroy (); 1529 im_destroy ();
1528 1530
1529 if (Input_Context) 1531 if (Input_Context)
1530 return; 1532 return;
1531 1533
1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1533 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1534 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1535#endif
1536 1536
1537 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1538 if (p && *p) 1538 if (p && *p)
1539 { 1539 {
1540 bool found = false; 1540 bool found = false;
… …
1545 { 1545 {
1546 if (*s[i]) 1546 if (*s[i])
1547 { 1547 {
1548 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1551 { 1551 {
1552 found = true; 1552 found = true;
1553 break; 1553 break;
1554 } 1554 }
1555 } 1555 }
… …
1560 if (found) 1560 if (found)
1561 goto done; 1561 goto done;
1562 } 1562 }
1563 1563
1564 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1566 goto done; 1566 goto done;
1567 1567
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1570 goto done; 1570 goto done;
1571 1571
1572done: 1572done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1576#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}
1630
1631Pixmap
1632rxvt_term::get_pixmap_property (Atom property)
1633{
1634 Pixmap pixmap = None;
1635
1636 int aformat;
1637 unsigned long nitems, bytes_after;
1638 Atom atype;
1639 unsigned char *prop;
1640 int result = XGetWindowProperty (dpy, display->root, property,
1641 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1642 &nitems, &bytes_after, &prop);
1643 if (result == Success)
1644 {
1645 if (atype == XA_PIXMAP)
1646 pixmap = *(Pixmap *)prop;
1647 XFree (prop);
1648 }
1649
1650 return pixmap;
1651} 1627}
1652 1628
1653#ifdef HAVE_BG_PIXMAP 1629#ifdef HAVE_BG_PIXMAP
1654 1630
1655void 1631void
… …
1657{ 1633{
1658 if (update_background_ev.is_active ()) 1634 if (update_background_ev.is_active ())
1659 return; 1635 return;
1660 1636
1661 bg_invalidate (); 1637 bg_invalidate ();
1638
1639 if (!mapped)
1640 return;
1662 1641
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664 1643
1665 if (to_wait <= 0.) 1644 if (to_wait <= 0.)
1666 bg_render (); 1645 bg_render ();

Diff Legend

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