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.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs.
Revision 1.395 by root, Sat Dec 13 11:58:23 2014 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-2014 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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
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 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
172 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);
173#endif 169#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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);
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 175#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 177#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 179#endif
184#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 182#endif
… …
189#endif 185#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
232#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 228 bg_destroy ();
234#endif 229#endif
235#ifdef HAVE_AFTERIMAGE 230
236 if (asv) 231#if HAVE_IMG
237 destroy_asvisual (asv, 0); 232 delete bg_img;
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 233#endif
241 234
242 if (display) 235 if (display)
243 { 236 {
244 selection_clear (); 237 selection_clear ();
245 selection_clear (true); 238 selection_clear (true);
246 239
247#ifdef USE_XIM 240#if USE_XIM
248 im_destroy (); 241 im_destroy ();
249#endif 242#endif
250 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
251 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
252 247
253 delete drawable; 248 delete drawable;
249
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent)
256 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
257 253
258 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
260 { 256 {
261 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
263 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
264#endif 261#endif
265 } 262 }
266 263
267 clear (); 264 clear ();
268 265
… …
276 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 274 free (allocated [i]);
278 275
279 free (selection.text); 276 free (selection.text);
280 free (selection.clip_text); 277 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 278 free (locale);
285 free (v_buffer); 279 free (v_buffer);
286 free (incr_buf); 280
281 delete selection_req;
282
283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
285
286 delete env;
287 287
288 delete envv; 288 delete envv;
289 delete argv; 289 delete argv;
290 290
291#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
292 delete keyboard; 292 delete keyboard;
293#endif 293#endif
294#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
296#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
297} 299}
298 300
299// child has exited, usually destroys 301// child has exited, usually destroys
300void 302void
301rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
324 { 326 {
325#if USE_XIM 327#if USE_XIM
326 im_ev.stop (display); 328 im_ev.stop (display);
327#endif 329#endif
328 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
330 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
331#endif 333#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 334 termwin_ev.stop (display);
334 vt_ev.stop (display); 335 vt_ev.stop (display);
335 } 336 }
336 337
337 flush_ev.stop (); 338 flush_ev.stop ();
… …
361 make_current (); 362 make_current ();
362 363
363 delete this; 364 delete this;
364} 365}
365 366
367void
368rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
369{
370 if (!opt)
371 return;
372
373 uint8_t mask = 1 << (opt & 7);
374 uint8_t &val = options [opt >> 3];
375
376 val = val & ~mask | (set ? mask : 0);
377}
378
366/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
367/* 380/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 382 */
371static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
372 384
373static void 385static void
374rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
378} 390}
379 391
380#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
381static void 393static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
383{ 395{
384 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
386 char number[32]; 398 char number[32];
387 char *mtype = "XlibMessage"; 399
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401
402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
404
405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 410 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
411
412 if (event->request_code >= 128)
413 {
414#if 0
415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
416 int nexts;
417 char **exts = XListExtensions (dpy, &nexts);
418
419 while (nexts)
420 {
421 char *extname = exts [nexts - 1];
422 int major, first_event, first_error;
423
424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
425 {
426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
428
429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
431 rxvt_warn ("+ (which is %s)\n", buffer);
432
433 break;
434 }
435
436 printf ("nextss %d %s\n", nexts, extname);//D
437 --nexts;
438 ++exts;
439 }
440#else
441 int nexts = 0;
442 char **exts = 0;
443#endif
444
445 if (!nexts)
446 {
447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
448
449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
450 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
451
452#if 0
453 sprintf (number, "RENDER.%d", event->minor_code);
454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
455 rxvt_warn ("+ (which is %s)\n", buffer);
456#endif
457 }
458
459 XFreeExtensionList (exts);
460 }
461 else
462 {
394 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
397 if (event->request_code >= 128) {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
399 mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 } 466 }
467
402 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 471 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 473 || event->error_code == BadColor
408 (event->error_code == BadGC) || 474 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 476 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
412 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 483 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 485
429int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 493{
432 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
434 else 496 else
435 { 497 {
436 // GET_R is most likely not the terminal which caused the error, 498 // GET_R is most likely not the terminal which caused the error,
437 // so just output the error and continue 499 // so just output the error and continue
… …
443 } 505 }
444 506
445 return 0; 507 return 0;
446} 508}
447 509
448int 510int ecb_cold
449rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
450{ 512{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 513 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 514 DisplayString (display));
453 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
576 638
577 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
578} 644}
579 645
580/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
581/* 647/*
582 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
703 if (recalc_y) 769 if (recalc_y)
704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
705 771
706 ncol = width / fwidth; 772 ncol = width / fwidth;
707 nrow = height / fheight; 773 nrow = height / fheight;
774
775 // When the size of the vt window is not a multiple of the cell
776 // size, i.e., when the wm does not honour our size hints, there are
777 // extra areas not covered by the terminal screen. Such gaps, when a
778 // bg pixmap is set, would have to be cleared manually to properly
779 // refresh the background. We take the simpler route and shrink the
780 // vt window so as to avoid creating gaps.
781 vt_width = ncol * fwidth;
782 vt_height = nrow * fheight;
708} 783}
709 784
710/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
711/* 786/*
712 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
720 795
721 struct winsize ws; 796 struct winsize ws;
722 797
723 ws.ws_col = ncol; 798 ws.ws_col = ncol;
724 ws.ws_row = nrow; 799 ws.ws_row = nrow;
725 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
726 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
727 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
728 803
729#if 0 804#if 0
730 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
731 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
732 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
733#endif 808#endif
734} 809}
735 810
736/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
737/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
738 *
739 * init = 1 - initialize
740 *
741 * fontname == FONT_UP - switch to bigger font
742 * fontname == FONT_DN - switch to smaller font
743 */
744bool 813bool
745rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
746{ 815{
747 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
748 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
763 832
764 delete fontset[0]; 833 delete fontset[0];
765 fontset[0] = fs; 834 fontset[0] = fs;
766 835
767 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
768 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
769 prop.width += letterSpace;
770 838
771 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
772 840
773 fwidth = prop.width; 841 fwidth = prop.width;
774 fheight = prop.height; 842 fheight = prop.height + lineSpace;
775 fbase = prop.ascent; 843 fbase = prop.ascent;
776 844
777 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
778 { 846 {
779#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
805#else 873#else
806 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
807#endif 875#endif
808 } 876 }
809 877
810 if (parent[0]) 878 if (parent)
811 { 879 {
812 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
813 scr_remap_chars (); 881 scr_remap_chars ();
814 scr_touch (true); 882 scr_touch (true);
815 } 883 }
… …
818} 886}
819 887
820void 888void
821rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
822{ 890{
823 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
824 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
825 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
826} 894}
827 895
828void 896void
… …
830{ 898{
831 XTextProperty ct; 899 XTextProperty ct;
832 900
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 { 902 {
835 XSetTextProperty (dpy, parent[0], &ct, prop); 903 XSetTextProperty (dpy, parent, &ct, prop);
836 XFree (ct.value); 904 XFree (ct.value);
837 } 905 }
838} 906}
839 907
840void 908void
841rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
842{ 910{
843 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
844 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
845 913
846 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
848 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
849 917
850 free (s); 918 free (s);
851 free (ws); 919 free (ws);
… …
941 1009
942/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
943/* 1011/*
944 * find if fg/bg matches any of the normal (low-intensity) colors 1012 * find if fg/bg matches any of the normal (low-intensity) colors
945 */ 1013 */
946void 1014char *
947rxvt_term::set_colorfgbg () 1015rxvt_term::get_colorfgbg ()
948{ 1016{
949 unsigned int i; 1017 unsigned int i;
950 const char *xpmb = ""; 1018 const char *xpmb = "";
951 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1019 char fstr[] = "default";
1020 char bstr[] = "default";
1021 char *env_colorfgbg;
952 1022
953 strcpy (fstr, "default");
954 strcpy (bstr, "default");
955 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
956 if (pix_colors[Color_fg] == pix_colors[i]) 1024 if (pix_colors[Color_fg] == pix_colors[i])
957 { 1025 {
958 sprintf (fstr, "%d", (i - Color_Black)); 1026 sprintf (fstr, "%d", i - Color_Black);
959 break; 1027 break;
960 } 1028 }
961 1029
962 for (i = Color_Black; i <= Color_White; i++) 1030 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 1031 if (pix_colors[Color_bg] == pix_colors[i])
964 { 1032 {
965 sprintf (bstr, "%d", (i - Color_Black)); 1033 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 1034#if BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 1035 xpmb = "default;";
968#endif 1036#endif
969 break; 1037 break;
970 } 1038 }
971 1039
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
972 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042 return env_colorfgbg;
973} 1043}
974 1044
975/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
976 1046
977bool 1047bool
… …
1006 1076
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1077 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint) 1078 if (set_hint)
1009 { 1079 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc); 1080 szHint.flags &= ~(PBaseSize | PResizeInc);
1011 XSetWMNormalHints (dpy, parent[0], &szHint); 1081 XSetWMNormalHints (dpy, parent, &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc; 1082 szHint.flags |= PBaseSize | PResizeInc;
1013 } 1083 }
1014 1084
1015 if (!ignoreparent) 1085 if (!ignoreparent)
1016 { 1086 {
… …
1022 int x, y, x1, y1; 1092 int x, y, x1, y1;
1023 int dx, dy; 1093 int dx, dy;
1024 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1025 Window unused_cr; 1095 Window unused_cr;
1026 1096
1027 XTranslateCoordinates (dpy, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent, display->root,
1028 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1029 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1030 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1031 /* 1101 /*
1032 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
1033 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1034 */ 1104 */
… …
1051 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1052 dy = 0; 1122 dy = 0;
1053 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1054 dy /= 2; 1124 dy /= 2;
1055 1125
1056 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1057 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1058#else 1128#else
1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1060#endif 1130#endif
1061 } 1131 }
1062 1132
1063 if (set_hint) 1133 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint); 1134 XSetWMNormalHints (dpy, parent, &szHint);
1065 1135
1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1136 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1067 1137
1068 if (fix_screen || newwidth != old_width || newheight != old_height) 1138 if (fix_screen || newwidth != old_width || newheight != old_height)
1069 { 1139 {
1070 if (scrollBar.state) 1140 if (scrollBar.state)
1071 scrollBar.resize (); 1141 scrollBar.resize ();
1072 1142
1073 XMoveResizeWindow (dpy, vt, 1143 XMoveResizeWindow (dpy, vt,
1074 window_vt_x, window_vt_y, 1144 window_vt_x, window_vt_y,
1075 width, height); 1145 vt_width, vt_height);
1146
1147 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1076 1148
1077#ifdef HAVE_BG_PIXMAP 1149#ifdef HAVE_BG_PIXMAP
1078 if (bgPixmap.window_size_sensitive ()) 1150 if (bg_window_size_sensitive ())
1079 update_background (); 1151 update_background ();
1080#endif 1152#endif
1081 } 1153 }
1082 1154
1083 if (fix_screen || old_height == 0) 1155 if (fix_screen || old_height == 0)
1084 scr_reset (); 1156 scr_reset ();
1085 1157
1086#ifdef HAVE_BG_PIXMAP
1087// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1088// if (bgPixmap.pixmap)
1089// scr_touch (false);
1090#endif
1091
1092#ifdef USE_XIM 1158#if USE_XIM
1093 IMSetPosition (); 1159 im_set_position ();
1094#endif 1160#endif
1095} 1161}
1096 1162
1097/* 1163/*
1098 * Set the width/height of the vt window in characters. Units are pixels. 1164 * Set the width/height of the vt window in characters. Units are pixels.
… …
1111 newwidth = wattr.width - szHint.base_width; 1177 newwidth = wattr.width - szHint.base_width;
1112 if (newheight == 0) 1178 if (newheight == 0)
1113 newheight = wattr.height - szHint.base_height; 1179 newheight = wattr.height - szHint.base_height;
1114 } 1180 }
1115 1181
1116 if (newwidth != width || newheight != height) 1182 if (newwidth != vt_width || newheight != vt_height)
1117 { 1183 {
1118 newwidth += szHint.base_width; 1184 newwidth += szHint.base_width;
1119 newheight += szHint.base_height; 1185 newheight += szHint.base_height;
1120 resize_all_windows (newwidth, newheight, 0); 1186 resize_all_windows (newwidth, newheight, 0);
1121 } 1187 }
1122} 1188}
1123 1189
1124/* -------------------------------------------------------------------- * 1190/* -------------------------------------------------------------------- *
1125 * - X INPUT METHOD ROUTINES - * 1191 * - X INPUT METHOD ROUTINES - *
1126 * -------------------------------------------------------------------- */ 1192 * -------------------------------------------------------------------- */
1127#ifdef USE_XIM 1193#if USE_XIM
1128 1194
1129void 1195void
1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1196rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1131{ 1197{
1132 fg = pix_colors [Color_fg]; 1198 fg = pix_colors [Color_fg];
… …
1159 status_rect.height = fheight; 1225 status_rect.height = fheight;
1160} 1226}
1161 1227
1162/* Checking whether input method is running. */ 1228/* Checking whether input method is running. */
1163bool 1229bool
1164rxvt_term::IMisRunning () 1230rxvt_term::im_is_running ()
1165{ 1231{
1166 Atom atom; 1232 Atom atom;
1167 Window win; 1233 Window win;
1168 char server[IMBUFSIZ]; 1234 char server[IMBUFSIZ];
1169 1235
… …
1178 1244
1179 atom = XInternAtom (dpy, server, False); 1245 atom = XInternAtom (dpy, server, False);
1180 win = XGetSelectionOwner (dpy, atom); 1246 win = XGetSelectionOwner (dpy, atom);
1181 1247
1182 if (win != None) 1248 if (win != None)
1183 return True; 1249 return true;
1184 } 1250 }
1185 1251
1186 return False; 1252 return false;
1187} 1253}
1188 1254
1189void 1255void
1190rxvt_term::IMSendSpot () 1256rxvt_term::im_send_spot ()
1191{ 1257{
1192 XPoint nspot; 1258 XPoint nspot;
1193 XVaNestedList preedit_attr; 1259 XVaNestedList preedit_attr;
1194 1260
1195 if (!Input_Context 1261 if (!Input_Context
… …
1301/* 1367/*
1302 * Try to open a XIM with the current modifiers, then see if we can 1368 * Try to open a XIM with the current modifiers, then see if we can
1303 * open a suitable preedit type 1369 * open a suitable preedit type
1304 */ 1370 */
1305bool 1371bool
1306rxvt_term::IM_get_IC (const char *modifiers) 1372rxvt_term::im_get_ic (const char *modifiers)
1307{ 1373{
1308 int i, j, found; 1374 int i, j, found;
1309 XIM xim; 1375 XIM xim;
1310 XPoint spot; 1376 XPoint spot;
1311 XRectangle rect, status_rect, needed_rect; 1377 XRectangle rect, status_rect, needed_rect;
1312 unsigned long fg, bg; 1378 unsigned long fg, bg;
1313 const char *p; 1379 const char *p;
1314 char **s; 1380 char **s;
1315 XIMStyles *xim_styles; 1381 XIMStyles *xim_styles;
1316#ifdef ENABLE_XIM_ONTHESPOT
1317 XIMCallback xcb[4];
1318#endif
1319 1382
1320 set_environ (envv); 1383 set_environ (env);
1321 1384
1322 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1385 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1323 return false; 1386 return false;
1324 1387
1325 input_method = display->get_xim (locale, modifiers); 1388 input_method = display->get_xim (locale, modifiers);
1326 if (input_method == NULL) 1389 if (input_method == NULL)
1327 return false; 1390 return false;
… …
1344 p = pet[pi]; 1407 p = pet[pi];
1345 1408
1346 if (!p) 1409 if (!p)
1347 continue; 1410 continue;
1348 1411
1349 s = rxvt_splitcommastring (p); 1412 s = rxvt_strsplit (',', p);
1350 1413
1351 for (i = found = 0; !found && s[i]; i++) 1414 for (i = found = 0; !found && s[i]; i++)
1352 { 1415 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1416 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = XIMPreeditPosition | XIMStatusNothing; 1417 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1366 input_style = XIMPreeditNothing | XIMStatusNothing; 1429 input_style = XIMPreeditNothing | XIMStatusNothing;
1367 1430
1368 for (j = 0; j < xim_styles->count_styles; j++) 1431 for (j = 0; j < xim_styles->count_styles; j++)
1369 if (input_style == xim_styles->supported_styles[j]) 1432 if (input_style == xim_styles->supported_styles[j])
1370 { 1433 {
1371 rxvt_freecommastring (s); 1434 rxvt_free_strsplit (s);
1372 1435
1373 found = 1; 1436 found = 1;
1374 goto foundpet; 1437 goto foundpet;
1375 } 1438 }
1376 1439
1377 } 1440 }
1378 1441
1379 rxvt_freecommastring (s); 1442 rxvt_free_strsplit (s);
1380 } 1443 }
1381 1444
1382foundpet: 1445foundpet:
1383 1446
1384 XFree (xim_styles); 1447 XFree (xim_styles);
… …
1463 NULL); 1526 NULL);
1464 } 1527 }
1465#if ENABLE_XIM_ONTHESPOT 1528#if ENABLE_XIM_ONTHESPOT
1466 else if (input_style & XIMPreeditCallbacks) 1529 else if (input_style & XIMPreeditCallbacks)
1467 { 1530 {
1531 XIMCallback xcb[4];
1532
1468 im_set_position (spot); 1533 im_set_position (spot);
1469 1534
1470 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1535 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1471 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1536 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1472 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1537 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1487#endif 1552#endif
1488 1553
1489 Input_Context = XCreateIC (xim, 1554 Input_Context = XCreateIC (xim,
1490 XNInputStyle, input_style, 1555 XNInputStyle, input_style,
1491 XNClientWindow, vt, 1556 XNClientWindow, vt,
1492 XNFocusWindow, parent[0], 1557 XNFocusWindow, parent,
1493 preedit_attr ? XNPreeditAttributes : NULL, 1558 preedit_attr ? XNPreeditAttributes : NULL,
1494 preedit_attr, 1559 preedit_attr,
1495 status_attr ? XNStatusAttributes : NULL, 1560 status_attr ? XNStatusAttributes : NULL,
1496 status_attr, NULL); 1561 status_attr, NULL);
1497 1562
… …
1510 // unfortunately, only the focus window is used by XIM, hard to fix 1575 // unfortunately, only the focus window is used by XIM, hard to fix
1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1576 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1512 vt_select_input (); 1577 vt_select_input ();
1513#endif 1578#endif
1514 1579
1515 IMSetPosition (); 1580 im_set_position ();
1516 1581
1517 return true; 1582 return true;
1518} 1583}
1519 1584
1520void 1585void
… …
1530 im_destroy (); 1595 im_destroy ();
1531 1596
1532 if (Input_Context) 1597 if (Input_Context)
1533 return; 1598 return;
1534 1599
1535#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1536 if (rs[Rs_imLocale]) 1600 if (rs[Rs_imLocale])
1537 SET_LOCALE (rs[Rs_imLocale]); 1601 SET_LOCALE (rs[Rs_imLocale]);
1538#endif
1539 1602
1540 p = rs[Rs_inputMethod]; 1603 p = rs[Rs_inputMethod];
1541 if (p && *p) 1604 if (p && *p)
1542 { 1605 {
1543 bool found = false; 1606 bool found = false;
1544 1607
1545 s = rxvt_splitcommastring (p); 1608 s = rxvt_strsplit (',', p);
1546 1609
1547 for (i = 0; s[i]; i++) 1610 for (i = 0; s[i]; i++)
1548 { 1611 {
1549 if (*s[i]) 1612 if (*s[i])
1550 { 1613 {
1551 strcpy (buf, "@im="); 1614 strcpy (buf, "@im=");
1552 strncat (buf, s[i], IMBUFSIZ - 5); 1615 strncat (buf, s[i], IMBUFSIZ - 5);
1553 if (IM_get_IC (buf)) 1616 if (im_get_ic (buf))
1554 { 1617 {
1555 found = true; 1618 found = true;
1556 break; 1619 break;
1557 } 1620 }
1558 } 1621 }
1559 } 1622 }
1560 1623
1561 rxvt_freecommastring (s); 1624 rxvt_free_strsplit (s);
1562 1625
1563 if (found) 1626 if (found)
1564 goto done; 1627 goto done;
1565 } 1628 }
1566 1629
1567 /* try with XMODIFIERS env. var. */ 1630 /* try with XMODIFIERS env. var. */
1568 if (IM_get_IC ("")) 1631 if (im_get_ic (""))
1569 goto done; 1632 goto done;
1570 1633
1571 /* try with no modifiers base IF the user didn't specify an IM */ 1634 /* try with no modifiers base IF the user didn't specify an IM */
1572 if (IM_get_IC ("@im=none")) 1635 if (im_get_ic ("@im=none"))
1573 goto done; 1636 goto done;
1574 1637
1575done: 1638done:
1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1577 if (rs[Rs_imLocale]) 1639 if (rs[Rs_imLocale])
1578 SET_LOCALE (locale); 1640 SET_LOCALE (locale);
1579#endif
1580} 1641}
1581 1642
1582void 1643void
1583rxvt_term::IMSetPosition () 1644rxvt_term::im_set_position ()
1584{ 1645{
1585 XRectangle preedit_rect, status_rect, *needed_rect; 1646 XRectangle preedit_rect, status_rect, *needed_rect;
1586 XVaNestedList preedit_attr, status_attr; 1647 XVaNestedList preedit_attr, status_attr;
1587 1648
1588 if (!Input_Context 1649 if (!Input_Context
1589 || !focus 1650 || !focus
1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1651 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1591 || !IMisRunning ()) 1652 || !im_is_running ())
1592 return; 1653 return;
1593 1654
1594 if (input_style & XIMPreeditPosition) 1655 if (input_style & XIMPreeditPosition)
1595 { 1656 {
1596 im_set_size (preedit_rect); 1657 im_set_size (preedit_rect);
… …
1626 1687
1627void 1688void
1628rxvt_term::get_window_origin (int &x, int &y) 1689rxvt_term::get_window_origin (int &x, int &y)
1629{ 1690{
1630 Window cr; 1691 Window cr;
1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1692 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1632}
1633
1634Pixmap
1635rxvt_term::get_pixmap_property (int prop_id)
1636{
1637 if (prop_id > 0 && prop_id < NUM_XA)
1638 if (xa[prop_id])
1639 {
1640 int aformat;
1641 unsigned long nitems, bytes_after;
1642 Atom atype;
1643 unsigned char *prop = NULL;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP)
1648 return *(Pixmap *)prop;
1649 }
1650
1651 return None;
1652} 1693}
1653 1694
1654#ifdef HAVE_BG_PIXMAP 1695#ifdef HAVE_BG_PIXMAP
1655 1696
1656void 1697void
1657rxvt_term::update_background () 1698rxvt_term::update_background ()
1658{ 1699{
1659 if (update_background_ev.is_active ()) 1700 if (update_background_ev.is_active ())
1660 return; 1701 return;
1661 1702
1662 bgPixmap.invalidate ();
1663
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1703 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1704
1666 if (to_wait <= 0.) 1705 if (to_wait <= 0.)
1667 bgPixmap.render (); 1706 bg_render ();
1668 else 1707 else
1669 update_background_ev.start (to_wait); 1708 update_background_ev.start (to_wait);
1670} 1709}
1671 1710
1672void 1711void
1673rxvt_term::update_background_cb (ev::timer &w, int revents) 1712rxvt_term::update_background_cb (ev::timer &w, int revents)
1674{ 1713{
1675 make_current (); 1714 make_current ();
1676 1715
1677 update_background_ev.stop (); 1716 update_background_ev.stop ();
1678 bgPixmap.render (); 1717 bg_render ();
1679 refresh_check (); 1718 refresh_check ();
1680} 1719}
1681 1720
1682#endif /* HAVE_BG_PIXMAP */ 1721#endif /* HAVE_BG_PIXMAP */
1683 1722

Diff Legend

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