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

Diff Legend

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