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.212 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
55 60
56static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
57 62
58bool 63bool
59rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) NOTHROW
60{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
61 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 72 return false;
63 73
64 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
66 return true; 76 return true;
67} 77}
68 78
69void 79void
… …
83class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
84 94
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 96{
87 compose_char *cc; 97 compose_char *cc;
88 98
89 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 101 cc = (*this)[c1];
92 while (cc) 102 while (cc)
93 { 103 {
… …
143} 153}
144#endif 154#endif
145 155
146rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
147 : 157 :
148#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 163#endif
151#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 166#endif
154#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 184#endif
172#ifdef USE_XIM 185#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
174#endif 187#endif
175#ifndef NO_BELL 188#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
177#endif 190#endif
178 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
179 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
181 check_ev (this, &rxvt_term::check_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
182 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
183 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
184 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
185 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
186{ 199{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 201
189 termlist.push_back (this); 202 termlist.push_back (this);
190 203
… …
193#endif 206#endif
194} 207}
195 208
196// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 210// for use before an emergency exit
211void
198void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
199{ 213{
200 if (cmd_pid) 214 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
202 216
217 pty_ev.stop ();
203 delete pty; pty = 0; 218 delete pty; pty = 0;
204} 219}
205 220
206rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
207{ 222{
… …
222 237
223#ifdef USE_XIM 238#ifdef USE_XIM
224 im_destroy (); 239 im_destroy ();
225#endif 240#endif
226#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 244#endif
230#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 247#endif
233#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 259#endif
245#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 264#endif
250 if (gc) XFreeGC (xdisp, gc); 265 if (gc) XFreeGC (dpy, gc);
251 266
252 delete drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (parent[0]) 269 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
271
272 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
256 280
257 clear (); 281 clear ();
258 } 282 }
259 283
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 284 delete [] pix_colors_focused;
262#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
264#endif 287#endif
265 288
289 bgPixmap.destroy ();
266 displays.put (display); 290 displays.put (display);
267 291
268 scr_release (); 292 scr_release ();
269 293
270 /* clear all resources */ 294 /* clear all resources */
… …
287#endif 311#endif
288} 312}
289 313
290// child has exited, usually destroys 314// child has exited, usually destroys
291void 315void
292rxvt_term::child_cb (child_watcher &w, int status) 316rxvt_term::child_cb (ev::child &w, int status)
293{ 317{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 318 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 319
296 cmd_pid = 0; 320 cmd_pid = 0;
297 321
298 if (!OPTION (Opt_hold)) 322 if (!option (Opt_hold))
299 destroy (); 323 destroy ();
300} 324}
301 325
302void 326void
303rxvt_term::destroy () 327rxvt_term::destroy ()
… …
317 im_ev.stop (display); 341 im_ev.stop (display);
318#endif 342#endif
319#if HAVE_SCROLLBARS 343#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 344 scrollbar_ev.stop (display);
321#endif 345#endif
322#if TRANSPARENT 346#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 347 rootwin_ev.stop (display);
324#endif 348#endif
325 incr_ev.stop (); 349 incr_ev.stop ();
326 termwin_ev.stop (display); 350 termwin_ev.stop (display);
327 vt_ev.stop (display); 351 vt_ev.stop (display);
328 } 352 }
329 353
330 check_ev.stop (); 354 prepare_ev.stop ();
331 pty_ev.stop (); 355 pty_ev.stop ();
332#ifdef CURSOR_BLINK 356#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 357 cursor_blink_ev.stop ();
334#endif 358#endif
335#ifdef TEXT_BLINK 359#ifdef TEXT_BLINK
… …
343#endif 367#endif
344#ifdef POINTER_BLANK 368#ifdef POINTER_BLANK
345 pointer_ev.stop (); 369 pointer_ev.stop ();
346#endif 370#endif
347 371
348 destroy_ev.start (0); 372 destroy_ev.start ();
349} 373}
350 374
351void 375void
352rxvt_term::destroy_cb (time_watcher &w) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 377{
354 make_current (); 378 make_current ();
355 379
356 delete this; 380 delete this;
357} 381}
… …
411 else 435 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 437 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 439 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 441 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 443}
420#endif 444#endif
421 445
… …
467#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 492 keyboard->register_done ();
469#endif 493#endif
470 494
471#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 496 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 497 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 498#endif
475 499
476 pty = ptytty::create (); 500 pty = ptytty::create ();
477 501
… …
480 init_xlocale (); 504 init_xlocale ();
481 505
482 scr_reset (); // initialize screen 506 scr_reset (); // initialize screen
483 507
484#if 0 508#if 0
485 XSynchronize (xdisp, True); 509 XSynchronize (dpy, True);
486#endif 510#endif
487 511
488#ifdef HAVE_SCROLLBARS 512#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 513 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 514 resize_scrollbar (); /* create and map scrollbar */
491#endif 515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
492#ifdef TRANSPARENT 520#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 521 if (option (Opt_transparent))
494 { 522 {
523 bgPixmap.set_transparent ();
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
498 } 536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap] != NULL)
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != NULL)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
499#endif 562#endif
500 563
501 set_colorfgbg (); 564 set_colorfgbg ();
502 565
503 init_command (cmd_argv); 566 init_command (cmd_argv);
504 567
505 free (cmd_argv); 568 free (cmd_argv);
506 569
507 if (pty->pty >= 0) 570 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
509 572
510 check_ev.start (); 573 prepare_ev.start ();
511 574
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 576
514#if ENABLE_XEMBED 577#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
516 { 579 {
517 long info[2] = { 0, XEMBED_MAPPED }; 580 long info[2] = { 0, XEMBED_MAPPED };
518 581
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 583 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 584 }
522#endif 585#endif
523 586
524 XMapWindow (xdisp, vt); 587 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 588 XMapWindow (dpy, parent[0]);
526 589
527 return true; 590 return true;
528} 591}
529 592
530static struct sig_handlers 593static struct sig_handlers
531{ 594{
532 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
533 596
534 /* 597 /*
535 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
536 */ 599 */
537 void 600 void
538 sig_term (sig_watcher &w) 601 sig_term (ev::sig &w, int revents)
539 { 602 {
540 rxvt_emergency_cleanup (); 603 rxvt_emergency_cleanup ();
541 signal (w.signum, SIG_DFL); 604 w.stop ();
542 kill (getpid (), w.signum); 605 kill (getpid (), w.signum);
543 } 606 }
544 607
545 sig_handlers () 608 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term), 609 : sw_term (this, &sig_handlers::sig_term),
… …
554void 617void
555rxvt_init () 618rxvt_init ()
556{ 619{
557 ptytty::init (); 620 ptytty::init ();
558 621
622 if (!ev::ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624
559 rxvt_environ = environ; 625 rxvt_environ = environ;
560 626
561 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
563 629
564 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
566 632
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
569 635
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
610 return p; 676 return p;
611} 677}
612 678
613/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
614/* 680/*
615 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
617 */ 683 */
618void 684void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 686{
… …
691 757
692 if (scrollBar.state) 758 if (scrollBar.state)
693 { 759 {
694 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
762
696 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 764 window_vt_x += sb_w;
698 } 765 }
699 766
700 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 769 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 770 szHint.min_height = szHint.base_height + szHint.height_inc;
704 771
705 if (newwidth && newwidth - szHint.base_width < max_width) 772 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 773 {
707 szHint.width = newwidth; 774 szHint.width = newwidth;
… …
722 { 789 {
723 min_it (height, max_height); 790 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
725 } 792 }
726 793
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
729 796
730 if (recalc_x) 797 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 799
733 if (recalc_y) 800 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 802
736 ncol = width / fwidth; 803 ncol = width / fwidth;
737 nrow = height / fheight; 804 nrow = height / fheight;
738} 805}
739 806
… …
794 delete fontset[0]; 861 delete fontset[0];
795 fontset[0] = fs; 862 fontset[0] = fs;
796 863
797 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 865 prop.height += lineSpace;
866
799 fs->set_prop (prop); 867 fs->set_prop (prop, false);
800 868
801 fwidth = prop.width; 869 fwidth = prop.width;
802 fheight = prop.height; 870 fheight = prop.height;
803 fbase = prop.ascent; 871 fbase = prop.ascent;
804 872
… …
813 { 881 {
814 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
816 884
817 if (res) 885 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
819 else 890 else
820 { 891 {
821 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
822 893
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 894 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 895 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
896
897 fs->set_prop (prop2, true);
825 } 898 }
826 899
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 900 }
830#else 901#else
831 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
832#endif 903#endif
833 } 904 }
… …
835 if (parent[0]) 906 if (parent[0])
836 { 907 {
837 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 909 scr_remap_chars ();
839 scr_touch (true); 910 scr_touch (true);
840 } 911 }
841 912
842 return true; 913 return true;
843} 914}
844 915
916void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 918{
847 XChangeProperty (xdisp, parent[0], 919 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 922}
851 923
924void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 926{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
856 929
857 XChangeProperty (xdisp, parent[0], 930 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 932 (const unsigned char *)s, strlen (s));
860 933
861 free (s); 934 free (s);
862 free (ws); 935 free (ws);
… …
881#if ENABLE_EWMH 954#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 956#endif
884} 957}
885 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
886#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 963 rxvt_color xcol;
891 int i; 964 int i;
892 965
893 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
894 return; 967 return;
895 968
896 color = strdup (color); 969 color = strdup (color);
897 allocated.push_back ((void *)color); 970 allocated.push_back ((void *)color);
… …
926 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
927 1000
928 /* XSetWindowAttributes attr; */ 1001 /* XSetWindowAttributes attr; */
929 /* Cursor cursor; */ 1002 /* Cursor cursor; */
930done: 1003done:
931
932#if OFF_FOCUS_FADING
933 if (rs[Rs_fade])
934 {
935 rgba c;
936 pix_colors [Color_fade].get (this, c);
937 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
938 }
939#endif
940
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
942 1005
1006 update_fade_color (idx);
943 recolour_cursor (); 1007 recolour_cursor ();
944 scr_recolour (); 1008 scr_recolour ();
1009#endif /* XTERM_COLOR_CHANGE */
945} 1010}
946
947#else
948# define set_window_color (idx,color) ((void)0)
949#endif /* XTERM_COLOR_CHANGE */
950 1011
951void 1012void
952rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
953{ 1014{
954 XColor xcol[2]; 1015 XColor fg, bg;
955 1016
956 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1017 (ISSET_PIXCOLOR (Color_pointer_fg)
957 ? pix_colors_focused[Color_pointer_fg] 1018 ? pix_colors_focused[Color_pointer_fg]
958 : pix_colors_focused[Color_fg]; 1019 : pix_colors_focused[Color_fg]).get (fg);
1020
959 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1021 (ISSET_PIXCOLOR (Color_pointer_bg)
960 ? pix_colors_focused[Color_pointer_bg] 1022 ? pix_colors_focused[Color_pointer_bg]
961 : pix_colors_focused[Color_bg]; 1023 : pix_colors_focused[Color_bg]).get (bg);
962 1024
963 XQueryColors (xdisp, cmap, xcol, 2);
964 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 1025 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
965} 1026}
966 1027
967/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
968/* 1029/*
969 * find if fg/bg matches any of the normal (low-intensity) colors 1030 * find if fg/bg matches any of the normal (low-intensity) colors
… …
986 1047
987 for (i = Color_Black; i <= Color_White; i++) 1048 for (i = Color_Black; i <= Color_White; i++)
988 if (pix_colors[Color_bg] == pix_colors[i]) 1049 if (pix_colors[Color_bg] == pix_colors[i])
989 { 1050 {
990 sprintf (bstr, "%d", (i - Color_Black)); 1051 sprintf (bstr, "%d", (i - Color_Black));
991#ifdef XPM_BACKGROUND 1052#ifdef BG_IMAGE_FROM_FILE
992 xpmb = "default;"; 1053 xpmb = "default;";
993#endif 1054#endif
994 break; 1055 break;
995 } 1056 }
996 1057
… …
1005 if (color.set (this, name)) 1066 if (color.set (this, name))
1006 return true; 1067 return true;
1007 1068
1008 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1069 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1009 return false; 1070 return false;
1071}
1072
1073void
1074rxvt_term::alias_color (int dst, int src)
1075{
1076 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1010} 1077}
1011 1078
1012/* -------------------------------------------------------------------- * 1079/* -------------------------------------------------------------------- *
1013 * - WINDOW RESIZING - * 1080 * - WINDOW RESIZING - *
1014 * -------------------------------------------------------------------- */ 1081 * -------------------------------------------------------------------- */
… …
1018 int fix_screen; 1085 int fix_screen;
1019 int old_width = szHint.width; 1086 int old_width = szHint.width;
1020 int old_height = szHint.height; 1087 int old_height = szHint.height;
1021 1088
1022 window_calc (newwidth, newheight); 1089 window_calc (newwidth, newheight);
1090
1091 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1023 XSetWMNormalHints (xdisp, parent[0], &szHint); 1092 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 1093
1025 if (!ignoreparent) 1094 if (!ignoreparent)
1026 { 1095 {
1027#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
1028 /* 1097 /*
… …
1032 int x, y, x1, y1; 1101 int x, y, x1, y1;
1033 int dx, dy; 1102 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1104 Window unused_cr;
1036 1105
1037 XTranslateCoordinates (xdisp, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent[0], display->root,
1038 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1110 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
1044 */ 1113 */
… …
1046 { 1115 {
1047 x -= x1; 1116 x -= x1;
1048 y -= y1; 1117 y -= y1;
1049 } 1118 }
1050 1119
1051 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1120 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1052 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1121 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1053 dx = old_width - szHint.width; 1122 dx = old_width - szHint.width;
1054 dy = old_height - szHint.height; 1123 dy = old_height - szHint.height;
1055 1124
1056 /* Check position of the center of the window */ 1125 /* Check position of the center of the window */
1057 if (x < x1) /* left half */ 1126 if (x < x1) /* left half */
… …
1061 if (y < y1) /* top half */ 1130 if (y < y1) /* top half */
1062 dy = 0; 1131 dy = 0;
1063 else if (y == y1) /* exact center */ 1132 else if (y == y1) /* exact center */
1064 dy /= 2; 1133 dy /= 2;
1065 1134
1066 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1135 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1067 szHint.width, szHint.height); 1136 szHint.width, szHint.height);
1068#else 1137#else
1069 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1138 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1070#endif 1139#endif
1071 } 1140 }
1072 1141
1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1142 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1074 1143
1075 if (fix_screen || newwidth != old_width || newheight != old_height) 1144 if (fix_screen || newwidth != old_width || newheight != old_height)
1076 { 1145 {
1077 if (scrollBar.state) 1146 if (scrollBar.state)
1078 { 1147 {
1079 XMoveResizeWindow (xdisp, scrollBar.win, 1148 XMoveResizeWindow (dpy, scrollBar.win,
1080 window_sb_x, 0, 1149 window_sb_x, 0,
1081 scrollbar_TotalWidth (), szHint.height); 1150 scrollbar_TotalWidth (), szHint.height);
1082 resize_scrollbar (); 1151 resize_scrollbar ();
1083 } 1152 }
1084 1153
1085 XMoveResizeWindow (xdisp, vt, 1154 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1087 width, height); 1156 width, height);
1088 1157
1158#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ())
1160 update_background ();
1161#endif
1162
1089 scr_clear (); 1163 scr_clear ();
1090#ifdef XPM_BACKGROUND
1091 resize_pixmap ();
1092#endif
1093 } 1164 }
1094 1165
1095 if (fix_screen || old_height == 0) 1166 if (fix_screen || old_height == 0)
1096 scr_reset (); 1167 scr_reset ();
1097 1168
1098#ifdef XPM_BACKGROUND 1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1099 if (pixmap) 1170 //scr_touch (false);
1171
1172#ifdef HAVE_BG_PIXMAP
1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174// if (bgPixmap.pixmap)
1100 scr_touch (false); 1175// scr_touch (false);
1101#endif 1176#endif
1102 1177
1103#ifdef USE_XIM 1178#ifdef USE_XIM
1104 IMSetStatusPosition (); 1179 IMSetPosition ();
1105#endif 1180#endif
1106} 1181}
1107 1182
1108/* 1183/*
1109 * Set the width/height of the vt window in characters. Units are pixels. 1184 * Set the width/height of the vt window in characters. Units are pixels.
… …
1114{ 1189{
1115 XWindowAttributes wattr; 1190 XWindowAttributes wattr;
1116 1191
1117 if (newwidth == 0 || newheight == 0) 1192 if (newwidth == 0 || newheight == 0)
1118 { 1193 {
1119 XGetWindowAttributes (xdisp, display->root, &wattr); 1194 XGetWindowAttributes (dpy, display->root, &wattr);
1120 1195
1121 if (newwidth == 0) 1196 if (newwidth == 0)
1122 newwidth = wattr.width - szHint.base_width; 1197 newwidth = wattr.width - szHint.base_width;
1123 if (newheight == 0) 1198 if (newheight == 0)
1124 newheight = wattr.height - szHint.base_height; 1199 newheight = wattr.height - szHint.base_height;
… …
1138#ifdef USE_XIM 1213#ifdef USE_XIM
1139 1214
1140void 1215void
1141rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1216rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1142{ 1217{
1143 fg = pix_colors[Color_fg]; 1218 fg = pix_colors [Color_fg];
1144 bg = pix_colors[Color_bg]; 1219 bg = pix_colors [Color_bg];
1145} 1220}
1146 1221
1147void 1222void
1148rxvt_term::im_set_size (XRectangle &size) 1223rxvt_term::im_set_size (XRectangle &size)
1149{ 1224{
… …
1186 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1261 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1187 1262
1188 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1263 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1189 *p = '\0'; 1264 *p = '\0';
1190 1265
1191 atom = XInternAtom (xdisp, server, False); 1266 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (xdisp, atom); 1267 win = XGetSelectionOwner (dpy, atom);
1193 1268
1194 if (win != None) 1269 if (win != None)
1195 return True; 1270 return True;
1196 } 1271 }
1197 1272
… …
1276 if (term->rs[Rs_imLocale]) 1351 if (term->rs[Rs_imLocale])
1277 SET_LOCALE (term->locale); 1352 SET_LOCALE (term->locale);
1278 } 1353 }
1279 else 1354 else
1280 str = (void *)text->string.wide_char; 1355 str = (void *)text->string.wide_char;
1281 1356
1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1283 DT_INT, call_data->caret, 1358 DT_INT, call_data->caret,
1284 DT_INT, call_data->chg_first, 1359 DT_INT, call_data->chg_first,
1285 DT_INT, call_data->chg_length, 1360 DT_INT, call_data->chg_length,
1286 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1361 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1421 "*", 1496 "*",
1422 fheight, 1497 fheight,
1423 fheight + 1, fheight - 1, 1498 fheight + 1, fheight - 1,
1424 fheight - 2, fheight + 2); 1499 fheight - 2, fheight + 2);
1425 1500
1426 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1501 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1427 &missing_charset_list, &missing_charset_count, &def_string); 1502 &missing_charset_list, &missing_charset_count, &def_string);
1428 1503
1429 if (missing_charset_list) 1504 if (missing_charset_list)
1430 XFreeStringList (missing_charset_list); 1505 XFreeStringList (missing_charset_list);
1431 1506
… …
1506 preedit_attr, 1581 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1582 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1583 status_attr, NULL);
1509 1584
1510 if (preedit_attr) XFree (preedit_attr); 1585 if (preedit_attr) XFree (preedit_attr);
1511 if (status_attr) XFree (status_attr); 1586 if (status_attr) XFree (status_attr);
1512 if (fs) XFreeFontSet (xdisp, fs); 1587 if (fs) XFreeFontSet (dpy, fs);
1513 1588
1514 if (Input_Context == NULL) 1589 if (Input_Context == NULL)
1515 { 1590 {
1516 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1591 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1517 im_destroy (); 1592 im_destroy ();
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1597 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1598 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1599 vt_select_input ();
1525#endif 1600#endif
1526 1601
1527 if (input_style & XIMPreeditArea)
1528 IMSetStatusPosition (); 1602 IMSetPosition ();
1529 1603
1530 return true; 1604 return true;
1531} 1605}
1532 1606
1533void 1607void
… …
1591 SET_LOCALE (locale); 1665 SET_LOCALE (locale);
1592#endif 1666#endif
1593} 1667}
1594 1668
1595void 1669void
1596rxvt_term::IMSetStatusPosition () 1670rxvt_term::IMSetPosition ()
1597{ 1671{
1598 XRectangle preedit_rect, status_rect, *needed_rect; 1672 XRectangle preedit_rect, status_rect, *needed_rect;
1599 XVaNestedList preedit_attr, status_attr; 1673 XVaNestedList preedit_attr, status_attr;
1600 1674
1601 if (!Input_Context 1675 if (!Input_Context
1602 || !focus 1676 || !focus
1603 || !(input_style & XIMPreeditArea) 1677 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1604 || !IMisRunning ()) 1678 || !IMisRunning ())
1605 return; 1679 return;
1606 1680
1681 if (input_style & XIMPreeditPosition)
1682 {
1683 im_set_size (preedit_rect);
1684 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1685
1686 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, NULL);
1688 }
1689 else
1690 {
1607 /* Getting the necessary width of preedit area */ 1691 /* Getting the necessary width of preedit area */
1608 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1692 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1609 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1693 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1610 XFree (status_attr); 1694 XFree (status_attr);
1611 1695
1612 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1696 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1613 XFree (needed_rect); 1697 XFree (needed_rect);
1614 1698
1615 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1699 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1616 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1700 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1617 1701
1618 XSetICValues (Input_Context, 1702 XSetICValues (Input_Context,
1619 XNPreeditAttributes, preedit_attr, 1703 XNPreeditAttributes, preedit_attr,
1620 XNStatusAttributes, status_attr, NULL); 1704 XNStatusAttributes, status_attr,
1705 NULL);
1621 1706
1707 XFree (status_attr);
1708 }
1709
1622 XFree (preedit_attr); 1710 XFree (preedit_attr);
1623 XFree (status_attr);
1624} 1711}
1625#endif /* USE_XIM */ 1712#endif /* USE_XIM */
1713
1714void
1715rxvt_term::get_window_origin (int &x, int &y)
1716{
1717 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720}
1721
1722Pixmap
1723rxvt_term::get_pixmap_property (int prop_id)
1724{
1725 if (prop_id > 0 && prop_id < NUM_XA)
1726 if (xa[prop_id])
1727 {
1728 int aformat;
1729 unsigned long nitems, bytes_after;
1730 Atom atype;
1731 unsigned char *prop = NULL;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP)
1736 {
1737 return *(Pixmap *)prop;
1738 }
1739 }
1740 return None;
1741}
1742
1743#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS
1745# undef update_background
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background ()
1754{
1755 bgPixmap.invalidate ();
1756
1757 /* no chance of real time refresh if we are blurring! */
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1759 bgPixmap.render ();
1760 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773}
1774
1775void
1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{
1778 bgPixmap.render ();
1779}
1780
1781#endif /* HAVE_BG_PIXMAP */
1626 1782
1627/*----------------------- end-of-file (C source) -----------------------*/ 1783/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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