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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC

… …
216#endif 216#endif
217 delete fontset[0]; 217 delete fontset[0];
218 218
219 if (display) 219 if (display)
220 { 220 {
221 dDisp;
222
223 selection_clear (); 221 selection_clear ();
224 222
225#ifdef USE_XIM 223#ifdef USE_XIM
226 im_destroy (); 224 im_destroy ();
227#endif 225#endif
228#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
231#endif 229#endif
232#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
234#endif 232#endif
235#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
246#endif 244#endif
247#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
251#endif 249#endif
252 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
253 251
254 delete drawable; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
258 }
259 256
260 // TODO: free pixcolours, colours should become part of rxvt_display 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 }
265
266 clear ();
267 }
268
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}
… …
475 483
476 pty = ptytty::create (); 484 pty = ptytty::create ();
477 485
478 create_windows (argc, argv); 486 create_windows (argc, argv);
479 487
480 dDisp;
481
482 init_xlocale (); 488 init_xlocale ();
483 489
484 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
485 491
486#if 0 492#if 0
487 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
488#endif 494#endif
489 495
490#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
493#endif 499#endif
494#ifdef TRANSPARENT 500#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
496 { 502 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
498 check_our_parents (); 504 check_our_parents ();
499 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
500 } 506 }
501#endif 507#endif
502 508
… …
516#if ENABLE_XEMBED 522#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 523 if (rs[Rs_embed])
518 { 524 {
519 long info[2] = { 0, XEMBED_MAPPED }; 525 long info[2] = { 0, XEMBED_MAPPED };
520 526
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 528 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 529 }
524#endif 530#endif
525 531
526 XMapWindow (disp, vt); 532 XMapWindow (xdisp, vt);
527 XMapWindow (disp, parent[0]); 533 XMapWindow (xdisp, parent[0]);
528 534
529 return true; 535 return true;
530} 536}
531 537
532static struct sig_handlers 538static struct sig_handlers
… …
622{ 628{
623 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
625 unsigned int w, h; 631 unsigned int w, h;
626 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
627 dDisp;
628 633
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 637
… …
694 699
695 if (scrollBar.state) 700 if (scrollBar.state)
696 { 701 {
697 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
699 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
700 window_vt_x += sb_w; 706 window_vt_x += sb_w;
701 } 707 }
702 708
703 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
729 735
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
732 738
733 if (recalc_x) 739 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
735 if (recalc_y) 742 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
737 744
738 ncol = width / fwidth; 745 ncol = width / fwidth;
739 nrow = height / fheight; 746 nrow = height / fheight;
740} 747}
741 748
… …
844 return true; 851 return true;
845} 852}
846 853
847void 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)
848{ 855{
849 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 859}
853 860
854void 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)
855{ 862{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
858 865
859 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
862 869
863 free (s); 870 free (s);
864 free (ws); 871 free (ws);
… …
889void 896void
890rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
891{ 898{
892 rxvt_color xcol; 899 rxvt_color xcol;
893 int i; 900 int i;
894 901
895 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
896 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
897 908
898 /* handle color aliases */ 909 /* handle color aliases */
899 if (isdigit (*color)) 910 if (isdigit (*color))
900 { 911 {
901 i = atoi (color); 912 i = atoi (color);
902 913
903 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
904 { /* bright colors */ 915 { /* bright colors */
905 i -= 8; 916 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 918 goto done;
909 } 919 }
910 920
911 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
912 { /* normal colors */ 922 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 924 goto done;
916 } 925 }
917 } 926 }
918 927
919 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 929
924 /* 930 /*
925 * 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,
926 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
927 */ 933 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 934
940 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 936
943 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 938 /* Cursor cursor; */
945done: 939done:
946 940
947#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
948 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, 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 }
950#endif 948#endif
951 949
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
953 951
954 recolour_cursor (); 952 recolour_cursor ();
… …
960#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
961 959
962void 960void
963rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
964{ 962{
965 XColor xcol[2]; 963 XColor fg, bg;
966 964
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
973 972
974 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 974}
977 975
978/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
979/* 977/*
980 * 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
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1007}
1010 1008
1011/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1012 1010
1013int 1011bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1013{
1016 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 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]);
1023} 1025}
1024 1026
1025/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1032{
1031 int fix_screen; 1033 int fix_screen;
1032 int old_width = szHint.width; 1034 int old_width = szHint.width;
1033 int old_height = szHint.height; 1035 int old_height = szHint.height;
1034 dDisp;
1035 1036
1036 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1038 1039
1039 if (!ignoreparent) 1040 if (!ignoreparent)
1040 { 1041 {
1041#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1042 /* 1043 /*
… …
1046 int x, y, x1, y1; 1047 int x, y, x1, y1;
1047 int dx, dy; 1048 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1050 Window unused_cr;
1050 1051
1051 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1056 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1058 */ 1059 */
… …
1060 { 1061 {
1061 x -= x1; 1062 x -= x1;
1062 y -= y1; 1063 y -= y1;
1063 } 1064 }
1064 1065
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1069 1070
1070 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1076 dy = 0; 1077 dy = 0;
1077 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1078 dy /= 2; 1079 dy /= 2;
1079 1080
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1082#else 1083#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1084#endif 1085#endif
1085 } 1086 }
1086 1087
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1089
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1091 {
1091 if (scrollBar.state) 1092 if (scrollBar.state)
1092 { 1093 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1094 window_sb_x, 0, 1095 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1097 resize_scrollbar ();
1097 } 1098 }
1098 1099
1099 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1100 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1101 width, height); 1102 width, height);
1102 1103
1103 scr_clear (); 1104 scr_clear ();
1104#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
… …
1106#endif 1107#endif
1107 } 1108 }
1108 1109
1109 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1110 scr_reset (); 1111 scr_reset ();
1112
1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 //scr_touch (false);
1111 1115
1112#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1113 if (pixmap) 1117 if (pixmap)
1114 scr_touch (false); 1118 scr_touch (false);
1115#endif 1119#endif
… …
1128{ 1132{
1129 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1130 1134
1131 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1132 { 1136 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1134 1138
1135 if (newwidth == 0) 1139 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1141 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1156#ifdef USE_XIM
1153 1157
1154void 1158void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1160{
1157 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1159} 1163}
1160 1164
1161void 1165void
1162rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1163{ 1167{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1205
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1207 *p = '\0';
1204 1208
1205 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1207 1211
1208 if (win != None) 1212 if (win != None)
1209 return True; 1213 return True;
1210 } 1214 }
1211 1215
… …
1435 "*", 1439 "*",
1436 fheight, 1440 fheight,
1437 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1439 1443
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1442 1446
1443 if (missing_charset_list) 1447 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1445 1449
… …
1486 XNBackground, bg, 1490 XNBackground, bg,
1487 XNArea, &status_rect, 1491 XNArea, &status_rect,
1488 XNFontSet, fs, 1492 XNFontSet, fs,
1489 NULL); 1493 NULL);
1490 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1496 else if (input_style & XIMPreeditCallbacks)
1492 { 1497 {
1493 im_set_position (spot); 1498 im_set_position (spot);
1494 1499
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1503# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1505# endif
1501 1506
1502 preedit_attr = XVaCreateNestedList (0, 1507 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1508 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1509 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1510 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1511 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1512# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1513 XNPreeditCaretCallback, &xcb[3],
1509#endif 1514# endif
1510 NULL); 1515 NULL);
1511 } 1516 }
1517#endif
1512 1518
1513 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1521 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1519 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1526 status_attr, NULL);
1521 1527
1522 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1525 1531
1526 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1527 { 1533 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1535 im_destroy ();

Diff Legend

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