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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.213 by root, Tue Jan 31 19:11:43 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]);
256
257 clear ();
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
271 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 272 free (allocated [i]);
273 273
274 free (selection.text); 274 free (selection.text);
275 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 276 free (env_display);
278 free (env_term); 277 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 278 free (locale);
281 free (v_buffer); 279 free (v_buffer);
282 free (incr_buf); 280 free (incr_buf);
283 281
284 delete envv; 282 delete envv;
… …
370{ 368{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
373} 371}
374 372
375#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
376static void 374static void
377print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
378{ 376{
379 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
429 else 427 else
430 { 428 {
431 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 430 // so just output the error and continue
433#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
434 print_x_error (display, event); 434 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 435#endif
438 } 436 }
439 437
440 return 0; 438 return 0;
441} 439}
… …
477 475
478 pty = ptytty::create (); 476 pty = ptytty::create ();
479 477
480 create_windows (argc, argv); 478 create_windows (argc, argv);
481 479
482 dDisp;
483
484 init_xlocale (); 480 init_xlocale ();
485 481
486 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
487 483
488#if 0 484#if 0
489 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
490#endif 486#endif
491 487
492#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
495#endif 491#endif
496#ifdef TRANSPARENT 492#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
498 { 494 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
500 check_our_parents (); 496 check_our_parents ();
501 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
502 } 498 }
503#endif 499#endif
504 500
… …
518#if ENABLE_XEMBED 514#if ENABLE_XEMBED
519 if (rs[Rs_embed]) 515 if (rs[Rs_embed])
520 { 516 {
521 long info[2] = { 0, XEMBED_MAPPED }; 517 long info[2] = { 0, XEMBED_MAPPED };
522 518
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2); 520 32, PropModeReplace, (unsigned char *)&info, 2);
525 } 521 }
526#endif 522#endif
527 523
528 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
529 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
530 526
531 return true; 527 return true;
532} 528}
533 529
534static struct sig_handlers 530static struct sig_handlers
… …
624{ 620{
625 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
627 unsigned int w, h; 623 unsigned int w, h;
628 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
629 dDisp;
630 625
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 629
… …
696 691
697 if (scrollBar.state) 692 if (scrollBar.state)
698 { 693 {
699 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
700 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
701 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
702 window_vt_x += sb_w; 698 window_vt_x += sb_w;
703 } 699 }
704 700
705 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
… …
731 727
732 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
734 730
735 if (recalc_x) 731 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
737 if (recalc_y) 734 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
739 736
740 ncol = width / fwidth; 737 ncol = width / fwidth;
741 nrow = height / fheight; 738 nrow = height / fheight;
742} 739}
743 740
… …
846 return true; 843 return true;
847} 844}
848 845
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 846void rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 847{
851 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 851}
855 852
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 854{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
860 857
861 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
864 861
865 free (s); 862 free (s);
866 free (ws); 863 free (ws);
… …
891void 888void
892rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
893{ 890{
894 rxvt_color xcol; 891 rxvt_color xcol;
895 int i; 892 int i;
896 893
897 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
898 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
899 900
900 /* handle color aliases */ 901 /* handle color aliases */
901 if (isdigit (*color)) 902 if (isdigit (*color))
902 { 903 {
903 i = atoi (color); 904 i = atoi (color);
904 905
905 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
906 { /* bright colors */ 907 { /* bright colors */
907 i -= 8; 908 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
909 SET_PIXCOLOR (idx);
910 goto done; 910 goto done;
911 } 911 }
912 912
913 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
914 { /* normal colors */ 914 { /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 916 goto done;
918 } 917 }
919 } 918 }
920 919
921 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 921
926 /* 922 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
929 */ 925 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 926
942 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 928
945 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */ 930 /* Cursor cursor; */
947done: 931done:
948 932
949#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
950 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 935 {
936 rgba c;
937 pix_colors [Color_fade].get (this, c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
952#endif 940#endif
953 941
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
955 943
956 recolour_cursor (); 944 recolour_cursor ();
… …
971 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg];
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 961 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 962 : pix_colors_focused[Color_bg];
975 963
976 XQueryColors (display->display, display->cmap, xcol, 2); 964 XQueryColors (xdisp, cmap, xcol, 2);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
978} 966}
979 967
980/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
981/* 969/*
982 * 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
… …
986{ 974{
987 unsigned int i; 975 unsigned int i;
988 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 978
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
996 { 983 {
… …
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 999}
1013 1000
1014/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1015 1002
1016int 1003bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 1005{
1019 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1026} 1011}
1027 1012
1028/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1017rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 1018{
1034 int fix_screen; 1019 int fix_screen;
1035 int old_width = szHint.width; 1020 int old_width = szHint.width;
1036 int old_height = szHint.height; 1021 int old_height = szHint.height;
1037 dDisp;
1038 1022
1039 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1041 1025
1042 if (!ignoreparent) 1026 if (!ignoreparent)
1043 { 1027 {
1044#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1045 /* 1029 /*
… …
1049 int x, y, x1, y1; 1033 int x, y, x1, y1;
1050 int dx, dy; 1034 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1036 Window unused_cr;
1053 1037
1054 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1042 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1043 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1061 */ 1045 */
… …
1063 { 1047 {
1064 x -= x1; 1048 x -= x1;
1065 y -= y1; 1049 y -= y1;
1066 } 1050 }
1067 1051
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1072 1056
1073 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1079 dy = 0; 1063 dy = 0;
1080 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1081 dy /= 2; 1065 dy /= 2;
1082 1066
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1085#else 1069#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1087#endif 1071#endif
1088 } 1072 }
1089 1073
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1075
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1077 {
1094 if (scrollBar.state) 1078 if (scrollBar.state)
1095 { 1079 {
1096 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1097 window_sb_x, 0, 1081 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 1083 resize_scrollbar ();
1100 } 1084 }
1101 1085
1102 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1103 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1104 width, height); 1088 width, height);
1105 1089
1106 scr_clear (); 1090 scr_clear ();
1107#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
… …
1131{ 1115{
1132 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1133 1117
1134 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1135 { 1119 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1137 1121
1138 if (newwidth == 0) 1122 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1124 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1204 1188
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1206 *p = '\0'; 1190 *p = '\0';
1207 1191
1208 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1210 1194
1211 if (win != None) 1195 if (win != None)
1212 return True; 1196 return True;
1213 } 1197 }
1214 1198
… …
1438 "*", 1422 "*",
1439 fheight, 1423 fheight,
1440 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1442 1426
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1445 1429
1446 if (missing_charset_list) 1430 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1448 1432
… …
1489 XNBackground, bg, 1473 XNBackground, bg,
1490 XNArea, &status_rect, 1474 XNArea, &status_rect,
1491 XNFontSet, fs, 1475 XNFontSet, fs,
1492 NULL); 1476 NULL);
1493 } 1477 }
1478#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1479 else if (input_style & XIMPreeditCallbacks)
1495 { 1480 {
1496 im_set_position (spot); 1481 im_set_position (spot);
1497 1482
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1483 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1484 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1485 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1486# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1488# endif
1504 1489
1505 preedit_attr = XVaCreateNestedList (0, 1490 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1491 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1492 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1493 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1494 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1495# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1496 XNPreeditCaretCallback, &xcb[3],
1512#endif 1497# endif
1513 NULL); 1498 NULL);
1514 } 1499 }
1500#endif
1515 1501
1516 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1504 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1522 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1509 status_attr, NULL);
1524 1510
1525 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1528 1514
1529 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1530 { 1516 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1518 im_destroy ();

Diff Legend

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