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

Diff Legend

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