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

Diff Legend

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