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.208 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.225 by root, Wed Jul 5 22:46:14 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>
… …
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
… …
368{ 377{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
371} 380}
372 381
373#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
374static void 383static void
375print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
376{ 385{
377 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
427 else 436 else
428 { 437 {
429 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 439 // so just output the error and continue
431#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
432 print_x_error (display, event); 443 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 444#endif
436 } 445 }
437 446
438 return 0; 447 return 0;
439} 448}
… …
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
500 509
… …
514#if ENABLE_XEMBED 523#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 524 if (rs[Rs_embed])
516 { 525 {
517 long info[2] = { 0, XEMBED_MAPPED }; 526 long info[2] = { 0, XEMBED_MAPPED };
518 527
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 529 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 530 }
522#endif 531#endif
523 532
524 XMapWindow (xdisp, vt); 533 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 534 XMapWindow (dpy, parent[0]);
526 535
527 return true; 536 return true;
528} 537}
529 538
530static struct sig_handlers 539static struct sig_handlers
… …
691 700
692 if (scrollBar.state) 701 if (scrollBar.state)
693 { 702 {
694 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
696 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
697 window_vt_x += sb_w; 707 window_vt_x += sb_w;
698 } 708 }
699 709
700 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
704 714
705 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 716 {
707 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
726 736
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
729 739
730 if (recalc_x) 740 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 742
733 if (recalc_y) 743 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 745
736 ncol = width / fwidth; 746 ncol = width / fwidth;
737 nrow = height / fheight; 747 nrow = height / fheight;
738} 748}
739 749
… …
842 return true; 852 return true;
843} 853}
844 854
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 856{
847 XChangeProperty (xdisp, parent[0], 857 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 860}
851 861
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 863{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
856 866
857 XChangeProperty (xdisp, parent[0], 867 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
860 870
861 free (s); 871 free (s);
862 free (ws); 872 free (ws);
… …
887void 897void
888rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
889{ 899{
890 rxvt_color xcol; 900 rxvt_color xcol;
891 int i; 901 int i;
892 902
893 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
894 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
895 909
896 /* handle color aliases */ 910 /* handle color aliases */
897 if (isdigit (*color)) 911 if (isdigit (*color))
898 { 912 {
899 i = atoi (color); 913 i = atoi (color);
900 914
901 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
902 { /* bright colors */ 916 { /* bright colors */
903 i -= 8; 917 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
905 SET_PIXCOLOR (idx);
906 goto done; 919 goto done;
907 } 920 }
908 921
909 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
910 { /* normal colors */ 923 { /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 925 goto done;
914 } 926 }
915 } 927 }
916 928
917 if (!set_color (xcol, color)) 929 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 930
922 /* 931 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
925 */ 934 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 935
938 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 937
941 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */ 939 /* Cursor cursor; */
943done: 940done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 941 /*TODO: handle Color_BD, scrollbar background, etc. */
951 942
943 update_fade_color (idx);
952 recolour_cursor (); 944 recolour_cursor ();
953 scr_recolour (); 945 scr_recolour ();
954} 946}
955 947
956#else 948#else
… …
958#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
959 951
960void 952void
961rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
962{ 954{
963 XColor xcol[2]; 955 XColor fg, bg;
964 956
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
971 964
972 XQueryColors (xdisp, cmap, xcol, 2);
973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 965 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 966}
975 967
976/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
977/* 969/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1016 1008
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false; 1010 return false;
1019} 1011}
1020 1012
1013void
1014rxvt_term::alias_color (int dst, int src)
1015{
1016 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017}
1018
1021/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1022 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1023 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
1024void 1022void
1025rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
… …
1027 int fix_screen; 1025 int fix_screen;
1028 int old_width = szHint.width; 1026 int old_width = szHint.width;
1029 int old_height = szHint.height; 1027 int old_height = szHint.height;
1030 1028
1031 window_calc (newwidth, newheight); 1029 window_calc (newwidth, newheight);
1030
1031 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1032 XSetWMNormalHints (xdisp, parent[0], &szHint); 1032 XSetWMNormalHints (dpy, parent[0], &szHint);
1033 1033
1034 if (!ignoreparent) 1034 if (!ignoreparent)
1035 { 1035 {
1036#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1037 /* 1037 /*
… …
1041 int x, y, x1, y1; 1041 int x, y, x1, y1;
1042 int dx, dy; 1042 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 1044 Window unused_cr;
1045 1045
1046 XTranslateCoordinates (xdisp, parent[0], display->root, 1046 XTranslateCoordinates (dpy, parent[0], display->root,
1047 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 1050 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 1051 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1053 */ 1053 */
… …
1055 { 1055 {
1056 x -= x1; 1056 x -= x1;
1057 y -= y1; 1057 y -= y1;
1058 } 1058 }
1059 1059
1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1060 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1062 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1063 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1064 1064
1065 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1066 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
… …
1070 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1071 dy = 0; 1071 dy = 0;
1072 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1073 dy /= 2; 1073 dy /= 2;
1074 1074
1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1076 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1077#else 1077#else
1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1079#endif 1079#endif
1080 } 1080 }
1081 1081
1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 1083
1084 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 1085 {
1086 if (scrollBar.state) 1086 if (scrollBar.state)
1087 { 1087 {
1088 XMoveResizeWindow (xdisp, scrollBar.win, 1088 XMoveResizeWindow (dpy, scrollBar.win,
1089 window_sb_x, 0, 1089 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar (); 1091 resize_scrollbar ();
1092 } 1092 }
1093 1093
1094 XMoveResizeWindow (xdisp, vt, 1094 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1096 width, height); 1096 width, height);
1097 1097
1098 scr_clear (); 1098 scr_clear ();
1099#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
… …
1102 } 1102 }
1103 1103
1104 if (fix_screen || old_height == 0) 1104 if (fix_screen || old_height == 0)
1105 scr_reset (); 1105 scr_reset ();
1106 1106
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false);
1109
1107#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1108 if (pixmap) 1111 if (pixmap)
1109 scr_touch (false); 1112 scr_touch (false);
1110#endif 1113#endif
1111 1114
1112#ifdef USE_XIM 1115#ifdef USE_XIM
1113 IMSetStatusPosition (); 1116 IMSetPosition ();
1114#endif 1117#endif
1115} 1118}
1116 1119
1117/* 1120/*
1118 * Set the width/height of the vt window in characters. Units are pixels. 1121 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123{ 1126{
1124 XWindowAttributes wattr; 1127 XWindowAttributes wattr;
1125 1128
1126 if (newwidth == 0 || newheight == 0) 1129 if (newwidth == 0 || newheight == 0)
1127 { 1130 {
1128 XGetWindowAttributes (xdisp, display->root, &wattr); 1131 XGetWindowAttributes (dpy, display->root, &wattr);
1129 1132
1130 if (newwidth == 0) 1133 if (newwidth == 0)
1131 newwidth = wattr.width - szHint.base_width; 1134 newwidth = wattr.width - szHint.base_width;
1132 if (newheight == 0) 1135 if (newheight == 0)
1133 newheight = wattr.height - szHint.base_height; 1136 newheight = wattr.height - szHint.base_height;
… …
1147#ifdef USE_XIM 1150#ifdef USE_XIM
1148 1151
1149void 1152void
1150rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1153rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1151{ 1154{
1152 fg = pix_colors[Color_fg]; 1155 fg = pix_colors [Color_fg];
1153 bg = pix_colors[Color_bg]; 1156 bg = pix_colors [Color_bg];
1154} 1157}
1155 1158
1156void 1159void
1157rxvt_term::im_set_size (XRectangle &size) 1160rxvt_term::im_set_size (XRectangle &size)
1158{ 1161{
… …
1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1198 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1196 1199
1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1200 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1198 *p = '\0'; 1201 *p = '\0';
1199 1202
1200 atom = XInternAtom (xdisp, server, False); 1203 atom = XInternAtom (dpy, server, False);
1201 win = XGetSelectionOwner (xdisp, atom); 1204 win = XGetSelectionOwner (dpy, atom);
1202 1205
1203 if (win != None) 1206 if (win != None)
1204 return True; 1207 return True;
1205 } 1208 }
1206 1209
… …
1430 "*", 1433 "*",
1431 fheight, 1434 fheight,
1432 fheight + 1, fheight - 1, 1435 fheight + 1, fheight - 1,
1433 fheight - 2, fheight + 2); 1436 fheight - 2, fheight + 2);
1434 1437
1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1438 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1436 &missing_charset_list, &missing_charset_count, &def_string); 1439 &missing_charset_list, &missing_charset_count, &def_string);
1437 1440
1438 if (missing_charset_list) 1441 if (missing_charset_list)
1439 XFreeStringList (missing_charset_list); 1442 XFreeStringList (missing_charset_list);
1440 1443
… …
1515 preedit_attr, 1518 preedit_attr,
1516 status_attr ? XNStatusAttributes : NULL, 1519 status_attr ? XNStatusAttributes : NULL,
1517 status_attr, NULL); 1520 status_attr, NULL);
1518 1521
1519 if (preedit_attr) XFree (preedit_attr); 1522 if (preedit_attr) XFree (preedit_attr);
1520 if (status_attr) XFree (status_attr); 1523 if (status_attr) XFree (status_attr);
1521 if (fs) XFreeFontSet (xdisp, fs); 1524 if (fs) XFreeFontSet (dpy, fs);
1522 1525
1523 if (Input_Context == NULL) 1526 if (Input_Context == NULL)
1524 { 1527 {
1525 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1526 im_destroy (); 1529 im_destroy ();
… …
1531 // unfortunately, only the focus window is used by XIM, hard to fix 1534 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input (); 1536 vt_select_input ();
1534#endif 1537#endif
1535 1538
1536 if (input_style & XIMPreeditArea)
1537 IMSetStatusPosition (); 1539 IMSetPosition ();
1538 1540
1539 return true; 1541 return true;
1540} 1542}
1541 1543
1542void 1544void
… …
1600 SET_LOCALE (locale); 1602 SET_LOCALE (locale);
1601#endif 1603#endif
1602} 1604}
1603 1605
1604void 1606void
1605rxvt_term::IMSetStatusPosition () 1607rxvt_term::IMSetPosition ()
1606{ 1608{
1607 XRectangle preedit_rect, status_rect, *needed_rect; 1609 XRectangle preedit_rect, status_rect, *needed_rect;
1608 XVaNestedList preedit_attr, status_attr; 1610 XVaNestedList preedit_attr, status_attr;
1609 1611
1610 if (!Input_Context 1612 if (!Input_Context
1611 || !focus 1613 || !focus
1612 || !(input_style & XIMPreeditArea) 1614 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1613 || !IMisRunning ()) 1615 || !IMisRunning ())
1614 return; 1616 return;
1615 1617
1618 if (input_style & XIMPreeditPosition)
1619 {
1620 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622
1623 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL);
1625 }
1626 else
1627 {
1616 /* Getting the necessary width of preedit area */ 1628 /* Getting the necessary width of preedit area */
1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1629 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1630 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1619 XFree (status_attr); 1631 XFree (status_attr);
1620 1632
1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1633 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1622 XFree (needed_rect); 1634 XFree (needed_rect);
1623 1635
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1626 1638
1627 XSetICValues (Input_Context, 1639 XSetICValues (Input_Context,
1628 XNPreeditAttributes, preedit_attr, 1640 XNPreeditAttributes, preedit_attr,
1629 XNStatusAttributes, status_attr, NULL); 1641 XNStatusAttributes, status_attr,
1642 NULL);
1630 1643
1644 XFree (status_attr);
1645 }
1646
1631 XFree (preedit_attr); 1647 XFree (preedit_attr);
1632 XFree (status_attr);
1633} 1648}
1634#endif /* USE_XIM */ 1649#endif /* USE_XIM */
1635 1650
1636/*----------------------- end-of-file (C source) -----------------------*/ 1651/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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