ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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
… …
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_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
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_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
220void 250void
221rxvt_term::commit_iso14755 () 251rxvt_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 {
… …
316 346
317 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
321 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
324 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 357 SET_LOCALE (locale);
326 358
327 if (status_return == XLookupChars 359 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
350 } 382 }
351 else 383 else
352#endif 384#endif
353 { 385 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
356 } 388 }
357 389
358 if (valid_keysym) 390 if (valid_keysym)
359 { 391 {
360#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 394 return;
363#endif 395#endif
364 396
365 if (TermWin.saveLines) 397 if (saveLines)
366 { 398 {
367#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 400 if (!ctrl && !meta)
369#else 401#else
370 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
371#endif 403#endif
372 { 404 {
373 int lnsppg; 405 int lnsppg;
374 406
375#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 409#else
378 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
379#endif 411#endif
380 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
381 { 413 {
382 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
383 return; 415 return;
… …
411 scr_move_to (0, 1); 443 scr_move_to (0, 1);
412 return; 444 return;
413 } 445 }
414 else if (keysym == XK_End) 446 else if (keysym == XK_End)
415 { 447 {
416 scr_move_to (1, 0); 448 scr_move_to (1, 1);
417 return; 449 return;
418 } 450 }
419 } 451 }
420#endif 452#endif
421 } 453 }
… …
432 { 464 {
433 switch (keysym) 465 switch (keysym)
434 { 466 {
435 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
436 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
437 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, Sel_Primary);
438 return; 470 return;
439#if TODO 471#if TODO
440 /* rxvt extras */ 472 /* rxvt extras */
441 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
442 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
823 { 855 {
824#ifdef META8_OPTION 856#ifdef META8_OPTION
825 /* set 8-bit on */ 857 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
827 { 859 {
828 unsigned char *ch; 860 char *ch;
829 861
830 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 863 *ch |= 0x80;
832 864
833 meta = 0; 865 meta = 0;
… …
835#endif 867#endif
836 /* nil */ ; 868 /* nil */ ;
837 } 869 }
838 } 870 }
839 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
840 if (len <= 0) 875 if (len <= 0)
841 return; /* not mapped */ 876 return; /* not mapped */
842 877
843 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 879 if (view_start)
845 { 880 {
846 TermWin.view_start = 0; 881 view_start = 0;
847 want_refresh = 1; 882 want_refresh = 1;
848 } 883 }
849 884
850 /* 885 /*
851 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 901#ifdef META8_OPTION
867 && meta_char == C0_ESC 902 && meta_char == C0_ESC
868#endif 903#endif
869 ) 904 )
870 { 905 {
871 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
872 tt_write (&ch, 1); 907 tt_write (&ch, 1);
873 } 908 }
874 909
875#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
884#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
885 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
886} 921}
887/*}}} */ 922/*}}} */
888 923
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */
892unsigned int 925unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 927{
895 unsigned int n, s; 928 unsigned int n, s;
896 929
897 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 968 }
936#endif 969#endif
937 970
938 if (want_refresh) 971 if (want_refresh)
939 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
940 scr_refresh (refresh_type); 1011 scr_refresh ();
941 scrollbar_show (1); 1012 scrollbar_show (1);
942#ifdef USE_XIM 1013#ifdef USE_XIM
943 IMSendSpot (); 1014 IMSendSpot ();
944#endif 1015#endif
945 } 1016 }
… …
948} 1019}
949 1020
950void 1021void
951rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
952{ 1023{
953 SET_R (this); 1024 make_current ();
954 SET_LOCALE (locale);
955 1025
956 display->flush (); 1026 display->flush ();
957 1027
958 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1030}
961 1031
962void 1032void
963rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
964{ 1034{
965 SET_R (this); 1035 make_current ();
966 SET_LOCALE (locale);
967 1036
968 refresh_limit = 1; 1037 refresh_limit = 1;
969 refresh_count = 0; 1038 refresh_count = 0;
970 flush (); 1039 flush ();
971} 1040}
… …
999rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1000{ 1069{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 { 1072 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1073 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 } 1075 }
1008} 1076}
1009#endif 1077#endif
… …
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1014{ 1082{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1084 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1086 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 } 1088 }
1022} 1089}
1023#endif 1090#endif
… …
1028{ 1095{
1029 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1099 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1100 if (view_start == top_row || view_start == 0)
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1036 1102
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1103 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1105 }
1041} 1106}
1042#endif 1107#endif
1043 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
1044bool 1127bool
1045rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
1046{ 1129{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1131
1049 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1050 { 1133 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1135 n = 0;
1053 } 1136 }
1054 1137
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1058 1141
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1143
1061 if (n > 0) 1144 if (r > 0)
1062 { 1145 {
1063 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
1064 return true; 1147 return true;
1065 } 1148 }
1066 else if (n < 0 && errno != EAGAIN) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1157 {
1158 pty_ev.stop ();
1159
1160 if (!OPTION (Opt_hold))
1067 destroy (); 1161 destroy ();
1162 }
1068 1163
1069 return false; 1164 return false;
1070} 1165}
1071 1166
1072void 1167void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1074{ 1169{
1075 SET_R (this); 1170 make_current ();
1076 SET_LOCALE (locale);
1077 1171
1078 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1174 while (pty_fill ())
1081 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1086} 1180}
1087 1181
1088void 1182void
1089rxvt_term::pointer_unblank () 1183rxvt_term::pointer_unblank ()
1090{ 1184{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1185 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1186 recolour_cursor ();
1093 1187
1094#ifdef POINTER_BLANK 1188#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1189 hidden_pointer = 0;
1096 1190
1097 if (options & Opt_pointerBlank) 1191 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1192 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1193#endif
1100} 1194}
1101 1195
1102#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1103void 1197void
1104rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1105{ 1199{
1106 if (! (options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1107 return; 1201 return;
1108 1202
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1204 XFlush (display->display);
1111 1205
1112 hidden_pointer = 1; 1206 hidden_pointer = 1;
1113} 1207}
1114 1208
1115void 1209void
1116rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1117{ 1211{
1118 SET_R (this); 1212 make_current ();
1119 SET_LOCALE (locale);
1120 1213
1121 pointer_blank (); 1214 pointer_blank ();
1122} 1215}
1123#endif 1216#endif
1124 1217
… …
1203 1296
1204/*{{{ process an X event */ 1297/*{{{ process an X event */
1205void 1298void
1206rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1207{ 1300{
1301 make_current ();
1302
1208 dDisp; 1303 dDisp;
1209 1304
1210 SET_R (this); 1305 if (ev.xany.window == vt
1211 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1212 1309
1213#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1215 {
1216 if (hidden_cursor)
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 }
1224#endif
1225
1226#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1228 {
1229 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease)
1232 if (hidden_pointer)
1233 pointer_unblank ();
1234
1235 if (ev.type == KeyPress && hidden_pointer == 0)
1236 pointer_blank ();
1237 }
1238#endif
1239
1240 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1313 unsigned int unused_mask;
1243 1314
1244 switch (ev.type) 1315 switch (ev.type)
… …
1251 1322
1252 break; 1323 break;
1253 1324
1254 case KeyRelease: 1325 case KeyRelease:
1255 { 1326 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1257 KeySym ks; 1328 KeySym keysym;
1258 1329
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif 1331#endif
1261 1332
1262#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support 1334 // ISO 14755 support
1264 if (iso14755buf) 1335 if (iso14755buf)
… …
1269# endif 1340# endif
1270# if ISO_14755 1341# if ISO_14755
1271 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1272 // first: controls 1343 // first: controls
1273 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1276 { 1347 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1278 commit_iso14755 (); 1349 commit_iso14755 ();
1279 return; // case-break; 1350 goto skip_switch;
1280 } 1351 }
1281 1352
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks) 1354 if (i[0] == keysym)
1284 { 1355 {
1285 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 (); 1357 commit_iso14755 ();
1287 return; // case-break; 1358 goto skip_switch;
1288 } 1359 }
1289 1360
1290 scr_bell (); 1361 scr_bell ();
1291# endif 1362# endif
1292 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1311 else 1382 else
1312 iso14755buf = 0; 1383 iso14755buf = 0;
1313 } 1384 }
1314#endif 1385#endif
1315 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1320 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1321#endif 1396#endif
1322 break; 1397 break;
1323 } 1398 }
1324 1399
… …
1416 case FocusOut: 1491 case FocusOut:
1417 focus_out (); 1492 focus_out ();
1418 break; 1493 break;
1419 1494
1420 case ConfigureNotify: 1495 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1496 if (ev.xconfigure.window == parent[0])
1422 { 1497 {
1423 int height, width;
1424
1425 do
1426 { /* Wrap lots of configures into one */
1427 width = ev.xconfigure.width;
1428 height = ev.xconfigure.height;
1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430 }
1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ;
1432 1500
1433 if (szHint.width != width || szHint.height != height) 1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1502 {
1435 seen_resize = 1; 1503 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1505 }
1438 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1510 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1511 check_our_parents ();
1442#endif 1512#endif
1443 } 1513 }
1444 break; 1514 break;
1445 1515
… …
1461 1531
1462 case SelectionRequest: 1532 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1464 break; 1534 break;
1465 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1466 case UnmapNotify: 1544 case UnmapNotify:
1467 TermWin.mapped = 0; 1545 mapped = 0;
1468#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1470#endif 1548#endif
1471 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 TermWin.mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1550 break;
1479 1551
1480#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1481 case ReparentNotify: 1553 case ReparentNotify:
1482 rootwin_cb (ev); 1554 rootwin_cb (ev);
1483 break; 1555 break;
1484#endif /* TRANSPARENT */ 1556#endif /* TRANSPARENT */
1485 1557
1486 case GraphicsExpose: 1558 case GraphicsExpose:
1487 case Expose: 1559 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1560 if (ev.xany.window == vt)
1489 { 1561 {
1490 do 1562 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1566
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1568
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1500 1572
1501 scr_refresh (refresh_type); 1573 want_refresh = 1;
1502 } 1574 }
1503 else 1575 else
1504 { 1576 {
1505 XEvent unused_event; 1577 XEvent unused_event;
1506 1578
… …
1512 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1513 { 1585 {
1514 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1515 scrollbar_show (0); 1587 scrollbar_show (0);
1516 } 1588 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1589
1522#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1525#endif 1593#endif
1526 } 1594 }
1527 break; 1595 break;
1528 1596
1529 case MotionNotify: 1597 case MotionNotify:
1530#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1599 if (hidden_pointer)
1532 pointer_unblank (); 1600 pointer_unblank ();
1533#endif 1601#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1603 break;
1543 1604
1544 if (ev.xany.window == TermWin.vt) 1605 if (ev.xany.window == vt)
1545 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1611 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1613 ;
1550 1614
1551 XQueryPointer (disp, TermWin.vt, 1615 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1616 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1617 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1618 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1619 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
… …
1568#endif 1632#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1633 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1634 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1635
1572#ifdef SELECTION_SCROLLING 1636#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1637 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1638 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1639 {
1576 int dist; 1640 int dist;
1577 1641
1578 /* don't clobber the current delay if we are 1642 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1643 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1651 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1652 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1653 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1654
1591 /* calc number of lines to scroll */ 1655 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1656 if (ev.xbutton.y < int_bwidth)
1593 { 1657 {
1594 scroll_selection_dir = UP; 1658 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1659 dist = int_bwidth - ev.xbutton.y;
1596 } 1660 }
1597 else 1661 else
1598 { 1662 {
1599 scroll_selection_dir = DN; 1663 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1664 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1665 }
1602 1666
1603 scroll_selection_lines = Pixel2Height (dist) 1667 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1668 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1669 + 1;
1606 MIN_IT (scroll_selection_lines, 1670 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1671 SELECTION_SCROLL_MAX_LINES);
1608 } 1672 }
1609 else 1673 else
1610 { 1674 {
1611 /* we are within the text window, so we 1675 /* we are within the text window, so we
… …
1631 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1697 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1699 scrollbar_size ());
1636 scr_refresh (refresh_type); 1700 want_refresh = 1;
1637 refresh_limit = 0; 1701 refresh_limit = 0;
1638 scrollbar_show (1); 1702 scrollbar_show (1);
1639 } 1703 }
1640 break; 1704 break;
1641 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1642} 1735}
1643 1736
1644void 1737void
1645rxvt_term::focus_in () 1738rxvt_term::focus_in ()
1646{ 1739{
1647 if (!TermWin.focus) 1740 if (!focus)
1648 { 1741 {
1649 TermWin.focus = 1; 1742 focus = 1;
1650 want_refresh = 1; 1743 want_refresh = 1;
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1746
1651#ifdef USE_XIM 1747#if USE_XIM
1652 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1653 { 1749 {
1654 IMSetStatusPosition (); 1750 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1751 XSetICFocus (Input_Context);
1656 } 1752 }
1657#endif 1753#endif
1658#ifdef CURSOR_BLINK 1754#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1755 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1757#endif
1662#ifdef OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1664 { 1760 {
1665 pix_colors = pix_colors_focused; 1761 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1762 scr_recolour ();
1667 } 1763 }
… …
1670} 1766}
1671 1767
1672void 1768void
1673rxvt_term::focus_out () 1769rxvt_term::focus_out ()
1674{ 1770{
1675 if (TermWin.focus) 1771 if (focus)
1676 { 1772 {
1677 TermWin.focus = 0; 1773 focus = 0;
1678 want_refresh = 1; 1774 want_refresh = 1;
1679 1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777
1680#if ENABLE_FRILLS || ISO_14755 1778#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf)
1780 {
1681 iso14755buf = 0; 1781 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1782# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1783 scr_overlay_off ();
1685#endif 1784# endif
1785 }
1786#endif
1686#ifdef USE_XIM 1787#if USE_XIM
1687 if (Input_Context != NULL) 1788 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1789 XUnsetICFocus (Input_Context);
1689#endif 1790#endif
1690#ifdef CURSOR_BLINK 1791#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1792 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1793 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1794 hidden_cursor = 0;
1694#endif 1795#endif
1695#ifdef OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1697 { 1798 {
1698 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1800 scr_recolour ();
1700 } 1801 }
… …
1704 1805
1705#if TRANSPARENT 1806#if TRANSPARENT
1706void 1807void
1707rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1809{
1709 SET_R (this); 1810 make_current ();
1710 SET_LOCALE (locale);
1711 1811
1712 switch (ev.type) 1812 switch (ev.type)
1713 { 1813 {
1714 case PropertyNotify: 1814 case PropertyNotify:
1715 /* 1815 /*
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1821 return;
1722 1822
1723 /* FALLTHROUGH */ 1823 /* FALLTHROUGH */
1724 case ReparentNotify: 1824 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1826 want_refresh = want_full_refresh = 1;
1727 break; 1827 break;
1728 } 1828 }
1729} 1829}
1730#endif 1830#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1734{ 1834{
1735 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1736 1836
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1738 if (!bypass_keystate) 1839 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1841
1741 /* 1842 /*
1742 * VT window processing of button press 1843 * VT window processing of button press
1743 */ 1844 */
1744 if (ev.window == TermWin.vt) 1845 if (ev.window == vt)
1745 { 1846 {
1746#if ISO_14755 1847#if ISO_14755
1747 // 5.4 1848 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1850 {
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1764 { 1865 {
1765 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1766 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1767 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1768 { 1870 {
1769 /* only report double clicks */ 1871 /* only report double clicks */
1770 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1771 mouse_report (ev); 1873 mouse_report (ev);
… …
1791 else 1893 else
1792 { 1894 {
1793 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1795 1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1899 switch (ev.button)
1797 { 1900 {
1798 case Button1: 1901 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1906#else
1804 selection.rect = false; 1907 selection.rect = false;
1805#endif 1908#endif
1806 1909
1807 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1912 {
1810 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1812 else 1915 else
1813 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1814 } 1917 }
1815 else 1918 else
1816 { 1919 {
1817 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1921 MEvent.clicks++;
1819 else 1922 else
1820 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1821 1924
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1926 }
1824 1927
1825 MEvent.button = Button1; 1928 MEvent.button = Button1;
1826 break; 1929 break;
1827 1930
1828 case Button3: 1931 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1831 else 1934 else
1832 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1833 1936
1834 MEvent.button = Button3; 1937 MEvent.button = Button3;
1835 break; 1938 break;
1836 } 1939 }
1837 } 1940 }
1838 1941
1839 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1840 return; 1943 return;
1841 } 1944 }
1842 1945
… …
1954 case Button3: 2057 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2058 if (scrollBar.style != R_SB_XTERM)
1956 { 2059 {
1957 if (scrollbar_above_slider (ev.y)) 2060 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 2061# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 2062 scr_page (UP, nrow - 1);
1960# else 2063# else
1961 scr_page (UP, TermWin.nrow / 4); 2064 scr_page (UP, nrow / 4);
1962# endif 2065# endif
1963 else if (scrollbar_below_slider (ev.y)) 2066 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 2068 scr_page (DN, nrow - 1);
1966# else 2069# else
1967 scr_page (DN, TermWin.nrow / 4); 2070 scr_page (DN, nrow / 4);
1968# endif 2071# endif
1969 else 2072 else
1970 scrollBar.setMotion (); 2073 scrollBar.setMotion ();
1971 } 2074 }
1972 else 2075 else
1973 { 2076 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2077 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2078 (nrow
1976 * scrollbar_position (ev.y) 2079 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2080 / scrollbar_size ()));
1978 } 2081 }
1979 2082
1980 break; 2083 break;
1981 } 2084 }
1982 } 2085 }
2086
1983 return; 2087 return;
1984 } 2088 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2089}
1993 2090
1994void 2091void
1995rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
1996{ 2093{
… …
2002 2099
2003 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2004 { 2101 {
2005 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2006 scrollbar_show (0); 2103 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2104 }
2011 2105
2012#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
2015#endif 2109#endif
2016 2110
2017 if (ev.window == TermWin.vt) 2111 if (ev.window == vt)
2018 { 2112 {
2019#if ISO_14755 2113#if ISO_14755
2020 // 5.4 2114 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2116 return;
… …
2052 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2053 && bypass_keystate 2147 && bypass_keystate
2054 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2055 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2056 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2057 switch (ev.button) 2154 switch (ev.button)
2058 { 2155 {
2059 case Button1: 2156 case Button1:
2060 case Button3: 2157 case Button3:
2061 selection_make (ev.time); 2158 selection_make (ev.time);
2062 break; 2159 break;
2160
2063 case Button2: 2161 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2164 {
2165 if (ev.state & ShiftMask)
2166 selection_request (ev.time, Sel_Clipboard);
2167 else
2168 selection_request (ev.time, Sel_Primary);
2169 }
2065 break; 2170 break;
2171
2066#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2067 case Button4: 2173 case Button4:
2068 case Button5: 2174 case Button5:
2069 { 2175 {
2070 int i; 2176 int i;
… …
2072 2178
2073 v = ev.button == Button4 ? UP : DN; 2179 v = ev.button == Button4 ? UP : DN;
2074 2180
2075 if (ev.state & ShiftMask) 2181 if (ev.state & ShiftMask)
2076 i = 1; 2182 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2183 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2184 i = nrow - 1;
2079 else 2185 else
2080 i = 5; 2186 i = 5;
2081 2187
2082# ifdef MOUSE_SLIP_WHEELING 2188# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2189 if (ev.state & ControlMask)
2084 { 2190 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2191 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2087 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2194
2089 if (slip_wheel_ev.at < NOW) 2195 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2197
2092 slip_wheel_ev.start (); 2198 slip_wheel_ev.start ();
2093 } 2199 }
2094 else 2200 else
2095 { 2201 {
2096# endif 2202# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2203 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2204 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2110 } 2206 }
2111#endif 2207# endif
2112 } 2208 }
2113 break; 2209 break;
2114#endif 2210#endif
2115 } 2211 }
2116 } 2212 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2213}
2122 2214
2123#ifdef TRANSPARENT 2215#ifdef TRANSPARENT
2124#if TINTING 2216#if TINTING
2125/* taken from aterm-0.4.2 */ 2217/* taken from aterm-0.4.2 */
… …
2368 XWindowAttributes wattr, wrootattr; 2460 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2461 dDisp;
2370 2462
2371 pchanged = 0; 2463 pchanged = 0;
2372 2464
2373 if (!(options & Opt_transparent)) 2465 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2466 return pchanged; /* Don't try any more */
2375 2467
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2468 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2469 rootdepth = wrootattr.depth;
2378 2470
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2471 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2472
2381 if (rootdepth != wattr.depth) 2473 if (rootdepth != wattr.depth)
2382 { 2474 {
2383 if (am_transparent) 2475 if (am_transparent)
2384 { 2476 {
2385 pchanged = 1; 2477 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2478 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2479 am_transparent = am_pixmap_trans = 0;
2388 } 2480 }
2389 2481
2390 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2391 } 2483 }
… …
2432 Window cr; 2524 Window cr;
2433 XImage *image; 2525 XImage *image;
2434 GC gc; 2526 GC gc;
2435 XGCValues gcvalue; 2527 XGCValues gcvalue;
2436 2528
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2529 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2530 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2531 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2532 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2533 nx = ny = 0;
2442 2534
… …
2452 nh += sy; 2544 nh += sy;
2453 ny = -sy; 2545 ny = -sy;
2454 sy = 0; 2546 sy = 0;
2455 } 2547 }
2456 2548
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2549 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2550 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2551
2460 XSync (disp, False); 2552 XSync (disp, False);
2461 allowedxerror = -1; 2553 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2554 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2555
… …
2468 if (image == NULL) 2560 if (image == NULL)
2469 { 2561 {
2470 if (am_transparent && am_pixmap_trans) 2562 if (am_transparent && am_pixmap_trans)
2471 { 2563 {
2472 pchanged = 1; 2564 pchanged = 1;
2473 if (TermWin.pixmap != None) 2565 if (pixmap != None)
2474 { 2566 {
2475 XFreePixmap (disp, TermWin.pixmap); 2567 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2568 pixmap = None;
2477 } 2569 }
2478 } 2570 }
2479 2571
2480 am_pixmap_trans = 0; 2572 am_pixmap_trans = 0;
2481 } 2573 }
2482 else 2574 else
2483 { 2575 {
2484 if (TermWin.pixmap != None) 2576 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2577 XFreePixmap (disp, pixmap);
2486 2578
2487#if TINTING 2579#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2580 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2581 {
2490 unsigned short rm, gm, bm; 2582 unsigned short rm, gm, bm;
… …
2494 2586
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2587 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2588 }
2497#endif 2589#endif
2498 2590
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2591 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2592 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2593 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2594 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2595 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2596 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2597 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2598 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2599 XClearWindow (disp, parent[0]);
2508 2600
2509 if (!am_transparent || !am_pixmap_trans) 2601 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2602 pchanged = 1;
2511 2603
2512 am_transparent = am_pixmap_trans = 1; 2604 am_transparent = am_pixmap_trans = 1;
2513 } 2605 }
2514 } 2606 }
2515 2607
2516 if (am_pixmap_trans) 2608 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2609 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2610 else
2519 { 2611 {
2520 unsigned int n; 2612 unsigned int n;
2521 /* 2613 /*
2522 * InheritPixmap transparency 2614 * InheritPixmap transparency
2523 */ 2615 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2617 {
2526 oldp = TermWin.parent[i]; 2618 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2619 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2620 &parent[i], &list, &n);
2529 XFree (list); 2621 XFree (list);
2530 2622
2531 if (TermWin.parent[i] == display->root) 2623 if (parent[i] == display->root)
2532 { 2624 {
2533 if (oldp != None) 2625 if (oldp != None)
2534 pchanged = 1; 2626 pchanged = 1;
2535 2627
2536 break; 2628 break;
2537 } 2629 }
2538 2630
2539 if (oldp != TermWin.parent[i]) 2631 if (oldp != parent[i])
2540 pchanged = 1; 2632 pchanged = 1;
2541 } 2633 }
2542 2634
2543 n = 0; 2635 n = 0;
2544 2636
2545 if (pchanged) 2637 if (pchanged)
2546 { 2638 {
2547 for (; n < (unsigned int)i; n++) 2639 for (; n < (unsigned int)i; n++)
2548 { 2640 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2641 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2642 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2643 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2644 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2645 break;
2554 } 2646 }
2555 } 2647 }
2556 } 2648 }
2557 2649
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2650 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2651 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2652 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2653 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2654 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2655 /* XXX: also turn off Opt_transparent? */
2564 } 2656 }
2565 else 2657 else
2566 { 2658 {
… …
2569 * needed for fvwm2.2.2 (and before?) */ 2661 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2662 sleep (1);
2571#endif 2663#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2573 { 2665 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2667 XClearWindow (disp, parent[n]);
2576 } 2668 }
2577 2669
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2671 am_transparent = 1;
2580 } 2672 }
2581 2673
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2675 parent[i] = None;
2584 } 2676 }
2585 2677
2586 if (scrollBar.win) 2678 if (scrollBar.win)
2587 { 2679 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2605 2697
2606bool 2698bool
2607rxvt_term::cmd_parse () 2699rxvt_term::cmd_parse ()
2608{ 2700{
2609 bool flag = false; 2701 bool flag = false;
2610 unicode_t ch = NOCHAR; 2702 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2703 char *seq_begin; // remember start of esc-sequence here
2612 2704
2613 for (;;) 2705 for (;;)
2614 { 2706 {
2615 if (ch == NOCHAR) 2707 if (ch == NOCHAR)
2616 { 2708 {
2617 seq_begin = cmdbuf_ptr; 2709 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2710 ch = next_char ();
2619 }
2620 2711
2621 if (ch == NOCHAR) // TODO: improve 2712 if (ch == NOCHAR)
2622 break; 2713 break;
2714 }
2623 2715
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2717 {
2626 if (!seen_input) 2718 if (!seen_input)
2627 { 2719 {
… …
2636 if (seen_resize && cmd_pid) 2728 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2729 kill (-cmd_pid, SIGWINCH);
2638 } 2730 }
2639 2731
2640 /* Read a text string from the input buffer */ 2732 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2733 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2734 bool refreshnow = false;
2643 int nlines = 0; 2735 int nlines = 0;
2644 unicode_t *str = buf; 2736 wchar_t *str = buf;
2737 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2738
2646 for (;;) 2739 for (;;)
2647 { 2740 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2742 break;
2650 2743
2651 *str++ = ch; 2744 *str++ = ch;
2652 2745
2653 if (ch == C0_LF) 2746 if (ch == C0_LF || str >= eol)
2654 { 2747 {
2748 if (ch == C0_LF)
2655 nlines++; 2749 nlines++;
2750
2656 refresh_count++; 2751 refresh_count++;
2657 2752
2658 if (!(options & Opt_jumpScroll) 2753 if (!OPTION (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2755 {
2661 refreshnow = true; 2756 refreshnow = true;
2757 refresh_count = 0;
2662 ch = NOCHAR; 2758 ch = NOCHAR;
2663 break; 2759 break;
2664 } 2760 }
2665 2761
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2763 if (nlines >= nrow - 1)
2668 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2669 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
2768
2670 nlines = 0; 2769 nlines = 0;
2671 str = buf; 2770 str = buf;
2771 eol = str + min (ncol, UBUFSIZ);
2672 } 2772 }
2673 }
2674 2773
2675 if (str >= buf + UBUFSIZ) 2774 if (str >= eol)
2676 { 2775 {
2776 if (eol >= buf + UBUFSIZ)
2777 {
2677 ch = NOCHAR; 2778 ch = NOCHAR;
2678 break; 2779 break;
2780 }
2781 else
2782 eol = min (eol + ncol, buf + UBUFSIZ);
2783 }
2784
2679 } 2785 }
2680 2786
2681 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2788 ch = next_char ();
2683 } 2789 }
2684 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2685 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2686 2794
2687 /* 2795 /*
2688 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2689 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
2690 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2800 */
2693 if (refreshnow) 2801 if (refreshnow)
2694 { 2802 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2804 refresh_limit++;
2697 else 2805 else
2698 { 2806 {
2699 flag = true; 2807 flag = true;
2700 scr_refresh (refresh_type); 2808 scr_refresh ();
2809 want_refresh = 1;
2701 } 2810 }
2702 } 2811 }
2703 2812
2704 } 2813 }
2705 else 2814 else
… …
2720 } 2829 }
2721 2830
2722 return flag; 2831 return flag;
2723} 2832}
2724 2833
2725// read the next octet
2726unicode_t
2727rxvt_term::next_octet ()
2728{
2729 return cmdbuf_ptr < cmdbuf_endp
2730 ? *cmdbuf_ptr++
2731 : NOCHAR;
2732}
2733
2734// read the next character 2834// read the next character
2735unicode_t 2835wchar_t
2736rxvt_term::next_char () 2836rxvt_term::next_char ()
2737{ 2837{
2738 while (cmdbuf_ptr < cmdbuf_endp) 2838 while (cmdbuf_ptr < cmdbuf_endp)
2739 { 2839 {
2740 // assume 7-bit to be ascii ALWAYS 2840 // assume 7-bit to be ascii ALWAYS
2741 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2841 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2742 return *cmdbuf_ptr++; 2842 return *cmdbuf_ptr++;
2743 2843
2744 wchar_t wc; 2844 wchar_t wc;
2745 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2845 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2746 2846
2747 if (len == (size_t)-2) 2847 if (len == (size_t)-2)
2748 { 2848 {
2749 // the mbstate stores incomplete sequences. didn't know this :/ 2849 // the mbstate stores incomplete sequences. didn't know this :/
2750 cmdbuf_ptr = cmdbuf_endp; 2850 cmdbuf_ptr = cmdbuf_endp;
2751 break; 2851 break;
2752 } 2852 }
2753 2853
2754 if (len == (size_t)-1) 2854 if (len == (size_t)-1)
2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2855 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2756 2856
2757 // assume wchar == unicode 2857 // assume wchar == unicode
2758 cmdbuf_ptr += len; 2858 cmdbuf_ptr += len;
2759 return wc & UNICODE_MASK; 2859 return wc & UNICODE_MASK;
2760 } 2860 }
2761 2861
2762 return NOCHAR; 2862 return NOCHAR;
2863}
2864
2865// read the next octet
2866uint32_t
2867rxvt_term::next_octet ()
2868{
2869 return cmdbuf_ptr < cmdbuf_endp
2870 ? (unsigned char)*cmdbuf_ptr++
2871 : NOCHAR;
2763} 2872}
2764 2873
2765/* rxvt_cmd_getc () - Return next input character */ 2874/* rxvt_cmd_getc () - Return next input character */
2766/* 2875/*
2767 * Return the next input character after first passing any keyboard input 2876 * Return the next input character after first passing any keyboard input
2768 * to the command. 2877 * to the command.
2769 */ 2878 */
2770unicode_t 2879wchar_t
2771rxvt_term::cmd_getc () 2880rxvt_term::cmd_getc ()
2772{ 2881{
2773 unicode_t c = next_char (); 2882 wchar_t c = next_char ();
2774 2883
2775 if (c == NOCHAR) 2884 if (c == NOCHAR)
2776 throw out_of_input; 2885 throw out_of_input;
2777 2886
2778 return c; 2887 return c;
2779} 2888}
2780 2889
2781unicode_t 2890uint32_t
2782rxvt_term::cmd_get8 () 2891rxvt_term::cmd_get8 ()
2783{ 2892{
2784 unicode_t c = next_octet (); 2893 uint32_t c = next_octet ();
2785 2894
2786 if (c == NOCHAR) 2895 if (c == NOCHAR)
2787 throw out_of_input; 2896 throw out_of_input;
2788 2897
2789 return c; 2898 return c;
… …
2889 case C0_ESC: 2998 case C0_ESC:
2890 process_escape_seq (); 2999 process_escape_seq ();
2891 break; 3000 break;
2892 case C0_ENQ: /* terminal Status */ 3001 case C0_ENQ: /* terminal Status */
2893 if (rs[Rs_answerbackstring]) 3002 if (rs[Rs_answerbackstring])
2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3003 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2896 else 3004 else
2897 tt_write ((unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, strlen (VT100_ANS));
2898 (unsigned int)strlen (VT100_ANS));
2899 break; 3006 break;
2900 case C0_BEL: /* bell */ 3007 case C0_BEL: /* bell */
2901 scr_bell (); 3008 scr_bell ();
2902 break; 3009 break;
2903 case C0_BS: /* backspace */ 3010 case C0_BS: /* backspace */
… …
3058 break; 3165 break;
3059 3166
3060 /* 8.3.87: NEXT LINE */ 3167 /* 8.3.87: NEXT LINE */
3061 case C1_NEL: /* ESC E */ 3168 case C1_NEL: /* ESC E */
3062 { 3169 {
3063 unicode_t nlcr[] = { C0_LF, C0_CR }; 3170 wchar_t nlcr[] = { C0_LF, C0_CR };
3064 scr_add_lines (nlcr, 1, 2); 3171 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3065 } 3172 }
3066 break; 3173 break;
3067 3174
3068 /* kidnapped escape sequence: Should be 8.3.48 */ 3175 /* kidnapped escape sequence: Should be 8.3.48 */
3069 case C1_ESA: /* ESC G */ 3176 case C1_ESA: /* ESC G */
… …
3091 process_dcs_seq (); 3198 process_dcs_seq ();
3092 break; 3199 break;
3093 3200
3094 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3201 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3095 case C1_SCI: /* ESC Z */ 3202 case C1_SCI: /* ESC Z */
3096 tt_write ((const unsigned char *)ESCZ_ANSWER, 3203 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3097 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3098 break; /* steal obsolete ESC [ c */ 3204 break; /* steal obsolete ESC [ c */
3099 3205
3100 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3206 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3101 case C1_CSI: /* ESC [ */ 3207 case C1_CSI: /* ESC [ */
3102 process_csi_seq (); 3208 process_csi_seq ();
… …
3342 3448
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3449 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3450 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3451 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3452 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3453 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3454 break;
3349 3455
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3456 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3457 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3352 (unsigned int) (sizeof (VT100_ANS) - 1));
3353 break; 3458 break;
3354 3459
3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3460 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3356 process_sgr_mode (nargs, arg); 3461 process_sgr_mode (nargs, arg);
3357 break; 3462 break;
… …
3364 break; 3469 break;
3365 case 6: /* CPR requested */ 3470 case 6: /* CPR requested */
3366 scr_report_position (); 3471 scr_report_position ();
3367 break; 3472 break;
3368 case 7: /* unofficial extension */ 3473 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3474 if (OPTION (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3475 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3476 break;
3372 case 8: /* unofficial extension */ 3477 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3478 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3479 break;
… …
3477 { 3582 {
3478 /* 3583 /*
3479 * commands 3584 * commands
3480 */ 3585 */
3481 case 1: /* deiconify window */ 3586 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3587 XMapWindow (disp, parent[0]);
3483 break; 3588 break;
3484 case 2: /* iconify window */ 3589 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3590 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3591 break;
3487 case 3: /* set position (pixels) */ 3592 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3593 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3594 break;
3490 case 4: /* set size (pixels) */ 3595 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3596 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3597 break;
3493 case 5: /* raise window */ 3598 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3599 XRaiseWindow (disp, parent[0]);
3495 break; 3600 break;
3496 case 6: /* lower window */ 3601 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3602 XLowerWindow (disp, parent[0]);
3498 break; 3603 break;
3499 case 7: /* refresh window */ 3604 case 7: /* refresh window */
3500 scr_touch (true); 3605 scr_touch (true);
3501 break; 3606 break;
3502 case 8: /* set size (chars) */ 3607 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3608 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3609 (unsigned int) (args[1] * fheight));
3505 break; 3610 break;
3506 3611
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3612 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3613 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3614 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3615 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3616 (unsigned int) (args[1] * fheight));
3512 break; 3617 break;
3513 3618
3514 3619
3515 /* 3620 /*
3516 * reports - some output format copied from XTerm 3621 * reports - some output format copied from XTerm
3517 */ 3622 */
3518 case 11: /* report window state */ 3623 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3625 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3626 break;
3522 case 13: /* report window position */ 3627 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3628 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3629 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3630 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3631 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3632 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3633 break;
3529 case 14: /* report window size (pixels) */ 3634 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3635 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3636 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3637 break;
3533 case 18: /* report text area size (chars) */ 3638 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3639 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3640 break;
3536 case 19: /* report window size (chars) */ 3641 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3642 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3643 break;
3539 case 20: /* report icon label */ 3644 case 20: /* report icon label */
3540 { 3645 {
3541 char *s; 3646 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3647 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3649 XFree (s);
3545 } 3650 }
3546 break; 3651 break;
3547 case 21: /* report window title */ 3652 case 21: /* report window title */
3548 { 3653 {
3549 char *s; 3654 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3655 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3656 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3657 XFree (s);
3553 } 3658 }
3554 break; 3659 break;
3555 } 3660 }
3556} 3661}
… …
3559/*----------------------------------------------------------------------*/ 3664/*----------------------------------------------------------------------*/
3560/* 3665/*
3561 * get input up until STRING TERMINATOR (or BEL) 3666 * get input up until STRING TERMINATOR (or BEL)
3562 * ends_how is terminator used. returned input must be free()'d 3667 * ends_how is terminator used. returned input must be free()'d
3563 */ 3668 */
3564unsigned char * 3669char *
3565rxvt_term::get_to_st (unicode_t &ends_how) 3670rxvt_term::get_to_st (unicode_t &ends_how)
3566{ 3671{
3567 unicode_t ch; 3672 unicode_t ch;
3568 bool seen_esc = false; 3673 bool seen_esc = false;
3569 unsigned int n = 0; 3674 unsigned int n = 0;
… …
3588 else if (ch < 0x20) 3693 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3694 return NULL; /* other control character - exit */
3590 3695
3591 seen_esc = false; 3696 seen_esc = false;
3592 3697
3593 if (n >= sizeof (string) - 1) 3698 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3699 // stop at some sane length
3595 return NULL; 3700 return NULL;
3596 3701
3597 if (ch == C0_SYN) 3702 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3703 string[n++] = cmd_get8 ();
… …
3602 3707
3603 string[n++] = '\0'; 3708 string[n++] = '\0';
3604 3709
3605 ends_how = (ch == 0x5c ? C0_ESC : ch); 3710 ends_how = (ch == 0x5c ? C0_ESC : ch);
3606 3711
3607 return (unsigned char *)rxvt_wcstombs (string); 3712 return rxvt_wcstombs (string);
3608} 3713}
3609 3714
3610/*----------------------------------------------------------------------*/ 3715/*----------------------------------------------------------------------*/
3611/* 3716/*
3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3717 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3613 */ 3718 */
3614void 3719void
3615rxvt_term::process_dcs_seq () 3720rxvt_term::process_dcs_seq ()
3616{ 3721{
3617 unsigned char *s; 3722 char *s;
3618 unicode_t eh; 3723 unicode_t eh;
3619 3724
3620 /* 3725 /*
3621 * Not handled yet 3726 * Not handled yet
3622 */ 3727 */
… …
3641 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3746 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3642 arg = arg * 10 + (ch - '0'); 3747 arg = arg * 10 + (ch - '0');
3643 3748
3644 if (ch == ';') 3749 if (ch == ';')
3645 { 3750 {
3646 unsigned char *s = get_to_st (eh); 3751 char *s = get_to_st (eh);
3647 3752
3648 if (s) 3753 if (s)
3649 { 3754 {
3650 process_xterm_seq (arg, (char *)s, eh); 3755 process_xterm_seq (arg, s, eh);
3651 free (s); 3756 free (s);
3652 } 3757 }
3653 } 3758 }
3654} 3759}
3655 3760
3656void 3761void
3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3762rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3658{ 3763{
3659 if (str[0] == '?' && !str[1]) 3764 if (str[0] == '?' && !str[1])
3660 { 3765 {
3661 unsigned short r, g, b; 3766 unsigned short r, g, b;
3662 pix_colors_focused[color].get (display, r, g, b); 3767 pix_colors_focused[color].get (display, r, g, b);
… …
3666 set_window_color (color, str); 3771 set_window_color (color, str);
3667} 3772}
3668 3773
3669/* 3774/*
3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3775 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3671 * 0 = change iconName/title
3672 * 1 = change iconName
3673 * 2 = change title
3674 * 4 = change color
3675 * 10 = change fg color
3676 * 11 = change bg color
3677 * 12 = change text color
3678 * 13 = change mouse foreground color
3679 * 17 = change highlight character colour
3680 * 18 = change bold character color
3681 * 19 = change underlined character color
3682 * 46 = change logfile (not implemented)
3683 * 50 = change font
3684 *
3685 * rxvt extensions:
3686 * 20 = bg pixmap
3687 * 39 = change default fg color
3688 * 49 = change default bg color
3689 * 55 = dump scrollback buffer and all of screen
3690 * 701 = change locale
3691 * 702 = find font
3692 * 703 = menu
3693 */ 3776 */
3694void 3777void
3695rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3778rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3696{ 3779{
3697 int changed = 0;
3698 int color; 3780 int color;
3699 char *buf, *name; 3781 char *buf, *name;
3700 bool query = str[0] == '?' && !str[1]; 3782 bool query = str[0] == '?' && !str[1];
3701 int saveop = op; 3783 int saveop = op;
3702 dDisp; 3784 dDisp;
… …
3723 unsigned long bytes_after; 3805 unsigned long bytes_after;
3724 unsigned char *value = 0; 3806 unsigned char *value = 0;
3725 const char *str = ""; 3807 const char *str = "";
3726 3808
3727 if (prop 3809 if (prop
3728 && XGetWindowProperty (disp, TermWin.parent[0], 3810 && XGetWindowProperty (disp, parent[0],
3729 prop, 0, 1<<16, 0, AnyPropertyType, 3811 prop, 0, 1<<16, 0, AnyPropertyType,
3730 &actual_type, &actual_format, 3812 &actual_type, &actual_format,
3731 &nitems, &bytes_after, &value) == Success 3813 &nitems, &bytes_after, &value) == Success
3732 && actual_type != None 3814 && actual_type != None
3733 && actual_format == 8) 3815 && actual_format == 8)
… …
3745 { 3827 {
3746 *eq = 0; 3828 *eq = 0;
3747 set_utf8_property (display->atom (str), eq + 1); 3829 set_utf8_property (display->atom (str), eq + 1);
3748 } 3830 }
3749 else 3831 else
3750 XDeleteProperty (disp, TermWin.parent[0], 3832 XDeleteProperty (disp, parent[0],
3751 display->atom (str)); 3833 display->atom (str));
3752 } 3834 }
3753 break; 3835 break;
3754 3836
3755 case XTerm_Color: 3837 case XTerm_Color:
… …
3757 { 3839 {
3758 if ((name = strchr (buf, ';')) == NULL) 3840 if ((name = strchr (buf, ';')) == NULL)
3759 break; 3841 break;
3760 3842
3761 *name++ = '\0'; 3843 *name++ = '\0';
3762 color = atoi (buf); 3844 color = atoi (buf) + minCOLOR;
3763 3845
3764 if (color < 0 || color >= TOTAL_COLORS) 3846 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3765 break; 3847 break;
3766 3848
3767 if ((buf = strchr (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
3768 *buf++ = '\0'; 3850 *buf++ = '\0';
3769 3851
3770 if (name[0] == '?' && !name[1]) 3852 if (name[0] == '?' && !name[1])
3771 { 3853 {
3772 unsigned short r, g, b; 3854 unsigned short r, g, b;
3773 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3855 pix_colors_focused[color].get (display, r, g, b);
3774 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3856 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3775 } 3857 }
3776 else 3858 else
3777 set_window_color (color + minCOLOR, name); 3859 set_window_color (color, name);
3778 } 3860 }
3779 break; 3861 break;
3780 case XTerm_Color00: 3862 case XTerm_Color00:
3781 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3863 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3782 break; 3864 break;
3783 case XTerm_Color01: 3865 case XTerm_Color01:
3784 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3866 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3785 break; 3867 break;
3786#ifndef NO_CURSORCOLOR 3868#ifndef NO_CURSORCOLOR
3787 case XTerm_Color_cursor: 3869 case XTerm_Color_cursor:
3788 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3870 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3789 break; 3871 break;
… …
3793 break; 3875 break;
3794 case XTerm_Color_pointer_bg: 3876 case XTerm_Color_pointer_bg:
3795 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3877 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3796 break; 3878 break;
3797#ifndef NO_BOLD_UNDERLINE_REVERSE 3879#ifndef NO_BOLD_UNDERLINE_REVERSE
3798 case XTerm_Color_BD:
3799 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800 break;
3801 case XTerm_Color_IT:
3802 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3803 break;
3804 case XTerm_Color_UL:
3805 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3806 break;
3807 case XTerm_Color_RV: 3880 case XTerm_Color_RV:
3808 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3881 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3809 break; 3882 break;
3883 case Rxvt_Color_BD:
3884 case URxvt_Color_BD:
3885 process_color_seq (op, Color_BD, str, resp);
3886 break;
3887 case Rxvt_Color_UL:
3888 case URxvt_Color_UL:
3889 process_color_seq (op, Color_UL, str, resp);
3890 break;
3891 case URxvt_Color_IT:
3892 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3893 break;
3810#endif 3894#endif
3811#if TRANSPARENT && TINTING 3895#if TRANSPARENT && TINTING
3812 case XTerm_Color_tint: 3896 case URxvt_Color_tint:
3813 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3897 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3814 check_our_parents (); 3898 check_our_parents ();
3815 if (am_transparent) 3899 if (am_transparent)
3816 want_full_refresh = want_refresh = 1; 3900 want_full_refresh = want_refresh = 1;
3817 break; 3901 break;
3818#endif 3902#endif
3819 3903
3820 case XTerm_Pixmap: 3904 case Rxvt_Pixmap:
3905 {
3821 if (*str != ';') 3906 if (*str != ';')
3822 { 3907 {
3823#if XPM_BACKGROUND 3908#if XPM_BACKGROUND
3824 scale_pixmap (""); /* reset to default scaling */ 3909 scale_pixmap (""); /* reset to default scaling */
3825 set_bgPixmap (str); /* change pixmap */ 3910 set_bgPixmap (str); /* change pixmap */
3826#endif
3827 scr_touch (true); 3911 scr_touch (true);
3912#endif
3828 } 3913 }
3914
3915 int changed = 0;
3916
3829 while ((str = strchr (str, ';')) != NULL) 3917 while ((str = strchr (str, ';')) != NULL)
3830 { 3918 {
3831 str++; 3919 str++;
3832#if XPM_BACKGROUND 3920#if XPM_BACKGROUND
3833 changed += scale_pixmap (str); 3921 changed += scale_pixmap (str);
3834#endif 3922#endif
3835 } 3923 }
3836 3924
3837 if (changed) 3925 if (changed)
3838 { 3926 {
3839#ifdef XPM_BACKGROUND 3927#ifdef XPM_BACKGROUND
3840 resize_pixmap (); 3928 resize_pixmap ();
3841#endif
3842 scr_touch (true); 3929 scr_touch (true);
3930#endif
3843 } 3931 }
3932 }
3844 break; 3933 break;
3845 3934
3846 case XTerm_restoreFG: 3935 case Rxvt_restoreFG:
3847 set_window_color (Color_fg, str); 3936 set_window_color (Color_fg, str);
3848 break; 3937 break;
3849 case XTerm_restoreBG: 3938 case Rxvt_restoreBG:
3850 set_window_color (Color_bg, str); 3939 set_window_color (Color_bg, str);
3851 break; 3940 break;
3852 3941
3853 case XTerm_logfile: 3942 case XTerm_logfile:
3854 // TODO, when secure mode? 3943 // TODO, when secure mode?
3855 break; 3944 break;
3856 3945
3946#if 0
3947 case Rxvt_dumpscreen: /* no error notices */
3948 {
3949 int fd;
3950 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3951 {
3952 scr_dump (fd);
3953 close (fd);
3954 }
3955 }
3956 break;
3957#endif
3857 case XTerm_font: 3958 case XTerm_font:
3858 op = URxvt_font; 3959 op = URxvt_font;
3859 case URxvt_font: 3960 case URxvt_font:
3860#if ENABLE_STYLES 3961#if ENABLE_STYLES
3861 case URxvt_boldFont: 3962 case URxvt_boldFont:
3862 case URxvt_italicFont: 3963 case URxvt_italicFont:
3863 case URxvt_boldItalicFont: 3964 case URxvt_boldItalicFont:
3864#endif 3965#endif
3865 if (query) 3966 if (query)
3866 tt_printf ("\33]%d;%-.250s%c", saveop, 3967 tt_printf ("\33]%d;%-.250s%c", saveop,
3867 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3968 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3868 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3969 ? fontset[op - URxvt_font]->fontdesc : "",
3869 resp); 3970 resp);
3870 else 3971 else
3871 { 3972 {
3872 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3973 const char *&res = rs[Rs_font + (op - URxvt_font)];
3873 3974
… …
3876 set_fonts (); 3977 set_fonts ();
3877 } 3978 }
3878 break; 3979 break;
3879 3980
3880#if ENABLE_FRILLS 3981#if ENABLE_FRILLS
3881 case XTerm_locale: 3982 case URxvt_locale:
3882 if (query) 3983 if (query)
3883 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3884 else 3985 else
3885 { 3986 {
3886 set_locale (str); 3987 set_locale (str);
3887 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
3888 init_xlocale (); 3989 init_xlocale ();
3889 } 3990 }
3890 break; 3991 break;
3891#endif
3892 3992
3893#ifdef MENUBAR 3993 case URxvt_view_up:
3894 case XTerm_Menu: 3994 case URxvt_view_down:
3895 if (options & Opt_insecure) 3995 {
3896 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3996 int lines = atoi (str);
3997
3998 if (lines)
3999 scr_page (op == URxvt_view_up ? UP : DN, lines);
4000 else
4001 scr_erase_savelines ();
4002 }
4003
3897 break; 4004 break;
3898#endif 4005#endif
3899#if 0 4006
3900 case XTerm_dumpscreen: /* no error notices */ 4007#if ENABLE_PERL
3901 { 4008 case URxvt_perl:
3902 int fd; 4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3903 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4010 ; // no responses yet
3904 {
3905 scr_dump (fd);
3906 close (fd);
3907 }
3908 }
3909 break; 4011 break;
3910#endif 4012#endif
3911 } 4013 }
3912} 4014}
3913/*----------------------------------------------------------------------*/ 4015/*----------------------------------------------------------------------*/
… …
3965 { 5, PrivMode_rVideo }, 4067 { 5, PrivMode_rVideo },
3966 { 6, PrivMode_relOrigin }, 4068 { 6, PrivMode_relOrigin },
3967 { 7, PrivMode_Autowrap }, 4069 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode 4070 // 8, bi-directional support mode
3969 { 9, PrivMode_MouseX10 }, 4071 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc
3971 { menuBar_esc, PrivMode_menuBar },
3972#endif
3973 // 18, 19 printing-related 4072 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 4073 { 25, PrivMode_VisibleCursor },
3975#ifdef scrollBar_esc 4074#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 4075 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 4076#endif
… …
4022 } 4121 }
4023 4122
4024 /* extra handling for values with state unkept */ 4123 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4124 switch (arg[i])
4026 { 4125 {
4126#if ENABLE_STYLES
4127 case 1021:
4128 set_option (Opt_intensityStyles, mode);
4129
4130 scr_touch (true);
4131 break;
4132#endif
4027 case 1048: /* alternative cursor save */ 4133 case 1048: /* alternative cursor save */
4028 case 1049: 4134 case 1049:
4029 if (options & Opt_secondaryScreen) 4135 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4136 if (mode == 0)
4031 scr_cursor (RESTORE); 4137 scr_cursor (RESTORE);
4032 else if (mode == 1) 4138 else if (mode == 1)
4033 scr_cursor (SAVE); 4139 scr_cursor (SAVE);
4034 break; 4140 break;
… …
4046 */ 4152 */
4047 PrivMode (1, PrivMode_vt52); 4153 PrivMode (1, PrivMode_vt52);
4048 break; 4154 break;
4049 case 3: /* 80/132 */ 4155 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4156 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4157 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4158 break;
4053 case 4: /* smooth scrolling */ 4159 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4160 set_option (Opt_jumpScroll, !state);
4058 break; 4161 break;
4059 case 5: /* reverse video */ 4162 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4163 scr_rvideo_mode (state);
4061 break; 4164 break;
4062 case 6: /* relative/absolute origins */ 4165 case 6: /* relative/absolute origins */
… …
4068 /* case 8: - auto repeat, can't do on a per window basis */ 4171 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 4172 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 4174 priv_modes &= ~PrivMode_MouseX11;
4072 break; 4175 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 4176#ifdef scrollBar_esc
4081 case scrollBar_esc: 4177 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 4178 if (scrollbar_mapping (state))
4083 { 4179 {
4084 resize_all_windows (0, 0, 0); 4180 resize_all_windows (0, 0, 0);
… …
4103#if 0 4199#if 0
4104 case 1001: 4200 case 1001:
4105 break; /* X11 mouse highlighting */ 4201 break; /* X11 mouse highlighting */
4106#endif 4202#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4203 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4204 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4205 break;
4113 case 1011: /* scroll to bottom on key press */ 4206 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4207 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4208 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4209 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4210 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4211 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4212 scr_erase_screen (2);
4123 scr_change_screen (state); 4213 scr_change_screen (state);
4124 break; 4214 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4215 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4216 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4217 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4218 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4219 scr_erase_screen (2);
4130 break; 4220 break;
4131 default: 4221 default:
4132 break; 4222 break;
… …
4260 scr_color (Color_bg, Color_bg); 4350 scr_color (Color_bg, Color_bg);
4261 break; 4351 break;
4262 4352
4263 //case 50: // not variable spacing 4353 //case 50: // not variable spacing
4264 4354
4265#ifndef NO_BRIGHTCOLOR 4355#if ENABLE_FRILLS
4266 case 90: 4356 case 90:
4267 case 91: /* set bright fg color */ 4357 case 91: /* set bright fg color */
4268 case 92: 4358 case 92:
4269 case 93: 4359 case 93:
4270 case 94: 4360 case 94:
… …
4282 case 106: 4372 case 106:
4283 case 107: 4373 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4374 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4375 break;
4286#endif 4376#endif
4287
4288 } 4377 }
4289 } 4378 }
4290} 4379}
4291/*}}} */ 4380/*}}} */
4292 4381
… …
4316 */ 4405 */
4317void 4406void
4318rxvt_term::tt_printf (const char *fmt,...) 4407rxvt_term::tt_printf (const char *fmt,...)
4319{ 4408{
4320 va_list arg_ptr; 4409 va_list arg_ptr;
4321 unsigned char buf[256]; 4410 char buf[256];
4322 4411
4323 va_start (arg_ptr, fmt); 4412 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4413 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4414 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4415 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4420 * or generated by us in response to a query ESC sequence.
4332 */ 4421 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4422const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4423
4335void 4424void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4426{
4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4428 return;
4429
4430 if (pty->pty < 0)
4431 return;
4432
4338 if (v_buflen == 0) 4433 if (v_buflen == 0)
4339 { 4434 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4435 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 4436
4342 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4343 return; 4438 return;
4344 4439
4345 data += written; 4440 data += written;
4346 len -= written; 4441 len -= written;
4347 } 4442 }
4348 4443
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4444 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4445
4351 memcpy (v_buffer + v_buflen, data, len); 4446 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4447 v_buflen += len;
4353 4448
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355} 4450}
4356 4451
4357void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4358{ 4453{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4455
4361 if (written > 0) 4456 if (written > 0)
4362 { 4457 {
4363 v_buflen -= written; 4458 v_buflen -= written;
4364 4459
… …
4373 } 4468 }
4374 4469
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4470 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4471 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4472 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4473 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4474}
4381 4475
4382/*----------------------- end-of-file (C source) -----------------------*/ 4476/*----------------------- end-of-file (C source) -----------------------*/
4383 4477

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines