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.227 by root, Fri Jul 28 17:16:42 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{
61 int len = strlen (locale) + 1; 66 int size = strlen (locale) + 1;
62 67
63 if (len > sizeof (curlocale)) 68 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n"); 69 rxvt_fatal ("locale string too long, aborting.\n");
65 70
66 if (!locale || !memcmp (locale, curlocale, len)) 71 if (!locale || !memcmp (locale, curlocale, size))
67 return false; 72 return false;
68 73
69 memcpy (curlocale, locale, len); 74 memcpy (curlocale, locale, size);
70 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
71 return true; 76 return true;
72} 77}
73 78
74void 79void
… …
88class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
89 94
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 96{
92 compose_char *cc; 97 compose_char *cc;
93 98
94 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 101 cc = (*this)[c1];
97 while (cc) 102 while (cc)
98 { 103 {
… …
148} 153}
149#endif 154#endif
150 155
151rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
152 : 157 :
153#if TRANSPARENT || ENABLE_PERL 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 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),
155#endif 163#endif
156#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
157 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
158#endif 166#endif
159#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
173#endif 181#endif
174#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
175 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
176#endif 184#endif
177#ifdef USE_XIM 185#ifdef USE_XIM
178 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
179#endif 187#endif
180#ifndef NO_BELL 188#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
182#endif 190#endif
183 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
184 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
186 check_ev (this, &rxvt_term::check_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
187 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
188 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
189 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
190 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
191{ 199{
192 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193 201
194 termlist.push_back (this); 202 termlist.push_back (this);
195 203
… …
198#endif 206#endif
199} 207}
200 208
201// 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.
202// for use before an emergency exit 210// for use before an emergency exit
211void
203void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
204{ 213{
205 if (cmd_pid) 214 if (cmd_pid)
206 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
207 216
208 pty_ev.stop (); 217 pty_ev.stop ();
… …
270 } 279 }
271 280
272 clear (); 281 clear ();
273 } 282 }
274 283
275 delete pix_colors_focused; 284 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
278#endif 287#endif
279 288
289 bgPixmap.destroy ();
280 displays.put (display); 290 displays.put (display);
281 291
282 scr_release (); 292 scr_release ();
283 293
284 /* clear all resources */ 294 /* clear all resources */
… …
301#endif 311#endif
302} 312}
303 313
304// child has exited, usually destroys 314// child has exited, usually destroys
305void 315void
306rxvt_term::child_cb (child_watcher &w, int status) 316rxvt_term::child_cb (ev::child &w, int status)
307{ 317{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 318 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 319
310 cmd_pid = 0; 320 cmd_pid = 0;
311 321
312 if (!OPTION (Opt_hold)) 322 if (!option (Opt_hold))
313 destroy (); 323 destroy ();
314} 324}
315 325
316void 326void
317rxvt_term::destroy () 327rxvt_term::destroy ()
… …
331 im_ev.stop (display); 341 im_ev.stop (display);
332#endif 342#endif
333#if HAVE_SCROLLBARS 343#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 344 scrollbar_ev.stop (display);
335#endif 345#endif
336#if TRANSPARENT || ENABLE_PERL 346#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 347 rootwin_ev.stop (display);
338#endif 348#endif
339 incr_ev.stop (); 349 incr_ev.stop ();
340 termwin_ev.stop (display); 350 termwin_ev.stop (display);
341 vt_ev.stop (display); 351 vt_ev.stop (display);
342 } 352 }
343 353
344 check_ev.stop (); 354 prepare_ev.stop ();
345 pty_ev.stop (); 355 pty_ev.stop ();
346#ifdef CURSOR_BLINK 356#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 357 cursor_blink_ev.stop ();
348#endif 358#endif
349#ifdef TEXT_BLINK 359#ifdef TEXT_BLINK
… …
357#endif 367#endif
358#ifdef POINTER_BLANK 368#ifdef POINTER_BLANK
359 pointer_ev.stop (); 369 pointer_ev.stop ();
360#endif 370#endif
361 371
362 destroy_ev.start (0); 372 destroy_ev.start ();
363} 373}
364 374
365void 375void
366rxvt_term::destroy_cb (time_watcher &w) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 377{
368 make_current (); 378 make_current ();
369 379
370 delete this; 380 delete this;
371} 381}
… …
425 else 435 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 437 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 439 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 441 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 443}
434#endif 444#endif
435 445
… …
481#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 492 keyboard->register_done ();
483#endif 493#endif
484 494
485#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 496 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 497 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 498#endif
489 499
490 pty = ptytty::create (); 500 pty = ptytty::create ();
491 501
… …
498#if 0 508#if 0
499 XSynchronize (dpy, True); 509 XSynchronize (dpy, True);
500#endif 510#endif
501 511
502#ifdef HAVE_SCROLLBARS 512#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 513 if (option (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 514 resize_scrollbar (); /* create and map scrollbar */
505#endif 515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
506#ifdef TRANSPARENT 520#ifdef ENABLE_TRANSPARENCY
507 if (OPTION (Opt_transparent)) 521 if (option (Opt_transparent))
508 { 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 ();
509 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
512 } 536 }
513#endif 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
514#if ENABLE_PERL 560#if ENABLE_PERL
515 rootwin_ev.start (display, display->root); 561 rootwin_ev.start (display, display->root);
516#endif 562#endif
517 563
518 set_colorfgbg (); 564 set_colorfgbg ();
… …
520 init_command (cmd_argv); 566 init_command (cmd_argv);
521 567
522 free (cmd_argv); 568 free (cmd_argv);
523 569
524 if (pty->pty >= 0) 570 if (pty->pty >= 0)
525 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
526 572
527 check_ev.start (); 573 prepare_ev.start ();
528 574
529 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
530 576
531#if ENABLE_XEMBED 577#if ENABLE_XEMBED
532 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
… …
544 return true; 590 return true;
545} 591}
546 592
547static struct sig_handlers 593static struct sig_handlers
548{ 594{
549 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
550 596
551 /* 597 /*
552 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
553 */ 599 */
554 void 600 void
555 sig_term (sig_watcher &w) 601 sig_term (ev::sig &w, int revents)
556 { 602 {
557 rxvt_emergency_cleanup (); 603 rxvt_emergency_cleanup ();
558 signal (w.signum, SIG_DFL); 604 w.stop ();
559 kill (getpid (), w.signum); 605 kill (getpid (), w.signum);
560 } 606 }
561 607
562 sig_handlers () 608 sig_handlers ()
563 : sw_term (this, &sig_handlers::sig_term), 609 : sw_term (this, &sig_handlers::sig_term),
… …
571void 617void
572rxvt_init () 618rxvt_init ()
573{ 619{
574 ptytty::init (); 620 ptytty::init ();
575 621
622 if (!ev::ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624
576 rxvt_environ = environ; 625 rxvt_environ = environ;
577 626
578 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
579 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
580 629
581 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
582 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
583 632
584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
585 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
586 635
587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
627 return p; 676 return p;
628} 677}
629 678
630/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
631/* 680/*
632 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
634 */ 683 */
635void 684void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 686{
… …
709 if (scrollBar.state) 758 if (scrollBar.state)
710 { 759 {
711 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
713 762
714 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 764 window_vt_x += sb_w;
716 } 765 }
717 766
718 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
… …
740 { 789 {
741 min_it (height, max_height); 790 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
743 } 792 }
744 793
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
747 796
748 if (recalc_x) 797 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 799
… …
812 delete fontset[0]; 861 delete fontset[0];
813 fontset[0] = fs; 862 fontset[0] = fs;
814 863
815 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 865 prop.height += lineSpace;
866
817 fs->set_prop (prop); 867 fs->set_prop (prop, false);
818 868
819 fwidth = prop.width; 869 fwidth = prop.width;
820 fheight = prop.height; 870 fheight = prop.height;
821 fbase = prop.ascent; 871 fbase = prop.ascent;
822 872
… …
831 { 881 {
832 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
833 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
834 884
835 if (res) 885 if (res)
836 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
837 else 890 else
838 { 891 {
839 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
840 893
841 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;
842 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);
843 } 898 }
844 899
845 fs->populate (res);
846 fs->set_prop (prop2);
847 } 900 }
848#else 901#else
849 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
850#endif 903#endif
851 } 904 }
… …
853 if (parent[0]) 906 if (parent[0])
854 { 907 {
855 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
856 scr_remap_chars (); 909 scr_remap_chars ();
857 scr_touch (true); 910 scr_touch (true);
858 } 911 }
859 912
860 return true; 913 return true;
861} 914}
862 915
916void
863void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
864{ 918{
865 XChangeProperty (dpy, parent[0], 919 XChangeProperty (dpy, parent[0],
866 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
867 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
868} 922}
869 923
924void
870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871{ 926{
872 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
873 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
874 929
875 XChangeProperty (dpy, parent[0], 930 XChangeProperty (dpy, parent[0],
… …
899#if ENABLE_EWMH 954#if ENABLE_EWMH
900 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901#endif 956#endif
902} 957}
903 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
904#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
905void
906rxvt_term::set_window_color (int idx, const char *color)
907{
908 rxvt_color xcol; 963 rxvt_color xcol;
909 int i; 964 int i;
910 965
911 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
912 return; 967 return;
913 968
914 color = strdup (color); 969 color = strdup (color);
915 allocated.push_back ((void *)color); 970 allocated.push_back ((void *)color);
… …
949 /*TODO: handle Color_BD, scrollbar background, etc. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
950 1005
951 update_fade_color (idx); 1006 update_fade_color (idx);
952 recolour_cursor (); 1007 recolour_cursor ();
953 scr_recolour (); 1008 scr_recolour ();
1009#endif /* XTERM_COLOR_CHANGE */
954} 1010}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 1011
960void 1012void
961rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
962{ 1014{
963 XColor fg, bg; 1015 XColor fg, bg;
… …
995 1047
996 for (i = Color_Black; i <= Color_White; i++) 1048 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1049 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1050 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1051 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1052#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1053 xpmb = "default;";
1002#endif 1054#endif
1003 break; 1055 break;
1004 } 1056 }
1005 1057
… …
1101 1153
1102 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1104 width, height); 1156 width, height);
1105 1157
1158#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ())
1160 update_background ();
1161#endif
1162
1106 scr_clear (); 1163 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1164 }
1111 1165
1112 if (fix_screen || old_height == 0) 1166 if (fix_screen || old_height == 0)
1113 scr_reset (); 1167 scr_reset ();
1114 1168
1115 // 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
1116 //scr_touch (false); 1170 //scr_touch (false);
1117 1171
1118#ifdef XPM_BACKGROUND 1172#ifdef HAVE_BG_PIXMAP
1119 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)
1120 scr_touch (false); 1175// scr_touch (false);
1121#endif 1176#endif
1122 1177
1123#ifdef USE_XIM 1178#ifdef USE_XIM
1124 IMSetPosition (); 1179 IMSetPosition ();
1125#endif 1180#endif
… …
1296 if (term->rs[Rs_imLocale]) 1351 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale); 1352 SET_LOCALE (term->locale);
1298 } 1353 }
1299 else 1354 else
1300 str = (void *)text->string.wide_char; 1355 str = (void *)text->string.wide_char;
1301 1356
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret, 1358 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first, 1359 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length, 1360 DT_INT, call_data->chg_length,
1306 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,
… …
1625 1680
1626 if (input_style & XIMPreeditPosition) 1681 if (input_style & XIMPreeditPosition)
1627 { 1682 {
1628 im_set_size (preedit_rect); 1683 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1684 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1685
1631 XSetICValues (Input_Context, 1686 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL); 1687 XNPreeditAttributes, preedit_attr, NULL);
1633 } 1688 }
1634 else 1689 else
1635 { 1690 {
… …
1652 XFree (status_attr); 1707 XFree (status_attr);
1653 } 1708 }
1654 1709
1655 XFree (preedit_attr); 1710 XFree (preedit_attr);
1656} 1711}
1657#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 */
1658 1782
1659/*----------------------- end-of-file (C source) -----------------------*/ 1783/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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