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.294 by root, Fri Jan 4 19:12:23 2008 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 2011 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-2007 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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
234 237
235#ifdef USE_XIM 238#ifdef USE_XIM
236 im_destroy (); 239 im_destroy ();
237#endif 240#endif
238#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
263 243
264 delete drawable; 244 delete drawable;
265 // destroy all windows 245 // destroy all windows
266 if (parent[0]) 246 if (parent[0])
274 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
275#endif 255#endif
276 } 256 }
277 257
278 clear (); 258 clear ();
279 }
280 259
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 260 display->flush (); /* ideally .put should do this */
285 displays.put (display); 261 displays.put (display);
262 }
286 263
287 scr_release (); 264 scr_release ();
288 265
289 /* clear all resources */ 266 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
291 free (allocated [i]); 268 free (allocated [i]);
292 269
293 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
294 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
295 free (env_display); 273 free (env_display);
296 free (env_term); 274 free (env_term);
297 free (locale); 275 free (locale);
298 free (v_buffer); 276 free (v_buffer);
299 free (incr_buf); 277
278 delete selection_req;
300 279
301 delete envv; 280 delete envv;
302 delete argv; 281 delete argv;
303 282
304#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
336 if (display) 315 if (display)
337 { 316 {
338#if USE_XIM 317#if USE_XIM
339 im_ev.stop (display); 318 im_ev.stop (display);
340#endif 319#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
346#endif 323#endif
347 incr_ev.stop ();
348 termwin_ev.stop (display); 324 termwin_ev.stop (display);
349 vt_ev.stop (display); 325 vt_ev.stop (display);
350 } 326 }
351 327
352 flush_ev.stop (); 328 flush_ev.stop ();
374rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
375{ 351{
376 make_current (); 352 make_current ();
377 353
378 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
379} 367}
380 368
381/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
382/* 370/*
383 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
397print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
398{ 386{
399 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
400 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
401 char number[32]; 389 char number[32];
402 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
403 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
406 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
407 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
409 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
410 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
411 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
412 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
413 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414 mesg, BUFSIZ); 402 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416 } 404 }
417 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
418 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
419 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
420 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
421 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
422 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
423 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
424 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
425 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
426 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
427 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
428 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
429 mesg, BUFSIZ); 417 mesg, BUFSIZ);
430 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
431 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
432 mesg, BUFSIZ); 420 mesg, BUFSIZ);
433 else 421 else
434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
435 mesg, BUFSIZ); 423 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437 } 425 }
438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439 mesg, BUFSIZ); 427 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441} 429}
442#endif 430#endif
443 431
444int 432int
467 DisplayString (display)); 455 DisplayString (display));
468 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
470} 458}
471 459
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586}
587
588static struct sig_handlers 460static struct sig_handlers
589{ 461{
590 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
591 463
592 /* 464 /*
607 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
608 w.stop (); 480 w.stop ();
609 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
610} 482}
611 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
612char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
613 552
614void 553void
615rxvt_init () 554rxvt_init ()
616{ 555{
617 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
618 558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
619 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 567
622 rxvt_environ = environ; 568 rxvt_environ = environ;
623 569
624 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
626 572
627 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */
632 575
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
634 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
635 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
636 579
644 */ 587 */
645void 588void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 590{
648 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 592 int x, y, flags;
650 unsigned int w, h; 593 unsigned int w, h;
651 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
652 595
653 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
654 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
664 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
665 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
666 609
667 if (flags & WidthValue) 610 if (flags & WidthValue)
668 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
669 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
670 szHint.flags |= USSize; 616 szHint.flags |= USSize;
671 } 617 }
672 618
673 if (flags & HeightValue) 619 if (flags & HeightValue)
674 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
675 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
676 szHint.flags |= USSize; 625 szHint.flags |= USSize;
677 } 626 }
678 627
679 if (flags & XValue) 628 if (flags & XValue)
680 { 629 {
711 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
712 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
713 662
714 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
715 664
716 sb_w = 0;
717 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
718 666
719 if (scrollBar.state) 667 if (scrollBar.state)
720 { 668 {
721 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
722 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
723 671
724 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
725 window_vt_x += sb_w; 673 window_vt_x += sb_w;
726 } 674 }
750 { 698 {
751 min_it (height, max_height); 699 min_it (height, max_height);
752 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
753 } 701 }
754 702
755 if (scrollBar.state && option (Opt_scrollBar_right))
756 window_sb_x = szHint.width - sb_w;
757
758 if (recalc_x) 703 if (recalc_x)
759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
760 705
761 if (recalc_y) 706 if (recalc_y)
762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 708
764 ncol = width / fwidth; 709 ncol = width / fwidth;
765 nrow = height / fheight; 710 nrow = height / fheight;
766} 711}
767 712
768/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
769/* 714/*
780 725
781 ws.ws_col = ncol; 726 ws.ws_col = ncol;
782 ws.ws_row = nrow; 727 ws.ws_row = nrow;
783 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
784 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
786 731
787#if 0 732#if 0
788 // TIOCSWINSZ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
789 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
790 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
820#endif 765#endif
821 766
822 delete fontset[0]; 767 delete fontset[0];
823 fontset[0] = fs; 768 fontset[0] = fs;
824 769
825 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
826 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
827 773
828 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
829 775
830 fwidth = prop.width; 776 fwidth = prop.width;
831 fheight = prop.height; 777 fheight = prop.height;
881 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
882 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
883} 829}
884 830
885void 831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent[0], &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
886rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 845{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
890 848
900/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
901/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
902void 860void
903rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
904{ 862{
905 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
906#if ENABLE_EWMH 864#if ENABLE_EWMH
907 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
908#endif 866#endif
909} 867}
910 868
911void 869void
912rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
913{ 871{
914 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
915#if ENABLE_EWMH 873#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 875#endif
918} 876}
919 877
920void 878void
921rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
922{ 880{
923#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
924 rxvt_color xcol; 882 rxvt_color xcol;
925 int i;
926 883
927 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
928 return; 885 return;
929 886
930 color = strdup (color); 887 color = strdup (color);
932 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
933 890
934 /* handle color aliases */ 891 /* handle color aliases */
935 if (isdigit (*color)) 892 if (isdigit (*color))
936 { 893 {
937 i = atoi (color); 894 int i = atoi (color);
938 895
939 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
940 { 897 {
941 /* bright colors */ 898 /* bright colors */
942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
992void 949void
993rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
994{ 951{
995 unsigned int i; 952 unsigned int i;
996 const char *xpmb = ""; 953 const char *xpmb = "";
997 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
998 956
999 strcpy (fstr, "default");
1000 strcpy (bstr, "default");
1001 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
1003 { 959 {
1004 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
1005 break; 961 break;
1006 } 962 }
1007 963
1008 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1009 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
1010 { 966 {
1011 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
1012#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
1013 xpmb = "default;"; 969 xpmb = "default;";
1014#endif 970#endif
1015 break; 971 break;
1016 } 972 }
1046 int old_width = szHint.width; 1002 int old_width = szHint.width;
1047 int old_height = szHint.height; 1003 int old_height = szHint.height;
1048 1004
1049 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
1050 1006
1051 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
1052 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent[0], &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
1053 1016
1054 if (!ignoreparent) 1017 if (!ignoreparent)
1055 { 1018 {
1056#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
1057 /* 1020 /*
1097#else 1060#else
1098 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1099#endif 1062#endif
1100 } 1063 }
1101 1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent[0], &szHint);
1067
1102 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1103 1069
1104 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1105 { 1071 {
1106 if (scrollBar.state) 1072 if (scrollBar.state)
1107 { 1073 scrollBar.resize ();
1108 XMoveResizeWindow (dpy, scrollBar.win,
1109 window_sb_x, 0,
1110 scrollbar_TotalWidth (), szHint.height);
1111 resize_scrollbar ();
1112 }
1113 1074
1114 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1115 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1116 width, height); 1077 width, height);
1117 1078
1118#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1120 update_background (); 1081 update_background ();
1121#endif 1082#endif
1122
1123 scr_clear ();
1124 } 1083 }
1125 1084
1126 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1127 scr_reset (); 1086 scr_reset ();
1128
1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1130 //scr_touch (false);
1131
1132#ifdef HAVE_BG_PIXMAP
1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1134// if (bgPixmap.pixmap)
1135// scr_touch (false);
1136#endif
1137 1087
1138#ifdef USE_XIM 1088#ifdef USE_XIM
1139 IMSetPosition (); 1089 IMSetPosition ();
1140#endif 1090#endif
1141} 1091}
1207 1157
1208/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1209bool 1159bool
1210rxvt_term::IMisRunning () 1160rxvt_term::IMisRunning ()
1211{ 1161{
1212 char *p;
1213 Atom atom; 1162 Atom atom;
1214 Window win; 1163 Window win;
1215 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1216 1165
1217 /* get current locale modifier */ 1166 /* get current locale modifier */
1218 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1219 { 1168 {
1220 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1221 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1222 1171
1223 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1224 *p = '\0'; 1173 *p = '\0';
1225 1174
1226 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1227 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1228 1177
1229 if (win != None) 1178 if (win != None)
1230 return True; 1179 return true;
1231 } 1180 }
1232 1181
1233 return False; 1182 return false;
1234} 1183}
1235 1184
1236void 1185void
1237rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1238{ 1187{
1295 1244
1296 term->make_current (); 1245 term->make_current ();
1297 1246
1298 if (text) 1247 if (text)
1299 { 1248 {
1300 void *str; 1249 wchar_t *str;
1301 1250
1302 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1303 { 1252 {
1304 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1305 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1306 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1307 1256
1308 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1309 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1310 1259
1311 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1312 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1313 } 1262 }
1314 else 1263 else
1315 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1316 1265
1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1318 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1319 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1320 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
1391 p = pet[pi]; 1340 p = pet[pi];
1392 1341
1393 if (!p) 1342 if (!p)
1394 continue; 1343 continue;
1395 1344
1396 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1397 1346
1398 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1399 { 1348 {
1400 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1401 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
1413 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1414 1363
1415 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1416 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1417 { 1366 {
1418 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1419 1368
1420 found = 1; 1369 found = 1;
1421 goto foundpet; 1370 goto foundpet;
1422 } 1371 }
1423 1372
1424 } 1373 }
1425 1374
1426 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1427 } 1376 }
1428 1377
1429foundpet: 1378foundpet:
1430 1379
1431 XFree (xim_styles); 1380 XFree (xim_styles);
1587 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1588 if (p && *p) 1537 if (p && *p)
1589 { 1538 {
1590 bool found = false; 1539 bool found = false;
1591 1540
1592 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1593 1542
1594 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1595 { 1544 {
1596 if (*s[i]) 1545 if (*s[i])
1597 { 1546 {
1603 break; 1552 break;
1604 } 1553 }
1605 } 1554 }
1606 } 1555 }
1607 1556
1608 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1609 1558
1610 if (found) 1559 if (found)
1611 goto done; 1560 goto done;
1612 } 1561 }
1613 1562
1674void 1623void
1675rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1676{ 1625{
1677 Window cr; 1626 Window cr;
1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1680} 1628}
1681 1629
1682Pixmap 1630Pixmap
1683rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1684{ 1632{
1685 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1686 if (xa[prop_id]) 1634
1687 {
1688 int aformat; 1635 int aformat;
1689 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1690 Atom atype; 1637 Atom atype;
1691 unsigned char *prop = NULL; 1638 unsigned char *prop;
1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1694 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1695 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1696 return *(Pixmap *)prop; 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1697 } 1647 }
1698 1648
1699 return None; 1649 return pixmap;
1700} 1650}
1701 1651
1702#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1703# if TRACE_PIXMAPS
1704# undef update_background
1705void
1706rxvt_term::trace_update_background (const char *file, int line)
1707{
1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1709 update_background ();
1710}
1711# endif
1712 1653
1713void 1654void
1714rxvt_term::update_background () 1655rxvt_term::update_background ()
1715{ 1656{
1716 if (update_background_ev.is_active ()) 1657 if (update_background_ev.is_active ())
1717 return; 1658 return;
1718 1659
1719 bgPixmap.invalidate (); 1660 bg_invalidate ();
1720 1661
1721 ev_tstamp refresh; 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1722 1663
1723 if (!bgPixmap.need_client_side_rendering ()) 1664 if (to_wait <= 0.)
1724 refresh = .05; 1665 bg_render ();
1725 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1726 /* no chance of real time refresh if we are blurring! */
1727 refresh = .50;
1728 else 1666 else
1729 refresh = .07;
1730
1731 update_background_ev.start (refresh); 1667 update_background_ev.start (to_wait);
1732} 1668}
1733 1669
1734void 1670void
1735rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1736{ 1672{
1737 make_current (); 1673 make_current ();
1738 1674
1739 update_background_ev.stop (); 1675 update_background_ev.stop ();
1740 bgPixmap.render (); 1676 bg_render ();
1741 refresh_check (); 1677 refresh_check ();
1742} 1678}
1743 1679
1744#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1745 1681

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines