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

Diff Legend

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