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.277 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.345 by root, Sat Jan 8 10:17:43 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
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
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE 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));
170#endif 171#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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::x_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);
185#endif 184#endif
186#ifndef NO_BELL 185#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 186 bell_ev.set <rxvt_term, &rxvt_term::bell_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 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
227 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
228 delete fontset[i]; 226 delete fontset[i];
229#endif 227#endif
230 delete fontset[0]; 228 delete fontset[0];
231 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
232 if (display) 240 if (display)
233 { 241 {
234 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
235 244
236#ifdef USE_XIM 245#ifdef USE_XIM
237 im_destroy (); 246 im_destroy ();
238#endif 247#endif
239#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 249 if (gc) XFreeGC (dpy, gc);
264 250
265 delete drawable; 251 delete drawable;
266 // destroy all windows 252 // destroy all windows
267 if (parent[0]) 253 if (parent[0])
275 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
276#endif 262#endif
277 } 263 }
278 264
279 clear (); 265 clear ();
280 }
281 266
282 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 268 displays.put (display);
269 }
291 270
292 scr_release (); 271 scr_release ();
293 272
294 /* clear all resources */ 273 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 275 free (allocated [i]);
297 276
298 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
300 free (env_display); 280 free (env_display);
301 free (env_term); 281 free (env_term);
302 free (locale); 282 free (locale);
303 free (v_buffer); 283 free (v_buffer);
327} 307}
328 308
329void 309void
330rxvt_term::destroy () 310rxvt_term::destroy ()
331{ 311{
332 if (ev_is_active (&destroy_ev)) 312 if (destroy_ev.is_active ())
333 return; 313 return;
334 314
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 316
337#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
341 if (display) 321 if (display)
342 { 322 {
343#if USE_XIM 323#if USE_XIM
344 im_ev.stop (display); 324 im_ev.stop (display);
345#endif 325#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
351#endif 329#endif
352 incr_ev.stop (); 330 incr_ev.stop ();
353 termwin_ev.stop (display); 331 termwin_ev.stop (display);
354 vt_ev.stop (display); 332 vt_ev.stop (display);
355 } 333 }
356 334
357 prepare_ev.stop (); 335 flush_ev.stop ();
358 pty_ev.stop (); 336 pty_ev.stop ();
359#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
361#endif 339#endif
362#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
379rxvt_term::destroy_cb (ev::idle &w, int revents) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
380{ 358{
381 make_current (); 359 make_current ();
382 360
383 delete this; 361 delete this;
362}
363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
384} 374}
385 375
386/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
387/* 377/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
402print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
403{ 393{
404 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
406 char number[32]; 396 char number[32];
407 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
417 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ); 409 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 411 }
422 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
423 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
424 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
425 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
426 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
427 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
428 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
429 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
430 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
431 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
432 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434 mesg, BUFSIZ); 424 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437 mesg, BUFSIZ); 427 mesg, BUFSIZ);
438 else 428 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440 mesg, BUFSIZ); 430 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 } 432 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ); 434 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446} 436}
447#endif 437#endif
448 438
449int 439int
472 DisplayString (display)); 462 DisplayString (display));
473 rxvt_emergency_cleanup (); 463 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
475} 465}
476 466
477/*----------------------------------------------------------------------*/
478bool
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 if (!init_vars ())
488 return false;
489
490 init_secondary ();
491
492 const char **cmd_argv = init_resources (argc, argv);
493
494#ifdef KEYSYM_RESOURCE
495 keyboard->register_done ();
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (option (Opt_scrollBar))
500 scrollBar.setIdle (); /* set existence for size calculations */
501#endif
502
503 pty = ptytty::create ();
504
505 create_windows (argc, argv);
506
507 init_xlocale ();
508
509 scr_reset (); // initialize screen
510
511#if 0
512 XSynchronize (dpy, True);
513#endif
514
515#ifdef HAVE_SCROLLBARS
516 if (option (Opt_scrollBar))
517 resize_scrollbar (); /* create and map scrollbar */
518#endif
519#ifdef HAVE_BG_PIXMAP
520 {
521 bgPixmap.set_target (this);
522
523#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent))
525 {
526 bgPixmap.set_transparent ();
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]);
535
536 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root);
539 }
540#endif
541
542#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL)
544 {
545 const char *p = rs[Rs_backgroundPixmap];
546
547 if ((p = strchr (p, ';')) != NULL)
548 {
549 p++;
550 bgPixmap.set_geometry (p);
551 }
552 else
553 bgPixmap.set_defaultGeometry ();
554
555 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556 if (!bgPixmap.window_position_sensitive ())
557 update_background ();
558 }
559#endif
560 }
561#endif
562
563#if ENABLE_PERL
564 rootwin_ev.start (display, display->root);
565#endif
566
567 set_colorfgbg ();
568
569 init_command (cmd_argv);
570
571 free (cmd_argv);
572
573 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ);
575
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580#if ENABLE_XEMBED
581 if (rs[Rs_embed])
582 {
583 long info[2] = { 0, XEMBED_MAPPED };
584
585 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586 32, PropModeReplace, (unsigned char *)&info, 2);
587 }
588#endif
589
590 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]);
592
593 return true;
594}
595
596static struct sig_handlers 467static struct sig_handlers
597{ 468{
598 ev::sig sw_term, sw_int; 469 ev::sig sw_term, sw_int;
599 470
600 /* 471 /*
615 rxvt_emergency_cleanup (); 486 rxvt_emergency_cleanup ();
616 w.stop (); 487 w.stop ();
617 kill (getpid (), w.signum); 488 kill (getpid (), w.signum);
618} 489}
619 490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
620char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
621 559
622void 560void
623rxvt_init () 561rxvt_init ()
624{ 562{
625 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
626 565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
627 if (!ev_default_loop (0)) 572 if (!ev_default_loop ())
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 574
630 rxvt_environ = environ; 575 rxvt_environ = environ;
631 576
632 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
633 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
634 579
635 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636 sig_handlers.sw_int.start (SIGINT); ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
637
638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
639 /* signal (SIGURG, SIG_DFL); */
640 582
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
644 586
645 XrmInitialize (); 587 XrmInitialize ();
646}
647
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682} 588}
683 589
684/*----------------------------------------------------------------------*/ 590/*----------------------------------------------------------------------*/
685/* 591/*
686 * window size/position calculations for XSizeHint and other storage. 592 * window size/position calculations for XSizeHint and other storage.
688 */ 594 */
689void 595void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 596rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 597{
692 short recalc_x, recalc_y; 598 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 599 int x, y, flags;
694 unsigned int w, h; 600 unsigned int w, h;
695 unsigned int max_width, max_height; 601 unsigned int max_width, max_height;
696 602
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 603 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 604 szHint.win_gravity = NorthWestGravity;
708 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 616
711 if (flags & WidthValue) 617 if (flags & WidthValue)
712 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 623 szHint.flags |= USSize;
715 } 624 }
716 625
717 if (flags & HeightValue) 626 if (flags & HeightValue)
718 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 632 szHint.flags |= USSize;
721 } 633 }
722 634
723 if (flags & XValue) 635 if (flags & XValue)
724 { 636 {
755 max_width = MAX_COLS * fwidth; 667 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 668 max_height = MAX_ROWS * fheight;
757 669
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 670 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 671
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 672 window_vt_x = window_vt_y = int_bwidth;
762 673
763 if (scrollBar.state) 674 if (scrollBar.state)
764 { 675 {
765 sb_w = scrollbar_TotalWidth (); 676 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 677 szHint.base_width += sb_w;
767 678
768 if (!option (Opt_scrollBar_right)) 679 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 680 window_vt_x += sb_w;
770 } 681 }
794 { 705 {
795 min_it (height, max_height); 706 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 707 szHint.height = szHint.base_height + height;
797 } 708 }
798 709
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 710 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 712
805 if (recalc_y) 713 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 715
808 ncol = width / fwidth; 716 ncol = width / fwidth;
809 nrow = height / fheight; 717 nrow = height / fheight;
810} 718}
811 719
812/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
813/* 721/*
824 732
825 ws.ws_col = ncol; 733 ws.ws_col = ncol;
826 ws.ws_row = nrow; 734 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 738
831#if 0 739#if 0
832 // TIOCSWINSZ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
864#endif 772#endif
865 773
866 delete fontset[0]; 774 delete fontset[0];
867 fontset[0] = fs; 775 fontset[0] = fs;
868 776
869 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
871 780
872 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
873 782
874 fwidth = prop.width; 783 fwidth = prop.width;
875 fheight = prop.height; 784 fheight = prop.height;
925 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
926 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
927} 836}
928 837
929void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
930rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
931{ 852{
932 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
933 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
934 855
944/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
945/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
946void 867void
947rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
948{ 869{
949 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
950#if ENABLE_EWMH 871#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
952#endif 873#endif
953} 874}
954 875
955void 876void
956rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
957{ 878{
958 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
959#if ENABLE_EWMH 880#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
961#endif 882#endif
962} 883}
963 884
964void 885void
965rxvt_term::set_window_color (int idx, const char *color) 886rxvt_term::set_window_color (int idx, const char *color)
966{ 887{
967#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 889 rxvt_color xcol;
969 int i;
970 890
971 if (color == NULL || *color == '\0') 891 if (color == NULL || *color == '\0')
972 return; 892 return;
973 893
974 color = strdup (color); 894 color = strdup (color);
976 rs[Rs_color + idx] = color; 896 rs[Rs_color + idx] = color;
977 897
978 /* handle color aliases */ 898 /* handle color aliases */
979 if (isdigit (*color)) 899 if (isdigit (*color))
980 { 900 {
981 i = atoi (color); 901 int i = atoi (color);
982 902
983 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
984 { 904 {
985 /* bright colors */ 905 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1043 strcpy (fstr, "default"); 963 strcpy (fstr, "default");
1044 strcpy (bstr, "default"); 964 strcpy (bstr, "default");
1045 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1046 if (pix_colors[Color_fg] == pix_colors[i]) 966 if (pix_colors[Color_fg] == pix_colors[i])
1047 { 967 {
1048 sprintf (fstr, "%d", (i - Color_Black)); 968 sprintf (fstr, "%d", i - Color_Black);
1049 break; 969 break;
1050 } 970 }
1051 971
1052 for (i = Color_Black; i <= Color_White; i++) 972 for (i = Color_Black; i <= Color_White; i++)
1053 if (pix_colors[Color_bg] == pix_colors[i]) 973 if (pix_colors[Color_bg] == pix_colors[i])
1054 { 974 {
1055 sprintf (bstr, "%d", (i - Color_Black)); 975 sprintf (bstr, "%d", i - Color_Black);
1056#ifdef BG_IMAGE_FROM_FILE 976#ifdef BG_IMAGE_FROM_FILE
1057 xpmb = "default;"; 977 xpmb = "default;";
1058#endif 978#endif
1059 break; 979 break;
1060 } 980 }
1090 int old_width = szHint.width; 1010 int old_width = szHint.width;
1091 int old_height = szHint.height; 1011 int old_height = szHint.height;
1092 1012
1093 window_calc (newwidth, newheight); 1013 window_calc (newwidth, newheight);
1094 1014
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1015 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1016
1017 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1018 if (set_hint)
1019 {
1020 szHint.flags &= ~(PBaseSize | PResizeInc);
1096 XSetWMNormalHints (dpy, parent[0], &szHint); 1021 XSetWMNormalHints (dpy, parent[0], &szHint);
1022 szHint.flags |= PBaseSize | PResizeInc;
1023 }
1097 1024
1098 if (!ignoreparent) 1025 if (!ignoreparent)
1099 { 1026 {
1100#ifdef SMART_RESIZE 1027#ifdef SMART_RESIZE
1101 /* 1028 /*
1141#else 1068#else
1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1069 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1143#endif 1070#endif
1144 } 1071 }
1145 1072
1073 if (set_hint)
1074 XSetWMNormalHints (dpy, parent[0], &szHint);
1075
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1076 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 1077
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 1078 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 1079 {
1150 if (scrollBar.state) 1080 if (scrollBar.state)
1151 { 1081 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 1082
1158 XMoveResizeWindow (dpy, vt, 1083 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 1084 window_vt_x, window_vt_y,
1160 width, height); 1085 width, height);
1161 1086
1162#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ()) 1088 if (bgPixmap.window_size_sensitive ())
1164 update_background (); 1089 update_background ();
1165#endif 1090#endif
1166
1167 scr_clear ();
1168 } 1091 }
1169 1092
1170 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
1171 scr_reset (); 1094 scr_reset ();
1172
1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1174 //scr_touch (false);
1175 1095
1176#ifdef HAVE_BG_PIXMAP 1096#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1097// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap) 1098// if (bgPixmap.pixmap)
1179// scr_touch (false); 1099// scr_touch (false);
1251 1171
1252/* Checking whether input method is running. */ 1172/* Checking whether input method is running. */
1253bool 1173bool
1254rxvt_term::IMisRunning () 1174rxvt_term::IMisRunning ()
1255{ 1175{
1256 char *p;
1257 Atom atom; 1176 Atom atom;
1258 Window win; 1177 Window win;
1259 char server[IMBUFSIZ]; 1178 char server[IMBUFSIZ];
1260 1179
1261 /* get current locale modifier */ 1180 /* get current locale modifier */
1262 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1181 if (char *p = XSetLocaleModifiers (0))
1263 { 1182 {
1264 strcpy (server, "@server="); 1183 strcpy (server, "@server=");
1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1184 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1266 1185
1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1186 if (p = strchr (server + 1, '@')) /* first one only */
1268 *p = '\0'; 1187 *p = '\0';
1269 1188
1270 atom = XInternAtom (dpy, server, False); 1189 atom = XInternAtom (dpy, server, False);
1271 win = XGetSelectionOwner (dpy, atom); 1190 win = XGetSelectionOwner (dpy, atom);
1272 1191
1339 1258
1340 term->make_current (); 1259 term->make_current ();
1341 1260
1342 if (text) 1261 if (text)
1343 { 1262 {
1344 void *str; 1263 wchar_t *str;
1345 1264
1346 if (!text->encoding_is_wchar && text->string.multi_byte) 1265 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 { 1266 {
1348 // of course, X makes it ugly again 1267 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale]) 1268 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]); 1269 SET_LOCALE (term->rs[Rs_imLocale]);
1351 1270
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1271 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1272 mbstowcs (str, text->string.multi_byte, text->length + 1);
1354 1273
1355 if (term->rs[Rs_imLocale]) 1274 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale); 1275 SET_LOCALE (term->locale);
1357 } 1276 }
1358 else 1277 else
1359 str = (void *)text->string.wide_char; 1278 str = text->string.wide_char;
1360 1279
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1280 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret, 1281 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first, 1282 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length, 1283 DT_INT, call_data->chg_length,
1718void 1637void
1719rxvt_term::get_window_origin (int &x, int &y) 1638rxvt_term::get_window_origin (int &x, int &y)
1720{ 1639{
1721 Window cr; 1640 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724} 1642}
1725 1643
1726Pixmap 1644Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1645rxvt_term::get_pixmap_property (Atom property)
1728{ 1646{
1729 if (prop_id > 0 && prop_id < NUM_XA) 1647 Pixmap pixmap = None;
1730 if (xa[prop_id]) 1648
1731 {
1732 int aformat; 1649 int aformat;
1733 unsigned long nitems, bytes_after; 1650 unsigned long nitems, bytes_after;
1734 Atom atype; 1651 Atom atype;
1735 unsigned char *prop = NULL; 1652 unsigned char *prop;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1653 int result = XGetWindowProperty (dpy, display->root, property,
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1654 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1655 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1656 if (result == Success)
1740 { 1657 {
1741 return *(Pixmap *)prop; 1658 if (atype == XA_PIXMAP)
1742 } 1659 pixmap = *(Pixmap *)prop;
1660 XFree (prop);
1743 } 1661 }
1744 return None; 1662
1663 return pixmap;
1745} 1664}
1746 1665
1747#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756 1667
1757int 1668void
1758rxvt_term::update_background () 1669rxvt_term::update_background ()
1759{ 1670{
1671 if (update_background_ev.is_active ())
1672 return;
1673
1760 bgPixmap.invalidate (); 1674 bgPixmap.invalidate ();
1761 1675
1762 /* no chance of real time refresh if we are blurring! */ 1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1677
1678 if (to_wait <= 0.)
1764 bgPixmap.render (); 1679 bgPixmap.render ();
1765 else 1680 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1681 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1682}
1779 1683
1780void 1684void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1685rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1686{
1687 make_current ();
1688
1689 update_background_ev.stop ();
1783 bgPixmap.render (); 1690 bgPixmap.render ();
1691 refresh_check ();
1784} 1692}
1785 1693
1786#endif /* HAVE_BG_PIXMAP */ 1694#endif /* HAVE_BG_PIXMAP */
1787 1695
1788/*----------------------- end-of-file (C source) -----------------------*/ 1696/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines