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.216 by root, Wed Feb 1 21:15:33 2006 UTC vs.
Revision 1.232 by root, Tue May 1 21:30:01 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 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]);
256 262
257 for (int i = 0; i < TOTAL_COLORS; i++) 263 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 264 if (ISSET_PIXCOLOR (i))
259 { 265 {
260 pix_colors_focused [i].free (this); 266 pix_colors_focused [i].free (this);
… …
264 } 270 }
265 271
266 clear (); 272 clear ();
267 } 273 }
268 274
269 delete pix_colors_focused; 275 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
272#endif 278#endif
273 279
274 displays.put (display); 280 displays.put (display);
275 281
276 scr_release (); 282 scr_release ();
… …
301{ 307{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 309
304 cmd_pid = 0; 310 cmd_pid = 0;
305 311
306 if (!OPTION (Opt_hold)) 312 if (!option (Opt_hold))
307 destroy (); 313 destroy ();
308} 314}
309 315
310void 316void
311rxvt_term::destroy () 317rxvt_term::destroy ()
… …
325 im_ev.stop (display); 331 im_ev.stop (display);
326#endif 332#endif
327#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
329#endif 335#endif
330#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
331 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
332#endif 338#endif
333 incr_ev.stop (); 339 incr_ev.stop ();
334 termwin_ev.stop (display); 340 termwin_ev.stop (display);
335 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
475#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 482 keyboard->register_done ();
477#endif 483#endif
478 484
479#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 486 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 488#endif
483 489
484 pty = ptytty::create (); 490 pty = ptytty::create ();
485 491
… …
488 init_xlocale (); 494 init_xlocale ();
489 495
490 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
491 497
492#if 0 498#if 0
493 XSynchronize (xdisp, True); 499 XSynchronize (dpy, True);
494#endif 500#endif
495 501
496#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 503 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
499#endif 505#endif
500#ifdef TRANSPARENT 506#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 507 if (option (Opt_transparent))
502 { 508 {
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 510 check_our_parents ();
505 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
506 } 512 }
507#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
508 517
509 set_colorfgbg (); 518 set_colorfgbg ();
510 519
511 init_command (cmd_argv); 520 init_command (cmd_argv);
512 521
… …
522#if ENABLE_XEMBED 531#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 532 if (rs[Rs_embed])
524 { 533 {
525 long info[2] = { 0, XEMBED_MAPPED }; 534 long info[2] = { 0, XEMBED_MAPPED };
526 535
527 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],
528 32, PropModeReplace, (unsigned char *)&info, 2); 537 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 538 }
530#endif 539#endif
531 540
532 XMapWindow (xdisp, vt); 541 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 542 XMapWindow (dpy, parent[0]);
534 543
535 return true; 544 return true;
536} 545}
537 546
538static struct sig_handlers 547static struct sig_handlers
… …
700 if (scrollBar.state) 709 if (scrollBar.state)
701 { 710 {
702 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
704 713
705 if (!OPTION (Opt_scrollBar_right)) 714 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 715 window_vt_x += sb_w;
707 } 716 }
708 717
709 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
713 722
714 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 724 {
716 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
731 { 740 {
732 min_it (height, max_height); 741 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
734 } 743 }
735 744
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
738 747
739 if (recalc_x) 748 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 750
742 if (recalc_y) 751 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 753
745 ncol = width / fwidth; 754 ncol = width / fwidth;
746 nrow = height / fheight; 755 nrow = height / fheight;
747} 756}
748 757
… …
803 delete fontset[0]; 812 delete fontset[0];
804 fontset[0] = fs; 813 fontset[0] = fs;
805 814
806 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 816 prop.height += lineSpace;
817
808 fs->set_prop (prop); 818 fs->set_prop (prop, false);
809 819
810 fwidth = prop.width; 820 fwidth = prop.width;
811 fheight = prop.height; 821 fheight = prop.height;
812 fbase = prop.ascent; 822 fbase = prop.ascent;
813 823
… …
822 { 832 {
823 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
825 835
826 if (res) 836 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
828 else 841 else
829 { 842 {
830 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
831 844
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
833 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
834 } 849 }
835 850
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 851 }
839#else 852#else
840 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
841#endif 854#endif
842 } 855 }
… …
851 return true; 864 return true;
852} 865}
853 866
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 868{
856 XChangeProperty (xdisp, parent[0], 869 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 872}
860 873
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 875{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
865 878
866 XChangeProperty (xdisp, parent[0], 879 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
869 882
870 free (s); 883 free (s);
871 free (ws); 884 free (ws);
… …
935 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
936 949
937 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 951 /* Cursor cursor; */
939done: 952done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
951 954
955 update_fade_color (idx);
952 recolour_cursor (); 956 recolour_cursor ();
953 scr_recolour (); 957 scr_recolour ();
954} 958}
955 959
956#else 960#else
… …
968 972
969 (ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 975 : pix_colors_focused[Color_bg]).get (bg);
972 976
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 978}
975 979
976/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
977/* 981/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1033 int fix_screen; 1037 int fix_screen;
1034 int old_width = szHint.width; 1038 int old_width = szHint.width;
1035 int old_height = szHint.height; 1039 int old_height = szHint.height;
1036 1040
1037 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1045
1040 if (!ignoreparent) 1046 if (!ignoreparent)
1041 { 1047 {
1042#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1043 /* 1049 /*
… …
1047 int x, y, x1, y1; 1053 int x, y, x1, y1;
1048 int dx, dy; 1054 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1056 Window unused_cr;
1051 1057
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1062 /*
1057 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1058 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1059 */ 1065 */
… …
1061 { 1067 {
1062 x -= x1; 1068 x -= x1;
1063 y -= y1; 1069 y -= y1;
1064 } 1070 }
1065 1071
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1070 1076
1071 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1077 dy = 0; 1083 dy = 0;
1078 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1079 dy /= 2; 1085 dy /= 2;
1080 1086
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1083#else 1089#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1091#endif
1086 } 1092 }
1087 1093
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1095
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1097 {
1092 if (scrollBar.state) 1098 if (scrollBar.state)
1093 { 1099 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1101 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1103 resize_scrollbar ();
1098 } 1104 }
1099 1105
1100 XMoveResizeWindow (xdisp, vt, 1106 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1102 width, height); 1108 width, height);
1103 1109
1104 scr_clear (); 1110 scr_clear ();
1105#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
… …
1108 } 1114 }
1109 1115
1110 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1111 scr_reset (); 1117 scr_reset ();
1112 1118
1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1120 //scr_touch (false);
1121
1113#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1114 if (pixmap) 1123 if (pixmap)
1115 scr_touch (false); 1124 scr_touch (false);
1116#endif 1125#endif
1117 1126
1118#ifdef USE_XIM 1127#ifdef USE_XIM
1119 IMSetStatusPosition (); 1128 IMSetPosition ();
1120#endif 1129#endif
1121} 1130}
1122 1131
1123/* 1132/*
1124 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1129{ 1138{
1130 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1131 1140
1132 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1133 { 1142 {
1134 XGetWindowAttributes (xdisp, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1135 1144
1136 if (newwidth == 0) 1145 if (newwidth == 0)
1137 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1138 if (newheight == 0) 1147 if (newheight == 0)
1139 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1202 1211
1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1204 *p = '\0'; 1213 *p = '\0';
1205 1214
1206 atom = XInternAtom (xdisp, server, False); 1215 atom = XInternAtom (dpy, server, False);
1207 win = XGetSelectionOwner (xdisp, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1208 1217
1209 if (win != None) 1218 if (win != None)
1210 return True; 1219 return True;
1211 } 1220 }
1212 1221
… …
1436 "*", 1445 "*",
1437 fheight, 1446 fheight,
1438 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1439 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1440 1449
1441 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1442 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1443 1452
1444 if (missing_charset_list) 1453 if (missing_charset_list)
1445 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1446 1455
… …
1521 preedit_attr, 1530 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1532 status_attr, NULL);
1524 1533
1525 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (xdisp, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1528 1537
1529 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1530 { 1539 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1541 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1546 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1548 vt_select_input ();
1540#endif 1549#endif
1541 1550
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1551 IMSetPosition ();
1544 1552
1545 return true; 1553 return true;
1546} 1554}
1547 1555
1548void 1556void
… …
1606 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1607#endif 1615#endif
1608} 1616}
1609 1617
1610void 1618void
1611rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1612{ 1620{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1615 1623
1616 if (!Input_Context 1624 if (!Input_Context
1617 || !focus 1625 || !focus
1618 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1627 || !IMisRunning ())
1620 return; 1628 return;
1621 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1622 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1643 XFree (status_attr);
1626 1644
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1646 XFree (needed_rect);
1629 1647
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1650
1633 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1636 1655
1656 XFree (status_attr);
1657 }
1658
1637 XFree (preedit_attr); 1659 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1660}
1640#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1641 1662
1642/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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