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.348 by sf-exg, Thu Jan 20 16:41:23 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
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 229#endif
239 230
240 if (display) 231 if (display)
241 { 232 {
242 selection_clear (); 233 selection_clear ();
243 selection_clear (true); 234 selection_clear (true);
244 235
245#ifdef USE_XIM 236#if USE_XIM
246 im_destroy (); 237 im_destroy ();
247#endif 238#endif
248 scrollBar.destroy (); 239 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
250 241
251 delete drawable; 242 delete drawable;
252 // destroy all windows 243 // destroy all windows
253 if (parent[0]) 244 if (parent)
254 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
255 246
256 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
258 { 249 {
259 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 266 free (allocated [i]);
276 267
277 free (selection.text); 268 free (selection.text);
278 free (selection.clip_text); 269 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 270 free (locale);
283 free (v_buffer); 271 free (v_buffer);
284 free (incr_buf); 272
273 delete selection_req;
285 274
286 delete envv; 275 delete envv;
287 delete argv; 276 delete argv;
288 277
289#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
325#endif 314#endif
326 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
329#endif 318#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 319 termwin_ev.stop (display);
332 vt_ev.stop (display); 320 vt_ev.stop (display);
333 } 321 }
334 322
335 flush_ev.stop (); 323 flush_ev.stop ();
… …
360 348
361 delete this; 349 delete this;
362} 350}
363 351
364void 352void
365rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 354{
367 if (!opt) 355 if (!opt)
368 return; 356 return;
369 357
370 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
374} 362}
375 363
376/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
377/* 365/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 367 */
381static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
382 369
383static void 370static void
384rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
386 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++)
387 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
388} 375}
389 376
390#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
391static void 378static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
393{ 380{
394 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
396 char number[32]; 383 char number[32];
397 const char mtype[] = "XlibMessage"; 384
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 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);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
404 sprintf(number, "%d", event->request_code); 396
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer);
407 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
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
409 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
410 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);
411 } 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
412 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 454 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 456 || event->error_code == BadColor
418 (event->error_code == BadGC) || 457 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 459 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
422 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 else 466 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 468
439int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 476{
442 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
444 else 479 else
… …
453 } 488 }
454 489
455 return 0; 490 return 0;
456} 491}
457 492
458int 493int ecb_cold
459rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
460{ 495{
461 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",
462 DisplayString (display)); 497 DisplayString (display));
463 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
… …
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
586 621
587 XrmInitialize (); 622 XrmInitialize ();
623
624#if HAVE_PIXBUF
625 g_type_init ();
626#endif
588} 627}
589 628
590/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
591/* 630/*
592 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
713 if (recalc_y) 752 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 754
716 ncol = width / fwidth; 755 ncol = width / fwidth;
717 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;
718} 766}
719 767
720/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
721/* 769/*
722 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
730 778
731 struct winsize ws; 779 struct winsize ws;
732 780
733 ws.ws_col = ncol; 781 ws.ws_col = ncol;
734 ws.ws_row = nrow; 782 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 786
739#if 0 787#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
743#endif 791#endif
744} 792}
745 793
746/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 795/* load and set the various fonts */
748 *
749 * init = 1 - initialize
750 *
751 * fontname == FONT_UP - switch to bigger font
752 * fontname == FONT_DN - switch to smaller font
753 */
754bool 796bool
755rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
756{ 798{
757 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 800 rxvt_fontprop prop;
… …
773 815
774 delete fontset[0]; 816 delete fontset[0];
775 fontset[0] = fs; 817 fontset[0] = fs;
776 818
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace;
779 prop.width += letterSpace; 820 prop.width += letterSpace;
780 821
781 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
782 823
783 fwidth = prop.width; 824 fwidth = prop.width;
784 fheight = prop.height; 825 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 826 fbase = prop.ascent;
786 827
787 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
788 { 829 {
789#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
815#else 856#else
816 fontset[style] = fontset[0]; 857 fontset[style] = fontset[0];
817#endif 858#endif
818 } 859 }
819 860
820 if (parent[0]) 861 if (parent)
821 { 862 {
822 resize_all_windows (0, 0, 0); 863 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 864 scr_remap_chars ();
824 scr_touch (true); 865 scr_touch (true);
825 } 866 }
… …
828} 869}
829 870
830void 871void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 872rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 873{
833 XChangeProperty (dpy, parent[0], 874 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 875 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 876 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 877}
837 878
838void 879void
… …
840{ 881{
841 XTextProperty ct; 882 XTextProperty ct;
842 883
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 884 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 885 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 886 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 887 XFree (ct.value);
847 } 888 }
848} 889}
849 890
850void 891void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 892rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 893{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 894 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 895 char *s = rxvt_wcstoutf8 (ws);
855 896
856 XChangeProperty (dpy, parent[0], 897 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 898 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 899 (const unsigned char *)s, strlen (s));
859 900
860 free (s); 901 free (s);
861 free (ws); 902 free (ws);
… …
951 992
952/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
953/* 994/*
954 * 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
955 */ 996 */
956void 997char *
957rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
958{ 999{
959 unsigned int i; 1000 unsigned int i;
960 const char *xpmb = ""; 1001 const char *xpmb = "";
961 char fstr[] = "default"; 1002 char fstr[] = "default";
962 char bstr[] = "default"; 1003 char bstr[] = "default";
1004 char *env_colorfgbg;
963 1005
964 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
966 { 1008 {
967 sprintf (fstr, "%d", i - Color_Black); 1009 sprintf (fstr, "%d", i - Color_Black);
… …
970 1012
971 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
972 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
973 { 1015 {
974 sprintf (bstr, "%d", i - Color_Black); 1016 sprintf (bstr, "%d", i - Color_Black);
975#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
976 xpmb = "default;"; 1018 xpmb = "default;";
977#endif 1019#endif
978 break; 1020 break;
979 } 1021 }
980 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
981 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;
982} 1026}
983 1027
984/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
985 1029
986bool 1030bool
… …
1015 1059
1016 // 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
1017 if (set_hint) 1061 if (set_hint)
1018 { 1062 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1063 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1064 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1065 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1066 }
1023 1067
1024 if (!ignoreparent) 1068 if (!ignoreparent)
1025 { 1069 {
… …
1031 int x, y, x1, y1; 1075 int x, y, x1, y1;
1032 int dx, dy; 1076 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1078 Window unused_cr;
1035 1079
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1080 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1081 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1082 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1084 /*
1041 * 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
1042 * our position for handles and decorations. Counter it 1086 * our position for handles and decorations. Counter it
1043 */ 1087 */
… …
1060 if (y < y1) /* top half */ 1104 if (y < y1) /* top half */
1061 dy = 0; 1105 dy = 0;
1062 else if (y == y1) /* exact center */ 1106 else if (y == y1) /* exact center */
1063 dy /= 2; 1107 dy /= 2;
1064 1108
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1109 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1110 szHint.width, szHint.height);
1067#else 1111#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1112 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1113#endif
1070 } 1114 }
1071 1115
1072 if (set_hint) 1116 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1117 XSetWMNormalHints (dpy, parent, &szHint);
1074 1118
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1120
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1122 {
1079 if (scrollBar.state) 1123 if (scrollBar.state)
1080 scrollBar.resize (); 1124 scrollBar.resize ();
1081 1125
1082 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1084 width, height); 1128 vt_width, vt_height);
1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085 1131
1086#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
1088 update_background (); 1134 update_background ();
1089#endif 1135#endif
1090 } 1136 }
1091 1137
1092 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1093 scr_reset (); 1139 scr_reset ();
1094 1140
1095#ifdef USE_XIM 1141#if USE_XIM
1096 IMSetPosition (); 1142 im_set_position ();
1097#endif 1143#endif
1098} 1144}
1099 1145
1100/* 1146/*
1101 * 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.
… …
1114 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1115 if (newheight == 0) 1161 if (newheight == 0)
1116 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1117 } 1163 }
1118 1164
1119 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1120 { 1166 {
1121 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1122 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1123 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1124 } 1170 }
1125} 1171}
1126 1172
1127/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1128 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1129 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1130#ifdef USE_XIM 1176#if USE_XIM
1131 1177
1132void 1178void
1133rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1134{ 1180{
1135 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1162 status_rect.height = fheight; 1208 status_rect.height = fheight;
1163} 1209}
1164 1210
1165/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1166bool 1212bool
1167rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1168{ 1214{
1169 Atom atom; 1215 Atom atom;
1170 Window win; 1216 Window win;
1171 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1172 1218
… …
1181 1227
1182 atom = XInternAtom (dpy, server, False); 1228 atom = XInternAtom (dpy, server, False);
1183 win = XGetSelectionOwner (dpy, atom); 1229 win = XGetSelectionOwner (dpy, atom);
1184 1230
1185 if (win != None) 1231 if (win != None)
1186 return True; 1232 return true;
1187 } 1233 }
1188 1234
1189 return False; 1235 return false;
1190} 1236}
1191 1237
1192void 1238void
1193rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1194{ 1240{
1195 XPoint nspot; 1241 XPoint nspot;
1196 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1197 1243
1198 if (!Input_Context 1244 if (!Input_Context
… …
1304/* 1350/*
1305 * 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
1306 * open a suitable preedit type 1352 * open a suitable preedit type
1307 */ 1353 */
1308bool 1354bool
1309rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1310{ 1356{
1311 int i, j, found; 1357 int i, j, found;
1312 XIM xim; 1358 XIM xim;
1313 XPoint spot; 1359 XPoint spot;
1314 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1315 unsigned long fg, bg; 1361 unsigned long fg, bg;
1316 const char *p; 1362 const char *p;
1317 char **s; 1363 char **s;
1318 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1319#ifdef ENABLE_XIM_ONTHESPOT
1320 XIMCallback xcb[4];
1321#endif
1322 1365
1323 set_environ (envv); 1366 set_environ (envv);
1324 1367
1325 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1326 return false; 1369 return false;
… …
1466 NULL); 1509 NULL);
1467 } 1510 }
1468#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1469 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1470 { 1513 {
1514 XIMCallback xcb[4];
1515
1471 im_set_position (spot); 1516 im_set_position (spot);
1472 1517
1473 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;
1474 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;
1475 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;
… …
1490#endif 1535#endif
1491 1536
1492 Input_Context = XCreateIC (xim, 1537 Input_Context = XCreateIC (xim,
1493 XNInputStyle, input_style, 1538 XNInputStyle, input_style,
1494 XNClientWindow, vt, 1539 XNClientWindow, vt,
1495 XNFocusWindow, parent[0], 1540 XNFocusWindow, parent,
1496 preedit_attr ? XNPreeditAttributes : NULL, 1541 preedit_attr ? XNPreeditAttributes : NULL,
1497 preedit_attr, 1542 preedit_attr,
1498 status_attr ? XNStatusAttributes : NULL, 1543 status_attr ? XNStatusAttributes : NULL,
1499 status_attr, NULL); 1544 status_attr, NULL);
1500 1545
… …
1513 // 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
1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1515 vt_select_input (); 1560 vt_select_input ();
1516#endif 1561#endif
1517 1562
1518 IMSetPosition (); 1563 im_set_position ();
1519 1564
1520 return true; 1565 return true;
1521} 1566}
1522 1567
1523void 1568void
… …
1533 im_destroy (); 1578 im_destroy ();
1534 1579
1535 if (Input_Context) 1580 if (Input_Context)
1536 return; 1581 return;
1537 1582
1538#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1539 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1540 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1541#endif
1542 1585
1543 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1544 if (p && *p) 1587 if (p && *p)
1545 { 1588 {
1546 bool found = false; 1589 bool found = false;
… …
1551 { 1594 {
1552 if (*s[i]) 1595 if (*s[i])
1553 { 1596 {
1554 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1555 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1556 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1557 { 1600 {
1558 found = true; 1601 found = true;
1559 break; 1602 break;
1560 } 1603 }
1561 } 1604 }
… …
1566 if (found) 1609 if (found)
1567 goto done; 1610 goto done;
1568 } 1611 }
1569 1612
1570 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1571 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1572 goto done; 1615 goto done;
1573 1616
1574 /* 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 */
1575 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1576 goto done; 1619 goto done;
1577 1620
1578done: 1621done:
1579#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1580 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1581 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1582#endif
1583} 1624}
1584 1625
1585void 1626void
1586rxvt_term::IMSetPosition () 1627rxvt_term::im_set_position ()
1587{ 1628{
1588 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1589 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1590 1631
1591 if (!Input_Context 1632 if (!Input_Context
1592 || !focus 1633 || !focus
1593 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1594 || !IMisRunning ()) 1635 || !im_is_running ())
1595 return; 1636 return;
1596 1637
1597 if (input_style & XIMPreeditPosition) 1638 if (input_style & XIMPreeditPosition)
1598 { 1639 {
1599 im_set_size (preedit_rect); 1640 im_set_size (preedit_rect);
… …
1629 1670
1630void 1671void
1631rxvt_term::get_window_origin (int &x, int &y) 1672rxvt_term::get_window_origin (int &x, int &y)
1632{ 1673{
1633 Window cr; 1674 Window cr;
1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1635}
1636
1637Pixmap
1638rxvt_term::get_pixmap_property (Atom property)
1639{
1640 Pixmap pixmap = None;
1641
1642 int aformat;
1643 unsigned long nitems, bytes_after;
1644 Atom atype;
1645 unsigned char *prop;
1646 int result = XGetWindowProperty (dpy, display->root, property,
1647 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1648 &nitems, &bytes_after, &prop);
1649 if (result == Success)
1650 {
1651 if (atype == XA_PIXMAP)
1652 pixmap = *(Pixmap *)prop;
1653 XFree (prop);
1654 }
1655
1656 return pixmap;
1657} 1676}
1658 1677
1659#ifdef HAVE_BG_PIXMAP 1678#ifdef HAVE_BG_PIXMAP
1660 1679
1661void 1680void
1662rxvt_term::update_background () 1681rxvt_term::update_background ()
1663{ 1682{
1664 if (update_background_ev.is_active ()) 1683 if (update_background_ev.is_active ())
1665 return; 1684 return;
1666 1685
1667 bgPixmap.invalidate (); 1686 bg_invalidate ();
1668 1687
1688 if (!mapped)
1689 return;
1690
1669 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1670 1692
1671 if (to_wait <= 0.) 1693 if (to_wait <= 0.)
1672 bgPixmap.render (); 1694 bg_render ();
1673 else 1695 else
1674 update_background_ev.start (to_wait); 1696 update_background_ev.start (to_wait);
1675} 1697}
1676 1698
1677void 1699void
1678rxvt_term::update_background_cb (ev::timer &w, int revents) 1700rxvt_term::update_background_cb (ev::timer &w, int revents)
1679{ 1701{
1680 make_current (); 1702 make_current ();
1681 1703
1682 update_background_ev.stop (); 1704 update_background_ev.stop ();
1683 bgPixmap.render (); 1705 bg_render ();
1684 refresh_check (); 1706 refresh_check ();
1685} 1707}
1686 1708
1687#endif /* HAVE_BG_PIXMAP */ 1709#endif /* HAVE_BG_PIXMAP */
1688 1710

Diff Legend

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