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.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.254 by ayin, Thu Oct 18 09:11:42 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
55 60
56static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
57 62
58bool 63bool
59rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) NOTHROW
60{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
61 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 72 return false;
63 73
64 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
66 return true; 76 return true;
67} 77}
68 78
69void 79void
… …
143} 153}
144#endif 154#endif
145 155
146rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
147 : 157 :
148#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 163#endif
151#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 166#endif
154#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
193#endif 206#endif
194} 207}
195 208
196// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 210// for use before an emergency exit
211void
198void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
199{ 213{
200 if (cmd_pid) 214 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
202 216
217 pty_ev.stop ();
203 delete pty; pty = 0; 218 delete pty; pty = 0;
204} 219}
205 220
206rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
207{ 222{
… …
222 237
223#ifdef USE_XIM 238#ifdef USE_XIM
224 im_destroy (); 239 im_destroy ();
225#endif 240#endif
226#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 244#endif
230#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 247#endif
233#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 259#endif
245#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 264#endif
250 if (gc) XFreeGC (xdisp, gc); 265 if (gc) XFreeGC (dpy, gc);
251 266
252 delete drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (parent[0]) 269 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
256 271
257 for (int i = 0; i < TOTAL_COLORS; i++) 272 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 273 if (ISSET_PIXCOLOR (i))
259 { 274 {
260 pix_colors_focused [i].free (this); 275 pix_colors_focused [i].free (this);
… …
264 } 279 }
265 280
266 clear (); 281 clear ();
267 } 282 }
268 283
269 delete pix_colors_focused; 284 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
272#endif 287#endif
273 288
274 displays.put (display); 289 displays.put (display);
275 290
276 scr_release (); 291 scr_release ();
… …
301{ 316{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 318
304 cmd_pid = 0; 319 cmd_pid = 0;
305 320
306 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
307 destroy (); 322 destroy ();
308} 323}
309 324
310void 325void
311rxvt_term::destroy () 326rxvt_term::destroy ()
… …
325 im_ev.stop (display); 340 im_ev.stop (display);
326#endif 341#endif
327#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
329#endif 344#endif
330#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
331 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
332#endif 347#endif
333 incr_ev.stop (); 348 incr_ev.stop ();
334 termwin_ev.stop (display); 349 termwin_ev.stop (display);
335 vt_ev.stop (display); 350 vt_ev.stop (display);
… …
475#ifdef KEYSYM_RESOURCE 490#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 491 keyboard->register_done ();
477#endif 492#endif
478 493
479#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 495 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 497#endif
483 498
484 pty = ptytty::create (); 499 pty = ptytty::create ();
485 500
… …
488 init_xlocale (); 503 init_xlocale ();
489 504
490 scr_reset (); // initialize screen 505 scr_reset (); // initialize screen
491 506
492#if 0 507#if 0
493 XSynchronize (xdisp, True); 508 XSynchronize (dpy, True);
494#endif 509#endif
495 510
496#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 512 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
499#endif 514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
500#ifdef TRANSPARENT 519#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 520 if (option (Opt_transparent))
502 { 521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
506 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
507#endif 561#endif
508 562
509 set_colorfgbg (); 563 set_colorfgbg ();
510 564
511 init_command (cmd_argv); 565 init_command (cmd_argv);
… …
522#if ENABLE_XEMBED 576#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
524 { 578 {
525 long info[2] = { 0, XEMBED_MAPPED }; 579 long info[2] = { 0, XEMBED_MAPPED };
526 580
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2); 582 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 583 }
530#endif 584#endif
531 585
532 XMapWindow (xdisp, vt); 586 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 587 XMapWindow (dpy, parent[0]);
534 588
535 return true; 589 return true;
536} 590}
537 591
538static struct sig_handlers 592static struct sig_handlers
… …
618 return p; 672 return p;
619} 673}
620 674
621/*----------------------------------------------------------------------*/ 675/*----------------------------------------------------------------------*/
622/* 676/*
623 * window size/position calculcations for XSizeHint and other storage. 677 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 678 * if width/height are non-zero then override calculated width/height
625 */ 679 */
626void 680void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 681rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 682{
… …
700 if (scrollBar.state) 754 if (scrollBar.state)
701 { 755 {
702 sb_w = scrollbar_TotalWidth (); 756 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 757 szHint.base_width += sb_w;
704 758
705 if (!OPTION (Opt_scrollBar_right)) 759 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 760 window_vt_x += sb_w;
707 } 761 }
708 762
709 szHint.width_inc = fwidth; 763 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 764 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 765 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 766 szHint.min_height = szHint.base_height + szHint.height_inc;
713 767
714 if (newwidth && newwidth - szHint.base_width < max_width) 768 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 769 {
716 szHint.width = newwidth; 770 szHint.width = newwidth;
… …
731 { 785 {
732 min_it (height, max_height); 786 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 787 szHint.height = szHint.base_height + height;
734 } 788 }
735 789
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 790 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 791 window_sb_x = szHint.width - sb_w;
738 792
739 if (recalc_x) 793 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 794 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 795
742 if (recalc_y) 796 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 797 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 798
745 ncol = width / fwidth; 799 ncol = width / fwidth;
746 nrow = height / fheight; 800 nrow = height / fheight;
747} 801}
748 802
… …
803 delete fontset[0]; 857 delete fontset[0];
804 fontset[0] = fs; 858 fontset[0] = fs;
805 859
806 prop = (*fs)[1]->properties (); 860 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 861 prop.height += lineSpace;
862
808 fs->set_prop (prop); 863 fs->set_prop (prop, false);
809 864
810 fwidth = prop.width; 865 fwidth = prop.width;
811 fheight = prop.height; 866 fheight = prop.height;
812 fbase = prop.ascent; 867 fbase = prop.ascent;
813 868
… …
822 { 877 {
823 fontset[style] = fs = new rxvt_fontset (this); 878 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 879 rxvt_fontprop prop2 = prop;
825 880
826 if (res) 881 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 882 {
883 fs->populate (res);
884 fs->set_prop (prop2, false);
885 }
828 else 886 else
829 { 887 {
830 res = fontset[0]->fontdesc; 888 fs->populate (fontset[0]->fontdesc);
831 889
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 890 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
833 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 891 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
892
893 fs->set_prop (prop2, true);
834 } 894 }
835 895
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 896 }
839#else 897#else
840 fontset[style] = fontset[0]; 898 fontset[style] = fontset[0];
841#endif 899#endif
842 } 900 }
… …
849 } 907 }
850 908
851 return true; 909 return true;
852} 910}
853 911
912void
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 913rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 914{
856 XChangeProperty (xdisp, parent[0], 915 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 916 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 917 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 918}
860 919
920void
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 921rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 922{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 923 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 924 char *s = rxvt_wcstoutf8 (ws);
865 925
866 XChangeProperty (xdisp, parent[0], 926 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 927 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 928 (const unsigned char *)s, strlen (s));
869 929
870 free (s); 930 free (s);
871 free (ws); 931 free (ws);
… …
890#if ENABLE_EWMH 950#if ENABLE_EWMH
891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 951 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892#endif 952#endif
893} 953}
894 954
955void
956rxvt_term::set_window_color (int idx, const char *color)
957{
895#ifdef XTERM_COLOR_CHANGE 958#ifdef XTERM_COLOR_CHANGE
896void
897rxvt_term::set_window_color (int idx, const char *color)
898{
899 rxvt_color xcol; 959 rxvt_color xcol;
900 int i; 960 int i;
901 961
902 if (color == NULL || *color == '\0') 962 if (color == NULL || *color == '\0')
903 return; 963 return;
… …
935 pix_colors_focused[idx] = xcol; 995 pix_colors_focused[idx] = xcol;
936 996
937 /* XSetWindowAttributes attr; */ 997 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 998 /* Cursor cursor; */
939done: 999done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 1000 /*TODO: handle Color_BD, scrollbar background, etc. */
951 1001
1002 update_fade_color (idx);
952 recolour_cursor (); 1003 recolour_cursor ();
953 scr_recolour (); 1004 scr_recolour ();
954}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
1006}
959 1007
960void 1008void
961rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
962{ 1010{
963 XColor fg, bg; 1011 XColor fg, bg;
… …
968 1016
969 (ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 1019 : pix_colors_focused[Color_bg]).get (bg);
972 1020
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 1022}
975 1023
976/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
977/* 1025/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 1026 * find if fg/bg matches any of the normal (low-intensity) colors
… …
995 1043
996 for (i = Color_Black; i <= Color_White; i++) 1044 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1045 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1046 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1047 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1048#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1049 xpmb = "default;";
1002#endif 1050#endif
1003 break; 1051 break;
1004 } 1052 }
1005 1053
… …
1033 int fix_screen; 1081 int fix_screen;
1034 int old_width = szHint.width; 1082 int old_width = szHint.width;
1035 int old_height = szHint.height; 1083 int old_height = szHint.height;
1036 1084
1037 window_calc (newwidth, newheight); 1085 window_calc (newwidth, newheight);
1086
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1089
1040 if (!ignoreparent) 1090 if (!ignoreparent)
1041 { 1091 {
1042#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1043 /* 1093 /*
… …
1047 int x, y, x1, y1; 1097 int x, y, x1, y1;
1048 int dx, dy; 1098 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1100 Window unused_cr;
1051 1101
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1106 /*
1057 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1058 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1059 */ 1109 */
… …
1061 { 1111 {
1062 x -= x1; 1112 x -= x1;
1063 y -= y1; 1113 y -= y1;
1064 } 1114 }
1065 1115
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1070 1120
1071 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1077 dy = 0; 1127 dy = 0;
1078 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1079 dy /= 2; 1129 dy /= 2;
1080 1130
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1083#else 1133#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1135#endif
1086 } 1136 }
1087 1137
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1139
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1141 {
1092 if (scrollBar.state) 1142 if (scrollBar.state)
1093 { 1143 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1145 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1147 resize_scrollbar ();
1098 } 1148 }
1099 1149
1100 XMoveResizeWindow (xdisp, vt, 1150 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1102 width, height); 1152 width, height);
1103 1153
1154#ifdef HAVE_BG_PIXMAP
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1104 scr_clear (); 1159 scr_clear ();
1105#ifdef XPM_BACKGROUND
1106 resize_pixmap ();
1107#endif
1108 } 1160 }
1109 1161
1110 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1111 scr_reset (); 1163 scr_reset ();
1112 1164
1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 //scr_touch (false); 1166 //scr_touch (false);
1115 1167
1116#ifdef XPM_BACKGROUND 1168#ifdef HAVE_BG_PIXMAP
1117 if (pixmap) 1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1118 scr_touch (false); 1171// scr_touch (false);
1119#endif 1172#endif
1120 1173
1121#ifdef USE_XIM 1174#ifdef USE_XIM
1122 IMSetStatusPosition (); 1175 IMSetPosition ();
1123#endif 1176#endif
1124} 1177}
1125 1178
1126/* 1179/*
1127 * Set the width/height of the vt window in characters. Units are pixels. 1180 * Set the width/height of the vt window in characters. Units are pixels.
… …
1132{ 1185{
1133 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1134 1187
1135 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1136 { 1189 {
1137 XGetWindowAttributes (xdisp, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1191
1139 if (newwidth == 0) 1192 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1194 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1258
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1260 *p = '\0';
1208 1261
1209 atom = XInternAtom (xdisp, server, False); 1262 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (xdisp, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1211 1264
1212 if (win != None) 1265 if (win != None)
1213 return True; 1266 return True;
1214 } 1267 }
1215 1268
… …
1439 "*", 1492 "*",
1440 fheight, 1493 fheight,
1441 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1442 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1443 1496
1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1445 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1446 1499
1447 if (missing_charset_list) 1500 if (missing_charset_list)
1448 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1449 1502
… …
1524 preedit_attr, 1577 preedit_attr,
1525 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1526 status_attr, NULL); 1579 status_attr, NULL);
1527 1580
1528 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1529 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1530 if (fs) XFreeFontSet (xdisp, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1531 1584
1532 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1533 { 1586 {
1534 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535 im_destroy (); 1588 im_destroy ();
… …
1540 // unfortunately, only the focus window is used by XIM, hard to fix 1593 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input (); 1595 vt_select_input ();
1543#endif 1596#endif
1544 1597
1545 if (input_style & XIMPreeditArea)
1546 IMSetStatusPosition (); 1598 IMSetPosition ();
1547 1599
1548 return true; 1600 return true;
1549} 1601}
1550 1602
1551void 1603void
… …
1609 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1610#endif 1662#endif
1611} 1663}
1612 1664
1613void 1665void
1614rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1615{ 1667{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1618 1670
1619 if (!Input_Context 1671 if (!Input_Context
1620 || !focus 1672 || !focus
1621 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1674 || !IMisRunning ())
1623 return; 1675 return;
1624 1676
1677 if (input_style & XIMPreeditPosition)
1678 {
1679 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681
1682 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL);
1684 }
1685 else
1686 {
1625 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1627 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1628 XFree (status_attr); 1690 XFree (status_attr);
1629 1691
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1693 XFree (needed_rect);
1632 1694
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1697
1636 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1639 1702
1703 XFree (status_attr);
1704 }
1705
1640 XFree (preedit_attr); 1706 XFree (preedit_attr);
1641 XFree (status_attr);
1642} 1707}
1643#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1644 1709
1710void
1711rxvt_term::get_window_origin (int &x, int &y)
1712{
1713 Window cr;
1714 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1716}
1717
1718Pixmap
1719rxvt_term::get_pixmap_property (int prop_id)
1720{
1721 if (prop_id > 0 && prop_id < NUM_XA)
1722 if (xa[prop_id])
1723 {
1724 int aformat;
1725 unsigned long nitems, bytes_after;
1726 Atom atype;
1727 unsigned char *prop = NULL;
1728 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1729 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730 &nitems, &bytes_after, &prop);
1731 if (result == Success && prop && atype == XA_PIXMAP)
1732 {
1733 return *(Pixmap *)prop;
1734 }
1735 }
1736 return None;
1737}
1738
1739#ifdef HAVE_BG_PIXMAP
1740int
1741rxvt_term::update_background ()
1742{
1743 bgPixmap.invalidate ();
1744
1745 /* no chance of real time refresh if we are blurring ! */
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1747 bgPixmap.render ();
1748 else
1749 {
1750 update_background_ev.stop ();
1751 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */
1755 else
1756 update_background_ev.start (NOW + .07);
1757 }
1758 return 0;
1759}
1760
1761void
1762rxvt_term::update_background_cb (time_watcher &w)
1763{
1764 bgPixmap.render ();
1765}
1766
1767#endif /* HAVE_BG_PIXMAP */
1768
1645/*----------------------- end-of-file (C source) -----------------------*/ 1769/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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