… | |
… | |
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 | #undef HAVE_SCHED_YIELD // disabled for the time being |
|
|
56 | //# include <sched.h> |
|
|
57 | #endif |
52 | |
58 | |
53 | #ifdef KEYSYM_RESOURCE |
59 | #ifdef KEYSYM_RESOURCE |
54 | # include "keyboard.h" |
60 | # include "keyboard.h" |
55 | #endif |
61 | #endif |
56 | |
62 | |
… | |
… | |
135 | rxvt_term::iso14755_54 (int x, int y) |
141 | rxvt_term::iso14755_54 (int x, int y) |
136 | { |
142 | { |
137 | x = Pixel2Col (x); |
143 | x = Pixel2Col (x); |
138 | y = Pixel2Row (y); |
144 | y = Pixel2Row (y); |
139 | |
145 | |
140 | if (x < 0 || x >= TermWin.ncol |
146 | if (!IN_RANGE_EXC (x, 0, ncol) |
141 | || y < 0 || y >= TermWin.nrow) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
142 | return; |
148 | return; |
143 | |
149 | |
144 | for (;;) |
150 | for (;;) |
145 | { |
151 | { |
146 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
152 | const line_t &l = ROW(y - view_start); |
|
|
153 | |
|
|
154 | text_t t = l.t[x]; |
147 | |
155 | |
148 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
149 | { |
157 | { |
150 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
158 | iso14755_51 (l.t[x], l.r[x], x, y); |
151 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
152 | iso14755buf = ISO_14755_54; |
159 | iso14755buf = ISO_14755_54; |
153 | break; |
160 | break; |
154 | } |
161 | } |
155 | |
162 | |
156 | x--; |
163 | x--; |
157 | } |
164 | } |
158 | |
|
|
159 | } |
165 | } |
160 | #endif |
|
|
161 | |
166 | |
162 | #if ENABLE_OVERLAY |
|
|
163 | void |
167 | void |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
168 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
165 | { |
169 | { |
166 | rxvt_fontset *fs = FONTSET (r); |
170 | rxvt_fontset *fs = FONTSET (r); |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
171 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
168 | wchar_t *chr, *alloc, ch2; |
172 | wchar_t *chr, *alloc, ch2, *fname; |
169 | int len; |
173 | int len; |
170 | |
174 | |
|
|
175 | fname = rxvt_utf8towcs (f->name); |
|
|
176 | |
171 | #if ENABLE_COMBINING |
177 | # if ENABLE_COMBINING |
172 | if (IS_COMPOSE (ch)) |
178 | if (IS_COMPOSE (ch)) |
173 | { |
179 | { |
174 | len = rxvt_composite.expand (ch, 0); |
180 | len = rxvt_composite.expand (ch, 0); |
175 | alloc = chr = new wchar_t[len]; |
181 | alloc = chr = new wchar_t[len]; |
176 | rxvt_composite.expand (ch, chr); |
182 | rxvt_composite.expand (ch, chr); |
177 | } |
183 | } |
178 | else |
184 | else |
179 | #endif |
185 | # endif |
180 | { |
186 | { |
181 | ch2 = ch; |
187 | ch2 = ch; |
182 | |
188 | |
183 | alloc = 0; |
189 | alloc = 0; |
184 | chr = &ch2; |
190 | chr = &ch2; |
185 | len = 1; |
191 | len = 1; |
186 | } |
192 | } |
187 | |
193 | |
188 | int width = strlen (f->name); |
194 | char attr[80]; // plenty |
189 | |
195 | |
190 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
196 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
197 | (int)r, |
|
|
198 | fgcolor_of (r), bgcolor_of (r), |
|
|
199 | r & RS_Bold ? " bold" : "", |
|
|
200 | r & RS_Italic ? " italic" : "", |
|
|
201 | r & RS_Blink ? " blink" : "", |
|
|
202 | r & RS_RVid ? " rvid" : "", |
|
|
203 | r & RS_Uline ? " uline" : "", |
|
|
204 | r & RS_Careful ? " careful" : ""); |
|
|
205 | |
|
|
206 | int width = wcswidth (fname, wcslen (fname)); |
|
|
207 | |
|
|
208 | max_it (width, 8+5); // for char + hey |
|
|
209 | max_it (width, strlen (attr)); |
|
|
210 | |
|
|
211 | if (y >= 0) |
|
|
212 | { |
|
|
213 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
214 | x = 0; |
|
|
215 | } |
|
|
216 | |
|
|
217 | scr_overlay_new (x, y, width, len + 2); |
191 | |
218 | |
192 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
219 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
193 | |
220 | |
194 | for (int y = 0; y < len; y++) |
221 | for (int y = 0; y < len; y++) |
195 | { |
222 | { |
… | |
… | |
198 | ch = *chr++; |
225 | ch = *chr++; |
199 | |
226 | |
200 | sprintf (buf, "%8x", ch); |
227 | sprintf (buf, "%8x", ch); |
201 | scr_overlay_set (0, y, buf); |
228 | scr_overlay_set (0, y, buf); |
202 | scr_overlay_set (9, y, '='); |
229 | scr_overlay_set (9, y, '='); |
203 | #if !UNICODE3 |
230 | # if !UNICODE3 |
204 | if (ch >= 0x10000) |
231 | if (ch >= 0x10000) |
205 | ch = 0xfffd; |
232 | ch = 0xfffd; |
206 | #endif |
233 | # endif |
207 | scr_overlay_set (11, y, ch, r); |
234 | scr_overlay_set (11, y, ch, r); |
208 | scr_overlay_set (12, y, NOCHAR, r); |
235 | scr_overlay_set (12, y, NOCHAR, r); |
209 | } |
236 | } |
210 | |
237 | |
|
|
238 | scr_overlay_set (0, len , attr); |
211 | scr_overlay_set (0, len, f->name); |
239 | scr_overlay_set (0, len + 1, fname); |
212 | |
240 | |
|
|
241 | free (fname); |
|
|
242 | |
213 | #if ENABLE_COMBINING |
243 | # if ENABLE_COMBINING |
214 | if (alloc) |
244 | if (alloc) |
215 | delete [] alloc; |
245 | delete [] alloc; |
216 | #endif |
246 | # endif |
217 | } |
247 | } |
218 | #endif |
248 | #endif |
219 | |
249 | |
220 | void |
250 | void |
221 | rxvt_term::commit_iso14755 () |
251 | rxvt_term::commit_iso14755 () |
… | |
… | |
238 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
239 | len = 1; |
269 | len = 1; |
240 | } |
270 | } |
241 | |
271 | |
242 | if (len > 0) |
272 | if (len > 0) |
243 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
244 | else |
274 | else |
245 | scr_bell (); |
275 | scr_bell (); |
246 | } |
276 | } |
247 | |
277 | |
248 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
276 | KeySym keysym; |
306 | KeySym keysym; |
277 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
278 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
279 | #endif |
309 | #endif |
280 | int valid_keysym; |
310 | int valid_keysym; |
281 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
282 | |
312 | |
283 | /* |
313 | /* |
284 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
285 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
286 | * |
316 | * |
… | |
… | |
304 | Status status_return; |
334 | Status status_return; |
305 | |
335 | |
306 | #if 0 |
336 | #if 0 |
307 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
308 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
309 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
310 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
311 | else |
341 | else |
312 | #endif |
342 | #endif |
313 | #endif |
343 | #endif |
314 | { |
344 | { |
… | |
… | |
351 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
352 | } |
382 | } |
353 | else |
383 | else |
354 | #endif |
384 | #endif |
355 | { |
385 | { |
356 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
357 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
358 | } |
388 | } |
359 | |
389 | |
360 | if (valid_keysym) |
390 | if (valid_keysym) |
361 | { |
391 | { |
362 | #ifdef KEYSYM_RESOURCE |
392 | #ifdef KEYSYM_RESOURCE |
363 | if (keyboard->dispatch (this, keysym, ev.state)) |
393 | if (keyboard->dispatch (this, keysym, ev.state)) |
364 | return; |
394 | return; |
365 | #endif |
395 | #endif |
366 | |
396 | |
367 | if (TermWin.saveLines) |
397 | if (saveLines) |
368 | { |
398 | { |
369 | #ifdef UNSHIFTED_SCROLLKEYS |
399 | #ifdef UNSHIFTED_SCROLLKEYS |
370 | if (!ctrl && !meta) |
400 | if (!ctrl && !meta) |
371 | #else |
401 | #else |
372 | if (IS_SCROLL_MOD) |
402 | if (IS_SCROLL_MOD) |
373 | #endif |
403 | #endif |
374 | { |
404 | { |
375 | int lnsppg; |
405 | int lnsppg; |
376 | |
406 | |
377 | #ifdef PAGING_CONTEXT_LINES |
407 | #ifdef PAGING_CONTEXT_LINES |
378 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
408 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
379 | #else |
409 | #else |
380 | lnsppg = TermWin.nrow * 4 / 5; |
410 | lnsppg = nrow * 4 / 5; |
381 | #endif |
411 | #endif |
382 | if (keysym == XK_Prior) |
412 | if (keysym == XK_Prior) |
383 | { |
413 | { |
384 | scr_page (UP, lnsppg); |
414 | scr_page (UP, lnsppg); |
385 | return; |
415 | return; |
… | |
… | |
825 | { |
855 | { |
826 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
827 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
828 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
829 | { |
859 | { |
830 | unsigned char *ch; |
860 | char *ch; |
831 | |
861 | |
832 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
833 | *ch |= 0x80; |
863 | *ch |= 0x80; |
834 | |
864 | |
835 | meta = 0; |
865 | meta = 0; |
… | |
… | |
840 | } |
870 | } |
841 | |
871 | |
842 | if (len <= 0) |
872 | if (len <= 0) |
843 | return; /* not mapped */ |
873 | return; /* not mapped */ |
844 | |
874 | |
845 | if (options & Opt_scrollTtyKeypress) |
875 | if (OPTION (Opt_scrollTtyKeypress)) |
846 | if (TermWin.view_start) |
876 | if (view_start) |
847 | { |
877 | { |
848 | TermWin.view_start = 0; |
878 | view_start = 0; |
849 | want_refresh = 1; |
879 | want_refresh = 1; |
850 | } |
880 | } |
851 | |
881 | |
852 | /* |
882 | /* |
853 | * these modifications only affect the static keybuffer |
883 | * these modifications only affect the static keybuffer |
… | |
… | |
868 | #ifdef META8_OPTION |
898 | #ifdef META8_OPTION |
869 | && meta_char == C0_ESC |
899 | && meta_char == C0_ESC |
870 | #endif |
900 | #endif |
871 | ) |
901 | ) |
872 | { |
902 | { |
873 | const unsigned char ch = C0_ESC; |
903 | const char ch = C0_ESC; |
874 | tt_write (&ch, 1); |
904 | tt_write (&ch, 1); |
875 | } |
905 | } |
876 | |
906 | |
877 | #if defined(DEBUG_CMD) |
907 | #if defined(DEBUG_CMD) |
878 | /* Display keyboard buffer contents */ |
908 | /* Display keyboard buffer contents */ |
… | |
… | |
890 | |
920 | |
891 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
921 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
892 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
922 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
893 | /* attempt to `write' count to the input buffer */ |
923 | /* attempt to `write' count to the input buffer */ |
894 | unsigned int |
924 | unsigned int |
895 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
925 | rxvt_term::cmd_write (const char *str, unsigned int count) |
896 | { |
926 | { |
897 | unsigned int n, s; |
927 | unsigned int n, s; |
898 | |
928 | |
899 | n = cmdbuf_ptr - cmdbuf_base; |
929 | n = cmdbuf_ptr - cmdbuf_base; |
900 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
930 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
956 | SET_LOCALE (locale); |
986 | SET_LOCALE (locale); |
957 | |
987 | |
958 | display->flush (); |
988 | display->flush (); |
959 | |
989 | |
960 | if (want_refresh && !flush_ev.active) |
990 | if (want_refresh && !flush_ev.active) |
961 | flush_ev.start (NOW + 0.01); |
991 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
962 | } |
992 | } |
963 | |
993 | |
964 | void |
994 | void |
965 | rxvt_term::flush_cb (time_watcher &w) |
995 | rxvt_term::flush_cb (time_watcher &w) |
966 | { |
996 | { |
… | |
… | |
1030 | { |
1060 | { |
1031 | if (mouse_slip_wheel_speed == 0 |
1061 | if (mouse_slip_wheel_speed == 0 |
1032 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1062 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1033 | : scr_page (UP, mouse_slip_wheel_speed)) |
1063 | : scr_page (UP, mouse_slip_wheel_speed)) |
1034 | { |
1064 | { |
1035 | if (TermWin.view_start == TermWin.nscrolled || |
1065 | if (view_start == nsaved || |
1036 | TermWin.view_start == 0) |
1066 | view_start == 0) |
1037 | mouse_slip_wheel_speed = 0; |
1067 | mouse_slip_wheel_speed = 0; |
1038 | |
1068 | |
1039 | refresh_type |= SMOOTH_REFRESH; |
1069 | refresh_type |= SMOOTH_REFRESH; |
1040 | want_refresh = 1; |
1070 | want_refresh = 1; |
1041 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1071 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1042 | } |
1072 | } |
1043 | } |
1073 | } |
1044 | #endif |
1074 | #endif |
1045 | |
1075 | |
|
|
1076 | #if HAVE_SCHED_YIELD |
|
|
1077 | static struct event_handler |
|
|
1078 | { |
|
|
1079 | check_watcher cw_yield; |
|
|
1080 | |
|
|
1081 | void yield (check_watcher &w) |
|
|
1082 | { |
|
|
1083 | sched_yield (); |
|
|
1084 | w.stop (); |
|
|
1085 | } |
|
|
1086 | |
|
|
1087 | event_handler () |
|
|
1088 | : cw_yield (this, &event_handler::yield) |
|
|
1089 | { |
|
|
1090 | } |
|
|
1091 | } event_handler; |
|
|
1092 | #endif |
|
|
1093 | |
1046 | bool |
1094 | bool |
1047 | rxvt_term::pty_fill () |
1095 | rxvt_term::pty_fill () |
1048 | { |
1096 | { |
1049 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1097 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1050 | |
1098 | |
1051 | if (CBUFSIZ == n) |
1099 | if (CBUFSIZ == n) |
1052 | { |
1100 | { |
1053 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1101 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1054 | n = 0; |
1102 | n = 0; |
1055 | } |
1103 | } |
1056 | |
1104 | |
1057 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1105 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1058 | cmdbuf_ptr = cmdbuf_base; |
1106 | cmdbuf_ptr = cmdbuf_base; |
1059 | cmdbuf_endp = cmdbuf_ptr + n; |
1107 | cmdbuf_endp = cmdbuf_ptr + n; |
1060 | |
1108 | |
1061 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1109 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1062 | |
1110 | |
1063 | if (n > 0) |
1111 | if (r > 0) |
1064 | { |
1112 | { |
1065 | cmdbuf_endp += n; |
1113 | cmdbuf_endp += r; |
1066 | return true; |
1114 | return true; |
1067 | } |
1115 | } |
1068 | else if (n < 0 && errno != EAGAIN) |
1116 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1117 | { |
|
|
1118 | #if HAVE_SCHED_YIELD |
|
|
1119 | if (display->is_local) |
|
|
1120 | event_handler.cw_yield.start (); |
|
|
1121 | #endif |
|
|
1122 | } |
|
|
1123 | else |
|
|
1124 | { |
|
|
1125 | pty_ev.stop (); |
|
|
1126 | |
|
|
1127 | if (!OPTION (Opt_hold)) |
1069 | destroy (); |
1128 | destroy (); |
|
|
1129 | } |
1070 | |
1130 | |
1071 | return false; |
1131 | return false; |
1072 | } |
1132 | } |
1073 | |
1133 | |
1074 | void |
1134 | void |
… | |
… | |
1088 | } |
1148 | } |
1089 | |
1149 | |
1090 | void |
1150 | void |
1091 | rxvt_term::pointer_unblank () |
1151 | rxvt_term::pointer_unblank () |
1092 | { |
1152 | { |
1093 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1153 | XDefineCursor (display->display, vt, TermWin_cursor); |
1094 | recolour_cursor (); |
1154 | recolour_cursor (); |
1095 | |
1155 | |
1096 | #ifdef POINTER_BLANK |
1156 | #ifdef POINTER_BLANK |
1097 | hidden_pointer = 0; |
1157 | hidden_pointer = 0; |
1098 | |
1158 | |
1099 | if (options & Opt_pointerBlank) |
1159 | if (OPTION (Opt_pointerBlank)) |
1100 | pointer_ev.start (NOW + pointerBlankDelay); |
1160 | pointer_ev.start (NOW + pointerBlankDelay); |
1101 | #endif |
1161 | #endif |
1102 | } |
1162 | } |
1103 | |
1163 | |
1104 | #ifdef POINTER_BLANK |
1164 | #ifdef POINTER_BLANK |
1105 | void |
1165 | void |
1106 | rxvt_term::pointer_blank () |
1166 | rxvt_term::pointer_blank () |
1107 | { |
1167 | { |
1108 | if (! (options & Opt_pointerBlank)) |
1168 | if (! OPTION (Opt_pointerBlank)) |
1109 | return; |
1169 | return; |
1110 | |
1170 | |
1111 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
1171 | XDefineCursor (display->display, vt, display->blank_cursor); |
1112 | XFlush (display->display); |
1172 | XFlush (display->display); |
1113 | |
1173 | |
1114 | hidden_pointer = 1; |
1174 | hidden_pointer = 1; |
1115 | } |
1175 | } |
1116 | |
1176 | |
… | |
… | |
1211 | |
1271 | |
1212 | SET_R (this); |
1272 | SET_R (this); |
1213 | SET_LOCALE (locale); |
1273 | SET_LOCALE (locale); |
1214 | |
1274 | |
1215 | #if defined(CURSOR_BLINK) |
1275 | #if defined(CURSOR_BLINK) |
1216 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1276 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1217 | { |
1277 | { |
1218 | if (hidden_cursor) |
1278 | if (hidden_cursor) |
1219 | { |
1279 | { |
1220 | hidden_cursor = 0; |
1280 | hidden_cursor = 0; |
1221 | want_refresh = 1; |
1281 | want_refresh = 1; |
… | |
… | |
1224 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1284 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1225 | } |
1285 | } |
1226 | #endif |
1286 | #endif |
1227 | |
1287 | |
1228 | #if defined(POINTER_BLANK) |
1288 | #if defined(POINTER_BLANK) |
1229 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
1289 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
1230 | { |
1290 | { |
1231 | if (ev.type == MotionNotify |
1291 | if (ev.type == MotionNotify |
1232 | || ev.type == ButtonPress |
1292 | || ev.type == ButtonPress |
1233 | || ev.type == ButtonRelease) |
1293 | || ev.type == ButtonRelease) |
1234 | if (hidden_pointer) |
1294 | if (hidden_pointer) |
… | |
… | |
1418 | case FocusOut: |
1478 | case FocusOut: |
1419 | focus_out (); |
1479 | focus_out (); |
1420 | break; |
1480 | break; |
1421 | |
1481 | |
1422 | case ConfigureNotify: |
1482 | case ConfigureNotify: |
1423 | if (ev.xconfigure.window == TermWin.parent[0]) |
1483 | if (ev.xconfigure.window == parent[0]) |
1424 | { |
1484 | { |
1425 | int height, width; |
|
|
1426 | |
|
|
1427 | do |
|
|
1428 | { /* Wrap lots of configures into one */ |
|
|
1429 | width = ev.xconfigure.width; |
|
|
1430 | height = ev.xconfigure.height; |
|
|
1431 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1432 | } |
|
|
1433 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); |
1485 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1486 | ; |
1434 | |
1487 | |
1435 | if (szHint.width != width || szHint.height != height) |
1488 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1436 | { |
1489 | { |
1437 | seen_resize = 1; |
1490 | seen_resize = 1; |
1438 | resize_all_windows (width, height, 1); |
1491 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1439 | } |
1492 | } |
1440 | |
1493 | |
1441 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1494 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1442 | if (options & Opt_transparent) |
1495 | if (OPTION (Opt_transparent)) |
1443 | check_our_parents (); |
1496 | check_our_parents (); |
1444 | #endif |
1497 | #endif |
1445 | } |
1498 | } |
1446 | break; |
1499 | break; |
1447 | |
1500 | |
… | |
… | |
1464 | case SelectionRequest: |
1517 | case SelectionRequest: |
1465 | selection_send (ev.xselectionrequest); |
1518 | selection_send (ev.xselectionrequest); |
1466 | break; |
1519 | break; |
1467 | |
1520 | |
1468 | case UnmapNotify: |
1521 | case UnmapNotify: |
1469 | TermWin.mapped = 0; |
1522 | mapped = 0; |
1470 | #ifdef TEXT_BLINK |
1523 | #ifdef TEXT_BLINK |
1471 | text_blink_ev.stop (); |
1524 | text_blink_ev.stop (); |
1472 | #endif |
1525 | #endif |
1473 | break; |
1526 | break; |
1474 | |
1527 | |
1475 | case MapNotify: |
1528 | case MapNotify: |
1476 | TermWin.mapped = 1; |
1529 | mapped = 1; |
1477 | #ifdef TEXT_BLINK |
1530 | #ifdef TEXT_BLINK |
1478 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1531 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1479 | #endif |
1532 | #endif |
1480 | break; |
1533 | break; |
1481 | |
1534 | |
… | |
… | |
1485 | break; |
1538 | break; |
1486 | #endif /* TRANSPARENT */ |
1539 | #endif /* TRANSPARENT */ |
1487 | |
1540 | |
1488 | case GraphicsExpose: |
1541 | case GraphicsExpose: |
1489 | case Expose: |
1542 | case Expose: |
1490 | if (ev.xany.window == TermWin.vt) |
1543 | if (ev.xany.window == vt) |
1491 | { |
1544 | { |
1492 | do |
1545 | do |
1493 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1546 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1494 | ev.xexpose.width, ev.xexpose.height, False); |
1547 | ev.xexpose.width, ev.xexpose.height, False); |
1495 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1548 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1496 | |
1549 | |
1497 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1550 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1498 | |
1551 | |
1499 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1552 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1500 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1553 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1501 | ev.xexpose.width, ev.xexpose.height, False); |
1554 | ev.xexpose.width, ev.xexpose.height, False); |
1502 | |
1555 | |
1503 | scr_refresh (refresh_type); |
1556 | scr_refresh (refresh_type); |
1504 | } |
1557 | } |
… | |
… | |
1520 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1573 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1521 | menubar_expose (); |
1574 | menubar_expose (); |
1522 | #endif |
1575 | #endif |
1523 | |
1576 | |
1524 | #ifdef TRANSPARENT |
1577 | #ifdef TRANSPARENT |
1525 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1578 | if (am_transparent && ev.xany.window == parent[0]) |
1526 | XClearWindow (disp, ev.xany.window); |
1579 | XClearWindow (disp, ev.xany.window); |
1527 | #endif |
1580 | #endif |
1528 | } |
1581 | } |
1529 | break; |
1582 | break; |
1530 | |
1583 | |
… | |
… | |
1541 | } |
1594 | } |
1542 | #endif |
1595 | #endif |
1543 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1596 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1544 | break; |
1597 | break; |
1545 | |
1598 | |
1546 | if (ev.xany.window == TermWin.vt) |
1599 | if (ev.xany.window == vt) |
1547 | { |
1600 | { |
1548 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1601 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1549 | { |
1602 | { |
1550 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1603 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1551 | ; |
1604 | ; |
1552 | |
1605 | |
1553 | XQueryPointer (disp, TermWin.vt, |
1606 | XQueryPointer (disp, vt, |
1554 | &unused_root, &unused_child, |
1607 | &unused_root, &unused_child, |
1555 | &unused_root_x, &unused_root_y, |
1608 | &unused_root_x, &unused_root_y, |
1556 | &ev.xbutton.x, &ev.xbutton.y, |
1609 | &ev.xbutton.x, &ev.xbutton.y, |
1557 | &ev.xbutton.state); |
1610 | &ev.xbutton.state); |
1558 | #ifdef MOUSE_THRESHOLD |
1611 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1570 | #endif |
1623 | #endif |
1571 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1624 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1572 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1625 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1573 | |
1626 | |
1574 | #ifdef SELECTION_SCROLLING |
1627 | #ifdef SELECTION_SCROLLING |
1575 | if (ev.xbutton.y < TermWin.int_bwidth |
1628 | if (ev.xbutton.y < int_bwidth |
1576 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1629 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1577 | { |
1630 | { |
1578 | int dist; |
1631 | int dist; |
1579 | |
1632 | |
1580 | /* don't clobber the current delay if we are |
1633 | /* don't clobber the current delay if we are |
1581 | * already in the middle of scrolling. |
1634 | * already in the middle of scrolling. |
… | |
… | |
1589 | selection_save_x = ev.xbutton.x; |
1642 | selection_save_x = ev.xbutton.x; |
1590 | selection_save_y = ev.xbutton.y; |
1643 | selection_save_y = ev.xbutton.y; |
1591 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1644 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1592 | |
1645 | |
1593 | /* calc number of lines to scroll */ |
1646 | /* calc number of lines to scroll */ |
1594 | if (ev.xbutton.y < TermWin.int_bwidth) |
1647 | if (ev.xbutton.y < int_bwidth) |
1595 | { |
1648 | { |
1596 | scroll_selection_dir = UP; |
1649 | scroll_selection_dir = UP; |
1597 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1650 | dist = int_bwidth - ev.xbutton.y; |
1598 | } |
1651 | } |
1599 | else |
1652 | else |
1600 | { |
1653 | { |
1601 | scroll_selection_dir = DN; |
1654 | scroll_selection_dir = DN; |
1602 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1655 | dist = ev.xbutton.y - (int_bwidth + height); |
1603 | } |
1656 | } |
1604 | |
1657 | |
1605 | scroll_selection_lines = Pixel2Height (dist) |
1658 | scroll_selection_lines = Pixel2Height (dist) |
1606 | / SELECTION_SCROLL_LINE_SPEEDUP |
1659 | / SELECTION_SCROLL_LINE_SPEEDUP |
1607 | + 1; |
1660 | + 1; |
1608 | MIN_IT (scroll_selection_lines, |
1661 | min_it (scroll_selection_lines, |
1609 | SELECTION_SCROLL_MAX_LINES); |
1662 | SELECTION_SCROLL_MAX_LINES); |
1610 | } |
1663 | } |
1611 | else |
1664 | else |
1612 | { |
1665 | { |
1613 | /* we are within the text window, so we |
1666 | /* we are within the text window, so we |
… | |
… | |
1644 | } |
1697 | } |
1645 | |
1698 | |
1646 | void |
1699 | void |
1647 | rxvt_term::focus_in () |
1700 | rxvt_term::focus_in () |
1648 | { |
1701 | { |
1649 | if (!TermWin.focus) |
1702 | if (!focus) |
1650 | { |
1703 | { |
1651 | TermWin.focus = 1; |
1704 | focus = 1; |
1652 | want_refresh = 1; |
1705 | want_refresh = 1; |
|
|
1706 | |
|
|
1707 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1708 | |
1653 | #ifdef USE_XIM |
1709 | #if USE_XIM |
1654 | if (Input_Context != NULL) |
1710 | if (Input_Context != NULL) |
1655 | { |
1711 | { |
1656 | IMSetStatusPosition (); |
1712 | IMSetStatusPosition (); |
1657 | XSetICFocus (Input_Context); |
1713 | XSetICFocus (Input_Context); |
1658 | } |
1714 | } |
1659 | #endif |
1715 | #endif |
1660 | #ifdef CURSOR_BLINK |
1716 | #if CURSOR_BLINK |
1661 | if (options & Opt_cursorBlink) |
1717 | if (OPTION (Opt_cursorBlink)) |
1662 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1718 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1663 | #endif |
1719 | #endif |
1664 | #ifdef OFF_FOCUS_FADING |
1720 | #if OFF_FOCUS_FADING |
1665 | if (rs[Rs_fade]) |
1721 | if (rs[Rs_fade]) |
1666 | { |
1722 | { |
1667 | pix_colors = pix_colors_focused; |
1723 | pix_colors = pix_colors_focused; |
1668 | scr_recolour (); |
1724 | scr_recolour (); |
1669 | } |
1725 | } |
… | |
… | |
1672 | } |
1728 | } |
1673 | |
1729 | |
1674 | void |
1730 | void |
1675 | rxvt_term::focus_out () |
1731 | rxvt_term::focus_out () |
1676 | { |
1732 | { |
1677 | if (TermWin.focus) |
1733 | if (focus) |
1678 | { |
1734 | { |
1679 | TermWin.focus = 0; |
1735 | focus = 0; |
1680 | want_refresh = 1; |
1736 | want_refresh = 1; |
1681 | |
1737 | |
|
|
1738 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1739 | |
1682 | #if ENABLE_FRILLS || ISO_14755 |
1740 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1741 | if (iso14755buf) |
|
|
1742 | { |
1683 | iso14755buf = 0; |
1743 | iso14755buf = 0; |
1684 | #endif |
|
|
1685 | #if ENABLE_OVERLAY |
1744 | # if ENABLE_OVERLAY |
1686 | scr_overlay_off (); |
1745 | scr_overlay_off (); |
1687 | #endif |
1746 | # endif |
|
|
1747 | } |
|
|
1748 | #endif |
1688 | #ifdef USE_XIM |
1749 | #if USE_XIM |
1689 | if (Input_Context != NULL) |
1750 | if (Input_Context != NULL) |
1690 | XUnsetICFocus (Input_Context); |
1751 | XUnsetICFocus (Input_Context); |
1691 | #endif |
1752 | #endif |
1692 | #ifdef CURSOR_BLINK |
1753 | #if CURSOR_BLINK |
1693 | if (options & Opt_cursorBlink) |
1754 | if (OPTION (Opt_cursorBlink)) |
1694 | cursor_blink_ev.stop (); |
1755 | cursor_blink_ev.stop (); |
1695 | hidden_cursor = 0; |
1756 | hidden_cursor = 0; |
1696 | #endif |
1757 | #endif |
1697 | #ifdef OFF_FOCUS_FADING |
1758 | #if OFF_FOCUS_FADING |
1698 | if (rs[Rs_fade]) |
1759 | if (rs[Rs_fade]) |
1699 | { |
1760 | { |
1700 | pix_colors = pix_colors_unfocused; |
1761 | pix_colors = pix_colors_unfocused; |
1701 | scr_recolour (); |
1762 | scr_recolour (); |
1702 | } |
1763 | } |
… | |
… | |
1722 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1783 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1723 | return; |
1784 | return; |
1724 | |
1785 | |
1725 | /* FALLTHROUGH */ |
1786 | /* FALLTHROUGH */ |
1726 | case ReparentNotify: |
1787 | case ReparentNotify: |
1727 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1788 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1728 | want_refresh = want_full_refresh = 1; |
1789 | want_refresh = want_full_refresh = 1; |
1729 | break; |
1790 | break; |
1730 | } |
1791 | } |
1731 | } |
1792 | } |
1732 | #endif |
1793 | #endif |
… | |
… | |
1735 | rxvt_term::button_press (XButtonEvent &ev) |
1796 | rxvt_term::button_press (XButtonEvent &ev) |
1736 | { |
1797 | { |
1737 | int reportmode = 0, clickintime; |
1798 | int reportmode = 0, clickintime; |
1738 | |
1799 | |
1739 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1800 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1801 | |
1740 | if (!bypass_keystate) |
1802 | if (!bypass_keystate) |
1741 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1803 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1742 | |
1804 | |
1743 | /* |
1805 | /* |
1744 | * VT window processing of button press |
1806 | * VT window processing of button press |
1745 | */ |
1807 | */ |
1746 | if (ev.window == TermWin.vt) |
1808 | if (ev.window == vt) |
1747 | { |
1809 | { |
1748 | #if ISO_14755 |
1810 | #if ISO_14755 |
1749 | // 5.4 |
1811 | // 5.4 |
1750 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1812 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1751 | { |
1813 | { |
… | |
… | |
1793 | else |
1855 | else |
1794 | { |
1856 | { |
1795 | if (ev.button != MEvent.button) |
1857 | if (ev.button != MEvent.button) |
1796 | MEvent.clicks = 0; |
1858 | MEvent.clicks = 0; |
1797 | |
1859 | |
|
|
1860 | if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) |
1798 | switch (ev.button) |
1861 | switch (ev.button) |
1799 | { |
1862 | { |
1800 | case Button1: |
1863 | case Button1: |
1801 | /* allow meta + click to select rectangular areas */ |
1864 | /* allow meta + click to select rectangular areas */ |
1802 | /* should be done in screen.C */ |
1865 | /* should be done in screen.C */ |
1803 | #if ENABLE_FRILLS |
1866 | #if ENABLE_FRILLS |
1804 | selection.rect = !!(ev.state & ModMetaMask); |
1867 | selection.rect = !!(ev.state & ModMetaMask); |
1805 | #else |
1868 | #else |
1806 | selection.rect = false; |
1869 | selection.rect = false; |
1807 | #endif |
1870 | #endif |
1808 | |
1871 | |
1809 | /* allow shift+left click to extend selection */ |
1872 | /* allow shift+left click to extend selection */ |
1810 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1873 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1811 | { |
1874 | { |
1812 | if (MEvent.button == Button1 && clickintime) |
1875 | if (MEvent.button == Button1 && clickintime) |
1813 | selection_rotate (ev.x, ev.y); |
1876 | selection_rotate (ev.x, ev.y); |
1814 | else |
1877 | else |
1815 | selection_extend (ev.x, ev.y, 1); |
1878 | selection_extend (ev.x, ev.y, 1); |
1816 | } |
1879 | } |
1817 | else |
1880 | else |
1818 | { |
1881 | { |
1819 | if (MEvent.button == Button1 && clickintime) |
1882 | if (MEvent.button == Button1 && clickintime) |
1820 | MEvent.clicks++; |
1883 | MEvent.clicks++; |
1821 | else |
1884 | else |
1822 | MEvent.clicks = 1; |
1885 | MEvent.clicks = 1; |
1823 | |
1886 | |
1824 | selection_click (MEvent.clicks, ev.x, ev.y); |
1887 | selection_click (MEvent.clicks, ev.x, ev.y); |
1825 | } |
1888 | } |
1826 | |
1889 | |
1827 | MEvent.button = Button1; |
1890 | MEvent.button = Button1; |
1828 | break; |
1891 | break; |
1829 | |
1892 | |
1830 | case Button3: |
1893 | case Button3: |
1831 | if (MEvent.button == Button3 && clickintime) |
1894 | if (MEvent.button == Button3 && clickintime) |
1832 | selection_rotate (ev.x, ev.y); |
1895 | selection_rotate (ev.x, ev.y); |
1833 | else |
1896 | else |
1834 | selection_extend (ev.x, ev.y, 1); |
1897 | selection_extend (ev.x, ev.y, 1); |
1835 | |
1898 | |
1836 | MEvent.button = Button3; |
1899 | MEvent.button = Button3; |
1837 | break; |
1900 | break; |
1838 | } |
1901 | } |
1839 | } |
1902 | } |
1840 | |
1903 | |
1841 | MEvent.time = ev.time; |
1904 | MEvent.time = ev.time; |
1842 | return; |
1905 | return; |
1843 | } |
1906 | } |
1844 | |
1907 | |
… | |
… | |
1956 | case Button3: |
2019 | case Button3: |
1957 | if (scrollBar.style != R_SB_XTERM) |
2020 | if (scrollBar.style != R_SB_XTERM) |
1958 | { |
2021 | { |
1959 | if (scrollbar_above_slider (ev.y)) |
2022 | if (scrollbar_above_slider (ev.y)) |
1960 | # ifdef RXVT_SCROLL_FULL |
2023 | # ifdef RXVT_SCROLL_FULL |
1961 | scr_page (UP, TermWin.nrow - 1); |
2024 | scr_page (UP, nrow - 1); |
1962 | # else |
2025 | # else |
1963 | scr_page (UP, TermWin.nrow / 4); |
2026 | scr_page (UP, nrow / 4); |
1964 | # endif |
2027 | # endif |
1965 | else if (scrollbar_below_slider (ev.y)) |
2028 | else if (scrollbar_below_slider (ev.y)) |
1966 | # ifdef RXVT_SCROLL_FULL |
2029 | # ifdef RXVT_SCROLL_FULL |
1967 | scr_page (DN, TermWin.nrow - 1); |
2030 | scr_page (DN, nrow - 1); |
1968 | # else |
2031 | # else |
1969 | scr_page (DN, TermWin.nrow / 4); |
2032 | scr_page (DN, nrow / 4); |
1970 | # endif |
2033 | # endif |
1971 | else |
2034 | else |
1972 | scrollBar.setMotion (); |
2035 | scrollBar.setMotion (); |
1973 | } |
2036 | } |
1974 | else |
2037 | else |
1975 | { |
2038 | { |
1976 | scr_page ((ev.button == Button1 ? DN : UP), |
2039 | scr_page ((ev.button == Button1 ? DN : UP), |
1977 | (TermWin.nrow |
2040 | (nrow |
1978 | * scrollbar_position (ev.y) |
2041 | * scrollbar_position (ev.y) |
1979 | / scrollbar_size ())); |
2042 | / scrollbar_size ())); |
1980 | } |
2043 | } |
1981 | |
2044 | |
1982 | break; |
2045 | break; |
… | |
… | |
2014 | #ifdef SELECTION_SCROLLING |
2077 | #ifdef SELECTION_SCROLLING |
2015 | if (sel_scroll_ev.active) |
2078 | if (sel_scroll_ev.active) |
2016 | sel_scroll_ev.stop(); |
2079 | sel_scroll_ev.stop(); |
2017 | #endif |
2080 | #endif |
2018 | |
2081 | |
2019 | if (ev.window == TermWin.vt) |
2082 | if (ev.window == vt) |
2020 | { |
2083 | { |
2021 | #if ISO_14755 |
2084 | #if ISO_14755 |
2022 | // 5.4 |
2085 | // 5.4 |
2023 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2086 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2024 | return; |
2087 | return; |
… | |
… | |
2074 | |
2137 | |
2075 | v = ev.button == Button4 ? UP : DN; |
2138 | v = ev.button == Button4 ? UP : DN; |
2076 | |
2139 | |
2077 | if (ev.state & ShiftMask) |
2140 | if (ev.state & ShiftMask) |
2078 | i = 1; |
2141 | i = 1; |
2079 | else if (options & Opt_mouseWheelScrollPage) |
2142 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2080 | i = TermWin.nrow - 1; |
2143 | i = nrow - 1; |
2081 | else |
2144 | else |
2082 | i = 5; |
2145 | i = 5; |
2083 | |
2146 | |
2084 | # ifdef MOUSE_SLIP_WHEELING |
2147 | # ifdef MOUSE_SLIP_WHEELING |
2085 | if (ev.state & ControlMask) |
2148 | if (ev.state & ControlMask) |
2086 | { |
2149 | { |
2087 | mouse_slip_wheel_speed += v ? -1 : 1; |
2150 | mouse_slip_wheel_speed += v ? -1 : 1; |
2088 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2151 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2089 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2152 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2090 | |
2153 | |
2091 | if (slip_wheel_ev.at < NOW) |
2154 | if (slip_wheel_ev.at < NOW) |
2092 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2155 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2093 | |
2156 | |
2094 | slip_wheel_ev.start (); |
2157 | slip_wheel_ev.start (); |
… | |
… | |
2370 | XWindowAttributes wattr, wrootattr; |
2433 | XWindowAttributes wattr, wrootattr; |
2371 | dDisp; |
2434 | dDisp; |
2372 | |
2435 | |
2373 | pchanged = 0; |
2436 | pchanged = 0; |
2374 | |
2437 | |
2375 | if (!(options & Opt_transparent)) |
2438 | if (!OPTION (Opt_transparent)) |
2376 | return pchanged; /* Don't try any more */ |
2439 | return pchanged; /* Don't try any more */ |
2377 | |
2440 | |
2378 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2441 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2379 | rootdepth = wrootattr.depth; |
2442 | rootdepth = wrootattr.depth; |
2380 | |
2443 | |
2381 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
2444 | XGetWindowAttributes (disp, parent[0], &wattr); |
2382 | |
2445 | |
2383 | if (rootdepth != wattr.depth) |
2446 | if (rootdepth != wattr.depth) |
2384 | { |
2447 | { |
2385 | if (am_transparent) |
2448 | if (am_transparent) |
2386 | { |
2449 | { |
2387 | pchanged = 1; |
2450 | pchanged = 1; |
2388 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2451 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2389 | am_transparent = am_pixmap_trans = 0; |
2452 | am_transparent = am_pixmap_trans = 0; |
2390 | } |
2453 | } |
2391 | |
2454 | |
2392 | return pchanged; /* Don't try any more */ |
2455 | return pchanged; /* Don't try any more */ |
2393 | } |
2456 | } |
… | |
… | |
2434 | Window cr; |
2497 | Window cr; |
2435 | XImage *image; |
2498 | XImage *image; |
2436 | GC gc; |
2499 | GC gc; |
2437 | XGCValues gcvalue; |
2500 | XGCValues gcvalue; |
2438 | |
2501 | |
2439 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2502 | XTranslateCoordinates (disp, parent[0], display->root, |
2440 | 0, 0, &sx, &sy, &cr); |
2503 | 0, 0, &sx, &sy, &cr); |
2441 | nw = (unsigned int)szHint.width; |
2504 | nw = (unsigned int)szHint.width; |
2442 | nh = (unsigned int)szHint.height; |
2505 | nh = (unsigned int)szHint.height; |
2443 | nx = ny = 0; |
2506 | nx = ny = 0; |
2444 | |
2507 | |
… | |
… | |
2454 | nh += sy; |
2517 | nh += sy; |
2455 | ny = -sy; |
2518 | ny = -sy; |
2456 | sy = 0; |
2519 | sy = 0; |
2457 | } |
2520 | } |
2458 | |
2521 | |
2459 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2522 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2460 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2523 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2461 | |
2524 | |
2462 | XSync (disp, False); |
2525 | XSync (disp, False); |
2463 | allowedxerror = -1; |
2526 | allowedxerror = -1; |
2464 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2527 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2465 | |
2528 | |
… | |
… | |
2470 | if (image == NULL) |
2533 | if (image == NULL) |
2471 | { |
2534 | { |
2472 | if (am_transparent && am_pixmap_trans) |
2535 | if (am_transparent && am_pixmap_trans) |
2473 | { |
2536 | { |
2474 | pchanged = 1; |
2537 | pchanged = 1; |
2475 | if (TermWin.pixmap != None) |
2538 | if (pixmap != None) |
2476 | { |
2539 | { |
2477 | XFreePixmap (disp, TermWin.pixmap); |
2540 | XFreePixmap (disp, pixmap); |
2478 | TermWin.pixmap = None; |
2541 | pixmap = None; |
2479 | } |
2542 | } |
2480 | } |
2543 | } |
2481 | |
2544 | |
2482 | am_pixmap_trans = 0; |
2545 | am_pixmap_trans = 0; |
2483 | } |
2546 | } |
2484 | else |
2547 | else |
2485 | { |
2548 | { |
2486 | if (TermWin.pixmap != None) |
2549 | if (pixmap != None) |
2487 | XFreePixmap (disp, TermWin.pixmap); |
2550 | XFreePixmap (disp, pixmap); |
2488 | |
2551 | |
2489 | #if TINTING |
2552 | #if TINTING |
2490 | if (ISSET_PIXCOLOR (Color_tint)) |
2553 | if (ISSET_PIXCOLOR (Color_tint)) |
2491 | { |
2554 | { |
2492 | unsigned short rm, gm, bm; |
2555 | unsigned short rm, gm, bm; |
… | |
… | |
2496 | |
2559 | |
2497 | ShadeXImage (display, image, shade, rm, gm, bm); |
2560 | ShadeXImage (display, image, shade, rm, gm, bm); |
2498 | } |
2561 | } |
2499 | #endif |
2562 | #endif |
2500 | |
2563 | |
2501 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2564 | pixmap = XCreatePixmap (disp, vt, |
2502 | szHint.width, szHint.height, image->depth); |
2565 | szHint.width, szHint.height, image->depth); |
2503 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2566 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2504 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2567 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2505 | nx, ny, image->width, image->height); |
2568 | nx, ny, image->width, image->height); |
2506 | XFreeGC (disp, gc); |
2569 | XFreeGC (disp, gc); |
2507 | XDestroyImage (image); |
2570 | XDestroyImage (image); |
2508 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2571 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2509 | XClearWindow (disp, TermWin.parent[0]); |
2572 | XClearWindow (disp, parent[0]); |
2510 | |
2573 | |
2511 | if (!am_transparent || !am_pixmap_trans) |
2574 | if (!am_transparent || !am_pixmap_trans) |
2512 | pchanged = 1; |
2575 | pchanged = 1; |
2513 | |
2576 | |
2514 | am_transparent = am_pixmap_trans = 1; |
2577 | am_transparent = am_pixmap_trans = 1; |
2515 | } |
2578 | } |
2516 | } |
2579 | } |
2517 | |
2580 | |
2518 | if (am_pixmap_trans) |
2581 | if (am_pixmap_trans) |
2519 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2582 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2520 | else |
2583 | else |
2521 | { |
2584 | { |
2522 | unsigned int n; |
2585 | unsigned int n; |
2523 | /* |
2586 | /* |
2524 | * InheritPixmap transparency |
2587 | * InheritPixmap transparency |
2525 | */ |
2588 | */ |
2526 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2589 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2527 | { |
2590 | { |
2528 | oldp = TermWin.parent[i]; |
2591 | oldp = parent[i]; |
2529 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2592 | XQueryTree (disp, parent[i - 1], &root, |
2530 | &TermWin.parent[i], &list, &n); |
2593 | &parent[i], &list, &n); |
2531 | XFree (list); |
2594 | XFree (list); |
2532 | |
2595 | |
2533 | if (TermWin.parent[i] == display->root) |
2596 | if (parent[i] == display->root) |
2534 | { |
2597 | { |
2535 | if (oldp != None) |
2598 | if (oldp != None) |
2536 | pchanged = 1; |
2599 | pchanged = 1; |
2537 | |
2600 | |
2538 | break; |
2601 | break; |
2539 | } |
2602 | } |
2540 | |
2603 | |
2541 | if (oldp != TermWin.parent[i]) |
2604 | if (oldp != parent[i]) |
2542 | pchanged = 1; |
2605 | pchanged = 1; |
2543 | } |
2606 | } |
2544 | |
2607 | |
2545 | n = 0; |
2608 | n = 0; |
2546 | |
2609 | |
2547 | if (pchanged) |
2610 | if (pchanged) |
2548 | { |
2611 | { |
2549 | for (; n < (unsigned int)i; n++) |
2612 | for (; n < (unsigned int)i; n++) |
2550 | { |
2613 | { |
2551 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2614 | XGetWindowAttributes (disp, parent[n], &wattr); |
2552 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2615 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2553 | { |
2616 | { |
2554 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2617 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2555 | break; |
2618 | break; |
2556 | } |
2619 | } |
2557 | } |
2620 | } |
2558 | } |
2621 | } |
2559 | |
2622 | |
2560 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2623 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2561 | { |
2624 | { |
2562 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2625 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2563 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2626 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2564 | am_transparent = 0; |
2627 | am_transparent = 0; |
2565 | /* XXX: also turn off Opt_transparent? */ |
2628 | /* XXX: also turn off Opt_transparent? */ |
2566 | } |
2629 | } |
2567 | else |
2630 | else |
2568 | { |
2631 | { |
… | |
… | |
2571 | * needed for fvwm2.2.2 (and before?) */ |
2634 | * needed for fvwm2.2.2 (and before?) */ |
2572 | sleep (1); |
2635 | sleep (1); |
2573 | #endif |
2636 | #endif |
2574 | for (n = 0; n < (unsigned int)i; n++) |
2637 | for (n = 0; n < (unsigned int)i; n++) |
2575 | { |
2638 | { |
2576 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
2639 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2577 | XClearWindow (disp, TermWin.parent[n]); |
2640 | XClearWindow (disp, parent[n]); |
2578 | } |
2641 | } |
2579 | |
2642 | |
2580 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2643 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2581 | am_transparent = 1; |
2644 | am_transparent = 1; |
2582 | } |
2645 | } |
2583 | |
2646 | |
2584 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2647 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2585 | TermWin.parent[i] = None; |
2648 | parent[i] = None; |
2586 | } |
2649 | } |
2587 | |
2650 | |
2588 | if (scrollBar.win) |
2651 | if (scrollBar.win) |
2589 | { |
2652 | { |
2590 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2653 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
… | |
… | |
2608 | bool |
2671 | bool |
2609 | rxvt_term::cmd_parse () |
2672 | rxvt_term::cmd_parse () |
2610 | { |
2673 | { |
2611 | bool flag = false; |
2674 | bool flag = false; |
2612 | unicode_t ch = NOCHAR; |
2675 | unicode_t ch = NOCHAR; |
2613 | unsigned char *seq_begin; // remember start of esc-sequence here |
2676 | char *seq_begin; // remember start of esc-sequence here |
2614 | |
2677 | |
2615 | for (;;) |
2678 | for (;;) |
2616 | { |
2679 | { |
2617 | if (ch == NOCHAR) |
2680 | if (ch == NOCHAR) |
2618 | { |
2681 | { |
… | |
… | |
2642 | /* Read a text string from the input buffer */ |
2705 | /* Read a text string from the input buffer */ |
2643 | unicode_t buf[UBUFSIZ]; |
2706 | unicode_t buf[UBUFSIZ]; |
2644 | bool refreshnow = false; |
2707 | bool refreshnow = false; |
2645 | int nlines = 0; |
2708 | int nlines = 0; |
2646 | unicode_t *str = buf; |
2709 | unicode_t *str = buf; |
|
|
2710 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2647 | |
2711 | |
2648 | for (;;) |
2712 | for (;;) |
2649 | { |
2713 | { |
2650 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2714 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2651 | break; |
2715 | break; |
2652 | |
2716 | |
2653 | *str++ = ch; |
2717 | *str++ = ch; |
2654 | |
2718 | |
2655 | if (ch == C0_LF) |
2719 | if (ch == C0_LF || str >= eol) |
2656 | { |
2720 | { |
|
|
2721 | if (ch == C0_LF) |
2657 | nlines++; |
2722 | nlines++; |
|
|
2723 | |
2658 | refresh_count++; |
2724 | refresh_count++; |
2659 | |
2725 | |
2660 | if (!(options & Opt_jumpScroll) |
2726 | if (!OPTION (Opt_jumpScroll) |
2661 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2727 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2662 | { |
2728 | { |
2663 | refreshnow = true; |
2729 | refreshnow = true; |
|
|
2730 | refresh_count = 0; |
2664 | ch = NOCHAR; |
2731 | ch = NOCHAR; |
2665 | break; |
2732 | break; |
2666 | } |
2733 | } |
2667 | |
2734 | |
2668 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2735 | // scr_add_lines only works for nlines <= nrow - 1. |
2669 | if (nlines >= TermWin.nrow - 1) |
2736 | if (nlines >= nrow - 1) |
2670 | { |
2737 | { |
2671 | scr_add_lines (buf, nlines, str - buf); |
2738 | scr_add_lines (buf, nlines, str - buf); |
2672 | nlines = 0; |
2739 | nlines = 0; |
2673 | str = buf; |
2740 | str = buf; |
|
|
2741 | eol = str + min (ncol, UBUFSIZ); |
2674 | } |
2742 | } |
2675 | } |
|
|
2676 | |
2743 | |
2677 | if (str >= buf + UBUFSIZ) |
2744 | if (str >= eol) |
2678 | { |
2745 | { |
|
|
2746 | if (eol >= buf + UBUFSIZ) |
|
|
2747 | { |
2679 | ch = NOCHAR; |
2748 | ch = NOCHAR; |
2680 | break; |
2749 | break; |
|
|
2750 | } |
|
|
2751 | else |
|
|
2752 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2753 | } |
|
|
2754 | |
2681 | } |
2755 | } |
2682 | |
2756 | |
2683 | seq_begin = cmdbuf_ptr; |
2757 | seq_begin = cmdbuf_ptr; |
2684 | ch = next_char (); |
2758 | ch = next_char (); |
2685 | } |
2759 | } |
… | |
… | |
2692 | * the number of pages between refreshes is refresh_limit, which |
2766 | * the number of pages between refreshes is refresh_limit, which |
2693 | * is incremented here because we must be doing flat-out scrolling. |
2767 | * is incremented here because we must be doing flat-out scrolling. |
2694 | */ |
2768 | */ |
2695 | if (refreshnow) |
2769 | if (refreshnow) |
2696 | { |
2770 | { |
2697 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2771 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2698 | refresh_limit++; |
2772 | refresh_limit++; |
2699 | else |
2773 | else |
2700 | { |
2774 | { |
2701 | flag = true; |
2775 | flag = true; |
2702 | scr_refresh (refresh_type); |
2776 | scr_refresh (refresh_type); |
|
|
2777 | flush_ev.stop (); |
2703 | } |
2778 | } |
2704 | } |
2779 | } |
2705 | |
2780 | |
2706 | } |
2781 | } |
2707 | else |
2782 | else |
… | |
… | |
2738 | rxvt_term::next_char () |
2813 | rxvt_term::next_char () |
2739 | { |
2814 | { |
2740 | while (cmdbuf_ptr < cmdbuf_endp) |
2815 | while (cmdbuf_ptr < cmdbuf_endp) |
2741 | { |
2816 | { |
2742 | // assume 7-bit to be ascii ALWAYS |
2817 | // assume 7-bit to be ascii ALWAYS |
2743 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2818 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2744 | return *cmdbuf_ptr++; |
2819 | return *cmdbuf_ptr++; |
2745 | |
2820 | |
2746 | wchar_t wc; |
2821 | wchar_t wc; |
2747 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2822 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2748 | |
2823 | |
2749 | if (len == (size_t)-2) |
2824 | if (len == (size_t)-2) |
2750 | { |
2825 | { |
2751 | // the mbstate stores incomplete sequences. didn't know this :/ |
2826 | // the mbstate stores incomplete sequences. didn't know this :/ |
2752 | cmdbuf_ptr = cmdbuf_endp; |
2827 | cmdbuf_ptr = cmdbuf_endp; |
… | |
… | |
2891 | case C0_ESC: |
2966 | case C0_ESC: |
2892 | process_escape_seq (); |
2967 | process_escape_seq (); |
2893 | break; |
2968 | break; |
2894 | case C0_ENQ: /* terminal Status */ |
2969 | case C0_ENQ: /* terminal Status */ |
2895 | if (rs[Rs_answerbackstring]) |
2970 | if (rs[Rs_answerbackstring]) |
2896 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2971 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2897 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2898 | else |
2972 | else |
2899 | tt_write ((unsigned char *)VT100_ANS, |
2973 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2900 | (unsigned int)strlen (VT100_ANS)); |
|
|
2901 | break; |
2974 | break; |
2902 | case C0_BEL: /* bell */ |
2975 | case C0_BEL: /* bell */ |
2903 | scr_bell (); |
2976 | scr_bell (); |
2904 | break; |
2977 | break; |
2905 | case C0_BS: /* backspace */ |
2978 | case C0_BS: /* backspace */ |
… | |
… | |
3093 | process_dcs_seq (); |
3166 | process_dcs_seq (); |
3094 | break; |
3167 | break; |
3095 | |
3168 | |
3096 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3169 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3097 | case C1_SCI: /* ESC Z */ |
3170 | case C1_SCI: /* ESC Z */ |
3098 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3171 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3099 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3100 | break; /* steal obsolete ESC [ c */ |
3172 | break; /* steal obsolete ESC [ c */ |
3101 | |
3173 | |
3102 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3174 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3103 | case C1_CSI: /* ESC [ */ |
3175 | case C1_CSI: /* ESC [ */ |
3104 | process_csi_seq (); |
3176 | process_csi_seq (); |
… | |
… | |
3344 | |
3416 | |
3345 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3417 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3346 | arg[0] = -arg[0]; |
3418 | arg[0] = -arg[0]; |
3347 | /* FALLTHROUGH */ |
3419 | /* FALLTHROUGH */ |
3348 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3420 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3349 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3421 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3350 | break; |
3422 | break; |
3351 | |
3423 | |
3352 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3424 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3353 | tt_write ((const unsigned char *)VT100_ANS, |
3425 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3354 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3355 | break; |
3426 | break; |
3356 | |
3427 | |
3357 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3428 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3358 | process_sgr_mode (nargs, arg); |
3429 | process_sgr_mode (nargs, arg); |
3359 | break; |
3430 | break; |
… | |
… | |
3366 | break; |
3437 | break; |
3367 | case 6: /* CPR requested */ |
3438 | case 6: /* CPR requested */ |
3368 | scr_report_position (); |
3439 | scr_report_position (); |
3369 | break; |
3440 | break; |
3370 | case 7: /* unofficial extension */ |
3441 | case 7: /* unofficial extension */ |
3371 | if (options & Opt_insecure) |
3442 | if (OPTION (Opt_insecure)) |
3372 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3443 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3373 | break; |
3444 | break; |
3374 | case 8: /* unofficial extension */ |
3445 | case 8: /* unofficial extension */ |
3375 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3446 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3376 | break; |
3447 | break; |
… | |
… | |
3479 | { |
3550 | { |
3480 | /* |
3551 | /* |
3481 | * commands |
3552 | * commands |
3482 | */ |
3553 | */ |
3483 | case 1: /* deiconify window */ |
3554 | case 1: /* deiconify window */ |
3484 | XMapWindow (disp, TermWin.parent[0]); |
3555 | XMapWindow (disp, parent[0]); |
3485 | break; |
3556 | break; |
3486 | case 2: /* iconify window */ |
3557 | case 2: /* iconify window */ |
3487 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3558 | XIconifyWindow (disp, parent[0], display->screen); |
3488 | break; |
3559 | break; |
3489 | case 3: /* set position (pixels) */ |
3560 | case 3: /* set position (pixels) */ |
3490 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3561 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3491 | break; |
3562 | break; |
3492 | case 4: /* set size (pixels) */ |
3563 | case 4: /* set size (pixels) */ |
3493 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3564 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3494 | break; |
3565 | break; |
3495 | case 5: /* raise window */ |
3566 | case 5: /* raise window */ |
3496 | XRaiseWindow (disp, TermWin.parent[0]); |
3567 | XRaiseWindow (disp, parent[0]); |
3497 | break; |
3568 | break; |
3498 | case 6: /* lower window */ |
3569 | case 6: /* lower window */ |
3499 | XLowerWindow (disp, TermWin.parent[0]); |
3570 | XLowerWindow (disp, parent[0]); |
3500 | break; |
3571 | break; |
3501 | case 7: /* refresh window */ |
3572 | case 7: /* refresh window */ |
3502 | scr_touch (true); |
3573 | scr_touch (true); |
3503 | break; |
3574 | break; |
3504 | case 8: /* set size (chars) */ |
3575 | case 8: /* set size (chars) */ |
3505 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3576 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3506 | (unsigned int) (args[1] * TermWin.fheight)); |
3577 | (unsigned int) (args[1] * fheight)); |
3507 | break; |
3578 | break; |
3508 | |
3579 | |
3509 | //case 9: NYI, TODO, restore maximized window or maximize window |
3580 | //case 9: NYI, TODO, restore maximized window or maximize window |
3510 | default: |
3581 | default: |
3511 | if (args[0] >= 24) /* set height (chars) */ |
3582 | if (args[0] >= 24) /* set height (chars) */ |
3512 | set_widthheight ((unsigned int)TermWin.width, |
3583 | set_widthheight ((unsigned int)width, |
3513 | (unsigned int) (args[1] * TermWin.fheight)); |
3584 | (unsigned int) (args[1] * fheight)); |
3514 | break; |
3585 | break; |
3515 | |
3586 | |
3516 | |
3587 | |
3517 | /* |
3588 | /* |
3518 | * reports - some output format copied from XTerm |
3589 | * reports - some output format copied from XTerm |
3519 | */ |
3590 | */ |
3520 | case 11: /* report window state */ |
3591 | case 11: /* report window state */ |
3521 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3592 | XGetWindowAttributes (disp, parent[0], &wattr); |
3522 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3593 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3523 | break; |
3594 | break; |
3524 | case 13: /* report window position */ |
3595 | case 13: /* report window position */ |
3525 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3596 | XGetWindowAttributes (disp, parent[0], &wattr); |
3526 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3597 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3527 | -wattr.border_width, -wattr.border_width, |
3598 | -wattr.border_width, -wattr.border_width, |
3528 | &x, &y, &wdummy); |
3599 | &x, &y, &wdummy); |
3529 | tt_printf ("\033[3;%d;%dt", x, y); |
3600 | tt_printf ("\033[3;%d;%dt", x, y); |
3530 | break; |
3601 | break; |
3531 | case 14: /* report window size (pixels) */ |
3602 | case 14: /* report window size (pixels) */ |
3532 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3603 | XGetWindowAttributes (disp, parent[0], &wattr); |
3533 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3604 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3534 | break; |
3605 | break; |
3535 | case 18: /* report text area size (chars) */ |
3606 | case 18: /* report text area size (chars) */ |
3536 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3607 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3537 | break; |
3608 | break; |
3538 | case 19: /* report window size (chars) */ |
3609 | case 19: /* report window size (chars) */ |
3539 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3610 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3540 | break; |
3611 | break; |
3541 | case 20: /* report icon label */ |
3612 | case 20: /* report icon label */ |
3542 | { |
3613 | { |
3543 | char *s; |
3614 | char *s; |
3544 | XGetIconName (disp, TermWin.parent[0], &s); |
3615 | XGetIconName (disp, parent[0], &s); |
3545 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3616 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3546 | XFree (s); |
3617 | XFree (s); |
3547 | } |
3618 | } |
3548 | break; |
3619 | break; |
3549 | case 21: /* report window title */ |
3620 | case 21: /* report window title */ |
3550 | { |
3621 | { |
3551 | char *s; |
3622 | char *s; |
3552 | XFetchName (disp, TermWin.parent[0], &s); |
3623 | XFetchName (disp, parent[0], &s); |
3553 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3624 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3554 | XFree (s); |
3625 | XFree (s); |
3555 | } |
3626 | } |
3556 | break; |
3627 | break; |
3557 | } |
3628 | } |
3558 | } |
3629 | } |
… | |
… | |
3561 | /*----------------------------------------------------------------------*/ |
3632 | /*----------------------------------------------------------------------*/ |
3562 | /* |
3633 | /* |
3563 | * get input up until STRING TERMINATOR (or BEL) |
3634 | * get input up until STRING TERMINATOR (or BEL) |
3564 | * ends_how is terminator used. returned input must be free()'d |
3635 | * ends_how is terminator used. returned input must be free()'d |
3565 | */ |
3636 | */ |
3566 | unsigned char * |
3637 | char * |
3567 | rxvt_term::get_to_st (unicode_t &ends_how) |
3638 | rxvt_term::get_to_st (unicode_t &ends_how) |
3568 | { |
3639 | { |
3569 | unicode_t ch; |
3640 | unicode_t ch; |
3570 | bool seen_esc = false; |
3641 | bool seen_esc = false; |
3571 | unsigned int n = 0; |
3642 | unsigned int n = 0; |
… | |
… | |
3604 | |
3675 | |
3605 | string[n++] = '\0'; |
3676 | string[n++] = '\0'; |
3606 | |
3677 | |
3607 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3678 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3608 | |
3679 | |
3609 | return (unsigned char *)rxvt_wcstombs (string); |
3680 | return rxvt_wcstombs (string); |
3610 | } |
3681 | } |
3611 | |
3682 | |
3612 | /*----------------------------------------------------------------------*/ |
3683 | /*----------------------------------------------------------------------*/ |
3613 | /* |
3684 | /* |
3614 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3685 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3615 | */ |
3686 | */ |
3616 | void |
3687 | void |
3617 | rxvt_term::process_dcs_seq () |
3688 | rxvt_term::process_dcs_seq () |
3618 | { |
3689 | { |
3619 | unsigned char *s; |
3690 | char *s; |
3620 | unicode_t eh; |
3691 | unicode_t eh; |
3621 | |
3692 | |
3622 | /* |
3693 | /* |
3623 | * Not handled yet |
3694 | * Not handled yet |
3624 | */ |
3695 | */ |
… | |
… | |
3643 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3714 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3644 | arg = arg * 10 + (ch - '0'); |
3715 | arg = arg * 10 + (ch - '0'); |
3645 | |
3716 | |
3646 | if (ch == ';') |
3717 | if (ch == ';') |
3647 | { |
3718 | { |
3648 | unsigned char *s = get_to_st (eh); |
3719 | char *s = get_to_st (eh); |
3649 | |
3720 | |
3650 | if (s) |
3721 | if (s) |
3651 | { |
3722 | { |
3652 | process_xterm_seq (arg, (char *)s, eh); |
3723 | process_xterm_seq (arg, s, eh); |
3653 | free (s); |
3724 | free (s); |
3654 | } |
3725 | } |
3655 | } |
3726 | } |
3656 | } |
3727 | } |
3657 | |
3728 | |
3658 | void |
3729 | void |
3659 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3730 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3660 | { |
3731 | { |
3661 | if (str[0] == '?' && !str[1]) |
3732 | if (str[0] == '?' && !str[1]) |
3662 | { |
3733 | { |
3663 | unsigned short r, g, b; |
3734 | unsigned short r, g, b; |
3664 | pix_colors_focused[color].get (display, r, g, b); |
3735 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3670 | |
3741 | |
3671 | /* |
3742 | /* |
3672 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3743 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3673 | */ |
3744 | */ |
3674 | void |
3745 | void |
3675 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3746 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3676 | { |
3747 | { |
3677 | int changed = 0; |
3748 | int changed = 0; |
3678 | int color; |
3749 | int color; |
3679 | char *buf, *name; |
3750 | char *buf, *name; |
3680 | bool query = str[0] == '?' && !str[1]; |
3751 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3703 | unsigned long bytes_after; |
3774 | unsigned long bytes_after; |
3704 | unsigned char *value = 0; |
3775 | unsigned char *value = 0; |
3705 | const char *str = ""; |
3776 | const char *str = ""; |
3706 | |
3777 | |
3707 | if (prop |
3778 | if (prop |
3708 | && XGetWindowProperty (disp, TermWin.parent[0], |
3779 | && XGetWindowProperty (disp, parent[0], |
3709 | prop, 0, 1<<16, 0, AnyPropertyType, |
3780 | prop, 0, 1<<16, 0, AnyPropertyType, |
3710 | &actual_type, &actual_format, |
3781 | &actual_type, &actual_format, |
3711 | &nitems, &bytes_after, &value) == Success |
3782 | &nitems, &bytes_after, &value) == Success |
3712 | && actual_type != None |
3783 | && actual_type != None |
3713 | && actual_format == 8) |
3784 | && actual_format == 8) |
… | |
… | |
3725 | { |
3796 | { |
3726 | *eq = 0; |
3797 | *eq = 0; |
3727 | set_utf8_property (display->atom (str), eq + 1); |
3798 | set_utf8_property (display->atom (str), eq + 1); |
3728 | } |
3799 | } |
3729 | else |
3800 | else |
3730 | XDeleteProperty (disp, TermWin.parent[0], |
3801 | XDeleteProperty (disp, parent[0], |
3731 | display->atom (str)); |
3802 | display->atom (str)); |
3732 | } |
3803 | } |
3733 | break; |
3804 | break; |
3734 | |
3805 | |
3735 | case XTerm_Color: |
3806 | case XTerm_Color: |
… | |
… | |
3834 | // TODO, when secure mode? |
3905 | // TODO, when secure mode? |
3835 | break; |
3906 | break; |
3836 | |
3907 | |
3837 | #ifdef MENUBAR |
3908 | #ifdef MENUBAR |
3838 | case URxvt_Menu: |
3909 | case URxvt_Menu: |
3839 | if (options & Opt_insecure) |
3910 | if (OPTION (Opt_insecure)) |
3840 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3911 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3841 | break; |
3912 | break; |
3842 | #endif |
3913 | #endif |
3843 | #if 0 |
3914 | #if 0 |
3844 | case XTerm_dumpscreen: /* no error notices */ |
3915 | case XTerm_dumpscreen: /* no error notices */ |
… | |
… | |
3860 | case URxvt_italicFont: |
3931 | case URxvt_italicFont: |
3861 | case URxvt_boldItalicFont: |
3932 | case URxvt_boldItalicFont: |
3862 | #endif |
3933 | #endif |
3863 | if (query) |
3934 | if (query) |
3864 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3935 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3865 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3936 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3866 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3937 | ? fontset[op - URxvt_font]->fontdesc : "", |
3867 | resp); |
3938 | resp); |
3868 | else |
3939 | else |
3869 | { |
3940 | { |
3870 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3941 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3871 | |
3942 | |
… | |
… | |
3876 | break; |
3947 | break; |
3877 | |
3948 | |
3878 | #if ENABLE_FRILLS |
3949 | #if ENABLE_FRILLS |
3879 | case URxvt_locale: |
3950 | case URxvt_locale: |
3880 | if (query) |
3951 | if (query) |
3881 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
3952 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3882 | else |
3953 | else |
3883 | { |
3954 | { |
3884 | set_locale (str); |
3955 | set_locale (str); |
3885 | pty.set_utf8_mode (enc_utf8); |
3956 | pty.set_utf8_mode (enc_utf8); |
3886 | init_xlocale (); |
3957 | init_xlocale (); |
3887 | } |
3958 | } |
3888 | break; |
3959 | break; |
3889 | |
3960 | |
3890 | case URxvt_view_up: |
3961 | case URxvt_view_up: |
3891 | case URxvt_view_down: |
3962 | case URxvt_view_down: |
|
|
3963 | { |
3892 | int lines = atoi (str); |
3964 | int lines = atoi (str); |
3893 | |
3965 | |
3894 | if (lines) |
3966 | if (lines) |
3895 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3967 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3896 | else |
3968 | else |
3897 | { |
|
|
3898 | scr_erase_savelines (); |
3969 | scr_erase_savelines (); |
3899 | } |
3970 | } |
3900 | |
3971 | |
|
|
3972 | break; |
|
|
3973 | #endif |
|
|
3974 | |
|
|
3975 | #if ENABLE_PERL |
|
|
3976 | case URxvt_perl: |
|
|
3977 | if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
|
|
3978 | ; // no responses yet |
3901 | break; |
3979 | break; |
3902 | #endif |
3980 | #endif |
3903 | } |
3981 | } |
3904 | } |
3982 | } |
3905 | /*----------------------------------------------------------------------*/ |
3983 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4014 | } |
4092 | } |
4015 | |
4093 | |
4016 | /* extra handling for values with state unkept */ |
4094 | /* extra handling for values with state unkept */ |
4017 | switch (arg[i]) |
4095 | switch (arg[i]) |
4018 | { |
4096 | { |
|
|
4097 | #if ENABLE_STYLES |
|
|
4098 | case 1021: |
|
|
4099 | if (mode) |
|
|
4100 | SET_OPTION (Opt_intensityStyles); |
|
|
4101 | else |
|
|
4102 | CLR_OPTION (Opt_intensityStyles); |
|
|
4103 | |
|
|
4104 | scr_touch (true); |
|
|
4105 | break; |
|
|
4106 | #endif |
4019 | case 1048: /* alternative cursor save */ |
4107 | case 1048: /* alternative cursor save */ |
4020 | case 1049: |
4108 | case 1049: |
4021 | if (options & Opt_secondaryScreen) |
4109 | if (OPTION (Opt_secondaryScreen)) |
4022 | if (mode == 0) |
4110 | if (mode == 0) |
4023 | scr_cursor (RESTORE); |
4111 | scr_cursor (RESTORE); |
4024 | else if (mode == 1) |
4112 | else if (mode == 1) |
4025 | scr_cursor (SAVE); |
4113 | scr_cursor (SAVE); |
4026 | break; |
4114 | break; |
… | |
… | |
4038 | */ |
4126 | */ |
4039 | PrivMode (1, PrivMode_vt52); |
4127 | PrivMode (1, PrivMode_vt52); |
4040 | break; |
4128 | break; |
4041 | case 3: /* 80/132 */ |
4129 | case 3: /* 80/132 */ |
4042 | if (priv_modes & PrivMode_132OK) |
4130 | if (priv_modes & PrivMode_132OK) |
4043 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4131 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4044 | break; |
4132 | break; |
4045 | case 4: /* smooth scrolling */ |
4133 | case 4: /* smooth scrolling */ |
4046 | if (state) |
4134 | if (!state) |
4047 | options &= ~Opt_jumpScroll; |
4135 | SET_OPTION (Opt_jumpScroll); |
4048 | else |
4136 | else |
4049 | options |= Opt_jumpScroll; |
4137 | CLR_OPTION (Opt_jumpScroll); |
4050 | break; |
4138 | break; |
4051 | case 5: /* reverse video */ |
4139 | case 5: /* reverse video */ |
4052 | scr_rvideo_mode (state); |
4140 | scr_rvideo_mode (state); |
4053 | break; |
4141 | break; |
4054 | case 6: /* relative/absolute origins */ |
4142 | case 6: /* relative/absolute origins */ |
… | |
… | |
4095 | #if 0 |
4183 | #if 0 |
4096 | case 1001: |
4184 | case 1001: |
4097 | break; /* X11 mouse highlighting */ |
4185 | break; /* X11 mouse highlighting */ |
4098 | #endif |
4186 | #endif |
4099 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4187 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4100 | if (state) |
4188 | if (!state) |
4101 | options &= ~Opt_scrollTtyOutput; |
4189 | SET_OPTION (Opt_scrollTtyOutput); |
4102 | else |
4190 | else |
4103 | options |= Opt_scrollTtyOutput; |
4191 | CLR_OPTION (Opt_scrollTtyOutput); |
4104 | break; |
4192 | break; |
4105 | case 1011: /* scroll to bottom on key press */ |
4193 | case 1011: /* scroll to bottom on key press */ |
4106 | if (state) |
4194 | if (state) |
4107 | options |= Opt_scrollTtyKeypress; |
4195 | SET_OPTION (Opt_scrollTtyKeypress); |
4108 | else |
4196 | else |
4109 | options &= ~Opt_scrollTtyKeypress; |
4197 | CLR_OPTION (Opt_scrollTtyKeypress); |
4110 | break; |
4198 | break; |
4111 | case 1047: /* secondary screen w/ clearing last */ |
4199 | case 1047: /* secondary screen w/ clearing last */ |
4112 | if (options & Opt_secondaryScreen) |
4200 | if (OPTION (Opt_secondaryScreen)) |
4113 | if (current_screen != PRIMARY) |
4201 | if (current_screen != PRIMARY) |
4114 | scr_erase_screen (2); |
4202 | scr_erase_screen (2); |
4115 | scr_change_screen (state); |
4203 | scr_change_screen (state); |
4116 | break; |
4204 | break; |
4117 | case 1049: /* secondary screen w/ clearing first */ |
4205 | case 1049: /* secondary screen w/ clearing first */ |
4118 | scr_change_screen (state); |
4206 | scr_change_screen (state); |
4119 | if (options & Opt_secondaryScreen) |
4207 | if (OPTION (Opt_secondaryScreen)) |
4120 | if (current_screen != PRIMARY) |
4208 | if (current_screen != PRIMARY) |
4121 | scr_erase_screen (2); |
4209 | scr_erase_screen (2); |
4122 | break; |
4210 | break; |
4123 | default: |
4211 | default: |
4124 | break; |
4212 | break; |
… | |
… | |
4274 | case 106: |
4362 | case 106: |
4275 | case 107: |
4363 | case 107: |
4276 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4364 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4277 | break; |
4365 | break; |
4278 | #endif |
4366 | #endif |
4279 | |
|
|
4280 | } |
4367 | } |
4281 | } |
4368 | } |
4282 | } |
4369 | } |
4283 | /*}}} */ |
4370 | /*}}} */ |
4284 | |
4371 | |
… | |
… | |
4308 | */ |
4395 | */ |
4309 | void |
4396 | void |
4310 | rxvt_term::tt_printf (const char *fmt,...) |
4397 | rxvt_term::tt_printf (const char *fmt,...) |
4311 | { |
4398 | { |
4312 | va_list arg_ptr; |
4399 | va_list arg_ptr; |
4313 | unsigned char buf[256]; |
4400 | char buf[256]; |
4314 | |
4401 | |
4315 | va_start (arg_ptr, fmt); |
4402 | va_start (arg_ptr, fmt); |
4316 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4403 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4317 | va_end (arg_ptr); |
4404 | va_end (arg_ptr); |
4318 | tt_write (buf, strlen (buf)); |
4405 | tt_write (buf, strlen (buf)); |
… | |
… | |
4323 | * or generated by us in response to a query ESC sequence. |
4410 | * or generated by us in response to a query ESC sequence. |
4324 | */ |
4411 | */ |
4325 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4412 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4326 | |
4413 | |
4327 | void |
4414 | void |
4328 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4415 | rxvt_term::tt_write (const char *data, unsigned int len) |
4329 | { |
4416 | { |
4330 | if (v_buflen == 0) |
4417 | if (v_buflen == 0) |
4331 | { |
4418 | { |
4332 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4419 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4333 | |
4420 | |
… | |
… | |
4336 | |
4423 | |
4337 | data += written; |
4424 | data += written; |
4338 | len -= written; |
4425 | len -= written; |
4339 | } |
4426 | } |
4340 | |
4427 | |
4341 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4428 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4342 | |
4429 | |
4343 | memcpy (v_buffer + v_buflen, data, len); |
4430 | memcpy (v_buffer + v_buflen, data, len); |
4344 | v_buflen += len; |
4431 | v_buflen += len; |
4345 | |
4432 | |
4346 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4433 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
… | |
… | |
4365 | } |
4452 | } |
4366 | |
4453 | |
4367 | memmove (v_buffer, v_buffer + written, v_buflen); |
4454 | memmove (v_buffer, v_buffer + written, v_buflen); |
4368 | } |
4455 | } |
4369 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4456 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4370 | // original code just ignores this... |
4457 | pty_ev.set (EVENT_READ); |
4371 | destroy (); |
|
|
4372 | } |
4458 | } |
4373 | |
4459 | |
4374 | /*----------------------- end-of-file (C source) -----------------------*/ |
4460 | /*----------------------- end-of-file (C source) -----------------------*/ |
4375 | |
4461 | |