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.267 by root, Tue Nov 27 17:45:46 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#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
280 displays.put (display); 292 displays.put (display);
281 293
282 scr_release (); 294 scr_release ();
283 295
284 /* clear all resources */ 296 /* clear all resources */
… …
297 delete argv; 309 delete argv;
298 310
299#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
300 delete keyboard; 312 delete keyboard;
301#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
302} 317}
303 318
304// child has exited, usually destroys 319// child has exited, usually destroys
305void 320void
306rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
307{ 322{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 324
310 cmd_pid = 0; 325 cmd_pid = 0;
311 326
312 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
313 destroy (); 328 destroy ();
314} 329}
315 330
316void 331void
317rxvt_term::destroy () 332rxvt_term::destroy ()
… …
331 im_ev.stop (display); 346 im_ev.stop (display);
332#endif 347#endif
333#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
335#endif 350#endif
336#if TRANSPARENT || ENABLE_PERL 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
338#endif 353#endif
339 incr_ev.stop (); 354 incr_ev.stop ();
340 termwin_ev.stop (display); 355 termwin_ev.stop (display);
341 vt_ev.stop (display); 356 vt_ev.stop (display);
342 } 357 }
343 358
344 check_ev.stop (); 359 prepare_ev.stop ();
345 pty_ev.stop (); 360 pty_ev.stop ();
346#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
348#endif 363#endif
349#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
357#endif 372#endif
358#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
359 pointer_ev.stop (); 374 pointer_ev.stop ();
360#endif 375#endif
361 376
362 destroy_ev.start (0); 377 destroy_ev.start ();
363} 378}
364 379
365void 380void
366rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 382{
368 make_current (); 383 make_current ();
369 384
370 delete this; 385 delete this;
371} 386}
… …
425 else 440 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 442 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 444 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 446 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 448}
434#endif 449#endif
435 450
… …
481#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 497 keyboard->register_done ();
483#endif 498#endif
484 499
485#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 503#endif
489 504
490 pty = ptytty::create (); 505 pty = ptytty::create ();
491 506
… …
498#if 0 513#if 0
499 XSynchronize (dpy, True); 514 XSynchronize (dpy, True);
500#endif 515#endif
501 516
502#ifdef HAVE_SCROLLBARS 517#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 518 if (option (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 519 resize_scrollbar (); /* create and map scrollbar */
505#endif 520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
506#ifdef TRANSPARENT 525#ifdef ENABLE_TRANSPARENCY
507 if (OPTION (Opt_transparent)) 526 if (option (Opt_transparent))
508 { 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 ();
509 XSelectInput (dpy, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
512 } 541 }
513#endif 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
514#if ENABLE_PERL 565#if ENABLE_PERL
515 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
516#endif 567#endif
517 568
518 set_colorfgbg (); 569 set_colorfgbg ();
… …
520 init_command (cmd_argv); 571 init_command (cmd_argv);
521 572
522 free (cmd_argv); 573 free (cmd_argv);
523 574
524 if (pty->pty >= 0) 575 if (pty->pty >= 0)
525 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
526 577
527 check_ev.start (); 578 prepare_ev.start ();
528 579
529 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
530 581
531#if ENABLE_XEMBED 582#if ENABLE_XEMBED
532 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
… …
544 return true; 595 return true;
545} 596}
546 597
547static struct sig_handlers 598static struct sig_handlers
548{ 599{
549 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
550 601
551 /* 602 /*
552 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
553 */ 604 */
554 void 605 void
555 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
556 { 607 {
557 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
558 signal (w.signum, SIG_DFL); 609 w.stop ();
559 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
560 } 611 }
561 612
562 sig_handlers () 613 sig_handlers ()
563 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
571void 622void
572rxvt_init () 623rxvt_init ()
573{ 624{
574 ptytty::init (); 625 ptytty::init ();
575 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
576 rxvt_environ = environ; 630 rxvt_environ = environ;
577 631
578 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
579 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
580 634
581 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
583 637
584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
585 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
586 640
587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
627 return p; 681 return p;
628} 682}
629 683
630/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
631/* 685/*
632 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
634 */ 688 */
635void 689void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 691{
… …
709 if (scrollBar.state) 763 if (scrollBar.state)
710 { 764 {
711 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
713 767
714 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 769 window_vt_x += sb_w;
716 } 770 }
717 771
718 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
… …
740 { 794 {
741 min_it (height, max_height); 795 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
743 } 797 }
744 798
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
747 801
748 if (recalc_x) 802 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 804
… …
812 delete fontset[0]; 866 delete fontset[0];
813 fontset[0] = fs; 867 fontset[0] = fs;
814 868
815 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 870 prop.height += lineSpace;
871
817 fs->set_prop (prop); 872 fs->set_prop (prop, false);
818 873
819 fwidth = prop.width; 874 fwidth = prop.width;
820 fheight = prop.height; 875 fheight = prop.height;
821 fbase = prop.ascent; 876 fbase = prop.ascent;
822 877
… …
831 { 886 {
832 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
833 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
834 889
835 if (res) 890 if (res)
836 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
837 else 895 else
838 { 896 {
839 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
840 898
841 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;
842 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);
843 } 903 }
844 904
845 fs->populate (res);
846 fs->set_prop (prop2);
847 } 905 }
848#else 906#else
849 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
850#endif 908#endif
851 } 909 }
… …
853 if (parent[0]) 911 if (parent[0])
854 { 912 {
855 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
856 scr_remap_chars (); 914 scr_remap_chars ();
857 scr_touch (true); 915 scr_touch (true);
858 } 916 }
859 917
860 return true; 918 return true;
861} 919}
862 920
921void
863void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
864{ 923{
865 XChangeProperty (dpy, parent[0], 924 XChangeProperty (dpy, parent[0],
866 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
867 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
868} 927}
869 928
929void
870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871{ 931{
872 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
873 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
874 934
875 XChangeProperty (dpy, parent[0], 935 XChangeProperty (dpy, parent[0],
… …
899#if ENABLE_EWMH 959#if ENABLE_EWMH
900 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901#endif 961#endif
902} 962}
903 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
904#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
905void
906rxvt_term::set_window_color (int idx, const char *color)
907{
908 rxvt_color xcol; 968 rxvt_color xcol;
909 int i; 969 int i;
910 970
911 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
912 return; 972 return;
913 973
914 color = strdup (color); 974 color = strdup (color);
915 allocated.push_back ((void *)color); 975 allocated.push_back ((void *)color);
… …
919 if (isdigit (*color)) 979 if (isdigit (*color))
920 { 980 {
921 i = atoi (color); 981 i = atoi (color);
922 982
923 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
924 { /* bright colors */ 985 /* bright colors */
925 i -= 8;
926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
927 goto done; 987 goto done;
928 } 988 }
929 989
930 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
931 { /* normal colors */ 992 /* normal colors */
932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
933 goto done; 994 goto done;
934 } 995 }
935 } 996 }
936 997
… …
941 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
942 */ 1003 */
943 1004
944 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
945 1006
946 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */
948done: 1007done:
949 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
950 1009
951 update_fade_color (idx); 1010 update_fade_color (idx);
952 recolour_cursor (); 1011 recolour_cursor ();
953 scr_recolour (); 1012 scr_recolour ();
1013#endif /* XTERM_COLOR_CHANGE */
954} 1014}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 1015
960void 1016void
961rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
962{ 1018{
963 XColor fg, bg; 1019 XColor fg, bg;
… …
995 1051
996 for (i = Color_Black; i <= Color_White; i++) 1052 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1053 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1054 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1055 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1056#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1057 xpmb = "default;";
1002#endif 1058#endif
1003 break; 1059 break;
1004 } 1060 }
1005 1061
… …
1101 1157
1102 XMoveResizeWindow (dpy, vt, 1158 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1104 width, height); 1160 width, height);
1105 1161
1162#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ())
1164 update_background ();
1165#endif
1166
1106 scr_clear (); 1167 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1168 }
1111 1169
1112 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1113 scr_reset (); 1171 scr_reset ();
1114 1172
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false); 1174 //scr_touch (false);
1117 1175
1118#ifdef XPM_BACKGROUND 1176#ifdef HAVE_BG_PIXMAP
1119 if (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)
1120 scr_touch (false); 1179// scr_touch (false);
1121#endif 1180#endif
1122 1181
1123#ifdef USE_XIM 1182#ifdef USE_XIM
1124 IMSetPosition (); 1183 IMSetPosition ();
1125#endif 1184#endif
… …
1296 if (term->rs[Rs_imLocale]) 1355 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale); 1356 SET_LOCALE (term->locale);
1298 } 1357 }
1299 else 1358 else
1300 str = (void *)text->string.wide_char; 1359 str = (void *)text->string.wide_char;
1301 1360
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret, 1362 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first, 1363 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length, 1364 DT_INT, call_data->chg_length,
1306 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,
… …
1625 1684
1626 if (input_style & XIMPreeditPosition) 1685 if (input_style & XIMPreeditPosition)
1627 { 1686 {
1628 im_set_size (preedit_rect); 1687 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1688 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1689
1631 XSetICValues (Input_Context, 1690 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL); 1691 XNPreeditAttributes, preedit_attr, NULL);
1633 } 1692 }
1634 else 1693 else
1635 { 1694 {
… …
1652 XFree (status_attr); 1711 XFree (status_attr);
1653 } 1712 }
1654 1713
1655 XFree (preedit_attr); 1714 XFree (preedit_attr);
1656} 1715}
1657#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 */
1658 1787
1659/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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