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.352 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 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
… …
233 if (display) 231 if (display)
234 { 232 {
235 selection_clear (); 233 selection_clear ();
236 selection_clear (true); 234 selection_clear (true);
237 235
238#ifdef USE_XIM 236#if USE_XIM
239 im_destroy (); 237 im_destroy ();
240#endif 238#endif
241 scrollBar.destroy (); 239 scrollBar.destroy ();
242 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
243 241
244 delete drawable; 242 delete drawable;
245 // destroy all windows 243 // destroy all windows
246 if (parent[0]) 244 if (parent)
247 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
248 246
249 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
251 { 249 {
252 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
267 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 266 free (allocated [i]);
269 267
270 free (selection.text); 268 free (selection.text);
271 free (selection.clip_text); 269 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 270 free (locale);
276 free (v_buffer); 271 free (v_buffer);
272
273 delete selection_req;
277 274
278 delete envv; 275 delete envv;
279 delete argv; 276 delete argv;
280 277
281#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
351 348
352 delete this; 349 delete this;
353} 350}
354 351
355void 352void
356rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
357{ 354{
358 if (!opt) 355 if (!opt)
359 return; 356 return;
360 357
361 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
365} 362}
366 363
367/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
368/* 365/*
369 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
370 * TODO: if debugging, this should free up any known resources if we can
371 */ 367 */
372static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
373 369
374static void 370static void
375rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
377 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++)
378 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
379} 375}
380 376
381#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
382static void 378static void ecb_cold
383print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
384{ 380{
385 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
386 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
387 char number[32]; 383 char number[32];
388 const char mtype[] = "XlibMessage"; 384
389 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
390 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
391 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);
392 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
393 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
395 sprintf(number, "%d", event->request_code); 396
396 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
397 rxvt_warn ("(which is %s)\n", buffer);
398 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
399#if 0
400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
399 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
400 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
401 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 436
437 sprintf (number, "%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer);
440 }
441
442 XFreeExtensionList (exts);
402 } 443 }
444 else
445 {
446 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer);
449 }
450
403 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
404 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
405 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
406 (event->error_code == BadFont) || 454 || event->error_code == BadFont
407 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
408 (event->error_code == BadColor) || 456 || event->error_code == BadColor
409 (event->error_code == BadGC) || 457 || event->error_code == BadGC
410 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
411 (event->error_code == BadValue) || 459 || event->error_code == BadValue
412 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
413 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
414 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ);
419 else 466 else
420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
421 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423 }
424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427}
428#endif
429 468
430int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
431rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
432{ 476{
433 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
434 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
435 else 479 else
… …
444 } 488 }
445 489
446 return 0; 490 return 0;
447} 491}
448 492
449int 493int ecb_cold
450rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
451{ 495{
452 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 496 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
453 DisplayString (display)); 497 DisplayString (display));
454 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
… …
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
575 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
576 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
577 621
578 XrmInitialize (); 622 XrmInitialize ();
623
624#if HAVE_PIXBUF
625 g_type_init ();
626#endif
579} 627}
580 628
581/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
582/* 630/*
583 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
704 if (recalc_y) 752 if (recalc_y)
705 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
706 754
707 ncol = width / fwidth; 755 ncol = width / fwidth;
708 nrow = height / fheight; 756 nrow = height / fheight;
757
758 // When the size of the vt window is not a multiple of the cell
759 // size, i.e., when the wm does not honour our size hints, there are
760 // extra areas not covered by the terminal screen. Such gaps, when a
761 // bg pixmap is set, would have to be cleared manually to properly
762 // refresh the background. We take the simpler route and shrink the
763 // vt window so as to avoid creating gaps.
764 vt_width = ncol * fwidth;
765 vt_height = nrow * fheight;
709} 766}
710 767
711/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
712/* 769/*
713 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
721 778
722 struct winsize ws; 779 struct winsize ws;
723 780
724 ws.ws_col = ncol; 781 ws.ws_col = ncol;
725 ws.ws_row = nrow; 782 ws.ws_row = nrow;
726 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
727 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
728 ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
729 786
730#if 0 787#if 0
731 // TIOCSWINSZ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
732 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
733 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
734#endif 791#endif
735} 792}
736 793
737/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
738/* set_fonts () - load and set the various fonts 795/* load and set the various fonts */
739 *
740 * init = 1 - initialize
741 *
742 * fontname == FONT_UP - switch to bigger font
743 * fontname == FONT_DN - switch to smaller font
744 */
745bool 796bool
746rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
747{ 798{
748 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
749 rxvt_fontprop prop; 800 rxvt_fontprop prop;
… …
764 815
765 delete fontset[0]; 816 delete fontset[0];
766 fontset[0] = fs; 817 fontset[0] = fs;
767 818
768 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
769 prop.height += lineSpace;
770 prop.width += letterSpace; 820 prop.width += letterSpace;
771 821
772 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
773 823
774 fwidth = prop.width; 824 fwidth = prop.width;
775 fheight = prop.height; 825 fheight = prop.height + lineSpace;
776 fbase = prop.ascent; 826 fbase = prop.ascent;
777 827
778 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
779 { 829 {
780#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
806#else 856#else
807 fontset[style] = fontset[0]; 857 fontset[style] = fontset[0];
808#endif 858#endif
809 } 859 }
810 860
811 if (parent[0]) 861 if (parent)
812 { 862 {
813 resize_all_windows (0, 0, 0); 863 resize_all_windows (0, 0, 0);
814 scr_remap_chars (); 864 scr_remap_chars ();
815 scr_touch (true); 865 scr_touch (true);
816 } 866 }
… …
819} 869}
820 870
821void 871void
822rxvt_term::set_string_property (Atom prop, const char *str, int len) 872rxvt_term::set_string_property (Atom prop, const char *str, int len)
823{ 873{
824 XChangeProperty (dpy, parent[0], 874 XChangeProperty (dpy, parent,
825 prop, XA_STRING, 8, PropModeReplace, 875 prop, XA_STRING, 8, PropModeReplace,
826 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 876 (const unsigned char *)str, len >= 0 ? len : strlen (str));
827} 877}
828 878
829void 879void
… …
831{ 881{
832 XTextProperty ct; 882 XTextProperty ct;
833 883
834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 884 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
835 { 885 {
836 XSetTextProperty (dpy, parent[0], &ct, prop); 886 XSetTextProperty (dpy, parent, &ct, prop);
837 XFree (ct.value); 887 XFree (ct.value);
838 } 888 }
839} 889}
840 890
841void 891void
842rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 892rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
843{ 893{
844 wchar_t *ws = rxvt_mbstowcs (str, len); 894 wchar_t *ws = rxvt_mbstowcs (str, len);
845 char *s = rxvt_wcstoutf8 (ws); 895 char *s = rxvt_wcstoutf8 (ws);
846 896
847 XChangeProperty (dpy, parent[0], 897 XChangeProperty (dpy, parent,
848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 898 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
849 (const unsigned char *)s, strlen (s)); 899 (const unsigned char *)s, strlen (s));
850 900
851 free (s); 901 free (s);
852 free (ws); 902 free (ws);
… …
942 992
943/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
944/* 994/*
945 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
946 */ 996 */
947void 997char *
948rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
949{ 999{
950 unsigned int i; 1000 unsigned int i;
951 const char *xpmb = ""; 1001 const char *xpmb = "";
952 char fstr[] = "default"; 1002 char fstr[] = "default";
953 char bstr[] = "default"; 1003 char bstr[] = "default";
1004 char *env_colorfgbg;
954 1005
955 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
956 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
957 { 1008 {
958 sprintf (fstr, "%d", i - Color_Black); 1009 sprintf (fstr, "%d", i - Color_Black);
… …
961 1012
962 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
964 { 1015 {
965 sprintf (bstr, "%d", i - Color_Black); 1016 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 1018 xpmb = "default;";
968#endif 1019#endif
969 break; 1020 break;
970 } 1021 }
971 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
972 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1025 return env_colorfgbg;
973} 1026}
974 1027
975/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
976 1029
977bool 1030bool
… …
1006 1059
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1060 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint) 1061 if (set_hint)
1009 { 1062 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc); 1063 szHint.flags &= ~(PBaseSize | PResizeInc);
1011 XSetWMNormalHints (dpy, parent[0], &szHint); 1064 XSetWMNormalHints (dpy, parent, &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc; 1065 szHint.flags |= PBaseSize | PResizeInc;
1013 } 1066 }
1014 1067
1015 if (!ignoreparent) 1068 if (!ignoreparent)
1016 { 1069 {
… …
1022 int x, y, x1, y1; 1075 int x, y, x1, y1;
1023 int dx, dy; 1076 int dx, dy;
1024 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1025 Window unused_cr; 1078 Window unused_cr;
1026 1079
1027 XTranslateCoordinates (dpy, parent[0], display->root, 1080 XTranslateCoordinates (dpy, parent, display->root,
1028 0, 0, &x, &y, &unused_cr); 1081 0, 0, &x, &y, &unused_cr);
1029 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1082 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1030 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1031 /* 1084 /*
1032 * if display->root isn't the parent window, a WM will probably have offset 1085 * if display->root isn't the parent window, a WM will probably have offset
1033 * our position for handles and decorations. Counter it 1086 * our position for handles and decorations. Counter it
1034 */ 1087 */
… …
1051 if (y < y1) /* top half */ 1104 if (y < y1) /* top half */
1052 dy = 0; 1105 dy = 0;
1053 else if (y == y1) /* exact center */ 1106 else if (y == y1) /* exact center */
1054 dy /= 2; 1107 dy /= 2;
1055 1108
1056 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1109 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1057 szHint.width, szHint.height); 1110 szHint.width, szHint.height);
1058#else 1111#else
1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1112 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1060#endif 1113#endif
1061 } 1114 }
1062 1115
1063 if (set_hint) 1116 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint); 1117 XSetWMNormalHints (dpy, parent, &szHint);
1065 1118
1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1067 1120
1068 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1069 { 1122 {
1070 if (scrollBar.state) 1123 if (scrollBar.state)
1071 scrollBar.resize (); 1124 scrollBar.resize ();
1072 1125
1073 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1074 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1075 width, height); 1128 vt_width, vt_height);
1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1076 1131
1077#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
1078 if (bg_window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
1079 update_background (); 1134 update_background ();
1080#endif 1135#endif
1081 } 1136 }
1082 1137
1083 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1084 scr_reset (); 1139 scr_reset ();
1085 1140
1086#ifdef USE_XIM 1141#if USE_XIM
1087 IMSetPosition (); 1142 im_set_position ();
1088#endif 1143#endif
1089} 1144}
1090 1145
1091/* 1146/*
1092 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1105 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1106 if (newheight == 0) 1161 if (newheight == 0)
1107 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1108 } 1163 }
1109 1164
1110 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1111 { 1166 {
1112 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1113 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1114 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1115 } 1170 }
1116} 1171}
1117 1172
1118/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1119 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1120 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1121#ifdef USE_XIM 1176#if USE_XIM
1122 1177
1123void 1178void
1124rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1125{ 1180{
1126 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1153 status_rect.height = fheight; 1208 status_rect.height = fheight;
1154} 1209}
1155 1210
1156/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1157bool 1212bool
1158rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1159{ 1214{
1160 Atom atom; 1215 Atom atom;
1161 Window win; 1216 Window win;
1162 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1163 1218
… …
1179 1234
1180 return false; 1235 return false;
1181} 1236}
1182 1237
1183void 1238void
1184rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1185{ 1240{
1186 XPoint nspot; 1241 XPoint nspot;
1187 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1188 1243
1189 if (!Input_Context 1244 if (!Input_Context
… …
1295/* 1350/*
1296 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1297 * open a suitable preedit type 1352 * open a suitable preedit type
1298 */ 1353 */
1299bool 1354bool
1300rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1301{ 1356{
1302 int i, j, found; 1357 int i, j, found;
1303 XIM xim; 1358 XIM xim;
1304 XPoint spot; 1359 XPoint spot;
1305 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1306 unsigned long fg, bg; 1361 unsigned long fg, bg;
1307 const char *p; 1362 const char *p;
1308 char **s; 1363 char **s;
1309 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1310#ifdef ENABLE_XIM_ONTHESPOT
1311 XIMCallback xcb[4];
1312#endif
1313 1365
1314 set_environ (envv); 1366 set_environ (envv);
1315 1367
1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1317 return false; 1369 return false;
… …
1457 NULL); 1509 NULL);
1458 } 1510 }
1459#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1460 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1461 { 1513 {
1514 XIMCallback xcb[4];
1515
1462 im_set_position (spot); 1516 im_set_position (spot);
1463 1517
1464 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1518 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1465 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1519 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1466 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1520 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1481#endif 1535#endif
1482 1536
1483 Input_Context = XCreateIC (xim, 1537 Input_Context = XCreateIC (xim,
1484 XNInputStyle, input_style, 1538 XNInputStyle, input_style,
1485 XNClientWindow, vt, 1539 XNClientWindow, vt,
1486 XNFocusWindow, parent[0], 1540 XNFocusWindow, parent,
1487 preedit_attr ? XNPreeditAttributes : NULL, 1541 preedit_attr ? XNPreeditAttributes : NULL,
1488 preedit_attr, 1542 preedit_attr,
1489 status_attr ? XNStatusAttributes : NULL, 1543 status_attr ? XNStatusAttributes : NULL,
1490 status_attr, NULL); 1544 status_attr, NULL);
1491 1545
… …
1504 // unfortunately, only the focus window is used by XIM, hard to fix 1558 // unfortunately, only the focus window is used by XIM, hard to fix
1505 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1506 vt_select_input (); 1560 vt_select_input ();
1507#endif 1561#endif
1508 1562
1509 IMSetPosition (); 1563 im_set_position ();
1510 1564
1511 return true; 1565 return true;
1512} 1566}
1513 1567
1514void 1568void
… …
1524 im_destroy (); 1578 im_destroy ();
1525 1579
1526 if (Input_Context) 1580 if (Input_Context)
1527 return; 1581 return;
1528 1582
1529#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1530 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1531 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1532#endif
1533 1585
1534 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1535 if (p && *p) 1587 if (p && *p)
1536 { 1588 {
1537 bool found = false; 1589 bool found = false;
… …
1542 { 1594 {
1543 if (*s[i]) 1595 if (*s[i])
1544 { 1596 {
1545 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1546 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1547 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1548 { 1600 {
1549 found = true; 1601 found = true;
1550 break; 1602 break;
1551 } 1603 }
1552 } 1604 }
… …
1557 if (found) 1609 if (found)
1558 goto done; 1610 goto done;
1559 } 1611 }
1560 1612
1561 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1562 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1563 goto done; 1615 goto done;
1564 1616
1565 /* try with no modifiers base IF the user didn't specify an IM */ 1617 /* try with no modifiers base IF the user didn't specify an IM */
1566 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1567 goto done; 1619 goto done;
1568 1620
1569done: 1621done:
1570#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1571 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1572 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1573#endif
1574} 1624}
1575 1625
1576void 1626void
1577rxvt_term::IMSetPosition () 1627rxvt_term::im_set_position ()
1578{ 1628{
1579 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1580 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1581 1631
1582 if (!Input_Context 1632 if (!Input_Context
1583 || !focus 1633 || !focus
1584 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1585 || !IMisRunning ()) 1635 || !im_is_running ())
1586 return; 1636 return;
1587 1637
1588 if (input_style & XIMPreeditPosition) 1638 if (input_style & XIMPreeditPosition)
1589 { 1639 {
1590 im_set_size (preedit_rect); 1640 im_set_size (preedit_rect);
… …
1620 1670
1621void 1671void
1622rxvt_term::get_window_origin (int &x, int &y) 1672rxvt_term::get_window_origin (int &x, int &y)
1623{ 1673{
1624 Window cr; 1674 Window cr;
1625 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1626}
1627
1628Pixmap
1629rxvt_term::get_pixmap_property (Atom property)
1630{
1631 Pixmap pixmap = None;
1632
1633 int aformat;
1634 unsigned long nitems, bytes_after;
1635 Atom atype;
1636 unsigned char *prop;
1637 int result = XGetWindowProperty (dpy, display->root, property,
1638 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1639 &nitems, &bytes_after, &prop);
1640 if (result == Success)
1641 {
1642 if (atype == XA_PIXMAP)
1643 pixmap = *(Pixmap *)prop;
1644 XFree (prop);
1645 }
1646
1647 return pixmap;
1648} 1676}
1649 1677
1650#ifdef HAVE_BG_PIXMAP 1678#ifdef HAVE_BG_PIXMAP
1651 1679
1652void 1680void
… …
1654{ 1682{
1655 if (update_background_ev.is_active ()) 1683 if (update_background_ev.is_active ())
1656 return; 1684 return;
1657 1685
1658 bg_invalidate (); 1686 bg_invalidate ();
1687
1688 if (!mapped)
1689 return;
1659 1690
1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1661 1692
1662 if (to_wait <= 0.) 1693 if (to_wait <= 0.)
1663 bg_render (); 1694 bg_render ();

Diff Legend

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