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.206 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.219 by root, Sat Feb 11 02:28:19 2006 UTC

… …
222 222
223#ifdef USE_XIM 223#ifdef USE_XIM
224 im_destroy (); 224 im_destroy ();
225#endif 225#endif
226#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 229#endif
230#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 232#endif
233#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 244#endif
245#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 249#endif
250 if (gc) XFreeGC (xdisp, gc); 250 if (gc) XFreeGC (dpy, gc);
251 251
252 delete drawable; 252 delete drawable;
253 // destroy all windows 253 // destroy all windows
254 if (parent[0]) 254 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 255 XDestroyWindow (dpy, parent[0]);
256
257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
256 265
257 clear (); 266 clear ();
258 } 267 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 269 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
264#endif 272#endif
265 273
… …
368{ 376{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
371} 379}
372 380
373#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
374static void 382static void
375print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
376{ 384{
377 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
427 else 435 else
428 { 436 {
429 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 438 // so just output the error and continue
431#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
432 print_x_error (display, event); 442 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 443#endif
436 } 444 }
437 445
438 return 0; 446 return 0;
439} 447}
… …
480 init_xlocale (); 488 init_xlocale ();
481 489
482 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
483 491
484#if 0 492#if 0
485 XSynchronize (xdisp, True); 493 XSynchronize (dpy, True);
486#endif 494#endif
487 495
488#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
491#endif 499#endif
492#ifdef TRANSPARENT 500#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
494 { 502 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 504 check_our_parents ();
497 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
498 } 506 }
499#endif 507#endif
500 508
… …
514#if ENABLE_XEMBED 522#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 523 if (rs[Rs_embed])
516 { 524 {
517 long info[2] = { 0, XEMBED_MAPPED }; 525 long info[2] = { 0, XEMBED_MAPPED };
518 526
519 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 528 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 529 }
522#endif 530#endif
523 531
524 XMapWindow (xdisp, vt); 532 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 533 XMapWindow (dpy, parent[0]);
526 534
527 return true; 535 return true;
528} 536}
529 537
530static struct sig_handlers 538static struct sig_handlers
… …
691 699
692 if (scrollBar.state) 700 if (scrollBar.state)
693 { 701 {
694 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
696 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
697 window_vt_x += sb_w; 706 window_vt_x += sb_w;
698 } 707 }
699 708
700 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
704 713
705 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 715 {
707 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
726 735
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
729 738
730 if (recalc_x) 739 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 741
733 if (recalc_y) 742 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 744
736 ncol = width / fwidth; 745 ncol = width / fwidth;
737 nrow = height / fheight; 746 nrow = height / fheight;
738} 747}
739 748
… …
842 return true; 851 return true;
843} 852}
844 853
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 855{
847 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 859}
851 860
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 862{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
856 865
857 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
860 869
861 free (s); 870 free (s);
862 free (ws); 871 free (ws);
… …
887void 896void
888rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
889{ 898{
890 rxvt_color xcol; 899 rxvt_color xcol;
891 int i; 900 int i;
892 901
893 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
894 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
895 908
896 /* handle color aliases */ 909 /* handle color aliases */
897 if (isdigit (*color)) 910 if (isdigit (*color))
898 { 911 {
899 i = atoi (color); 912 i = atoi (color);
900 913
901 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
902 { /* bright colors */ 915 { /* bright colors */
903 i -= 8; 916 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
905 SET_PIXCOLOR (idx);
906 goto done; 918 goto done;
907 } 919 }
908 920
909 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
910 { /* normal colors */ 922 { /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 924 goto done;
914 } 925 }
915 } 926 }
916 927
917 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (display->display, display->cmap, XColor*); */
921 929
922 /* 930 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
925 */ 933 */
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 (display->display, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (display->display, display->screen));
935 }
936# endif
937 934
938 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 936
941 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */ 938 /* Cursor cursor; */
943done: 939done:
944 940
945#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
946 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_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 948#endif
949 949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
951 951
952 recolour_cursor (); 952 recolour_cursor ();
… …
958#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
959 959
960void 960void
961rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
962{ 962{
963 XColor xcol[2]; 963 XColor fg, bg;
964 964
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
971 972
972 XQueryColors (display->display, cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
974} 974}
975 975
976/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
977/* 977/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1007} 1007}
1008 1008
1009/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1010 1010
1011int 1011bool
1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1013{ 1013{
1014 if (!screen_in_out->set (this, colour)) 1014 if (color.set (this, name))
1015 {
1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1017 return false;
1018 }
1019
1020 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1021} 1025}
1022 1026
1023/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1024 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1025 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
… …
1029 int fix_screen; 1033 int fix_screen;
1030 int old_width = szHint.width; 1034 int old_width = szHint.width;
1031 int old_height = szHint.height; 1035 int old_height = szHint.height;
1032 1036
1033 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1034 XSetWMNormalHints (xdisp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1035 1041
1036 if (!ignoreparent) 1042 if (!ignoreparent)
1037 { 1043 {
1038#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1039 /* 1045 /*
… …
1043 int x, y, x1, y1; 1049 int x, y, x1, y1;
1044 int dx, dy; 1050 int dx, dy;
1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1046 Window unused_cr; 1052 Window unused_cr;
1047 1053
1048 XTranslateCoordinates (xdisp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1049 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1052 /* 1058 /*
1053 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1054 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1055 */ 1061 */
… …
1057 { 1063 {
1058 x -= x1; 1064 x -= x1;
1059 y -= y1; 1065 y -= y1;
1060 } 1066 }
1061 1067
1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1064 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1065 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1066 1072
1067 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1068 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1072 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1073 dy = 0; 1079 dy = 0;
1074 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1075 dy /= 2; 1081 dy /= 2;
1076 1082
1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1078 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1079#else 1085#else
1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1081#endif 1087#endif
1082 } 1088 }
1083 1089
1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1085 1091
1086 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1087 { 1093 {
1088 if (scrollBar.state) 1094 if (scrollBar.state)
1089 { 1095 {
1090 XMoveResizeWindow (xdisp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1091 window_sb_x, 0, 1097 window_sb_x, 0,
1092 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1093 resize_scrollbar (); 1099 resize_scrollbar ();
1094 } 1100 }
1095 1101
1096 XMoveResizeWindow (xdisp, vt, 1102 XMoveResizeWindow (dpy, vt,
1097 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1098 width, height); 1104 width, height);
1099 1105
1100 scr_clear (); 1106 scr_clear ();
1101#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1103#endif 1109#endif
1104 } 1110 }
1105 1111
1106 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1107 scr_reset (); 1113 scr_reset ();
1114
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1108 1117
1109#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1110 if (pixmap) 1119 if (pixmap)
1111 scr_touch (false); 1120 scr_touch (false);
1112#endif 1121#endif
… …
1125{ 1134{
1126 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1127 1136
1128 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1129 { 1138 {
1130 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1131 1140
1132 if (newwidth == 0) 1141 if (newwidth == 0)
1133 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1134 if (newheight == 0) 1143 if (newheight == 0)
1135 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1149#ifdef USE_XIM 1158#ifdef USE_XIM
1150 1159
1151void 1160void
1152rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1153{ 1162{
1154 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1155 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1156} 1165}
1157 1166
1158void 1167void
1159rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1160{ 1169{
… …
1197 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1198 1207
1199 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1200 *p = '\0'; 1209 *p = '\0';
1201 1210
1202 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1203 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1204 1213
1205 if (win != None) 1214 if (win != None)
1206 return True; 1215 return True;
1207 } 1216 }
1208 1217
… …
1432 "*", 1441 "*",
1433 fheight, 1442 fheight,
1434 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1435 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1436 1445
1437 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1438 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1439 1448
1440 if (missing_charset_list) 1449 if (missing_charset_list)
1441 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1442 1451
… …
1518 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1519 status_attr, NULL); 1528 status_attr, NULL);
1520 1529
1521 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1522 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1523 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1524 1533
1525 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1526 { 1535 {
1527 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1528 im_destroy (); 1537 im_destroy ();

Diff Legend

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