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.347 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs.
Revision 1.378 by root, Tue Jun 5 11:10:50 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)
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
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 ();
243 selection_clear (true); 234 selection_clear (true);
244 235
245#ifdef USE_XIM 236#if USE_XIM
246 im_destroy (); 237 im_destroy ();
247#endif 238#endif
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];
397 const char mtype[] = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
407 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 401 }
402
412 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 406 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 408 || event->error_code == BadColor
418 (event->error_code == BadGC) || 409 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 411 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
422 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 else 418 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ); 420
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 422 }
423
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 426}
437#endif 427#endif
438 428
439int 429int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 431{
442 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
444 else 434 else
453 } 443 }
454 444
455 return 0; 445 return 0;
456} 446}
457 447
458int 448int ecb_cold
459rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
460{ 450{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display)); 452 DisplayString (display));
463 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
586 576
587 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
588} 582}
589 583
590/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
591/* 585/*
592 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
713 if (recalc_y) 707 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 709
716 ncol = width / fwidth; 710 ncol = width / fwidth;
717 nrow = height / fheight; 711 nrow = height / fheight;
712
713 // When the size of the vt window is not a multiple of the cell
714 // size, i.e., when the wm does not honour our size hints, there are
715 // extra areas not covered by the terminal screen. Such gaps, when a
716 // bg pixmap is set, would have to be cleared manually to properly
717 // refresh the background. We take the simpler route and shrink the
718 // vt window so as to avoid creating gaps.
719 vt_width = ncol * fwidth;
720 vt_height = nrow * fheight;
718} 721}
719 722
720/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
721/* 724/*
722 * Tell the teletype handler what size the window is. 725 * Tell the teletype handler what size the window is.
730 733
731 struct winsize ws; 734 struct winsize ws;
732 735
733 ws.ws_col = ncol; 736 ws.ws_col = ncol;
734 ws.ws_row = nrow; 737 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 738 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 739 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 740 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 741
739#if 0 742#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 743 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 744 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 745 kill (-cmd_pid, SIGWINCH);
743#endif 746#endif
744} 747}
745 748
746/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 750/* 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 751bool
755rxvt_term::set_fonts () 752rxvt_term::set_fonts ()
756{ 753{
757 rxvt_fontset *fs = new rxvt_fontset (this); 754 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 755 rxvt_fontprop prop;
773 770
774 delete fontset[0]; 771 delete fontset[0];
775 fontset[0] = fs; 772 fontset[0] = fs;
776 773
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace;
779 prop.width += letterSpace; 775 prop.width += letterSpace;
780 776
781 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
782 778
783 fwidth = prop.width; 779 fwidth = prop.width;
784 fheight = prop.height; 780 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 781 fbase = prop.ascent;
786 782
787 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
788 { 784 {
789#if ENABLE_STYLES 785#if ENABLE_STYLES
815#else 811#else
816 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
817#endif 813#endif
818 } 814 }
819 815
820 if (parent[0]) 816 if (parent)
821 { 817 {
822 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 819 scr_remap_chars ();
824 scr_touch (true); 820 scr_touch (true);
825 } 821 }
828} 824}
829 825
830void 826void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 828{
833 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 832}
837 833
838void 834void
840{ 836{
841 XTextProperty ct; 837 XTextProperty ct;
842 838
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 840 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 841 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 842 XFree (ct.value);
847 } 843 }
848} 844}
849 845
850void 846void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 848{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
855 851
856 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
859 855
860 free (s); 856 free (s);
861 free (ws); 857 free (ws);
951 947
952/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
953/* 949/*
954 * find if fg/bg matches any of the normal (low-intensity) colors 950 * find if fg/bg matches any of the normal (low-intensity) colors
955 */ 951 */
956void 952char *
957rxvt_term::set_colorfgbg () 953rxvt_term::get_colorfgbg ()
958{ 954{
959 unsigned int i; 955 unsigned int i;
960 const char *xpmb = ""; 956 const char *xpmb = "";
961 char fstr[] = "default"; 957 char fstr[] = "default";
962 char bstr[] = "default"; 958 char bstr[] = "default";
959 char *env_colorfgbg;
963 960
964 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_fg] == pix_colors[i]) 962 if (pix_colors[Color_fg] == pix_colors[i])
966 { 963 {
967 sprintf (fstr, "%d", i - Color_Black); 964 sprintf (fstr, "%d", i - Color_Black);
970 967
971 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
972 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
973 { 970 {
974 sprintf (bstr, "%d", i - Color_Black); 971 sprintf (bstr, "%d", i - Color_Black);
975#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
976 xpmb = "default;"; 973 xpmb = "default;";
977#endif 974#endif
978 break; 975 break;
979 } 976 }
980 977
978 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
981 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 979 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
980 return env_colorfgbg;
982} 981}
983 982
984/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
985 984
986bool 985bool
1015 1014
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1015 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint) 1016 if (set_hint)
1018 { 1017 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1018 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1019 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1020 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1021 }
1023 1022
1024 if (!ignoreparent) 1023 if (!ignoreparent)
1025 { 1024 {
1031 int x, y, x1, y1; 1030 int x, y, x1, y1;
1032 int dx, dy; 1031 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1032 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1033 Window unused_cr;
1035 1034
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1035 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1036 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1037 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1038 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1039 /*
1041 * if display->root isn't the parent window, a WM will probably have offset 1040 * if display->root isn't the parent window, a WM will probably have offset
1042 * our position for handles and decorations. Counter it 1041 * our position for handles and decorations. Counter it
1043 */ 1042 */
1060 if (y < y1) /* top half */ 1059 if (y < y1) /* top half */
1061 dy = 0; 1060 dy = 0;
1062 else if (y == y1) /* exact center */ 1061 else if (y == y1) /* exact center */
1063 dy /= 2; 1062 dy /= 2;
1064 1063
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1064 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1065 szHint.width, szHint.height);
1067#else 1066#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1067 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1068#endif
1070 } 1069 }
1071 1070
1072 if (set_hint) 1071 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1072 XSetWMNormalHints (dpy, parent, &szHint);
1074 1073
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1075
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1077 {
1079 if (scrollBar.state) 1078 if (scrollBar.state)
1080 scrollBar.resize (); 1079 scrollBar.resize ();
1081 1080
1082 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
1084 width, height); 1083 vt_width, vt_height);
1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085 1086
1086#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
1088 update_background (); 1089 update_background ();
1089#endif 1090#endif
1090 } 1091 }
1091 1092
1092 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
1093 scr_reset (); 1094 scr_reset ();
1094 1095
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 1096#if USE_XIM
1102 IMSetPosition (); 1097 im_set_position ();
1103#endif 1098#endif
1104} 1099}
1105 1100
1106/* 1101/*
1107 * Set the width/height of the vt window in characters. Units are pixels. 1102 * Set the width/height of the vt window in characters. Units are pixels.
1120 newwidth = wattr.width - szHint.base_width; 1115 newwidth = wattr.width - szHint.base_width;
1121 if (newheight == 0) 1116 if (newheight == 0)
1122 newheight = wattr.height - szHint.base_height; 1117 newheight = wattr.height - szHint.base_height;
1123 } 1118 }
1124 1119
1125 if (newwidth != width || newheight != height) 1120 if (newwidth != vt_width || newheight != vt_height)
1126 { 1121 {
1127 newwidth += szHint.base_width; 1122 newwidth += szHint.base_width;
1128 newheight += szHint.base_height; 1123 newheight += szHint.base_height;
1129 resize_all_windows (newwidth, newheight, 0); 1124 resize_all_windows (newwidth, newheight, 0);
1130 } 1125 }
1131} 1126}
1132 1127
1133/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1134 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1135 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1136#ifdef USE_XIM 1131#if USE_XIM
1137 1132
1138void 1133void
1139rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1140{ 1135{
1141 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
1168 status_rect.height = fheight; 1163 status_rect.height = fheight;
1169} 1164}
1170 1165
1171/* Checking whether input method is running. */ 1166/* Checking whether input method is running. */
1172bool 1167bool
1173rxvt_term::IMisRunning () 1168rxvt_term::im_is_running ()
1174{ 1169{
1175 Atom atom; 1170 Atom atom;
1176 Window win; 1171 Window win;
1177 char server[IMBUFSIZ]; 1172 char server[IMBUFSIZ];
1178 1173
1187 1182
1188 atom = XInternAtom (dpy, server, False); 1183 atom = XInternAtom (dpy, server, False);
1189 win = XGetSelectionOwner (dpy, atom); 1184 win = XGetSelectionOwner (dpy, atom);
1190 1185
1191 if (win != None) 1186 if (win != None)
1192 return True; 1187 return true;
1193 } 1188 }
1194 1189
1195 return False; 1190 return false;
1196} 1191}
1197 1192
1198void 1193void
1199rxvt_term::IMSendSpot () 1194rxvt_term::im_send_spot ()
1200{ 1195{
1201 XPoint nspot; 1196 XPoint nspot;
1202 XVaNestedList preedit_attr; 1197 XVaNestedList preedit_attr;
1203 1198
1204 if (!Input_Context 1199 if (!Input_Context
1310/* 1305/*
1311 * Try to open a XIM with the current modifiers, then see if we can 1306 * Try to open a XIM with the current modifiers, then see if we can
1312 * open a suitable preedit type 1307 * open a suitable preedit type
1313 */ 1308 */
1314bool 1309bool
1315rxvt_term::IM_get_IC (const char *modifiers) 1310rxvt_term::im_get_ic (const char *modifiers)
1316{ 1311{
1317 int i, j, found; 1312 int i, j, found;
1318 XIM xim; 1313 XIM xim;
1319 XPoint spot; 1314 XPoint spot;
1320 XRectangle rect, status_rect, needed_rect; 1315 XRectangle rect, status_rect, needed_rect;
1321 unsigned long fg, bg; 1316 unsigned long fg, bg;
1322 const char *p; 1317 const char *p;
1323 char **s; 1318 char **s;
1324 XIMStyles *xim_styles; 1319 XIMStyles *xim_styles;
1325#ifdef ENABLE_XIM_ONTHESPOT
1326 XIMCallback xcb[4];
1327#endif
1328 1320
1329 set_environ (envv); 1321 set_environ (envv);
1330 1322
1331 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1332 return false; 1324 return false;
1472 NULL); 1464 NULL);
1473 } 1465 }
1474#if ENABLE_XIM_ONTHESPOT 1466#if ENABLE_XIM_ONTHESPOT
1475 else if (input_style & XIMPreeditCallbacks) 1467 else if (input_style & XIMPreeditCallbacks)
1476 { 1468 {
1469 XIMCallback xcb[4];
1470
1477 im_set_position (spot); 1471 im_set_position (spot);
1478 1472
1479 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1473 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; 1474 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; 1475 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1496#endif 1490#endif
1497 1491
1498 Input_Context = XCreateIC (xim, 1492 Input_Context = XCreateIC (xim,
1499 XNInputStyle, input_style, 1493 XNInputStyle, input_style,
1500 XNClientWindow, vt, 1494 XNClientWindow, vt,
1501 XNFocusWindow, parent[0], 1495 XNFocusWindow, parent,
1502 preedit_attr ? XNPreeditAttributes : NULL, 1496 preedit_attr ? XNPreeditAttributes : NULL,
1503 preedit_attr, 1497 preedit_attr,
1504 status_attr ? XNStatusAttributes : NULL, 1498 status_attr ? XNStatusAttributes : NULL,
1505 status_attr, NULL); 1499 status_attr, NULL);
1506 1500
1519 // unfortunately, only the focus window is used by XIM, hard to fix 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1520 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1521 vt_select_input (); 1515 vt_select_input ();
1522#endif 1516#endif
1523 1517
1524 IMSetPosition (); 1518 im_set_position ();
1525 1519
1526 return true; 1520 return true;
1527} 1521}
1528 1522
1529void 1523void
1539 im_destroy (); 1533 im_destroy ();
1540 1534
1541 if (Input_Context) 1535 if (Input_Context)
1542 return; 1536 return;
1543 1537
1544#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1545 if (rs[Rs_imLocale]) 1538 if (rs[Rs_imLocale])
1546 SET_LOCALE (rs[Rs_imLocale]); 1539 SET_LOCALE (rs[Rs_imLocale]);
1547#endif
1548 1540
1549 p = rs[Rs_inputMethod]; 1541 p = rs[Rs_inputMethod];
1550 if (p && *p) 1542 if (p && *p)
1551 { 1543 {
1552 bool found = false; 1544 bool found = false;
1557 { 1549 {
1558 if (*s[i]) 1550 if (*s[i])
1559 { 1551 {
1560 strcpy (buf, "@im="); 1552 strcpy (buf, "@im=");
1561 strncat (buf, s[i], IMBUFSIZ - 5); 1553 strncat (buf, s[i], IMBUFSIZ - 5);
1562 if (IM_get_IC (buf)) 1554 if (im_get_ic (buf))
1563 { 1555 {
1564 found = true; 1556 found = true;
1565 break; 1557 break;
1566 } 1558 }
1567 } 1559 }
1572 if (found) 1564 if (found)
1573 goto done; 1565 goto done;
1574 } 1566 }
1575 1567
1576 /* try with XMODIFIERS env. var. */ 1568 /* try with XMODIFIERS env. var. */
1577 if (IM_get_IC ("")) 1569 if (im_get_ic (""))
1578 goto done; 1570 goto done;
1579 1571
1580 /* try with no modifiers base IF the user didn't specify an IM */ 1572 /* try with no modifiers base IF the user didn't specify an IM */
1581 if (IM_get_IC ("@im=none")) 1573 if (im_get_ic ("@im=none"))
1582 goto done; 1574 goto done;
1583 1575
1584done: 1576done:
1585#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1586 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1587 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1588#endif
1589} 1579}
1590 1580
1591void 1581void
1592rxvt_term::IMSetPosition () 1582rxvt_term::im_set_position ()
1593{ 1583{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1596 1586
1597 if (!Input_Context 1587 if (!Input_Context
1598 || !focus 1588 || !focus
1599 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1590 || !im_is_running ())
1601 return; 1591 return;
1602 1592
1603 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1604 { 1594 {
1605 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
1635 1625
1636void 1626void
1637rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1638{ 1628{
1639 Window cr; 1629 Window cr;
1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1641}
1642
1643Pixmap
1644rxvt_term::get_pixmap_property (Atom property)
1645{
1646 Pixmap pixmap = None;
1647
1648 int aformat;
1649 unsigned long nitems, bytes_after;
1650 Atom atype;
1651 unsigned char *prop;
1652 int result = XGetWindowProperty (dpy, display->root, property,
1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1654 &nitems, &bytes_after, &prop);
1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1660 }
1661
1662 return pixmap;
1663} 1631}
1664 1632
1665#ifdef HAVE_BG_PIXMAP 1633#ifdef HAVE_BG_PIXMAP
1666 1634
1667void 1635void
1668rxvt_term::update_background () 1636rxvt_term::update_background ()
1669{ 1637{
1670 if (update_background_ev.is_active ()) 1638 if (update_background_ev.is_active ())
1671 return; 1639 return;
1672 1640
1673 bgPixmap.invalidate (); 1641 bg_invalidate ();
1674 1642
1643 if (!mapped)
1644 return;
1645
1675 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1676 1647
1677 if (to_wait <= 0.) 1648 if (to_wait <= 0.)
1678 bgPixmap.render (); 1649 bg_render ();
1679 else 1650 else
1680 update_background_ev.start (to_wait); 1651 update_background_ev.start (to_wait);
1681} 1652}
1682 1653
1683void 1654void
1684rxvt_term::update_background_cb (ev::timer &w, int revents) 1655rxvt_term::update_background_cb (ev::timer &w, int revents)
1685{ 1656{
1686 make_current (); 1657 make_current ();
1687 1658
1688 update_background_ev.stop (); 1659 update_background_ev.stop ();
1689 bgPixmap.render (); 1660 bg_render ();
1690 refresh_check (); 1661 refresh_check ();
1691} 1662}
1692 1663
1693#endif /* HAVE_BG_PIXMAP */ 1664#endif /* HAVE_BG_PIXMAP */
1694 1665

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines