… | |
… | |
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 |
376 | static void |
382 | static void |
377 | print_x_error (Display *dpy, XErrorEvent *event) |
383 | print_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 | |
… | |
… | |
518 | #if ENABLE_XEMBED |
522 | #if ENABLE_XEMBED |
519 | if (rs[Rs_embed]) |
523 | if (rs[Rs_embed]) |
520 | { |
524 | { |
521 | long info[2] = { 0, XEMBED_MAPPED }; |
525 | long info[2] = { 0, XEMBED_MAPPED }; |
522 | |
526 | |
523 | XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
527 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
524 | 32, PropModeReplace, (unsigned char *)&info, 2); |
528 | 32, PropModeReplace, (unsigned char *)&info, 2); |
525 | } |
529 | } |
526 | #endif |
530 | #endif |
527 | |
531 | |
528 | XMapWindow (disp, vt); |
532 | XMapWindow (dpy, vt); |
529 | XMapWindow (disp, parent[0]); |
533 | XMapWindow (dpy, parent[0]); |
530 | |
534 | |
531 | return true; |
535 | return true; |
532 | } |
536 | } |
533 | |
537 | |
534 | static struct sig_handlers |
538 | static struct sig_handlers |
… | |
… | |
624 | { |
628 | { |
625 | short recalc_x, recalc_y; |
629 | short recalc_x, recalc_y; |
626 | int x, y, sb_w, flags; |
630 | int x, y, sb_w, flags; |
627 | unsigned int w, h; |
631 | unsigned int w, h; |
628 | unsigned int max_width, max_height; |
632 | unsigned int max_width, max_height; |
629 | dDisp; |
|
|
630 | |
633 | |
631 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
634 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
632 | szHint.win_gravity = NorthWestGravity; |
635 | szHint.win_gravity = NorthWestGravity; |
633 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
636 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
634 | |
637 | |
… | |
… | |
696 | |
699 | |
697 | if (scrollBar.state) |
700 | if (scrollBar.state) |
698 | { |
701 | { |
699 | sb_w = scrollbar_TotalWidth (); |
702 | sb_w = scrollbar_TotalWidth (); |
700 | szHint.base_width += sb_w; |
703 | szHint.base_width += sb_w; |
|
|
704 | |
701 | if (!OPTION (Opt_scrollBar_right)) |
705 | if (!OPTION (Opt_scrollBar_right)) |
702 | window_vt_x += sb_w; |
706 | window_vt_x += sb_w; |
703 | } |
707 | } |
704 | |
708 | |
705 | szHint.width_inc = fwidth; |
709 | szHint.width_inc = fwidth; |
706 | szHint.height_inc = fheight; |
710 | szHint.height_inc = fheight; |
707 | szHint.min_width = szHint.base_width + szHint.width_inc; |
711 | szHint.min_width = szHint.base_width + szHint.width_inc; |
708 | szHint.min_height = szHint.base_height + szHint.height_inc; |
712 | szHint.min_height = szHint.base_height + szHint.height_inc; |
709 | |
713 | |
710 | if (newwidth && newwidth - szHint.base_width < max_width) |
714 | if (newwidth && newwidth - szHint.base_width < max_width) |
711 | { |
715 | { |
712 | szHint.width = newwidth; |
716 | szHint.width = newwidth; |
… | |
… | |
731 | |
735 | |
732 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
736 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
733 | window_sb_x = szHint.width - sb_w; |
737 | window_sb_x = szHint.width - sb_w; |
734 | |
738 | |
735 | if (recalc_x) |
739 | if (recalc_x) |
736 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
740 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
|
|
741 | |
737 | if (recalc_y) |
742 | if (recalc_y) |
738 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
743 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
739 | |
744 | |
740 | ncol = width / fwidth; |
745 | ncol = width / fwidth; |
741 | nrow = height / fheight; |
746 | nrow = height / fheight; |
742 | } |
747 | } |
743 | |
748 | |
… | |
… | |
846 | return true; |
851 | return true; |
847 | } |
852 | } |
848 | |
853 | |
849 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
854 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
850 | { |
855 | { |
851 | XChangeProperty (display->display, parent[0], |
856 | XChangeProperty (dpy, parent[0], |
852 | prop, XA_STRING, 8, PropModeReplace, |
857 | prop, XA_STRING, 8, PropModeReplace, |
853 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
858 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
854 | } |
859 | } |
855 | |
860 | |
856 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
861 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
857 | { |
862 | { |
858 | wchar_t *ws = rxvt_mbstowcs (str, len); |
863 | wchar_t *ws = rxvt_mbstowcs (str, len); |
859 | char *s = rxvt_wcstoutf8 (ws); |
864 | char *s = rxvt_wcstoutf8 (ws); |
860 | |
865 | |
861 | XChangeProperty (display->display, parent[0], |
866 | XChangeProperty (dpy, parent[0], |
862 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
867 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
863 | (const unsigned char *)s, strlen (s)); |
868 | (const unsigned char *)s, strlen (s)); |
864 | |
869 | |
865 | free (s); |
870 | free (s); |
866 | free (ws); |
871 | free (ws); |
… | |
… | |
891 | void |
896 | void |
892 | rxvt_term::set_window_color (int idx, const char *color) |
897 | rxvt_term::set_window_color (int idx, const char *color) |
893 | { |
898 | { |
894 | rxvt_color xcol; |
899 | rxvt_color xcol; |
895 | int i; |
900 | int i; |
896 | |
901 | |
897 | if (color == NULL || *color == '\0') |
902 | if (color == NULL || *color == '\0') |
898 | return; |
903 | return; |
|
|
904 | |
|
|
905 | color = strdup (color); |
|
|
906 | allocated.push_back ((void *)color); |
|
|
907 | rs[Rs_color + idx] = color; |
899 | |
908 | |
900 | /* handle color aliases */ |
909 | /* handle color aliases */ |
901 | if (isdigit (*color)) |
910 | if (isdigit (*color)) |
902 | { |
911 | { |
903 | i = atoi (color); |
912 | i = atoi (color); |
904 | |
913 | |
905 | if (i >= 8 && i <= 15) |
914 | if (i >= 8 && i <= 15) |
906 | { /* bright colors */ |
915 | { /* bright colors */ |
907 | i -= 8; |
916 | i -= 8; |
908 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
917 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
909 | SET_PIXCOLOR (idx); |
|
|
910 | goto done; |
918 | goto done; |
911 | } |
919 | } |
912 | |
920 | |
913 | if (i >= 0 && i <= 7) |
921 | if (i >= 0 && i <= 7) |
914 | { /* normal colors */ |
922 | { /* normal colors */ |
915 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
923 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
916 | SET_PIXCOLOR (idx); |
|
|
917 | goto done; |
924 | goto done; |
918 | } |
925 | } |
919 | } |
926 | } |
920 | |
927 | |
921 | if (!rXParseAllocColor (&xcol, color)) |
928 | set_color (xcol, color); |
922 | return; |
|
|
923 | |
|
|
924 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
|
|
925 | |
929 | |
926 | /* |
930 | /* |
927 | * 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, |
928 | * so just keep gobbling up the colormap |
932 | * so just keep gobbling up the colormap |
929 | */ |
933 | */ |
930 | # if 0 |
|
|
931 | for (i = Color_Black; i <= Color_White; i++) |
|
|
932 | if (pix_colors[idx] == pix_colors[i]) |
|
|
933 | break; |
|
|
934 | if (i > Color_White) |
|
|
935 | { |
|
|
936 | /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ |
|
|
937 | XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, |
|
|
938 | DisplayPlanes (display->display, display->screen)); |
|
|
939 | } |
|
|
940 | # endif |
|
|
941 | |
934 | |
942 | pix_colors_focused[idx] = xcol; |
935 | pix_colors_focused[idx] = xcol; |
943 | SET_PIXCOLOR (idx); |
|
|
944 | |
936 | |
945 | /* XSetWindowAttributes attr; */ |
937 | /* XSetWindowAttributes attr; */ |
946 | /* Cursor cursor; */ |
938 | /* Cursor cursor; */ |
947 | done: |
939 | done: |
948 | |
940 | |
949 | #if OFF_FOCUS_FADING |
941 | #if OFF_FOCUS_FADING |
950 | if (rs[Rs_fade]) |
942 | if (rs[Rs_fade]) |
951 | 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 | } |
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 (); |
… | |
… | |
962 | #endif /* XTERM_COLOR_CHANGE */ |
958 | #endif /* XTERM_COLOR_CHANGE */ |
963 | |
959 | |
964 | void |
960 | void |
965 | rxvt_term::recolour_cursor () |
961 | rxvt_term::recolour_cursor () |
966 | { |
962 | { |
967 | XColor xcol[2]; |
963 | XColor fg, bg; |
968 | |
964 | |
969 | xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) |
965 | (ISSET_PIXCOLOR (Color_pointer_fg) |
970 | ? pix_colors_focused[Color_pointer_fg] |
966 | ? pix_colors_focused[Color_pointer_fg] |
971 | : pix_colors_focused[Color_fg]; |
967 | : pix_colors_focused[Color_fg]).get (fg); |
|
|
968 | |
972 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
969 | (ISSET_PIXCOLOR (Color_pointer_bg) |
973 | ? pix_colors_focused[Color_pointer_bg] |
970 | ? pix_colors_focused[Color_pointer_bg] |
974 | : pix_colors_focused[Color_bg]; |
971 | : pix_colors_focused[Color_bg]).get (bg); |
975 | |
972 | |
976 | XQueryColors (display->display, display->cmap, xcol, 2); |
973 | XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); |
977 | XRecolorCursor (display->display, 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; |
|
|
1019 | } |
|
|
1020 | |
|
|
1021 | void |
|
|
1022 | rxvt_term::alias_color (int dst, int src) |
|
|
1023 | { |
|
|
1024 | pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); |
1026 | } |
1025 | } |
1027 | |
1026 | |
1028 | /* -------------------------------------------------------------------- * |
1027 | /* -------------------------------------------------------------------- * |
1029 | * - WINDOW RESIZING - * |
1028 | * - WINDOW RESIZING - * |
1030 | * -------------------------------------------------------------------- */ |
1029 | * -------------------------------------------------------------------- */ |
… | |
… | |
1032 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1031 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1033 | { |
1032 | { |
1034 | int fix_screen; |
1033 | int fix_screen; |
1035 | int old_width = szHint.width; |
1034 | int old_width = szHint.width; |
1036 | int old_height = szHint.height; |
1035 | int old_height = szHint.height; |
1037 | dDisp; |
|
|
1038 | |
1036 | |
1039 | 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))) |
1040 | XSetWMNormalHints (disp, parent[0], &szHint); |
1040 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1041 | |
1041 | |
1042 | if (!ignoreparent) |
1042 | if (!ignoreparent) |
1043 | { |
1043 | { |
1044 | #ifdef SMART_RESIZE |
1044 | #ifdef SMART_RESIZE |
1045 | /* |
1045 | /* |
… | |
… | |
1049 | int x, y, x1, y1; |
1049 | int x, y, x1, y1; |
1050 | int dx, dy; |
1050 | int dx, dy; |
1051 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1051 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1052 | Window unused_cr; |
1052 | Window unused_cr; |
1053 | |
1053 | |
1054 | XTranslateCoordinates (disp, parent[0], display->root, |
1054 | XTranslateCoordinates (dpy, parent[0], display->root, |
1055 | 0, 0, &x, &y, &unused_cr); |
1055 | 0, 0, &x, &y, &unused_cr); |
1056 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1056 | XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, |
1057 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1057 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1058 | /* |
1058 | /* |
1059 | * 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 |
1060 | * our position for handles and decorations. Counter it |
1060 | * our position for handles and decorations. Counter it |
1061 | */ |
1061 | */ |
… | |
… | |
1063 | { |
1063 | { |
1064 | x -= x1; |
1064 | x -= x1; |
1065 | y -= y1; |
1065 | y -= y1; |
1066 | } |
1066 | } |
1067 | |
1067 | |
1068 | x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; |
1068 | x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; |
1069 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1069 | y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; |
1070 | dx = old_width - szHint.width; |
1070 | dx = old_width - szHint.width; |
1071 | dy = old_height - szHint.height; |
1071 | dy = old_height - szHint.height; |
1072 | |
1072 | |
1073 | /* Check position of the center of the window */ |
1073 | /* Check position of the center of the window */ |
1074 | if (x < x1) /* left half */ |
1074 | if (x < x1) /* left half */ |
… | |
… | |
1078 | if (y < y1) /* top half */ |
1078 | if (y < y1) /* top half */ |
1079 | dy = 0; |
1079 | dy = 0; |
1080 | else if (y == y1) /* exact center */ |
1080 | else if (y == y1) /* exact center */ |
1081 | dy /= 2; |
1081 | dy /= 2; |
1082 | |
1082 | |
1083 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1083 | XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, |
1084 | szHint.width, szHint.height); |
1084 | szHint.width, szHint.height); |
1085 | #else |
1085 | #else |
1086 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1086 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
1087 | #endif |
1087 | #endif |
1088 | } |
1088 | } |
1089 | |
1089 | |
1090 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1090 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1091 | |
1091 | |
1092 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1092 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1093 | { |
1093 | { |
1094 | if (scrollBar.state) |
1094 | if (scrollBar.state) |
1095 | { |
1095 | { |
1096 | XMoveResizeWindow (disp, scrollBar.win, |
1096 | XMoveResizeWindow (dpy, scrollBar.win, |
1097 | window_sb_x, 0, |
1097 | window_sb_x, 0, |
1098 | scrollbar_TotalWidth (), szHint.height); |
1098 | scrollbar_TotalWidth (), szHint.height); |
1099 | resize_scrollbar (); |
1099 | resize_scrollbar (); |
1100 | } |
1100 | } |
1101 | |
1101 | |
1102 | XMoveResizeWindow (disp, vt, |
1102 | XMoveResizeWindow (dpy, vt, |
1103 | window_vt_x, window_vt_y, |
1103 | window_vt_x, window_vt_y, |
1104 | width, height); |
1104 | width, height); |
1105 | |
1105 | |
1106 | scr_clear (); |
1106 | scr_clear (); |
1107 | #ifdef XPM_BACKGROUND |
1107 | #ifdef XPM_BACKGROUND |
… | |
… | |
1110 | } |
1110 | } |
1111 | |
1111 | |
1112 | if (fix_screen || old_height == 0) |
1112 | if (fix_screen || old_height == 0) |
1113 | scr_reset (); |
1113 | scr_reset (); |
1114 | |
1114 | |
|
|
1115 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
|
|
1116 | //scr_touch (false); |
|
|
1117 | |
1115 | #ifdef XPM_BACKGROUND |
1118 | #ifdef XPM_BACKGROUND |
1116 | if (pixmap) |
1119 | if (pixmap) |
1117 | scr_touch (false); |
1120 | scr_touch (false); |
1118 | #endif |
1121 | #endif |
1119 | |
1122 | |
1120 | #ifdef USE_XIM |
1123 | #ifdef USE_XIM |
1121 | IMSetStatusPosition (); |
1124 | IMSetPosition (); |
1122 | #endif |
1125 | #endif |
1123 | } |
1126 | } |
1124 | |
1127 | |
1125 | /* |
1128 | /* |
1126 | * 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. |
… | |
… | |
1131 | { |
1134 | { |
1132 | XWindowAttributes wattr; |
1135 | XWindowAttributes wattr; |
1133 | |
1136 | |
1134 | if (newwidth == 0 || newheight == 0) |
1137 | if (newwidth == 0 || newheight == 0) |
1135 | { |
1138 | { |
1136 | XGetWindowAttributes (display->display, display->root, &wattr); |
1139 | XGetWindowAttributes (dpy, display->root, &wattr); |
1137 | |
1140 | |
1138 | if (newwidth == 0) |
1141 | if (newwidth == 0) |
1139 | newwidth = wattr.width - szHint.base_width; |
1142 | newwidth = wattr.width - szHint.base_width; |
1140 | if (newheight == 0) |
1143 | if (newheight == 0) |
1141 | newheight = wattr.height - szHint.base_height; |
1144 | newheight = wattr.height - szHint.base_height; |
… | |
… | |
1155 | #ifdef USE_XIM |
1158 | #ifdef USE_XIM |
1156 | |
1159 | |
1157 | void |
1160 | void |
1158 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1161 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1159 | { |
1162 | { |
1160 | fg = pix_colors[Color_fg]; |
1163 | fg = pix_colors [Color_fg]; |
1161 | bg = pix_colors[Color_bg]; |
1164 | bg = pix_colors [Color_bg]; |
1162 | } |
1165 | } |
1163 | |
1166 | |
1164 | void |
1167 | void |
1165 | rxvt_term::im_set_size (XRectangle &size) |
1168 | rxvt_term::im_set_size (XRectangle &size) |
1166 | { |
1169 | { |
… | |
… | |
1203 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1206 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1204 | |
1207 | |
1205 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1208 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1206 | *p = '\0'; |
1209 | *p = '\0'; |
1207 | |
1210 | |
1208 | atom = XInternAtom (display->display, server, False); |
1211 | atom = XInternAtom (dpy, server, False); |
1209 | win = XGetSelectionOwner (display->display, atom); |
1212 | win = XGetSelectionOwner (dpy, atom); |
1210 | |
1213 | |
1211 | if (win != None) |
1214 | if (win != None) |
1212 | return True; |
1215 | return True; |
1213 | } |
1216 | } |
1214 | |
1217 | |
… | |
… | |
1438 | "*", |
1441 | "*", |
1439 | fheight, |
1442 | fheight, |
1440 | fheight + 1, fheight - 1, |
1443 | fheight + 1, fheight - 1, |
1441 | fheight - 2, fheight + 2); |
1444 | fheight - 2, fheight + 2); |
1442 | |
1445 | |
1443 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1446 | fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1444 | &missing_charset_list, &missing_charset_count, &def_string); |
1447 | &missing_charset_list, &missing_charset_count, &def_string); |
1445 | |
1448 | |
1446 | if (missing_charset_list) |
1449 | if (missing_charset_list) |
1447 | XFreeStringList (missing_charset_list); |
1450 | XFreeStringList (missing_charset_list); |
1448 | |
1451 | |
… | |
… | |
1489 | XNBackground, bg, |
1492 | XNBackground, bg, |
1490 | XNArea, &status_rect, |
1493 | XNArea, &status_rect, |
1491 | XNFontSet, fs, |
1494 | XNFontSet, fs, |
1492 | NULL); |
1495 | NULL); |
1493 | } |
1496 | } |
|
|
1497 | #if ENABLE_XIM_ONTHESPOT |
1494 | else if (input_style & XIMPreeditCallbacks) |
1498 | else if (input_style & XIMPreeditCallbacks) |
1495 | { |
1499 | { |
1496 | im_set_position (spot); |
1500 | im_set_position (spot); |
1497 | |
1501 | |
1498 | 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; |
1499 | 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; |
1500 | 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; |
1501 | #if 0 |
1505 | # if 0 |
1502 | 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; |
1503 | #endif |
1507 | # endif |
1504 | |
1508 | |
1505 | preedit_attr = XVaCreateNestedList (0, |
1509 | preedit_attr = XVaCreateNestedList (0, |
1506 | XNSpotLocation, &spot, |
1510 | XNSpotLocation, &spot, |
1507 | XNPreeditStartCallback, &xcb[0], |
1511 | XNPreeditStartCallback, &xcb[0], |
1508 | XNPreeditDoneCallback , &xcb[1], |
1512 | XNPreeditDoneCallback , &xcb[1], |
1509 | XNPreeditDrawCallback , &xcb[2], |
1513 | XNPreeditDrawCallback , &xcb[2], |
1510 | #if 0 |
1514 | # if 0 |
1511 | XNPreeditCaretCallback, &xcb[3], |
1515 | XNPreeditCaretCallback, &xcb[3], |
1512 | #endif |
1516 | # endif |
1513 | NULL); |
1517 | NULL); |
1514 | } |
1518 | } |
|
|
1519 | #endif |
1515 | |
1520 | |
1516 | Input_Context = XCreateIC (xim, |
1521 | Input_Context = XCreateIC (xim, |
1517 | XNInputStyle, input_style, |
1522 | XNInputStyle, input_style, |
1518 | XNClientWindow, vt, |
1523 | XNClientWindow, vt, |
1519 | XNFocusWindow, parent[0], |
1524 | XNFocusWindow, parent[0], |
… | |
… | |
1521 | preedit_attr, |
1526 | preedit_attr, |
1522 | status_attr ? XNStatusAttributes : NULL, |
1527 | status_attr ? XNStatusAttributes : NULL, |
1523 | status_attr, NULL); |
1528 | status_attr, NULL); |
1524 | |
1529 | |
1525 | if (preedit_attr) XFree (preedit_attr); |
1530 | if (preedit_attr) XFree (preedit_attr); |
1526 | if (status_attr) XFree (status_attr); |
1531 | if (status_attr) XFree (status_attr); |
1527 | if (fs) XFreeFontSet (display->display, fs); |
1532 | if (fs) XFreeFontSet (dpy, fs); |
1528 | |
1533 | |
1529 | if (Input_Context == NULL) |
1534 | if (Input_Context == NULL) |
1530 | { |
1535 | { |
1531 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1536 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1532 | im_destroy (); |
1537 | im_destroy (); |
… | |
… | |
1537 | // 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 |
1538 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1543 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
1539 | vt_select_input (); |
1544 | vt_select_input (); |
1540 | #endif |
1545 | #endif |
1541 | |
1546 | |
1542 | if (input_style & XIMPreeditArea) |
|
|
1543 | IMSetStatusPosition (); |
1547 | IMSetPosition (); |
1544 | |
1548 | |
1545 | return true; |
1549 | return true; |
1546 | } |
1550 | } |
1547 | |
1551 | |
1548 | void |
1552 | void |
… | |
… | |
1606 | SET_LOCALE (locale); |
1610 | SET_LOCALE (locale); |
1607 | #endif |
1611 | #endif |
1608 | } |
1612 | } |
1609 | |
1613 | |
1610 | void |
1614 | void |
1611 | rxvt_term::IMSetStatusPosition () |
1615 | rxvt_term::IMSetPosition () |
1612 | { |
1616 | { |
1613 | XRectangle preedit_rect, status_rect, *needed_rect; |
1617 | XRectangle preedit_rect, status_rect, *needed_rect; |
1614 | XVaNestedList preedit_attr, status_attr; |
1618 | XVaNestedList preedit_attr, status_attr; |
1615 | |
1619 | |
1616 | if (!Input_Context |
1620 | if (!Input_Context |
1617 | || !focus |
1621 | || !focus |
1618 | || !(input_style & XIMPreeditArea) |
1622 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1619 | || !IMisRunning ()) |
1623 | || !IMisRunning ()) |
1620 | return; |
1624 | return; |
1621 | |
1625 | |
|
|
1626 | if (input_style & XIMPreeditPosition) |
|
|
1627 | { |
|
|
1628 | im_set_size (preedit_rect); |
|
|
1629 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
|
|
1630 | |
|
|
1631 | XSetICValues (Input_Context, |
|
|
1632 | XNPreeditAttributes, preedit_attr, NULL); |
|
|
1633 | } |
|
|
1634 | else |
|
|
1635 | { |
1622 | /* Getting the necessary width of preedit area */ |
1636 | /* Getting the necessary width of preedit area */ |
1623 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1637 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1624 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1638 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1625 | XFree (status_attr); |
1639 | XFree (status_attr); |
1626 | |
1640 | |
1627 | im_set_preedit_area (preedit_rect, status_rect, *needed_rect); |
1641 | im_set_preedit_area (preedit_rect, status_rect, *needed_rect); |
1628 | XFree (needed_rect); |
1642 | XFree (needed_rect); |
1629 | |
1643 | |
1630 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1644 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1631 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1645 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1632 | |
1646 | |
1633 | XSetICValues (Input_Context, |
1647 | XSetICValues (Input_Context, |
1634 | XNPreeditAttributes, preedit_attr, |
1648 | XNPreeditAttributes, preedit_attr, |
1635 | XNStatusAttributes, status_attr, NULL); |
1649 | XNStatusAttributes, status_attr, |
|
|
1650 | NULL); |
1636 | |
1651 | |
|
|
1652 | XFree (status_attr); |
|
|
1653 | } |
|
|
1654 | |
1637 | XFree (preedit_attr); |
1655 | XFree (preedit_attr); |
1638 | XFree (status_attr); |
|
|
1639 | } |
1656 | } |
1640 | #endif /* USE_XIM */ |
1657 | #endif /* USE_XIM */ |
1641 | |
1658 | |
1642 | /*----------------------- end-of-file (C source) -----------------------*/ |
1659 | /*----------------------- end-of-file (C source) -----------------------*/ |