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.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.256 by root, Sun Nov 11 04:08:00 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
… …
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),
… …
562 615
563void 616void
564rxvt_init () 617rxvt_init ()
565{ 618{
566 ptytty::init (); 619 ptytty::init ();
620 ev::ev_default_loop (0);
567 621
568 rxvt_environ = environ; 622 rxvt_environ = environ;
569 623
570 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
572 626
573 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
575 629
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
578 632
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
619 return p; 673 return p;
620} 674}
621 675
622/*----------------------------------------------------------------------*/ 676/*----------------------------------------------------------------------*/
623/* 677/*
624 * window size/position calculcations for XSizeHint and other storage. 678 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 679 * if width/height are non-zero then override calculated width/height
626 */ 680 */
627void 681void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 682rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 683{
… …
701 if (scrollBar.state) 755 if (scrollBar.state)
702 { 756 {
703 sb_w = scrollbar_TotalWidth (); 757 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 758 szHint.base_width += sb_w;
705 759
706 if (!OPTION (Opt_scrollBar_right)) 760 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 761 window_vt_x += sb_w;
708 } 762 }
709 763
710 szHint.width_inc = fwidth; 764 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 765 szHint.height_inc = fheight;
… …
732 { 786 {
733 min_it (height, max_height); 787 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 788 szHint.height = szHint.base_height + height;
735 } 789 }
736 790
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 791 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 792 window_sb_x = szHint.width - sb_w;
739 793
740 if (recalc_x) 794 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 795 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 796
… …
804 delete fontset[0]; 858 delete fontset[0];
805 fontset[0] = fs; 859 fontset[0] = fs;
806 860
807 prop = (*fs)[1]->properties (); 861 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 862 prop.height += lineSpace;
863
809 fs->set_prop (prop); 864 fs->set_prop (prop, false);
810 865
811 fwidth = prop.width; 866 fwidth = prop.width;
812 fheight = prop.height; 867 fheight = prop.height;
813 fbase = prop.ascent; 868 fbase = prop.ascent;
814 869
… …
823 { 878 {
824 fontset[style] = fs = new rxvt_fontset (this); 879 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 880 rxvt_fontprop prop2 = prop;
826 881
827 if (res) 882 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 883 {
884 fs->populate (res);
885 fs->set_prop (prop2, false);
886 }
829 else 887 else
830 { 888 {
831 res = fontset[0]->fontdesc; 889 fs->populate (fontset[0]->fontdesc);
832 890
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 891 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; 892 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
893
894 fs->set_prop (prop2, true);
835 } 895 }
836 896
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 897 }
840#else 898#else
841 fontset[style] = fontset[0]; 899 fontset[style] = fontset[0];
842#endif 900#endif
843 } 901 }
… …
845 if (parent[0]) 903 if (parent[0])
846 { 904 {
847 resize_all_windows (0, 0, 0); 905 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 906 scr_remap_chars ();
849 scr_touch (true); 907 scr_touch (true);
850 } 908 }
851 909
852 return true; 910 return true;
853} 911}
854 912
913void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 914rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 915{
857 XChangeProperty (dpy, parent[0], 916 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 917 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 918 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 919}
861 920
921void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 922rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 923{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 924 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 925 char *s = rxvt_wcstoutf8 (ws);
866 926
867 XChangeProperty (dpy, parent[0], 927 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 951#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 952 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 953#endif
894} 954}
895 955
956void
957rxvt_term::set_window_color (int idx, const char *color)
958{
896#ifdef XTERM_COLOR_CHANGE 959#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 960 rxvt_color xcol;
901 int i; 961 int i;
902 962
903 if (color == NULL || *color == '\0') 963 if (color == NULL || *color == '\0')
904 return; 964 return;
905 965
906 color = strdup (color); 966 color = strdup (color);
907 allocated.push_back ((void *)color); 967 allocated.push_back ((void *)color);
… …
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 1001 /*TODO: handle Color_BD, scrollbar background, etc. */
942 1002
943 update_fade_color (idx); 1003 update_fade_color (idx);
944 recolour_cursor (); 1004 recolour_cursor ();
945 scr_recolour (); 1005 scr_recolour ();
946}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
1007}
951 1008
952void 1009void
953rxvt_term::recolour_cursor () 1010rxvt_term::recolour_cursor ()
954{ 1011{
955 XColor fg, bg; 1012 XColor fg, bg;
… …
987 1044
988 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1046 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1047 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1048 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1049#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1050 xpmb = "default;";
994#endif 1051#endif
995 break; 1052 break;
996 } 1053 }
997 1054
… …
1093 1150
1094 XMoveResizeWindow (dpy, vt, 1151 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1096 width, height); 1153 width, height);
1097 1154
1155#ifdef HAVE_BG_PIXMAP
1156 if (bgPixmap.window_size_sensitive ())
1157 update_background ();
1158#endif
1159
1098 scr_clear (); 1160 scr_clear ();
1099#ifdef XPM_BACKGROUND
1100 resize_pixmap ();
1101#endif
1102 } 1161 }
1103 1162
1104 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1105 scr_reset (); 1164 scr_reset ();
1106 1165
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false); 1167 //scr_touch (false);
1109 1168
1110#ifdef XPM_BACKGROUND 1169#ifdef HAVE_BG_PIXMAP
1111 if (pixmap) 1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap)
1112 scr_touch (false); 1172// scr_touch (false);
1113#endif 1173#endif
1114 1174
1115#ifdef USE_XIM 1175#ifdef USE_XIM
1116 IMSetPosition (); 1176 IMSetPosition ();
1117#endif 1177#endif
… …
1288 if (term->rs[Rs_imLocale]) 1348 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->locale); 1349 SET_LOCALE (term->locale);
1290 } 1350 }
1291 else 1351 else
1292 str = (void *)text->string.wide_char; 1352 str = (void *)text->string.wide_char;
1293 1353
1294 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1295 DT_INT, call_data->caret, 1355 DT_INT, call_data->caret,
1296 DT_INT, call_data->chg_first, 1356 DT_INT, call_data->chg_first,
1297 DT_INT, call_data->chg_length, 1357 DT_INT, call_data->chg_length,
1298 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1358 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1617 1677
1618 if (input_style & XIMPreeditPosition) 1678 if (input_style & XIMPreeditPosition)
1619 { 1679 {
1620 im_set_size (preedit_rect); 1680 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1681 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622 1682
1623 XSetICValues (Input_Context, 1683 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL); 1684 XNPreeditAttributes, preedit_attr, NULL);
1625 } 1685 }
1626 else 1686 else
1627 { 1687 {
… …
1646 1706
1647 XFree (preedit_attr); 1707 XFree (preedit_attr);
1648} 1708}
1649#endif /* USE_XIM */ 1709#endif /* USE_XIM */
1650 1710
1711void
1712rxvt_term::get_window_origin (int &x, int &y)
1713{
1714 Window cr;
1715 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1716/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1717}
1718
1719Pixmap
1720rxvt_term::get_pixmap_property (int prop_id)
1721{
1722 if (prop_id > 0 && prop_id < NUM_XA)
1723 if (xa[prop_id])
1724 {
1725 int aformat;
1726 unsigned long nitems, bytes_after;
1727 Atom atype;
1728 unsigned char *prop = NULL;
1729 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1730 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1731 &nitems, &bytes_after, &prop);
1732 if (result == Success && prop && atype == XA_PIXMAP)
1733 {
1734 return *(Pixmap *)prop;
1735 }
1736 }
1737 return None;
1738}
1739
1740#ifdef HAVE_BG_PIXMAP
1741int
1742rxvt_term::update_background ()
1743{
1744 bgPixmap.invalidate ();
1745
1746 /* no chance of real time refresh if we are blurring! */
1747 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1748 bgPixmap.render ();
1749 else
1750 {
1751 update_background_ev.stop ();
1752
1753 if (!bgPixmap.need_client_side_rendering())
1754 update_background_ev.start (.05);
1755 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1756 update_background_ev.start (.20); /* very slow !!! */
1757 else
1758 update_background_ev.start (.07);
1759 }
1760
1761 return 0;
1762}
1763
1764void
1765rxvt_term::update_background_cb (ev::timer &w, int revents)
1766{
1767 bgPixmap.render ();
1768}
1769
1770#endif /* HAVE_BG_PIXMAP */
1771
1651/*----------------------- end-of-file (C source) -----------------------*/ 1772/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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