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

Diff Legend

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