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

Diff Legend

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