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.198 by root, Tue Jan 24 16:57:42 2006 UTC vs.
Revision 1.211 by root, Tue Jan 31 16:57:35 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
… …
530 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
531 */ 536 */
532 void 537 void
533 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
534 { 539 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
541 } 543 }
542 544
… …
618{ 620{
619 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
620 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
621 unsigned int w, h; 623 unsigned int w, h;
622 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
623 dDisp;
624
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627 625
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 629
… …
728 726
729 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
730 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
731 729
732 if (recalc_x) 730 if (recalc_x)
733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
734 if (recalc_y) 733 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
736 735
737 ncol = width / fwidth; 736 ncol = width / fwidth;
738 nrow = height / fheight; 737 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 738}
744 739
745/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
746/* 741/*
747 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
847 return true; 842 return true;
848} 843}
849 844
850void rxvt_term::set_string_property (Atom prop, const char *str, int len) 845void rxvt_term::set_string_property (Atom prop, const char *str, int len)
851{ 846{
852 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
853 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
854 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
855} 850}
856 851
857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
858{ 853{
859 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
860 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
861 856
862 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
864 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
865 860
866 free (s); 861 free (s);
867 free (ws); 862 free (ws);
… …
917 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
918 goto done; 913 goto done;
919 } 914 }
920 } 915 }
921 916
922 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
923 return; 918 return;
924 919
925 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
926 921
927 /* 922 /*
928 * 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,
929 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
930 */ 925 */
… …
933 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
934 break; 929 break;
935 if (i > Color_White) 930 if (i > Color_White)
936 { 931 {
937 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
938 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
939 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
940 } 935 }
941# endif 936# endif
942 937
943 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
944 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
947 /* Cursor cursor; */ 942 /* Cursor cursor; */
948done: 943done:
949 944
950#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
951 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 947 {
948 rxvt_rgba c;
949 pix_colors [Color_fade].get (this, c);
950 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
951 }
953#endif 952#endif
954 953
955 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
956 955
957 recolour_cursor (); 956 recolour_cursor ();
… …
972 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg];
973 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
974 ? pix_colors_focused[Color_pointer_bg] 973 ? pix_colors_focused[Color_pointer_bg]
975 : pix_colors_focused[Color_bg]; 974 : pix_colors_focused[Color_bg];
976 975
977 XQueryColors (display->display, display->cmap, xcol, 2); 976 XQueryColors (xdisp, cmap, xcol, 2);
978 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
979} 978}
980 979
981/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
982/* 981/*
983 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
987{ 986{
988 unsigned int i; 987 unsigned int i;
989 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 990
992 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
993 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
994 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
995 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
996 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
997 { 995 {
… …
1012 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1013} 1011}
1014 1012
1015/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1016 1014
1017int 1015bool
1018rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1019{ 1017{
1020 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1021 {
1022 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1023 return false;
1024 }
1025
1026 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1027} 1023}
1028 1024
1029/* -------------------------------------------------------------------- * 1025/* -------------------------------------------------------------------- *
1030 * - WINDOW RESIZING - * 1026 * - WINDOW RESIZING - *
1031 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
… …
1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1034{ 1030{
1035 int fix_screen; 1031 int fix_screen;
1036 int old_width = szHint.width; 1032 int old_width = szHint.width;
1037 int old_height = szHint.height; 1033 int old_height = szHint.height;
1038 dDisp;
1039 1034
1040 window_calc (newwidth, newheight); 1035 window_calc (newwidth, newheight);
1041 XSetWMNormalHints (disp, parent[0], &szHint); 1036 XSetWMNormalHints (xdisp, parent[0], &szHint);
1042 1037
1043 if (!ignoreparent) 1038 if (!ignoreparent)
1044 { 1039 {
1045#ifdef SMART_RESIZE 1040#ifdef SMART_RESIZE
1046 /* 1041 /*
… …
1050 int x, y, x1, y1; 1045 int x, y, x1, y1;
1051 int dx, dy; 1046 int dx, dy;
1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1053 Window unused_cr; 1048 Window unused_cr;
1054 1049
1055 XTranslateCoordinates (disp, parent[0], display->root, 1050 XTranslateCoordinates (xdisp, parent[0], display->root,
1056 0, 0, &x, &y, &unused_cr); 1051 0, 0, &x, &y, &unused_cr);
1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1059 /* 1054 /*
1060 * if display->root isn't the parent window, a WM will probably have offset 1055 * if display->root isn't the parent window, a WM will probably have offset
1061 * our position for handles and decorations. Counter it 1056 * our position for handles and decorations. Counter it
1062 */ 1057 */
… …
1064 { 1059 {
1065 x -= x1; 1060 x -= x1;
1066 y -= y1; 1061 y -= y1;
1067 } 1062 }
1068 1063
1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1071 dx = old_width - szHint.width; 1066 dx = old_width - szHint.width;
1072 dy = old_height - szHint.height; 1067 dy = old_height - szHint.height;
1073 1068
1074 /* Check position of the center of the window */ 1069 /* Check position of the center of the window */
1075 if (x < x1) /* left half */ 1070 if (x < x1) /* left half */
… …
1079 if (y < y1) /* top half */ 1074 if (y < y1) /* top half */
1080 dy = 0; 1075 dy = 0;
1081 else if (y == y1) /* exact center */ 1076 else if (y == y1) /* exact center */
1082 dy /= 2; 1077 dy /= 2;
1083 1078
1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1085 szHint.width, szHint.height); 1080 szHint.width, szHint.height);
1086#else 1081#else
1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1088#endif 1083#endif
1089 } 1084 }
1090 1085
1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1092 1087
1093 if (fix_screen || newwidth != old_width || newheight != old_height) 1088 if (fix_screen || newwidth != old_width || newheight != old_height)
1094 { 1089 {
1095 if (scrollBar.state) 1090 if (scrollBar.state)
1096 { 1091 {
1097 XMoveResizeWindow (disp, scrollBar.win, 1092 XMoveResizeWindow (xdisp, scrollBar.win,
1098 window_sb_x, 0, 1093 window_sb_x, 0,
1099 scrollbar_TotalWidth (), szHint.height); 1094 scrollbar_TotalWidth (), szHint.height);
1100 resize_scrollbar (); 1095 resize_scrollbar ();
1101 } 1096 }
1102 1097
1103 XMoveResizeWindow (disp, vt, 1098 XMoveResizeWindow (xdisp, vt,
1104 window_vt_x, window_vt_y, 1099 window_vt_x, window_vt_y,
1105 width, height); 1100 width, height);
1106 1101
1107 scr_clear (); 1102 scr_clear ();
1108#ifdef XPM_BACKGROUND 1103#ifdef XPM_BACKGROUND
… …
1132{ 1127{
1133 XWindowAttributes wattr; 1128 XWindowAttributes wattr;
1134 1129
1135 if (newwidth == 0 || newheight == 0) 1130 if (newwidth == 0 || newheight == 0)
1136 { 1131 {
1137 XGetWindowAttributes (display->display, display->root, &wattr); 1132 XGetWindowAttributes (xdisp, display->root, &wattr);
1138 1133
1139 if (newwidth == 0) 1134 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1135 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1136 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1137 newheight = wattr.height - szHint.base_height;
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1200
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1202 *p = '\0';
1208 1203
1209 atom = XInternAtom (display->display, server, False); 1204 atom = XInternAtom (xdisp, server, False);
1210 win = XGetSelectionOwner (display->display, atom); 1205 win = XGetSelectionOwner (xdisp, atom);
1211 1206
1212 if (win != None) 1207 if (win != None)
1213 return True; 1208 return True;
1214 } 1209 }
1215 1210
… …
1222 XPoint nspot; 1217 XPoint nspot;
1223 XVaNestedList preedit_attr; 1218 XVaNestedList preedit_attr;
1224 1219
1225 if (!Input_Context 1220 if (!Input_Context
1226 || !focus 1221 || !focus
1227 || !(input_style & XIMPreeditPosition)) 1222 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1228 return; 1223 return;
1229 1224
1230 im_set_position (nspot); 1225 im_set_position (nspot);
1231 1226
1232 if (nspot.x == spot.x && nspot.y == spot.y) 1227 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1251 input_method = 0; 1246 input_method = 0;
1252 } 1247 }
1253 1248
1254 Input_Context = 0; 1249 Input_Context = 0;
1255} 1250}
1251
1252#ifdef ENABLE_XIM_ONTHESPOT
1253
1254static void
1255xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1256{
1257 ((rxvt_term *)client_data)->make_current ();
1258 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1259}
1260
1261static void
1262xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1266}
1267
1268static void
1269xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1270{
1271 rxvt_term *term = (rxvt_term *)client_data;
1272 XIMText *text = call_data->text;
1273
1274 term->make_current ();
1275
1276 if (text)
1277 {
1278 void *str;
1279
1280 if (!text->encoding_is_wchar && text->string.multi_byte)
1281 {
1282 // of course, X makes it ugly again
1283 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->rs[Rs_imLocale]);
1285
1286 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1287 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1288
1289 if (term->rs[Rs_imLocale])
1290 SET_LOCALE (term->locale);
1291 }
1292 else
1293 str = (void *)text->string.wide_char;
1294
1295 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1296 DT_INT, call_data->caret,
1297 DT_INT, call_data->chg_first,
1298 DT_INT, call_data->chg_length,
1299 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1300 DT_WCS_LEN, str, str ? (int)text->length : 0,
1301 DT_END));
1302 }
1303 else
1304 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1305 DT_INT, call_data->caret,
1306 DT_INT, call_data->chg_first,
1307 DT_INT, call_data->chg_length,
1308 DT_END));
1309}
1310
1311#if 0
1312static void
1313xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1314{
1315 ((rxvt_term *)client_data)->make_current ();
1316 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1317 DT_INT, call_data->position,
1318 DT_INT, call_data->direction,
1319 DT_INT, call_data->style,
1320 DT_END));
1321}
1322#endif
1323
1324#endif
1256 1325
1257/* 1326/*
1258 * Try to open a XIM with the current modifiers, then see if we can 1327 * Try to open a XIM with the current modifiers, then see if we can
1259 * open a suitable preedit type 1328 * open a suitable preedit type
1260 */ 1329 */
… …
1267 XRectangle rect, status_rect, needed_rect; 1336 XRectangle rect, status_rect, needed_rect;
1268 unsigned long fg, bg; 1337 unsigned long fg, bg;
1269 const char *p; 1338 const char *p;
1270 char **s; 1339 char **s;
1271 XIMStyles *xim_styles; 1340 XIMStyles *xim_styles;
1341#ifdef ENABLE_XIM_ONTHESPOT
1342 XIMCallback xcb[4];
1343#endif
1272 1344
1273 set_environ (envv); 1345 set_environ (envv);
1274 1346
1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1347 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1276 return false; 1348 return false;
1277 1349
1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1279 input_method = display->get_xim (locale, modifiers); 1350 input_method = display->get_xim (locale, modifiers);
1280 if (input_method == NULL) 1351 if (input_method == NULL)
1281 return false; 1352 return false;
1282 1353
1283 xim = input_method->xim; 1354 xim = input_method->xim;
… …
1303 s = rxvt_splitcommastring (p); 1374 s = rxvt_splitcommastring (p);
1304 1375
1305 for (i = found = 0; !found && s[i]; i++) 1376 for (i = found = 0; !found && s[i]; i++)
1306 { 1377 {
1307 if (!strcmp (s[i], "OverTheSpot")) 1378 if (!strcmp (s[i], "OverTheSpot"))
1308 input_style = (XIMPreeditPosition | XIMStatusNothing); 1379 input_style = XIMPreeditPosition | XIMStatusNothing;
1309 else if (!strcmp (s[i], "OffTheSpot")) 1380 else if (!strcmp (s[i], "OffTheSpot"))
1310 input_style = (XIMPreeditArea | XIMStatusArea); 1381 input_style = XIMPreeditArea | XIMStatusArea;
1311 else if (!strcmp (s[i], "Root")) 1382 else if (!strcmp (s[i], "Root"))
1312 input_style = (XIMPreeditNothing | XIMStatusNothing); 1383 input_style = XIMPreeditNothing | XIMStatusNothing;
1313 else if (!strcmp (s[i], "None")) 1384 else if (!strcmp (s[i], "None"))
1314 input_style = (XIMPreeditNone | XIMStatusNone); 1385 input_style = XIMPreeditNone | XIMStatusNone;
1386#ifdef ENABLE_XIM_ONTHESPOT
1387 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1388 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1389#endif
1390 else
1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1315 1392
1316 for (j = 0; j < xim_styles->count_styles; j++) 1393 for (j = 0; j < xim_styles->count_styles; j++)
1317 if (input_style == xim_styles->supported_styles[j]) 1394 if (input_style == xim_styles->supported_styles[j])
1318 { 1395 {
1319 rxvt_freecommastring (s); 1396 rxvt_freecommastring (s);
… …
1357 "*", 1434 "*",
1358 fheight, 1435 fheight,
1359 fheight + 1, fheight - 1, 1436 fheight + 1, fheight - 1,
1360 fheight - 2, fheight + 2); 1437 fheight - 2, fheight + 2);
1361 1438
1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1363 &missing_charset_list, &missing_charset_count, &def_string); 1440 &missing_charset_list, &missing_charset_count, &def_string);
1364 1441
1365 if (missing_charset_list) 1442 if (missing_charset_list)
1366 XFreeStringList (missing_charset_list); 1443 XFreeStringList (missing_charset_list);
1367 1444
… …
1408 XNBackground, bg, 1485 XNBackground, bg,
1409 XNArea, &status_rect, 1486 XNArea, &status_rect,
1410 XNFontSet, fs, 1487 XNFontSet, fs,
1411 NULL); 1488 NULL);
1412 } 1489 }
1490#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks)
1492 {
1493 im_set_position (spot);
1494
1495 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;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500# endif
1501
1502 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2],
1507# if 0
1508 XNPreeditCaretCallback, &xcb[3],
1509# endif
1510 NULL);
1511 }
1512#endif
1413 1513
1414 Input_Context = XCreateIC (xim, 1514 Input_Context = XCreateIC (xim,
1415 XNInputStyle, input_style, 1515 XNInputStyle, input_style,
1416 XNClientWindow, vt, 1516 XNClientWindow, vt,
1417 XNFocusWindow, parent[0], 1517 XNFocusWindow, parent[0],
… …
1420 status_attr ? XNStatusAttributes : NULL, 1520 status_attr ? XNStatusAttributes : NULL,
1421 status_attr, NULL); 1521 status_attr, NULL);
1422 1522
1423 if (preedit_attr) XFree (preedit_attr); 1523 if (preedit_attr) XFree (preedit_attr);
1424 if (status_attr) XFree (status_attr); 1524 if (status_attr) XFree (status_attr);
1425 if (fs) XFreeFontSet (display->display, fs); 1525 if (fs) XFreeFontSet (xdisp, fs);
1426 1526
1427 if (Input_Context == NULL) 1527 if (Input_Context == NULL)
1428 { 1528 {
1429 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1529 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1430 im_destroy (); 1530 im_destroy ();
1431 return false; 1531 return false;
1432 } 1532 }
1433 1533
1534#if 0
1535 // unfortunately, only the focus window is used by XIM, hard to fix
1434 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1536 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1435 vt_select_input (); 1537 vt_select_input ();
1538#endif
1436 1539
1437 if (input_style & XIMPreeditArea) 1540 if (input_style & XIMPreeditArea)
1438 IMSetStatusPosition (); 1541 IMSetStatusPosition ();
1439 1542
1440 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1441 return true; 1543 return true;
1442} 1544}
1443 1545
1444void 1546void
1445rxvt_term::im_cb () 1547rxvt_term::im_cb ()
… …
1451 1553
1452 make_current (); 1554 make_current ();
1453 1555
1454 im_destroy (); 1556 im_destroy ();
1455 1557
1456 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1457 if (Input_Context) 1558 if (Input_Context)
1458 return; 1559 return;
1459 1560
1460#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1561#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1461 if (rs[Rs_imLocale]) 1562 if (rs[Rs_imLocale])

Diff Legend

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