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.199 by root, Tue Jan 24 19:40:12 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;
… …
305rxvt_term::destroy () 303rxvt_term::destroy ()
306{ 304{
307 if (destroy_ev.active) 305 if (destroy_ev.active)
308 return; 306 return;
309 307
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 309
313#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
314 scr_overlay_off (); 311 scr_overlay_off ();
315#endif 312#endif
316 313
… …
371{ 368{
372 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++)
373 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
374} 371}
375 372
376#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
377static void 374static void
378print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
379{ 376{
380 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
430 else 427 else
431 { 428 {
432 // 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,
433 // so just output the error and continue 430 // so just output the error and continue
434#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
435 print_x_error (display, event); 434 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 435#endif
439 } 436 }
440 437
441 return 0; 438 return 0;
442} 439}
… …
478 475
479 pty = ptytty::create (); 476 pty = ptytty::create ();
480 477
481 create_windows (argc, argv); 478 create_windows (argc, argv);
482 479
483 dDisp;
484
485 init_xlocale (); 480 init_xlocale ();
486 481
487 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
488 483
489#if 0 484#if 0
490 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
491#endif 486#endif
492 487
493#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
496#endif 491#endif
497#ifdef TRANSPARENT 492#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
499 { 494 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
501 check_our_parents (); 496 check_our_parents ();
502 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
503 } 498 }
504#endif 499#endif
505 500
… …
514 509
515 check_ev.start (); 510 check_ev.start ();
516 511
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 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
519 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
520 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
521 526
522 return true; 527 return true;
523} 528}
524 529
525static struct sig_handlers 530static struct sig_handlers
… …
615{ 620{
616 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
618 unsigned int w, h; 623 unsigned int w, h;
619 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
620 dDisp;
621 625
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 629
… …
687 691
688 if (scrollBar.state) 692 if (scrollBar.state)
689 { 693 {
690 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
691 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
692 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
693 window_vt_x += sb_w; 698 window_vt_x += sb_w;
694 } 699 }
695 700
696 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
… …
722 727
723 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
725 730
726 if (recalc_x) 731 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
728 if (recalc_y) 734 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
730 736
731 ncol = width / fwidth; 737 ncol = width / fwidth;
732 nrow = height / fheight; 738 nrow = height / fheight;
733} 739}
734 740
… …
837 return true; 843 return true;
838} 844}
839 845
840void 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)
841{ 847{
842 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 851}
846 852
847void 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)
848{ 854{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
851 857
852 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
855 861
856 free (s); 862 free (s);
857 free (ws); 863 free (ws);
… …
882void 888void
883rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
884{ 890{
885 rxvt_color xcol; 891 rxvt_color xcol;
886 int i; 892 int i;
887 893
888 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
889 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
890 900
891 /* handle color aliases */ 901 /* handle color aliases */
892 if (isdigit (*color)) 902 if (isdigit (*color))
893 { 903 {
894 i = atoi (color); 904 i = atoi (color);
895 905
896 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
897 { /* bright colors */ 907 { /* bright colors */
898 i -= 8; 908 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
900 SET_PIXCOLOR (idx);
901 goto done; 910 goto done;
902 } 911 }
903 912
904 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
905 { /* normal colors */ 914 { /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 916 goto done;
909 } 917 }
910 } 918 }
911 919
912 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 921
917 /* 922 /*
918 * 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,
919 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
920 */ 925 */
921# if 0
922 for (i = Color_Black; i <= Color_White; i++)
923 if (pix_colors[idx] == pix_colors[i])
924 break;
925 if (i > Color_White)
926 {
927 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
928 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
929 DisplayPlanes (display->display, display->screen));
930 }
931# endif
932 926
933 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 928
936 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */ 930 /* Cursor cursor; */
938done: 931done:
939 932
940#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
941 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
942 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 }
943#endif 940#endif
944 941
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
946 943
947 recolour_cursor (); 944 recolour_cursor ();
… …
962 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg];
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 961 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 962 : pix_colors_focused[Color_bg];
966 963
967 XQueryColors (display->display, display->cmap, xcol, 2); 964 XQueryColors (xdisp, cmap, xcol, 2);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
969} 966}
970 967
971/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
972/* 969/*
973 * 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
… …
977{ 974{
978 unsigned int i; 975 unsigned int i;
979 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 978
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
987 { 983 {
… …
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 999}
1004 1000
1005/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1006 1002
1007int 1003bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 1005{
1010 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1011 {
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1013 return false;
1014 }
1015
1016 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1017} 1011}
1018 1012
1019/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
… …
1023rxvt_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)
1024{ 1018{
1025 int fix_screen; 1019 int fix_screen;
1026 int old_width = szHint.width; 1020 int old_width = szHint.width;
1027 int old_height = szHint.height; 1021 int old_height = szHint.height;
1028 dDisp;
1029 1022
1030 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1032 1025
1033 if (!ignoreparent) 1026 if (!ignoreparent)
1034 { 1027 {
1035#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1036 /* 1029 /*
… …
1040 int x, y, x1, y1; 1033 int x, y, x1, y1;
1041 int dx, dy; 1034 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1036 Window unused_cr;
1044 1037
1045 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1042 /*
1050 * 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
1051 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1052 */ 1045 */
… …
1054 { 1047 {
1055 x -= x1; 1048 x -= x1;
1056 y -= y1; 1049 y -= y1;
1057 } 1050 }
1058 1051
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1063 1056
1064 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1070 dy = 0; 1063 dy = 0;
1071 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1072 dy /= 2; 1065 dy /= 2;
1073 1066
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1076#else 1069#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1078#endif 1071#endif
1079 } 1072 }
1080 1073
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1075
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1077 {
1085 if (scrollBar.state) 1078 if (scrollBar.state)
1086 { 1079 {
1087 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1088 window_sb_x, 0, 1081 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar (); 1083 resize_scrollbar ();
1091 } 1084 }
1092 1085
1093 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1094 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1095 width, height); 1088 width, height);
1096 1089
1097 scr_clear (); 1090 scr_clear ();
1098#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
… …
1122{ 1115{
1123 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1124 1117
1125 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1126 { 1119 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1128 1121
1129 if (newwidth == 0) 1122 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1124 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1188
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1190 *p = '\0';
1198 1191
1199 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1201 1194
1202 if (win != None) 1195 if (win != None)
1203 return True; 1196 return True;
1204 } 1197 }
1205 1198
… …
1212 XPoint nspot; 1205 XPoint nspot;
1213 XVaNestedList preedit_attr; 1206 XVaNestedList preedit_attr;
1214 1207
1215 if (!Input_Context 1208 if (!Input_Context
1216 || !focus 1209 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1210 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1211 return;
1219 1212
1220 im_set_position (nspot); 1213 im_set_position (nspot);
1221 1214
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1215 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1234 input_method = 0;
1242 } 1235 }
1243 1236
1244 Input_Context = 0; 1237 Input_Context = 0;
1245} 1238}
1239
1240#ifdef ENABLE_XIM_ONTHESPOT
1241
1242static void
1243xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1244{
1245 ((rxvt_term *)client_data)->make_current ();
1246 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1247}
1248
1249static void
1250xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1251{
1252 ((rxvt_term *)client_data)->make_current ();
1253 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1254}
1255
1256static void
1257xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1258{
1259 rxvt_term *term = (rxvt_term *)client_data;
1260 XIMText *text = call_data->text;
1261
1262 term->make_current ();
1263
1264 if (text)
1265 {
1266 void *str;
1267
1268 if (!text->encoding_is_wchar && text->string.multi_byte)
1269 {
1270 // of course, X makes it ugly again
1271 if (term->rs[Rs_imLocale])
1272 SET_LOCALE (term->rs[Rs_imLocale]);
1273
1274 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1275 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1276
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale);
1279 }
1280 else
1281 str = (void *)text->string.wide_char;
1282
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1288 DT_WCS_LEN, str, str ? (int)text->length : 0,
1289 DT_END));
1290 }
1291 else
1292 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1293 DT_INT, call_data->caret,
1294 DT_INT, call_data->chg_first,
1295 DT_INT, call_data->chg_length,
1296 DT_END));
1297}
1298
1299#if 0
1300static void
1301xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1302{
1303 ((rxvt_term *)client_data)->make_current ();
1304 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1305 DT_INT, call_data->position,
1306 DT_INT, call_data->direction,
1307 DT_INT, call_data->style,
1308 DT_END));
1309}
1310#endif
1311
1312#endif
1246 1313
1247/* 1314/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1315 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1316 * open a suitable preedit type
1250 */ 1317 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1324 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1325 unsigned long fg, bg;
1259 const char *p; 1326 const char *p;
1260 char **s; 1327 char **s;
1261 XIMStyles *xim_styles; 1328 XIMStyles *xim_styles;
1329#ifdef ENABLE_XIM_ONTHESPOT
1330 XIMCallback xcb[4];
1331#endif
1262 1332
1263 set_environ (envv); 1333 set_environ (envv);
1264 1334
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1335 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1336 return false;
… …
1292 s = rxvt_splitcommastring (p); 1362 s = rxvt_splitcommastring (p);
1293 1363
1294 for (i = found = 0; !found && s[i]; i++) 1364 for (i = found = 0; !found && s[i]; i++)
1295 { 1365 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1366 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1367 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1368 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1369 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1370 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1371 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1372 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1373 input_style = XIMPreeditNone | XIMStatusNone;
1374#ifdef ENABLE_XIM_ONTHESPOT
1375 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1376 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1377#endif
1378 else
1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1380
1305 for (j = 0; j < xim_styles->count_styles; j++) 1381 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1382 if (input_style == xim_styles->supported_styles[j])
1307 { 1383 {
1308 rxvt_freecommastring (s); 1384 rxvt_freecommastring (s);
… …
1346 "*", 1422 "*",
1347 fheight, 1423 fheight,
1348 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1350 1426
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1353 1429
1354 if (missing_charset_list) 1430 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1356 1432
… …
1397 XNBackground, bg, 1473 XNBackground, bg,
1398 XNArea, &status_rect, 1474 XNArea, &status_rect,
1399 XNFontSet, fs, 1475 XNFontSet, fs,
1400 NULL); 1476 NULL);
1401 } 1477 }
1478#if ENABLE_XIM_ONTHESPOT
1479 else if (input_style & XIMPreeditCallbacks)
1480 {
1481 im_set_position (spot);
1482
1483 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1484 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1485 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1486# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1488# endif
1489
1490 preedit_attr = XVaCreateNestedList (0,
1491 XNSpotLocation, &spot,
1492 XNPreeditStartCallback, &xcb[0],
1493 XNPreeditDoneCallback , &xcb[1],
1494 XNPreeditDrawCallback , &xcb[2],
1495# if 0
1496 XNPreeditCaretCallback, &xcb[3],
1497# endif
1498 NULL);
1499 }
1500#endif
1402 1501
1403 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1504 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1409 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1509 status_attr, NULL);
1411 1510
1412 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1415 1514
1416 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1417 { 1516 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1518 im_destroy ();
1420 return false; 1519 return false;
1421 } 1520 }
1422 1521
1522#if 0
1523 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1525 vt_select_input ();
1526#endif
1425 1527
1426 if (input_style & XIMPreeditArea) 1528 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1529 IMSetStatusPosition ();
1428 1530
1429 return true; 1531 return true;

Diff Legend

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