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.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.265 by ayin, Mon Nov 26 10:08:36 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]);
256 271
257 for (int i = 0; i < TOTAL_COLORS; i++) 272 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 273 if (ISSET_PIXCOLOR (i))
259 { 274 {
260 pix_colors_focused [i].free (this); 275 pix_colors_focused [i].free (this);
… …
264 } 279 }
265 280
266 clear (); 281 clear ();
267 } 282 }
268 283
269 delete pix_colors_focused; 284 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
272#endif 287#endif
273 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
274 displays.put (display); 292 displays.put (display);
275 293
276 scr_release (); 294 scr_release ();
277 295
278 /* clear all resources */ 296 /* clear all resources */
… …
291 delete argv; 309 delete argv;
292 310
293#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
294 delete keyboard; 312 delete keyboard;
295#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
296} 317}
297 318
298// child has exited, usually destroys 319// child has exited, usually destroys
299void 320void
300rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
301{ 322{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 324
304 cmd_pid = 0; 325 cmd_pid = 0;
305 326
306 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
307 destroy (); 328 destroy ();
308} 329}
309 330
310void 331void
311rxvt_term::destroy () 332rxvt_term::destroy ()
… …
325 im_ev.stop (display); 346 im_ev.stop (display);
326#endif 347#endif
327#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
329#endif 350#endif
330#if TRANSPARENT 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
331 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
332#endif 353#endif
333 incr_ev.stop (); 354 incr_ev.stop ();
334 termwin_ev.stop (display); 355 termwin_ev.stop (display);
335 vt_ev.stop (display); 356 vt_ev.stop (display);
336 } 357 }
337 358
338 check_ev.stop (); 359 prepare_ev.stop ();
339 pty_ev.stop (); 360 pty_ev.stop ();
340#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
341 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
342#endif 363#endif
343#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
351#endif 372#endif
352#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
353 pointer_ev.stop (); 374 pointer_ev.stop ();
354#endif 375#endif
355 376
356 destroy_ev.start (0); 377 destroy_ev.start ();
357} 378}
358 379
359void 380void
360rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
361{ 382{
362 make_current (); 383 make_current ();
363 384
364 delete this; 385 delete this;
365} 386}
… …
419 else 440 else
420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421 mesg, BUFSIZ); 442 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423 } 444 }
424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425 mesg, BUFSIZ); 446 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427} 448}
428#endif 449#endif
429 450
… …
475#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 497 keyboard->register_done ();
477#endif 498#endif
478 499
479#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 503#endif
483 504
484 pty = ptytty::create (); 505 pty = ptytty::create ();
485 506
… …
488 init_xlocale (); 509 init_xlocale ();
489 510
490 scr_reset (); // initialize screen 511 scr_reset (); // initialize screen
491 512
492#if 0 513#if 0
493 XSynchronize (xdisp, True); 514 XSynchronize (dpy, True);
494#endif 515#endif
495 516
496#ifdef HAVE_SCROLLBARS 517#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 518 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 519 resize_scrollbar (); /* create and map scrollbar */
499#endif 520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
500#ifdef TRANSPARENT 525#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 526 if (option (Opt_transparent))
502 { 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 ();
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
506 } 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);
507#endif 567#endif
508 568
509 set_colorfgbg (); 569 set_colorfgbg ();
510 570
511 init_command (cmd_argv); 571 init_command (cmd_argv);
512 572
513 free (cmd_argv); 573 free (cmd_argv);
514 574
515 if (pty->pty >= 0) 575 if (pty->pty >= 0)
516 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
517 577
518 check_ev.start (); 578 prepare_ev.start ();
519 579
520 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
521 581
522#if ENABLE_XEMBED 582#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
524 { 584 {
525 long info[2] = { 0, XEMBED_MAPPED }; 585 long info[2] = { 0, XEMBED_MAPPED };
526 586
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2); 588 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 589 }
530#endif 590#endif
531 591
532 XMapWindow (xdisp, vt); 592 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 593 XMapWindow (dpy, parent[0]);
534 594
535 return true; 595 return true;
536} 596}
537 597
538static struct sig_handlers 598static struct sig_handlers
539{ 599{
540 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
541 601
542 /* 602 /*
543 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
544 */ 604 */
545 void 605 void
546 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
547 { 607 {
548 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
549 signal (w.signum, SIG_DFL); 609 w.stop ();
550 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
551 } 611 }
552 612
553 sig_handlers () 613 sig_handlers ()
554 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
562void 622void
563rxvt_init () 623rxvt_init ()
564{ 624{
565 ptytty::init (); 625 ptytty::init ();
566 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
567 rxvt_environ = environ; 630 rxvt_environ = environ;
568 631
569 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
570 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
571 634
572 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
574 637
575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
576 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
577 640
578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
618 return p; 681 return p;
619} 682}
620 683
621/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
622/* 685/*
623 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
625 */ 688 */
626void 689void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 691{
… …
700 if (scrollBar.state) 763 if (scrollBar.state)
701 { 764 {
702 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
704 767
705 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 769 window_vt_x += sb_w;
707 } 770 }
708 771
709 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
713 776
714 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 778 {
716 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
731 { 794 {
732 min_it (height, max_height); 795 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
734 } 797 }
735 798
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
738 801
739 if (recalc_x) 802 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 804
742 if (recalc_y) 805 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 807
745 ncol = width / fwidth; 808 ncol = width / fwidth;
746 nrow = height / fheight; 809 nrow = height / fheight;
747} 810}
748 811
… …
803 delete fontset[0]; 866 delete fontset[0];
804 fontset[0] = fs; 867 fontset[0] = fs;
805 868
806 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 870 prop.height += lineSpace;
871
808 fs->set_prop (prop); 872 fs->set_prop (prop, false);
809 873
810 fwidth = prop.width; 874 fwidth = prop.width;
811 fheight = prop.height; 875 fheight = prop.height;
812 fbase = prop.ascent; 876 fbase = prop.ascent;
813 877
… …
822 { 886 {
823 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
825 889
826 if (res) 890 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
828 else 895 else
829 { 896 {
830 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
831 898
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 899 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
833 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 900 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
901
902 fs->set_prop (prop2, true);
834 } 903 }
835 904
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 905 }
839#else 906#else
840 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
841#endif 908#endif
842 } 909 }
… …
844 if (parent[0]) 911 if (parent[0])
845 { 912 {
846 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
847 scr_remap_chars (); 914 scr_remap_chars ();
848 scr_touch (true); 915 scr_touch (true);
849 } 916 }
850 917
851 return true; 918 return true;
852} 919}
853 920
921void
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 923{
856 XChangeProperty (xdisp, parent[0], 924 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 927}
860 928
929void
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 931{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
865 934
866 XChangeProperty (xdisp, parent[0], 935 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
869 938
870 free (s); 939 free (s);
871 free (ws); 940 free (ws);
… …
890#if ENABLE_EWMH 959#if ENABLE_EWMH
891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892#endif 961#endif
893} 962}
894 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
895#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
896void
897rxvt_term::set_window_color (int idx, const char *color)
898{
899 rxvt_color xcol; 968 rxvt_color xcol;
900 int i; 969 int i;
901 970
902 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
903 return; 972 return;
904 973
905 color = strdup (color); 974 color = strdup (color);
906 allocated.push_back ((void *)color); 975 allocated.push_back ((void *)color);
… …
910 if (isdigit (*color)) 979 if (isdigit (*color))
911 { 980 {
912 i = atoi (color); 981 i = atoi (color);
913 982
914 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
915 { /* bright colors */ 985 /* bright colors */
916 i -= 8; 986 i -= 8;
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
918 goto done; 988 goto done;
919 } 989 }
920 990
921 if (i >= 0 && i <= 7) 991 if (i >= 0 && i <= 7)
992 {
922 { /* normal colors */ 993 /* normal colors */
923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 994 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924 goto done; 995 goto done;
925 } 996 }
926 } 997 }
927 998
… …
932 * so just keep gobbling up the colormap 1003 * so just keep gobbling up the colormap
933 */ 1004 */
934 1005
935 pix_colors_focused[idx] = xcol; 1006 pix_colors_focused[idx] = xcol;
936 1007
937 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */
939done: 1008done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
951 1010
1011 update_fade_color (idx);
952 recolour_cursor (); 1012 recolour_cursor ();
953 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
954} 1015}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 1016
960void 1017void
961rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
962{ 1019{
963 XColor fg, bg; 1020 XColor fg, bg;
… …
968 1025
969 (ISSET_PIXCOLOR (Color_pointer_bg) 1026 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 1027 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 1028 : pix_colors_focused[Color_bg]).get (bg);
972 1029
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1030 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 1031}
975 1032
976/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
977/* 1034/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 1035 * find if fg/bg matches any of the normal (low-intensity) colors
… …
995 1052
996 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1055 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1058 xpmb = "default;";
1002#endif 1059#endif
1003 break; 1060 break;
1004 } 1061 }
1005 1062
… …
1033 int fix_screen; 1090 int fix_screen;
1034 int old_width = szHint.width; 1091 int old_width = szHint.width;
1035 int old_height = szHint.height; 1092 int old_height = szHint.height;
1036 1093
1037 window_calc (newwidth, newheight); 1094 window_calc (newwidth, newheight);
1095
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1097 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1098
1040 if (!ignoreparent) 1099 if (!ignoreparent)
1041 { 1100 {
1042#ifdef SMART_RESIZE 1101#ifdef SMART_RESIZE
1043 /* 1102 /*
… …
1047 int x, y, x1, y1; 1106 int x, y, x1, y1;
1048 int dx, dy; 1107 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1109 Window unused_cr;
1051 1110
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1111 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1112 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1115 /*
1057 * if display->root isn't the parent window, a WM will probably have offset 1116 * if display->root isn't the parent window, a WM will probably have offset
1058 * our position for handles and decorations. Counter it 1117 * our position for handles and decorations. Counter it
1059 */ 1118 */
… …
1061 { 1120 {
1062 x -= x1; 1121 x -= x1;
1063 y -= y1; 1122 y -= y1;
1064 } 1123 }
1065 1124
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1125 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1126 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1127 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1128 dy = old_height - szHint.height;
1070 1129
1071 /* Check position of the center of the window */ 1130 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1131 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1135 if (y < y1) /* top half */
1077 dy = 0; 1136 dy = 0;
1078 else if (y == y1) /* exact center */ 1137 else if (y == y1) /* exact center */
1079 dy /= 2; 1138 dy /= 2;
1080 1139
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1141 szHint.width, szHint.height);
1083#else 1142#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1144#endif
1086 } 1145 }
1087 1146
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1148
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1150 {
1092 if (scrollBar.state) 1151 if (scrollBar.state)
1093 { 1152 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1153 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1154 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1155 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1156 resize_scrollbar ();
1098 } 1157 }
1099 1158
1100 XMoveResizeWindow (xdisp, vt, 1159 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1102 width, height); 1161 width, height);
1103 1162
1163#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ())
1165 update_background ();
1166#endif
1167
1104 scr_clear (); 1168 scr_clear ();
1105#ifdef XPM_BACKGROUND
1106 resize_pixmap ();
1107#endif
1108 } 1169 }
1109 1170
1110 if (fix_screen || old_height == 0) 1171 if (fix_screen || old_height == 0)
1111 scr_reset (); 1172 scr_reset ();
1112 1173
1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 //scr_touch (false); 1175 //scr_touch (false);
1115 1176
1116#ifdef XPM_BACKGROUND 1177#ifdef HAVE_BG_PIXMAP
1117 if (pixmap) 1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179// if (bgPixmap.pixmap)
1118 scr_touch (false); 1180// scr_touch (false);
1119#endif 1181#endif
1120 1182
1121#ifdef USE_XIM 1183#ifdef USE_XIM
1122 IMSetStatusPosition (); 1184 IMSetPosition ();
1123#endif 1185#endif
1124} 1186}
1125 1187
1126/* 1188/*
1127 * Set the width/height of the vt window in characters. Units are pixels. 1189 * Set the width/height of the vt window in characters. Units are pixels.
… …
1132{ 1194{
1133 XWindowAttributes wattr; 1195 XWindowAttributes wattr;
1134 1196
1135 if (newwidth == 0 || newheight == 0) 1197 if (newwidth == 0 || newheight == 0)
1136 { 1198 {
1137 XGetWindowAttributes (xdisp, display->root, &wattr); 1199 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1200
1139 if (newwidth == 0) 1201 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1202 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1203 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1204 newheight = wattr.height - szHint.base_height;
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1267
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1269 *p = '\0';
1208 1270
1209 atom = XInternAtom (xdisp, server, False); 1271 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (xdisp, atom); 1272 win = XGetSelectionOwner (dpy, atom);
1211 1273
1212 if (win != None) 1274 if (win != None)
1213 return True; 1275 return True;
1214 } 1276 }
1215 1277
… …
1294 if (term->rs[Rs_imLocale]) 1356 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale); 1357 SET_LOCALE (term->locale);
1296 } 1358 }
1297 else 1359 else
1298 str = (void *)text->string.wide_char; 1360 str = (void *)text->string.wide_char;
1299 1361
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret, 1363 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first, 1364 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length, 1365 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1439 "*", 1501 "*",
1440 fheight, 1502 fheight,
1441 fheight + 1, fheight - 1, 1503 fheight + 1, fheight - 1,
1442 fheight - 2, fheight + 2); 1504 fheight - 2, fheight + 2);
1443 1505
1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1506 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1445 &missing_charset_list, &missing_charset_count, &def_string); 1507 &missing_charset_list, &missing_charset_count, &def_string);
1446 1508
1447 if (missing_charset_list) 1509 if (missing_charset_list)
1448 XFreeStringList (missing_charset_list); 1510 XFreeStringList (missing_charset_list);
1449 1511
… …
1524 preedit_attr, 1586 preedit_attr,
1525 status_attr ? XNStatusAttributes : NULL, 1587 status_attr ? XNStatusAttributes : NULL,
1526 status_attr, NULL); 1588 status_attr, NULL);
1527 1589
1528 if (preedit_attr) XFree (preedit_attr); 1590 if (preedit_attr) XFree (preedit_attr);
1529 if (status_attr) XFree (status_attr); 1591 if (status_attr) XFree (status_attr);
1530 if (fs) XFreeFontSet (xdisp, fs); 1592 if (fs) XFreeFontSet (dpy, fs);
1531 1593
1532 if (Input_Context == NULL) 1594 if (Input_Context == NULL)
1533 { 1595 {
1534 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1596 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535 im_destroy (); 1597 im_destroy ();
… …
1540 // unfortunately, only the focus window is used by XIM, hard to fix 1602 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input (); 1604 vt_select_input ();
1543#endif 1605#endif
1544 1606
1545 if (input_style & XIMPreeditArea)
1546 IMSetStatusPosition (); 1607 IMSetPosition ();
1547 1608
1548 return true; 1609 return true;
1549} 1610}
1550 1611
1551void 1612void
… …
1609 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1610#endif 1671#endif
1611} 1672}
1612 1673
1613void 1674void
1614rxvt_term::IMSetStatusPosition () 1675rxvt_term::IMSetPosition ()
1615{ 1676{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1677 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1678 XVaNestedList preedit_attr, status_attr;
1618 1679
1619 if (!Input_Context 1680 if (!Input_Context
1620 || !focus 1681 || !focus
1621 || !(input_style & XIMPreeditArea) 1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1683 || !IMisRunning ())
1623 return; 1684 return;
1624 1685
1686 if (input_style & XIMPreeditPosition)
1687 {
1688 im_set_size (preedit_rect);
1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1690
1691 XSetICValues (Input_Context,
1692 XNPreeditAttributes, preedit_attr, NULL);
1693 }
1694 else
1695 {
1625 /* Getting the necessary width of preedit area */ 1696 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1627 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1698 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1628 XFree (status_attr); 1699 XFree (status_attr);
1629 1700
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1701 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1702 XFree (needed_rect);
1632 1703
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1704 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1705 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1706
1636 XSetICValues (Input_Context, 1707 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1708 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1709 XNStatusAttributes, status_attr,
1710 NULL);
1639 1711
1712 XFree (status_attr);
1713 }
1714
1640 XFree (preedit_attr); 1715 XFree (preedit_attr);
1641 XFree (status_attr);
1642} 1716}
1643#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1718
1719void
1720rxvt_term::get_window_origin (int &x, int &y)
1721{
1722 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746}
1747
1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757int
1758rxvt_term::update_background ()
1759{
1760 bgPixmap.invalidate ();
1761
1762 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render ();
1765 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778}
1779
1780void
1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{
1783 bgPixmap.render ();
1784}
1785
1786#endif /* HAVE_BG_PIXMAP */
1644 1787
1645/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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