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.346 by sf-exg, Sat Jan 8 10:37:21 2011 UTC vs.
Revision 1.374 by root, Sun Jun 3 10:42:34 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
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 229#endif
239 230
240 if (display) 231 if (display)
241 { 232 {
242 selection_clear (); 233 selection_clear ();
… …
248 scrollBar.destroy (); 239 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
250 241
251 delete drawable; 242 delete drawable;
252 // destroy all windows 243 // destroy all windows
253 if (parent[0]) 244 if (parent)
254 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
255 246
256 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
258 { 249 {
259 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 266 free (allocated [i]);
276 267
277 free (selection.text); 268 free (selection.text);
278 free (selection.clip_text); 269 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 270 free (locale);
283 free (v_buffer); 271 free (v_buffer);
284 free (incr_buf); 272
273 delete selection_req;
285 274
286 delete envv; 275 delete envv;
287 delete argv; 276 delete argv;
288 277
289#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
325#endif 314#endif
326 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
329#endif 318#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 319 termwin_ev.stop (display);
332 vt_ev.stop (display); 320 vt_ev.stop (display);
333 } 321 }
334 322
335 flush_ev.stop (); 323 flush_ev.stop ();
… …
360 348
361 delete this; 349 delete this;
362} 350}
363 351
364void 352void
365rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 354{
367 if (!opt) 355 if (!opt)
368 return; 356 return;
369 357
370 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
386 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++)
387 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
388} 376}
389 377
390#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
391static void 379static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
393{ 381{
394 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
396 char number[32]; 384 char number[32];
… …
434 mesg, BUFSIZ); 422 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 424}
437#endif 425#endif
438 426
439int 427int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 429{
442 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
444 else 432 else
… …
453 } 441 }
454 442
455 return 0; 443 return 0;
456} 444}
457 445
458int 446int ecb_cold
459rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
460{ 448{
461 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",
462 DisplayString (display)); 450 DisplayString (display));
463 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
586 574
587 XrmInitialize (); 575 XrmInitialize ();
576
577#ifdef HAVE_PIXBUF
578 g_type_init ();
579#endif
588} 580}
589 581
590/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
591/* 583/*
592 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
713 if (recalc_y) 705 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 707
716 ncol = width / fwidth; 708 ncol = width / fwidth;
717 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;
718} 719}
719 720
720/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
721/* 722/*
722 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
730 731
731 struct winsize ws; 732 struct winsize ws;
732 733
733 ws.ws_col = ncol; 734 ws.ws_col = ncol;
734 ws.ws_row = nrow; 735 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 739
739#if 0 740#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
743#endif 744#endif
744} 745}
745 746
746/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
748 *
749 * init = 1 - initialize
750 *
751 * fontname == FONT_UP - switch to bigger font
752 * fontname == FONT_DN - switch to smaller font
753 */
754bool 749bool
755rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
756{ 751{
757 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
773 768
774 delete fontset[0]; 769 delete fontset[0];
775 fontset[0] = fs; 770 fontset[0] = fs;
776 771
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace;
779 prop.width += letterSpace; 773 prop.width += letterSpace;
780 774
781 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
782 776
783 fwidth = prop.width; 777 fwidth = prop.width;
784 fheight = prop.height; 778 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 779 fbase = prop.ascent;
786 780
787 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
788 { 782 {
789#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
815#else 809#else
816 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
817#endif 811#endif
818 } 812 }
819 813
820 if (parent[0]) 814 if (parent)
821 { 815 {
822 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 817 scr_remap_chars ();
824 scr_touch (true); 818 scr_touch (true);
825 } 819 }
… …
828} 822}
829 823
830void 824void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 826{
833 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 830}
837 831
838void 832void
… …
840{ 834{
841 XTextProperty ct; 835 XTextProperty ct;
842 836
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 838 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 839 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 840 XFree (ct.value);
847 } 841 }
848} 842}
849 843
850void 844void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 846{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
855 849
856 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
859 853
860 free (s); 854 free (s);
861 free (ws); 855 free (ws);
… …
951 945
952/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
953/* 947/*
954 * 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
955 */ 949 */
956void 950char *
957rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
958{ 952{
959 unsigned int i; 953 unsigned int i;
960 const char *xpmb = ""; 954 const char *xpmb = "";
961 char fstr[] = "default"; 955 char fstr[] = "default";
962 char bstr[] = "default"; 956 char bstr[] = "default";
957 char *env_colorfgbg;
963 958
964 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
966 { 961 {
967 sprintf (fstr, "%d", i - Color_Black); 962 sprintf (fstr, "%d", i - Color_Black);
… …
976 xpmb = "default;"; 971 xpmb = "default;";
977#endif 972#endif
978 break; 973 break;
979 } 974 }
980 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
981 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;
982} 979}
983 980
984/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
985 982
986bool 983bool
… …
1015 1012
1016 // 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
1017 if (set_hint) 1014 if (set_hint)
1018 { 1015 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1018 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1019 }
1023 1020
1024 if (!ignoreparent) 1021 if (!ignoreparent)
1025 { 1022 {
… …
1031 int x, y, x1, y1; 1028 int x, y, x1, y1;
1032 int dx, dy; 1029 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1031 Window unused_cr;
1035 1032
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1037 /*
1041 * 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
1042 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1043 */ 1040 */
… …
1060 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1061 dy = 0; 1058 dy = 0;
1062 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1063 dy /= 2; 1060 dy /= 2;
1064 1061
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1067#else 1064#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1066#endif
1070 } 1067 }
1071 1068
1072 if (set_hint) 1069 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
1074 1071
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1073
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1075 {
1079 if (scrollBar.state) 1076 if (scrollBar.state)
1080 scrollBar.resize (); 1077 scrollBar.resize ();
1081 1078
1082 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1084 width, height); 1081 vt_width, vt_height);
1085 1082
1086#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1088 update_background (); 1085 update_background ();
1089#endif 1086#endif
1090 } 1087 }
1091 1088
1092 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1093 scr_reset (); 1090 scr_reset ();
1094 1091
1095#ifdef HAVE_BG_PIXMAP
1096// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1097// if (bgPixmap.pixmap)
1098// scr_touch (false);
1099#endif
1100
1101#ifdef USE_XIM 1092#ifdef USE_XIM
1102 IMSetPosition (); 1093 im_set_position ();
1103#endif 1094#endif
1104} 1095}
1105 1096
1106/* 1097/*
1107 * 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.
… …
1120 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1121 if (newheight == 0) 1112 if (newheight == 0)
1122 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1123 } 1114 }
1124 1115
1125 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1126 { 1117 {
1127 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1128 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1129 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1130 } 1121 }
… …
1168 status_rect.height = fheight; 1159 status_rect.height = fheight;
1169} 1160}
1170 1161
1171/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1172bool 1163bool
1173rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1174{ 1165{
1175 Atom atom; 1166 Atom atom;
1176 Window win; 1167 Window win;
1177 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1178 1169
… …
1187 1178
1188 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1189 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1190 1181
1191 if (win != None) 1182 if (win != None)
1192 return True; 1183 return true;
1193 } 1184 }
1194 1185
1195 return False; 1186 return false;
1196} 1187}
1197 1188
1198void 1189void
1199rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1200{ 1191{
1201 XPoint nspot; 1192 XPoint nspot;
1202 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1203 1194
1204 if (!Input_Context 1195 if (!Input_Context
… …
1310/* 1301/*
1311 * 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
1312 * open a suitable preedit type 1303 * open a suitable preedit type
1313 */ 1304 */
1314bool 1305bool
1315rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1316{ 1307{
1317 int i, j, found; 1308 int i, j, found;
1318 XIM xim; 1309 XIM xim;
1319 XPoint spot; 1310 XPoint spot;
1320 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1321 unsigned long fg, bg; 1312 unsigned long fg, bg;
1322 const char *p; 1313 const char *p;
1323 char **s; 1314 char **s;
1324 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1325#ifdef ENABLE_XIM_ONTHESPOT
1326 XIMCallback xcb[4];
1327#endif
1328 1316
1329 set_environ (envv); 1317 set_environ (envv);
1330 1318
1331 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1332 return false; 1320 return false;
… …
1353 p = pet[pi]; 1341 p = pet[pi];
1354 1342
1355 if (!p) 1343 if (!p)
1356 continue; 1344 continue;
1357 1345
1358 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1359 1347
1360 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1361 { 1349 {
1362 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1363 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1375 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1376 1364
1377 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1378 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1379 { 1367 {
1380 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1381 1369
1382 found = 1; 1370 found = 1;
1383 goto foundpet; 1371 goto foundpet;
1384 } 1372 }
1385 1373
1386 } 1374 }
1387 1375
1388 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1389 } 1377 }
1390 1378
1391foundpet: 1379foundpet:
1392 1380
1393 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1472 NULL); 1460 NULL);
1473 } 1461 }
1474#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1475 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1476 { 1464 {
1465 XIMCallback xcb[4];
1466
1477 im_set_position (spot); 1467 im_set_position (spot);
1478 1468
1479 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;
1480 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;
1481 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;
… …
1496#endif 1486#endif
1497 1487
1498 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1499 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1500 XNClientWindow, vt, 1490 XNClientWindow, vt,
1501 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1502 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1503 preedit_attr, 1493 preedit_attr,
1504 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1505 status_attr, NULL); 1495 status_attr, NULL);
1506 1496
… …
1519 // 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
1520 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1521 vt_select_input (); 1511 vt_select_input ();
1522#endif 1512#endif
1523 1513
1524 IMSetPosition (); 1514 im_set_position ();
1525 1515
1526 return true; 1516 return true;
1527} 1517}
1528 1518
1529void 1519void
… …
1539 im_destroy (); 1529 im_destroy ();
1540 1530
1541 if (Input_Context) 1531 if (Input_Context)
1542 return; 1532 return;
1543 1533
1544#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1545 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1546 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1547#endif
1548 1536
1549 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1550 if (p && *p) 1538 if (p && *p)
1551 { 1539 {
1552 bool found = false; 1540 bool found = false;
1553 1541
1554 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1555 1543
1556 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1557 { 1545 {
1558 if (*s[i]) 1546 if (*s[i])
1559 { 1547 {
1560 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1561 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1562 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1563 { 1551 {
1564 found = true; 1552 found = true;
1565 break; 1553 break;
1566 } 1554 }
1567 } 1555 }
1568 } 1556 }
1569 1557
1570 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1571 1559
1572 if (found) 1560 if (found)
1573 goto done; 1561 goto done;
1574 } 1562 }
1575 1563
1576 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1577 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1578 goto done; 1566 goto done;
1579 1567
1580 /* 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 */
1581 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1582 goto done; 1570 goto done;
1583 1571
1584done: 1572done:
1585#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1586 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1587 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1588#endif
1589} 1575}
1590 1576
1591void 1577void
1592rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1593{ 1579{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1596 1582
1597 if (!Input_Context 1583 if (!Input_Context
1598 || !focus 1584 || !focus
1599 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1586 || !im_is_running ())
1601 return; 1587 return;
1602 1588
1603 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1604 { 1590 {
1605 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1635 1621
1636void 1622void
1637rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1638{ 1624{
1639 Window cr; 1625 Window cr;
1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1641} 1627}
1642 1628
1643Pixmap 1629Pixmap
1644rxvt_term::get_pixmap_property (Atom property) 1630rxvt_term::get_pixmap_property (Atom property)
1645{ 1631{
… …
1668rxvt_term::update_background () 1654rxvt_term::update_background ()
1669{ 1655{
1670 if (update_background_ev.is_active ()) 1656 if (update_background_ev.is_active ())
1671 return; 1657 return;
1672 1658
1673 bgPixmap.invalidate (); 1659 bg_invalidate ();
1674 1660
1661 if (!mapped)
1662 return;
1663
1675 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1676 1665
1677 if (to_wait <= 0.) 1666 if (to_wait <= 0.)
1678 bgPixmap.render (); 1667 bg_render ();
1679 else 1668 else
1680 update_background_ev.start (to_wait); 1669 update_background_ev.start (to_wait);
1681} 1670}
1682 1671
1683void 1672void
1684rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1685{ 1674{
1686 make_current (); 1675 make_current ();
1687 1676
1688 update_background_ev.stop (); 1677 update_background_ev.stop ();
1689 bgPixmap.render (); 1678 bg_render ();
1690 refresh_check (); 1679 refresh_check ();
1691} 1680}
1692 1681
1693#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1694 1683

Diff Legend

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