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.227 by root, Fri Jul 28 17:16:42 2006 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 len = strlen (locale) + 1;
62
63 if (len > 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, len))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, len);
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 TRANSPARENT || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
150#endif 155#endif
151#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
… …
198void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
199{ 204{
200 if (cmd_pid) 205 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
202 207
208 pty_ev.stop ();
203 delete pty; pty = 0; 209 delete pty; pty = 0;
204} 210}
205 211
206rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
207{ 213{
… …
222 228
223#ifdef USE_XIM 229#ifdef USE_XIM
224 im_destroy (); 230 im_destroy ();
225#endif 231#endif
226#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 235#endif
230#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 238#endif
233#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 250#endif
245#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 255#endif
250 if (gc) XFreeGC (xdisp, gc); 256 if (gc) XFreeGC (dpy, gc);
251 257
252 delete drawable; 258 delete drawable;
253 // destroy all windows 259 // destroy all windows
254 if (parent[0]) 260 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
262
263 for (int i = 0; i < TOTAL_COLORS; i++)
264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
256 271
257 clear (); 272 clear ();
258 } 273 }
259 274
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 275 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
264#endif 278#endif
265 279
… …
317 im_ev.stop (display); 331 im_ev.stop (display);
318#endif 332#endif
319#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
321#endif 335#endif
322#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
323 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
324#endif 338#endif
325 incr_ev.stop (); 339 incr_ev.stop ();
326 termwin_ev.stop (display); 340 termwin_ev.stop (display);
327 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
480 init_xlocale (); 494 init_xlocale ();
481 495
482 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
483 497
484#if 0 498#if 0
485 XSynchronize (xdisp, True); 499 XSynchronize (dpy, True);
486#endif 500#endif
487 501
488#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
491#endif 505#endif
492#ifdef TRANSPARENT 506#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
494 { 508 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 510 check_our_parents ();
497 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
498 } 512 }
499#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
500 517
501 set_colorfgbg (); 518 set_colorfgbg ();
502 519
503 init_command (cmd_argv); 520 init_command (cmd_argv);
504 521
… …
514#if ENABLE_XEMBED 531#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 532 if (rs[Rs_embed])
516 { 533 {
517 long info[2] = { 0, XEMBED_MAPPED }; 534 long info[2] = { 0, XEMBED_MAPPED };
518 535
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 537 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 538 }
522#endif 539#endif
523 540
524 XMapWindow (xdisp, vt); 541 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 542 XMapWindow (dpy, parent[0]);
526 543
527 return true; 544 return true;
528} 545}
529 546
530static struct sig_handlers 547static struct sig_handlers
… …
691 708
692 if (scrollBar.state) 709 if (scrollBar.state)
693 { 710 {
694 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
696 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
697 window_vt_x += sb_w; 715 window_vt_x += sb_w;
698 } 716 }
699 717
700 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
704 722
705 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 724 {
707 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
726 744
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
729 747
730 if (recalc_x) 748 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 750
733 if (recalc_y) 751 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 753
736 ncol = width / fwidth; 754 ncol = width / fwidth;
737 nrow = height / fheight; 755 nrow = height / fheight;
738} 756}
739 757
… …
842 return true; 860 return true;
843} 861}
844 862
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 863void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 864{
847 XChangeProperty (xdisp, parent[0], 865 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 866 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 867 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 868}
851 869
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 871{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 872 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 873 char *s = rxvt_wcstoutf8 (ws);
856 874
857 XChangeProperty (xdisp, parent[0], 875 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 876 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 877 (const unsigned char *)s, strlen (s));
860 878
861 free (s); 879 free (s);
862 free (ws); 880 free (ws);
… …
926 pix_colors_focused[idx] = xcol; 944 pix_colors_focused[idx] = xcol;
927 945
928 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
929 /* Cursor cursor; */ 947 /* Cursor cursor; */
930done: 948done:
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. */ 949 /*TODO: handle Color_BD, scrollbar background, etc. */
942 950
951 update_fade_color (idx);
943 recolour_cursor (); 952 recolour_cursor ();
944 scr_recolour (); 953 scr_recolour ();
945} 954}
946 955
947#else 956#else
… …
949#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
950 959
951void 960void
952rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
953{ 962{
954 XColor xcol[2]; 963 XColor fg, bg;
955 964
956 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
957 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
958 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
959 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
960 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
961 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
962 972
963 XQueryColors (xdisp, cmap, xcol, 2);
964 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
965} 974}
966 975
967/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
968/* 977/*
969 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1007 1016
1008 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1009 return false; 1018 return false;
1010} 1019}
1011 1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1025}
1026
1012/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1013 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1014 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1015void 1030void
1016rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
… …
1018 int fix_screen; 1033 int fix_screen;
1019 int old_width = szHint.width; 1034 int old_width = szHint.width;
1020 int old_height = szHint.height; 1035 int old_height = szHint.height;
1021 1036
1022 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1023 XSetWMNormalHints (xdisp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 1041
1025 if (!ignoreparent) 1042 if (!ignoreparent)
1026 { 1043 {
1027#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1028 /* 1045 /*
… …
1032 int x, y, x1, y1; 1049 int x, y, x1, y1;
1033 int dx, dy; 1050 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1052 Window unused_cr;
1036 1053
1037 XTranslateCoordinates (xdisp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1038 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1058 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1044 */ 1061 */
… …
1046 { 1063 {
1047 x -= x1; 1064 x -= x1;
1048 y -= y1; 1065 y -= y1;
1049 } 1066 }
1050 1067
1051 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1052 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1053 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1054 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1055 1072
1056 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1057 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1061 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1062 dy = 0; 1079 dy = 0;
1063 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1064 dy /= 2; 1081 dy /= 2;
1065 1082
1066 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1067 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1068#else 1085#else
1069 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1070#endif 1087#endif
1071 } 1088 }
1072 1089
1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1074 1091
1075 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1076 { 1093 {
1077 if (scrollBar.state) 1094 if (scrollBar.state)
1078 { 1095 {
1079 XMoveResizeWindow (xdisp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1080 window_sb_x, 0, 1097 window_sb_x, 0,
1081 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1082 resize_scrollbar (); 1099 resize_scrollbar ();
1083 } 1100 }
1084 1101
1085 XMoveResizeWindow (xdisp, vt, 1102 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1087 width, height); 1104 width, height);
1088 1105
1089 scr_clear (); 1106 scr_clear ();
1090#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1093 } 1110 }
1094 1111
1095 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1096 scr_reset (); 1113 scr_reset ();
1097 1114
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1117
1098#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1099 if (pixmap) 1119 if (pixmap)
1100 scr_touch (false); 1120 scr_touch (false);
1101#endif 1121#endif
1102 1122
1103#ifdef USE_XIM 1123#ifdef USE_XIM
1104 IMSetStatusPosition (); 1124 IMSetPosition ();
1105#endif 1125#endif
1106} 1126}
1107 1127
1108/* 1128/*
1109 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1114{ 1134{
1115 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1116 1136
1117 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1118 { 1138 {
1119 XGetWindowAttributes (xdisp, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1120 1140
1121 if (newwidth == 0) 1141 if (newwidth == 0)
1122 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1123 if (newheight == 0) 1143 if (newheight == 0)
1124 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1138#ifdef USE_XIM 1158#ifdef USE_XIM
1139 1159
1140void 1160void
1141rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1142{ 1162{
1143 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1144 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1145} 1165}
1146 1166
1147void 1167void
1148rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1149{ 1169{
… …
1186 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1187 1207
1188 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1189 *p = '\0'; 1209 *p = '\0';
1190 1210
1191 atom = XInternAtom (xdisp, server, False); 1211 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (xdisp, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1193 1213
1194 if (win != None) 1214 if (win != None)
1195 return True; 1215 return True;
1196 } 1216 }
1197 1217
… …
1421 "*", 1441 "*",
1422 fheight, 1442 fheight,
1423 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1424 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1425 1445
1426 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1427 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1428 1448
1429 if (missing_charset_list) 1449 if (missing_charset_list)
1430 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1431 1451
… …
1506 preedit_attr, 1526 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1528 status_attr, NULL);
1509 1529
1510 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1511 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1512 if (fs) XFreeFontSet (xdisp, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1513 1533
1514 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1515 { 1535 {
1516 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1517 im_destroy (); 1537 im_destroy ();
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1542 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1544 vt_select_input ();
1525#endif 1545#endif
1526 1546
1527 if (input_style & XIMPreeditArea)
1528 IMSetStatusPosition (); 1547 IMSetPosition ();
1529 1548
1530 return true; 1549 return true;
1531} 1550}
1532 1551
1533void 1552void
… …
1591 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1592#endif 1611#endif
1593} 1612}
1594 1613
1595void 1614void
1596rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1597{ 1616{
1598 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1599 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1600 1619
1601 if (!Input_Context 1620 if (!Input_Context
1602 || !focus 1621 || !focus
1603 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1604 || !IMisRunning ()) 1623 || !IMisRunning ())
1605 return; 1624 return;
1606 1625
1626 if (input_style & XIMPreeditPosition)
1627 {
1628 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630
1631 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL);
1633 }
1634 else
1635 {
1607 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1608 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1609 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1610 XFree (status_attr); 1639 XFree (status_attr);
1611 1640
1612 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1613 XFree (needed_rect); 1642 XFree (needed_rect);
1614 1643
1615 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1616 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1617 1646
1618 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1619 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1620 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1621 1651
1652 XFree (status_attr);
1653 }
1654
1622 XFree (preedit_attr); 1655 XFree (preedit_attr);
1623 XFree (status_attr);
1624} 1656}
1625#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1626 1658
1627/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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