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.215 by root, Wed Feb 1 18:36:48 2006 UTC vs.
Revision 1.252 by ayin, Mon Oct 8 07:05:23 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
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
222 231
223#ifdef USE_XIM 232#ifdef USE_XIM
224 im_destroy (); 233 im_destroy ();
225#endif 234#endif
226#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 238#endif
230#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 241#endif
233#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 253#endif
245#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 258#endif
250 if (gc) XFreeGC (xdisp, gc); 259 if (gc) XFreeGC (dpy, gc);
251 260
252 delete drawable; 261 delete drawable;
253 // destroy all windows 262 // destroy all windows
254 if (parent[0]) 263 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
265
266 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
256 274
257 clear (); 275 clear ();
258 } 276 }
259 277
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 278 delete [] pix_colors_focused;
262#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
264#endif 281#endif
265 282
266 displays.put (display); 283 displays.put (display);
267 284
268 scr_release (); 285 scr_release ();
… …
293{ 310{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 312
296 cmd_pid = 0; 313 cmd_pid = 0;
297 314
298 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
299 destroy (); 316 destroy ();
300} 317}
301 318
302void 319void
303rxvt_term::destroy () 320rxvt_term::destroy ()
… …
317 im_ev.stop (display); 334 im_ev.stop (display);
318#endif 335#endif
319#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
321#endif 338#endif
322#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
324#endif 341#endif
325 incr_ev.stop (); 342 incr_ev.stop ();
326 termwin_ev.stop (display); 343 termwin_ev.stop (display);
327 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
467#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 485 keyboard->register_done ();
469#endif 486#endif
470 487
471#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 491#endif
475 492
476 pty = ptytty::create (); 493 pty = ptytty::create ();
477 494
… …
480 init_xlocale (); 497 init_xlocale ();
481 498
482 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
483 500
484#if 0 501#if 0
485 XSynchronize (xdisp, True); 502 XSynchronize (dpy, True);
486#endif 503#endif
487 504
488#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
491#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
492#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
494 { 515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
498 } 529 }
530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
499#endif 555#endif
500 556
501 set_colorfgbg (); 557 set_colorfgbg ();
502 558
503 init_command (cmd_argv); 559 init_command (cmd_argv);
… …
514#if ENABLE_XEMBED 570#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 571 if (rs[Rs_embed])
516 { 572 {
517 long info[2] = { 0, XEMBED_MAPPED }; 573 long info[2] = { 0, XEMBED_MAPPED };
518 574
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 576 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 577 }
522#endif 578#endif
523 579
524 XMapWindow (xdisp, vt); 580 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 581 XMapWindow (dpy, parent[0]);
526 582
527 return true; 583 return true;
528} 584}
529 585
530static struct sig_handlers 586static struct sig_handlers
… …
610 return p; 666 return p;
611} 667}
612 668
613/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
614/* 670/*
615 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
617 */ 673 */
618void 674void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 676{
… …
692 if (scrollBar.state) 748 if (scrollBar.state)
693 { 749 {
694 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
696 752
697 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 754 window_vt_x += sb_w;
699 } 755 }
700 756
701 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 759 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 760 szHint.min_height = szHint.base_height + szHint.height_inc;
705 761
706 if (newwidth && newwidth - szHint.base_width < max_width) 762 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 763 {
708 szHint.width = newwidth; 764 szHint.width = newwidth;
… …
723 { 779 {
724 min_it (height, max_height); 780 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
726 } 782 }
727 783
728 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
730 786
731 if (recalc_x) 787 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 789
734 if (recalc_y) 790 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 792
737 ncol = width / fwidth; 793 ncol = width / fwidth;
738 nrow = height / fheight; 794 nrow = height / fheight;
739} 795}
740 796
… …
795 delete fontset[0]; 851 delete fontset[0];
796 fontset[0] = fs; 852 fontset[0] = fs;
797 853
798 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
799 prop.height += lineSpace; 855 prop.height += lineSpace;
856
800 fs->set_prop (prop); 857 fs->set_prop (prop, false);
801 858
802 fwidth = prop.width; 859 fwidth = prop.width;
803 fheight = prop.height; 860 fheight = prop.height;
804 fbase = prop.ascent; 861 fbase = prop.ascent;
805 862
… …
814 { 871 {
815 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
817 874
818 if (res) 875 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
820 else 880 else
821 { 881 {
822 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
823 883
824 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
825 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
826 } 888 }
827 889
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 890 }
831#else 891#else
832 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
833#endif 893#endif
834 } 894 }
… …
843 return true; 903 return true;
844} 904}
845 905
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 906void rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 907{
848 XChangeProperty (xdisp, parent[0], 908 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 909 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 910 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 911}
852 912
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 914{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 915 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 916 char *s = rxvt_wcstoutf8 (ws);
857 917
858 XChangeProperty (xdisp, parent[0], 918 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 920 (const unsigned char *)s, strlen (s));
861 921
862 free (s); 922 free (s);
863 free (ws); 923 free (ws);
… …
882#if ENABLE_EWMH 942#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 944#endif
885} 945}
886 946
947void
948rxvt_term::set_window_color (int idx, const char *color)
949{
887#ifdef XTERM_COLOR_CHANGE 950#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 951 rxvt_color xcol;
892 int i; 952 int i;
893 953
894 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
895 return; 955 return;
… …
927 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
928 988
929 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */ 990 /* Cursor cursor; */
931done: 991done:
932
933#if OFF_FOCUS_FADING
934 if (rs[Rs_fade])
935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
940#endif
941
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
943 993
994 update_fade_color (idx);
944 recolour_cursor (); 995 recolour_cursor ();
945 scr_recolour (); 996 scr_recolour ();
946}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */ 997#endif /* XTERM_COLOR_CHANGE */
998}
951 999
952void 1000void
953rxvt_term::recolour_cursor () 1001rxvt_term::recolour_cursor ()
954{ 1002{
955 XColor fg, bg; 1003 XColor fg, bg;
… …
960 1008
961 (ISSET_PIXCOLOR (Color_pointer_bg) 1009 (ISSET_PIXCOLOR (Color_pointer_bg)
962 ? pix_colors_focused[Color_pointer_bg] 1010 ? pix_colors_focused[Color_pointer_bg]
963 : pix_colors_focused[Color_bg]).get (bg); 1011 : pix_colors_focused[Color_bg]).get (bg);
964 1012
965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1013 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 1014}
967 1015
968/*----------------------------------------------------------------------*/ 1016/*----------------------------------------------------------------------*/
969/* 1017/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 1018 * find if fg/bg matches any of the normal (low-intensity) colors
… …
987 1035
988 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1037 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1038 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1039 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1040#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1041 xpmb = "default;";
994#endif 1042#endif
995 break; 1043 break;
996 } 1044 }
997 1045
… …
1006 if (color.set (this, name)) 1054 if (color.set (this, name))
1007 return true; 1055 return true;
1008 1056
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1057 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 1058 return false;
1059}
1060
1061void
1062rxvt_term::alias_color (int dst, int src)
1063{
1064 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 1065}
1012 1066
1013/* -------------------------------------------------------------------- * 1067/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 1068 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 1069 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 1073 int fix_screen;
1020 int old_width = szHint.width; 1074 int old_width = szHint.width;
1021 int old_height = szHint.height; 1075 int old_height = szHint.height;
1022 1076
1023 window_calc (newwidth, newheight); 1077 window_calc (newwidth, newheight);
1078
1079 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 1080 XSetWMNormalHints (dpy, parent[0], &szHint);
1025 1081
1026 if (!ignoreparent) 1082 if (!ignoreparent)
1027 { 1083 {
1028#ifdef SMART_RESIZE 1084#ifdef SMART_RESIZE
1029 /* 1085 /*
… …
1033 int x, y, x1, y1; 1089 int x, y, x1, y1;
1034 int dx, dy; 1090 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 1092 Window unused_cr;
1037 1093
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 1098 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 1099 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
1045 */ 1101 */
… …
1047 { 1103 {
1048 x -= x1; 1104 x -= x1;
1049 y -= y1; 1105 y -= y1;
1050 } 1106 }
1051 1107
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1108 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1109 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 1110 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 1111 dy = old_height - szHint.height;
1056 1112
1057 /* Check position of the center of the window */ 1113 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 1114 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
1063 dy = 0; 1119 dy = 0;
1064 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
1065 dy /= 2; 1121 dy /= 2;
1066 1122
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
1069#else 1125#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 1127#endif
1072 } 1128 }
1073 1129
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 1131
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 1132 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 1133 {
1078 if (scrollBar.state) 1134 if (scrollBar.state)
1079 { 1135 {
1080 XMoveResizeWindow (xdisp, scrollBar.win, 1136 XMoveResizeWindow (dpy, scrollBar.win,
1081 window_sb_x, 0, 1137 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height); 1138 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar (); 1139 resize_scrollbar ();
1084 } 1140 }
1085 1141
1086 XMoveResizeWindow (xdisp, vt, 1142 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1088 width, height); 1144 width, height);
1089 1145
1146#ifdef HAVE_BG_PIXMAP
1147 if (bgPixmap.window_size_sensitive ())
1148 update_background ();
1149#endif
1150
1090 scr_clear (); 1151 scr_clear ();
1091#ifdef XPM_BACKGROUND
1092 resize_pixmap ();
1093#endif
1094 } 1152 }
1095 1153
1096 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1097 scr_reset (); 1155 scr_reset ();
1098 1156
1099#ifdef XPM_BACKGROUND 1157 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1100 if (pixmap) 1158 //scr_touch (false);
1159
1160#ifdef HAVE_BG_PIXMAP
1161// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1162// if (bgPixmap.pixmap)
1101 scr_touch (false); 1163// scr_touch (false);
1102#endif 1164#endif
1103 1165
1104#ifdef USE_XIM 1166#ifdef USE_XIM
1105 IMSetStatusPosition (); 1167 IMSetPosition ();
1106#endif 1168#endif
1107} 1169}
1108 1170
1109/* 1171/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1172 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1177{
1116 XWindowAttributes wattr; 1178 XWindowAttributes wattr;
1117 1179
1118 if (newwidth == 0 || newheight == 0) 1180 if (newwidth == 0 || newheight == 0)
1119 { 1181 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1182 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1183
1122 if (newwidth == 0) 1184 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1185 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1186 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1187 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1201#ifdef USE_XIM
1140 1202
1141void 1203void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1204rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1205{
1144 fg = pix_colors[Color_fg]; 1206 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1207 bg = pix_colors [Color_bg];
1146} 1208}
1147 1209
1148void 1210void
1149rxvt_term::im_set_size (XRectangle &size) 1211rxvt_term::im_set_size (XRectangle &size)
1150{ 1212{
… …
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1249 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1188 1250
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1251 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1190 *p = '\0'; 1252 *p = '\0';
1191 1253
1192 atom = XInternAtom (xdisp, server, False); 1254 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1255 win = XGetSelectionOwner (dpy, atom);
1194 1256
1195 if (win != None) 1257 if (win != None)
1196 return True; 1258 return True;
1197 } 1259 }
1198 1260
… …
1422 "*", 1484 "*",
1423 fheight, 1485 fheight,
1424 fheight + 1, fheight - 1, 1486 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1487 fheight - 2, fheight + 2);
1426 1488
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1489 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1490 &missing_charset_list, &missing_charset_count, &def_string);
1429 1491
1430 if (missing_charset_list) 1492 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1493 XFreeStringList (missing_charset_list);
1432 1494
… …
1507 preedit_attr, 1569 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1570 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1571 status_attr, NULL);
1510 1572
1511 if (preedit_attr) XFree (preedit_attr); 1573 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1574 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1575 if (fs) XFreeFontSet (dpy, fs);
1514 1576
1515 if (Input_Context == NULL) 1577 if (Input_Context == NULL)
1516 { 1578 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1579 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1580 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1585 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1586 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1587 vt_select_input ();
1526#endif 1588#endif
1527 1589
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1590 IMSetPosition ();
1530 1591
1531 return true; 1592 return true;
1532} 1593}
1533 1594
1534void 1595void
… …
1592 SET_LOCALE (locale); 1653 SET_LOCALE (locale);
1593#endif 1654#endif
1594} 1655}
1595 1656
1596void 1657void
1597rxvt_term::IMSetStatusPosition () 1658rxvt_term::IMSetPosition ()
1598{ 1659{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1660 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1661 XVaNestedList preedit_attr, status_attr;
1601 1662
1602 if (!Input_Context 1663 if (!Input_Context
1603 || !focus 1664 || !focus
1604 || !(input_style & XIMPreeditArea) 1665 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1666 || !IMisRunning ())
1606 return; 1667 return;
1607 1668
1669 if (input_style & XIMPreeditPosition)
1670 {
1671 im_set_size (preedit_rect);
1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673
1674 XSetICValues (Input_Context,
1675 XNPreeditAttributes, preedit_attr, NULL);
1676 }
1677 else
1678 {
1608 /* Getting the necessary width of preedit area */ 1679 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1680 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1681 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1682 XFree (status_attr);
1612 1683
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1684 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1685 XFree (needed_rect);
1615 1686
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1687 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1689
1619 XSetICValues (Input_Context, 1690 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1691 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1692 XNStatusAttributes, status_attr,
1693 NULL);
1622 1694
1695 XFree (status_attr);
1696 }
1697
1623 XFree (preedit_attr); 1698 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1699}
1626#endif /* USE_XIM */ 1700#endif /* USE_XIM */
1627 1701
1702void
1703rxvt_term::get_window_origin (int &x, int &y)
1704{
1705 Window cr;
1706 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1707/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1708}
1709
1710Pixmap
1711rxvt_term::get_pixmap_property (int prop_id)
1712{
1713 if (prop_id > 0 && prop_id < NUM_XA)
1714 if (xa[prop_id])
1715 {
1716 int aformat;
1717 unsigned long nitems, bytes_after;
1718 Atom atype;
1719 unsigned char *prop = NULL;
1720 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1721 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1722 &nitems, &bytes_after, &prop);
1723 if (result == Success && prop && atype == XA_PIXMAP)
1724 {
1725 return *(Pixmap *)prop;
1726 }
1727 }
1728 return None;
1729}
1730
1731#ifdef HAVE_BG_PIXMAP
1732int
1733rxvt_term::update_background ()
1734{
1735 bgPixmap.invalidate ();
1736
1737 /* no chance of real time refresh if we are blurring ! */
1738 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1739 bgPixmap.render ();
1740 else
1741 {
1742 update_background_ev.stop ();
1743 if (!bgPixmap.need_client_side_rendering())
1744 update_background_ev.start (NOW + .05);
1745 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1746 update_background_ev.start (NOW + .2); /* very slow !!! */
1747 else
1748 update_background_ev.start (NOW + .07);
1749 }
1750 return 0;
1751}
1752
1753void
1754rxvt_term::update_background_cb (time_watcher &w)
1755{
1756 bgPixmap.render ();
1757}
1758
1759#endif /* HAVE_BG_PIXMAP */
1760
1628/*----------------------- end-of-file (C source) -----------------------*/ 1761/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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