… | |
… | |
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 |
… | |
… | |
368 | { |
368 | { |
369 | 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++) |
370 | (*t)->emergency_cleanup (); |
370 | (*t)->emergency_cleanup (); |
371 | } |
371 | } |
372 | |
372 | |
373 | #if ENABLE_FRILLS |
373 | #if !ENABLE_MINIMAL |
374 | static void |
374 | static void |
375 | print_x_error (Display *dpy, XErrorEvent *event) |
375 | print_x_error (Display *dpy, XErrorEvent *event) |
376 | { |
376 | { |
377 | char buffer[BUFSIZ]; |
377 | char buffer[BUFSIZ]; |
378 | char mesg[BUFSIZ]; |
378 | char mesg[BUFSIZ]; |
… | |
… | |
426 | GET_R->allowedxerror = event->error_code; |
426 | GET_R->allowedxerror = event->error_code; |
427 | else |
427 | else |
428 | { |
428 | { |
429 | // 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, |
430 | // so just output the error and continue |
430 | // so just output the error and continue |
431 | #if ENABLE_FRILLS |
431 | #if ENABLE_MINIMAL |
|
|
432 | old_xerror_handler (display, event); |
|
|
433 | #else |
432 | print_x_error (display, event); |
434 | print_x_error (display, event); |
433 | #else |
|
|
434 | old_xerror_handler (display, event); |
|
|
435 | #endif |
435 | #endif |
436 | } |
436 | } |
437 | |
437 | |
438 | return 0; |
438 | return 0; |
439 | } |
439 | } |
… | |
… | |
475 | |
475 | |
476 | pty = ptytty::create (); |
476 | pty = ptytty::create (); |
477 | |
477 | |
478 | create_windows (argc, argv); |
478 | create_windows (argc, argv); |
479 | |
479 | |
480 | dDisp; |
|
|
481 | |
|
|
482 | init_xlocale (); |
480 | init_xlocale (); |
483 | |
481 | |
484 | scr_reset (); // initialize screen |
482 | scr_reset (); // initialize screen |
485 | |
483 | |
486 | #if 0 |
484 | #if 0 |
487 | XSynchronize (disp, True); |
485 | XSynchronize (xdisp, True); |
488 | #endif |
486 | #endif |
489 | |
487 | |
490 | #ifdef HAVE_SCROLLBARS |
488 | #ifdef HAVE_SCROLLBARS |
491 | if (OPTION (Opt_scrollBar)) |
489 | if (OPTION (Opt_scrollBar)) |
492 | resize_scrollbar (); /* create and map scrollbar */ |
490 | resize_scrollbar (); /* create and map scrollbar */ |
493 | #endif |
491 | #endif |
494 | #ifdef TRANSPARENT |
492 | #ifdef TRANSPARENT |
495 | if (OPTION (Opt_transparent)) |
493 | if (OPTION (Opt_transparent)) |
496 | { |
494 | { |
497 | XSelectInput (disp, display->root, PropertyChangeMask); |
495 | XSelectInput (xdisp, display->root, PropertyChangeMask); |
498 | check_our_parents (); |
496 | check_our_parents (); |
499 | rootwin_ev.start (display, display->root); |
497 | rootwin_ev.start (display, display->root); |
500 | } |
498 | } |
501 | #endif |
499 | #endif |
502 | |
500 | |
… | |
… | |
516 | #if ENABLE_XEMBED |
514 | #if ENABLE_XEMBED |
517 | if (rs[Rs_embed]) |
515 | if (rs[Rs_embed]) |
518 | { |
516 | { |
519 | long info[2] = { 0, XEMBED_MAPPED }; |
517 | long info[2] = { 0, XEMBED_MAPPED }; |
520 | |
518 | |
521 | XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
519 | XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
522 | 32, PropModeReplace, (unsigned char *)&info, 2); |
520 | 32, PropModeReplace, (unsigned char *)&info, 2); |
523 | } |
521 | } |
524 | #endif |
522 | #endif |
525 | |
523 | |
526 | XMapWindow (disp, vt); |
524 | XMapWindow (xdisp, vt); |
527 | XMapWindow (disp, parent[0]); |
525 | XMapWindow (xdisp, parent[0]); |
528 | |
526 | |
529 | return true; |
527 | return true; |
530 | } |
528 | } |
531 | |
529 | |
532 | static struct sig_handlers |
530 | static struct sig_handlers |
… | |
… | |
622 | { |
620 | { |
623 | short recalc_x, recalc_y; |
621 | short recalc_x, recalc_y; |
624 | int x, y, sb_w, flags; |
622 | int x, y, sb_w, flags; |
625 | unsigned int w, h; |
623 | unsigned int w, h; |
626 | unsigned int max_width, max_height; |
624 | unsigned int max_width, max_height; |
627 | dDisp; |
|
|
628 | |
625 | |
629 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
626 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
630 | szHint.win_gravity = NorthWestGravity; |
627 | szHint.win_gravity = NorthWestGravity; |
631 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
628 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
632 | |
629 | |
… | |
… | |
694 | |
691 | |
695 | if (scrollBar.state) |
692 | if (scrollBar.state) |
696 | { |
693 | { |
697 | sb_w = scrollbar_TotalWidth (); |
694 | sb_w = scrollbar_TotalWidth (); |
698 | szHint.base_width += sb_w; |
695 | szHint.base_width += sb_w; |
|
|
696 | |
699 | if (!OPTION (Opt_scrollBar_right)) |
697 | if (!OPTION (Opt_scrollBar_right)) |
700 | window_vt_x += sb_w; |
698 | window_vt_x += sb_w; |
701 | } |
699 | } |
702 | |
700 | |
703 | szHint.width_inc = fwidth; |
701 | szHint.width_inc = fwidth; |
… | |
… | |
729 | |
727 | |
730 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
728 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
731 | window_sb_x = szHint.width - sb_w; |
729 | window_sb_x = szHint.width - sb_w; |
732 | |
730 | |
733 | if (recalc_x) |
731 | if (recalc_x) |
734 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
732 | szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; |
|
|
733 | |
735 | if (recalc_y) |
734 | if (recalc_y) |
736 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
735 | szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; |
737 | |
736 | |
738 | ncol = width / fwidth; |
737 | ncol = width / fwidth; |
739 | nrow = height / fheight; |
738 | nrow = height / fheight; |
740 | } |
739 | } |
741 | |
740 | |
… | |
… | |
844 | return true; |
843 | return true; |
845 | } |
844 | } |
846 | |
845 | |
847 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
846 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
848 | { |
847 | { |
849 | XChangeProperty (display->display, parent[0], |
848 | XChangeProperty (xdisp, parent[0], |
850 | prop, XA_STRING, 8, PropModeReplace, |
849 | prop, XA_STRING, 8, PropModeReplace, |
851 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
850 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
852 | } |
851 | } |
853 | |
852 | |
854 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
853 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
855 | { |
854 | { |
856 | wchar_t *ws = rxvt_mbstowcs (str, len); |
855 | wchar_t *ws = rxvt_mbstowcs (str, len); |
857 | char *s = rxvt_wcstoutf8 (ws); |
856 | char *s = rxvt_wcstoutf8 (ws); |
858 | |
857 | |
859 | XChangeProperty (display->display, parent[0], |
858 | XChangeProperty (xdisp, parent[0], |
860 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
859 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
861 | (const unsigned char *)s, strlen (s)); |
860 | (const unsigned char *)s, strlen (s)); |
862 | |
861 | |
863 | free (s); |
862 | free (s); |
864 | free (ws); |
863 | free (ws); |
… | |
… | |
889 | void |
888 | void |
890 | rxvt_term::set_window_color (int idx, const char *color) |
889 | rxvt_term::set_window_color (int idx, const char *color) |
891 | { |
890 | { |
892 | rxvt_color xcol; |
891 | rxvt_color xcol; |
893 | int i; |
892 | int i; |
894 | |
893 | |
895 | if (color == NULL || *color == '\0') |
894 | if (color == NULL || *color == '\0') |
896 | return; |
895 | return; |
|
|
896 | |
|
|
897 | color = strdup (color); |
|
|
898 | allocated.push_back ((void *)color); |
|
|
899 | rs[Rs_color + idx] = color; |
897 | |
900 | |
898 | /* handle color aliases */ |
901 | /* handle color aliases */ |
899 | if (isdigit (*color)) |
902 | if (isdigit (*color)) |
900 | { |
903 | { |
901 | i = atoi (color); |
904 | i = atoi (color); |
902 | |
905 | |
903 | if (i >= 8 && i <= 15) |
906 | if (i >= 8 && i <= 15) |
904 | { /* bright colors */ |
907 | { /* bright colors */ |
905 | i -= 8; |
908 | i -= 8; |
906 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
909 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
907 | SET_PIXCOLOR (idx); |
|
|
908 | goto done; |
910 | goto done; |
909 | } |
911 | } |
910 | |
912 | |
911 | if (i >= 0 && i <= 7) |
913 | if (i >= 0 && i <= 7) |
912 | { /* normal colors */ |
914 | { /* normal colors */ |
913 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
915 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
914 | SET_PIXCOLOR (idx); |
|
|
915 | goto done; |
916 | goto done; |
916 | } |
917 | } |
917 | } |
918 | } |
918 | |
919 | |
919 | if (!rXParseAllocColor (&xcol, color)) |
920 | set_color (xcol, color); |
920 | return; |
|
|
921 | |
|
|
922 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
|
|
923 | |
921 | |
924 | /* |
922 | /* |
925 | * 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, |
926 | * so just keep gobbling up the colormap |
924 | * so just keep gobbling up the colormap |
927 | */ |
925 | */ |
928 | # if 0 |
|
|
929 | for (i = Color_Black; i <= Color_White; i++) |
|
|
930 | if (pix_colors[idx] == pix_colors[i]) |
|
|
931 | break; |
|
|
932 | if (i > Color_White) |
|
|
933 | { |
|
|
934 | /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ |
|
|
935 | XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, |
|
|
936 | DisplayPlanes (display->display, display->screen)); |
|
|
937 | } |
|
|
938 | # endif |
|
|
939 | |
926 | |
940 | pix_colors_focused[idx] = xcol; |
927 | pix_colors_focused[idx] = xcol; |
941 | SET_PIXCOLOR (idx); |
|
|
942 | |
928 | |
943 | /* XSetWindowAttributes attr; */ |
929 | /* XSetWindowAttributes attr; */ |
944 | /* Cursor cursor; */ |
930 | /* Cursor cursor; */ |
945 | done: |
931 | done: |
946 | |
932 | |
947 | #if OFF_FOCUS_FADING |
933 | #if OFF_FOCUS_FADING |
948 | if (rs[Rs_fade]) |
934 | if (rs[Rs_fade]) |
949 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
935 | { |
|
|
936 | rgba c; |
|
|
937 | pix_colors [Color_fade].get (this, c); |
|
|
938 | pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); |
|
|
939 | } |
950 | #endif |
940 | #endif |
951 | |
941 | |
952 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
942 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
953 | |
943 | |
954 | recolour_cursor (); |
944 | recolour_cursor (); |
… | |
… | |
969 | : pix_colors_focused[Color_fg]; |
959 | : pix_colors_focused[Color_fg]; |
970 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
960 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
971 | ? pix_colors_focused[Color_pointer_bg] |
961 | ? pix_colors_focused[Color_pointer_bg] |
972 | : pix_colors_focused[Color_bg]; |
962 | : pix_colors_focused[Color_bg]; |
973 | |
963 | |
974 | XQueryColors (display->display, display->cmap, xcol, 2); |
964 | XQueryColors (xdisp, cmap, xcol, 2); |
975 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
965 | XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); |
976 | } |
966 | } |
977 | |
967 | |
978 | /*----------------------------------------------------------------------*/ |
968 | /*----------------------------------------------------------------------*/ |
979 | /* |
969 | /* |
980 | * find if fg/bg matches any of the normal (low-intensity) colors |
970 | * find if fg/bg matches any of the normal (low-intensity) colors |
… | |
… | |
1008 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
998 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
1009 | } |
999 | } |
1010 | |
1000 | |
1011 | /*----------------------------------------------------------------------*/ |
1001 | /*----------------------------------------------------------------------*/ |
1012 | |
1002 | |
1013 | int |
1003 | bool |
1014 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1004 | rxvt_term::set_color (rxvt_color &color, const char *name) |
1015 | { |
1005 | { |
1016 | if (!screen_in_out->set (display, colour)) |
1006 | if (color.set (this, name)) |
1017 | { |
|
|
1018 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
|
|
1019 | return false; |
|
|
1020 | } |
|
|
1021 | |
|
|
1022 | return true; |
1007 | return true; |
|
|
1008 | |
|
|
1009 | rxvt_warn ("can't get colour '%s', continuing without.\n", name); |
|
|
1010 | return false; |
1023 | } |
1011 | } |
1024 | |
1012 | |
1025 | /* -------------------------------------------------------------------- * |
1013 | /* -------------------------------------------------------------------- * |
1026 | * - WINDOW RESIZING - * |
1014 | * - WINDOW RESIZING - * |
1027 | * -------------------------------------------------------------------- */ |
1015 | * -------------------------------------------------------------------- */ |
… | |
… | |
1029 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1017 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1030 | { |
1018 | { |
1031 | int fix_screen; |
1019 | int fix_screen; |
1032 | int old_width = szHint.width; |
1020 | int old_width = szHint.width; |
1033 | int old_height = szHint.height; |
1021 | int old_height = szHint.height; |
1034 | dDisp; |
|
|
1035 | |
1022 | |
1036 | window_calc (newwidth, newheight); |
1023 | window_calc (newwidth, newheight); |
1037 | XSetWMNormalHints (disp, parent[0], &szHint); |
1024 | XSetWMNormalHints (xdisp, parent[0], &szHint); |
1038 | |
1025 | |
1039 | if (!ignoreparent) |
1026 | if (!ignoreparent) |
1040 | { |
1027 | { |
1041 | #ifdef SMART_RESIZE |
1028 | #ifdef SMART_RESIZE |
1042 | /* |
1029 | /* |
… | |
… | |
1046 | int x, y, x1, y1; |
1033 | int x, y, x1, y1; |
1047 | int dx, dy; |
1034 | int dx, dy; |
1048 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1035 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1049 | Window unused_cr; |
1036 | Window unused_cr; |
1050 | |
1037 | |
1051 | XTranslateCoordinates (disp, parent[0], display->root, |
1038 | XTranslateCoordinates (xdisp, parent[0], display->root, |
1052 | 0, 0, &x, &y, &unused_cr); |
1039 | 0, 0, &x, &y, &unused_cr); |
1053 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1040 | XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, |
1054 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1041 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1055 | /* |
1042 | /* |
1056 | * if display->root isn't the parent window, a WM will probably have offset |
1043 | * if display->root isn't the parent window, a WM will probably have offset |
1057 | * our position for handles and decorations. Counter it |
1044 | * our position for handles and decorations. Counter it |
1058 | */ |
1045 | */ |
… | |
… | |
1060 | { |
1047 | { |
1061 | x -= x1; |
1048 | x -= x1; |
1062 | y -= y1; |
1049 | y -= y1; |
1063 | } |
1050 | } |
1064 | |
1051 | |
1065 | x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; |
1052 | x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; |
1066 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1053 | y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; |
1067 | dx = old_width - szHint.width; |
1054 | dx = old_width - szHint.width; |
1068 | dy = old_height - szHint.height; |
1055 | dy = old_height - szHint.height; |
1069 | |
1056 | |
1070 | /* Check position of the center of the window */ |
1057 | /* Check position of the center of the window */ |
1071 | if (x < x1) /* left half */ |
1058 | if (x < x1) /* left half */ |
… | |
… | |
1075 | if (y < y1) /* top half */ |
1062 | if (y < y1) /* top half */ |
1076 | dy = 0; |
1063 | dy = 0; |
1077 | else if (y == y1) /* exact center */ |
1064 | else if (y == y1) /* exact center */ |
1078 | dy /= 2; |
1065 | dy /= 2; |
1079 | |
1066 | |
1080 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1067 | XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, |
1081 | szHint.width, szHint.height); |
1068 | szHint.width, szHint.height); |
1082 | #else |
1069 | #else |
1083 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1070 | XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); |
1084 | #endif |
1071 | #endif |
1085 | } |
1072 | } |
1086 | |
1073 | |
1087 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1074 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1088 | |
1075 | |
1089 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1076 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1090 | { |
1077 | { |
1091 | if (scrollBar.state) |
1078 | if (scrollBar.state) |
1092 | { |
1079 | { |
1093 | XMoveResizeWindow (disp, scrollBar.win, |
1080 | XMoveResizeWindow (xdisp, scrollBar.win, |
1094 | window_sb_x, 0, |
1081 | window_sb_x, 0, |
1095 | scrollbar_TotalWidth (), szHint.height); |
1082 | scrollbar_TotalWidth (), szHint.height); |
1096 | resize_scrollbar (); |
1083 | resize_scrollbar (); |
1097 | } |
1084 | } |
1098 | |
1085 | |
1099 | XMoveResizeWindow (disp, vt, |
1086 | XMoveResizeWindow (xdisp, vt, |
1100 | window_vt_x, window_vt_y, |
1087 | window_vt_x, window_vt_y, |
1101 | width, height); |
1088 | width, height); |
1102 | |
1089 | |
1103 | scr_clear (); |
1090 | scr_clear (); |
1104 | #ifdef XPM_BACKGROUND |
1091 | #ifdef XPM_BACKGROUND |
… | |
… | |
1128 | { |
1115 | { |
1129 | XWindowAttributes wattr; |
1116 | XWindowAttributes wattr; |
1130 | |
1117 | |
1131 | if (newwidth == 0 || newheight == 0) |
1118 | if (newwidth == 0 || newheight == 0) |
1132 | { |
1119 | { |
1133 | XGetWindowAttributes (display->display, display->root, &wattr); |
1120 | XGetWindowAttributes (xdisp, display->root, &wattr); |
1134 | |
1121 | |
1135 | if (newwidth == 0) |
1122 | if (newwidth == 0) |
1136 | newwidth = wattr.width - szHint.base_width; |
1123 | newwidth = wattr.width - szHint.base_width; |
1137 | if (newheight == 0) |
1124 | if (newheight == 0) |
1138 | newheight = wattr.height - szHint.base_height; |
1125 | newheight = wattr.height - szHint.base_height; |
… | |
… | |
1200 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1187 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1201 | |
1188 | |
1202 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1189 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1203 | *p = '\0'; |
1190 | *p = '\0'; |
1204 | |
1191 | |
1205 | atom = XInternAtom (display->display, server, False); |
1192 | atom = XInternAtom (xdisp, server, False); |
1206 | win = XGetSelectionOwner (display->display, atom); |
1193 | win = XGetSelectionOwner (xdisp, atom); |
1207 | |
1194 | |
1208 | if (win != None) |
1195 | if (win != None) |
1209 | return True; |
1196 | return True; |
1210 | } |
1197 | } |
1211 | |
1198 | |
… | |
… | |
1435 | "*", |
1422 | "*", |
1436 | fheight, |
1423 | fheight, |
1437 | fheight + 1, fheight - 1, |
1424 | fheight + 1, fheight - 1, |
1438 | fheight - 2, fheight + 2); |
1425 | fheight - 2, fheight + 2); |
1439 | |
1426 | |
1440 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1427 | fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1441 | &missing_charset_list, &missing_charset_count, &def_string); |
1428 | &missing_charset_list, &missing_charset_count, &def_string); |
1442 | |
1429 | |
1443 | if (missing_charset_list) |
1430 | if (missing_charset_list) |
1444 | XFreeStringList (missing_charset_list); |
1431 | XFreeStringList (missing_charset_list); |
1445 | |
1432 | |
… | |
… | |
1486 | XNBackground, bg, |
1473 | XNBackground, bg, |
1487 | XNArea, &status_rect, |
1474 | XNArea, &status_rect, |
1488 | XNFontSet, fs, |
1475 | XNFontSet, fs, |
1489 | NULL); |
1476 | NULL); |
1490 | } |
1477 | } |
|
|
1478 | #if ENABLE_XIM_ONTHESPOT |
1491 | else if (input_style & XIMPreeditCallbacks) |
1479 | else if (input_style & XIMPreeditCallbacks) |
1492 | { |
1480 | { |
1493 | im_set_position (spot); |
1481 | im_set_position (spot); |
1494 | |
1482 | |
1495 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
1483 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
1496 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
1484 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
1497 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
1485 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
1498 | #if 0 |
1486 | # if 0 |
1499 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
1487 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
1500 | #endif |
1488 | # endif |
1501 | |
1489 | |
1502 | preedit_attr = XVaCreateNestedList (0, |
1490 | preedit_attr = XVaCreateNestedList (0, |
1503 | XNSpotLocation, &spot, |
1491 | XNSpotLocation, &spot, |
1504 | XNPreeditStartCallback, &xcb[0], |
1492 | XNPreeditStartCallback, &xcb[0], |
1505 | XNPreeditDoneCallback , &xcb[1], |
1493 | XNPreeditDoneCallback , &xcb[1], |
1506 | XNPreeditDrawCallback , &xcb[2], |
1494 | XNPreeditDrawCallback , &xcb[2], |
1507 | #if 0 |
1495 | # if 0 |
1508 | XNPreeditCaretCallback, &xcb[3], |
1496 | XNPreeditCaretCallback, &xcb[3], |
1509 | #endif |
1497 | # endif |
1510 | NULL); |
1498 | NULL); |
1511 | } |
1499 | } |
|
|
1500 | #endif |
1512 | |
1501 | |
1513 | Input_Context = XCreateIC (xim, |
1502 | Input_Context = XCreateIC (xim, |
1514 | XNInputStyle, input_style, |
1503 | XNInputStyle, input_style, |
1515 | XNClientWindow, vt, |
1504 | XNClientWindow, vt, |
1516 | XNFocusWindow, parent[0], |
1505 | XNFocusWindow, parent[0], |
… | |
… | |
1519 | status_attr ? XNStatusAttributes : NULL, |
1508 | status_attr ? XNStatusAttributes : NULL, |
1520 | status_attr, NULL); |
1509 | status_attr, NULL); |
1521 | |
1510 | |
1522 | if (preedit_attr) XFree (preedit_attr); |
1511 | if (preedit_attr) XFree (preedit_attr); |
1523 | if (status_attr) XFree (status_attr); |
1512 | if (status_attr) XFree (status_attr); |
1524 | if (fs) XFreeFontSet (display->display, fs); |
1513 | if (fs) XFreeFontSet (xdisp, fs); |
1525 | |
1514 | |
1526 | if (Input_Context == NULL) |
1515 | if (Input_Context == NULL) |
1527 | { |
1516 | { |
1528 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1517 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1529 | im_destroy (); |
1518 | im_destroy (); |