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.256 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.335 by root, Sun Oct 24 17:52:50 2010 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-2008 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
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 {
111 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
113 } 114 }
152 153
153} 154}
154#endif 155#endif
155 156
156rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
157 : 158{
159#if HAVE_BG_PIXMAP
160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 179#endif
161#if HAVE_BG_PIXMAP 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 181#ifdef USE_XIM
163#endif 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 183#endif
182#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 186#endif
188#ifndef NO_BELL 187#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 189#endif
191 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 197
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 199
202 termlist.push_back (this); 200 termlist.push_back (this);
203 201
204#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
229 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
230 delete fontset[i]; 228 delete fontset[i];
231#endif 229#endif
232 delete fontset[0]; 230 delete fontset[0];
233 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
234 if (display) 242 if (display)
235 { 243 {
236 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
237 246
238#ifdef USE_XIM 247#ifdef USE_XIM
239 im_destroy (); 248 im_destroy ();
240#endif 249#endif
241#ifdef XTERM_SCROLLBAR 250 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); 251 if (gc) XFreeGC (dpy, gc);
266 252
267 delete drawable; 253 delete drawable;
268 // destroy all windows 254 // destroy all windows
269 if (parent[0]) 255 if (parent[0])
277 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
278#endif 264#endif
279 } 265 }
280 266
281 clear (); 267 clear ();
282 }
283 268
284 delete [] pix_colors_focused; 269 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 displays.put (display); 270 displays.put (display);
271 }
290 272
291 scr_release (); 273 scr_release ();
292 274
293 /* clear all resources */ 275 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
295 free (allocated [i]); 277 free (allocated [i]);
296 278
297 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
298 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
299 free (env_display); 282 free (env_display);
300 free (env_term); 283 free (env_term);
301 free (locale); 284 free (locale);
302 free (v_buffer); 285 free (v_buffer);
306 delete argv; 289 delete argv;
307 290
308#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
309 delete keyboard; 292 delete keyboard;
310#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
311} 297}
312 298
313// child has exited, usually destroys 299// child has exited, usually destroys
314void 300void
315rxvt_term::child_cb (ev::child &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
323} 309}
324 310
325void 311void
326rxvt_term::destroy () 312rxvt_term::destroy ()
327{ 313{
328 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
329 return; 315 return;
330 316
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 318
333#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
337 if (display) 323 if (display)
338 { 324 {
339#if USE_XIM 325#if USE_XIM
340 im_ev.stop (display); 326 im_ev.stop (display);
341#endif 327#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
347#endif 331#endif
348 incr_ev.stop (); 332 incr_ev.stop ();
349 termwin_ev.stop (display); 333 termwin_ev.stop (display);
350 vt_ev.stop (display); 334 vt_ev.stop (display);
351 } 335 }
352 336
353 prepare_ev.stop (); 337 flush_ev.stop ();
354 pty_ev.stop (); 338 pty_ev.stop ();
355#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
357#endif 341#endif
358#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
370 354
371 destroy_ev.start (); 355 destroy_ev.start ();
372} 356}
373 357
374void 358void
375rxvt_term::destroy_cb (ev::check &w, int revents) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 360{
377 make_current (); 361 make_current ();
378 362
379 delete this; 363 delete this;
380} 364}
401 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
402 char number[32]; 386 char number[32];
403 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 399 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 401 }
418 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 414 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 417 mesg, BUFSIZ);
434 else 418 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 420 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 422 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 424 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 426}
443#endif 427#endif
444 428
445int 429int
468 DisplayString (display)); 452 DisplayString (display));
469 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
471} 455}
472 456
473/*----------------------------------------------------------------------*/
474bool
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 if (!init_vars ())
484 return false;
485
486 init_secondary ();
487
488 const char **cmd_argv = init_resources (argc, argv);
489
490#ifdef KEYSYM_RESOURCE
491 keyboard->register_done ();
492#endif
493
494#ifdef HAVE_SCROLLBARS
495 if (option (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */
497#endif
498
499 pty = ptytty::create ();
500
501 create_windows (argc, argv);
502
503 init_xlocale ();
504
505 scr_reset (); // initialize screen
506
507#if 0
508 XSynchronize (dpy, True);
509#endif
510
511#ifdef HAVE_SCROLLBARS
512 if (option (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */
514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
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] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
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 prepare_ev.start ();
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 return true;
590}
591
592static struct sig_handlers 457static struct sig_handlers
593{ 458{
594 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
595 460
596 /* 461 /*
597 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
598 */ 463 */
599 void
600 sig_term (ev::sig &w, int revents) 464 void sig_term (ev::sig &w, int revents);
465
466 sig_handlers ()
601 { 467 {
602 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 w.stop ();
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 470 }
612} sig_handlers; 471} sig_handlers;
613 472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516
517# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1;
519# endif
520# if VTIME != VEOL
521 tio->c_cc[VTIME] = 0;
522# endif
523
524 /* input modes */
525 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
526# ifdef IMAXBEL
527 | IMAXBEL
528# endif
529 | IXON);
530
531 /* output modes */
532 tio->c_oflag = (OPOST | ONLCR);
533
534 /* control modes */
535 tio->c_cflag = (CS8 | CREAD);
536
537 /* local modes */
538 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
539# if defined (ECHOCTL) && defined (ECHOKE)
540 | ECHOCTL | ECHOKE
541# endif
542 | ECHOE | ECHOK);
543}
544
614char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
615 546
616void 547void
617rxvt_init () 548rxvt_init ()
618{ 549{
619 ptytty::init (); 550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
552
553 rxvt_get_ttymode (&rxvt_term::def_tio);
554
555 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
620 ev::ev_default_loop (0); 559 if (!ev_default_loop ())
560 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 561
622 rxvt_environ = environ; 562 rxvt_environ = environ;
623 563
624 signal (SIGHUP, SIG_IGN); 564 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 565 signal (SIGPIPE, SIG_IGN);
626 566
627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 567 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 568 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */
632 569
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
634 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
635 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
636 573
637 XrmInitialize (); 574 XrmInitialize ();
638}
639
640/* ------------------------------------------------------------------------- *
641 * MEMORY ALLOCATION WRAPPERS *
642 * ------------------------------------------------------------------------- */
643void *
644rxvt_malloc (size_t size)
645{
646 void *p = malloc (size);
647
648 if (!p)
649 rxvt_fatal ("memory allocation failure. aborting.\n");
650
651 return p;
652}
653
654void *
655rxvt_calloc (size_t number, size_t size)
656{
657 void *p = calloc (number, size);
658
659 if (!p)
660 rxvt_fatal ("memory allocation failure. aborting.\n");
661
662 return p;
663}
664
665void *
666rxvt_realloc (void *ptr, size_t size)
667{
668 void *p = realloc (ptr, size);
669
670 if (!p)
671 rxvt_fatal ("memory allocation failure. aborting.\n");
672
673 return p;
674} 575}
675 576
676/*----------------------------------------------------------------------*/ 577/*----------------------------------------------------------------------*/
677/* 578/*
678 * window size/position calculations for XSizeHint and other storage. 579 * window size/position calculations for XSizeHint and other storage.
680 */ 581 */
681void 582void
682rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 583rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
683{ 584{
684 short recalc_x, recalc_y; 585 short recalc_x, recalc_y;
685 int x, y, sb_w, flags; 586 int x, y, flags;
686 unsigned int w, h; 587 unsigned int w, h;
687 unsigned int max_width, max_height; 588 unsigned int max_width, max_height;
688 589
689 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 590 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
690 szHint.win_gravity = NorthWestGravity; 591 szHint.win_gravity = NorthWestGravity;
700 if (rs[Rs_geometry]) 601 if (rs[Rs_geometry])
701 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 602 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
702 603
703 if (flags & WidthValue) 604 if (flags & WidthValue)
704 { 605 {
606 if (!w)
607 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
608
705 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 609 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
706 szHint.flags |= USSize; 610 szHint.flags |= USSize;
707 } 611 }
708 612
709 if (flags & HeightValue) 613 if (flags & HeightValue)
710 { 614 {
615 if (!h)
616 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
617
711 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 618 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
712 szHint.flags |= USSize; 619 szHint.flags |= USSize;
713 } 620 }
714 621
715 if (flags & XValue) 622 if (flags & XValue)
716 { 623 {
747 max_width = MAX_COLS * fwidth; 654 max_width = MAX_COLS * fwidth;
748 max_height = MAX_ROWS * fheight; 655 max_height = MAX_ROWS * fheight;
749 656
750 szHint.base_width = szHint.base_height = 2 * int_bwidth; 657 szHint.base_width = szHint.base_height = 2 * int_bwidth;
751 658
752 sb_w = 0;
753 window_vt_x = window_vt_y = int_bwidth; 659 window_vt_x = window_vt_y = int_bwidth;
754 660
755 if (scrollBar.state) 661 if (scrollBar.state)
756 { 662 {
757 sb_w = scrollbar_TotalWidth (); 663 int sb_w = scrollBar.total_width ();
758 szHint.base_width += sb_w; 664 szHint.base_width += sb_w;
759 665
760 if (!option (Opt_scrollBar_right)) 666 if (!option (Opt_scrollBar_right))
761 window_vt_x += sb_w; 667 window_vt_x += sb_w;
762 } 668 }
786 { 692 {
787 min_it (height, max_height); 693 min_it (height, max_height);
788 szHint.height = szHint.base_height + height; 694 szHint.height = szHint.base_height + height;
789 } 695 }
790 696
791 if (scrollBar.state && option (Opt_scrollBar_right))
792 window_sb_x = szHint.width - sb_w;
793
794 if (recalc_x) 697 if (recalc_x)
795 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 698 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
796 699
797 if (recalc_y) 700 if (recalc_y)
798 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
799 702
800 ncol = width / fwidth; 703 ncol = width / fwidth;
801 nrow = height / fheight; 704 nrow = height / fheight;
802} 705}
803 706
804/*----------------------------------------------------------------------*/ 707/*----------------------------------------------------------------------*/
805/* 708/*
816 719
817 ws.ws_col = ncol; 720 ws.ws_col = ncol;
818 ws.ws_row = nrow; 721 ws.ws_row = nrow;
819 ws.ws_xpixel = width; 722 ws.ws_xpixel = width;
820 ws.ws_ypixel = height; 723 ws.ws_ypixel = height;
821 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 724 ioctl (pty->pty, TIOCSWINSZ, &ws);
822 725
823#if 0 726#if 0
824 // TIOCSWINSZ is supposed to do this automatically and correctly 727 // TIOCSWINSZ is supposed to do this automatically and correctly
825 if (cmd_pid) /* force through to the command */ 728 if (cmd_pid) /* force through to the command */
826 kill (-cmd_pid, SIGWINCH); 729 kill (-cmd_pid, SIGWINCH);
827#endif 730#endif
828} 731}
829 732
856#endif 759#endif
857 760
858 delete fontset[0]; 761 delete fontset[0];
859 fontset[0] = fs; 762 fontset[0] = fs;
860 763
861 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
862 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
863 767
864 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
865 769
866 fwidth = prop.width; 770 fwidth = prop.width;
867 fheight = prop.height; 771 fheight = prop.height;
917 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
918 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
919} 823}
920 824
921void 825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent[0], &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
922rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
923{ 839{
924 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
925 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
926 842
936/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
937/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
938void 854void
939rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
940{ 856{
941 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
942#if ENABLE_EWMH 858#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
944#endif 860#endif
945} 861}
946 862
947void 863void
948rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
949{ 865{
950 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
951#if ENABLE_EWMH 867#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
953#endif 869#endif
954} 870}
955 871
956void 872void
957rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
958{ 874{
959#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
960 rxvt_color xcol; 876 rxvt_color xcol;
961 int i;
962 877
963 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
964 return; 879 return;
965 880
966 color = strdup (color); 881 color = strdup (color);
968 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
969 884
970 /* handle color aliases */ 885 /* handle color aliases */
971 if (isdigit (*color)) 886 if (isdigit (*color))
972 { 887 {
973 i = atoi (color); 888 int i = atoi (color);
974 889
975 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
891 {
976 { /* bright colors */ 892 /* bright colors */
977 i -= 8;
978 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
979 goto done; 894 goto done;
980 } 895 }
981 896
982 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
898 {
983 { /* normal colors */ 899 /* normal colors */
984 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985 goto done; 901 goto done;
986 } 902 }
987 } 903 }
988 904
993 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
994 */ 910 */
995 911
996 pix_colors_focused[idx] = xcol; 912 pix_colors_focused[idx] = xcol;
997 913
998 /* XSetWindowAttributes attr; */
999 /* Cursor cursor; */
1000done: 914done:
1001 /*TODO: handle Color_BD, scrollbar background, etc. */ 915 /*TODO: handle Color_BD, scrollbar background, etc. */
1002 916
1003 update_fade_color (idx); 917 update_fade_color (idx);
1004 recolour_cursor (); 918 recolour_cursor ();
1005 scr_recolour (); 919 scr_recolour ();
1006#endif /* XTERM_COLOR_CHANGE */ 920#endif /* XTERM_COLOR_CHANGE */
1007} 921}
1008 922
1009void 923void
1010rxvt_term::recolour_cursor () 924rxvt_term::recolour_cursor ()
1011{ 925{
1028 */ 942 */
1029void 943void
1030rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
1031{ 945{
1032 unsigned int i; 946 unsigned int i;
1033 const char *xpmb = "\0"; 947 const char *xpmb = "";
1034 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1035 949
1036 strcpy (fstr, "default"); 950 strcpy (fstr, "default");
1037 strcpy (bstr, "default"); 951 strcpy (bstr, "default");
1038 for (i = Color_Black; i <= Color_White; i++) 952 for (i = Color_Black; i <= Color_White; i++)
1083 int old_width = szHint.width; 997 int old_width = szHint.width;
1084 int old_height = szHint.height; 998 int old_height = szHint.height;
1085 999
1086 window_calc (newwidth, newheight); 1000 window_calc (newwidth, newheight);
1087 1001
1088 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1002 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1003
1004 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1005 if (set_hint)
1006 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc);
1089 XSetWMNormalHints (dpy, parent[0], &szHint); 1008 XSetWMNormalHints (dpy, parent[0], &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc;
1010 }
1090 1011
1091 if (!ignoreparent) 1012 if (!ignoreparent)
1092 { 1013 {
1093#ifdef SMART_RESIZE 1014#ifdef SMART_RESIZE
1094 /* 1015 /*
1134#else 1055#else
1135 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1136#endif 1057#endif
1137 } 1058 }
1138 1059
1060 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint);
1062
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1064
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1065 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1066 {
1143 if (scrollBar.state) 1067 if (scrollBar.state)
1144 { 1068 scrollBar.resize ();
1145 XMoveResizeWindow (dpy, scrollBar.win,
1146 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar ();
1149 }
1150 1069
1151 XMoveResizeWindow (dpy, vt, 1070 XMoveResizeWindow (dpy, vt,
1152 window_vt_x, window_vt_y, 1071 window_vt_x, window_vt_y,
1153 width, height); 1072 width, height);
1154 1073
1155#ifdef HAVE_BG_PIXMAP 1074#ifdef HAVE_BG_PIXMAP
1156 if (bgPixmap.window_size_sensitive ()) 1075 if (bgPixmap.window_size_sensitive ())
1157 update_background (); 1076 update_background ();
1158#endif 1077#endif
1159
1160 scr_clear ();
1161 } 1078 }
1162 1079
1163 if (fix_screen || old_height == 0) 1080 if (fix_screen || old_height == 0)
1164 scr_reset (); 1081 scr_reset ();
1165
1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1167 //scr_touch (false);
1168 1082
1169#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1084// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap) 1085// if (bgPixmap.pixmap)
1172// scr_touch (false); 1086// scr_touch (false);
1244 1158
1245/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1246bool 1160bool
1247rxvt_term::IMisRunning () 1161rxvt_term::IMisRunning ()
1248{ 1162{
1249 char *p;
1250 Atom atom; 1163 Atom atom;
1251 Window win; 1164 Window win;
1252 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1253 1166
1254 /* get current locale modifier */ 1167 /* get current locale modifier */
1255 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1256 { 1169 {
1257 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1258 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1259 1172
1260 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1261 *p = '\0'; 1174 *p = '\0';
1262 1175
1263 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1264 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1265 1178
1332 1245
1333 term->make_current (); 1246 term->make_current ();
1334 1247
1335 if (text) 1248 if (text)
1336 { 1249 {
1337 void *str; 1250 wchar_t *str;
1338 1251
1339 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1340 { 1253 {
1341 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1342 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1344 1257
1345 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1346 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1347 1260
1348 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1350 } 1263 }
1351 else 1264 else
1352 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1353 1266
1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1356 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1357 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
1704 XFree (status_attr); 1617 XFree (status_attr);
1705 } 1618 }
1706 1619
1707 XFree (preedit_attr); 1620 XFree (preedit_attr);
1708} 1621}
1709#endif /* USE_XIM */ 1622#endif /* USE_XIM */
1710 1623
1711void 1624void
1712rxvt_term::get_window_origin (int &x, int &y) 1625rxvt_term::get_window_origin (int &x, int &y)
1713{ 1626{
1714 Window cr; 1627 Window cr;
1715 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1716/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1717} 1629}
1718 1630
1719Pixmap 1631Pixmap
1720rxvt_term::get_pixmap_property (int prop_id) 1632rxvt_term::get_pixmap_property (int prop_id)
1721{ 1633{
1728 unsigned char *prop = NULL; 1640 unsigned char *prop = NULL;
1729 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1730 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1731 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1732 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success && prop && atype == XA_PIXMAP)
1733 {
1734 return *(Pixmap *)prop; 1645 return *(Pixmap *)prop;
1735 }
1736 } 1646 }
1647
1737 return None; 1648 return None;
1738} 1649}
1739 1650
1740#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1741int 1652
1653void
1742rxvt_term::update_background () 1654rxvt_term::update_background ()
1743{ 1655{
1656 if (update_background_ev.is_active ())
1657 return;
1658
1744 bgPixmap.invalidate (); 1659 bgPixmap.invalidate ();
1745 1660
1746 /* no chance of real time refresh if we are blurring! */ 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1747 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1662
1663 if (to_wait <= 0.)
1748 bgPixmap.render (); 1664 bgPixmap.render ();
1749 else 1665 else
1750 {
1751 update_background_ev.stop ();
1752
1753 if (!bgPixmap.need_client_side_rendering())
1754 update_background_ev.start (.05); 1666 update_background_ev.start (to_wait);
1755 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1756 update_background_ev.start (.20); /* very slow !!! */
1757 else
1758 update_background_ev.start (.07);
1759 }
1760
1761 return 0;
1762} 1667}
1763 1668
1764void 1669void
1765rxvt_term::update_background_cb (ev::timer &w, int revents) 1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1766{ 1671{
1672 make_current ();
1673
1674 update_background_ev.stop ();
1767 bgPixmap.render (); 1675 bgPixmap.render ();
1676 refresh_check ();
1768} 1677}
1769 1678
1770#endif /* HAVE_BG_PIXMAP */ 1679#endif /* HAVE_BG_PIXMAP */
1771 1680
1772/*----------------------- end-of-file (C source) -----------------------*/ 1681/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines