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.231 by root, Sun Aug 27 10:14:47 2006 UTC vs.
Revision 1.279 by ayin, Wed Dec 12 09:33:48 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
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
88class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
89 92
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 94{
92 compose_char *cc; 95 compose_char *cc;
93 96
94 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 99 cc = (*this)[c1];
97 while (cc) 100 while (cc)
98 { 101 {
147 150
148} 151}
149#endif 152#endif
150 153
151rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
152 : 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
153#if TRANSPARENT || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
155#endif 176#endif
156#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
157 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
158#endif 179#endif
159#ifdef CURSOR_BLINK 180#ifdef USE_XIM
160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev (this, &rxvt_term::text_blink_cb),
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
173#endif 182#endif
174#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
175 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176#endif 185#endif
177#ifdef USE_XIM
178 im_ev (this, &rxvt_term::im_cb),
179#endif
180#ifndef NO_BELL 186#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182#endif 188#endif
183 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184 vt_ev (this, &rxvt_term::x_cb), 190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
185 child_ev (this, &rxvt_term::child_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
186 check_ev (this, &rxvt_term::check_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
187 flush_ev (this, &rxvt_term::flush_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
188 destroy_ev (this, &rxvt_term::destroy_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
189 pty_ev (this, &rxvt_term::pty_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 incr_ev (this, &rxvt_term::incr_cb) 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191{ 197
192 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193 199
194 termlist.push_back (this); 200 termlist.push_back (this);
195 201
196#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
198#endif 204#endif
199} 205}
200 206
201// clean up the most important stuff, do *not* call x or free mem etc. 207// clean up the most important stuff, do *not* call x or free mem etc.
202// for use before an emergency exit 208// for use before an emergency exit
209void
203void rxvt_term::emergency_cleanup () 210rxvt_term::emergency_cleanup ()
204{ 211{
205 if (cmd_pid) 212 if (cmd_pid)
206 kill (-cmd_pid, SIGHUP); 213 kill (-cmd_pid, SIGHUP);
207 214
208 pty_ev.stop (); 215 pty_ev.stop ();
275 delete [] pix_colors_focused; 282 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING 283#if OFF_FOCUS_FADING
277 delete [] pix_colors_unfocused; 284 delete [] pix_colors_unfocused;
278#endif 285#endif
279 286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
280 displays.put (display); 290 displays.put (display);
281 291
282 scr_release (); 292 scr_release ();
283 293
284 /* clear all resources */ 294 /* clear all resources */
297 delete argv; 307 delete argv;
298 308
299#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
300 delete keyboard; 310 delete keyboard;
301#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
302} 315}
303 316
304// child has exited, usually destroys 317// child has exited, usually destroys
305void 318void
306rxvt_term::child_cb (child_watcher &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
307{ 320{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 321 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 322
310 cmd_pid = 0; 323 cmd_pid = 0;
311 324
312 if (!OPTION (Opt_hold)) 325 if (!option (Opt_hold))
313 destroy (); 326 destroy ();
314} 327}
315 328
316void 329void
317rxvt_term::destroy () 330rxvt_term::destroy ()
318{ 331{
319 if (destroy_ev.active) 332 if (ev_is_active (&destroy_ev))
320 return; 333 return;
321 334
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 336
324#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
331 im_ev.stop (display); 344 im_ev.stop (display);
332#endif 345#endif
333#if HAVE_SCROLLBARS 346#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 347 scrollbar_ev.stop (display);
335#endif 348#endif
336#if TRANSPARENT || ENABLE_PERL 349#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 350 rootwin_ev.stop (display);
338#endif 351#endif
339 incr_ev.stop (); 352 incr_ev.stop ();
340 termwin_ev.stop (display); 353 termwin_ev.stop (display);
341 vt_ev.stop (display); 354 vt_ev.stop (display);
342 } 355 }
343 356
344 check_ev.stop (); 357 prepare_ev.stop ();
345 pty_ev.stop (); 358 pty_ev.stop ();
346#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
348#endif 361#endif
349#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
357#endif 370#endif
358#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
359 pointer_ev.stop (); 372 pointer_ev.stop ();
360#endif 373#endif
361 374
362 destroy_ev.start (0); 375 destroy_ev.start ();
363} 376}
364 377
365void 378void
366rxvt_term::destroy_cb (time_watcher &w) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 380{
368 make_current (); 381 make_current ();
369 382
370 delete this; 383 delete this;
371} 384}
425 else 438 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 440 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 442 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 444 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 446}
434#endif 447#endif
435 448
469 482
470 SET_R (this); 483 SET_R (this);
471 set_locale (""); 484 set_locale ("");
472 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
473 486
474 if (!init_vars ()) 487 init_vars ();
475 return false;
476 488
477 init_secondary (); 489 init_secondary ();
478 490
479 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
480 492
481#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 494 keyboard->register_done ();
483#endif 495#endif
484 496
485#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 500#endif
489 501
490 pty = ptytty::create (); 502 pty = ptytty::create ();
491 503
498#if 0 510#if 0
499 XSynchronize (dpy, True); 511 XSynchronize (dpy, True);
500#endif 512#endif
501 513
502#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
505#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
506#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
507 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
508 { 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 ();
509 XSelectInput (dpy, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
512 } 538 }
513#endif 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
514#if ENABLE_PERL 562#if ENABLE_PERL
515 rootwin_ev.start (display, display->root); 563 rootwin_ev.start (display, display->root);
516#endif 564#endif
517 565
518 set_colorfgbg (); 566 set_colorfgbg ();
520 init_command (cmd_argv); 568 init_command (cmd_argv);
521 569
522 free (cmd_argv); 570 free (cmd_argv);
523 571
524 if (pty->pty >= 0) 572 if (pty->pty >= 0)
525 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
526 574
527 check_ev.start (); 575 prepare_ev.start ();
528 576
529 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
530 578
531#if ENABLE_XEMBED 579#if ENABLE_XEMBED
532 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
544 return true; 592 return true;
545} 593}
546 594
547static struct sig_handlers 595static struct sig_handlers
548{ 596{
549 sig_watcher sw_term, sw_int; 597 ev::sig sw_term, sw_int;
550 598
551 /* 599 /*
552 * Catch a fatal signal and tidy up before quitting 600 * Catch a fatal signal and tidy up before quitting
553 */ 601 */
554 void 602 void sig_term (ev::sig &w, int revents);
555 sig_term (sig_watcher &w) 603
604 sig_handlers ()
556 { 605 {
557 rxvt_emergency_cleanup (); 606 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558 signal (w.signum, SIG_DFL);
559 kill (getpid (), w.signum);
560 }
561
562 sig_handlers ()
563 : sw_term (this, &sig_handlers::sig_term),
564 sw_int (this, &sig_handlers::sig_term) 607 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565 {
566 } 608 }
567} sig_handlers; 609} sig_handlers;
568 610
611void
612sig_handlers::sig_term (ev::sig &w, int revents)
613{
614 rxvt_emergency_cleanup ();
615 w.stop ();
616 kill (getpid (), w.signum);
617}
618
569char **rxvt_environ; // startup environment 619char **rxvt_environ; // startup environment
570 620
571void 621void
572rxvt_init () 622rxvt_init ()
573{ 623{
574 ptytty::init (); 624 ptytty::init ();
625
626 if (!ev_default_loop (0))
627 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575 628
576 rxvt_environ = environ; 629 rxvt_environ = environ;
577 630
578 signal (SIGHUP, SIG_IGN); 631 signal (SIGHUP, SIG_IGN);
579 signal (SIGPIPE, SIG_IGN); 632 signal (SIGPIPE, SIG_IGN);
580 633
581 sig_handlers.sw_term.start (SIGTERM); 634 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582 sig_handlers.sw_int.start (SIGINT); 635 sig_handlers.sw_int.start (SIGINT); ev_unref ();
583 636
584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
585 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
586 639
587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 return p; 680 return p;
628} 681}
629 682
630/*----------------------------------------------------------------------*/ 683/*----------------------------------------------------------------------*/
631/* 684/*
632 * window size/position calculcations for XSizeHint and other storage. 685 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 686 * if width/height are non-zero then override calculated width/height
634 */ 687 */
635void 688void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 689rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 690{
709 if (scrollBar.state) 762 if (scrollBar.state)
710 { 763 {
711 sb_w = scrollbar_TotalWidth (); 764 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 765 szHint.base_width += sb_w;
713 766
714 if (!OPTION (Opt_scrollBar_right)) 767 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 768 window_vt_x += sb_w;
716 } 769 }
717 770
718 szHint.width_inc = fwidth; 771 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 772 szHint.height_inc = fheight;
740 { 793 {
741 min_it (height, max_height); 794 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 795 szHint.height = szHint.base_height + height;
743 } 796 }
744 797
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 798 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 799 window_sb_x = szHint.width - sb_w;
747 800
748 if (recalc_x) 801 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 802 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 803
773 ws.ws_xpixel = width; 826 ws.ws_xpixel = width;
774 ws.ws_ypixel = height; 827 ws.ws_ypixel = height;
775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 828 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776 829
777#if 0 830#if 0
778 // TIOCSWINSZ is supposed to do this automatically and correctly 831 // TIOCSWINSZ is supposed to do this automatically and correctly
779 if (cmd_pid) /* force through to the command */ 832 if (cmd_pid) /* force through to the command */
780 kill (-cmd_pid, SIGWINCH); 833 kill (-cmd_pid, SIGWINCH);
781#endif 834#endif
782} 835}
783 836
857 if (parent[0]) 910 if (parent[0])
858 { 911 {
859 resize_all_windows (0, 0, 0); 912 resize_all_windows (0, 0, 0);
860 scr_remap_chars (); 913 scr_remap_chars ();
861 scr_touch (true); 914 scr_touch (true);
862 } 915 }
863 916
864 return true; 917 return true;
865} 918}
866 919
920void
867void rxvt_term::set_string_property (Atom prop, const char *str, int len) 921rxvt_term::set_string_property (Atom prop, const char *str, int len)
868{ 922{
869 XChangeProperty (dpy, parent[0], 923 XChangeProperty (dpy, parent[0],
870 prop, XA_STRING, 8, PropModeReplace, 924 prop, XA_STRING, 8, PropModeReplace,
871 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 925 (const unsigned char *)str, len >= 0 ? len : strlen (str));
872} 926}
873 927
928void
874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 929rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
875{ 930{
876 wchar_t *ws = rxvt_mbstowcs (str, len); 931 wchar_t *ws = rxvt_mbstowcs (str, len);
877 char *s = rxvt_wcstoutf8 (ws); 932 char *s = rxvt_wcstoutf8 (ws);
878 933
879 XChangeProperty (dpy, parent[0], 934 XChangeProperty (dpy, parent[0],
903#if ENABLE_EWMH 958#if ENABLE_EWMH
904 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 959 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
905#endif 960#endif
906} 961}
907 962
963void
964rxvt_term::set_window_color (int idx, const char *color)
965{
908#ifdef XTERM_COLOR_CHANGE 966#ifdef XTERM_COLOR_CHANGE
909void
910rxvt_term::set_window_color (int idx, const char *color)
911{
912 rxvt_color xcol; 967 rxvt_color xcol;
913 int i; 968 int i;
914 969
915 if (color == NULL || *color == '\0') 970 if (color == NULL || *color == '\0')
916 return; 971 return;
917 972
918 color = strdup (color); 973 color = strdup (color);
919 allocated.push_back ((void *)color); 974 allocated.push_back ((void *)color);
923 if (isdigit (*color)) 978 if (isdigit (*color))
924 { 979 {
925 i = atoi (color); 980 i = atoi (color);
926 981
927 if (i >= 8 && i <= 15) 982 if (i >= 8 && i <= 15)
983 {
928 { /* bright colors */ 984 /* bright colors */
929 i -= 8;
930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 985 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
931 goto done; 986 goto done;
932 } 987 }
933 988
934 if (i >= 0 && i <= 7) 989 if (i >= 0 && i <= 7)
990 {
935 { /* normal colors */ 991 /* normal colors */
936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
937 goto done; 993 goto done;
938 } 994 }
939 } 995 }
940 996
945 * so just keep gobbling up the colormap 1001 * so just keep gobbling up the colormap
946 */ 1002 */
947 1003
948 pix_colors_focused[idx] = xcol; 1004 pix_colors_focused[idx] = xcol;
949 1005
950 /* XSetWindowAttributes attr; */
951 /* Cursor cursor; */
952done: 1006done:
953 /*TODO: handle Color_BD, scrollbar background, etc. */ 1007 /*TODO: handle Color_BD, scrollbar background, etc. */
954 1008
955 update_fade_color (idx); 1009 update_fade_color (idx);
956 recolour_cursor (); 1010 recolour_cursor ();
957 scr_recolour (); 1011 scr_recolour ();
1012#endif /* XTERM_COLOR_CHANGE */
958} 1013}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 1014
964void 1015void
965rxvt_term::recolour_cursor () 1016rxvt_term::recolour_cursor ()
966{ 1017{
967 XColor fg, bg; 1018 XColor fg, bg;
983 */ 1034 */
984void 1035void
985rxvt_term::set_colorfgbg () 1036rxvt_term::set_colorfgbg ()
986{ 1037{
987 unsigned int i; 1038 unsigned int i;
988 const char *xpmb = "\0"; 1039 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1040 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 1041
991 strcpy (fstr, "default"); 1042 strcpy (fstr, "default");
992 strcpy (bstr, "default"); 1043 strcpy (bstr, "default");
993 for (i = Color_Black; i <= Color_White; i++) 1044 for (i = Color_Black; i <= Color_White; i++)
999 1050
1000 for (i = Color_Black; i <= Color_White; i++) 1051 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1052 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1053 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1054 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1055#ifdef BG_IMAGE_FROM_FILE
1005 xpmb = "default;"; 1056 xpmb = "default;";
1006#endif 1057#endif
1007 break; 1058 break;
1008 } 1059 }
1009 1060
1105 1156
1106 XMoveResizeWindow (dpy, vt, 1157 XMoveResizeWindow (dpy, vt,
1107 window_vt_x, window_vt_y, 1158 window_vt_x, window_vt_y,
1108 width, height); 1159 width, height);
1109 1160
1161#ifdef HAVE_BG_PIXMAP
1162 if (bgPixmap.window_size_sensitive ())
1163 update_background ();
1164#endif
1165
1110 scr_clear (); 1166 scr_clear ();
1111#ifdef XPM_BACKGROUND
1112 resize_pixmap ();
1113#endif
1114 } 1167 }
1115 1168
1116 if (fix_screen || old_height == 0) 1169 if (fix_screen || old_height == 0)
1117 scr_reset (); 1170 scr_reset ();
1118 1171
1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1172 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1120 //scr_touch (false); 1173 //scr_touch (false);
1121 1174
1122#ifdef XPM_BACKGROUND 1175#ifdef HAVE_BG_PIXMAP
1123 if (pixmap) 1176// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1177// if (bgPixmap.pixmap)
1124 scr_touch (false); 1178// scr_touch (false);
1125#endif 1179#endif
1126 1180
1127#ifdef USE_XIM 1181#ifdef USE_XIM
1128 IMSetPosition (); 1182 IMSetPosition ();
1129#endif 1183#endif
1300 if (term->rs[Rs_imLocale]) 1354 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale); 1355 SET_LOCALE (term->locale);
1302 } 1356 }
1303 else 1357 else
1304 str = (void *)text->string.wide_char; 1358 str = (void *)text->string.wide_char;
1305 1359
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1360 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret, 1361 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first, 1362 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length, 1363 DT_INT, call_data->chg_length,
1310 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1364 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1629 1683
1630 if (input_style & XIMPreeditPosition) 1684 if (input_style & XIMPreeditPosition)
1631 { 1685 {
1632 im_set_size (preedit_rect); 1686 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1687 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 1688
1635 XSetICValues (Input_Context, 1689 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL); 1690 XNPreeditAttributes, preedit_attr, NULL);
1637 } 1691 }
1638 else 1692 else
1639 { 1693 {
1656 XFree (status_attr); 1710 XFree (status_attr);
1657 } 1711 }
1658 1712
1659 XFree (preedit_attr); 1713 XFree (preedit_attr);
1660} 1714}
1661#endif /* USE_XIM */ 1715#endif /* USE_XIM */
1716
1717void
1718rxvt_term::get_window_origin (int &x, int &y)
1719{
1720 Window cr;
1721 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1722/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1723}
1724
1725Pixmap
1726rxvt_term::get_pixmap_property (int prop_id)
1727{
1728 if (prop_id > 0 && prop_id < NUM_XA)
1729 if (xa[prop_id])
1730 {
1731 int aformat;
1732 unsigned long nitems, bytes_after;
1733 Atom atype;
1734 unsigned char *prop = NULL;
1735 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1736 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1737 &nitems, &bytes_after, &prop);
1738 if (result == Success && prop && atype == XA_PIXMAP)
1739 {
1740 return *(Pixmap *)prop;
1741 }
1742 }
1743 return None;
1744}
1745
1746#ifdef HAVE_BG_PIXMAP
1747# if TRACE_PIXMAPS
1748# undef update_background
1749int rxvt_term::trace_update_background (const char *file, int line)
1750{
1751 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1752 update_background ();
1753}
1754# endif
1755
1756int
1757rxvt_term::update_background ()
1758{
1759 bgPixmap.invalidate ();
1760
1761 /* no chance of real time refresh if we are blurring! */
1762 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1763 bgPixmap.render ();
1764 else
1765 {
1766 update_background_ev.stop ();
1767
1768 if (!bgPixmap.need_client_side_rendering())
1769 update_background_ev.start (.05);
1770 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1771 update_background_ev.start (.20); /* very slow !!! */
1772 else
1773 update_background_ev.start (.07);
1774 }
1775
1776 return 0;
1777}
1778
1779void
1780rxvt_term::update_background_cb (ev::timer &w, int revents)
1781{
1782 bgPixmap.render ();
1783}
1784
1785#endif /* HAVE_BG_PIXMAP */
1662 1786
1663/*----------------------- end-of-file (C source) -----------------------*/ 1787/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines