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.269 by root, Tue Dec 4 14:50:42 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 HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 160#endif
154#ifdef CURSOR_BLINK 161#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 163#endif
157#ifdef TEXT_BLINK 164#ifdef TEXT_BLINK
… …
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 175#endif
169#ifdef POINTER_BLANK 176#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 177 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 178#endif
179#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb),
181#endif
182 child_ev (this, &rxvt_term::child_cb),
183 prepare_ev (this, &rxvt_term::prepare_cb),
184 flush_ev (this, &rxvt_term::flush_cb),
185 destroy_ev (this, &rxvt_term::destroy_cb),
186 pty_ev (this, &rxvt_term::pty_cb),
187 incr_ev (this, &rxvt_term::incr_cb)
188{
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
172#ifdef USE_XIM 195#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 196 callback_set (im_ev , this, rxvt_term, im_cb);
174#endif 197#endif
175#ifndef NO_BELL 198 callback_set (termwin_ev , this, rxvt_term, x_cb);
176 bell_ev (this, &rxvt_term::bell_cb), 199 callback_set (vt_ev , this, rxvt_term, x_cb);
177#endif 200
178 termwin_ev (this, &rxvt_term::x_cb),
179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
181 check_ev (this, &rxvt_term::check_cb),
182 flush_ev (this, &rxvt_term::flush_cb),
183 destroy_ev (this, &rxvt_term::destroy_cb),
184 pty_ev (this, &rxvt_term::pty_cb),
185 incr_ev (this, &rxvt_term::incr_cb)
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 202
189 termlist.push_back (this); 203 termlist.push_back (this);
190 204
191#ifdef KEYSYM_RESOURCE 205#ifdef KEYSYM_RESOURCE
… …
193#endif 207#endif
194} 208}
195 209
196// clean up the most important stuff, do *not* call x or free mem etc. 210// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 211// for use before an emergency exit
212void
198void rxvt_term::emergency_cleanup () 213rxvt_term::emergency_cleanup ()
199{ 214{
200 if (cmd_pid) 215 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 216 kill (-cmd_pid, SIGHUP);
202 217
203 pty_ev.stop (); 218 pty_ev.stop ();
… …
265 } 280 }
266 281
267 clear (); 282 clear ();
268 } 283 }
269 284
270 delete pix_colors_focused; 285 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 286#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 287 delete [] pix_colors_unfocused;
273#endif 288#endif
274 289
290#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy ();
292#endif
275 displays.put (display); 293 displays.put (display);
276 294
277 scr_release (); 295 scr_release ();
278 296
279 /* clear all resources */ 297 /* clear all resources */
… …
292 delete argv; 310 delete argv;
293 311
294#ifdef KEYSYM_RESOURCE 312#ifdef KEYSYM_RESOURCE
295 delete keyboard; 313 delete keyboard;
296#endif 314#endif
315#ifndef NO_RESOURCES
316 XrmDestroyDatabase (option_db);
317#endif
297} 318}
298 319
299// child has exited, usually destroys 320// child has exited, usually destroys
300void 321void
301rxvt_term::child_cb (child_watcher &w, int status) 322rxvt_term::child_cb (ev::child &w, int status)
302{ 323{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 324 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 325
305 cmd_pid = 0; 326 cmd_pid = 0;
306 327
307 if (!OPTION (Opt_hold)) 328 if (!option (Opt_hold))
308 destroy (); 329 destroy ();
309} 330}
310 331
311void 332void
312rxvt_term::destroy () 333rxvt_term::destroy ()
… …
326 im_ev.stop (display); 347 im_ev.stop (display);
327#endif 348#endif
328#if HAVE_SCROLLBARS 349#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 350 scrollbar_ev.stop (display);
330#endif 351#endif
331#if TRANSPARENT 352#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 353 rootwin_ev.stop (display);
333#endif 354#endif
334 incr_ev.stop (); 355 incr_ev.stop ();
335 termwin_ev.stop (display); 356 termwin_ev.stop (display);
336 vt_ev.stop (display); 357 vt_ev.stop (display);
337 } 358 }
338 359
339 check_ev.stop (); 360 prepare_ev.stop ();
340 pty_ev.stop (); 361 pty_ev.stop ();
341#ifdef CURSOR_BLINK 362#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 363 cursor_blink_ev.stop ();
343#endif 364#endif
344#ifdef TEXT_BLINK 365#ifdef TEXT_BLINK
… …
352#endif 373#endif
353#ifdef POINTER_BLANK 374#ifdef POINTER_BLANK
354 pointer_ev.stop (); 375 pointer_ev.stop ();
355#endif 376#endif
356 377
357 destroy_ev.start (0); 378 destroy_ev.start ();
358} 379}
359 380
360void 381void
361rxvt_term::destroy_cb (time_watcher &w) 382rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 383{
363 make_current (); 384 make_current ();
364 385
365 delete this; 386 delete this;
366} 387}
… …
420 else 441 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 442 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 443 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 445 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 446 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 447 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 448 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 449}
429#endif 450#endif
430 451
… …
476#ifdef KEYSYM_RESOURCE 497#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 498 keyboard->register_done ();
478#endif 499#endif
479 500
480#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 502 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 504#endif
484 505
485 pty = ptytty::create (); 506 pty = ptytty::create ();
486 507
… …
493#if 0 514#if 0
494 XSynchronize (dpy, True); 515 XSynchronize (dpy, True);
495#endif 516#endif
496 517
497#ifdef HAVE_SCROLLBARS 518#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 519 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 520 resize_scrollbar (); /* create and map scrollbar */
500#endif 521#endif
522#ifdef HAVE_BG_PIXMAP
523 {
524 bgPixmap.set_target (this);
525
501#ifdef TRANSPARENT 526#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 527 if (option (Opt_transparent))
503 { 528 {
529 bgPixmap.set_transparent ();
530#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif
534 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]);
538
539 bgPixmap.set_root_pixmap ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 540 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 541 rootwin_ev.start (display, display->root);
507 } 542 }
543#endif
544
545#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL)
547 {
548 const char *p = rs[Rs_backgroundPixmap];
549
550 if ((p = strchr (p, ';')) != NULL)
551 {
552 p++;
553 bgPixmap.set_geometry (p);
554 }
555 else
556 bgPixmap.set_defaultGeometry ();
557
558 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559 if (!bgPixmap.window_position_sensitive ())
560 update_background ();
561 }
562#endif
563 }
564#endif
565
566#if ENABLE_PERL
567 rootwin_ev.start (display, display->root);
508#endif 568#endif
509 569
510 set_colorfgbg (); 570 set_colorfgbg ();
511 571
512 init_command (cmd_argv); 572 init_command (cmd_argv);
513 573
514 free (cmd_argv); 574 free (cmd_argv);
515 575
516 if (pty->pty >= 0) 576 if (pty->pty >= 0)
517 pty_ev.start (pty->pty, EVENT_READ); 577 pty_ev.start (pty->pty, ev::READ);
518 578
519 check_ev.start (); 579 prepare_ev.start ();
520 580
521 HOOK_INVOKE ((this, HOOK_START, DT_END)); 581 HOOK_INVOKE ((this, HOOK_START, DT_END));
522 582
523#if ENABLE_XEMBED 583#if ENABLE_XEMBED
524 if (rs[Rs_embed]) 584 if (rs[Rs_embed])
… …
536 return true; 596 return true;
537} 597}
538 598
539static struct sig_handlers 599static struct sig_handlers
540{ 600{
541 sig_watcher sw_term, sw_int; 601 ev::sig sw_term, sw_int;
542 602
543 /* 603 /*
544 * Catch a fatal signal and tidy up before quitting 604 * Catch a fatal signal and tidy up before quitting
545 */ 605 */
546 void 606 void
547 sig_term (sig_watcher &w) 607 sig_term (ev::sig &w, int revents)
548 { 608 {
549 rxvt_emergency_cleanup (); 609 rxvt_emergency_cleanup ();
550 signal (w.signum, SIG_DFL); 610 w.stop ();
551 kill (getpid (), w.signum); 611 kill (getpid (), w.signum);
552 } 612 }
553 613
554 sig_handlers () 614 sig_handlers ()
555 : sw_term (this, &sig_handlers::sig_term), 615 : sw_term (this, &sig_handlers::sig_term),
… …
563void 623void
564rxvt_init () 624rxvt_init ()
565{ 625{
566 ptytty::init (); 626 ptytty::init ();
567 627
628 if (!ev_default_loop (0))
629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
630
568 rxvt_environ = environ; 631 rxvt_environ = environ;
569 632
570 signal (SIGHUP, SIG_IGN); 633 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 634 signal (SIGPIPE, SIG_IGN);
572 635
573 sig_handlers.sw_term.start (SIGTERM); 636 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 637 sig_handlers.sw_int.start (SIGINT); ev_unref ();
575 638
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 640 /* signal (SIGURG, SIG_DFL); */
578 641
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
619 return p; 682 return p;
620} 683}
621 684
622/*----------------------------------------------------------------------*/ 685/*----------------------------------------------------------------------*/
623/* 686/*
624 * window size/position calculcations for XSizeHint and other storage. 687 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 688 * if width/height are non-zero then override calculated width/height
626 */ 689 */
627void 690void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 691rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 692{
… …
701 if (scrollBar.state) 764 if (scrollBar.state)
702 { 765 {
703 sb_w = scrollbar_TotalWidth (); 766 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 767 szHint.base_width += sb_w;
705 768
706 if (!OPTION (Opt_scrollBar_right)) 769 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 770 window_vt_x += sb_w;
708 } 771 }
709 772
710 szHint.width_inc = fwidth; 773 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 774 szHint.height_inc = fheight;
… …
732 { 795 {
733 min_it (height, max_height); 796 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 797 szHint.height = szHint.base_height + height;
735 } 798 }
736 799
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 800 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 801 window_sb_x = szHint.width - sb_w;
739 802
740 if (recalc_x) 803 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 804 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 805
… …
804 delete fontset[0]; 867 delete fontset[0];
805 fontset[0] = fs; 868 fontset[0] = fs;
806 869
807 prop = (*fs)[1]->properties (); 870 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 871 prop.height += lineSpace;
872
809 fs->set_prop (prop); 873 fs->set_prop (prop, false);
810 874
811 fwidth = prop.width; 875 fwidth = prop.width;
812 fheight = prop.height; 876 fheight = prop.height;
813 fbase = prop.ascent; 877 fbase = prop.ascent;
814 878
… …
823 { 887 {
824 fontset[style] = fs = new rxvt_fontset (this); 888 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 889 rxvt_fontprop prop2 = prop;
826 890
827 if (res) 891 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 892 {
893 fs->populate (res);
894 fs->set_prop (prop2, false);
895 }
829 else 896 else
830 { 897 {
831 res = fontset[0]->fontdesc; 898 fs->populate (fontset[0]->fontdesc);
832 899
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 900 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; 901 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
902
903 fs->set_prop (prop2, true);
835 } 904 }
836 905
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 906 }
840#else 907#else
841 fontset[style] = fontset[0]; 908 fontset[style] = fontset[0];
842#endif 909#endif
843 } 910 }
… …
845 if (parent[0]) 912 if (parent[0])
846 { 913 {
847 resize_all_windows (0, 0, 0); 914 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 915 scr_remap_chars ();
849 scr_touch (true); 916 scr_touch (true);
850 } 917 }
851 918
852 return true; 919 return true;
853} 920}
854 921
922void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 923rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 924{
857 XChangeProperty (dpy, parent[0], 925 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 926 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 927 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 928}
861 929
930void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 931rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 932{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 933 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 934 char *s = rxvt_wcstoutf8 (ws);
866 935
867 XChangeProperty (dpy, parent[0], 936 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 960#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 961 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 962#endif
894} 963}
895 964
965void
966rxvt_term::set_window_color (int idx, const char *color)
967{
896#ifdef XTERM_COLOR_CHANGE 968#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 969 rxvt_color xcol;
901 int i; 970 int i;
902 971
903 if (color == NULL || *color == '\0') 972 if (color == NULL || *color == '\0')
904 return; 973 return;
905 974
906 color = strdup (color); 975 color = strdup (color);
907 allocated.push_back ((void *)color); 976 allocated.push_back ((void *)color);
… …
911 if (isdigit (*color)) 980 if (isdigit (*color))
912 { 981 {
913 i = atoi (color); 982 i = atoi (color);
914 983
915 if (i >= 8 && i <= 15) 984 if (i >= 8 && i <= 15)
985 {
916 { /* bright colors */ 986 /* bright colors */
917 i -= 8;
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
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;
… …
980 */ 1036 */
981void 1037void
982rxvt_term::set_colorfgbg () 1038rxvt_term::set_colorfgbg ()
983{ 1039{
984 unsigned int i; 1040 unsigned int i;
985 const char *xpmb = "\0"; 1041 const char *xpmb = "";
986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
987 1043
988 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
989 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
990 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
… …
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
1757
1758int
1759rxvt_term::update_background ()
1760{
1761 bgPixmap.invalidate ();
1762
1763 /* no chance of real time refresh if we are blurring! */
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1765 bgPixmap.render ();
1766 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779}
1780
1781void
1782rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{
1784 bgPixmap.render ();
1785}
1786
1787#endif /* HAVE_BG_PIXMAP */
1659 1788
1660/*----------------------- end-of-file (C source) -----------------------*/ 1789/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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