1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: main.C |
2 | * File: main.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
… | |
… | |
198 | void rxvt_term::emergency_cleanup () |
198 | void rxvt_term::emergency_cleanup () |
199 | { |
199 | { |
200 | if (cmd_pid) |
200 | if (cmd_pid) |
201 | kill (-cmd_pid, SIGHUP); |
201 | kill (-cmd_pid, SIGHUP); |
202 | |
202 | |
|
|
203 | pty_ev.stop (); |
203 | delete pty; pty = 0; |
204 | delete pty; pty = 0; |
204 | } |
205 | } |
205 | |
206 | |
206 | rxvt_term::~rxvt_term () |
207 | rxvt_term::~rxvt_term () |
207 | { |
208 | { |
… | |
… | |
222 | |
223 | |
223 | #ifdef USE_XIM |
224 | #ifdef USE_XIM |
224 | im_destroy (); |
225 | im_destroy (); |
225 | #endif |
226 | #endif |
226 | #ifdef XTERM_SCROLLBAR |
227 | #ifdef XTERM_SCROLLBAR |
227 | if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); |
228 | if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); |
228 | if (ShadowGC) XFreeGC (xdisp, ShadowGC); |
229 | if (ShadowGC) XFreeGC (dpy, ShadowGC); |
229 | #endif |
230 | #endif |
230 | #ifdef PLAIN_SCROLLBAR |
231 | #ifdef PLAIN_SCROLLBAR |
231 | if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); |
232 | if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); |
232 | #endif |
233 | #endif |
233 | #ifdef NEXT_SCROLLBAR |
234 | #ifdef NEXT_SCROLLBAR |
234 | if (blackGC) XFreeGC (xdisp, blackGC); |
235 | if (blackGC) XFreeGC (dpy, blackGC); |
235 | if (whiteGC) XFreeGC (xdisp, whiteGC); |
236 | if (whiteGC) XFreeGC (dpy, whiteGC); |
236 | if (grayGC) XFreeGC (xdisp, grayGC); |
237 | if (grayGC) XFreeGC (dpy, grayGC); |
237 | if (darkGC) XFreeGC (xdisp, darkGC); |
238 | if (darkGC) XFreeGC (dpy, darkGC); |
238 | if (stippleGC) XFreeGC (xdisp, stippleGC); |
239 | if (stippleGC) XFreeGC (dpy, stippleGC); |
239 | if (dimple) XFreePixmap (xdisp, dimple); |
240 | if (dimple) XFreePixmap (dpy, dimple); |
240 | if (upArrow) XFreePixmap (xdisp, upArrow); |
241 | if (upArrow) XFreePixmap (dpy, upArrow); |
241 | if (downArrow) XFreePixmap (xdisp, downArrow); |
242 | if (downArrow) XFreePixmap (dpy, downArrow); |
242 | if (upArrowHi) XFreePixmap (xdisp, upArrowHi); |
243 | if (upArrowHi) XFreePixmap (dpy, upArrowHi); |
243 | if (downArrowHi) XFreePixmap (xdisp, downArrowHi); |
244 | if (downArrowHi) XFreePixmap (dpy, downArrowHi); |
244 | #endif |
245 | #endif |
245 | #ifdef RXVT_SCROLLBAR |
246 | #ifdef RXVT_SCROLLBAR |
246 | if (topShadowGC) XFreeGC (xdisp, topShadowGC); |
247 | if (topShadowGC) XFreeGC (dpy, topShadowGC); |
247 | if (botShadowGC) XFreeGC (xdisp, botShadowGC); |
248 | if (botShadowGC) XFreeGC (dpy, botShadowGC); |
248 | if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); |
249 | if (scrollbarGC) XFreeGC (dpy, scrollbarGC); |
249 | #endif |
250 | #endif |
250 | if (gc) XFreeGC (xdisp, gc); |
251 | if (gc) XFreeGC (dpy, gc); |
251 | |
252 | |
252 | delete drawable; |
253 | delete drawable; |
253 | // destroy all windows |
254 | // destroy all windows |
254 | if (parent[0]) |
255 | if (parent[0]) |
255 | XDestroyWindow (xdisp, parent[0]); |
256 | XDestroyWindow (dpy, parent[0]); |
|
|
257 | |
|
|
258 | for (int i = 0; i < TOTAL_COLORS; i++) |
|
|
259 | if (ISSET_PIXCOLOR (i)) |
|
|
260 | { |
|
|
261 | pix_colors_focused [i].free (this); |
|
|
262 | #if OFF_FOCUS_FADING |
|
|
263 | pix_colors_unfocused [i].free (this); |
|
|
264 | #endif |
|
|
265 | } |
256 | |
266 | |
257 | clear (); |
267 | clear (); |
258 | } |
268 | } |
259 | |
269 | |
260 | // TODO: free pixcolours, colours should become part of rxvt_display |
|
|
261 | delete pix_colors_focused; |
270 | delete pix_colors_focused; |
262 | #if OFF_FOCUS_FADING |
271 | #if OFF_FOCUS_FADING |
263 | delete pix_colors_unfocused; |
272 | delete pix_colors_unfocused; |
264 | #endif |
273 | #endif |
265 | |
274 | |
… | |
… | |
480 | init_xlocale (); |
489 | init_xlocale (); |
481 | |
490 | |
482 | scr_reset (); // initialize screen |
491 | scr_reset (); // initialize screen |
483 | |
492 | |
484 | #if 0 |
493 | #if 0 |
485 | XSynchronize (xdisp, True); |
494 | XSynchronize (dpy, True); |
486 | #endif |
495 | #endif |
487 | |
496 | |
488 | #ifdef HAVE_SCROLLBARS |
497 | #ifdef HAVE_SCROLLBARS |
489 | if (OPTION (Opt_scrollBar)) |
498 | if (OPTION (Opt_scrollBar)) |
490 | resize_scrollbar (); /* create and map scrollbar */ |
499 | resize_scrollbar (); /* create and map scrollbar */ |
491 | #endif |
500 | #endif |
492 | #ifdef TRANSPARENT |
501 | #ifdef TRANSPARENT |
493 | if (OPTION (Opt_transparent)) |
502 | if (OPTION (Opt_transparent)) |
494 | { |
503 | { |
495 | XSelectInput (xdisp, display->root, PropertyChangeMask); |
504 | XSelectInput (dpy, display->root, PropertyChangeMask); |
496 | check_our_parents (); |
505 | check_our_parents (); |
497 | rootwin_ev.start (display, display->root); |
506 | rootwin_ev.start (display, display->root); |
498 | } |
507 | } |
499 | #endif |
508 | #endif |
500 | |
509 | |
… | |
… | |
514 | #if ENABLE_XEMBED |
523 | #if ENABLE_XEMBED |
515 | if (rs[Rs_embed]) |
524 | if (rs[Rs_embed]) |
516 | { |
525 | { |
517 | long info[2] = { 0, XEMBED_MAPPED }; |
526 | long info[2] = { 0, XEMBED_MAPPED }; |
518 | |
527 | |
519 | XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
528 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
520 | 32, PropModeReplace, (unsigned char *)&info, 2); |
529 | 32, PropModeReplace, (unsigned char *)&info, 2); |
521 | } |
530 | } |
522 | #endif |
531 | #endif |
523 | |
532 | |
524 | XMapWindow (xdisp, vt); |
533 | XMapWindow (dpy, vt); |
525 | XMapWindow (xdisp, parent[0]); |
534 | XMapWindow (dpy, parent[0]); |
526 | |
535 | |
527 | return true; |
536 | return true; |
528 | } |
537 | } |
529 | |
538 | |
530 | static struct sig_handlers |
539 | static struct sig_handlers |
… | |
… | |
691 | |
700 | |
692 | if (scrollBar.state) |
701 | if (scrollBar.state) |
693 | { |
702 | { |
694 | sb_w = scrollbar_TotalWidth (); |
703 | sb_w = scrollbar_TotalWidth (); |
695 | szHint.base_width += sb_w; |
704 | szHint.base_width += sb_w; |
|
|
705 | |
696 | if (!OPTION (Opt_scrollBar_right)) |
706 | if (!OPTION (Opt_scrollBar_right)) |
697 | window_vt_x += sb_w; |
707 | window_vt_x += sb_w; |
698 | } |
708 | } |
699 | |
709 | |
700 | szHint.width_inc = fwidth; |
710 | szHint.width_inc = fwidth; |
701 | szHint.height_inc = fheight; |
711 | szHint.height_inc = fheight; |
702 | szHint.min_width = szHint.base_width + szHint.width_inc; |
712 | szHint.min_width = szHint.base_width + szHint.width_inc; |
703 | szHint.min_height = szHint.base_height + szHint.height_inc; |
713 | szHint.min_height = szHint.base_height + szHint.height_inc; |
704 | |
714 | |
705 | if (newwidth && newwidth - szHint.base_width < max_width) |
715 | if (newwidth && newwidth - szHint.base_width < max_width) |
706 | { |
716 | { |
707 | szHint.width = newwidth; |
717 | szHint.width = newwidth; |
… | |
… | |
726 | |
736 | |
727 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
737 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
728 | window_sb_x = szHint.width - sb_w; |
738 | window_sb_x = szHint.width - sb_w; |
729 | |
739 | |
730 | if (recalc_x) |
740 | if (recalc_x) |
731 | szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; |
741 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
732 | |
742 | |
733 | if (recalc_y) |
743 | if (recalc_y) |
734 | szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; |
744 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
735 | |
745 | |
736 | ncol = width / fwidth; |
746 | ncol = width / fwidth; |
737 | nrow = height / fheight; |
747 | nrow = height / fheight; |
738 | } |
748 | } |
739 | |
749 | |
… | |
… | |
842 | return true; |
852 | return true; |
843 | } |
853 | } |
844 | |
854 | |
845 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
855 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
846 | { |
856 | { |
847 | XChangeProperty (xdisp, parent[0], |
857 | XChangeProperty (dpy, parent[0], |
848 | prop, XA_STRING, 8, PropModeReplace, |
858 | prop, XA_STRING, 8, PropModeReplace, |
849 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
859 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
850 | } |
860 | } |
851 | |
861 | |
852 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
862 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
853 | { |
863 | { |
854 | wchar_t *ws = rxvt_mbstowcs (str, len); |
864 | wchar_t *ws = rxvt_mbstowcs (str, len); |
855 | char *s = rxvt_wcstoutf8 (ws); |
865 | char *s = rxvt_wcstoutf8 (ws); |
856 | |
866 | |
857 | XChangeProperty (xdisp, parent[0], |
867 | XChangeProperty (dpy, parent[0], |
858 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
868 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
859 | (const unsigned char *)s, strlen (s)); |
869 | (const unsigned char *)s, strlen (s)); |
860 | |
870 | |
861 | free (s); |
871 | free (s); |
862 | free (ws); |
872 | free (ws); |
… | |
… | |
887 | void |
897 | void |
888 | rxvt_term::set_window_color (int idx, const char *color) |
898 | rxvt_term::set_window_color (int idx, const char *color) |
889 | { |
899 | { |
890 | rxvt_color xcol; |
900 | rxvt_color xcol; |
891 | int i; |
901 | int i; |
892 | |
902 | |
893 | if (color == NULL || *color == '\0') |
903 | if (color == NULL || *color == '\0') |
894 | return; |
904 | return; |
|
|
905 | |
|
|
906 | color = strdup (color); |
|
|
907 | allocated.push_back ((void *)color); |
|
|
908 | rs[Rs_color + idx] = color; |
895 | |
909 | |
896 | /* handle color aliases */ |
910 | /* handle color aliases */ |
897 | if (isdigit (*color)) |
911 | if (isdigit (*color)) |
898 | { |
912 | { |
899 | i = atoi (color); |
913 | i = atoi (color); |
900 | |
914 | |
901 | if (i >= 8 && i <= 15) |
915 | if (i >= 8 && i <= 15) |
902 | { /* bright colors */ |
916 | { /* bright colors */ |
903 | i -= 8; |
917 | i -= 8; |
904 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
918 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
905 | SET_PIXCOLOR (idx); |
|
|
906 | goto done; |
919 | goto done; |
907 | } |
920 | } |
908 | |
921 | |
909 | if (i >= 0 && i <= 7) |
922 | if (i >= 0 && i <= 7) |
910 | { /* normal colors */ |
923 | { /* normal colors */ |
911 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
924 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
912 | SET_PIXCOLOR (idx); |
|
|
913 | goto done; |
925 | goto done; |
914 | } |
926 | } |
915 | } |
927 | } |
916 | |
928 | |
917 | if (!set_color (xcol, color)) |
929 | set_color (xcol, color); |
918 | return; |
|
|
919 | |
|
|
920 | /* XStoreColor (xdisp, display->cmap, XColor*); */ |
|
|
921 | |
930 | |
922 | /* |
931 | /* |
923 | * FIXME: should free colors here, but no idea how to do it so instead, |
932 | * FIXME: should free colors here, but no idea how to do it so instead, |
924 | * so just keep gobbling up the colormap |
933 | * so just keep gobbling up the colormap |
925 | */ |
934 | */ |
926 | # if 0 |
|
|
927 | for (i = Color_Black; i <= Color_White; i++) |
|
|
928 | if (pix_colors[idx] == pix_colors[i]) |
|
|
929 | break; |
|
|
930 | if (i > Color_White) |
|
|
931 | { |
|
|
932 | /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ |
|
|
933 | XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1, |
|
|
934 | DisplayPlanes (xdisp, display->screen)); |
|
|
935 | } |
|
|
936 | # endif |
|
|
937 | |
935 | |
938 | pix_colors_focused[idx] = xcol; |
936 | pix_colors_focused[idx] = xcol; |
939 | SET_PIXCOLOR (idx); |
|
|
940 | |
937 | |
941 | /* XSetWindowAttributes attr; */ |
938 | /* XSetWindowAttributes attr; */ |
942 | /* Cursor cursor; */ |
939 | /* Cursor cursor; */ |
943 | done: |
940 | done: |
944 | |
941 | |
945 | #if OFF_FOCUS_FADING |
942 | #if OFF_FOCUS_FADING |
946 | if (rs[Rs_fade]) |
943 | if (rs[Rs_fade]) |
947 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
944 | { |
|
|
945 | rgba c; |
|
|
946 | pix_colors [Color_fade].get (c); |
|
|
947 | pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); |
|
|
948 | } |
948 | #endif |
949 | #endif |
949 | |
950 | |
950 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
951 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
951 | |
952 | |
952 | recolour_cursor (); |
953 | recolour_cursor (); |
… | |
… | |
958 | #endif /* XTERM_COLOR_CHANGE */ |
959 | #endif /* XTERM_COLOR_CHANGE */ |
959 | |
960 | |
960 | void |
961 | void |
961 | rxvt_term::recolour_cursor () |
962 | rxvt_term::recolour_cursor () |
962 | { |
963 | { |
963 | XColor xcol[2]; |
964 | XColor fg, bg; |
964 | |
965 | |
965 | xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) |
966 | (ISSET_PIXCOLOR (Color_pointer_fg) |
966 | ? pix_colors_focused[Color_pointer_fg] |
967 | ? pix_colors_focused[Color_pointer_fg] |
967 | : pix_colors_focused[Color_fg]; |
968 | : pix_colors_focused[Color_fg]).get (fg); |
|
|
969 | |
968 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
970 | (ISSET_PIXCOLOR (Color_pointer_bg) |
969 | ? pix_colors_focused[Color_pointer_bg] |
971 | ? pix_colors_focused[Color_pointer_bg] |
970 | : pix_colors_focused[Color_bg]; |
972 | : pix_colors_focused[Color_bg]).get (bg); |
971 | |
973 | |
972 | XQueryColors (xdisp, cmap, xcol, 2); |
|
|
973 | XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); |
974 | XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); |
974 | } |
975 | } |
975 | |
976 | |
976 | /*----------------------------------------------------------------------*/ |
977 | /*----------------------------------------------------------------------*/ |
977 | /* |
978 | /* |
978 | * find if fg/bg matches any of the normal (low-intensity) colors |
979 | * find if fg/bg matches any of the normal (low-intensity) colors |
… | |
… | |
1016 | |
1017 | |
1017 | rxvt_warn ("can't get colour '%s', continuing without.\n", name); |
1018 | rxvt_warn ("can't get colour '%s', continuing without.\n", name); |
1018 | return false; |
1019 | return false; |
1019 | } |
1020 | } |
1020 | |
1021 | |
|
|
1022 | void |
|
|
1023 | rxvt_term::alias_color (int dst, int src) |
|
|
1024 | { |
|
|
1025 | pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); |
|
|
1026 | } |
|
|
1027 | |
1021 | /* -------------------------------------------------------------------- * |
1028 | /* -------------------------------------------------------------------- * |
1022 | * - WINDOW RESIZING - * |
1029 | * - WINDOW RESIZING - * |
1023 | * -------------------------------------------------------------------- */ |
1030 | * -------------------------------------------------------------------- */ |
1024 | void |
1031 | void |
1025 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1032 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
… | |
… | |
1027 | int fix_screen; |
1034 | int fix_screen; |
1028 | int old_width = szHint.width; |
1035 | int old_width = szHint.width; |
1029 | int old_height = szHint.height; |
1036 | int old_height = szHint.height; |
1030 | |
1037 | |
1031 | window_calc (newwidth, newheight); |
1038 | window_calc (newwidth, newheight); |
|
|
1039 | |
|
|
1040 | if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) |
1032 | XSetWMNormalHints (xdisp, parent[0], &szHint); |
1041 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1033 | |
1042 | |
1034 | if (!ignoreparent) |
1043 | if (!ignoreparent) |
1035 | { |
1044 | { |
1036 | #ifdef SMART_RESIZE |
1045 | #ifdef SMART_RESIZE |
1037 | /* |
1046 | /* |
… | |
… | |
1041 | int x, y, x1, y1; |
1050 | int x, y, x1, y1; |
1042 | int dx, dy; |
1051 | int dx, dy; |
1043 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1052 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1044 | Window unused_cr; |
1053 | Window unused_cr; |
1045 | |
1054 | |
1046 | XTranslateCoordinates (xdisp, parent[0], display->root, |
1055 | XTranslateCoordinates (dpy, parent[0], display->root, |
1047 | 0, 0, &x, &y, &unused_cr); |
1056 | 0, 0, &x, &y, &unused_cr); |
1048 | XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, |
1057 | XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, |
1049 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1058 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1050 | /* |
1059 | /* |
1051 | * if display->root isn't the parent window, a WM will probably have offset |
1060 | * if display->root isn't the parent window, a WM will probably have offset |
1052 | * our position for handles and decorations. Counter it |
1061 | * our position for handles and decorations. Counter it |
1053 | */ |
1062 | */ |
… | |
… | |
1055 | { |
1064 | { |
1056 | x -= x1; |
1065 | x -= x1; |
1057 | y -= y1; |
1066 | y -= y1; |
1058 | } |
1067 | } |
1059 | |
1068 | |
1060 | x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; |
1069 | x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; |
1061 | y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; |
1070 | y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; |
1062 | dx = old_width - szHint.width; |
1071 | dx = old_width - szHint.width; |
1063 | dy = old_height - szHint.height; |
1072 | dy = old_height - szHint.height; |
1064 | |
1073 | |
1065 | /* Check position of the center of the window */ |
1074 | /* Check position of the center of the window */ |
1066 | if (x < x1) /* left half */ |
1075 | if (x < x1) /* left half */ |
… | |
… | |
1070 | if (y < y1) /* top half */ |
1079 | if (y < y1) /* top half */ |
1071 | dy = 0; |
1080 | dy = 0; |
1072 | else if (y == y1) /* exact center */ |
1081 | else if (y == y1) /* exact center */ |
1073 | dy /= 2; |
1082 | dy /= 2; |
1074 | |
1083 | |
1075 | XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, |
1084 | XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, |
1076 | szHint.width, szHint.height); |
1085 | szHint.width, szHint.height); |
1077 | #else |
1086 | #else |
1078 | XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); |
1087 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
1079 | #endif |
1088 | #endif |
1080 | } |
1089 | } |
1081 | |
1090 | |
1082 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1091 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1083 | |
1092 | |
1084 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1093 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1085 | { |
1094 | { |
1086 | if (scrollBar.state) |
1095 | if (scrollBar.state) |
1087 | { |
1096 | { |
1088 | XMoveResizeWindow (xdisp, scrollBar.win, |
1097 | XMoveResizeWindow (dpy, scrollBar.win, |
1089 | window_sb_x, 0, |
1098 | window_sb_x, 0, |
1090 | scrollbar_TotalWidth (), szHint.height); |
1099 | scrollbar_TotalWidth (), szHint.height); |
1091 | resize_scrollbar (); |
1100 | resize_scrollbar (); |
1092 | } |
1101 | } |
1093 | |
1102 | |
1094 | XMoveResizeWindow (xdisp, vt, |
1103 | XMoveResizeWindow (dpy, vt, |
1095 | window_vt_x, window_vt_y, |
1104 | window_vt_x, window_vt_y, |
1096 | width, height); |
1105 | width, height); |
1097 | |
1106 | |
1098 | scr_clear (); |
1107 | scr_clear (); |
1099 | #ifdef XPM_BACKGROUND |
1108 | #ifdef XPM_BACKGROUND |
… | |
… | |
1102 | } |
1111 | } |
1103 | |
1112 | |
1104 | if (fix_screen || old_height == 0) |
1113 | if (fix_screen || old_height == 0) |
1105 | scr_reset (); |
1114 | scr_reset (); |
1106 | |
1115 | |
|
|
1116 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
|
|
1117 | //scr_touch (false); |
|
|
1118 | |
1107 | #ifdef XPM_BACKGROUND |
1119 | #ifdef XPM_BACKGROUND |
1108 | if (pixmap) |
1120 | if (pixmap) |
1109 | scr_touch (false); |
1121 | scr_touch (false); |
1110 | #endif |
1122 | #endif |
1111 | |
1123 | |
1112 | #ifdef USE_XIM |
1124 | #ifdef USE_XIM |
1113 | IMSetStatusPosition (); |
1125 | IMSetPosition (); |
1114 | #endif |
1126 | #endif |
1115 | } |
1127 | } |
1116 | |
1128 | |
1117 | /* |
1129 | /* |
1118 | * Set the width/height of the vt window in characters. Units are pixels. |
1130 | * Set the width/height of the vt window in characters. Units are pixels. |
… | |
… | |
1123 | { |
1135 | { |
1124 | XWindowAttributes wattr; |
1136 | XWindowAttributes wattr; |
1125 | |
1137 | |
1126 | if (newwidth == 0 || newheight == 0) |
1138 | if (newwidth == 0 || newheight == 0) |
1127 | { |
1139 | { |
1128 | XGetWindowAttributes (xdisp, display->root, &wattr); |
1140 | XGetWindowAttributes (dpy, display->root, &wattr); |
1129 | |
1141 | |
1130 | if (newwidth == 0) |
1142 | if (newwidth == 0) |
1131 | newwidth = wattr.width - szHint.base_width; |
1143 | newwidth = wattr.width - szHint.base_width; |
1132 | if (newheight == 0) |
1144 | if (newheight == 0) |
1133 | newheight = wattr.height - szHint.base_height; |
1145 | newheight = wattr.height - szHint.base_height; |
… | |
… | |
1147 | #ifdef USE_XIM |
1159 | #ifdef USE_XIM |
1148 | |
1160 | |
1149 | void |
1161 | void |
1150 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1162 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1151 | { |
1163 | { |
1152 | fg = pix_colors[Color_fg]; |
1164 | fg = pix_colors [Color_fg]; |
1153 | bg = pix_colors[Color_bg]; |
1165 | bg = pix_colors [Color_bg]; |
1154 | } |
1166 | } |
1155 | |
1167 | |
1156 | void |
1168 | void |
1157 | rxvt_term::im_set_size (XRectangle &size) |
1169 | rxvt_term::im_set_size (XRectangle &size) |
1158 | { |
1170 | { |
… | |
… | |
1195 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1207 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1196 | |
1208 | |
1197 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1209 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1198 | *p = '\0'; |
1210 | *p = '\0'; |
1199 | |
1211 | |
1200 | atom = XInternAtom (xdisp, server, False); |
1212 | atom = XInternAtom (dpy, server, False); |
1201 | win = XGetSelectionOwner (xdisp, atom); |
1213 | win = XGetSelectionOwner (dpy, atom); |
1202 | |
1214 | |
1203 | if (win != None) |
1215 | if (win != None) |
1204 | return True; |
1216 | return True; |
1205 | } |
1217 | } |
1206 | |
1218 | |
… | |
… | |
1430 | "*", |
1442 | "*", |
1431 | fheight, |
1443 | fheight, |
1432 | fheight + 1, fheight - 1, |
1444 | fheight + 1, fheight - 1, |
1433 | fheight - 2, fheight + 2); |
1445 | fheight - 2, fheight + 2); |
1434 | |
1446 | |
1435 | fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1447 | fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1436 | &missing_charset_list, &missing_charset_count, &def_string); |
1448 | &missing_charset_list, &missing_charset_count, &def_string); |
1437 | |
1449 | |
1438 | if (missing_charset_list) |
1450 | if (missing_charset_list) |
1439 | XFreeStringList (missing_charset_list); |
1451 | XFreeStringList (missing_charset_list); |
1440 | |
1452 | |
… | |
… | |
1515 | preedit_attr, |
1527 | preedit_attr, |
1516 | status_attr ? XNStatusAttributes : NULL, |
1528 | status_attr ? XNStatusAttributes : NULL, |
1517 | status_attr, NULL); |
1529 | status_attr, NULL); |
1518 | |
1530 | |
1519 | if (preedit_attr) XFree (preedit_attr); |
1531 | if (preedit_attr) XFree (preedit_attr); |
1520 | if (status_attr) XFree (status_attr); |
1532 | if (status_attr) XFree (status_attr); |
1521 | if (fs) XFreeFontSet (xdisp, fs); |
1533 | if (fs) XFreeFontSet (dpy, fs); |
1522 | |
1534 | |
1523 | if (Input_Context == NULL) |
1535 | if (Input_Context == NULL) |
1524 | { |
1536 | { |
1525 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1537 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1526 | im_destroy (); |
1538 | im_destroy (); |
… | |
… | |
1531 | // unfortunately, only the focus window is used by XIM, hard to fix |
1543 | // unfortunately, only the focus window is used by XIM, hard to fix |
1532 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1544 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1533 | vt_select_input (); |
1545 | vt_select_input (); |
1534 | #endif |
1546 | #endif |
1535 | |
1547 | |
1536 | if (input_style & XIMPreeditArea) |
|
|
1537 | IMSetStatusPosition (); |
1548 | IMSetPosition (); |
1538 | |
1549 | |
1539 | return true; |
1550 | return true; |
1540 | } |
1551 | } |
1541 | |
1552 | |
1542 | void |
1553 | void |
… | |
… | |
1600 | SET_LOCALE (locale); |
1611 | SET_LOCALE (locale); |
1601 | #endif |
1612 | #endif |
1602 | } |
1613 | } |
1603 | |
1614 | |
1604 | void |
1615 | void |
1605 | rxvt_term::IMSetStatusPosition () |
1616 | rxvt_term::IMSetPosition () |
1606 | { |
1617 | { |
1607 | XRectangle preedit_rect, status_rect, *needed_rect; |
1618 | XRectangle preedit_rect, status_rect, *needed_rect; |
1608 | XVaNestedList preedit_attr, status_attr; |
1619 | XVaNestedList preedit_attr, status_attr; |
1609 | |
1620 | |
1610 | if (!Input_Context |
1621 | if (!Input_Context |
1611 | || !focus |
1622 | || !focus |
1612 | || !(input_style & XIMPreeditArea) |
1623 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1613 | || !IMisRunning ()) |
1624 | || !IMisRunning ()) |
1614 | return; |
1625 | return; |
1615 | |
1626 | |
|
|
1627 | if (input_style & XIMPreeditPosition) |
|
|
1628 | { |
|
|
1629 | im_set_size (preedit_rect); |
|
|
1630 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
|
|
1631 | |
|
|
1632 | XSetICValues (Input_Context, |
|
|
1633 | XNPreeditAttributes, preedit_attr, NULL); |
|
|
1634 | } |
|
|
1635 | else |
|
|
1636 | { |
1616 | /* Getting the necessary width of preedit area */ |
1637 | /* Getting the necessary width of preedit area */ |
1617 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1638 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1618 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1639 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1619 | XFree (status_attr); |
1640 | XFree (status_attr); |
1620 | |
1641 | |
1621 | im_set_preedit_area (preedit_rect, status_rect, *needed_rect); |
1642 | im_set_preedit_area (preedit_rect, status_rect, *needed_rect); |
1622 | XFree (needed_rect); |
1643 | XFree (needed_rect); |
1623 | |
1644 | |
1624 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1645 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1625 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1646 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1626 | |
1647 | |
1627 | XSetICValues (Input_Context, |
1648 | XSetICValues (Input_Context, |
1628 | XNPreeditAttributes, preedit_attr, |
1649 | XNPreeditAttributes, preedit_attr, |
1629 | XNStatusAttributes, status_attr, NULL); |
1650 | XNStatusAttributes, status_attr, |
|
|
1651 | NULL); |
1630 | |
1652 | |
|
|
1653 | XFree (status_attr); |
|
|
1654 | } |
|
|
1655 | |
1631 | XFree (preedit_attr); |
1656 | XFree (preedit_attr); |
1632 | XFree (status_attr); |
|
|
1633 | } |
1657 | } |
1634 | #endif /* USE_XIM */ |
1658 | #endif /* USE_XIM */ |
1635 | |
1659 | |
1636 | /*----------------------- end-of-file (C source) -----------------------*/ |
1660 | /*----------------------- end-of-file (C source) -----------------------*/ |