ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.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;
… …
370{ 376{
371 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++)
372 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
373} 379}
374 380
375#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
376static void 382static void
377print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
378{ 384{
379 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
429 else 435 else
430 { 436 {
431 // 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,
432 // so just output the error and continue 438 // so just output the error and continue
433#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
434 print_x_error (display, event); 442 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 443#endif
438 } 444 }
439 445
440 return 0; 446 return 0;
441} 447}
… …
477 483
478 pty = ptytty::create (); 484 pty = ptytty::create ();
479 485
480 create_windows (argc, argv); 486 create_windows (argc, argv);
481 487
482 dDisp;
483
484 init_xlocale (); 488 init_xlocale ();
485 489
486 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
487 491
488#if 0 492#if 0
489 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
490#endif 494#endif
491 495
492#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
495#endif 499#endif
496#ifdef TRANSPARENT 500#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
498 { 502 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents (); 504 check_our_parents ();
501 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
502 } 506 }
503#endif 507#endif
504 508
… …
513 517
514 check_ev.start (); 518 check_ev.start ();
515 519
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 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
518 XMapWindow (disp, vt); 532 XMapWindow (dpy, vt);
519 XMapWindow (disp, parent[0]); 533 XMapWindow (dpy, parent[0]);
520 534
521 return true; 535 return true;
522} 536}
523 537
524static struct sig_handlers 538static struct sig_handlers
… …
614{ 628{
615 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
617 unsigned int w, h; 631 unsigned int w, h;
618 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
619 dDisp;
620 633
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 637
… …
686 699
687 if (scrollBar.state) 700 if (scrollBar.state)
688 { 701 {
689 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
691 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
692 window_vt_x += sb_w; 706 window_vt_x += sb_w;
693 } 707 }
694 708
695 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
699 713
700 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 715 {
702 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
721 735
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
724 738
725 if (recalc_x) 739 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
727 if (recalc_y) 742 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 744
730 ncol = width / fwidth; 745 ncol = width / fwidth;
731 nrow = height / fheight; 746 nrow = height / fheight;
732} 747}
733 748
… …
836 return true; 851 return true;
837} 852}
838 853
839void 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)
840{ 855{
841 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 859}
845 860
846void 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)
847{ 862{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
850 865
851 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
854 869
855 free (s); 870 free (s);
856 free (ws); 871 free (ws);
… …
881void 896void
882rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
883{ 898{
884 rxvt_color xcol; 899 rxvt_color xcol;
885 int i; 900 int i;
886 901
887 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
888 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
889 908
890 /* handle color aliases */ 909 /* handle color aliases */
891 if (isdigit (*color)) 910 if (isdigit (*color))
892 { 911 {
893 i = atoi (color); 912 i = atoi (color);
894 913
895 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
896 { /* bright colors */ 915 { /* bright colors */
897 i -= 8; 916 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
899 SET_PIXCOLOR (idx);
900 goto done; 918 goto done;
901 } 919 }
902 920
903 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
904 { /* normal colors */ 922 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 924 goto done;
908 } 925 }
909 } 926 }
910 927
911 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 929
916 /* 930 /*
917 * 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,
918 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
919 */ 933 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 934
932 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 936
935 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 938 /* Cursor cursor; */
937done: 939done:
938 940
939#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
940 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
941 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 }
942#endif 948#endif
943 949
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
945 951
946 recolour_cursor (); 952 recolour_cursor ();
… …
952#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
953 959
954void 960void
955rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
956{ 962{
957 XColor xcol[2]; 963 XColor fg, bg;
958 964
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
965 972
966 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 974}
969 975
970/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
971/* 977/*
972 * 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
… …
976{ 982{
977 unsigned int i; 983 unsigned int i;
978 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 986
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
986 { 991 {
… …
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 1007}
1003 1008
1004/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1005 1010
1006int 1011bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 1013{
1009 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 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]);
1016} 1025}
1017 1026
1018/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
… …
1022rxvt_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)
1023{ 1032{
1024 int fix_screen; 1033 int fix_screen;
1025 int old_width = szHint.width; 1034 int old_width = szHint.width;
1026 int old_height = szHint.height; 1035 int old_height = szHint.height;
1027 dDisp;
1028 1036
1029 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)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 1041
1032 if (!ignoreparent) 1042 if (!ignoreparent)
1033 { 1043 {
1034#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1035 /* 1045 /*
… …
1039 int x, y, x1, y1; 1049 int x, y, x1, y1;
1040 int dx, dy; 1050 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1052 Window unused_cr;
1043 1053
1044 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1058 /*
1049 * 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
1050 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1051 */ 1061 */
… …
1053 { 1063 {
1054 x -= x1; 1064 x -= x1;
1055 y -= y1; 1065 y -= y1;
1056 } 1066 }
1057 1067
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1062 1072
1063 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1069 dy = 0; 1079 dy = 0;
1070 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1071 dy /= 2; 1081 dy /= 2;
1072 1082
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1075#else 1085#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 1087#endif
1078 } 1088 }
1079 1089
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1091
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1093 {
1084 if (scrollBar.state) 1094 if (scrollBar.state)
1085 { 1095 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1087 window_sb_x, 0, 1097 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1099 resize_scrollbar ();
1090 } 1100 }
1091 1101
1092 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1094 width, height); 1104 width, height);
1095 1105
1096 scr_clear (); 1106 scr_clear ();
1097#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1100 } 1110 }
1101 1111
1102 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1103 scr_reset (); 1113 scr_reset ();
1104 1114
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1117
1105#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1106 if (pixmap) 1119 if (pixmap)
1107 scr_touch (false); 1120 scr_touch (false);
1108#endif 1121#endif
1109 1122
1110#ifdef USE_XIM 1123#ifdef USE_XIM
1111 IMSetStatusPosition (); 1124 IMSetPosition ();
1112#endif 1125#endif
1113} 1126}
1114 1127
1115/* 1128/*
1116 * 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.
… …
1121{ 1134{
1122 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1123 1136
1124 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1125 { 1138 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1140
1128 if (newwidth == 0) 1141 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1143 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1158#ifdef USE_XIM
1146 1159
1147void 1160void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1162{
1150 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1152} 1165}
1153 1166
1154void 1167void
1155rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1156{ 1169{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1207
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1209 *p = '\0';
1197 1210
1198 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1200 1213
1201 if (win != None) 1214 if (win != None)
1202 return True; 1215 return True;
1203 } 1216 }
1204 1217
… …
1211 XPoint nspot; 1224 XPoint nspot;
1212 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1213 1226
1214 if (!Input_Context 1227 if (!Input_Context
1215 || !focus 1228 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1230 return;
1218 1231
1219 im_set_position (nspot); 1232 im_set_position (nspot);
1220 1233
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1428 "*", 1441 "*",
1429 fheight, 1442 fheight,
1430 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1432 1445
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1435 1448
1436 if (missing_charset_list) 1449 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1438 1451
… …
1479 XNBackground, bg, 1492 XNBackground, bg,
1480 XNArea, &status_rect, 1493 XNArea, &status_rect,
1481 XNFontSet, fs, 1494 XNFontSet, fs,
1482 NULL); 1495 NULL);
1483 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1498 else if (input_style & XIMPreeditCallbacks)
1485 { 1499 {
1500 im_set_position (spot);
1501
1486 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1487 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1488 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1489#if 0 1505# if 0
1490 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1491#endif 1507# endif
1492 1508
1493 preedit_attr = XVaCreateNestedList (0, 1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1494 XNPreeditStartCallback, &xcb[0], 1511 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1], 1512 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2], 1513 XNPreeditDrawCallback , &xcb[2],
1497#if 0 1514# if 0
1498 XNPreeditCaretCallback, &xcb[3], 1515 XNPreeditCaretCallback, &xcb[3],
1499#endif 1516# endif
1500 NULL); 1517 NULL);
1501 } 1518 }
1519#endif
1502 1520
1503 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1504 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1505 XNClientWindow, vt, 1523 XNClientWindow, vt,
1506 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1508 preedit_attr, 1526 preedit_attr,
1509 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1510 status_attr, NULL); 1528 status_attr, NULL);
1511 1529
1512 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1513 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1514 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1515 1533
1516 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1517 { 1535 {
1518 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1519 im_destroy (); 1537 im_destroy ();
… …
1524 // unfortunately, only the focus window is used by XIM, hard to fix 1542 // unfortunately, only the focus window is used by XIM, hard to fix
1525 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1526 vt_select_input (); 1544 vt_select_input ();
1527#endif 1545#endif
1528 1546
1529 if (input_style & XIMPreeditArea)
1530 IMSetStatusPosition (); 1547 IMSetPosition ();
1531 1548
1532 return true; 1549 return true;
1533} 1550}
1534 1551
1535void 1552void
… …
1593 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1594#endif 1611#endif
1595} 1612}
1596 1613
1597void 1614void
1598rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1599{ 1616{
1600 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1601 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1602 1619
1603 if (!Input_Context 1620 if (!Input_Context
1604 || !focus 1621 || !focus
1605 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1606 || !IMisRunning ()) 1623 || !IMisRunning ())
1607 return; 1624 return;
1608 1625
1609 /* Getting the necessary width of preedit area */ 1626 /* Getting the necessary width of preedit area */
1610 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
… …
1613 1630
1614 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1615 XFree (needed_rect); 1632 XFree (needed_rect);
1616 1633
1617 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1618 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1619 1636
1620 XSetICValues (Input_Context, 1637 XSetICValues (Input_Context,
1621 XNPreeditAttributes, preedit_attr, 1638 XNPreeditAttributes, preedit_attr,
1622 XNStatusAttributes, status_attr, NULL); 1639 XNStatusAttributes, status_attr,
1640 NULL);
1623 1641
1624 XFree (preedit_attr); 1642 XFree (preedit_attr);
1625 XFree (status_attr); 1643 XFree (status_attr);
1626} 1644}
1627#endif /* USE_XIM */ 1645#endif /* USE_XIM */

Diff Legend

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