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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.253 by ayin, Mon Oct 15 07:33:48 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>
… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
212 pty_ev.stop ();
203 delete pty; pty = 0; 213 delete pty; pty = 0;
204} 214}
205 215
206rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
207{ 217{
… …
216#endif 226#endif
217 delete fontset[0]; 227 delete fontset[0];
218 228
219 if (display) 229 if (display)
220 { 230 {
221 dDisp;
222
223 selection_clear (); 231 selection_clear ();
224 232
225#ifdef USE_XIM 233#ifdef USE_XIM
226 im_destroy (); 234 im_destroy ();
227#endif 235#endif
228#ifdef XTERM_SCROLLBAR 236#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 237 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 238 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 239#endif
232#ifdef PLAIN_SCROLLBAR 240#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 241 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 242#endif
235#ifdef NEXT_SCROLLBAR 243#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 244 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 245 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 246 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 247 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 248 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 249 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 250 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 251 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 252 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 253 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 254#endif
247#ifdef RXVT_SCROLLBAR 255#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 259#endif
252 if (gc) XFreeGC (disp, gc); 260 if (gc) XFreeGC (dpy, gc);
253 261
254 delete drawable; 262 delete drawable;
255 // destroy all windows 263 // destroy all windows
256 if (parent[0]) 264 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 265 XDestroyWindow (dpy, parent[0]);
258 }
259 266
260 // TODO: free pixcolours, colours should become part of rxvt_display 267 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 268 if (ISSET_PIXCOLOR (i))
269 {
270 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
272 pix_colors_unfocused [i].free (this);
273#endif
274 }
275
276 clear ();
277 }
278
279 delete [] pix_colors_focused;
280#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 281 delete [] pix_colors_unfocused;
264#endif 282#endif
265 283
266 displays.put (display); 284 displays.put (display);
267 285
268 scr_release (); 286 scr_release ();
… …
293{ 311{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 313
296 cmd_pid = 0; 314 cmd_pid = 0;
297 315
298 if (!OPTION (Opt_hold)) 316 if (!option (Opt_hold))
299 destroy (); 317 destroy ();
300} 318}
301 319
302void 320void
303rxvt_term::destroy () 321rxvt_term::destroy ()
… …
317 im_ev.stop (display); 335 im_ev.stop (display);
318#endif 336#endif
319#if HAVE_SCROLLBARS 337#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 338 scrollbar_ev.stop (display);
321#endif 339#endif
322#if TRANSPARENT 340#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 341 rootwin_ev.stop (display);
324#endif 342#endif
325 incr_ev.stop (); 343 incr_ev.stop ();
326 termwin_ev.stop (display); 344 termwin_ev.stop (display);
327 vt_ev.stop (display); 345 vt_ev.stop (display);
… …
368{ 386{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
371} 389}
372 390
373#if ENABLE_FRILLS 391#if !ENABLE_MINIMAL
374static void 392static void
375print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
376{ 394{
377 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 444 GET_R->allowedxerror = event->error_code;
427 else 445 else
428 { 446 {
429 // GET_R is most likely not the terminal which caused the error, 447 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 448 // so just output the error and continue
431#if ENABLE_FRILLS 449#if ENABLE_MINIMAL
450 old_xerror_handler (display, event);
451#else
432 print_x_error (display, event); 452 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 453#endif
436 } 454 }
437 455
438 return 0; 456 return 0;
439} 457}
… …
467#ifdef KEYSYM_RESOURCE 485#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 486 keyboard->register_done ();
469#endif 487#endif
470 488
471#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 490 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 492#endif
475 493
476 pty = ptytty::create (); 494 pty = ptytty::create ();
477 495
478 create_windows (argc, argv); 496 create_windows (argc, argv);
479 497
480 dDisp;
481
482 init_xlocale (); 498 init_xlocale ();
483 499
484 scr_reset (); // initialize screen 500 scr_reset (); // initialize screen
485 501
486#if 0 502#if 0
487 XSynchronize (disp, True); 503 XSynchronize (dpy, True);
488#endif 504#endif
489 505
490#ifdef HAVE_SCROLLBARS 506#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 507 if (option (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 508 resize_scrollbar (); /* create and map scrollbar */
493#endif 509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
494#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
495 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
496 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526
527 bgPixmap.set_root_pixmap ();
497 XSelectInput (disp, display->root, PropertyChangeMask); 528 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root); 529 rootwin_ev.start (display, display->root);
500 } 530 }
531#endif
532
533#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL)
535 {
536 const char *p = rs[Rs_backgroundPixmap];
537
538 if ((p = strchr (p, ';')) != NULL)
539 {
540 p++;
541 bgPixmap.set_geometry (p);
542 }
543 else
544 bgPixmap.set_defaultGeometry ();
545
546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
549 }
550#endif
551 }
552#endif
553
554#if ENABLE_PERL
555 rootwin_ev.start (display, display->root);
501#endif 556#endif
502 557
503 set_colorfgbg (); 558 set_colorfgbg ();
504 559
505 init_command (cmd_argv); 560 init_command (cmd_argv);
… …
516#if ENABLE_XEMBED 571#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 572 if (rs[Rs_embed])
518 { 573 {
519 long info[2] = { 0, XEMBED_MAPPED }; 574 long info[2] = { 0, XEMBED_MAPPED };
520 575
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 576 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 577 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 578 }
524#endif 579#endif
525 580
526 XMapWindow (disp, vt); 581 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 582 XMapWindow (dpy, parent[0]);
528 583
529 return true; 584 return true;
530} 585}
531 586
532static struct sig_handlers 587static struct sig_handlers
… …
612 return p; 667 return p;
613} 668}
614 669
615/*----------------------------------------------------------------------*/ 670/*----------------------------------------------------------------------*/
616/* 671/*
617 * window size/position calculcations for XSizeHint and other storage. 672 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 673 * if width/height are non-zero then override calculated width/height
619 */ 674 */
620void 675void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 677{
623 short recalc_x, recalc_y; 678 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 679 int x, y, sb_w, flags;
625 unsigned int w, h; 680 unsigned int w, h;
626 unsigned int max_width, max_height; 681 unsigned int max_width, max_height;
627 dDisp;
628 682
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 683 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 684 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 685 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 686
… …
694 748
695 if (scrollBar.state) 749 if (scrollBar.state)
696 { 750 {
697 sb_w = scrollbar_TotalWidth (); 751 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 752 szHint.base_width += sb_w;
753
699 if (!OPTION (Opt_scrollBar_right)) 754 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 755 window_vt_x += sb_w;
701 } 756 }
702 757
703 szHint.width_inc = fwidth; 758 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 759 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 760 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 761 szHint.min_height = szHint.base_height + szHint.height_inc;
707 762
708 if (newwidth && newwidth - szHint.base_width < max_width) 763 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 764 {
710 szHint.width = newwidth; 765 szHint.width = newwidth;
… …
725 { 780 {
726 min_it (height, max_height); 781 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 782 szHint.height = szHint.base_height + height;
728 } 783 }
729 784
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 785 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 786 window_sb_x = szHint.width - sb_w;
732 787
733 if (recalc_x) 788 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
790
735 if (recalc_y) 791 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 792 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 793
738 ncol = width / fwidth; 794 ncol = width / fwidth;
739 nrow = height / fheight; 795 nrow = height / fheight;
740} 796}
741 797
… …
796 delete fontset[0]; 852 delete fontset[0];
797 fontset[0] = fs; 853 fontset[0] = fs;
798 854
799 prop = (*fs)[1]->properties (); 855 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 856 prop.height += lineSpace;
857
801 fs->set_prop (prop); 858 fs->set_prop (prop, false);
802 859
803 fwidth = prop.width; 860 fwidth = prop.width;
804 fheight = prop.height; 861 fheight = prop.height;
805 fbase = prop.ascent; 862 fbase = prop.ascent;
806 863
… …
815 { 872 {
816 fontset[style] = fs = new rxvt_fontset (this); 873 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 874 rxvt_fontprop prop2 = prop;
818 875
819 if (res) 876 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 877 {
878 fs->populate (res);
879 fs->set_prop (prop2, false);
880 }
821 else 881 else
822 { 882 {
823 res = fontset[0]->fontdesc; 883 fs->populate (fontset[0]->fontdesc);
824 884
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 885 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 886 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
887
888 fs->set_prop (prop2, true);
827 } 889 }
828 890
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 891 }
832#else 892#else
833 fontset[style] = fontset[0]; 893 fontset[style] = fontset[0];
834#endif 894#endif
835 } 895 }
… …
842 } 902 }
843 903
844 return true; 904 return true;
845} 905}
846 906
907void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 909{
849 XChangeProperty (display->display, parent[0], 910 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 913}
853 914
915void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 917{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
858 920
859 XChangeProperty (display->display, parent[0], 921 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 922 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 923 (const unsigned char *)s, strlen (s));
862 924
863 free (s); 925 free (s);
864 free (ws); 926 free (ws);
… …
883#if ENABLE_EWMH 945#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 947#endif
886} 948}
887 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
888#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 954 rxvt_color xcol;
893 int i; 955 int i;
894 956
895 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
896 return; 958 return;
959
960 color = strdup (color);
961 allocated.push_back ((void *)color);
962 rs[Rs_color + idx] = color;
897 963
898 /* handle color aliases */ 964 /* handle color aliases */
899 if (isdigit (*color)) 965 if (isdigit (*color))
900 { 966 {
901 i = atoi (color); 967 i = atoi (color);
902 968
903 if (i >= 8 && i <= 15) 969 if (i >= 8 && i <= 15)
904 { /* bright colors */ 970 { /* bright colors */
905 i -= 8; 971 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 973 goto done;
909 } 974 }
910 975
911 if (i >= 0 && i <= 7) 976 if (i >= 0 && i <= 7)
912 { /* normal colors */ 977 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 979 goto done;
916 } 980 }
917 } 981 }
918 982
919 if (!rXParseAllocColor (&xcol, color)) 983 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 984
924 /* 985 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 986 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 987 * so just keep gobbling up the colormap
927 */ 988 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 989
940 pix_colors_focused[idx] = xcol; 990 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 991
943 /* XSetWindowAttributes attr; */ 992 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 993 /* Cursor cursor; */
945done: 994done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
953 996
997 update_fade_color (idx);
954 recolour_cursor (); 998 recolour_cursor ();
955 scr_recolour (); 999 scr_recolour ();
956}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
961 1002
962void 1003void
963rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
964{ 1005{
965 XColor xcol[2]; 1006 XColor fg, bg;
966 1007
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
973 1015
974 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 1017}
977 1018
978/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
979/* 1020/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 1021 * find if fg/bg matches any of the normal (low-intensity) colors
… …
997 1038
998 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 1041 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 1044 xpmb = "default;";
1004#endif 1045#endif
1005 break; 1046 break;
1006 } 1047 }
1007 1048
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1050}
1010 1051
1011/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1012 1053
1013int 1054bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1056{
1016 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 1058 return true;
1059
1060 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1061 return false;
1062}
1063
1064void
1065rxvt_term::alias_color (int dst, int src)
1066{
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1068}
1024 1069
1025/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1074rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1075{
1031 int fix_screen; 1076 int fix_screen;
1032 int old_width = szHint.width; 1077 int old_width = szHint.width;
1033 int old_height = szHint.height; 1078 int old_height = szHint.height;
1034 dDisp;
1035 1079
1036 window_calc (newwidth, newheight); 1080 window_calc (newwidth, newheight);
1081
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1084
1039 if (!ignoreparent) 1085 if (!ignoreparent)
1040 { 1086 {
1041#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1042 /* 1088 /*
… …
1046 int x, y, x1, y1; 1092 int x, y, x1, y1;
1047 int dx, dy; 1093 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1095 Window unused_cr;
1050 1096
1051 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1101 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1058 */ 1104 */
… …
1060 { 1106 {
1061 x -= x1; 1107 x -= x1;
1062 y -= y1; 1108 y -= y1;
1063 } 1109 }
1064 1110
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1069 1115
1070 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1076 dy = 0; 1122 dy = 0;
1077 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1078 dy /= 2; 1124 dy /= 2;
1079 1125
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1082#else 1128#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1130#endif
1085 } 1131 }
1086 1132
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1134
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1136 {
1091 if (scrollBar.state) 1137 if (scrollBar.state)
1092 { 1138 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1140 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1142 resize_scrollbar ();
1097 } 1143 }
1098 1144
1099 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1101 width, height); 1147 width, height);
1102 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1103 scr_clear (); 1154 scr_clear ();
1104#ifdef XPM_BACKGROUND
1105 resize_pixmap ();
1106#endif
1107 } 1155 }
1108 1156
1109 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1110 scr_reset (); 1158 scr_reset ();
1111 1159
1112#ifdef XPM_BACKGROUND 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113 if (pixmap) 1161 //scr_touch (false);
1162
1163#ifdef HAVE_BG_PIXMAP
1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1165// if (bgPixmap.pixmap)
1114 scr_touch (false); 1166// scr_touch (false);
1115#endif 1167#endif
1116 1168
1117#ifdef USE_XIM 1169#ifdef USE_XIM
1118 IMSetStatusPosition (); 1170 IMSetPosition ();
1119#endif 1171#endif
1120} 1172}
1121 1173
1122/* 1174/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1175 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1180{
1129 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1130 1182
1131 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1132 { 1184 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1186
1135 if (newwidth == 0) 1187 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1189 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1204#ifdef USE_XIM
1153 1205
1154void 1206void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1208{
1157 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1159} 1211}
1160 1212
1161void 1213void
1162rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1163{ 1215{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1253
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1255 *p = '\0';
1204 1256
1205 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1207 1259
1208 if (win != None) 1260 if (win != None)
1209 return True; 1261 return True;
1210 } 1262 }
1211 1263
… …
1435 "*", 1487 "*",
1436 fheight, 1488 fheight,
1437 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1439 1491
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1442 1494
1443 if (missing_charset_list) 1495 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1445 1497
… …
1486 XNBackground, bg, 1538 XNBackground, bg,
1487 XNArea, &status_rect, 1539 XNArea, &status_rect,
1488 XNFontSet, fs, 1540 XNFontSet, fs,
1489 NULL); 1541 NULL);
1490 } 1542 }
1543#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1544 else if (input_style & XIMPreeditCallbacks)
1492 { 1545 {
1493 im_set_position (spot); 1546 im_set_position (spot);
1494 1547
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1551# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1552 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1553# endif
1501 1554
1502 preedit_attr = XVaCreateNestedList (0, 1555 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1556 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1557 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1558 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1559 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1560# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1561 XNPreeditCaretCallback, &xcb[3],
1509#endif 1562# endif
1510 NULL); 1563 NULL);
1511 } 1564 }
1565#endif
1512 1566
1513 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1569 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1572 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1574 status_attr, NULL);
1521 1575
1522 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1525 1579
1526 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1527 { 1581 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1583 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1588 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1590 vt_select_input ();
1537#endif 1591#endif
1538 1592
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1593 IMSetPosition ();
1541 1594
1542 return true; 1595 return true;
1543} 1596}
1544 1597
1545void 1598void
… …
1603 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1604#endif 1657#endif
1605} 1658}
1606 1659
1607void 1660void
1608rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1609{ 1662{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1612 1665
1613 if (!Input_Context 1666 if (!Input_Context
1614 || !focus 1667 || !focus
1615 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1669 || !IMisRunning ())
1617 return; 1670 return;
1618 1671
1672 if (input_style & XIMPreeditPosition)
1673 {
1674 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676
1677 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL);
1679 }
1680 else
1681 {
1619 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1685 XFree (status_attr);
1623 1686
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1688 XFree (needed_rect);
1626 1689
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1692
1630 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1633 1697
1698 XFree (status_attr);
1699 }
1700
1634 XFree (preedit_attr); 1701 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1702}
1637#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1638 1704
1705void
1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate ();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render ();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1763
1639/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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