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.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.257 by root, Sun Nov 11 17:10:45 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
… …
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{
… …
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
275 displays.put (display); 289 displays.put (display);
276 290
277 scr_release (); 291 scr_release ();
… …
296#endif 310#endif
297} 311}
298 312
299// child has exited, usually destroys 313// child has exited, usually destroys
300void 314void
301rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
302{ 316{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 318
305 cmd_pid = 0; 319 cmd_pid = 0;
306 320
307 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
308 destroy (); 322 destroy ();
309} 323}
310 324
311void 325void
312rxvt_term::destroy () 326rxvt_term::destroy ()
… …
326 im_ev.stop (display); 340 im_ev.stop (display);
327#endif 341#endif
328#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
330#endif 344#endif
331#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
333#endif 347#endif
334 incr_ev.stop (); 348 incr_ev.stop ();
335 termwin_ev.stop (display); 349 termwin_ev.stop (display);
336 vt_ev.stop (display); 350 vt_ev.stop (display);
337 } 351 }
338 352
339 check_ev.stop (); 353 prepare_ev.stop ();
340 pty_ev.stop (); 354 pty_ev.stop ();
341#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
343#endif 357#endif
344#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
352#endif 366#endif
353#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
354 pointer_ev.stop (); 368 pointer_ev.stop ();
355#endif 369#endif
356 370
357 destroy_ev.start (0); 371 destroy_ev.start ();
358} 372}
359 373
360void 374void
361rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::check &w, int revents)
362{ 376{
363 make_current (); 377 make_current ();
364 378
365 delete this; 379 delete this;
366} 380}
… …
420 else 434 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 436 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 438 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 440 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 442}
429#endif 443#endif
430 444
… …
476#ifdef KEYSYM_RESOURCE 490#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 491 keyboard->register_done ();
478#endif 492#endif
479 493
480#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 495 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 497#endif
484 498
485 pty = ptytty::create (); 499 pty = ptytty::create ();
486 500
… …
493#if 0 507#if 0
494 XSynchronize (dpy, True); 508 XSynchronize (dpy, True);
495#endif 509#endif
496 510
497#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 512 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
500#endif 514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
501#ifdef TRANSPARENT 519#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 520 if (option (Opt_transparent))
503 { 521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
507 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
508#endif 561#endif
509 562
510 set_colorfgbg (); 563 set_colorfgbg ();
511 564
512 init_command (cmd_argv); 565 init_command (cmd_argv);
513 566
514 free (cmd_argv); 567 free (cmd_argv);
515 568
516 if (pty->pty >= 0) 569 if (pty->pty >= 0)
517 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
518 571
519 check_ev.start (); 572 prepare_ev.start ();
520 573
521 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
522 575
523#if ENABLE_XEMBED 576#if ENABLE_XEMBED
524 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
… …
536 return true; 589 return true;
537} 590}
538 591
539static struct sig_handlers 592static struct sig_handlers
540{ 593{
541 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
542 595
543 /* 596 /*
544 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
545 */ 598 */
546 void 599 void
547 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
548 { 601 {
549 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
550 signal (w.signum, SIG_DFL); 603 w.stop ();
551 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
552 } 605 }
553 606
554 sig_handlers () 607 sig_handlers ()
555 : sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
… …
563void 616void
564rxvt_init () 617rxvt_init ()
565{ 618{
566 ptytty::init (); 619 ptytty::init ();
567 620
621 if (!ev::ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623
568 rxvt_environ = environ; 624 rxvt_environ = environ;
569 625
570 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
572 628
573 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
575 631
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
578 634
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
619 return p; 675 return p;
620} 676}
621 677
622/*----------------------------------------------------------------------*/ 678/*----------------------------------------------------------------------*/
623/* 679/*
624 * window size/position calculcations for XSizeHint and other storage. 680 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 681 * if width/height are non-zero then override calculated width/height
626 */ 682 */
627void 683void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 685{
… …
701 if (scrollBar.state) 757 if (scrollBar.state)
702 { 758 {
703 sb_w = scrollbar_TotalWidth (); 759 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 760 szHint.base_width += sb_w;
705 761
706 if (!OPTION (Opt_scrollBar_right)) 762 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 763 window_vt_x += sb_w;
708 } 764 }
709 765
710 szHint.width_inc = fwidth; 766 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 767 szHint.height_inc = fheight;
… …
732 { 788 {
733 min_it (height, max_height); 789 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 790 szHint.height = szHint.base_height + height;
735 } 791 }
736 792
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 793 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 794 window_sb_x = szHint.width - sb_w;
739 795
740 if (recalc_x) 796 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 798
… …
804 delete fontset[0]; 860 delete fontset[0];
805 fontset[0] = fs; 861 fontset[0] = fs;
806 862
807 prop = (*fs)[1]->properties (); 863 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 864 prop.height += lineSpace;
865
809 fs->set_prop (prop); 866 fs->set_prop (prop, false);
810 867
811 fwidth = prop.width; 868 fwidth = prop.width;
812 fheight = prop.height; 869 fheight = prop.height;
813 fbase = prop.ascent; 870 fbase = prop.ascent;
814 871
… …
823 { 880 {
824 fontset[style] = fs = new rxvt_fontset (this); 881 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 882 rxvt_fontprop prop2 = prop;
826 883
827 if (res) 884 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 885 {
886 fs->populate (res);
887 fs->set_prop (prop2, false);
888 }
829 else 889 else
830 { 890 {
831 res = fontset[0]->fontdesc; 891 fs->populate (fontset[0]->fontdesc);
832 892
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 893 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; 894 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
895
896 fs->set_prop (prop2, true);
835 } 897 }
836 898
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 899 }
840#else 900#else
841 fontset[style] = fontset[0]; 901 fontset[style] = fontset[0];
842#endif 902#endif
843 } 903 }
… …
845 if (parent[0]) 905 if (parent[0])
846 { 906 {
847 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 908 scr_remap_chars ();
849 scr_touch (true); 909 scr_touch (true);
850 } 910 }
851 911
852 return true; 912 return true;
853} 913}
854 914
915void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 916rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 917{
857 XChangeProperty (dpy, parent[0], 918 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 919 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 920 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 921}
861 922
923void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 924rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 925{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 926 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 927 char *s = rxvt_wcstoutf8 (ws);
866 928
867 XChangeProperty (dpy, parent[0], 929 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 953#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 955#endif
894} 956}
895 957
958void
959rxvt_term::set_window_color (int idx, const char *color)
960{
896#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 962 rxvt_color xcol;
901 int i; 963 int i;
902 964
903 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
904 return; 966 return;
905 967
906 color = strdup (color); 968 color = strdup (color);
907 allocated.push_back ((void *)color); 969 allocated.push_back ((void *)color);
… …
936 pix_colors_focused[idx] = xcol; 998 pix_colors_focused[idx] = xcol;
937 999
938 /* XSetWindowAttributes attr; */ 1000 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */ 1001 /* Cursor cursor; */
940done: 1002done:
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. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
952 1004
1005 update_fade_color (idx);
953 recolour_cursor (); 1006 recolour_cursor ();
954 scr_recolour (); 1007 scr_recolour ();
955}
956
957#else
958# define set_window_color (idx,color) ((void)0)
959#endif /* XTERM_COLOR_CHANGE */ 1008#endif /* XTERM_COLOR_CHANGE */
1009}
960 1010
961void 1011void
962rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
963{ 1013{
964 XColor fg, bg; 1014 XColor fg, bg;
… …
996 1046
997 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
998 if (pix_colors[Color_bg] == pix_colors[i]) 1048 if (pix_colors[Color_bg] == pix_colors[i])
999 { 1049 {
1000 sprintf (bstr, "%d", (i - Color_Black)); 1050 sprintf (bstr, "%d", (i - Color_Black));
1001#ifdef XPM_BACKGROUND 1051#ifdef BG_IMAGE_FROM_FILE
1002 xpmb = "default;"; 1052 xpmb = "default;";
1003#endif 1053#endif
1004 break; 1054 break;
1005 } 1055 }
1006 1056
… …
1102 1152
1103 XMoveResizeWindow (dpy, vt, 1153 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1154 window_vt_x, window_vt_y,
1105 width, height); 1155 width, height);
1106 1156
1157#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ())
1159 update_background ();
1160#endif
1161
1107 scr_clear (); 1162 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1163 }
1112 1164
1113 if (fix_screen || old_height == 0) 1165 if (fix_screen || old_height == 0)
1114 scr_reset (); 1166 scr_reset ();
1115 1167
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false); 1169 //scr_touch (false);
1118 1170
1119#ifdef XPM_BACKGROUND 1171#ifdef HAVE_BG_PIXMAP
1120 if (pixmap) 1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173// if (bgPixmap.pixmap)
1121 scr_touch (false); 1174// scr_touch (false);
1122#endif 1175#endif
1123 1176
1124#ifdef USE_XIM 1177#ifdef USE_XIM
1125 IMSetPosition (); 1178 IMSetPosition ();
1126#endif 1179#endif
… …
1297 if (term->rs[Rs_imLocale]) 1350 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale); 1351 SET_LOCALE (term->locale);
1299 } 1352 }
1300 else 1353 else
1301 str = (void *)text->string.wide_char; 1354 str = (void *)text->string.wide_char;
1302 1355
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret, 1357 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first, 1358 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length, 1359 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1360 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1626 1679
1627 if (input_style & XIMPreeditPosition) 1680 if (input_style & XIMPreeditPosition)
1628 { 1681 {
1629 im_set_size (preedit_rect); 1682 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 1684
1632 XSetICValues (Input_Context, 1685 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL); 1686 XNPreeditAttributes, preedit_attr, NULL);
1634 } 1687 }
1635 else 1688 else
1636 { 1689 {
… …
1655 1708
1656 XFree (preedit_attr); 1709 XFree (preedit_attr);
1657} 1710}
1658#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1659 1712
1713void
1714rxvt_term::get_window_origin (int &x, int &y)
1715{
1716 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740}
1741
1742#ifdef HAVE_BG_PIXMAP
1743int
1744rxvt_term::update_background ()
1745{
1746 bgPixmap.invalidate ();
1747
1748 /* no chance of real time refresh if we are blurring! */
1749 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1750 bgPixmap.render ();
1751 else
1752 {
1753 update_background_ev.stop ();
1754
1755 if (!bgPixmap.need_client_side_rendering())
1756 update_background_ev.start (.05);
1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758 update_background_ev.start (.20); /* very slow !!! */
1759 else
1760 update_background_ev.start (.07);
1761 }
1762
1763 return 0;
1764}
1765
1766void
1767rxvt_term::update_background_cb (ev::timer &w, int revents)
1768{
1769 bgPixmap.render ();
1770}
1771
1772#endif /* HAVE_BG_PIXMAP */
1773
1660/*----------------------- end-of-file (C source) -----------------------*/ 1774/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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