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.335 by root, Sun Oct 24 17:52:50 2010 UTC vs.
Revision 1.377 by root, Tue Jun 5 11:00:40 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 175#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 177#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 179#endif
184#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 182#endif
… …
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 ();
245 selection_clear (true); 234 selection_clear (true);
246 235
247#ifdef USE_XIM 236#if USE_XIM
248 im_destroy (); 237 im_destroy ();
249#endif 238#endif
250 scrollBar.destroy (); 239 scrollBar.destroy ();
251 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
252 241
253 delete drawable; 242 delete drawable;
254 // destroy all windows 243 // destroy all windows
255 if (parent[0]) 244 if (parent)
256 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
257 246
258 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
260 { 249 {
261 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
276 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 266 free (allocated [i]);
278 267
279 free (selection.text); 268 free (selection.text);
280 free (selection.clip_text); 269 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 270 free (locale);
285 free (v_buffer); 271 free (v_buffer);
286 free (incr_buf); 272
273 delete selection_req;
287 274
288 delete envv; 275 delete envv;
289 delete argv; 276 delete argv;
290 277
291#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
327#endif 314#endif
328 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
331#endif 318#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 319 termwin_ev.stop (display);
334 vt_ev.stop (display); 320 vt_ev.stop (display);
335 } 321 }
336 322
337 flush_ev.stop (); 323 flush_ev.stop ();
… …
359rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
360{ 346{
361 make_current (); 347 make_current ();
362 348
363 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
364} 362}
365 363
366/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
367/* 365/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
376 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++)
377 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
378} 376}
379 377
380#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
381static void 379static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
383{ 381{
384 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
386 char number[32]; 384 char number[32];
387 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
391 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
424 mesg, BUFSIZ); 422 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426} 424}
427#endif 425#endif
428 426
429int 427int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 429{
432 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
434 else 432 else
… …
443 } 441 }
444 442
445 return 0; 443 return 0;
446} 444}
447 445
448int 446int ecb_cold
449rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
450{ 448{
451 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",
452 DisplayString (display)); 450 DisplayString (display));
453 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
511 tio->c_cc[VWERSE] = CWERASE; 509 tio->c_cc[VWERSE] = CWERASE;
512# endif 510# endif
513# ifdef VLNEXT 511# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 512 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
516 517
517# if VMIN != VEOF 518# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 519 tio->c_cc[VMIN] = 1;
519# endif 520# endif
520# if VTIME != VEOL 521# if VTIME != VEOL
… …
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
571 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
572 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
573 574
574 XrmInitialize (); 575 XrmInitialize ();
576
577#if HAVE_PIXBUF
578 g_type_init ();
579#endif
575} 580}
576 581
577/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
578/* 583/*
579 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
700 if (recalc_y) 705 if (recalc_y)
701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
702 707
703 ncol = width / fwidth; 708 ncol = width / fwidth;
704 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;
705} 719}
706 720
707/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
708/* 722/*
709 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
717 731
718 struct winsize ws; 732 struct winsize ws;
719 733
720 ws.ws_col = ncol; 734 ws.ws_col = ncol;
721 ws.ws_row = nrow; 735 ws.ws_row = nrow;
722 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
723 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
724 ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
725 739
726#if 0 740#if 0
727 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
728 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
729 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
730#endif 744#endif
731} 745}
732 746
733/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
734/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
735 *
736 * init = 1 - initialize
737 *
738 * fontname == FONT_UP - switch to bigger font
739 * fontname == FONT_DN - switch to smaller font
740 */
741bool 749bool
742rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
743{ 751{
744 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
745 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
760 768
761 delete fontset[0]; 769 delete fontset[0];
762 fontset[0] = fs; 770 fontset[0] = fs;
763 771
764 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765 prop.height += lineSpace;
766 prop.width += letterSpace; 773 prop.width += letterSpace;
767 774
768 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
769 776
770 fwidth = prop.width; 777 fwidth = prop.width;
771 fheight = prop.height; 778 fheight = prop.height + lineSpace;
772 fbase = prop.ascent; 779 fbase = prop.ascent;
773 780
774 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
775 { 782 {
776#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
802#else 809#else
803 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
804#endif 811#endif
805 } 812 }
806 813
807 if (parent[0]) 814 if (parent)
808 { 815 {
809 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
810 scr_remap_chars (); 817 scr_remap_chars ();
811 scr_touch (true); 818 scr_touch (true);
812 } 819 }
… …
815} 822}
816 823
817void 824void
818rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
819{ 826{
820 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
821 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
822 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
823} 830}
824 831
825void 832void
… …
827{ 834{
828 XTextProperty ct; 835 XTextProperty ct;
829 836
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 { 838 {
832 XSetTextProperty (dpy, parent[0], &ct, prop); 839 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value); 840 XFree (ct.value);
834 } 841 }
835} 842}
836 843
837void 844void
838rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
839{ 846{
840 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
841 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
842 849
843 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
845 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
846 853
847 free (s); 854 free (s);
848 free (ws); 855 free (ws);
… …
938 945
939/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
940/* 947/*
941 * 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
942 */ 949 */
943void 950char *
944rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
945{ 952{
946 unsigned int i; 953 unsigned int i;
947 const char *xpmb = ""; 954 const char *xpmb = "";
948 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
949 958
950 strcpy (fstr, "default");
951 strcpy (bstr, "default");
952 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
953 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
954 { 961 {
955 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
956 break; 963 break;
957 } 964 }
958 965
959 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
961 { 968 {
962 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
963#ifdef BG_IMAGE_FROM_FILE 970#if BG_IMAGE_FROM_FILE
964 xpmb = "default;"; 971 xpmb = "default;";
965#endif 972#endif
966 break; 973 break;
967 } 974 }
968 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
969 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;
970} 979}
971 980
972/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
973 982
974bool 983bool
… …
1003 1012
1004 // 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
1005 if (set_hint) 1014 if (set_hint)
1006 { 1015 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc); 1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1008 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc; 1018 szHint.flags |= PBaseSize | PResizeInc;
1010 } 1019 }
1011 1020
1012 if (!ignoreparent) 1021 if (!ignoreparent)
1013 { 1022 {
… …
1019 int x, y, x1, y1; 1028 int x, y, x1, y1;
1020 int dx, dy; 1029 int dx, dy;
1021 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1022 Window unused_cr; 1031 Window unused_cr;
1023 1032
1024 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1025 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1026 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1027 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1028 /* 1037 /*
1029 * 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
1030 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1031 */ 1040 */
… …
1048 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1049 dy = 0; 1058 dy = 0;
1050 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1051 dy /= 2; 1060 dy /= 2;
1052 1061
1053 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1054 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1055#else 1064#else
1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1057#endif 1066#endif
1058 } 1067 }
1059 1068
1060 if (set_hint) 1069 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
1062 1071
1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1064 1073
1065 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1066 { 1075 {
1067 if (scrollBar.state) 1076 if (scrollBar.state)
1068 scrollBar.resize (); 1077 scrollBar.resize ();
1069 1078
1070 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1071 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1072 width, height); 1081 vt_width, vt_height);
1082
1083 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1073 1084
1074#ifdef HAVE_BG_PIXMAP 1085#ifdef HAVE_BG_PIXMAP
1075 if (bgPixmap.window_size_sensitive ()) 1086 if (bg_window_size_sensitive ())
1076 update_background (); 1087 update_background ();
1077#endif 1088#endif
1078 } 1089 }
1079 1090
1080 if (fix_screen || old_height == 0) 1091 if (fix_screen || old_height == 0)
1081 scr_reset (); 1092 scr_reset ();
1082 1093
1083#ifdef HAVE_BG_PIXMAP
1084// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1085// if (bgPixmap.pixmap)
1086// scr_touch (false);
1087#endif
1088
1089#ifdef USE_XIM 1094#if USE_XIM
1090 IMSetPosition (); 1095 im_set_position ();
1091#endif 1096#endif
1092} 1097}
1093 1098
1094/* 1099/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1100 * Set the width/height of the vt window in characters. Units are pixels.
… …
1108 newwidth = wattr.width - szHint.base_width; 1113 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1114 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1115 newheight = wattr.height - szHint.base_height;
1111 } 1116 }
1112 1117
1113 if (newwidth != width || newheight != height) 1118 if (newwidth != vt_width || newheight != vt_height)
1114 { 1119 {
1115 newwidth += szHint.base_width; 1120 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1121 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1122 resize_all_windows (newwidth, newheight, 0);
1118 } 1123 }
1119} 1124}
1120 1125
1121/* -------------------------------------------------------------------- * 1126/* -------------------------------------------------------------------- *
1122 * - X INPUT METHOD ROUTINES - * 1127 * - X INPUT METHOD ROUTINES - *
1123 * -------------------------------------------------------------------- */ 1128 * -------------------------------------------------------------------- */
1124#ifdef USE_XIM 1129#if USE_XIM
1125 1130
1126void 1131void
1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1132rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1128{ 1133{
1129 fg = pix_colors [Color_fg]; 1134 fg = pix_colors [Color_fg];
… …
1156 status_rect.height = fheight; 1161 status_rect.height = fheight;
1157} 1162}
1158 1163
1159/* Checking whether input method is running. */ 1164/* Checking whether input method is running. */
1160bool 1165bool
1161rxvt_term::IMisRunning () 1166rxvt_term::im_is_running ()
1162{ 1167{
1163 Atom atom; 1168 Atom atom;
1164 Window win; 1169 Window win;
1165 char server[IMBUFSIZ]; 1170 char server[IMBUFSIZ];
1166 1171
… …
1175 1180
1176 atom = XInternAtom (dpy, server, False); 1181 atom = XInternAtom (dpy, server, False);
1177 win = XGetSelectionOwner (dpy, atom); 1182 win = XGetSelectionOwner (dpy, atom);
1178 1183
1179 if (win != None) 1184 if (win != None)
1180 return True; 1185 return true;
1181 } 1186 }
1182 1187
1183 return False; 1188 return false;
1184} 1189}
1185 1190
1186void 1191void
1187rxvt_term::IMSendSpot () 1192rxvt_term::im_send_spot ()
1188{ 1193{
1189 XPoint nspot; 1194 XPoint nspot;
1190 XVaNestedList preedit_attr; 1195 XVaNestedList preedit_attr;
1191 1196
1192 if (!Input_Context 1197 if (!Input_Context
… …
1298/* 1303/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1304 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1305 * open a suitable preedit type
1301 */ 1306 */
1302bool 1307bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1308rxvt_term::im_get_ic (const char *modifiers)
1304{ 1309{
1305 int i, j, found; 1310 int i, j, found;
1306 XIM xim; 1311 XIM xim;
1307 XPoint spot; 1312 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1313 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1314 unsigned long fg, bg;
1310 const char *p; 1315 const char *p;
1311 char **s; 1316 char **s;
1312 XIMStyles *xim_styles; 1317 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1318
1317 set_environ (envv); 1319 set_environ (envv);
1318 1320
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1322 return false;
… …
1341 p = pet[pi]; 1343 p = pet[pi];
1342 1344
1343 if (!p) 1345 if (!p)
1344 continue; 1346 continue;
1345 1347
1346 s = rxvt_splitcommastring (p); 1348 s = rxvt_strsplit (',', p);
1347 1349
1348 for (i = found = 0; !found && s[i]; i++) 1350 for (i = found = 0; !found && s[i]; i++)
1349 { 1351 {
1350 if (!strcmp (s[i], "OverTheSpot")) 1352 if (!strcmp (s[i], "OverTheSpot"))
1351 input_style = XIMPreeditPosition | XIMStatusNothing; 1353 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1363 input_style = XIMPreeditNothing | XIMStatusNothing; 1365 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1366
1365 for (j = 0; j < xim_styles->count_styles; j++) 1367 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1368 if (input_style == xim_styles->supported_styles[j])
1367 { 1369 {
1368 rxvt_freecommastring (s); 1370 rxvt_free_strsplit (s);
1369 1371
1370 found = 1; 1372 found = 1;
1371 goto foundpet; 1373 goto foundpet;
1372 } 1374 }
1373 1375
1374 } 1376 }
1375 1377
1376 rxvt_freecommastring (s); 1378 rxvt_free_strsplit (s);
1377 } 1379 }
1378 1380
1379foundpet: 1381foundpet:
1380 1382
1381 XFree (xim_styles); 1383 XFree (xim_styles);
… …
1460 NULL); 1462 NULL);
1461 } 1463 }
1462#if ENABLE_XIM_ONTHESPOT 1464#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1465 else if (input_style & XIMPreeditCallbacks)
1464 { 1466 {
1467 XIMCallback xcb[4];
1468
1465 im_set_position (spot); 1469 im_set_position (spot);
1466 1470
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1471 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; 1472 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; 1473 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1488#endif
1485 1489
1486 Input_Context = XCreateIC (xim, 1490 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1491 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1492 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1493 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1494 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1495 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1496 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1497 status_attr, NULL);
1494 1498
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1511 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1512 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1513 vt_select_input ();
1510#endif 1514#endif
1511 1515
1512 IMSetPosition (); 1516 im_set_position ();
1513 1517
1514 return true; 1518 return true;
1515} 1519}
1516 1520
1517void 1521void
… …
1527 im_destroy (); 1531 im_destroy ();
1528 1532
1529 if (Input_Context) 1533 if (Input_Context)
1530 return; 1534 return;
1531 1535
1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1533 if (rs[Rs_imLocale]) 1536 if (rs[Rs_imLocale])
1534 SET_LOCALE (rs[Rs_imLocale]); 1537 SET_LOCALE (rs[Rs_imLocale]);
1535#endif
1536 1538
1537 p = rs[Rs_inputMethod]; 1539 p = rs[Rs_inputMethod];
1538 if (p && *p) 1540 if (p && *p)
1539 { 1541 {
1540 bool found = false; 1542 bool found = false;
1541 1543
1542 s = rxvt_splitcommastring (p); 1544 s = rxvt_strsplit (',', p);
1543 1545
1544 for (i = 0; s[i]; i++) 1546 for (i = 0; s[i]; i++)
1545 { 1547 {
1546 if (*s[i]) 1548 if (*s[i])
1547 { 1549 {
1548 strcpy (buf, "@im="); 1550 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1551 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1552 if (im_get_ic (buf))
1551 { 1553 {
1552 found = true; 1554 found = true;
1553 break; 1555 break;
1554 } 1556 }
1555 } 1557 }
1556 } 1558 }
1557 1559
1558 rxvt_freecommastring (s); 1560 rxvt_free_strsplit (s);
1559 1561
1560 if (found) 1562 if (found)
1561 goto done; 1563 goto done;
1562 } 1564 }
1563 1565
1564 /* try with XMODIFIERS env. var. */ 1566 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1567 if (im_get_ic (""))
1566 goto done; 1568 goto done;
1567 1569
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1570 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1571 if (im_get_ic ("@im=none"))
1570 goto done; 1572 goto done;
1571 1573
1572done: 1574done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1576#endif
1577} 1577}
1578 1578
1579void 1579void
1580rxvt_term::IMSetPosition () 1580rxvt_term::im_set_position ()
1581{ 1581{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1582 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1583 XVaNestedList preedit_attr, status_attr;
1584 1584
1585 if (!Input_Context 1585 if (!Input_Context
1586 || !focus 1586 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1588 || !im_is_running ())
1589 return; 1589 return;
1590 1590
1591 if (input_style & XIMPreeditPosition) 1591 if (input_style & XIMPreeditPosition)
1592 { 1592 {
1593 im_set_size (preedit_rect); 1593 im_set_size (preedit_rect);
… …
1623 1623
1624void 1624void
1625rxvt_term::get_window_origin (int &x, int &y) 1625rxvt_term::get_window_origin (int &x, int &y)
1626{ 1626{
1627 Window cr; 1627 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629}
1630
1631Pixmap
1632rxvt_term::get_pixmap_property (int prop_id)
1633{
1634 if (prop_id > 0 && prop_id < NUM_XA)
1635 if (xa[prop_id])
1636 {
1637 int aformat;
1638 unsigned long nitems, bytes_after;
1639 Atom atype;
1640 unsigned char *prop = NULL;
1641 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop);
1644 if (result == Success && prop && atype == XA_PIXMAP)
1645 return *(Pixmap *)prop;
1646 }
1647
1648 return None;
1649} 1629}
1650 1630
1651#ifdef HAVE_BG_PIXMAP 1631#ifdef HAVE_BG_PIXMAP
1652 1632
1653void 1633void
1654rxvt_term::update_background () 1634rxvt_term::update_background ()
1655{ 1635{
1656 if (update_background_ev.is_active ()) 1636 if (update_background_ev.is_active ())
1657 return; 1637 return;
1658 1638
1659 bgPixmap.invalidate (); 1639 bg_invalidate ();
1660 1640
1641 if (!mapped)
1642 return;
1643
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1644 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1662 1645
1663 if (to_wait <= 0.) 1646 if (to_wait <= 0.)
1664 bgPixmap.render (); 1647 bg_render ();
1665 else 1648 else
1666 update_background_ev.start (to_wait); 1649 update_background_ev.start (to_wait);
1667} 1650}
1668 1651
1669void 1652void
1670rxvt_term::update_background_cb (ev::timer &w, int revents) 1653rxvt_term::update_background_cb (ev::timer &w, int revents)
1671{ 1654{
1672 make_current (); 1655 make_current ();
1673 1656
1674 update_background_ev.stop (); 1657 update_background_ev.stop ();
1675 bgPixmap.render (); 1658 bg_render ();
1676 refresh_check (); 1659 refresh_check ();
1677} 1660}
1678 1661
1679#endif /* HAVE_BG_PIXMAP */ 1662#endif /* HAVE_BG_PIXMAP */
1680 1663

Diff Legend

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