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.220 by root, Sat Feb 11 10:53:37 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 (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 229#endif
232#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 232#endif
235#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 244#endif
247#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 249#endif
252 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, 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 (dpy, parent[0]);
258 }
259 256
260 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
261 delete pix_colors_focused; 269 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
264#endif 272#endif
265 273
… …
271 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 280 free (allocated [i]);
273 281
274 free (selection.text); 282 free (selection.text);
275 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 284 free (env_display);
278 free (env_term); 285 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 286 free (locale);
281 free (v_buffer); 287 free (v_buffer);
282 free (incr_buf); 288 free (incr_buf);
283 289
284 delete envv; 290 delete envv;
… …
305rxvt_term::destroy () 311rxvt_term::destroy ()
306{ 312{
307 if (destroy_ev.active) 313 if (destroy_ev.active)
308 return; 314 return;
309 315
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 317
313#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
314 scr_overlay_off (); 319 scr_overlay_off ();
315#endif 320#endif
316 321
… …
371{ 376{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
374} 379}
375 380
376#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
377static void 382static void
378print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
379{ 384{
380 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
430 else 435 else
431 { 436 {
432 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 438 // so just output the error and continue
434#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
435 print_x_error (display, event); 442 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 443#endif
439 } 444 }
440 445
441 return 0; 446 return 0;
442} 447}
… …
478 483
479 pty = ptytty::create (); 484 pty = ptytty::create ();
480 485
481 create_windows (argc, argv); 486 create_windows (argc, argv);
482 487
483 dDisp;
484
485 init_xlocale (); 488 init_xlocale ();
486 489
487 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
488 491
489#if 0 492#if 0
490 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
491#endif 494#endif
492 495
493#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
496#endif 499#endif
497#ifdef TRANSPARENT 500#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
499 { 502 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents (); 504 check_our_parents ();
502 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
503 } 506 }
504#endif 507#endif
505 508
… …
514 517
515 check_ev.start (); 518 check_ev.start ();
516 519
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
519 XMapWindow (disp, vt); 532 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 533 XMapWindow (dpy, parent[0]);
521 534
522 return true; 535 return true;
523} 536}
524 537
525static struct sig_handlers 538static struct sig_handlers
… …
615{ 628{
616 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
618 unsigned int w, h; 631 unsigned int w, h;
619 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
620 dDisp;
621 633
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 637
… …
687 699
688 if (scrollBar.state) 700 if (scrollBar.state)
689 { 701 {
690 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
691 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
692 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
693 window_vt_x += sb_w; 706 window_vt_x += sb_w;
694 } 707 }
695 708
696 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
700 713
701 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 715 {
703 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
722 735
723 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
725 738
726 if (recalc_x) 739 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
728 if (recalc_y) 742 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 744
731 ncol = width / fwidth; 745 ncol = width / fwidth;
732 nrow = height / fheight; 746 nrow = height / fheight;
733} 747}
734 748
… …
837 return true; 851 return true;
838} 852}
839 853
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 855{
842 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 859}
846 860
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 862{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
851 865
852 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
855 869
856 free (s); 870 free (s);
857 free (ws); 871 free (ws);
… …
882void 896void
883rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
884{ 898{
885 rxvt_color xcol; 899 rxvt_color xcol;
886 int i; 900 int i;
887 901
888 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
889 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
890 908
891 /* handle color aliases */ 909 /* handle color aliases */
892 if (isdigit (*color)) 910 if (isdigit (*color))
893 { 911 {
894 i = atoi (color); 912 i = atoi (color);
895 913
896 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
897 { /* bright colors */ 915 { /* bright colors */
898 i -= 8; 916 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
900 SET_PIXCOLOR (idx);
901 goto done; 918 goto done;
902 } 919 }
903 920
904 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
905 { /* normal colors */ 922 { /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 924 goto done;
909 } 925 }
910 } 926 }
911 927
912 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 929
917 /* 930 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
920 */ 933 */
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 934
933 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 936
936 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */ 938 /* Cursor cursor; */
938done: 939done:
939 940
940#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
941 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
943#endif 948#endif
944 949
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
946 951
947 recolour_cursor (); 952 recolour_cursor ();
… …
953#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
954 959
955void 960void
956rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
957{ 962{
958 XColor xcol[2]; 963 XColor fg, bg;
959 964
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
966 972
967 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 974}
970 975
971/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
972/* 977/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
977{ 982{
978 unsigned int i; 983 unsigned int i;
979 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 986
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
987 { 991 {
… …
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 1007}
1004 1008
1005/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1006 1010
1007int 1011bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 1013{
1010 if (!screen_in_out->set (display, colour)) 1014 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; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 1025}
1018 1026
1019/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 1032{
1025 int fix_screen; 1033 int fix_screen;
1026 int old_width = szHint.width; 1034 int old_width = szHint.width;
1027 int old_height = szHint.height; 1035 int old_height = szHint.height;
1028 dDisp;
1029 1036
1030 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1032 1041
1033 if (!ignoreparent) 1042 if (!ignoreparent)
1034 { 1043 {
1035#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1036 /* 1045 /*
… …
1040 int x, y, x1, y1; 1049 int x, y, x1, y1;
1041 int dx, dy; 1050 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1052 Window unused_cr;
1044 1053
1045 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1058 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1052 */ 1061 */
… …
1054 { 1063 {
1055 x -= x1; 1064 x -= x1;
1056 y -= y1; 1065 y -= y1;
1057 } 1066 }
1058 1067
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1063 1072
1064 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1070 dy = 0; 1079 dy = 0;
1071 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1072 dy /= 2; 1081 dy /= 2;
1073 1082
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1076#else 1085#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 1087#endif
1079 } 1088 }
1080 1089
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1091
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1093 {
1085 if (scrollBar.state) 1094 if (scrollBar.state)
1086 { 1095 {
1087 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1088 window_sb_x, 0, 1097 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar (); 1099 resize_scrollbar ();
1091 } 1100 }
1092 1101
1093 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1095 width, height); 1104 width, height);
1096 1105
1097 scr_clear (); 1106 scr_clear ();
1098#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1101 } 1110 }
1102 1111
1103 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1104 scr_reset (); 1113 scr_reset ();
1105 1114
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1117
1106#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1107 if (pixmap) 1119 if (pixmap)
1108 scr_touch (false); 1120 scr_touch (false);
1109#endif 1121#endif
1110 1122
1111#ifdef USE_XIM 1123#ifdef USE_XIM
1112 IMSetStatusPosition (); 1124 IMSetPosition ();
1113#endif 1125#endif
1114} 1126}
1115 1127
1116/* 1128/*
1117 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1122{ 1134{
1123 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1124 1136
1125 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1126 { 1138 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1140
1129 if (newwidth == 0) 1141 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1143 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1158#ifdef USE_XIM
1147 1159
1148void 1160void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1162{
1151 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1153} 1165}
1154 1166
1155void 1167void
1156rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1157{ 1169{
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1207
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1209 *p = '\0';
1198 1210
1199 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1201 1213
1202 if (win != None) 1214 if (win != None)
1203 return True; 1215 return True;
1204 } 1216 }
1205 1217
… …
1212 XPoint nspot; 1224 XPoint nspot;
1213 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1214 1226
1215 if (!Input_Context 1227 if (!Input_Context
1216 || !focus 1228 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1230 return;
1219 1231
1220 im_set_position (nspot); 1232 im_set_position (nspot);
1221 1233
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1253 input_method = 0;
1242 } 1254 }
1243 1255
1244 Input_Context = 0; 1256 Input_Context = 0;
1245} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (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_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1246 1332
1247/* 1333/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1335 * open a suitable preedit type
1250 */ 1336 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1344 unsigned long fg, bg;
1259 const char *p; 1345 const char *p;
1260 char **s; 1346 char **s;
1261 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1262 1351
1263 set_environ (envv); 1352 set_environ (envv);
1264 1353
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1355 return false;
… …
1292 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1293 1382
1294 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1295 { 1384 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1399
1305 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1307 { 1402 {
1308 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1346 "*", 1441 "*",
1347 fheight, 1442 fheight,
1348 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1350 1445
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1353 1448
1354 if (missing_charset_list) 1449 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1356 1451
… …
1397 XNBackground, bg, 1492 XNBackground, bg,
1398 XNArea, &status_rect, 1493 XNArea, &status_rect,
1399 XNFontSet, fs, 1494 XNFontSet, fs,
1400 NULL); 1495 NULL);
1401 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1402 1520
1403 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1523 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1526 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1528 status_attr, NULL);
1411 1529
1412 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1415 1533
1416 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1417 { 1535 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1537 im_destroy ();
1420 return false; 1538 return false;
1421 } 1539 }
1422 1540
1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1544 vt_select_input ();
1545#endif
1425 1546
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1547 IMSetPosition ();
1428 1548
1429 return true; 1549 return true;
1430} 1550}
1431 1551
1432void 1552void
… …
1490 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1491#endif 1611#endif
1492} 1612}
1493 1613
1494void 1614void
1495rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1496{ 1616{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1499 1619
1500 if (!Input_Context 1620 if (!Input_Context
1501 || !focus 1621 || !focus
1502 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1623 || !IMisRunning ())
1504 return; 1624 return;
1505 1625
1506 /* Getting the necessary width of preedit area */ 1626 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
… …
1510 1630
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1632 XFree (needed_rect);
1513 1633
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1636
1517 XSetICValues (Input_Context, 1637 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1638 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1639 XNStatusAttributes, status_attr,
1640 NULL);
1520 1641
1521 XFree (preedit_attr); 1642 XFree (preedit_attr);
1522 XFree (status_attr); 1643 XFree (status_attr);
1523} 1644}
1524#endif /* USE_XIM */ 1645#endif /* USE_XIM */

Diff Legend

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