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.351 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 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
… …
234 if (display) 231 if (display)
235 { 232 {
236 selection_clear (); 233 selection_clear ();
237 selection_clear (true); 234 selection_clear (true);
238 235
239#ifdef USE_XIM 236#if USE_XIM
240 im_destroy (); 237 im_destroy ();
241#endif 238#endif
242 scrollBar.destroy (); 239 scrollBar.destroy ();
243 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
244 241
245 delete drawable; 242 delete drawable;
246 // destroy all windows 243 // destroy all windows
247 if (parent[0]) 244 if (parent)
248 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
249 246
250 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
251 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
252 { 249 {
253 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
268 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 266 free (allocated [i]);
270 267
271 free (selection.text); 268 free (selection.text);
272 free (selection.clip_text); 269 free (selection.clip_text);
273 // TODO: manage env vars in child only(!)
274 free (env_display);
275 free (env_term);
276 free (locale); 270 free (locale);
277 free (v_buffer); 271 free (v_buffer);
278 free (incr_buf); 272
273 delete selection_req;
279 274
280 delete envv; 275 delete envv;
281 delete argv; 276 delete argv;
282 277
283#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
319#endif 314#endif
320 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
323#endif 318#endif
324 incr_ev.stop ();
325 termwin_ev.stop (display); 319 termwin_ev.stop (display);
326 vt_ev.stop (display); 320 vt_ev.stop (display);
327 } 321 }
328 322
329 flush_ev.stop (); 323 flush_ev.stop ();
… …
354 348
355 delete this; 349 delete this;
356} 350}
357 351
358void 352void
359rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
360{ 354{
361 if (!opt) 355 if (!opt)
362 return; 356 return;
363 357
364 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
368} 362}
369 363
370/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
371/* 365/*
372 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
373 * TODO: if debugging, this should free up any known resources if we can
374 */ 367 */
375static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
376 369
377static void 370static void
378rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
381 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
382} 375}
383 376
384#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
385static void 378static void ecb_cold
386print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
387{ 380{
388 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
389 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
390 char number[32]; 383 char number[32];
391 const char mtype[] = "XlibMessage"; 384
392 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
393 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
395 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
396 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396
398 sprintf(number, "%d", event->request_code); 397 sprintf (number, "%d", event->request_code);
399 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
400 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("+ (which is %s)\n", buffer);
400
401 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
402 {
402 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
403 mesg, BUFSIZ); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
405 } 405 }
406
406 if ((event->error_code == BadWindow) || 407 if (event->error_code == BadWindow
407 (event->error_code == BadPixmap) || 408 || event->error_code == BadPixmap
408 (event->error_code == BadCursor) || 409 || event->error_code == BadCursor
409 (event->error_code == BadFont) || 410 || event->error_code == BadFont
410 (event->error_code == BadDrawable) || 411 || event->error_code == BadDrawable
411 (event->error_code == BadColor) || 412 || event->error_code == BadColor
412 (event->error_code == BadGC) || 413 || event->error_code == BadGC
413 (event->error_code == BadIDChoice) || 414 || event->error_code == BadIDChoice
414 (event->error_code == BadValue) || 415 || event->error_code == BadValue
415 (event->error_code == BadAtom)) { 416 || event->error_code == BadAtom)
417 {
416 if (event->error_code == BadValue) 418 if (event->error_code == BadValue)
417 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 419 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ);
419 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
420 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
421 mesg, BUFSIZ);
422 else 422 else
423 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
426 }
427 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
428 mesg, BUFSIZ);
429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
430}
431#endif
432 424
433int 425 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
426 }
427}
428#endif
429
430int ecb_cold
434rxvt_xerror_handler (Display *display, XErrorEvent *event) 431rxvt_xerror_handler (Display *display, XErrorEvent *event)
435{ 432{
436 if (GET_R->allowedxerror == -1) 433 if (GET_R->allowedxerror == -1)
437 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
438 else 435 else
… …
447 } 444 }
448 445
449 return 0; 446 return 0;
450} 447}
451 448
452int 449int ecb_cold
453rxvt_xioerror_handler (Display *display) 450rxvt_xioerror_handler (Display *display)
454{ 451{
455 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 452 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
456 DisplayString (display)); 453 DisplayString (display));
457 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
… …
577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
579 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
580 577
581 XrmInitialize (); 578 XrmInitialize ();
579
580#if HAVE_PIXBUF
581 g_type_init ();
582#endif
582} 583}
583 584
584/*----------------------------------------------------------------------*/ 585/*----------------------------------------------------------------------*/
585/* 586/*
586 * window size/position calculations for XSizeHint and other storage. 587 * window size/position calculations for XSizeHint and other storage.
… …
707 if (recalc_y) 708 if (recalc_y)
708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
709 710
710 ncol = width / fwidth; 711 ncol = width / fwidth;
711 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 vt_width = ncol * fwidth;
721 vt_height = nrow * fheight;
712} 722}
713 723
714/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
715/* 725/*
716 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
724 734
725 struct winsize ws; 735 struct winsize ws;
726 736
727 ws.ws_col = ncol; 737 ws.ws_col = ncol;
728 ws.ws_row = nrow; 738 ws.ws_row = nrow;
729 ws.ws_xpixel = width; 739 ws.ws_xpixel = vt_width;
730 ws.ws_ypixel = height; 740 ws.ws_ypixel = vt_height;
731 ioctl (pty->pty, TIOCSWINSZ, &ws); 741 ioctl (pty->pty, TIOCSWINSZ, &ws);
732 742
733#if 0 743#if 0
734 // TIOCSWINSZ is supposed to do this automatically and correctly 744 // TIOCSWINSZ is supposed to do this automatically and correctly
735 if (cmd_pid) /* force through to the command */ 745 if (cmd_pid) /* force through to the command */
736 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
737#endif 747#endif
738} 748}
739 749
740/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
741/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
742 *
743 * init = 1 - initialize
744 *
745 * fontname == FONT_UP - switch to bigger font
746 * fontname == FONT_DN - switch to smaller font
747 */
748bool 752bool
749rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
750{ 754{
751 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
752 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
767 771
768 delete fontset[0]; 772 delete fontset[0];
769 fontset[0] = fs; 773 fontset[0] = fs;
770 774
771 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
772 prop.height += lineSpace;
773 prop.width += letterSpace; 776 prop.width += letterSpace;
774 777
775 fs->set_prop (prop, false); 778 fs->set_prop (prop, false);
776 779
777 fwidth = prop.width; 780 fwidth = prop.width;
778 fheight = prop.height; 781 fheight = prop.height + lineSpace;
779 fbase = prop.ascent; 782 fbase = prop.ascent;
780 783
781 for (int style = 1; style < 4; style++) 784 for (int style = 1; style < 4; style++)
782 { 785 {
783#if ENABLE_STYLES 786#if ENABLE_STYLES
… …
809#else 812#else
810 fontset[style] = fontset[0]; 813 fontset[style] = fontset[0];
811#endif 814#endif
812 } 815 }
813 816
814 if (parent[0]) 817 if (parent)
815 { 818 {
816 resize_all_windows (0, 0, 0); 819 resize_all_windows (0, 0, 0);
817 scr_remap_chars (); 820 scr_remap_chars ();
818 scr_touch (true); 821 scr_touch (true);
819 } 822 }
… …
822} 825}
823 826
824void 827void
825rxvt_term::set_string_property (Atom prop, const char *str, int len) 828rxvt_term::set_string_property (Atom prop, const char *str, int len)
826{ 829{
827 XChangeProperty (dpy, parent[0], 830 XChangeProperty (dpy, parent,
828 prop, XA_STRING, 8, PropModeReplace, 831 prop, XA_STRING, 8, PropModeReplace,
829 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 832 (const unsigned char *)str, len >= 0 ? len : strlen (str));
830} 833}
831 834
832void 835void
… …
834{ 837{
835 XTextProperty ct; 838 XTextProperty ct;
836 839
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 840 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 { 841 {
839 XSetTextProperty (dpy, parent[0], &ct, prop); 842 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value); 843 XFree (ct.value);
841 } 844 }
842} 845}
843 846
844void 847void
845rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 848rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
846{ 849{
847 wchar_t *ws = rxvt_mbstowcs (str, len); 850 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 851 char *s = rxvt_wcstoutf8 (ws);
849 852
850 XChangeProperty (dpy, parent[0], 853 XChangeProperty (dpy, parent,
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 854 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 855 (const unsigned char *)s, strlen (s));
853 856
854 free (s); 857 free (s);
855 free (ws); 858 free (ws);
… …
945 948
946/*----------------------------------------------------------------------*/ 949/*----------------------------------------------------------------------*/
947/* 950/*
948 * find if fg/bg matches any of the normal (low-intensity) colors 951 * find if fg/bg matches any of the normal (low-intensity) colors
949 */ 952 */
950void 953char *
951rxvt_term::set_colorfgbg () 954rxvt_term::get_colorfgbg ()
952{ 955{
953 unsigned int i; 956 unsigned int i;
954 const char *xpmb = ""; 957 const char *xpmb = "";
955 char fstr[] = "default"; 958 char fstr[] = "default";
956 char bstr[] = "default"; 959 char bstr[] = "default";
960 char *env_colorfgbg;
957 961
958 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
959 if (pix_colors[Color_fg] == pix_colors[i]) 963 if (pix_colors[Color_fg] == pix_colors[i])
960 { 964 {
961 sprintf (fstr, "%d", i - Color_Black); 965 sprintf (fstr, "%d", i - Color_Black);
… …
964 968
965 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
967 { 971 {
968 sprintf (bstr, "%d", i - Color_Black); 972 sprintf (bstr, "%d", i - Color_Black);
969#ifdef BG_IMAGE_FROM_FILE 973#if BG_IMAGE_FROM_FILE
970 xpmb = "default;"; 974 xpmb = "default;";
971#endif 975#endif
972 break; 976 break;
973 } 977 }
974 978
979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
975 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 980 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
981 return env_colorfgbg;
976} 982}
977 983
978/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
979 985
980bool 986bool
… …
1009 1015
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint) 1017 if (set_hint)
1012 { 1018 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc); 1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1014 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc; 1021 szHint.flags |= PBaseSize | PResizeInc;
1016 } 1022 }
1017 1023
1018 if (!ignoreparent) 1024 if (!ignoreparent)
1019 { 1025 {
… …
1025 int x, y, x1, y1; 1031 int x, y, x1, y1;
1026 int dx, dy; 1032 int dx, dy;
1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1028 Window unused_cr; 1034 Window unused_cr;
1029 1035
1030 XTranslateCoordinates (dpy, parent[0], display->root, 1036 XTranslateCoordinates (dpy, parent, display->root,
1031 0, 0, &x, &y, &unused_cr); 1037 0, 0, &x, &y, &unused_cr);
1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1038 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1034 /* 1040 /*
1035 * if display->root isn't the parent window, a WM will probably have offset 1041 * if display->root isn't the parent window, a WM will probably have offset
1036 * our position for handles and decorations. Counter it 1042 * our position for handles and decorations. Counter it
1037 */ 1043 */
… …
1054 if (y < y1) /* top half */ 1060 if (y < y1) /* top half */
1055 dy = 0; 1061 dy = 0;
1056 else if (y == y1) /* exact center */ 1062 else if (y == y1) /* exact center */
1057 dy /= 2; 1063 dy /= 2;
1058 1064
1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1065 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1060 szHint.width, szHint.height); 1066 szHint.width, szHint.height);
1061#else 1067#else
1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1063#endif 1069#endif
1064 } 1070 }
1065 1071
1066 if (set_hint) 1072 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint); 1073 XSetWMNormalHints (dpy, parent, &szHint);
1068 1074
1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1070 1076
1071 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1072 { 1078 {
1073 if (scrollBar.state) 1079 if (scrollBar.state)
1074 scrollBar.resize (); 1080 scrollBar.resize ();
1075 1081
1076 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1077 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1078 width, height); 1084 vt_width, vt_height);
1085
1086 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1079 1087
1080#ifdef HAVE_BG_PIXMAP 1088#ifdef HAVE_BG_PIXMAP
1081 if (bg_window_size_sensitive ()) 1089 if (bg_window_size_sensitive ())
1082 update_background (); 1090 update_background ();
1083#endif 1091#endif
1084 } 1092 }
1085 1093
1086 if (fix_screen || old_height == 0) 1094 if (fix_screen || old_height == 0)
1087 scr_reset (); 1095 scr_reset ();
1088 1096
1089#ifdef USE_XIM 1097#if USE_XIM
1090 IMSetPosition (); 1098 im_set_position ();
1091#endif 1099#endif
1092} 1100}
1093 1101
1094/* 1102/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1103 * Set the width/height of the vt window in characters. Units are pixels.
… …
1108 newwidth = wattr.width - szHint.base_width; 1116 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1117 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1118 newheight = wattr.height - szHint.base_height;
1111 } 1119 }
1112 1120
1113 if (newwidth != width || newheight != height) 1121 if (newwidth != vt_width || newheight != vt_height)
1114 { 1122 {
1115 newwidth += szHint.base_width; 1123 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1124 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1125 resize_all_windows (newwidth, newheight, 0);
1118 } 1126 }
1119} 1127}
1120 1128
1121/* -------------------------------------------------------------------- * 1129/* -------------------------------------------------------------------- *
1122 * - X INPUT METHOD ROUTINES - * 1130 * - X INPUT METHOD ROUTINES - *
1123 * -------------------------------------------------------------------- */ 1131 * -------------------------------------------------------------------- */
1124#ifdef USE_XIM 1132#if USE_XIM
1125 1133
1126void 1134void
1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1135rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1128{ 1136{
1129 fg = pix_colors [Color_fg]; 1137 fg = pix_colors [Color_fg];
… …
1156 status_rect.height = fheight; 1164 status_rect.height = fheight;
1157} 1165}
1158 1166
1159/* Checking whether input method is running. */ 1167/* Checking whether input method is running. */
1160bool 1168bool
1161rxvt_term::IMisRunning () 1169rxvt_term::im_is_running ()
1162{ 1170{
1163 Atom atom; 1171 Atom atom;
1164 Window win; 1172 Window win;
1165 char server[IMBUFSIZ]; 1173 char server[IMBUFSIZ];
1166 1174
… …
1182 1190
1183 return false; 1191 return false;
1184} 1192}
1185 1193
1186void 1194void
1187rxvt_term::IMSendSpot () 1195rxvt_term::im_send_spot ()
1188{ 1196{
1189 XPoint nspot; 1197 XPoint nspot;
1190 XVaNestedList preedit_attr; 1198 XVaNestedList preedit_attr;
1191 1199
1192 if (!Input_Context 1200 if (!Input_Context
… …
1298/* 1306/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1307 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1308 * open a suitable preedit type
1301 */ 1309 */
1302bool 1310bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1311rxvt_term::im_get_ic (const char *modifiers)
1304{ 1312{
1305 int i, j, found; 1313 int i, j, found;
1306 XIM xim; 1314 XIM xim;
1307 XPoint spot; 1315 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1317 unsigned long fg, bg;
1310 const char *p; 1318 const char *p;
1311 char **s; 1319 char **s;
1312 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1321
1317 set_environ (envv); 1322 set_environ (envv);
1318 1323
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1325 return false;
… …
1460 NULL); 1465 NULL);
1461 } 1466 }
1462#if ENABLE_XIM_ONTHESPOT 1467#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1468 else if (input_style & XIMPreeditCallbacks)
1464 { 1469 {
1470 XIMCallback xcb[4];
1471
1465 im_set_position (spot); 1472 im_set_position (spot);
1466 1473
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1474 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; 1475 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; 1476 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1491#endif
1485 1492
1486 Input_Context = XCreateIC (xim, 1493 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1494 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1495 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1496 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1497 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1498 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1499 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1500 status_attr, NULL);
1494 1501
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1514 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1515 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1516 vt_select_input ();
1510#endif 1517#endif
1511 1518
1512 IMSetPosition (); 1519 im_set_position ();
1513 1520
1514 return true; 1521 return true;
1515} 1522}
1516 1523
1517void 1524void
… …
1527 im_destroy (); 1534 im_destroy ();
1528 1535
1529 if (Input_Context) 1536 if (Input_Context)
1530 return; 1537 return;
1531 1538
1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1533 if (rs[Rs_imLocale]) 1539 if (rs[Rs_imLocale])
1534 SET_LOCALE (rs[Rs_imLocale]); 1540 SET_LOCALE (rs[Rs_imLocale]);
1535#endif
1536 1541
1537 p = rs[Rs_inputMethod]; 1542 p = rs[Rs_inputMethod];
1538 if (p && *p) 1543 if (p && *p)
1539 { 1544 {
1540 bool found = false; 1545 bool found = false;
… …
1545 { 1550 {
1546 if (*s[i]) 1551 if (*s[i])
1547 { 1552 {
1548 strcpy (buf, "@im="); 1553 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1554 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1555 if (im_get_ic (buf))
1551 { 1556 {
1552 found = true; 1557 found = true;
1553 break; 1558 break;
1554 } 1559 }
1555 } 1560 }
… …
1560 if (found) 1565 if (found)
1561 goto done; 1566 goto done;
1562 } 1567 }
1563 1568
1564 /* try with XMODIFIERS env. var. */ 1569 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1570 if (im_get_ic (""))
1566 goto done; 1571 goto done;
1567 1572
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1573 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1574 if (im_get_ic ("@im=none"))
1570 goto done; 1575 goto done;
1571 1576
1572done: 1577done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1578 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1579 SET_LOCALE (locale);
1576#endif
1577} 1580}
1578 1581
1579void 1582void
1580rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1581{ 1584{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1584 1587
1585 if (!Input_Context 1588 if (!Input_Context
1586 || !focus 1589 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1591 || !im_is_running ())
1589 return; 1592 return;
1590 1593
1591 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1592 { 1595 {
1593 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
… …
1623 1626
1624void 1627void
1625rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1626{ 1629{
1627 Window cr; 1630 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629}
1630
1631Pixmap
1632rxvt_term::get_pixmap_property (Atom property)
1633{
1634 Pixmap pixmap = None;
1635
1636 int aformat;
1637 unsigned long nitems, bytes_after;
1638 Atom atype;
1639 unsigned char *prop;
1640 int result = XGetWindowProperty (dpy, display->root, property,
1641 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1642 &nitems, &bytes_after, &prop);
1643 if (result == Success)
1644 {
1645 if (atype == XA_PIXMAP)
1646 pixmap = *(Pixmap *)prop;
1647 XFree (prop);
1648 }
1649
1650 return pixmap;
1651} 1632}
1652 1633
1653#ifdef HAVE_BG_PIXMAP 1634#ifdef HAVE_BG_PIXMAP
1654 1635
1655void 1636void
… …
1657{ 1638{
1658 if (update_background_ev.is_active ()) 1639 if (update_background_ev.is_active ())
1659 return; 1640 return;
1660 1641
1661 bg_invalidate (); 1642 bg_invalidate ();
1643
1644 if (!mapped)
1645 return;
1662 1646
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1647 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664 1648
1665 if (to_wait <= 0.) 1649 if (to_wait <= 0.)
1666 bg_render (); 1650 bg_render ();

Diff Legend

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