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.320 by sf-exg, Sat Jan 30 20:43:56 2010 UTC vs.
Revision 1.374 by root, Sun Jun 3 10:42:34 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-2008 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 229#endif
238 230
239 if (display) 231 if (display)
240 { 232 {
241 selection_clear (); 233 selection_clear ();
… …
247 scrollBar.destroy (); 239 scrollBar.destroy ();
248 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
249 241
250 delete drawable; 242 delete drawable;
251 // destroy all windows 243 // destroy all windows
252 if (parent[0]) 244 if (parent)
253 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
254 246
255 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
256 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
257 { 249 {
258 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
273 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
274 free (allocated [i]); 266 free (allocated [i]);
275 267
276 free (selection.text); 268 free (selection.text);
277 free (selection.clip_text); 269 free (selection.clip_text);
278 // TODO: manage env vars in child only(!)
279 free (env_display);
280 free (env_term);
281 free (locale); 270 free (locale);
282 free (v_buffer); 271 free (v_buffer);
283 free (incr_buf); 272
273 delete selection_req;
284 274
285 delete envv; 275 delete envv;
286 delete argv; 276 delete argv;
287 277
288#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
324#endif 314#endif
325 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
326#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
327 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
328#endif 318#endif
329 incr_ev.stop ();
330 termwin_ev.stop (display); 319 termwin_ev.stop (display);
331 vt_ev.stop (display); 320 vt_ev.stop (display);
332 } 321 }
333 322
334 flush_ev.stop (); 323 flush_ev.stop ();
… …
356rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
357{ 346{
358 make_current (); 347 make_current ();
359 348
360 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
361} 362}
362 363
363/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
364/* 365/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
374 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
375} 376}
376 377
377#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
378static void 379static void ecb_cold
379print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
380{ 381{
381 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
383 char number[32]; 384 char number[32];
384 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
385 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
389 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
394 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
396 mesg, BUFSIZ); 397 mesg, BUFSIZ);
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398 } 399 }
399 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
400 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
401 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
402 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
403 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
404 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
405 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
406 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
407 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
408 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
409 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
411 mesg, BUFSIZ); 412 mesg, BUFSIZ);
412 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
414 mesg, BUFSIZ); 415 mesg, BUFSIZ);
415 else 416 else
416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
417 mesg, BUFSIZ); 418 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419 } 420 }
420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421 mesg, BUFSIZ); 422 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423} 424}
424#endif 425#endif
425 426
426int 427int ecb_cold
427rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
428{ 429{
429 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
430 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
431 else 432 else
… …
440 } 441 }
441 442
442 return 0; 443 return 0;
443} 444}
444 445
445int 446int ecb_cold
446rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
447{ 448{
448 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
449 DisplayString (display)); 450 DisplayString (display));
450 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
473 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
474 w.stop (); 475 w.stop ();
475 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
476} 477}
477 478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
478char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
479 547
480void 548void
481rxvt_init () 549rxvt_init ()
482{ 550{
483 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
484 553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
485 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487 562
488 rxvt_environ = environ; 563 rxvt_environ = environ;
489 564
490 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
491 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
492 567
493 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
497 /* signal (SIGURG, SIG_DFL); */
498 570
499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
501 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
502 574
503 XrmInitialize (); 575 XrmInitialize ();
576
577#ifdef HAVE_PIXBUF
578 g_type_init ();
579#endif
504} 580}
505 581
506/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
507/* 583/*
508 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
629 if (recalc_y) 705 if (recalc_y)
630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
631 707
632 ncol = width / fwidth; 708 ncol = width / fwidth;
633 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
634} 719}
635 720
636/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
637/* 722/*
638 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
646 731
647 struct winsize ws; 732 struct winsize ws;
648 733
649 ws.ws_col = ncol; 734 ws.ws_col = ncol;
650 ws.ws_row = nrow; 735 ws.ws_row = nrow;
651 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
652 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
653 ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
654 739
655#if 0 740#if 0
656 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
657 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
658 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
659#endif 744#endif
660} 745}
661 746
662/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
663/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
664 *
665 * init = 1 - initialize
666 *
667 * fontname == FONT_UP - switch to bigger font
668 * fontname == FONT_DN - switch to smaller font
669 */
670bool 749bool
671rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
672{ 751{
673 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
674 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
688#endif 767#endif
689 768
690 delete fontset[0]; 769 delete fontset[0];
691 fontset[0] = fs; 770 fontset[0] = fs;
692 771
693 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694 prop.height += lineSpace;
695 prop.width += letterSpace; 773 prop.width += letterSpace;
696 774
697 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
698 776
699 fwidth = prop.width; 777 fwidth = prop.width;
700 fheight = prop.height; 778 fheight = prop.height + lineSpace;
701 fbase = prop.ascent; 779 fbase = prop.ascent;
702 780
703 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
704 { 782 {
705#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
731#else 809#else
732 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
733#endif 811#endif
734 } 812 }
735 813
736 if (parent[0]) 814 if (parent)
737 { 815 {
738 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
739 scr_remap_chars (); 817 scr_remap_chars ();
740 scr_touch (true); 818 scr_touch (true);
741 } 819 }
… …
744} 822}
745 823
746void 824void
747rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
748{ 826{
749 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
750 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
751 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
752} 830}
753 831
754void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
755rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756{ 846{
757 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
758 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
759 849
760 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
762 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
763 853
764 free (s); 854 free (s);
765 free (ws); 855 free (ws);
… …
769/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
770/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
771void 861void
772rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
773{ 863{
774 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
775#if ENABLE_EWMH 865#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
777#endif 867#endif
778} 868}
779 869
780void 870void
781rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
782{ 872{
783 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
784#if ENABLE_EWMH 874#if ENABLE_EWMH
785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786#endif 876#endif
787} 877}
788 878
… …
855 945
856/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
857/* 947/*
858 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
859 */ 949 */
860void 950char *
861rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
862{ 952{
863 unsigned int i; 953 unsigned int i;
864 const char *xpmb = ""; 954 const char *xpmb = "";
865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
866 958
867 strcpy (fstr, "default");
868 strcpy (bstr, "default");
869 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
870 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
871 { 961 {
872 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
873 break; 963 break;
874 } 964 }
875 965
876 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
877 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
878 { 968 {
879 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
880#ifdef BG_IMAGE_FROM_FILE 970#ifdef BG_IMAGE_FROM_FILE
881 xpmb = "default;"; 971 xpmb = "default;";
882#endif 972#endif
883 break; 973 break;
884 } 974 }
885 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
886 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
887} 979}
888 980
889/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
890 982
891bool 983bool
… …
920 1012
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint) 1014 if (set_hint)
923 { 1015 {
924 szHint.flags &= ~(PBaseSize | PResizeInc); 1016 szHint.flags &= ~(PBaseSize | PResizeInc);
925 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
926 szHint.flags |= PBaseSize | PResizeInc; 1018 szHint.flags |= PBaseSize | PResizeInc;
927 } 1019 }
928 1020
929 if (!ignoreparent) 1021 if (!ignoreparent)
930 { 1022 {
… …
936 int x, y, x1, y1; 1028 int x, y, x1, y1;
937 int dx, dy; 1029 int dx, dy;
938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
939 Window unused_cr; 1031 Window unused_cr;
940 1032
941 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
942 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
944 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
945 /* 1037 /*
946 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
947 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
948 */ 1040 */
… …
965 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
966 dy = 0; 1058 dy = 0;
967 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
968 dy /= 2; 1060 dy /= 2;
969 1061
970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
971 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
972#else 1064#else
973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
974#endif 1066#endif
975 } 1067 }
976 1068
977 if (set_hint) 1069 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
979 1071
980 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
981 1073
982 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
983 { 1075 {
984 if (scrollBar.state) 1076 if (scrollBar.state)
985 scrollBar.resize (); 1077 scrollBar.resize ();
986 1078
987 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
988 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
989 width, height); 1081 vt_width, vt_height);
990 1082
991#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
992 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
993 update_background (); 1085 update_background ();
994#endif 1086#endif
995 } 1087 }
996 1088
997 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
998 scr_reset (); 1090 scr_reset ();
999 1091
1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1006// scr_touch (false);
1007#endif
1008
1009#ifdef USE_XIM 1092#ifdef USE_XIM
1010 IMSetPosition (); 1093 im_set_position ();
1011#endif 1094#endif
1012} 1095}
1013 1096
1014/* 1097/*
1015 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1028 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1029 if (newheight == 0) 1112 if (newheight == 0)
1030 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1031 } 1114 }
1032 1115
1033 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1034 { 1117 {
1035 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1036 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1037 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1038 } 1121 }
… …
1076 status_rect.height = fheight; 1159 status_rect.height = fheight;
1077} 1160}
1078 1161
1079/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1080bool 1163bool
1081rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1082{ 1165{
1083 Atom atom; 1166 Atom atom;
1084 Window win; 1167 Window win;
1085 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1086 1169
… …
1095 1178
1096 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1097 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1098 1181
1099 if (win != None) 1182 if (win != None)
1100 return True; 1183 return true;
1101 } 1184 }
1102 1185
1103 return False; 1186 return false;
1104} 1187}
1105 1188
1106void 1189void
1107rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1108{ 1191{
1109 XPoint nspot; 1192 XPoint nspot;
1110 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1111 1194
1112 if (!Input_Context 1195 if (!Input_Context
… …
1218/* 1301/*
1219 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1220 * open a suitable preedit type 1303 * open a suitable preedit type
1221 */ 1304 */
1222bool 1305bool
1223rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1224{ 1307{
1225 int i, j, found; 1308 int i, j, found;
1226 XIM xim; 1309 XIM xim;
1227 XPoint spot; 1310 XPoint spot;
1228 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1229 unsigned long fg, bg; 1312 unsigned long fg, bg;
1230 const char *p; 1313 const char *p;
1231 char **s; 1314 char **s;
1232 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1233#ifdef ENABLE_XIM_ONTHESPOT
1234 XIMCallback xcb[4];
1235#endif
1236 1316
1237 set_environ (envv); 1317 set_environ (envv);
1238 1318
1239 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1240 return false; 1320 return false;
… …
1261 p = pet[pi]; 1341 p = pet[pi];
1262 1342
1263 if (!p) 1343 if (!p)
1264 continue; 1344 continue;
1265 1345
1266 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1267 1347
1268 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1269 { 1349 {
1270 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1271 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1283 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1284 1364
1285 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1286 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1287 { 1367 {
1288 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1289 1369
1290 found = 1; 1370 found = 1;
1291 goto foundpet; 1371 goto foundpet;
1292 } 1372 }
1293 1373
1294 } 1374 }
1295 1375
1296 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1297 } 1377 }
1298 1378
1299foundpet: 1379foundpet:
1300 1380
1301 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1380 NULL); 1460 NULL);
1381 } 1461 }
1382#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1383 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1384 { 1464 {
1465 XIMCallback xcb[4];
1466
1385 im_set_position (spot); 1467 im_set_position (spot);
1386 1468
1387 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1388 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1389 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1404#endif 1486#endif
1405 1487
1406 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1407 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1408 XNClientWindow, vt, 1490 XNClientWindow, vt,
1409 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1410 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1411 preedit_attr, 1493 preedit_attr,
1412 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1413 status_attr, NULL); 1495 status_attr, NULL);
1414 1496
… …
1427 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1428 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1429 vt_select_input (); 1511 vt_select_input ();
1430#endif 1512#endif
1431 1513
1432 IMSetPosition (); 1514 im_set_position ();
1433 1515
1434 return true; 1516 return true;
1435} 1517}
1436 1518
1437void 1519void
… …
1447 im_destroy (); 1529 im_destroy ();
1448 1530
1449 if (Input_Context) 1531 if (Input_Context)
1450 return; 1532 return;
1451 1533
1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1453 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1454 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1455#endif
1456 1536
1457 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1458 if (p && *p) 1538 if (p && *p)
1459 { 1539 {
1460 bool found = false; 1540 bool found = false;
1461 1541
1462 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1463 1543
1464 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1465 { 1545 {
1466 if (*s[i]) 1546 if (*s[i])
1467 { 1547 {
1468 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1469 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1470 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1471 { 1551 {
1472 found = true; 1552 found = true;
1473 break; 1553 break;
1474 } 1554 }
1475 } 1555 }
1476 } 1556 }
1477 1557
1478 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1479 1559
1480 if (found) 1560 if (found)
1481 goto done; 1561 goto done;
1482 } 1562 }
1483 1563
1484 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1485 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1486 goto done; 1566 goto done;
1487 1567
1488 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1489 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1490 goto done; 1570 goto done;
1491 1571
1492done: 1572done:
1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1494 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1495 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1496#endif
1497} 1575}
1498 1576
1499void 1577void
1500rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1501{ 1579{
1502 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1503 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1504 1582
1505 if (!Input_Context 1583 if (!Input_Context
1506 || !focus 1584 || !focus
1507 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1508 || !IMisRunning ()) 1586 || !im_is_running ())
1509 return; 1587 return;
1510 1588
1511 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1512 { 1590 {
1513 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1543 1621
1544void 1622void
1545rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1546{ 1624{
1547 Window cr; 1625 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550} 1627}
1551 1628
1552Pixmap 1629Pixmap
1553rxvt_term::get_pixmap_property (int prop_id) 1630rxvt_term::get_pixmap_property (Atom property)
1554{ 1631{
1555 if (prop_id > 0 && prop_id < NUM_XA) 1632 Pixmap pixmap = None;
1556 if (xa[prop_id]) 1633
1557 {
1558 int aformat; 1634 int aformat;
1559 unsigned long nitems, bytes_after; 1635 unsigned long nitems, bytes_after;
1560 Atom atype; 1636 Atom atype;
1561 unsigned char *prop = NULL; 1637 unsigned char *prop;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1638 int result = XGetWindowProperty (dpy, display->root, property,
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop); 1640 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP) 1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1566 return *(Pixmap *)prop; 1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1567 } 1646 }
1568 1647
1569 return None; 1648 return pixmap;
1570} 1649}
1571 1650
1572#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582 1652
1583void 1653void
1584rxvt_term::update_background () 1654rxvt_term::update_background ()
1585{ 1655{
1586 if (update_background_ev.is_active ()) 1656 if (update_background_ev.is_active ())
1587 return; 1657 return;
1588 1658
1589 bgPixmap.invalidate (); 1659 bg_invalidate ();
1590 1660
1661 if (!mapped)
1662 return;
1663
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1592 1665
1593 if (to_wait <= 0.) 1666 if (to_wait <= 0.)
1594 bgPixmap.render (); 1667 bg_render ();
1595 else 1668 else
1596 update_background_ev.start (to_wait); 1669 update_background_ev.start (to_wait);
1597} 1670}
1598 1671
1599void 1672void
1600rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{ 1674{
1602 make_current (); 1675 make_current ();
1603 1676
1604 update_background_ev.stop (); 1677 update_background_ev.stop ();
1605 bgPixmap.render (); 1678 bg_render ();
1606 refresh_check (); 1679 refresh_check ();
1607} 1680}
1608 1681
1609#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1610 1683

Diff Legend

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