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.398 by sf-exg, Tue Sep 8 07:54:58 2015 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-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
… …
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
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 229#endif
233#ifdef HAVE_AFTERIMAGE 230
234 if (asv) 231#if HAVE_IMG
235 destroy_asvisual (asv, 0); 232 delete bg_img;
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 233#endif
239 234
240 if (display) 235 if (display)
241 { 236 {
242 selection_clear (); 237 selection_clear ();
243 selection_clear (true); 238 selection_clear (true);
244 239
245#ifdef USE_XIM 240#if USE_XIM
246 im_destroy (); 241 im_destroy ();
247#endif 242#endif
248 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
249 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
250 247
251 delete drawable; 248 delete drawable;
249
252 // destroy all windows 250 // destroy all windows
253 if (parent[0]) 251 if (parent)
254 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
255 253
256 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
258 { 256 {
259 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
261 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
262#endif 261#endif
263 } 262 }
264 263
265 clear (); 264 clear ();
266 265
… …
274 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 274 free (allocated [i]);
276 275
277 free (selection.text); 276 free (selection.text);
278 free (selection.clip_text); 277 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 278 free (locale);
283 free (v_buffer); 279 free (v_buffer);
284 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;
285 287
286 delete envv; 288 delete envv;
287 delete argv; 289 delete argv;
288 290
289#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
290 delete keyboard; 292 delete keyboard;
291#endif 293#endif
292#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
294#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
295} 299}
296 300
297// child has exited, usually destroys 301// child has exited, usually destroys
298void 302void
299rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
322 { 326 {
323#if USE_XIM 327#if USE_XIM
324 im_ev.stop (display); 328 im_ev.stop (display);
325#endif 329#endif
326 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
329#endif 333#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 334 termwin_ev.stop (display);
332 vt_ev.stop (display); 335 vt_ev.stop (display);
333 } 336 }
334 337
335 flush_ev.stop (); 338 flush_ev.stop ();
… …
360 363
361 delete this; 364 delete this;
362} 365}
363 366
364void 367void
365rxvt_term::set_option (uint8_t opt, bool set) 368rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 369{
367 if (!opt) 370 if (!opt)
368 return; 371 return;
369 372
370 uint8_t mask = 1 << (opt & 7); 373 uint8_t mask = 1 << (opt & 7);
… …
374} 377}
375 378
376/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
377/* 380/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * 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 */ 382 */
381static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
382 384
383static void 385static void
384rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
386 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++)
387 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
388} 390}
389 391
390#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
391static void 393static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
393{ 395{
394 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
396 char number[32]; 398 char number[32];
397 const char mtype[] = "XlibMessage"; 399
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"); 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);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 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 {
404 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
407 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 466 }
467
412 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 471 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 473 || event->error_code == BadColor
418 (event->error_code == BadGC) || 474 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 476 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
422 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 else 483 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 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 485
439int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 493{
442 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
444 else 496 else
445 { 497 {
446 // 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,
447 // so just output the error and continue 499 // so just output the error and continue
… …
453 } 505 }
454 506
455 return 0; 507 return 0;
456} 508}
457 509
458int 510int ecb_cold
459rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
460{ 512{
461 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",
462 DisplayString (display)); 514 DisplayString (display));
463 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
… …
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
586 638
587 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
588} 644}
589 645
590/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
591/* 647/*
592 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
713 if (recalc_y) 769 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 771
716 ncol = width / fwidth; 772 ncol = width / fwidth;
717 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;
718} 783}
719 784
720/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
721/* 786/*
722 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
730 795
731 struct winsize ws; 796 struct winsize ws;
732 797
733 ws.ws_col = ncol; 798 ws.ws_col = ncol;
734 ws.ws_row = nrow; 799 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 803
739#if 0 804#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
743#endif 808#endif
744} 809}
745 810
746/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 812/* 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 813bool
755rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
756{ 815{
757 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
773 832
774 delete fontset[0]; 833 delete fontset[0];
775 fontset[0] = fs; 834 fontset[0] = fs;
776 835
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
779 prop.width += letterSpace;
780 838
781 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
782 840
783 fwidth = prop.width; 841 fwidth = prop.width;
784 fheight = prop.height; 842 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 843 fbase = prop.ascent;
786 844
787 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
788 { 846 {
789#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
815#else 873#else
816 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
817#endif 875#endif
818 } 876 }
819 877
820 if (parent[0]) 878 if (parent)
821 { 879 {
822 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 881 scr_remap_chars ();
824 scr_touch (true); 882 scr_touch (true);
825 } 883 }
… …
828} 886}
829 887
830void 888void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 890{
833 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 894}
837 895
838void 896void
… …
840{ 898{
841 XTextProperty ct; 899 XTextProperty ct;
842 900
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 902 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 903 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 904 XFree (ct.value);
847 } 905 }
848} 906}
849 907
850void 908void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 910{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
855 913
856 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
859 917
860 free (s); 918 free (s);
861 free (ws); 919 free (ws);
… …
884 942
885void 943void
886rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
887{ 945{
888#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
889 rxvt_color xcol;
890
891 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
892 return; 948 return;
893 949
894 color = strdup (color); 950 color = strdup (color);
895 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
… …
901 int i = atoi (color); 957 int i = atoi (color);
902 958
903 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
904 { 960 {
905 /* bright colors */ 961 /* bright colors */
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
907 goto done; 963 goto done;
908 } 964 }
909 965
910 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
911 { 967 {
912 /* normal colors */ 968 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
914 goto done; 970 goto done;
915 } 971 }
916 } 972 }
917 973
918 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
919 975 set_color (pix_colors_focused[idx], color);
920 /*
921 * FIXME: should free colors here, but no idea how to do it so instead,
922 * so just keep gobbling up the colormap
923 */
924
925 pix_colors_focused[idx] = xcol;
926 976
927done: 977done:
928 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
929 979
930 update_fade_color (idx); 980 update_fade_color (idx);
931 recolour_cursor (); 981 recolor_cursor ();
932 scr_recolour (); 982 scr_recolor ();
933#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
934} 984}
935 985
936void 986void
937rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
938{ 988{
939 XColor fg, bg; 989 XColor fg, bg;
940 990
941 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
942 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
951 1001
952/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
953/* 1003/*
954 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
955 */ 1005 */
956void 1006char *
957rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
958{ 1008{
959 unsigned int i; 1009 unsigned int i;
960 const char *xpmb = ""; 1010 const char *xpmb = "";
961 char fstr[] = "default"; 1011 char fstr[] = "default";
962 char bstr[] = "default"; 1012 char bstr[] = "default";
1013 char *env_colorfgbg;
963 1014
964 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
966 { 1017 {
967 sprintf (fstr, "%d", i - Color_Black); 1018 sprintf (fstr, "%d", i - Color_Black);
… …
970 1021
971 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
972 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
973 { 1024 {
974 sprintf (bstr, "%d", i - Color_Black); 1025 sprintf (bstr, "%d", i - Color_Black);
975#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
976 xpmb = "default;"; 1027 xpmb = "default;";
977#endif 1028#endif
978 break; 1029 break;
979 } 1030 }
980 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
981 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
982} 1035}
983 1036
984/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
985 1038
986bool 1039bool
… …
994} 1047}
995 1048
996void 1049void
997rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
998{ 1051{
1052 pix_colors[dst].free (this);
999 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1053 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1000} 1054}
1001 1055
1002/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
1003 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
… …
1015 1069
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1070 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint) 1071 if (set_hint)
1018 { 1072 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1073 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1074 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1075 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1076 }
1023 1077
1024 if (!ignoreparent) 1078 if (!ignoreparent)
1025 { 1079 {
… …
1031 int x, y, x1, y1; 1085 int x, y, x1, y1;
1032 int dx, dy; 1086 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1088 Window unused_cr;
1035 1089
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1090 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1091 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1092 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1094 /*
1041 * if display->root isn't the parent window, a WM will probably have offset 1095 * if display->root isn't the parent window, a WM will probably have offset
1042 * our position for handles and decorations. Counter it 1096 * our position for handles and decorations. Counter it
1043 */ 1097 */
… …
1060 if (y < y1) /* top half */ 1114 if (y < y1) /* top half */
1061 dy = 0; 1115 dy = 0;
1062 else if (y == y1) /* exact center */ 1116 else if (y == y1) /* exact center */
1063 dy /= 2; 1117 dy /= 2;
1064 1118
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1119 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1120 szHint.width, szHint.height);
1067#else 1121#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1122 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1123#endif
1070 } 1124 }
1071 1125
1072 if (set_hint) 1126 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1127 XSetWMNormalHints (dpy, parent, &szHint);
1074 1128
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1129 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1130
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1131 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1132 {
1079 if (scrollBar.state) 1133 if (scrollBar.state)
1080 scrollBar.resize (); 1134 scrollBar.resize ();
1081 1135
1082 XMoveResizeWindow (dpy, vt, 1136 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1137 window_vt_x, window_vt_y,
1084 width, height); 1138 vt_width, vt_height);
1139
1140 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085 1141
1086#ifdef HAVE_BG_PIXMAP 1142#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1143 if (bg_window_size_sensitive ())
1088 update_background (); 1144 update_background ();
1089#endif 1145#endif
1090 } 1146 }
1091 1147
1092 if (fix_screen || old_height == 0) 1148 if (fix_screen || old_height == 0)
1093 scr_reset (); 1149 scr_reset ();
1094 1150
1095#ifdef USE_XIM 1151#if USE_XIM
1096 IMSetPosition (); 1152 im_set_position ();
1097#endif 1153#endif
1098} 1154}
1099 1155
1100/* 1156/*
1101 * Set the width/height of the vt window in characters. Units are pixels. 1157 * Set the width/height of the vt window in characters. Units are pixels.
… …
1114 newwidth = wattr.width - szHint.base_width; 1170 newwidth = wattr.width - szHint.base_width;
1115 if (newheight == 0) 1171 if (newheight == 0)
1116 newheight = wattr.height - szHint.base_height; 1172 newheight = wattr.height - szHint.base_height;
1117 } 1173 }
1118 1174
1119 if (newwidth != width || newheight != height) 1175 if (newwidth != vt_width || newheight != vt_height)
1120 { 1176 {
1121 newwidth += szHint.base_width; 1177 newwidth += szHint.base_width;
1122 newheight += szHint.base_height; 1178 newheight += szHint.base_height;
1123 resize_all_windows (newwidth, newheight, 0); 1179 resize_all_windows (newwidth, newheight, 0);
1124 } 1180 }
1125} 1181}
1126 1182
1127/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1128 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1129 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1130#ifdef USE_XIM 1186#if USE_XIM
1131 1187
1132void 1188void
1133rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1134{ 1190{
1135 fg = pix_colors [Color_fg]; 1191 fg = pix_colors [Color_fg];
… …
1162 status_rect.height = fheight; 1218 status_rect.height = fheight;
1163} 1219}
1164 1220
1165/* Checking whether input method is running. */ 1221/* Checking whether input method is running. */
1166bool 1222bool
1167rxvt_term::IMisRunning () 1223rxvt_term::im_is_running ()
1168{ 1224{
1169 Atom atom; 1225 Atom atom;
1170 Window win; 1226 Window win;
1171 char server[IMBUFSIZ]; 1227 char server[IMBUFSIZ];
1172 1228
… …
1181 1237
1182 atom = XInternAtom (dpy, server, False); 1238 atom = XInternAtom (dpy, server, False);
1183 win = XGetSelectionOwner (dpy, atom); 1239 win = XGetSelectionOwner (dpy, atom);
1184 1240
1185 if (win != None) 1241 if (win != None)
1186 return True; 1242 return true;
1187 } 1243 }
1188 1244
1189 return False; 1245 return false;
1190} 1246}
1191 1247
1192void 1248void
1193rxvt_term::IMSendSpot () 1249rxvt_term::im_send_spot ()
1194{ 1250{
1195 XPoint nspot; 1251 XPoint nspot;
1196 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1197 1253
1198 if (!Input_Context 1254 if (!Input_Context
… …
1304/* 1360/*
1305 * Try to open a XIM with the current modifiers, then see if we can 1361 * Try to open a XIM with the current modifiers, then see if we can
1306 * open a suitable preedit type 1362 * open a suitable preedit type
1307 */ 1363 */
1308bool 1364bool
1309rxvt_term::IM_get_IC (const char *modifiers) 1365rxvt_term::im_get_ic (const char *modifiers)
1310{ 1366{
1311 int i, j, found; 1367 int i, j, found;
1312 XIM xim; 1368 XIM xim;
1313 XPoint spot; 1369 XPoint spot;
1314 XRectangle rect, status_rect, needed_rect; 1370 XRectangle rect, status_rect, needed_rect;
1315 unsigned long fg, bg; 1371 unsigned long fg, bg;
1316 const char *p; 1372 const char *p;
1317 char **s; 1373 char **s;
1318 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1319#ifdef ENABLE_XIM_ONTHESPOT
1320 XIMCallback xcb[4];
1321#endif
1322 1375
1323 set_environ (envv); 1376 set_environ (env);
1324 1377
1325 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1326 return false; 1379 return false;
1327 1380
1328 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1382 if (input_method == NULL)
1330 return false; 1383 return false;
… …
1466 NULL); 1519 NULL);
1467 } 1520 }
1468#if ENABLE_XIM_ONTHESPOT 1521#if ENABLE_XIM_ONTHESPOT
1469 else if (input_style & XIMPreeditCallbacks) 1522 else if (input_style & XIMPreeditCallbacks)
1470 { 1523 {
1524 XIMCallback xcb[4];
1525
1471 im_set_position (spot); 1526 im_set_position (spot);
1472 1527
1473 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1528 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; 1529 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; 1530 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1490#endif 1545#endif
1491 1546
1492 Input_Context = XCreateIC (xim, 1547 Input_Context = XCreateIC (xim,
1493 XNInputStyle, input_style, 1548 XNInputStyle, input_style,
1494 XNClientWindow, vt, 1549 XNClientWindow, vt,
1495 XNFocusWindow, parent[0], 1550 XNFocusWindow, parent,
1496 preedit_attr ? XNPreeditAttributes : NULL, 1551 preedit_attr ? XNPreeditAttributes : NULL,
1497 preedit_attr, 1552 preedit_attr,
1498 status_attr ? XNStatusAttributes : NULL, 1553 status_attr ? XNStatusAttributes : NULL,
1499 status_attr, NULL); 1554 status_attr, NULL);
1500 1555
… …
1513 // unfortunately, only the focus window is used by XIM, hard to fix 1568 // unfortunately, only the focus window is used by XIM, hard to fix
1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1569 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1515 vt_select_input (); 1570 vt_select_input ();
1516#endif 1571#endif
1517 1572
1518 IMSetPosition (); 1573 im_set_position ();
1519 1574
1520 return true; 1575 return true;
1521} 1576}
1522 1577
1523void 1578void
… …
1533 im_destroy (); 1588 im_destroy ();
1534 1589
1535 if (Input_Context) 1590 if (Input_Context)
1536 return; 1591 return;
1537 1592
1538#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1539 if (rs[Rs_imLocale]) 1593 if (rs[Rs_imLocale])
1540 SET_LOCALE (rs[Rs_imLocale]); 1594 SET_LOCALE (rs[Rs_imLocale]);
1541#endif
1542 1595
1543 p = rs[Rs_inputMethod]; 1596 p = rs[Rs_inputMethod];
1544 if (p && *p) 1597 if (p && *p)
1545 { 1598 {
1546 bool found = false; 1599 bool found = false;
… …
1551 { 1604 {
1552 if (*s[i]) 1605 if (*s[i])
1553 { 1606 {
1554 strcpy (buf, "@im="); 1607 strcpy (buf, "@im=");
1555 strncat (buf, s[i], IMBUFSIZ - 5); 1608 strncat (buf, s[i], IMBUFSIZ - 5);
1556 if (IM_get_IC (buf)) 1609 if (im_get_ic (buf))
1557 { 1610 {
1558 found = true; 1611 found = true;
1559 break; 1612 break;
1560 } 1613 }
1561 } 1614 }
… …
1566 if (found) 1619 if (found)
1567 goto done; 1620 goto done;
1568 } 1621 }
1569 1622
1570 /* try with XMODIFIERS env. var. */ 1623 /* try with XMODIFIERS env. var. */
1571 if (IM_get_IC ("")) 1624 if (im_get_ic (""))
1572 goto done; 1625 goto done;
1573 1626
1574 /* try with no modifiers base IF the user didn't specify an IM */ 1627 /* try with no modifiers base IF the user didn't specify an IM */
1575 if (IM_get_IC ("@im=none")) 1628 if (im_get_ic ("@im=none"))
1576 goto done; 1629 goto done;
1577 1630
1578done: 1631done:
1579#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1580 if (rs[Rs_imLocale]) 1632 if (rs[Rs_imLocale])
1581 SET_LOCALE (locale); 1633 SET_LOCALE (locale);
1582#endif
1583} 1634}
1584 1635
1585void 1636void
1586rxvt_term::IMSetPosition () 1637rxvt_term::im_set_position ()
1587{ 1638{
1588 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1589 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1590 1641
1591 if (!Input_Context 1642 if (!Input_Context
1592 || !focus 1643 || !focus
1593 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1644 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1594 || !IMisRunning ()) 1645 || !im_is_running ())
1595 return; 1646 return;
1596 1647
1597 if (input_style & XIMPreeditPosition) 1648 if (input_style & XIMPreeditPosition)
1598 { 1649 {
1599 im_set_size (preedit_rect); 1650 im_set_size (preedit_rect);
… …
1629 1680
1630void 1681void
1631rxvt_term::get_window_origin (int &x, int &y) 1682rxvt_term::get_window_origin (int &x, int &y)
1632{ 1683{
1633 Window cr; 1684 Window cr;
1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1685 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} 1686}
1658 1687
1659#ifdef HAVE_BG_PIXMAP 1688#ifdef HAVE_BG_PIXMAP
1660 1689
1661void 1690void
1662rxvt_term::update_background () 1691rxvt_term::update_background ()
1663{ 1692{
1664 if (update_background_ev.is_active ()) 1693 if (update_background_ev.is_active ())
1665 return; 1694 return;
1666 1695
1667 bgPixmap.invalidate ();
1668
1669 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1696 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1670 1697
1671 if (to_wait <= 0.) 1698 if (to_wait <= 0.)
1672 bgPixmap.render (); 1699 bg_render ();
1673 else 1700 else
1674 update_background_ev.start (to_wait); 1701 update_background_ev.start (to_wait);
1675} 1702}
1676 1703
1677void 1704void
1678rxvt_term::update_background_cb (ev::timer &w, int revents) 1705rxvt_term::update_background_cb (ev::timer &w, int revents)
1679{ 1706{
1680 make_current (); 1707 make_current ();
1681 1708
1682 update_background_ev.stop (); 1709 update_background_ev.stop ();
1683 bgPixmap.render (); 1710 bg_render ();
1684 refresh_check (); 1711 refresh_check ();
1685} 1712}
1686 1713
1687#endif /* HAVE_BG_PIXMAP */ 1714#endif /* HAVE_BG_PIXMAP */
1688 1715

Diff Legend

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