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