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.224 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC

… …
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
203 pty_ev.stop (); 217 pty_ev.stop ();
… …
265 } 279 }
266 280
267 clear (); 281 clear ();
268 } 282 }
269 283
270 delete pix_colors_focused; 284 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
273#endif 287#endif
274 288
289 bgPixmap.destroy ();
275 displays.put (display); 290 displays.put (display);
276 291
277 scr_release (); 292 scr_release ();
278 293
279 /* clear all resources */ 294 /* clear all resources */
… …
296#endif 311#endif
297} 312}
298 313
299// child has exited, usually destroys 314// child has exited, usually destroys
300void 315void
301rxvt_term::child_cb (child_watcher &w, int status) 316rxvt_term::child_cb (ev::child &w, int status)
302{ 317{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 318 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 319
305 cmd_pid = 0; 320 cmd_pid = 0;
306 321
307 if (!OPTION (Opt_hold)) 322 if (!option (Opt_hold))
308 destroy (); 323 destroy ();
309} 324}
310 325
311void 326void
312rxvt_term::destroy () 327rxvt_term::destroy ()
… …
326 im_ev.stop (display); 341 im_ev.stop (display);
327#endif 342#endif
328#if HAVE_SCROLLBARS 343#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 344 scrollbar_ev.stop (display);
330#endif 345#endif
331#if TRANSPARENT 346#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 347 rootwin_ev.stop (display);
333#endif 348#endif
334 incr_ev.stop (); 349 incr_ev.stop ();
335 termwin_ev.stop (display); 350 termwin_ev.stop (display);
336 vt_ev.stop (display); 351 vt_ev.stop (display);
337 } 352 }
338 353
339 check_ev.stop (); 354 prepare_ev.stop ();
340 pty_ev.stop (); 355 pty_ev.stop ();
341#ifdef CURSOR_BLINK 356#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 357 cursor_blink_ev.stop ();
343#endif 358#endif
344#ifdef TEXT_BLINK 359#ifdef TEXT_BLINK
… …
352#endif 367#endif
353#ifdef POINTER_BLANK 368#ifdef POINTER_BLANK
354 pointer_ev.stop (); 369 pointer_ev.stop ();
355#endif 370#endif
356 371
357 destroy_ev.start (0); 372 destroy_ev.start ();
358} 373}
359 374
360void 375void
361rxvt_term::destroy_cb (time_watcher &w) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 377{
363 make_current (); 378 make_current ();
364 379
365 delete this; 380 delete this;
366} 381}
… …
420 else 435 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 437 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 439 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 441 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 443}
429#endif 444#endif
430 445
… …
476#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 492 keyboard->register_done ();
478#endif 493#endif
479 494
480#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 496 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 497 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 498#endif
484 499
485 pty = ptytty::create (); 500 pty = ptytty::create ();
486 501
… …
493#if 0 508#if 0
494 XSynchronize (dpy, True); 509 XSynchronize (dpy, True);
495#endif 510#endif
496 511
497#ifdef HAVE_SCROLLBARS 512#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 513 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 514 resize_scrollbar (); /* create and map scrollbar */
500#endif 515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
501#ifdef TRANSPARENT 520#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 521 if (option (Opt_transparent))
503 { 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 ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
507 } 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);
508#endif 562#endif
509 563
510 set_colorfgbg (); 564 set_colorfgbg ();
511 565
512 init_command (cmd_argv); 566 init_command (cmd_argv);
513 567
514 free (cmd_argv); 568 free (cmd_argv);
515 569
516 if (pty->pty >= 0) 570 if (pty->pty >= 0)
517 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
518 572
519 check_ev.start (); 573 prepare_ev.start ();
520 574
521 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
522 576
523#if ENABLE_XEMBED 577#if ENABLE_XEMBED
524 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
… …
536 return true; 590 return true;
537} 591}
538 592
539static struct sig_handlers 593static struct sig_handlers
540{ 594{
541 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
542 596
543 /* 597 /*
544 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
545 */ 599 */
546 void 600 void
547 sig_term (sig_watcher &w) 601 sig_term (ev::sig &w, int revents)
548 { 602 {
549 rxvt_emergency_cleanup (); 603 rxvt_emergency_cleanup ();
550 signal (w.signum, SIG_DFL); 604 w.stop ();
551 kill (getpid (), w.signum); 605 kill (getpid (), w.signum);
552 } 606 }
553 607
554 sig_handlers () 608 sig_handlers ()
555 : sw_term (this, &sig_handlers::sig_term), 609 : sw_term (this, &sig_handlers::sig_term),
… …
563void 617void
564rxvt_init () 618rxvt_init ()
565{ 619{
566 ptytty::init (); 620 ptytty::init ();
567 621
622 if (!ev::ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624
568 rxvt_environ = environ; 625 rxvt_environ = environ;
569 626
570 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
572 629
573 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
575 632
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
578 635
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
619 return p; 676 return p;
620} 677}
621 678
622/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
623/* 680/*
624 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
626 */ 683 */
627void 684void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 686{
… …
701 if (scrollBar.state) 758 if (scrollBar.state)
702 { 759 {
703 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
705 762
706 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 764 window_vt_x += sb_w;
708 } 765 }
709 766
710 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
… …
732 { 789 {
733 min_it (height, max_height); 790 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
735 } 792 }
736 793
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
739 796
740 if (recalc_x) 797 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 799
… …
804 delete fontset[0]; 861 delete fontset[0];
805 fontset[0] = fs; 862 fontset[0] = fs;
806 863
807 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 865 prop.height += lineSpace;
866
809 fs->set_prop (prop); 867 fs->set_prop (prop, false);
810 868
811 fwidth = prop.width; 869 fwidth = prop.width;
812 fheight = prop.height; 870 fheight = prop.height;
813 fbase = prop.ascent; 871 fbase = prop.ascent;
814 872
… …
823 { 881 {
824 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
826 884
827 if (res) 885 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
829 else 890 else
830 { 891 {
831 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
832 893
833 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;
834 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);
835 } 898 }
836 899
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 900 }
840#else 901#else
841 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
842#endif 903#endif
843 } 904 }
… …
845 if (parent[0]) 906 if (parent[0])
846 { 907 {
847 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 909 scr_remap_chars ();
849 scr_touch (true); 910 scr_touch (true);
850 } 911 }
851 912
852 return true; 913 return true;
853} 914}
854 915
916void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 918{
857 XChangeProperty (dpy, parent[0], 919 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 922}
861 923
924void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 926{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
866 929
867 XChangeProperty (dpy, parent[0], 930 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 954#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 956#endif
894} 957}
895 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
896#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 963 rxvt_color xcol;
901 int i; 964 int i;
902 965
903 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
904 return; 967 return;
905 968
906 color = strdup (color); 969 color = strdup (color);
907 allocated.push_back ((void *)color); 970 allocated.push_back ((void *)color);
… …
936 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
937 1000
938 /* XSetWindowAttributes attr; */ 1001 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */ 1002 /* Cursor cursor; */
940done: 1003done:
941
942#if OFF_FOCUS_FADING
943 if (rs[Rs_fade])
944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
949#endif
950
951 /*TODO: handle Color_BD, scrollbar background, etc. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
952 1005
1006 update_fade_color (idx);
953 recolour_cursor (); 1007 recolour_cursor ();
954 scr_recolour (); 1008 scr_recolour ();
1009#endif /* XTERM_COLOR_CHANGE */
955} 1010}
956
957#else
958# define set_window_color (idx,color) ((void)0)
959#endif /* XTERM_COLOR_CHANGE */
960 1011
961void 1012void
962rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
963{ 1014{
964 XColor fg, bg; 1015 XColor fg, bg;
… …
996 1047
997 for (i = Color_Black; i <= Color_White; i++) 1048 for (i = Color_Black; i <= Color_White; i++)
998 if (pix_colors[Color_bg] == pix_colors[i]) 1049 if (pix_colors[Color_bg] == pix_colors[i])
999 { 1050 {
1000 sprintf (bstr, "%d", (i - Color_Black)); 1051 sprintf (bstr, "%d", (i - Color_Black));
1001#ifdef XPM_BACKGROUND 1052#ifdef BG_IMAGE_FROM_FILE
1002 xpmb = "default;"; 1053 xpmb = "default;";
1003#endif 1054#endif
1004 break; 1055 break;
1005 } 1056 }
1006 1057
… …
1102 1153
1103 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1105 width, height); 1156 width, height);
1106 1157
1158#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ())
1160 update_background ();
1161#endif
1162
1107 scr_clear (); 1163 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1164 }
1112 1165
1113 if (fix_screen || old_height == 0) 1166 if (fix_screen || old_height == 0)
1114 scr_reset (); 1167 scr_reset ();
1115 1168
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false); 1170 //scr_touch (false);
1118 1171
1119#ifdef XPM_BACKGROUND 1172#ifdef HAVE_BG_PIXMAP
1120 if (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)
1121 scr_touch (false); 1175// scr_touch (false);
1122#endif 1176#endif
1123 1177
1124#ifdef USE_XIM 1178#ifdef USE_XIM
1125 IMSetPosition (); 1179 IMSetPosition ();
1126#endif 1180#endif
… …
1297 if (term->rs[Rs_imLocale]) 1351 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale); 1352 SET_LOCALE (term->locale);
1299 } 1353 }
1300 else 1354 else
1301 str = (void *)text->string.wide_char; 1355 str = (void *)text->string.wide_char;
1302 1356
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret, 1358 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first, 1359 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length, 1360 DT_INT, call_data->chg_length,
1307 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,
… …
1626 1680
1627 if (input_style & XIMPreeditPosition) 1681 if (input_style & XIMPreeditPosition)
1628 { 1682 {
1629 im_set_size (preedit_rect); 1683 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1684 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 1685
1632 XSetICValues (Input_Context, 1686 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL); 1687 XNPreeditAttributes, preedit_attr, NULL);
1634 } 1688 }
1635 else 1689 else
1636 { 1690 {
… …
1653 XFree (status_attr); 1707 XFree (status_attr);
1654 } 1708 }
1655 1709
1656 XFree (preedit_attr); 1710 XFree (preedit_attr);
1657} 1711}
1658#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 */
1659 1782
1660/*----------------------- end-of-file (C source) -----------------------*/ 1783/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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