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.212 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.243 by sasha, Thu Aug 16 21:26:20 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 XPM_BACKGROUND
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 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least */
549 if (!bgPixmap.window_size_sensitive ())
550 update_background();
551#endif
552 }
553#endif
554
555#if ENABLE_PERL
556 rootwin_ev.start (display, display->root);
499#endif 557#endif
500 558
501 set_colorfgbg (); 559 set_colorfgbg ();
502 560
503 init_command (cmd_argv); 561 init_command (cmd_argv);
… …
514#if ENABLE_XEMBED 572#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 573 if (rs[Rs_embed])
516 { 574 {
517 long info[2] = { 0, XEMBED_MAPPED }; 575 long info[2] = { 0, XEMBED_MAPPED };
518 576
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 577 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 578 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 579 }
522#endif 580#endif
523 581
524 XMapWindow (xdisp, vt); 582 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 583 XMapWindow (dpy, parent[0]);
526 584
527 return true; 585 return true;
528} 586}
529 587
530static struct sig_handlers 588static struct sig_handlers
… …
610 return p; 668 return p;
611} 669}
612 670
613/*----------------------------------------------------------------------*/ 671/*----------------------------------------------------------------------*/
614/* 672/*
615 * window size/position calculcations for XSizeHint and other storage. 673 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 674 * if width/height are non-zero then override calculated width/height
617 */ 675 */
618void 676void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 677rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 678{
… …
691 749
692 if (scrollBar.state) 750 if (scrollBar.state)
693 { 751 {
694 sb_w = scrollbar_TotalWidth (); 752 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 753 szHint.base_width += sb_w;
754
696 if (!OPTION (Opt_scrollBar_right)) 755 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 756 window_vt_x += sb_w;
698 } 757 }
699 758
700 szHint.width_inc = fwidth; 759 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 760 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 761 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 762 szHint.min_height = szHint.base_height + szHint.height_inc;
704 763
705 if (newwidth && newwidth - szHint.base_width < max_width) 764 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 765 {
707 szHint.width = newwidth; 766 szHint.width = newwidth;
… …
722 { 781 {
723 min_it (height, max_height); 782 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 783 szHint.height = szHint.base_height + height;
725 } 784 }
726 785
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 786 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 787 window_sb_x = szHint.width - sb_w;
729 788
730 if (recalc_x) 789 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 790 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 791
733 if (recalc_y) 792 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 793 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 794
736 ncol = width / fwidth; 795 ncol = width / fwidth;
737 nrow = height / fheight; 796 nrow = height / fheight;
738} 797}
739 798
… …
794 delete fontset[0]; 853 delete fontset[0];
795 fontset[0] = fs; 854 fontset[0] = fs;
796 855
797 prop = (*fs)[1]->properties (); 856 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 857 prop.height += lineSpace;
858
799 fs->set_prop (prop); 859 fs->set_prop (prop, false);
800 860
801 fwidth = prop.width; 861 fwidth = prop.width;
802 fheight = prop.height; 862 fheight = prop.height;
803 fbase = prop.ascent; 863 fbase = prop.ascent;
804 864
… …
813 { 873 {
814 fontset[style] = fs = new rxvt_fontset (this); 874 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 875 rxvt_fontprop prop2 = prop;
816 876
817 if (res) 877 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 878 {
879 fs->populate (res);
880 fs->set_prop (prop2, false);
881 }
819 else 882 else
820 { 883 {
821 res = fontset[0]->fontdesc; 884 fs->populate (fontset[0]->fontdesc);
822 885
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 886 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 887 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
888
889 fs->set_prop (prop2, true);
825 } 890 }
826 891
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 892 }
830#else 893#else
831 fontset[style] = fontset[0]; 894 fontset[style] = fontset[0];
832#endif 895#endif
833 } 896 }
… …
842 return true; 905 return true;
843} 906}
844 907
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 909{
847 XChangeProperty (xdisp, parent[0], 910 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 913}
851 914
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 915void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 916{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 917 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 918 char *s = rxvt_wcstoutf8 (ws);
856 919
857 XChangeProperty (xdisp, parent[0], 920 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 921 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 922 (const unsigned char *)s, strlen (s));
860 923
861 free (s); 924 free (s);
862 free (ws); 925 free (ws);
… …
926 pix_colors_focused[idx] = xcol; 989 pix_colors_focused[idx] = xcol;
927 990
928 /* XSetWindowAttributes attr; */ 991 /* XSetWindowAttributes attr; */
929 /* Cursor cursor; */ 992 /* Cursor cursor; */
930done: 993done:
931
932#if OFF_FOCUS_FADING
933 if (rs[Rs_fade])
934 {
935 rgba c;
936 pix_colors [Color_fade].get (this, c);
937 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
938 }
939#endif
940
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 994 /*TODO: handle Color_BD, scrollbar background, etc. */
942 995
996 update_fade_color (idx);
943 recolour_cursor (); 997 recolour_cursor ();
944 scr_recolour (); 998 scr_recolour ();
945} 999}
946 1000
947#else 1001#else
… …
949#endif /* XTERM_COLOR_CHANGE */ 1003#endif /* XTERM_COLOR_CHANGE */
950 1004
951void 1005void
952rxvt_term::recolour_cursor () 1006rxvt_term::recolour_cursor ()
953{ 1007{
954 XColor xcol[2]; 1008 XColor fg, bg;
955 1009
956 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1010 (ISSET_PIXCOLOR (Color_pointer_fg)
957 ? pix_colors_focused[Color_pointer_fg] 1011 ? pix_colors_focused[Color_pointer_fg]
958 : pix_colors_focused[Color_fg]; 1012 : pix_colors_focused[Color_fg]).get (fg);
1013
959 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1014 (ISSET_PIXCOLOR (Color_pointer_bg)
960 ? pix_colors_focused[Color_pointer_bg] 1015 ? pix_colors_focused[Color_pointer_bg]
961 : pix_colors_focused[Color_bg]; 1016 : pix_colors_focused[Color_bg]).get (bg);
962 1017
963 XQueryColors (xdisp, cmap, xcol, 2);
964 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 1018 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
965} 1019}
966 1020
967/*----------------------------------------------------------------------*/ 1021/*----------------------------------------------------------------------*/
968/* 1022/*
969 * find if fg/bg matches any of the normal (low-intensity) colors 1023 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1007 1061
1008 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1062 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1009 return false; 1063 return false;
1010} 1064}
1011 1065
1066void
1067rxvt_term::alias_color (int dst, int src)
1068{
1069 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1070}
1071
1012/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
1013 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
1014 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
1015void 1075void
1016rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1076rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
… …
1018 int fix_screen; 1078 int fix_screen;
1019 int old_width = szHint.width; 1079 int old_width = szHint.width;
1020 int old_height = szHint.height; 1080 int old_height = szHint.height;
1021 1081
1022 window_calc (newwidth, newheight); 1082 window_calc (newwidth, newheight);
1083
1084 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1023 XSetWMNormalHints (xdisp, parent[0], &szHint); 1085 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 1086
1025 if (!ignoreparent) 1087 if (!ignoreparent)
1026 { 1088 {
1027#ifdef SMART_RESIZE 1089#ifdef SMART_RESIZE
1028 /* 1090 /*
… …
1032 int x, y, x1, y1; 1094 int x, y, x1, y1;
1033 int dx, dy; 1095 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1096 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1097 Window unused_cr;
1036 1098
1037 XTranslateCoordinates (xdisp, parent[0], display->root, 1099 XTranslateCoordinates (dpy, parent[0], display->root,
1038 0, 0, &x, &y, &unused_cr); 1100 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1101 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1102 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1103 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 1104 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 1105 * our position for handles and decorations. Counter it
1044 */ 1106 */
… …
1046 { 1108 {
1047 x -= x1; 1109 x -= x1;
1048 y -= y1; 1110 y -= y1;
1049 } 1111 }
1050 1112
1051 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1113 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1052 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1114 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1053 dx = old_width - szHint.width; 1115 dx = old_width - szHint.width;
1054 dy = old_height - szHint.height; 1116 dy = old_height - szHint.height;
1055 1117
1056 /* Check position of the center of the window */ 1118 /* Check position of the center of the window */
1057 if (x < x1) /* left half */ 1119 if (x < x1) /* left half */
… …
1061 if (y < y1) /* top half */ 1123 if (y < y1) /* top half */
1062 dy = 0; 1124 dy = 0;
1063 else if (y == y1) /* exact center */ 1125 else if (y == y1) /* exact center */
1064 dy /= 2; 1126 dy /= 2;
1065 1127
1066 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1128 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1067 szHint.width, szHint.height); 1129 szHint.width, szHint.height);
1068#else 1130#else
1069 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1131 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1070#endif 1132#endif
1071 } 1133 }
1072 1134
1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1135 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1074 1136
1075 if (fix_screen || newwidth != old_width || newheight != old_height) 1137 if (fix_screen || newwidth != old_width || newheight != old_height)
1076 { 1138 {
1077 if (scrollBar.state) 1139 if (scrollBar.state)
1078 { 1140 {
1079 XMoveResizeWindow (xdisp, scrollBar.win, 1141 XMoveResizeWindow (dpy, scrollBar.win,
1080 window_sb_x, 0, 1142 window_sb_x, 0,
1081 scrollbar_TotalWidth (), szHint.height); 1143 scrollbar_TotalWidth (), szHint.height);
1082 resize_scrollbar (); 1144 resize_scrollbar ();
1083 } 1145 }
1084 1146
1085 XMoveResizeWindow (xdisp, vt, 1147 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1148 window_vt_x, window_vt_y,
1087 width, height); 1149 width, height);
1088 1150
1151#ifdef XPM_BACKGROUND
1152 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1153 if (bgPixmap.window_size_sensitive ())
1154 update_background ();
1155#endif
1156
1089 scr_clear (); 1157 scr_clear ();
1090#ifdef XPM_BACKGROUND
1091 resize_pixmap ();
1092#endif
1093 } 1158 }
1094 1159
1095 if (fix_screen || old_height == 0) 1160 if (fix_screen || old_height == 0)
1096 scr_reset (); 1161 scr_reset ();
1097 1162
1098#ifdef XPM_BACKGROUND 1163 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1099 if (pixmap) 1164 //scr_touch (false);
1165
1166#ifdef HAVE_BG_PIXMAP
1167// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168// if (bgPixmap.pixmap)
1100 scr_touch (false); 1169// scr_touch (false);
1101#endif 1170#endif
1102 1171
1103#ifdef USE_XIM 1172#ifdef USE_XIM
1104 IMSetStatusPosition (); 1173 IMSetPosition ();
1105#endif 1174#endif
1106} 1175}
1107 1176
1108/* 1177/*
1109 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
… …
1114{ 1183{
1115 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1116 1185
1117 if (newwidth == 0 || newheight == 0) 1186 if (newwidth == 0 || newheight == 0)
1118 { 1187 {
1119 XGetWindowAttributes (xdisp, display->root, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1120 1189
1121 if (newwidth == 0) 1190 if (newwidth == 0)
1122 newwidth = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1123 if (newheight == 0) 1192 if (newheight == 0)
1124 newheight = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
… …
1138#ifdef USE_XIM 1207#ifdef USE_XIM
1139 1208
1140void 1209void
1141rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1142{ 1211{
1143 fg = pix_colors[Color_fg]; 1212 fg = pix_colors [Color_fg];
1144 bg = pix_colors[Color_bg]; 1213 bg = pix_colors [Color_bg];
1145} 1214}
1146 1215
1147void 1216void
1148rxvt_term::im_set_size (XRectangle &size) 1217rxvt_term::im_set_size (XRectangle &size)
1149{ 1218{
… …
1186 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1187 1256
1188 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1189 *p = '\0'; 1258 *p = '\0';
1190 1259
1191 atom = XInternAtom (xdisp, server, False); 1260 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (xdisp, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1193 1262
1194 if (win != None) 1263 if (win != None)
1195 return True; 1264 return True;
1196 } 1265 }
1197 1266
… …
1421 "*", 1490 "*",
1422 fheight, 1491 fheight,
1423 fheight + 1, fheight - 1, 1492 fheight + 1, fheight - 1,
1424 fheight - 2, fheight + 2); 1493 fheight - 2, fheight + 2);
1425 1494
1426 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1427 &missing_charset_list, &missing_charset_count, &def_string); 1496 &missing_charset_list, &missing_charset_count, &def_string);
1428 1497
1429 if (missing_charset_list) 1498 if (missing_charset_list)
1430 XFreeStringList (missing_charset_list); 1499 XFreeStringList (missing_charset_list);
1431 1500
… …
1506 preedit_attr, 1575 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1576 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1577 status_attr, NULL);
1509 1578
1510 if (preedit_attr) XFree (preedit_attr); 1579 if (preedit_attr) XFree (preedit_attr);
1511 if (status_attr) XFree (status_attr); 1580 if (status_attr) XFree (status_attr);
1512 if (fs) XFreeFontSet (xdisp, fs); 1581 if (fs) XFreeFontSet (dpy, fs);
1513 1582
1514 if (Input_Context == NULL) 1583 if (Input_Context == NULL)
1515 { 1584 {
1516 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1517 im_destroy (); 1586 im_destroy ();
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1591 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1593 vt_select_input ();
1525#endif 1594#endif
1526 1595
1527 if (input_style & XIMPreeditArea)
1528 IMSetStatusPosition (); 1596 IMSetPosition ();
1529 1597
1530 return true; 1598 return true;
1531} 1599}
1532 1600
1533void 1601void
… …
1591 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1592#endif 1660#endif
1593} 1661}
1594 1662
1595void 1663void
1596rxvt_term::IMSetStatusPosition () 1664rxvt_term::IMSetPosition ()
1597{ 1665{
1598 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1599 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1600 1668
1601 if (!Input_Context 1669 if (!Input_Context
1602 || !focus 1670 || !focus
1603 || !(input_style & XIMPreeditArea) 1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1604 || !IMisRunning ()) 1672 || !IMisRunning ())
1605 return; 1673 return;
1606 1674
1675 if (input_style & XIMPreeditPosition)
1676 {
1677 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679
1680 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL);
1682 }
1683 else
1684 {
1607 /* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1608 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1609 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1610 XFree (status_attr); 1688 XFree (status_attr);
1611 1689
1612 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1613 XFree (needed_rect); 1691 XFree (needed_rect);
1614 1692
1615 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1616 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1617 1695
1618 XSetICValues (Input_Context, 1696 XSetICValues (Input_Context,
1619 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1620 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1621 1700
1701 XFree (status_attr);
1702 }
1703
1622 XFree (preedit_attr); 1704 XFree (preedit_attr);
1623 XFree (status_attr);
1624} 1705}
1625#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1626 1707
1627/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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