… | |
… | |
936 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
936 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
937 | mouse_slip_wheel_speed = 0; |
937 | mouse_slip_wheel_speed = 0; |
938 | #endif |
938 | #endif |
939 | } |
939 | } |
940 | |
940 | |
941 | #if defined (KEYSYM_RESOURCE) |
|
|
942 | unsigned int |
|
|
943 | rxvt_term::cmd_write (const char *str, unsigned int count) |
|
|
944 | { |
|
|
945 | unsigned int n, s; |
|
|
946 | |
|
|
947 | n = cmdbuf_ptr - cmdbuf_base; |
|
|
948 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
|
|
949 | |
|
|
950 | if (n > 0 && s < count) |
|
|
951 | { |
|
|
952 | memmove (cmdbuf_base, cmdbuf_ptr, |
|
|
953 | (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); |
|
|
954 | cmdbuf_ptr = cmdbuf_base; |
|
|
955 | cmdbuf_endp -= n; |
|
|
956 | s += n; |
|
|
957 | } |
|
|
958 | |
|
|
959 | if (count > s) |
|
|
960 | { |
|
|
961 | rxvt_warn ("data loss: cmd_write too large, continuing.\n"); |
|
|
962 | count = s; |
|
|
963 | } |
|
|
964 | |
|
|
965 | for (; count--;) |
|
|
966 | *cmdbuf_endp++ = *str++; |
|
|
967 | |
|
|
968 | cmd_parse (); |
|
|
969 | |
|
|
970 | return 0; |
|
|
971 | } |
|
|
972 | #endif |
|
|
973 | |
|
|
974 | void |
941 | void |
975 | rxvt_term::flush () |
942 | rxvt_term::flush () |
976 | { |
943 | { |
977 | flush_ev.stop (); |
944 | flush_ev.stop (); |
978 | |
945 | |
… | |
… | |
1152 | { |
1119 | { |
1153 | } |
1120 | } |
1154 | } event_handler; |
1121 | } event_handler; |
1155 | #endif |
1122 | #endif |
1156 | |
1123 | |
|
|
1124 | /* make sure all the cmd data is at beginning of cmdbuf */ |
|
|
1125 | void |
|
|
1126 | rxvt_term::cmdbuf_reify () |
|
|
1127 | { |
|
|
1128 | if (cmdbuf_ptr == cmdbuf_base) |
|
|
1129 | return; |
|
|
1130 | |
|
|
1131 | ssize_t used = cmdbuf_endp - cmdbuf_ptr; |
|
|
1132 | |
|
|
1133 | memmove (cmdbuf_base, cmdbuf_ptr, used); |
|
|
1134 | cmdbuf_ptr = cmdbuf_base; |
|
|
1135 | cmdbuf_endp = cmdbuf_ptr + used; |
|
|
1136 | |
|
|
1137 | } |
|
|
1138 | |
|
|
1139 | #if defined (KEYSYM_RESOURCE) |
|
|
1140 | void |
|
|
1141 | rxvt_term::cmdbuf_append (const char *str, size_t count) |
|
|
1142 | { |
|
|
1143 | cmdbuf_reify (); |
|
|
1144 | |
|
|
1145 | size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp; |
|
|
1146 | |
|
|
1147 | if (count > avail) |
|
|
1148 | return; |
|
|
1149 | |
|
|
1150 | memcpy (cmdbuf_endp, str, count); |
|
|
1151 | cmdbuf_endp += count; |
|
|
1152 | |
|
|
1153 | cmd_parse (); |
|
|
1154 | } |
|
|
1155 | #endif |
|
|
1156 | |
1157 | bool |
1157 | bool |
1158 | rxvt_term::pty_fill () |
1158 | rxvt_term::pty_fill () |
1159 | { |
1159 | { |
1160 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1160 | cmdbuf_reify (); |
1161 | |
1161 | |
1162 | if (CBUFSIZ == n) |
1162 | size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp; |
|
|
1163 | |
|
|
1164 | if (!avail) |
|
|
1165 | { |
1163 | n = 0; // normally this indicates a "too long" command sequence - just drop the data we have |
1166 | // normally this indicates a "too long" command sequence - just drop the data we have |
1164 | |
|
|
1165 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
|
|
1166 | cmdbuf_ptr = cmdbuf_base; |
1167 | cmdbuf_ptr = cmdbuf_base; |
1167 | cmdbuf_endp = cmdbuf_ptr + n; |
1168 | cmdbuf_endp = cmdbuf_ptr; |
|
|
1169 | avail = CBUFSIZ; |
|
|
1170 | } |
1168 | |
1171 | |
1169 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1172 | ssize_t r = read (pty->pty, cmdbuf_endp, avail); |
1170 | |
1173 | |
1171 | if (r > 0) |
1174 | if (r > 0) |
1172 | { |
1175 | { |
1173 | cmdbuf_endp += r; |
1176 | cmdbuf_endp += r; |
1174 | return true; |
1177 | return true; |