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.211 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.237 by root, Tue Jun 26 00:40:18 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 ENABLE_TRANSPARENCY
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_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
492#ifdef TRANSPARENT 509#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
494 { 511 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 513 check_our_parents ();
497 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
498 } 515 }
499#endif 516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
519#endif
500 520
501 set_colorfgbg (); 521 set_colorfgbg ();
502 522
503 init_command (cmd_argv); 523 init_command (cmd_argv);
504 524
… …
514#if ENABLE_XEMBED 534#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 535 if (rs[Rs_embed])
516 { 536 {
517 long info[2] = { 0, XEMBED_MAPPED }; 537 long info[2] = { 0, XEMBED_MAPPED };
518 538
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 539 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 540 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 541 }
522#endif 542#endif
523 543
524 XMapWindow (xdisp, vt); 544 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 545 XMapWindow (dpy, parent[0]);
526 546
527 return true; 547 return true;
528} 548}
529 549
530static struct sig_handlers 550static struct sig_handlers
… …
610 return p; 630 return p;
611} 631}
612 632
613/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
614/* 634/*
615 * window size/position calculcations for XSizeHint and other storage. 635 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 636 * if width/height are non-zero then override calculated width/height
617 */ 637 */
618void 638void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 640{
… …
691 711
692 if (scrollBar.state) 712 if (scrollBar.state)
693 { 713 {
694 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
716
696 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 718 window_vt_x += sb_w;
698 } 719 }
699 720
700 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 723 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 724 szHint.min_height = szHint.base_height + szHint.height_inc;
704 725
705 if (newwidth && newwidth - szHint.base_width < max_width) 726 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 727 {
707 szHint.width = newwidth; 728 szHint.width = newwidth;
… …
722 { 743 {
723 min_it (height, max_height); 744 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
725 } 746 }
726 747
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
729 750
730 if (recalc_x) 751 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 753
733 if (recalc_y) 754 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 756
736 ncol = width / fwidth; 757 ncol = width / fwidth;
737 nrow = height / fheight; 758 nrow = height / fheight;
738} 759}
739 760
… …
794 delete fontset[0]; 815 delete fontset[0];
795 fontset[0] = fs; 816 fontset[0] = fs;
796 817
797 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 819 prop.height += lineSpace;
820
799 fs->set_prop (prop); 821 fs->set_prop (prop, false);
800 822
801 fwidth = prop.width; 823 fwidth = prop.width;
802 fheight = prop.height; 824 fheight = prop.height;
803 fbase = prop.ascent; 825 fbase = prop.ascent;
804 826
… …
813 { 835 {
814 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
816 838
817 if (res) 839 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
819 else 844 else
820 { 845 {
821 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
822 847
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 848 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; 849 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
850
851 fs->set_prop (prop2, true);
825 } 852 }
826 853
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 854 }
830#else 855#else
831 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
832#endif 857#endif
833 } 858 }
… …
842 return true; 867 return true;
843} 868}
844 869
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 870void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 871{
847 XChangeProperty (xdisp, parent[0], 872 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 873 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 874 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 875}
851 876
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 877void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 878{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 879 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 880 char *s = rxvt_wcstoutf8 (ws);
856 881
857 XChangeProperty (xdisp, parent[0], 882 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 883 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 884 (const unsigned char *)s, strlen (s));
860 885
861 free (s); 886 free (s);
862 free (ws); 887 free (ws);
… …
887void 912void
888rxvt_term::set_window_color (int idx, const char *color) 913rxvt_term::set_window_color (int idx, const char *color)
889{ 914{
890 rxvt_color xcol; 915 rxvt_color xcol;
891 int i; 916 int i;
892 917
893 if (color == NULL || *color == '\0') 918 if (color == NULL || *color == '\0')
894 return; 919 return;
920
921 color = strdup (color);
922 allocated.push_back ((void *)color);
923 rs[Rs_color + idx] = color;
895 924
896 /* handle color aliases */ 925 /* handle color aliases */
897 if (isdigit (*color)) 926 if (isdigit (*color))
898 { 927 {
899 i = atoi (color); 928 i = atoi (color);
900 929
901 if (i >= 8 && i <= 15) 930 if (i >= 8 && i <= 15)
902 { /* bright colors */ 931 { /* bright colors */
903 i -= 8; 932 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
905 SET_PIXCOLOR (idx);
906 goto done; 934 goto done;
907 } 935 }
908 936
909 if (i >= 0 && i <= 7) 937 if (i >= 0 && i <= 7)
910 { /* normal colors */ 938 { /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 939 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 940 goto done;
914 } 941 }
915 } 942 }
916 943
917 if (!set_color (xcol, color)) 944 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 945
922 /* 946 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 947 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 948 * so just keep gobbling up the colormap
925 */ 949 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 950
938 pix_colors_focused[idx] = xcol; 951 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 952
941 /* XSetWindowAttributes attr; */ 953 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */ 954 /* Cursor cursor; */
943done: 955done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 {
948 rxvt_rgba c;
949 pix_colors [Color_fade].get (this, c);
950 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
951 }
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 956 /*TODO: handle Color_BD, scrollbar background, etc. */
955 957
958 update_fade_color (idx);
956 recolour_cursor (); 959 recolour_cursor ();
957 scr_recolour (); 960 scr_recolour ();
958} 961}
959 962
960#else 963#else
… …
962#endif /* XTERM_COLOR_CHANGE */ 965#endif /* XTERM_COLOR_CHANGE */
963 966
964void 967void
965rxvt_term::recolour_cursor () 968rxvt_term::recolour_cursor ()
966{ 969{
967 XColor xcol[2]; 970 XColor fg, bg;
968 971
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 972 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 973 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 974 : pix_colors_focused[Color_fg]).get (fg);
975
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 976 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 977 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 978 : pix_colors_focused[Color_bg]).get (bg);
975 979
976 XQueryColors (xdisp, cmap, xcol, 2);
977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 980 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978} 981}
979 982
980/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
981/* 984/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 985 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1020 1023
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1024 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false; 1025 return false;
1023} 1026}
1024 1027
1028void
1029rxvt_term::alias_color (int dst, int src)
1030{
1031 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1032}
1033
1025/* -------------------------------------------------------------------- * 1034/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1035 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1036 * -------------------------------------------------------------------- */
1028void 1037void
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1038rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
… …
1031 int fix_screen; 1040 int fix_screen;
1032 int old_width = szHint.width; 1041 int old_width = szHint.width;
1033 int old_height = szHint.height; 1042 int old_height = szHint.height;
1034 1043
1035 window_calc (newwidth, newheight); 1044 window_calc (newwidth, newheight);
1045
1046 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1036 XSetWMNormalHints (xdisp, parent[0], &szHint); 1047 XSetWMNormalHints (dpy, parent[0], &szHint);
1037 1048
1038 if (!ignoreparent) 1049 if (!ignoreparent)
1039 { 1050 {
1040#ifdef SMART_RESIZE 1051#ifdef SMART_RESIZE
1041 /* 1052 /*
… …
1045 int x, y, x1, y1; 1056 int x, y, x1, y1;
1046 int dx, dy; 1057 int dx, dy;
1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1058 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1048 Window unused_cr; 1059 Window unused_cr;
1049 1060
1050 XTranslateCoordinates (xdisp, parent[0], display->root, 1061 XTranslateCoordinates (dpy, parent[0], display->root,
1051 0, 0, &x, &y, &unused_cr); 1062 0, 0, &x, &y, &unused_cr);
1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1063 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1064 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1054 /* 1065 /*
1055 * if display->root isn't the parent window, a WM will probably have offset 1066 * if display->root isn't the parent window, a WM will probably have offset
1056 * our position for handles and decorations. Counter it 1067 * our position for handles and decorations. Counter it
1057 */ 1068 */
… …
1059 { 1070 {
1060 x -= x1; 1071 x -= x1;
1061 y -= y1; 1072 y -= y1;
1062 } 1073 }
1063 1074
1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1075 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1076 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1066 dx = old_width - szHint.width; 1077 dx = old_width - szHint.width;
1067 dy = old_height - szHint.height; 1078 dy = old_height - szHint.height;
1068 1079
1069 /* Check position of the center of the window */ 1080 /* Check position of the center of the window */
1070 if (x < x1) /* left half */ 1081 if (x < x1) /* left half */
… …
1074 if (y < y1) /* top half */ 1085 if (y < y1) /* top half */
1075 dy = 0; 1086 dy = 0;
1076 else if (y == y1) /* exact center */ 1087 else if (y == y1) /* exact center */
1077 dy /= 2; 1088 dy /= 2;
1078 1089
1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1090 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1080 szHint.width, szHint.height); 1091 szHint.width, szHint.height);
1081#else 1092#else
1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1093 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1083#endif 1094#endif
1084 } 1095 }
1085 1096
1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1097 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1087 1098
1088 if (fix_screen || newwidth != old_width || newheight != old_height) 1099 if (fix_screen || newwidth != old_width || newheight != old_height)
1089 { 1100 {
1090 if (scrollBar.state) 1101 if (scrollBar.state)
1091 { 1102 {
1092 XMoveResizeWindow (xdisp, scrollBar.win, 1103 XMoveResizeWindow (dpy, scrollBar.win,
1093 window_sb_x, 0, 1104 window_sb_x, 0,
1094 scrollbar_TotalWidth (), szHint.height); 1105 scrollbar_TotalWidth (), szHint.height);
1095 resize_scrollbar (); 1106 resize_scrollbar ();
1096 } 1107 }
1097 1108
1098 XMoveResizeWindow (xdisp, vt, 1109 XMoveResizeWindow (dpy, vt,
1099 window_vt_x, window_vt_y, 1110 window_vt_x, window_vt_y,
1100 width, height); 1111 width, height);
1101 1112
1102 scr_clear (); 1113 scr_clear ();
1103#ifdef XPM_BACKGROUND 1114#ifdef XPM_BACKGROUND
… …
1106 } 1117 }
1107 1118
1108 if (fix_screen || old_height == 0) 1119 if (fix_screen || old_height == 0)
1109 scr_reset (); 1120 scr_reset ();
1110 1121
1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123 //scr_touch (false);
1124
1111#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1112 if (pixmap) 1126 if (pixmap)
1113 scr_touch (false); 1127 scr_touch (false);
1114#endif 1128#endif
1115 1129
1116#ifdef USE_XIM 1130#ifdef USE_XIM
1117 IMSetStatusPosition (); 1131 IMSetPosition ();
1118#endif 1132#endif
1119} 1133}
1120 1134
1121/* 1135/*
1122 * Set the width/height of the vt window in characters. Units are pixels. 1136 * Set the width/height of the vt window in characters. Units are pixels.
… …
1127{ 1141{
1128 XWindowAttributes wattr; 1142 XWindowAttributes wattr;
1129 1143
1130 if (newwidth == 0 || newheight == 0) 1144 if (newwidth == 0 || newheight == 0)
1131 { 1145 {
1132 XGetWindowAttributes (xdisp, display->root, &wattr); 1146 XGetWindowAttributes (dpy, display->root, &wattr);
1133 1147
1134 if (newwidth == 0) 1148 if (newwidth == 0)
1135 newwidth = wattr.width - szHint.base_width; 1149 newwidth = wattr.width - szHint.base_width;
1136 if (newheight == 0) 1150 if (newheight == 0)
1137 newheight = wattr.height - szHint.base_height; 1151 newheight = wattr.height - szHint.base_height;
… …
1151#ifdef USE_XIM 1165#ifdef USE_XIM
1152 1166
1153void 1167void
1154rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1168rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1155{ 1169{
1156 fg = pix_colors[Color_fg]; 1170 fg = pix_colors [Color_fg];
1157 bg = pix_colors[Color_bg]; 1171 bg = pix_colors [Color_bg];
1158} 1172}
1159 1173
1160void 1174void
1161rxvt_term::im_set_size (XRectangle &size) 1175rxvt_term::im_set_size (XRectangle &size)
1162{ 1176{
… …
1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1213 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1200 1214
1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1215 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1202 *p = '\0'; 1216 *p = '\0';
1203 1217
1204 atom = XInternAtom (xdisp, server, False); 1218 atom = XInternAtom (dpy, server, False);
1205 win = XGetSelectionOwner (xdisp, atom); 1219 win = XGetSelectionOwner (dpy, atom);
1206 1220
1207 if (win != None) 1221 if (win != None)
1208 return True; 1222 return True;
1209 } 1223 }
1210 1224
… …
1434 "*", 1448 "*",
1435 fheight, 1449 fheight,
1436 fheight + 1, fheight - 1, 1450 fheight + 1, fheight - 1,
1437 fheight - 2, fheight + 2); 1451 fheight - 2, fheight + 2);
1438 1452
1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1453 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1440 &missing_charset_list, &missing_charset_count, &def_string); 1454 &missing_charset_list, &missing_charset_count, &def_string);
1441 1455
1442 if (missing_charset_list) 1456 if (missing_charset_list)
1443 XFreeStringList (missing_charset_list); 1457 XFreeStringList (missing_charset_list);
1444 1458
… …
1519 preedit_attr, 1533 preedit_attr,
1520 status_attr ? XNStatusAttributes : NULL, 1534 status_attr ? XNStatusAttributes : NULL,
1521 status_attr, NULL); 1535 status_attr, NULL);
1522 1536
1523 if (preedit_attr) XFree (preedit_attr); 1537 if (preedit_attr) XFree (preedit_attr);
1524 if (status_attr) XFree (status_attr); 1538 if (status_attr) XFree (status_attr);
1525 if (fs) XFreeFontSet (xdisp, fs); 1539 if (fs) XFreeFontSet (dpy, fs);
1526 1540
1527 if (Input_Context == NULL) 1541 if (Input_Context == NULL)
1528 { 1542 {
1529 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1543 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1530 im_destroy (); 1544 im_destroy ();
… …
1535 // unfortunately, only the focus window is used by XIM, hard to fix 1549 // unfortunately, only the focus window is used by XIM, hard to fix
1536 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1550 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1537 vt_select_input (); 1551 vt_select_input ();
1538#endif 1552#endif
1539 1553
1540 if (input_style & XIMPreeditArea)
1541 IMSetStatusPosition (); 1554 IMSetPosition ();
1542 1555
1543 return true; 1556 return true;
1544} 1557}
1545 1558
1546void 1559void
… …
1604 SET_LOCALE (locale); 1617 SET_LOCALE (locale);
1605#endif 1618#endif
1606} 1619}
1607 1620
1608void 1621void
1609rxvt_term::IMSetStatusPosition () 1622rxvt_term::IMSetPosition ()
1610{ 1623{
1611 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1612 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1613 1626
1614 if (!Input_Context 1627 if (!Input_Context
1615 || !focus 1628 || !focus
1616 || !(input_style & XIMPreeditArea) 1629 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1617 || !IMisRunning ()) 1630 || !IMisRunning ())
1618 return; 1631 return;
1619 1632
1633 if (input_style & XIMPreeditPosition)
1634 {
1635 im_set_size (preedit_rect);
1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637
1638 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, NULL);
1640 }
1641 else
1642 {
1620 /* Getting the necessary width of preedit area */ 1643 /* Getting the necessary width of preedit area */
1621 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1644 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1622 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1645 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1623 XFree (status_attr); 1646 XFree (status_attr);
1624 1647
1625 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1648 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1626 XFree (needed_rect); 1649 XFree (needed_rect);
1627 1650
1628 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1651 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1629 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1630 1653
1631 XSetICValues (Input_Context, 1654 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, 1655 XNPreeditAttributes, preedit_attr,
1633 XNStatusAttributes, status_attr, NULL); 1656 XNStatusAttributes, status_attr,
1657 NULL);
1634 1658
1659 XFree (status_attr);
1660 }
1661
1635 XFree (preedit_attr); 1662 XFree (preedit_attr);
1636 XFree (status_attr);
1637} 1663}
1638#endif /* USE_XIM */ 1664#endif /* USE_XIM */
1639 1665
1640/*----------------------- end-of-file (C source) -----------------------*/ 1666/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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