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.213 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.267 by root, Tue Nov 27 17:45:46 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#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
266 displays.put (display); 292 displays.put (display);
267 293
268 scr_release (); 294 scr_release ();
269 295
270 /* clear all resources */ 296 /* clear all resources */
… …
283 delete argv; 309 delete argv;
284 310
285#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
286 delete keyboard; 312 delete keyboard;
287#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
288} 317}
289 318
290// child has exited, usually destroys 319// child has exited, usually destroys
291void 320void
292rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
293{ 322{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 324
296 cmd_pid = 0; 325 cmd_pid = 0;
297 326
298 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
299 destroy (); 328 destroy ();
300} 329}
301 330
302void 331void
303rxvt_term::destroy () 332rxvt_term::destroy ()
… …
317 im_ev.stop (display); 346 im_ev.stop (display);
318#endif 347#endif
319#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
321#endif 350#endif
322#if TRANSPARENT 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
324#endif 353#endif
325 incr_ev.stop (); 354 incr_ev.stop ();
326 termwin_ev.stop (display); 355 termwin_ev.stop (display);
327 vt_ev.stop (display); 356 vt_ev.stop (display);
328 } 357 }
329 358
330 check_ev.stop (); 359 prepare_ev.stop ();
331 pty_ev.stop (); 360 pty_ev.stop ();
332#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
334#endif 363#endif
335#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
343#endif 372#endif
344#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
345 pointer_ev.stop (); 374 pointer_ev.stop ();
346#endif 375#endif
347 376
348 destroy_ev.start (0); 377 destroy_ev.start ();
349} 378}
350 379
351void 380void
352rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 382{
354 make_current (); 383 make_current ();
355 384
356 delete this; 385 delete this;
357} 386}
… …
411 else 440 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 442 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 444 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 446 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 448}
420#endif 449#endif
421 450
… …
467#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 497 keyboard->register_done ();
469#endif 498#endif
470 499
471#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 503#endif
475 504
476 pty = ptytty::create (); 505 pty = ptytty::create ();
477 506
… …
480 init_xlocale (); 509 init_xlocale ();
481 510
482 scr_reset (); // initialize screen 511 scr_reset (); // initialize screen
483 512
484#if 0 513#if 0
485 XSynchronize (xdisp, True); 514 XSynchronize (dpy, True);
486#endif 515#endif
487 516
488#ifdef HAVE_SCROLLBARS 517#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 518 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 519 resize_scrollbar (); /* create and map scrollbar */
491#endif 520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
492#ifdef TRANSPARENT 525#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 526 if (option (Opt_transparent))
494 { 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 ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
498 } 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);
499#endif 567#endif
500 568
501 set_colorfgbg (); 569 set_colorfgbg ();
502 570
503 init_command (cmd_argv); 571 init_command (cmd_argv);
504 572
505 free (cmd_argv); 573 free (cmd_argv);
506 574
507 if (pty->pty >= 0) 575 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
509 577
510 check_ev.start (); 578 prepare_ev.start ();
511 579
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 581
514#if ENABLE_XEMBED 582#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
516 { 584 {
517 long info[2] = { 0, XEMBED_MAPPED }; 585 long info[2] = { 0, XEMBED_MAPPED };
518 586
519 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],
520 32, PropModeReplace, (unsigned char *)&info, 2); 588 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 589 }
522#endif 590#endif
523 591
524 XMapWindow (xdisp, vt); 592 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 593 XMapWindow (dpy, parent[0]);
526 594
527 return true; 595 return true;
528} 596}
529 597
530static struct sig_handlers 598static struct sig_handlers
531{ 599{
532 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
533 601
534 /* 602 /*
535 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
536 */ 604 */
537 void 605 void
538 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
539 { 607 {
540 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
541 signal (w.signum, SIG_DFL); 609 w.stop ();
542 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
543 } 611 }
544 612
545 sig_handlers () 613 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
554void 622void
555rxvt_init () 623rxvt_init ()
556{ 624{
557 ptytty::init (); 625 ptytty::init ();
558 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
559 rxvt_environ = environ; 630 rxvt_environ = environ;
560 631
561 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
563 634
564 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 637
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
569 640
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
610 return p; 681 return p;
611} 682}
612 683
613/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
614/* 685/*
615 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
617 */ 688 */
618void 689void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 691{
… …
692 if (scrollBar.state) 763 if (scrollBar.state)
693 { 764 {
694 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
696 767
697 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 769 window_vt_x += sb_w;
699 } 770 }
700 771
701 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
705 776
706 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 778 {
708 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
723 { 794 {
724 min_it (height, max_height); 795 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
726 } 797 }
727 798
728 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
730 801
731 if (recalc_x) 802 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 804
734 if (recalc_y) 805 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 807
737 ncol = width / fwidth; 808 ncol = width / fwidth;
738 nrow = height / fheight; 809 nrow = height / fheight;
739} 810}
740 811
… …
795 delete fontset[0]; 866 delete fontset[0];
796 fontset[0] = fs; 867 fontset[0] = fs;
797 868
798 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
799 prop.height += lineSpace; 870 prop.height += lineSpace;
871
800 fs->set_prop (prop); 872 fs->set_prop (prop, false);
801 873
802 fwidth = prop.width; 874 fwidth = prop.width;
803 fheight = prop.height; 875 fheight = prop.height;
804 fbase = prop.ascent; 876 fbase = prop.ascent;
805 877
… …
814 { 886 {
815 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
817 889
818 if (res) 890 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
820 else 895 else
821 { 896 {
822 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
823 898
824 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;
825 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);
826 } 903 }
827 904
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 905 }
831#else 906#else
832 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
833#endif 908#endif
834 } 909 }
… …
836 if (parent[0]) 911 if (parent[0])
837 { 912 {
838 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
839 scr_remap_chars (); 914 scr_remap_chars ();
840 scr_touch (true); 915 scr_touch (true);
841 } 916 }
842 917
843 return true; 918 return true;
844} 919}
845 920
921void
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 923{
848 XChangeProperty (xdisp, parent[0], 924 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 927}
852 928
929void
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 931{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
857 934
858 XChangeProperty (xdisp, parent[0], 935 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
861 938
862 free (s); 939 free (s);
863 free (ws); 940 free (ws);
… …
882#if ENABLE_EWMH 959#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 961#endif
885} 962}
886 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
887#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 968 rxvt_color xcol;
892 int i; 969 int i;
893 970
894 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
895 return; 972 return;
896 973
897 color = strdup (color); 974 color = strdup (color);
898 allocated.push_back ((void *)color); 975 allocated.push_back ((void *)color);
… …
902 if (isdigit (*color)) 979 if (isdigit (*color))
903 { 980 {
904 i = atoi (color); 981 i = atoi (color);
905 982
906 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
907 { /* bright colors */ 985 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 goto done; 987 goto done;
911 } 988 }
912 989
913 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
914 { /* normal colors */ 992 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 goto done; 994 goto done;
917 } 995 }
918 } 996 }
919 997
… …
924 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
925 */ 1003 */
926 1004
927 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
928 1006
929 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */
931done: 1007done:
932
933#if OFF_FOCUS_FADING
934 if (rs[Rs_fade])
935 {
936 rgba c;
937 pix_colors [Color_fade].get (this, c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
940#endif
941
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
943 1009
1010 update_fade_color (idx);
944 recolour_cursor (); 1011 recolour_cursor ();
945 scr_recolour (); 1012 scr_recolour ();
1013#endif /* XTERM_COLOR_CHANGE */
946} 1014}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 1015
952void 1016void
953rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
954{ 1018{
955 XColor xcol[2]; 1019 XColor fg, bg;
956 1020
957 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1021 (ISSET_PIXCOLOR (Color_pointer_fg)
958 ? pix_colors_focused[Color_pointer_fg] 1022 ? pix_colors_focused[Color_pointer_fg]
959 : pix_colors_focused[Color_fg]; 1023 : pix_colors_focused[Color_fg]).get (fg);
1024
960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1025 (ISSET_PIXCOLOR (Color_pointer_bg)
961 ? pix_colors_focused[Color_pointer_bg] 1026 ? pix_colors_focused[Color_pointer_bg]
962 : pix_colors_focused[Color_bg]; 1027 : pix_colors_focused[Color_bg]).get (bg);
963 1028
964 XQueryColors (xdisp, cmap, xcol, 2);
965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 1029 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 1030}
967 1031
968/*----------------------------------------------------------------------*/ 1032/*----------------------------------------------------------------------*/
969/* 1033/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 1034 * find if fg/bg matches any of the normal (low-intensity) colors
… …
987 1051
988 for (i = Color_Black; i <= Color_White; i++) 1052 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1053 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1054 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1055 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1056#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1057 xpmb = "default;";
994#endif 1058#endif
995 break; 1059 break;
996 } 1060 }
997 1061
… …
1006 if (color.set (this, name)) 1070 if (color.set (this, name))
1007 return true; 1071 return true;
1008 1072
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1073 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 1074 return false;
1075}
1076
1077void
1078rxvt_term::alias_color (int dst, int src)
1079{
1080 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 1081}
1012 1082
1013/* -------------------------------------------------------------------- * 1083/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 1084 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 1085 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 1089 int fix_screen;
1020 int old_width = szHint.width; 1090 int old_width = szHint.width;
1021 int old_height = szHint.height; 1091 int old_height = szHint.height;
1022 1092
1023 window_calc (newwidth, newheight); 1093 window_calc (newwidth, newheight);
1094
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 1096 XSetWMNormalHints (dpy, parent[0], &szHint);
1025 1097
1026 if (!ignoreparent) 1098 if (!ignoreparent)
1027 { 1099 {
1028#ifdef SMART_RESIZE 1100#ifdef SMART_RESIZE
1029 /* 1101 /*
… …
1033 int x, y, x1, y1; 1105 int x, y, x1, y1;
1034 int dx, dy; 1106 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 1108 Window unused_cr;
1037 1109
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 1114 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 1115 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
1045 */ 1117 */
… …
1047 { 1119 {
1048 x -= x1; 1120 x -= x1;
1049 y -= y1; 1121 y -= y1;
1050 } 1122 }
1051 1123
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1124 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1125 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 1126 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 1127 dy = old_height - szHint.height;
1056 1128
1057 /* Check position of the center of the window */ 1129 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 1130 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 1134 if (y < y1) /* top half */
1063 dy = 0; 1135 dy = 0;
1064 else if (y == y1) /* exact center */ 1136 else if (y == y1) /* exact center */
1065 dy /= 2; 1137 dy /= 2;
1066 1138
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1139 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 1140 szHint.width, szHint.height);
1069#else 1141#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 1143#endif
1072 } 1144 }
1073 1145
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 1147
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 1148 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 1149 {
1078 if (scrollBar.state) 1150 if (scrollBar.state)
1079 { 1151 {
1080 XMoveResizeWindow (xdisp, scrollBar.win, 1152 XMoveResizeWindow (dpy, scrollBar.win,
1081 window_sb_x, 0, 1153 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height); 1154 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar (); 1155 resize_scrollbar ();
1084 } 1156 }
1085 1157
1086 XMoveResizeWindow (xdisp, vt, 1158 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1088 width, height); 1160 width, height);
1089 1161
1162#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ())
1164 update_background ();
1165#endif
1166
1090 scr_clear (); 1167 scr_clear ();
1091#ifdef XPM_BACKGROUND
1092 resize_pixmap ();
1093#endif
1094 } 1168 }
1095 1169
1096 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1097 scr_reset (); 1171 scr_reset ();
1098 1172
1099#ifdef XPM_BACKGROUND 1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1100 if (pixmap) 1174 //scr_touch (false);
1175
1176#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap)
1101 scr_touch (false); 1179// scr_touch (false);
1102#endif 1180#endif
1103 1181
1104#ifdef USE_XIM 1182#ifdef USE_XIM
1105 IMSetStatusPosition (); 1183 IMSetPosition ();
1106#endif 1184#endif
1107} 1185}
1108 1186
1109/* 1187/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1188 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1193{
1116 XWindowAttributes wattr; 1194 XWindowAttributes wattr;
1117 1195
1118 if (newwidth == 0 || newheight == 0) 1196 if (newwidth == 0 || newheight == 0)
1119 { 1197 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1198 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1199
1122 if (newwidth == 0) 1200 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1201 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1202 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1203 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1217#ifdef USE_XIM
1140 1218
1141void 1219void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1220rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1221{
1144 fg = pix_colors[Color_fg]; 1222 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1223 bg = pix_colors [Color_bg];
1146} 1224}
1147 1225
1148void 1226void
1149rxvt_term::im_set_size (XRectangle &size) 1227rxvt_term::im_set_size (XRectangle &size)
1150{ 1228{
… …
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1188 1266
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1190 *p = '\0'; 1268 *p = '\0';
1191 1269
1192 atom = XInternAtom (xdisp, server, False); 1270 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1271 win = XGetSelectionOwner (dpy, atom);
1194 1272
1195 if (win != None) 1273 if (win != None)
1196 return True; 1274 return True;
1197 } 1275 }
1198 1276
… …
1277 if (term->rs[Rs_imLocale]) 1355 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale); 1356 SET_LOCALE (term->locale);
1279 } 1357 }
1280 else 1358 else
1281 str = (void *)text->string.wide_char; 1359 str = (void *)text->string.wide_char;
1282 1360
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret, 1362 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first, 1363 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length, 1364 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1365 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 "*", 1500 "*",
1423 fheight, 1501 fheight,
1424 fheight + 1, fheight - 1, 1502 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1503 fheight - 2, fheight + 2);
1426 1504
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1505 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1506 &missing_charset_list, &missing_charset_count, &def_string);
1429 1507
1430 if (missing_charset_list) 1508 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1509 XFreeStringList (missing_charset_list);
1432 1510
… …
1507 preedit_attr, 1585 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1586 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1587 status_attr, NULL);
1510 1588
1511 if (preedit_attr) XFree (preedit_attr); 1589 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1590 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1591 if (fs) XFreeFontSet (dpy, fs);
1514 1592
1515 if (Input_Context == NULL) 1593 if (Input_Context == NULL)
1516 { 1594 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1595 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1596 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1601 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1602 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1603 vt_select_input ();
1526#endif 1604#endif
1527 1605
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1606 IMSetPosition ();
1530 1607
1531 return true; 1608 return true;
1532} 1609}
1533 1610
1534void 1611void
… …
1592 SET_LOCALE (locale); 1669 SET_LOCALE (locale);
1593#endif 1670#endif
1594} 1671}
1595 1672
1596void 1673void
1597rxvt_term::IMSetStatusPosition () 1674rxvt_term::IMSetPosition ()
1598{ 1675{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1676 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1677 XVaNestedList preedit_attr, status_attr;
1601 1678
1602 if (!Input_Context 1679 if (!Input_Context
1603 || !focus 1680 || !focus
1604 || !(input_style & XIMPreeditArea) 1681 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1682 || !IMisRunning ())
1606 return; 1683 return;
1607 1684
1685 if (input_style & XIMPreeditPosition)
1686 {
1687 im_set_size (preedit_rect);
1688 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1689
1690 XSetICValues (Input_Context,
1691 XNPreeditAttributes, preedit_attr, NULL);
1692 }
1693 else
1694 {
1608 /* Getting the necessary width of preedit area */ 1695 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1697 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1698 XFree (status_attr);
1612 1699
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1700 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1701 XFree (needed_rect);
1615 1702
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1703 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1704 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1705
1619 XSetICValues (Input_Context, 1706 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1707 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1708 XNStatusAttributes, status_attr,
1709 NULL);
1622 1710
1711 XFree (status_attr);
1712 }
1713
1623 XFree (preedit_attr); 1714 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1715}
1626#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1717
1718void
1719rxvt_term::get_window_origin (int &x, int &y)
1720{
1721 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724}
1725
1726Pixmap
1727rxvt_term::get_pixmap_property (int prop_id)
1728{
1729 if (prop_id > 0 && prop_id < NUM_XA)
1730 if (xa[prop_id])
1731 {
1732 int aformat;
1733 unsigned long nitems, bytes_after;
1734 Atom atype;
1735 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop;
1742 }
1743 }
1744 return None;
1745}
1746
1747#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756
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 */
1627 1787
1628/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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