… | |
… | |
36 | #include "keyboard.h" |
36 | #include "keyboard.h" |
37 | #include "rxvtperl.h" |
37 | #include "rxvtperl.h" |
38 | |
38 | |
39 | #include <limits> |
39 | #include <limits> |
40 | |
40 | |
41 | #include <cassert> |
41 | #include <assert.h> |
42 | #include <csignal> |
42 | #include <signal.h> |
43 | #include <cstring> |
43 | #include <string.h> |
44 | |
44 | |
45 | #include <termios.h> |
45 | #include <termios.h> |
46 | |
46 | |
47 | #ifdef HAVE_XSETLOCALE |
47 | #ifdef HAVE_XSETLOCALE |
48 | # define X_LOCALE |
48 | # define X_LOCALE |
49 | # include <X11/Xlocale.h> |
49 | # include <X11/Xlocale.h> |
50 | #else |
50 | #else |
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <clocale> |
51 | # include <locale.h> |
53 | # endif |
|
|
54 | #endif |
52 | #endif |
55 | |
53 | |
56 | struct termios rxvt_term::def_tio; |
54 | struct termios rxvt_term::def_tio; |
57 | vector<rxvt_term *> rxvt_term::termlist; |
55 | vector<rxvt_term *> rxvt_term::termlist; |
58 | |
56 | |
… | |
… | |
105 | if (cc->c2 == c2) return c1; |
103 | if (cc->c2 == c2) return c1; |
106 | cc = (*this)[cc->c1]; |
104 | cc = (*this)[cc->c1]; |
107 | } |
105 | } |
108 | |
106 | |
109 | // check to see whether this combination already exists otherwise |
107 | // check to see whether this combination already exists otherwise |
110 | for (cc = v.end (); cc-- > v.begin (); ) |
108 | for (cc = v.begin (); cc < v.end (); cc++) |
111 | if (cc->c1 == c1 && cc->c2 == c2) |
109 | if (cc->c1 == c1 && cc->c2 == c2) |
112 | return COMPOSE_LO + (cc - v.begin ()); |
110 | return COMPOSE_LO + (cc - v.begin ()); |
113 | |
111 | |
114 | // allocate a new combination |
112 | // allocate a new combination |
115 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
113 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
… | |
… | |
267 | for (int i = 0; i < allocated.size (); i++) |
265 | for (int i = 0; i < allocated.size (); i++) |
268 | free (allocated [i]); |
266 | free (allocated [i]); |
269 | |
267 | |
270 | free (selection.text); |
268 | free (selection.text); |
271 | free (selection.clip_text); |
269 | free (selection.clip_text); |
272 | // TODO: manage env vars in child only(!) |
|
|
273 | free (env_display); |
|
|
274 | free (env_term); |
|
|
275 | free (locale); |
270 | free (locale); |
276 | free (v_buffer); |
271 | free (v_buffer); |
277 | |
272 | |
278 | delete selection_req; |
273 | delete selection_req; |
279 | |
274 | |
… | |
… | |
353 | |
348 | |
354 | delete this; |
349 | delete this; |
355 | } |
350 | } |
356 | |
351 | |
357 | void |
352 | void |
358 | rxvt_term::set_option (uint8_t opt, bool set) |
353 | rxvt_term::set_option (uint8_t opt, bool set) NOTHROW |
359 | { |
354 | { |
360 | if (!opt) |
355 | if (!opt) |
361 | return; |
356 | return; |
362 | |
357 | |
363 | uint8_t mask = 1 << (opt & 7); |
358 | uint8_t mask = 1 << (opt & 7); |
… | |
… | |
706 | if (recalc_y) |
701 | if (recalc_y) |
707 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
702 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
708 | |
703 | |
709 | ncol = width / fwidth; |
704 | ncol = width / fwidth; |
710 | nrow = height / fheight; |
705 | nrow = height / fheight; |
|
|
706 | |
|
|
707 | // When the size of the vt window is not a multiple of the cell |
|
|
708 | // size, i.e., when the wm does not honour our size hints, there are |
|
|
709 | // extra areas not covered by the terminal screen. Such gaps, when a |
|
|
710 | // bg pixmap is set, would have to be cleared manually to properly |
|
|
711 | // refresh the background. We take the simpler route and shrink the |
|
|
712 | // vt window so as to avoid creating gaps. |
|
|
713 | vt_width = ncol * fwidth; |
|
|
714 | vt_height = nrow * fheight; |
711 | } |
715 | } |
712 | |
716 | |
713 | /*----------------------------------------------------------------------*/ |
717 | /*----------------------------------------------------------------------*/ |
714 | /* |
718 | /* |
715 | * Tell the teletype handler what size the window is. |
719 | * Tell the teletype handler what size the window is. |
… | |
… | |
723 | |
727 | |
724 | struct winsize ws; |
728 | struct winsize ws; |
725 | |
729 | |
726 | ws.ws_col = ncol; |
730 | ws.ws_col = ncol; |
727 | ws.ws_row = nrow; |
731 | ws.ws_row = nrow; |
728 | ws.ws_xpixel = width; |
732 | ws.ws_xpixel = vt_width; |
729 | ws.ws_ypixel = height; |
733 | ws.ws_ypixel = vt_height; |
730 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
734 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
731 | |
735 | |
732 | #if 0 |
736 | #if 0 |
733 | // TIOCSWINSZ is supposed to do this automatically and correctly |
737 | // TIOCSWINSZ is supposed to do this automatically and correctly |
734 | if (cmd_pid) /* force through to the command */ |
738 | if (cmd_pid) /* force through to the command */ |
… | |
… | |
760 | |
764 | |
761 | delete fontset[0]; |
765 | delete fontset[0]; |
762 | fontset[0] = fs; |
766 | fontset[0] = fs; |
763 | |
767 | |
764 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
768 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
765 | prop.height += lineSpace; |
|
|
766 | prop.width += letterSpace; |
769 | prop.width += letterSpace; |
767 | |
770 | |
768 | fs->set_prop (prop, false); |
771 | fs->set_prop (prop, false); |
769 | |
772 | |
770 | fwidth = prop.width; |
773 | fwidth = prop.width; |
771 | fheight = prop.height; |
774 | fheight = prop.height + lineSpace; |
772 | fbase = prop.ascent; |
775 | fbase = prop.ascent; |
773 | |
776 | |
774 | for (int style = 1; style < 4; style++) |
777 | for (int style = 1; style < 4; style++) |
775 | { |
778 | { |
776 | #if ENABLE_STYLES |
779 | #if ENABLE_STYLES |
… | |
… | |
938 | |
941 | |
939 | /*----------------------------------------------------------------------*/ |
942 | /*----------------------------------------------------------------------*/ |
940 | /* |
943 | /* |
941 | * find if fg/bg matches any of the normal (low-intensity) colors |
944 | * find if fg/bg matches any of the normal (low-intensity) colors |
942 | */ |
945 | */ |
943 | void |
946 | char * |
944 | rxvt_term::set_colorfgbg () |
947 | rxvt_term::get_colorfgbg () |
945 | { |
948 | { |
946 | unsigned int i; |
949 | unsigned int i; |
947 | const char *xpmb = ""; |
950 | const char *xpmb = ""; |
948 | char fstr[] = "default"; |
951 | char fstr[] = "default"; |
949 | char bstr[] = "default"; |
952 | char bstr[] = "default"; |
|
|
953 | char *env_colorfgbg; |
950 | |
954 | |
951 | for (i = Color_Black; i <= Color_White; i++) |
955 | for (i = Color_Black; i <= Color_White; i++) |
952 | if (pix_colors[Color_fg] == pix_colors[i]) |
956 | if (pix_colors[Color_fg] == pix_colors[i]) |
953 | { |
957 | { |
954 | sprintf (fstr, "%d", i - Color_Black); |
958 | sprintf (fstr, "%d", i - Color_Black); |
… | |
… | |
963 | xpmb = "default;"; |
967 | xpmb = "default;"; |
964 | #endif |
968 | #endif |
965 | break; |
969 | break; |
966 | } |
970 | } |
967 | |
971 | |
|
|
972 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg")); |
968 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
973 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
|
|
974 | return env_colorfgbg; |
969 | } |
975 | } |
970 | |
976 | |
971 | /*----------------------------------------------------------------------*/ |
977 | /*----------------------------------------------------------------------*/ |
972 | |
978 | |
973 | bool |
979 | bool |
… | |
… | |
1066 | if (scrollBar.state) |
1072 | if (scrollBar.state) |
1067 | scrollBar.resize (); |
1073 | scrollBar.resize (); |
1068 | |
1074 | |
1069 | XMoveResizeWindow (dpy, vt, |
1075 | XMoveResizeWindow (dpy, vt, |
1070 | window_vt_x, window_vt_y, |
1076 | window_vt_x, window_vt_y, |
1071 | width, height); |
1077 | vt_width, vt_height); |
1072 | |
1078 | |
1073 | #ifdef HAVE_BG_PIXMAP |
1079 | #ifdef HAVE_BG_PIXMAP |
1074 | if (bg_window_size_sensitive ()) |
1080 | if (bg_window_size_sensitive ()) |
1075 | update_background (); |
1081 | update_background (); |
1076 | #endif |
1082 | #endif |
… | |
… | |
1101 | newwidth = wattr.width - szHint.base_width; |
1107 | newwidth = wattr.width - szHint.base_width; |
1102 | if (newheight == 0) |
1108 | if (newheight == 0) |
1103 | newheight = wattr.height - szHint.base_height; |
1109 | newheight = wattr.height - szHint.base_height; |
1104 | } |
1110 | } |
1105 | |
1111 | |
1106 | if (newwidth != width || newheight != height) |
1112 | if (newwidth != vt_width || newheight != vt_height) |
1107 | { |
1113 | { |
1108 | newwidth += szHint.base_width; |
1114 | newwidth += szHint.base_width; |
1109 | newheight += szHint.base_height; |
1115 | newheight += szHint.base_height; |
1110 | resize_all_windows (newwidth, newheight, 0); |
1116 | resize_all_windows (newwidth, newheight, 0); |
1111 | } |
1117 | } |
… | |
… | |
1519 | im_destroy (); |
1525 | im_destroy (); |
1520 | |
1526 | |
1521 | if (Input_Context) |
1527 | if (Input_Context) |
1522 | return; |
1528 | return; |
1523 | |
1529 | |
1524 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1525 | if (rs[Rs_imLocale]) |
1530 | if (rs[Rs_imLocale]) |
1526 | SET_LOCALE (rs[Rs_imLocale]); |
1531 | SET_LOCALE (rs[Rs_imLocale]); |
1527 | #endif |
|
|
1528 | |
1532 | |
1529 | p = rs[Rs_inputMethod]; |
1533 | p = rs[Rs_inputMethod]; |
1530 | if (p && *p) |
1534 | if (p && *p) |
1531 | { |
1535 | { |
1532 | bool found = false; |
1536 | bool found = false; |
… | |
… | |
1560 | /* try with no modifiers base IF the user didn't specify an IM */ |
1564 | /* try with no modifiers base IF the user didn't specify an IM */ |
1561 | if (im_get_ic ("@im=none")) |
1565 | if (im_get_ic ("@im=none")) |
1562 | goto done; |
1566 | goto done; |
1563 | |
1567 | |
1564 | done: |
1568 | done: |
1565 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1566 | if (rs[Rs_imLocale]) |
1569 | if (rs[Rs_imLocale]) |
1567 | SET_LOCALE (locale); |
1570 | SET_LOCALE (locale); |
1568 | #endif |
|
|
1569 | } |
1571 | } |
1570 | |
1572 | |
1571 | void |
1573 | void |
1572 | rxvt_term::im_set_position () |
1574 | rxvt_term::im_set_position () |
1573 | { |
1575 | { |
… | |
… | |
1650 | if (update_background_ev.is_active ()) |
1652 | if (update_background_ev.is_active ()) |
1651 | return; |
1653 | return; |
1652 | |
1654 | |
1653 | bg_invalidate (); |
1655 | bg_invalidate (); |
1654 | |
1656 | |
|
|
1657 | if (!mapped) |
|
|
1658 | return; |
|
|
1659 | |
1655 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1660 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1656 | |
1661 | |
1657 | if (to_wait <= 0.) |
1662 | if (to_wait <= 0.) |
1658 | bg_render (); |
1663 | bg_render (); |
1659 | else |
1664 | else |