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

Diff Legend

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