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.272 by root, Tue Dec 11 03:30:49 2007 UTC vs.
Revision 1.344 by root, Fri Jan 7 21:17:08 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#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
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 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 97{
97 compose_char *cc; 98 compose_char *cc;
98 99
99 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 102 cc = (*this)[c1];
102 while (cc) 103 while (cc)
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 }
114 113
115 // allocate a new combination 114 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 116 {
118 static int seen; 117 static int seen;
119 118
120 if (!seen++) 119 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 121
123 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
124 } 123 }
125 124
126 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
157{ 156{
158#if HAVE_BG_PIXMAP 157#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 159#endif
161#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 162#endif
164#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 165#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 168#endif
170#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
… …
172#endif 171#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 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);
175#endif 174#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
178#endif 177#endif
179#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif
182#ifdef USE_XIM 179#ifdef USE_XIM
183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
184#endif 181#endif
185#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
187#endif 184#endif
188#ifndef NO_BELL 185#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 187#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
229 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
230 delete fontset[i]; 226 delete fontset[i];
231#endif 227#endif
232 delete fontset[0]; 228 delete fontset[0];
233 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
234 if (display) 240 if (display)
235 { 241 {
236 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
237 244
238#ifdef USE_XIM 245#ifdef USE_XIM
239 im_destroy (); 246 im_destroy ();
240#endif 247#endif
241#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 249 if (gc) XFreeGC (dpy, gc);
266 250
267 delete drawable; 251 delete drawable;
268 // destroy all windows 252 // destroy all windows
269 if (parent[0]) 253 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
278#endif 262#endif
279 } 263 }
280 264
281 clear (); 265 clear ();
282 }
283 266
284 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 268 displays.put (display);
269 }
293 270
294 scr_release (); 271 scr_release ();
295 272
296 /* clear all resources */ 273 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 275 free (allocated [i]);
299 276
300 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
301 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
302 free (env_display); 280 free (env_display);
303 free (env_term); 281 free (env_term);
304 free (locale); 282 free (locale);
305 free (v_buffer); 283 free (v_buffer);
… …
329} 307}
330 308
331void 309void
332rxvt_term::destroy () 310rxvt_term::destroy ()
333{ 311{
334 if (ev_is_active (&destroy_ev)) 312 if (destroy_ev.is_active ())
335 return; 313 return;
336 314
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 316
339#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
343 if (display) 321 if (display)
344 { 322 {
345#if USE_XIM 323#if USE_XIM
346 im_ev.stop (display); 324 im_ev.stop (display);
347#endif 325#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
350#endif
351#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
353#endif 329#endif
354 incr_ev.stop (); 330 incr_ev.stop ();
355 termwin_ev.stop (display); 331 termwin_ev.stop (display);
356 vt_ev.stop (display); 332 vt_ev.stop (display);
357 } 333 }
358 334
359 prepare_ev.stop (); 335 flush_ev.stop ();
360 pty_ev.stop (); 336 pty_ev.stop ();
361#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
363#endif 339#endif
364#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
381rxvt_term::destroy_cb (ev::idle &w, int revents) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
382{ 358{
383 make_current (); 359 make_current ();
384 360
385 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);
386} 374}
387 375
388/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
389/* 377/*
390 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
404print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
405{ 393{
406 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
407 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
408 char number[32]; 396 char number[32];
409 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
410 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
411 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
412 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");
413 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
416 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
419 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
421 mesg, BUFSIZ); 409 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
423 } 411 }
424 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
425 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
426 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
427 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
428 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
429 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
430 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
431 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
432 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
433 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
434 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
436 mesg, BUFSIZ); 424 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
439 mesg, BUFSIZ); 427 mesg, BUFSIZ);
440 else 428 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
442 mesg, BUFSIZ); 430 mesg, BUFSIZ);
443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
444 } 432 }
445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
446 mesg, BUFSIZ); 434 mesg, BUFSIZ);
447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
448} 436}
449#endif 437#endif
450 438
451int 439int
… …
474 DisplayString (display)); 462 DisplayString (display));
475 rxvt_emergency_cleanup (); 463 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
477} 465}
478 466
479/*----------------------------------------------------------------------*/
480bool
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{
483 this->envv = envv;
484
485 SET_R (this);
486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
488
489 if (!init_vars ())
490 return false;
491
492 init_secondary ();
493
494 const char **cmd_argv = init_resources (argc, argv);
495
496#ifdef KEYSYM_RESOURCE
497 keyboard->register_done ();
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
568
569 set_colorfgbg ();
570
571 init_command (cmd_argv);
572
573 free (cmd_argv);
574
575 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ);
577
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
595 return true;
596}
597
598static struct sig_handlers 467static struct sig_handlers
599{ 468{
600 ev::sig sw_term, sw_int; 469 ev::sig sw_term, sw_int;
601 470
602 /* 471 /*
… …
617 rxvt_emergency_cleanup (); 486 rxvt_emergency_cleanup ();
618 w.stop (); 487 w.stop ();
619 kill (getpid (), w.signum); 488 kill (getpid (), w.signum);
620} 489}
621 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
622char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
623 559
624void 560void
625rxvt_init () 561rxvt_init ()
626{ 562{
627 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))));
628 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
629 if (!ev_default_loop (0)) 572 if (!ev_default_loop ())
630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
631 574
632 rxvt_environ = environ; 575 rxvt_environ = environ;
633 576
634 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
635 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
636 579
637 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
638 sig_handlers.sw_int.start (SIGINT); ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
639
640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
641 /* signal (SIGURG, SIG_DFL); */
642 582
643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
644 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
645 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
646 586
647 XrmInitialize (); 587 XrmInitialize ();
648}
649
650/* ------------------------------------------------------------------------- *
651 * MEMORY ALLOCATION WRAPPERS *
652 * ------------------------------------------------------------------------- */
653void *
654rxvt_malloc (size_t size)
655{
656 void *p = malloc (size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_calloc (size_t number, size_t size)
666{
667 void *p = calloc (number, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673}
674
675void *
676rxvt_realloc (void *ptr, size_t size)
677{
678 void *p = realloc (ptr, size);
679
680 if (!p)
681 rxvt_fatal ("memory allocation failure. aborting.\n");
682
683 return p;
684} 588}
685 589
686/*----------------------------------------------------------------------*/ 590/*----------------------------------------------------------------------*/
687/* 591/*
688 * window size/position calculations for XSizeHint and other storage. 592 * window size/position calculations for XSizeHint and other storage.
… …
690 */ 594 */
691void 595void
692rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 596rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 597{
694 short recalc_x, recalc_y; 598 short recalc_x, recalc_y;
695 int x, y, sb_w, flags; 599 int x, y, flags;
696 unsigned int w, h; 600 unsigned int w, h;
697 unsigned int max_width, max_height; 601 unsigned int max_width, max_height;
698 602
699 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 603 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
700 szHint.win_gravity = NorthWestGravity; 604 szHint.win_gravity = NorthWestGravity;
… …
710 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
711 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
712 616
713 if (flags & WidthValue) 617 if (flags & WidthValue)
714 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
715 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
716 szHint.flags |= USSize; 623 szHint.flags |= USSize;
717 } 624 }
718 625
719 if (flags & HeightValue) 626 if (flags & HeightValue)
720 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
721 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 632 szHint.flags |= USSize;
723 } 633 }
724 634
725 if (flags & XValue) 635 if (flags & XValue)
726 { 636 {
… …
757 max_width = MAX_COLS * fwidth; 667 max_width = MAX_COLS * fwidth;
758 max_height = MAX_ROWS * fheight; 668 max_height = MAX_ROWS * fheight;
759 669
760 szHint.base_width = szHint.base_height = 2 * int_bwidth; 670 szHint.base_width = szHint.base_height = 2 * int_bwidth;
761 671
762 sb_w = 0;
763 window_vt_x = window_vt_y = int_bwidth; 672 window_vt_x = window_vt_y = int_bwidth;
764 673
765 if (scrollBar.state) 674 if (scrollBar.state)
766 { 675 {
767 sb_w = scrollbar_TotalWidth (); 676 int sb_w = scrollBar.total_width ();
768 szHint.base_width += sb_w; 677 szHint.base_width += sb_w;
769 678
770 if (!option (Opt_scrollBar_right)) 679 if (!option (Opt_scrollBar_right))
771 window_vt_x += sb_w; 680 window_vt_x += sb_w;
772 } 681 }
… …
796 { 705 {
797 min_it (height, max_height); 706 min_it (height, max_height);
798 szHint.height = szHint.base_height + height; 707 szHint.height = szHint.base_height + height;
799 } 708 }
800 709
801 if (scrollBar.state && option (Opt_scrollBar_right))
802 window_sb_x = szHint.width - sb_w;
803
804 if (recalc_x) 710 if (recalc_x)
805 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
806 712
807 if (recalc_y) 713 if (recalc_y)
808 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
809 715
810 ncol = width / fwidth; 716 ncol = width / fwidth;
811 nrow = height / fheight; 717 nrow = height / fheight;
812} 718}
813 719
814/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
815/* 721/*
… …
826 732
827 ws.ws_col = ncol; 733 ws.ws_col = ncol;
828 ws.ws_row = nrow; 734 ws.ws_row = nrow;
829 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
830 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
832 738
833#if 0 739#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
837#endif 743#endif
838} 744}
839 745
… …
866#endif 772#endif
867 773
868 delete fontset[0]; 774 delete fontset[0];
869 fontset[0] = fs; 775 fontset[0] = fs;
870 776
871 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
872 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
873 780
874 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
875 782
876 fwidth = prop.width; 783 fwidth = prop.width;
877 fheight = prop.height; 784 fheight = prop.height;
… …
927 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
928 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
929} 836}
930 837
931void 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
932rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
933{ 852{
934 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
935 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
936 855
… …
946/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
947/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
948void 867void
949rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
950{ 869{
951 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
952#if ENABLE_EWMH 871#if ENABLE_EWMH
953 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
954#endif 873#endif
955} 874}
956 875
957void 876void
958rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
959{ 878{
960 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
961#if ENABLE_EWMH 880#if ENABLE_EWMH
962 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
963#endif 882#endif
964} 883}
965 884
966void 885void
967rxvt_term::set_window_color (int idx, const char *color) 886rxvt_term::set_window_color (int idx, const char *color)
968{ 887{
969#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
970 rxvt_color xcol; 889 rxvt_color xcol;
971 int i;
972 890
973 if (color == NULL || *color == '\0') 891 if (color == NULL || *color == '\0')
974 return; 892 return;
975 893
976 color = strdup (color); 894 color = strdup (color);
… …
978 rs[Rs_color + idx] = color; 896 rs[Rs_color + idx] = color;
979 897
980 /* handle color aliases */ 898 /* handle color aliases */
981 if (isdigit (*color)) 899 if (isdigit (*color))
982 { 900 {
983 i = atoi (color); 901 int i = atoi (color);
984 902
985 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
986 { 904 {
987 /* bright colors */ 905 /* bright colors */
988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1092 int old_width = szHint.width; 1010 int old_width = szHint.width;
1093 int old_height = szHint.height; 1011 int old_height = szHint.height;
1094 1012
1095 window_calc (newwidth, newheight); 1013 window_calc (newwidth, newheight);
1096 1014
1097 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);
1098 XSetWMNormalHints (dpy, parent[0], &szHint); 1021 XSetWMNormalHints (dpy, parent[0], &szHint);
1022 szHint.flags |= PBaseSize | PResizeInc;
1023 }
1099 1024
1100 if (!ignoreparent) 1025 if (!ignoreparent)
1101 { 1026 {
1102#ifdef SMART_RESIZE 1027#ifdef SMART_RESIZE
1103 /* 1028 /*
… …
1143#else 1068#else
1144 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1069 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1145#endif 1070#endif
1146 } 1071 }
1147 1072
1073 if (set_hint)
1074 XSetWMNormalHints (dpy, parent[0], &szHint);
1075
1148 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1076 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1149 1077
1150 if (fix_screen || newwidth != old_width || newheight != old_height) 1078 if (fix_screen || newwidth != old_width || newheight != old_height)
1151 { 1079 {
1152 if (scrollBar.state) 1080 if (scrollBar.state)
1153 { 1081 scrollBar.resize ();
1154 XMoveResizeWindow (dpy, scrollBar.win,
1155 window_sb_x, 0,
1156 scrollbar_TotalWidth (), szHint.height);
1157 resize_scrollbar ();
1158 }
1159 1082
1160 XMoveResizeWindow (dpy, vt, 1083 XMoveResizeWindow (dpy, vt,
1161 window_vt_x, window_vt_y, 1084 window_vt_x, window_vt_y,
1162 width, height); 1085 width, height);
1163 1086
1164#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
1165 if (bgPixmap.window_size_sensitive ()) 1088 if (bgPixmap.window_size_sensitive ())
1166 update_background (); 1089 update_background ();
1167#endif 1090#endif
1168
1169 scr_clear ();
1170 } 1091 }
1171 1092
1172 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
1173 scr_reset (); 1094 scr_reset ();
1174
1175 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1176 //scr_touch (false);
1177 1095
1178#ifdef HAVE_BG_PIXMAP 1096#ifdef HAVE_BG_PIXMAP
1179// 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 ?
1180// if (bgPixmap.pixmap) 1098// if (bgPixmap.pixmap)
1181// scr_touch (false); 1099// scr_touch (false);
… …
1253 1171
1254/* Checking whether input method is running. */ 1172/* Checking whether input method is running. */
1255bool 1173bool
1256rxvt_term::IMisRunning () 1174rxvt_term::IMisRunning ()
1257{ 1175{
1258 char *p;
1259 Atom atom; 1176 Atom atom;
1260 Window win; 1177 Window win;
1261 char server[IMBUFSIZ]; 1178 char server[IMBUFSIZ];
1262 1179
1263 /* get current locale modifier */ 1180 /* get current locale modifier */
1264 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1181 if (char *p = XSetLocaleModifiers (0))
1265 { 1182 {
1266 strcpy (server, "@server="); 1183 strcpy (server, "@server=");
1267 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1184 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1268 1185
1269 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1186 if (p = strchr (server + 1, '@')) /* first one only */
1270 *p = '\0'; 1187 *p = '\0';
1271 1188
1272 atom = XInternAtom (dpy, server, False); 1189 atom = XInternAtom (dpy, server, False);
1273 win = XGetSelectionOwner (dpy, atom); 1190 win = XGetSelectionOwner (dpy, atom);
1274 1191
… …
1341 1258
1342 term->make_current (); 1259 term->make_current ();
1343 1260
1344 if (text) 1261 if (text)
1345 { 1262 {
1346 void *str; 1263 wchar_t *str;
1347 1264
1348 if (!text->encoding_is_wchar && text->string.multi_byte) 1265 if (!text->encoding_is_wchar && text->string.multi_byte)
1349 { 1266 {
1350 // of course, X makes it ugly again 1267 // of course, X makes it ugly again
1351 if (term->rs[Rs_imLocale]) 1268 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->rs[Rs_imLocale]); 1269 SET_LOCALE (term->rs[Rs_imLocale]);
1353 1270
1354 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1271 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1355 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1272 mbstowcs (str, text->string.multi_byte, text->length + 1);
1356 1273
1357 if (term->rs[Rs_imLocale]) 1274 if (term->rs[Rs_imLocale])
1358 SET_LOCALE (term->locale); 1275 SET_LOCALE (term->locale);
1359 } 1276 }
1360 else 1277 else
1361 str = (void *)text->string.wide_char; 1278 str = text->string.wide_char;
1362 1279
1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1280 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1364 DT_INT, call_data->caret, 1281 DT_INT, call_data->caret,
1365 DT_INT, call_data->chg_first, 1282 DT_INT, call_data->chg_first,
1366 DT_INT, call_data->chg_length, 1283 DT_INT, call_data->chg_length,
… …
1720void 1637void
1721rxvt_term::get_window_origin (int &x, int &y) 1638rxvt_term::get_window_origin (int &x, int &y)
1722{ 1639{
1723 Window cr; 1640 Window cr;
1724 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1725/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1726} 1642}
1727 1643
1728Pixmap 1644Pixmap
1729rxvt_term::get_pixmap_property (int prop_id) 1645rxvt_term::get_pixmap_property (Atom property)
1730{ 1646{
1731 if (prop_id > 0 && prop_id < NUM_XA) 1647 Pixmap pixmap = None;
1732 if (xa[prop_id]) 1648
1733 {
1734 int aformat; 1649 int aformat;
1735 unsigned long nitems, bytes_after; 1650 unsigned long nitems, bytes_after;
1736 Atom atype; 1651 Atom atype;
1737 unsigned char *prop = NULL; 1652 unsigned char *prop;
1738 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1653 int result = XGetWindowProperty (dpy, display->root, property,
1739 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1654 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1740 &nitems, &bytes_after, &prop); 1655 &nitems, &bytes_after, &prop);
1741 if (result == Success && prop && atype == XA_PIXMAP) 1656 if (result == Success)
1742 { 1657 {
1743 return *(Pixmap *)prop; 1658 if (atype == XA_PIXMAP)
1744 } 1659 pixmap = *(Pixmap *)prop;
1660 XFree (prop);
1745 } 1661 }
1746 return None; 1662
1663 return pixmap;
1747} 1664}
1748 1665
1749#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP
1750# if TRACE_PIXMAPS
1751# undef update_background
1752int rxvt_term::trace_update_background (const char *file, int line)
1753{
1754 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1755 update_background ();
1756}
1757# endif
1758 1667
1759int 1668void
1760rxvt_term::update_background () 1669rxvt_term::update_background ()
1761{ 1670{
1671 if (update_background_ev.is_active ())
1672 return;
1673
1762 bgPixmap.invalidate (); 1674 bgPixmap.invalidate ();
1763 1675
1764 /* no chance of real time refresh if we are blurring! */ 1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1677
1678 if (to_wait <= 0.)
1766 bgPixmap.render (); 1679 bgPixmap.render ();
1767 else 1680 else
1768 {
1769 update_background_ev.stop ();
1770
1771 if (!bgPixmap.need_client_side_rendering())
1772 update_background_ev.start (.05); 1681 update_background_ev.start (to_wait);
1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1774 update_background_ev.start (.20); /* very slow !!! */
1775 else
1776 update_background_ev.start (.07);
1777 }
1778
1779 return 0;
1780} 1682}
1781 1683
1782void 1684void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1685rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1686{
1687 make_current ();
1688
1689 update_background_ev.stop ();
1785 bgPixmap.render (); 1690 bgPixmap.render ();
1691 refresh_check ();
1786} 1692}
1787 1693
1788#endif /* HAVE_BG_PIXMAP */ 1694#endif /* HAVE_BG_PIXMAP */
1789 1695
1790/*----------------------- end-of-file (C source) -----------------------*/ 1696/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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