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.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.215 by root, Wed Feb 1 18:36:48 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
… …
513 509
514 check_ev.start (); 510 check_ev.start ();
515 511
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
518 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
519 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
520 526
521 return true; 527 return true;
522} 528}
523 529
524static struct sig_handlers 530static struct sig_handlers
… …
614{ 620{
615 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
617 unsigned int w, h; 623 unsigned int w, h;
618 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
619 dDisp;
620 625
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 629
… …
686 691
687 if (scrollBar.state) 692 if (scrollBar.state)
688 { 693 {
689 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
691 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
692 window_vt_x += sb_w; 698 window_vt_x += sb_w;
693 } 699 }
694 700
695 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
… …
721 727
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
724 730
725 if (recalc_x) 731 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
727 if (recalc_y) 734 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
729 736
730 ncol = width / fwidth; 737 ncol = width / fwidth;
731 nrow = height / fheight; 738 nrow = height / fheight;
732} 739}
733 740
… …
836 return true; 843 return true;
837} 844}
838 845
839void 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)
840{ 847{
841 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 851}
845 852
846void 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)
847{ 854{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
850 857
851 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
854 861
855 free (s); 862 free (s);
856 free (ws); 863 free (ws);
… …
881void 888void
882rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
883{ 890{
884 rxvt_color xcol; 891 rxvt_color xcol;
885 int i; 892 int i;
886 893
887 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
888 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
889 900
890 /* handle color aliases */ 901 /* handle color aliases */
891 if (isdigit (*color)) 902 if (isdigit (*color))
892 { 903 {
893 i = atoi (color); 904 i = atoi (color);
894 905
895 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
896 { /* bright colors */ 907 { /* bright colors */
897 i -= 8; 908 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
899 SET_PIXCOLOR (idx);
900 goto done; 910 goto done;
901 } 911 }
902 912
903 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
904 { /* normal colors */ 914 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 916 goto done;
908 } 917 }
909 } 918 }
910 919
911 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 921
916 /* 922 /*
917 * 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,
918 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
919 */ 925 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 926
932 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 928
935 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 930 /* Cursor cursor; */
937done: 931done:
938 932
939#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
940 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
941 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 (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
942#endif 940#endif
943 941
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
945 943
946 recolour_cursor (); 944 recolour_cursor ();
… …
952#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
953 951
954void 952void
955rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
956{ 954{
957 XColor xcol[2]; 955 XColor fg, bg;
958 956
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
965 964
966 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 966}
969 967
970/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
971/* 969/*
972 * 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
… …
976{ 974{
977 unsigned int i; 975 unsigned int i;
978 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 978
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
986 { 983 {
… …
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 999}
1003 1000
1004/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1005 1002
1006int 1003bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 1005{
1009 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1016} 1011}
1017 1012
1018/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
… …
1022rxvt_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)
1023{ 1018{
1024 int fix_screen; 1019 int fix_screen;
1025 int old_width = szHint.width; 1020 int old_width = szHint.width;
1026 int old_height = szHint.height; 1021 int old_height = szHint.height;
1027 dDisp;
1028 1022
1029 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1031 1025
1032 if (!ignoreparent) 1026 if (!ignoreparent)
1033 { 1027 {
1034#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1035 /* 1029 /*
… …
1039 int x, y, x1, y1; 1033 int x, y, x1, y1;
1040 int dx, dy; 1034 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1036 Window unused_cr;
1043 1037
1044 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1042 /*
1049 * 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
1050 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1051 */ 1045 */
… …
1053 { 1047 {
1054 x -= x1; 1048 x -= x1;
1055 y -= y1; 1049 y -= y1;
1056 } 1050 }
1057 1051
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1062 1056
1063 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1069 dy = 0; 1063 dy = 0;
1070 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1071 dy /= 2; 1065 dy /= 2;
1072 1066
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1075#else 1069#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1077#endif 1071#endif
1078 } 1072 }
1079 1073
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1075
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1077 {
1084 if (scrollBar.state) 1078 if (scrollBar.state)
1085 { 1079 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1087 window_sb_x, 0, 1081 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1083 resize_scrollbar ();
1090 } 1084 }
1091 1085
1092 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1093 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1094 width, height); 1088 width, height);
1095 1089
1096 scr_clear (); 1090 scr_clear ();
1097#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
… …
1121{ 1115{
1122 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1123 1117
1124 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1125 { 1119 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1127 1121
1128 if (newwidth == 0) 1122 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1124 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1188
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1190 *p = '\0';
1197 1191
1198 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1200 1194
1201 if (win != None) 1195 if (win != None)
1202 return True; 1196 return True;
1203 } 1197 }
1204 1198
… …
1211 XPoint nspot; 1205 XPoint nspot;
1212 XVaNestedList preedit_attr; 1206 XVaNestedList preedit_attr;
1213 1207
1214 if (!Input_Context 1208 if (!Input_Context
1215 || !focus 1209 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1210 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1211 return;
1218 1212
1219 im_set_position (nspot); 1213 im_set_position (nspot);
1220 1214
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1215 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1428 "*", 1422 "*",
1429 fheight, 1423 fheight,
1430 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1432 1426
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1435 1429
1436 if (missing_charset_list) 1430 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1438 1432
… …
1479 XNBackground, bg, 1473 XNBackground, bg,
1480 XNArea, &status_rect, 1474 XNArea, &status_rect,
1481 XNFontSet, fs, 1475 XNFontSet, fs,
1482 NULL); 1476 NULL);
1483 } 1477 }
1478#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1479 else if (input_style & XIMPreeditCallbacks)
1485 { 1480 {
1481 im_set_position (spot);
1482
1486 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;
1487 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;
1488 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;
1489#if 0 1486# if 0
1490 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;
1491#endif 1488# endif
1492 1489
1493 preedit_attr = XVaCreateNestedList (0, 1490 preedit_attr = XVaCreateNestedList (0,
1491 XNSpotLocation, &spot,
1494 XNPreeditStartCallback, &xcb[0], 1492 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1], 1493 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2], 1494 XNPreeditDrawCallback , &xcb[2],
1497#if 0 1495# if 0
1498 XNPreeditCaretCallback, &xcb[3], 1496 XNPreeditCaretCallback, &xcb[3],
1499#endif 1497# endif
1500 NULL); 1498 NULL);
1501 } 1499 }
1500#endif
1502 1501
1503 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1504 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1505 XNClientWindow, vt, 1504 XNClientWindow, vt,
1506 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1509 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1510 status_attr, NULL); 1509 status_attr, NULL);
1511 1510
1512 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1513 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1514 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1515 1514
1516 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1517 { 1516 {
1518 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1519 im_destroy (); 1518 im_destroy ();

Diff Legend

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