… | |
… | |
43 | * along with this program; if not, write to the Free Software |
43 | * along with this program; if not, write to the Free Software |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
45 | *----------------------------------------------------------------------*/ |
45 | *----------------------------------------------------------------------*/ |
46 | |
46 | |
47 | /*{{{ includes: */ |
47 | /*{{{ includes: */ |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" |
|
|
50 | #include "rxvtperl.h" |
50 | #include "version.h" |
51 | #include "version.h" |
51 | #include "command.h" |
52 | #include "command.h" |
|
|
53 | |
|
|
54 | #if HAVE_SCHED_YIELD |
|
|
55 | # include <sched.h> |
|
|
56 | #endif |
52 | |
57 | |
53 | #ifdef KEYSYM_RESOURCE |
58 | #ifdef KEYSYM_RESOURCE |
54 | # include "keyboard.h" |
59 | # include "keyboard.h" |
55 | #endif |
60 | #endif |
56 | |
61 | |
… | |
… | |
980 | SET_LOCALE (locale); |
985 | SET_LOCALE (locale); |
981 | |
986 | |
982 | display->flush (); |
987 | display->flush (); |
983 | |
988 | |
984 | if (want_refresh && !flush_ev.active) |
989 | if (want_refresh && !flush_ev.active) |
985 | flush_ev.start (NOW + 0.01); |
990 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
986 | } |
991 | } |
987 | |
992 | |
988 | void |
993 | void |
989 | rxvt_term::flush_cb (time_watcher &w) |
994 | rxvt_term::flush_cb (time_watcher &w) |
990 | { |
995 | { |
… | |
… | |
1065 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1070 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1066 | } |
1071 | } |
1067 | } |
1072 | } |
1068 | #endif |
1073 | #endif |
1069 | |
1074 | |
|
|
1075 | #if HAVE_SCHED_YIELD |
|
|
1076 | static struct event_handler |
|
|
1077 | { |
|
|
1078 | check_watcher cw_yield; |
|
|
1079 | |
|
|
1080 | void yield (check_watcher &w) |
|
|
1081 | { |
|
|
1082 | sched_yield (); |
|
|
1083 | w.stop (); |
|
|
1084 | } |
|
|
1085 | |
|
|
1086 | event_handler () |
|
|
1087 | : cw_yield (this, &event_handler::yield) |
|
|
1088 | { |
|
|
1089 | } |
|
|
1090 | } event_handler; |
|
|
1091 | #endif |
|
|
1092 | |
1070 | bool |
1093 | bool |
1071 | rxvt_term::pty_fill () |
1094 | rxvt_term::pty_fill () |
1072 | { |
1095 | { |
1073 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1096 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1074 | |
1097 | |
… | |
… | |
1080 | |
1103 | |
1081 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1104 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1082 | cmdbuf_ptr = cmdbuf_base; |
1105 | cmdbuf_ptr = cmdbuf_base; |
1083 | cmdbuf_endp = cmdbuf_ptr + n; |
1106 | cmdbuf_endp = cmdbuf_ptr + n; |
1084 | |
1107 | |
1085 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1108 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1086 | |
1109 | |
1087 | if (n > 0) |
1110 | if (r > 0) |
1088 | { |
1111 | { |
1089 | cmdbuf_endp += n; |
1112 | cmdbuf_endp += r; |
1090 | return true; |
1113 | return true; |
1091 | } |
1114 | } |
1092 | else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) |
1115 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1116 | { |
|
|
1117 | #if HAVE_SCHED_YIELD |
|
|
1118 | if (display->is_local) |
|
|
1119 | event_handler.cw_yield.start (); |
|
|
1120 | #endif |
|
|
1121 | } |
|
|
1122 | else |
1093 | { |
1123 | { |
1094 | pty_ev.stop (); |
1124 | pty_ev.stop (); |
1095 | |
1125 | |
1096 | if (!OPTION (Opt_hold)) |
1126 | if (!OPTION (Opt_hold)) |
1097 | destroy (); |
1127 | destroy (); |
… | |
… | |
1670 | { |
1700 | { |
1671 | if (!focus) |
1701 | if (!focus) |
1672 | { |
1702 | { |
1673 | focus = 1; |
1703 | focus = 1; |
1674 | want_refresh = 1; |
1704 | want_refresh = 1; |
|
|
1705 | |
|
|
1706 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1707 | |
1675 | #if USE_XIM |
1708 | #if USE_XIM |
1676 | if (Input_Context != NULL) |
1709 | if (Input_Context != NULL) |
1677 | { |
1710 | { |
1678 | IMSetStatusPosition (); |
1711 | IMSetStatusPosition (); |
1679 | XSetICFocus (Input_Context); |
1712 | XSetICFocus (Input_Context); |
… | |
… | |
1699 | if (focus) |
1732 | if (focus) |
1700 | { |
1733 | { |
1701 | focus = 0; |
1734 | focus = 0; |
1702 | want_refresh = 1; |
1735 | want_refresh = 1; |
1703 | |
1736 | |
|
|
1737 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1738 | |
1704 | #if ENABLE_FRILLS || ISO_14755 |
1739 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1740 | if (iso14755buf) |
|
|
1741 | { |
1705 | iso14755buf = 0; |
1742 | iso14755buf = 0; |
1706 | #endif |
|
|
1707 | #if ENABLE_OVERLAY |
1743 | # if ENABLE_OVERLAY |
1708 | scr_overlay_off (); |
1744 | scr_overlay_off (); |
|
|
1745 | # endif |
|
|
1746 | } |
1709 | #endif |
1747 | #endif |
1710 | #if USE_XIM |
1748 | #if USE_XIM |
1711 | if (Input_Context != NULL) |
1749 | if (Input_Context != NULL) |
1712 | XUnsetICFocus (Input_Context); |
1750 | XUnsetICFocus (Input_Context); |
1713 | #endif |
1751 | #endif |
… | |
… | |
2684 | |
2722 | |
2685 | if (!OPTION (Opt_jumpScroll) |
2723 | if (!OPTION (Opt_jumpScroll) |
2686 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2724 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2687 | { |
2725 | { |
2688 | refreshnow = true; |
2726 | refreshnow = true; |
|
|
2727 | refresh_count = 0; |
2689 | ch = NOCHAR; |
2728 | ch = NOCHAR; |
2690 | break; |
2729 | break; |
2691 | } |
2730 | } |
2692 | |
2731 | |
2693 | // scr_add_lines only works for nlines <= nrow - 1. |
2732 | // scr_add_lines only works for nlines <= nrow - 1. |
… | |
… | |
2730 | refresh_limit++; |
2769 | refresh_limit++; |
2731 | else |
2770 | else |
2732 | { |
2771 | { |
2733 | flag = true; |
2772 | flag = true; |
2734 | scr_refresh (refresh_type); |
2773 | scr_refresh (refresh_type); |
|
|
2774 | flush_ev.stop (); |
2735 | } |
2775 | } |
2736 | } |
2776 | } |
2737 | |
2777 | |
2738 | } |
2778 | } |
2739 | else |
2779 | else |
… | |
… | |
4052 | case 1021: |
4092 | case 1021: |
4053 | if (mode) |
4093 | if (mode) |
4054 | SET_OPTION (Opt_intensityStyles); |
4094 | SET_OPTION (Opt_intensityStyles); |
4055 | else |
4095 | else |
4056 | CLR_OPTION (Opt_intensityStyles); |
4096 | CLR_OPTION (Opt_intensityStyles); |
|
|
4097 | |
|
|
4098 | scr_touch (true); |
|
|
4099 | break; |
4057 | #endif |
4100 | #endif |
4058 | case 1048: /* alternative cursor save */ |
4101 | case 1048: /* alternative cursor save */ |
4059 | case 1049: |
4102 | case 1049: |
4060 | if (OPTION (Opt_secondaryScreen)) |
4103 | if (OPTION (Opt_secondaryScreen)) |
4061 | if (mode == 0) |
4104 | if (mode == 0) |