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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 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 }
… …
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
… …
1330 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1331 break; 1406 break;
1332 1407
1333 case ClientMessage: 1408 case ClientMessage:
1334 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1413 destroy ();
1414#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev);
1419#endif
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1337#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1343 { 1436 {
1344 /* Get Dnd data */ 1437 /* Get Dnd data */
1345 Atom ActualType; 1438 Atom ActualType;
1346 int ActualFormat; 1439 int ActualFormat;
1347 unsigned char *data; 1440 unsigned char *data;
… …
1390 break; 1483 break;
1391 } 1484 }
1392 break; 1485 break;
1393 1486
1394 case FocusIn: 1487 case FocusIn:
1395 if (!TermWin.focus) 1488 focus_in ();
1489 break;
1490
1491 case FocusOut:
1492 focus_out ();
1493 break;
1494
1495 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0])
1396 { 1497 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ;
1464 1500
1465 if (szHint.width != width || szHint.height != height) 1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1502 {
1467 seen_resize = 1; 1503 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1505 }
1470 1506
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1508 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1509 check_our_parents ();
1474#endif 1510#endif
1475 } 1511 }
1476 break; 1512 break;
1477 1513
… …
1493 1529
1494 case SelectionRequest: 1530 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1496 break; 1532 break;
1497 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1498 case UnmapNotify: 1542 case UnmapNotify:
1499 TermWin.mapped = 0; 1543 mapped = 0;
1500#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1502#endif 1546#endif
1503 break; 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505 case MapNotify:
1506 TermWin.mapped = 1;
1507#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif
1510 break; 1548 break;
1511 1549
1512#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1513 case ReparentNotify: 1551 case ReparentNotify:
1514 rootwin_cb (ev); 1552 rootwin_cb (ev);
1515 break; 1553 break;
1516#endif /* TRANSPARENT */ 1554#endif /* TRANSPARENT */
1517 1555
1518 case GraphicsExpose: 1556 case GraphicsExpose:
1519 case Expose: 1557 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == vt)
1521 { 1559 {
1522 do 1560 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1564
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1566
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1532 1570
1533 scr_refresh (refresh_type); 1571 want_refresh = 1;
1534 } 1572 }
1535 else 1573 else
1536 { 1574 {
1537 XEvent unused_event; 1575 XEvent unused_event;
1538 1576
… …
1544 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1545 { 1583 {
1546 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1547 scrollbar_show (0); 1585 scrollbar_show (0);
1548 } 1586 }
1549#ifdef MENUBAR
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose ();
1552#endif
1553 1587
1554#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1557#endif 1591#endif
1558 } 1592 }
1559 break; 1593 break;
1560 1594
1561 case MotionNotify: 1595 case MotionNotify:
1562#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1597 if (hidden_pointer)
1564 pointer_unblank (); 1598 pointer_unblank ();
1565#endif 1599#endif
1566#if MENUBAR
1567 if (isMenuBarWindow (ev.xany.window))
1568 {
1569 menubar_control (ev.xbutton);
1570 break;
1571 }
1572#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1601 break;
1575 1602
1576 if (ev.xany.window == TermWin.vt) 1603 if (ev.xany.window == vt)
1577 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1609 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1611 ;
1582 1612
1583 XQueryPointer (disp, TermWin.vt, 1613 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1614 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1615 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1616 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1617 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
… …
1600#endif 1630#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1631 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1632 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1633
1604#ifdef SELECTION_SCROLLING 1634#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1635 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1636 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1637 {
1608 int dist; 1638 int dist;
1609 1639
1610 /* don't clobber the current delay if we are 1640 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1641 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1649 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1650 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1651 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1652
1623 /* calc number of lines to scroll */ 1653 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1654 if (ev.xbutton.y < int_bwidth)
1625 { 1655 {
1626 scroll_selection_dir = UP; 1656 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1657 dist = int_bwidth - ev.xbutton.y;
1628 } 1658 }
1629 else 1659 else
1630 { 1660 {
1631 scroll_selection_dir = DN; 1661 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1662 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1663 }
1634 1664
1635 scroll_selection_lines = Pixel2Height (dist) 1665 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1666 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1667 + 1;
1638 MIN_IT (scroll_selection_lines, 1668 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1669 SELECTION_SCROLL_MAX_LINES);
1640 } 1670 }
1641 else 1671 else
1642 { 1672 {
1643 /* we are within the text window, so we 1673 /* we are within the text window, so we
… …
1663 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1694 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1695 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1697 scrollbar_size ());
1668 scr_refresh (refresh_type); 1698 want_refresh = 1;
1669 refresh_limit = 0; 1699 refresh_limit = 0;
1670 scrollbar_show (1); 1700 scrollbar_show (1);
1671 } 1701 }
1672 break; 1702 break;
1673 } 1703 }
1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1733}
1734
1735void
1736rxvt_term::focus_in ()
1737{
1738 if (!focus)
1739 {
1740 focus = 1;
1741 want_refresh = 1;
1742
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1745#if USE_XIM
1746 if (Input_Context != NULL)
1747 {
1748 IMSetStatusPosition ();
1749 XSetICFocus (Input_Context);
1750 }
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_focused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766void
1767rxvt_term::focus_out ()
1768{
1769 if (focus)
1770 {
1771 focus = 0;
1772 want_refresh = 1;
1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1779 iso14755buf = 0;
1780# if ENABLE_OVERLAY
1781 scr_overlay_off ();
1782# endif
1783 }
1784#endif
1785#if USE_XIM
1786 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context);
1788#endif
1789#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink))
1791 cursor_blink_ev.stop ();
1792 hidden_cursor = 0;
1793#endif
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 pix_colors = pix_colors_unfocused;
1798 scr_recolour ();
1799 }
1800#endif
1801 }
1674} 1802}
1675 1803
1676#if TRANSPARENT 1804#if TRANSPARENT
1677void 1805void
1678rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1807{
1680 SET_R (this); 1808 make_current ();
1681 SET_LOCALE (locale);
1682 1809
1683 switch (ev.type) 1810 switch (ev.type)
1684 { 1811 {
1685 case PropertyNotify: 1812 case PropertyNotify:
1686 /* 1813 /*
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1819 return;
1693 1820
1694 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1695 case ReparentNotify: 1822 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1698 break; 1825 break;
1699 } 1826 }
1700} 1827}
1701#endif 1828#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1705{ 1832{
1706 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1707 1834
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1709 if (!bypass_keystate) 1837 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1839
1712 /* 1840 /*
1713 * VT window processing of button press 1841 * VT window processing of button press
1714 */ 1842 */
1715 if (ev.window == TermWin.vt) 1843 if (ev.window == vt)
1716 { 1844 {
1717#if ISO_14755 1845#if ISO_14755
1718 // 5.4 1846 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1848 {
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1735 { 1863 {
1736 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1737 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1738 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1739 { 1868 {
1740 /* only report double clicks */ 1869 /* only report double clicks */
1741 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1742 mouse_report (ev); 1871 mouse_report (ev);
… …
1762 else 1891 else
1763 { 1892 {
1764 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1765 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1766 1895
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1767 switch (ev.button) 1897 switch (ev.button)
1768 { 1898 {
1769 case Button1: 1899 case Button1:
1770 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */ 1901 /* should be done in screen.C */
1772#if ENABLE_FRILLS 1902#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask); 1903 selection.rect = !!(ev.state & ModMetaMask);
1774#else 1904#else
1775 selection.rect = false; 1905 selection.rect = false;
1776#endif 1906#endif
1777 1907
1778 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1910 {
1781 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1783 else 1913 else
1784 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1785 } 1915 }
1786 else 1916 else
1787 { 1917 {
1788 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1789 MEvent.clicks++; 1919 MEvent.clicks++;
1790 else 1920 else
1791 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1792 1922
1793 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1794 } 1924 }
1795 1925
1796 MEvent.button = Button1; 1926 MEvent.button = Button1;
1797 break; 1927 break;
1798 1928
1799 case Button3: 1929 case Button3:
1800 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1801 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1802 else 1932 else
1803 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1804 1934
1805 MEvent.button = Button3; 1935 MEvent.button = Button3;
1806 break; 1936 break;
1807 } 1937 }
1808 } 1938 }
1809 1939
1810 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1811 return; 1941 return;
1812 } 1942 }
1813 1943
… …
1925 case Button3: 2055 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1927 { 2057 {
1928 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1931# else 2061# else
1932 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1933# endif 2063# endif
1934 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1937# else 2067# else
1938 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1939# endif 2069# endif
1940 else 2070 else
1941 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1942 } 2072 }
1943 else 2073 else
1944 { 2074 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2076 (nrow
1947 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2078 / scrollbar_size ()));
1949 } 2079 }
1950 2080
1951 break; 2081 break;
1952 } 2082 }
1953 } 2083 }
2084
1954 return; 2085 return;
1955 } 2086 }
1956#if MENUBAR
1957 /*
1958 * Menubar window processing of button press
1959 */
1960 if (isMenuBarWindow (ev.window))
1961 menubar_control (ev);
1962#endif
1963} 2087}
1964 2088
1965void 2089void
1966rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1967{ 2091{
… …
1973 2097
1974 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1975 { 2099 {
1976 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1977 scrollbar_show (0); 2101 scrollbar_show (0);
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 refresh_type &= ~SMOOTH_REFRESH;
1980#endif
1981 } 2102 }
1982 2103
1983#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
1986#endif 2107#endif
1987 2108
1988 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1989 { 2110 {
1990#if ISO_14755 2111#if ISO_14755
1991 // 5.4 2112 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2114 return;
… …
2023 if (priv_modes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
2024 && bypass_keystate 2145 && bypass_keystate
2025 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
2026 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2027 2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2028 switch (ev.button) 2152 switch (ev.button)
2029 { 2153 {
2030 case Button1: 2154 case Button1:
2031 case Button3: 2155 case Button3:
2032 selection_make (ev.time); 2156 selection_make (ev.time);
… …
2043 2167
2044 v = ev.button == Button4 ? UP : DN; 2168 v = ev.button == Button4 ? UP : DN;
2045 2169
2046 if (ev.state & ShiftMask) 2170 if (ev.state & ShiftMask)
2047 i = 1; 2171 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2172 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2173 i = nrow - 1;
2050 else 2174 else
2051 i = 5; 2175 i = 5;
2052 2176
2053# ifdef MOUSE_SLIP_WHEELING 2177# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2178 if (ev.state & ControlMask)
2055 { 2179 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2180 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2181 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2183
2060 if (slip_wheel_ev.at < NOW) 2184 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2186
2063 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
2064 } 2188 }
2065 else 2189 else
2066 { 2190 {
2067# endif 2191# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2192 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2193 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2081 } 2195 }
2082#endif 2196# endif
2083 } 2197 }
2084 break; 2198 break;
2085#endif 2199#endif
2086 } 2200 }
2087 } 2201 }
2088#ifdef MENUBAR
2089 else if (isMenuBarWindow (ev.window))
2090 menubar_control (ev);
2091#endif
2092} 2202}
2093 2203
2094#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2095#if TINTING 2205#if TINTING
2096/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2339 XWindowAttributes wattr, wrootattr; 2449 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2450 dDisp;
2341 2451
2342 pchanged = 0; 2452 pchanged = 0;
2343 2453
2344 if (!(options & Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2346 2456
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2349 2459
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2460 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2461
2352 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2353 { 2463 {
2354 if (am_transparent) 2464 if (am_transparent)
2355 { 2465 {
2356 pchanged = 1; 2466 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2359 } 2469 }
2360 2470
2361 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2362 } 2472 }
… …
2403 Window cr; 2513 Window cr;
2404 XImage *image; 2514 XImage *image;
2405 GC gc; 2515 GC gc;
2406 XGCValues gcvalue; 2516 XGCValues gcvalue;
2407 2517
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2518 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2522 nx = ny = 0;
2413 2523
… …
2423 nh += sy; 2533 nh += sy;
2424 ny = -sy; 2534 ny = -sy;
2425 sy = 0; 2535 sy = 0;
2426 } 2536 }
2427 2537
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2540
2431 XSync (disp, False); 2541 XSync (disp, False);
2432 allowedxerror = -1; 2542 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2544
… …
2439 if (image == NULL) 2549 if (image == NULL)
2440 { 2550 {
2441 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2442 { 2552 {
2443 pchanged = 1; 2553 pchanged = 1;
2444 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2445 { 2555 {
2446 XFreePixmap (disp, TermWin.pixmap); 2556 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2557 pixmap = None;
2448 } 2558 }
2449 } 2559 }
2450 2560
2451 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2452 } 2562 }
2453 else 2563 else
2454 { 2564 {
2455 if (TermWin.pixmap != None) 2565 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2566 XFreePixmap (disp, pixmap);
2457 2567
2458#if TINTING 2568#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2570 {
2461 unsigned short rm, gm, bm; 2571 unsigned short rm, gm, bm;
… …
2465 2575
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2577 }
2468#endif 2578#endif
2469 2579
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2580 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2581 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2584 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2585 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2586 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2588 XClearWindow (disp, parent[0]);
2479 2589
2480 if (!am_transparent || !am_pixmap_trans) 2590 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2591 pchanged = 1;
2482 2592
2483 am_transparent = am_pixmap_trans = 1; 2593 am_transparent = am_pixmap_trans = 1;
2484 } 2594 }
2485 } 2595 }
2486 2596
2487 if (am_pixmap_trans) 2597 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2599 else
2490 { 2600 {
2491 unsigned int n; 2601 unsigned int n;
2492 /* 2602 /*
2493 * InheritPixmap transparency 2603 * InheritPixmap transparency
2494 */ 2604 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2606 {
2497 oldp = TermWin.parent[i]; 2607 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2608 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2609 &parent[i], &list, &n);
2500 XFree (list); 2610 XFree (list);
2501 2611
2502 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2503 { 2613 {
2504 if (oldp != None) 2614 if (oldp != None)
2505 pchanged = 1; 2615 pchanged = 1;
2506 2616
2507 break; 2617 break;
2508 } 2618 }
2509 2619
2510 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2511 pchanged = 1; 2621 pchanged = 1;
2512 } 2622 }
2513 2623
2514 n = 0; 2624 n = 0;
2515 2625
2516 if (pchanged) 2626 if (pchanged)
2517 { 2627 {
2518 for (; n < (unsigned int)i; n++) 2628 for (; n < (unsigned int)i; n++)
2519 { 2629 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2630 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2632 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2634 break;
2525 } 2635 }
2526 } 2636 }
2527 } 2637 }
2528 2638
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2640 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2643 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2644 /* XXX: also turn off Opt_transparent? */
2535 } 2645 }
2536 else 2646 else
2537 { 2647 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2650 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2651 sleep (1);
2542#endif 2652#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2653 for (n = 0; n < (unsigned int)i; n++)
2544 { 2654 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2656 XClearWindow (disp, parent[n]);
2547 } 2657 }
2548 2658
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2660 am_transparent = 1;
2551 } 2661 }
2552 2662
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2664 parent[i] = None;
2555 } 2665 }
2556 2666
2557 if (scrollBar.win) 2667 if (scrollBar.win)
2558 { 2668 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2576 2686
2577bool 2687bool
2578rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2579{ 2689{
2580 bool flag = false; 2690 bool flag = false;
2581 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2583 2693
2584 for (;;) 2694 for (;;)
2585 { 2695 {
2586 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2587 { 2697 {
2588 seq_begin = cmdbuf_ptr; 2698 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2699 ch = next_char ();
2590 }
2591 2700
2592 if (ch == NOCHAR) // TODO: improve 2701 if (ch == NOCHAR)
2593 break; 2702 break;
2703 }
2594 2704
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2706 {
2597 if (!seen_input) 2707 if (!seen_input)
2598 { 2708 {
… …
2602 // some window managers resize the window early, and these programs 2712 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2713 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2714 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2715 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2716 // resized.
2607 if (seen_resize) 2717 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2718 kill (-cmd_pid, SIGWINCH);
2609 } 2719 }
2610 2720
2611 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2723 bool refreshnow = false;
2614 int nlines = 0; 2724 int nlines = 0;
2615 unicode_t *str = buf; 2725 wchar_t *str = buf;
2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2727
2617 for (;;) 2728 for (;;)
2618 { 2729 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2731 break;
2621 2732
2622 *str++ = ch; 2733 *str++ = ch;
2623 2734
2624 if (ch == C0_LF) 2735 if (ch == C0_LF || str >= eol)
2625 { 2736 {
2737 if (ch == C0_LF)
2626 nlines++; 2738 nlines++;
2739
2627 refresh_count++; 2740 refresh_count++;
2628 2741
2629 if (!(options & Opt_jumpScroll) 2742 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2744 {
2632 refreshnow = true; 2745 refreshnow = true;
2746 refresh_count = 0;
2633 ch = NOCHAR; 2747 ch = NOCHAR;
2634 break; 2748 break;
2635 } 2749 }
2636 2750
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2752 if (nlines >= nrow - 1)
2639 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2757
2641 nlines = 0; 2758 nlines = 0;
2642 str = buf; 2759 str = buf;
2760 eol = str + min (ncol, UBUFSIZ);
2643 } 2761 }
2644 }
2645 2762
2646 if (str >= buf + UBUFSIZ) 2763 if (str >= eol)
2647 { 2764 {
2765 if (eol >= buf + UBUFSIZ)
2766 {
2648 ch = NOCHAR; 2767 ch = NOCHAR;
2649 break; 2768 break;
2769 }
2770 else
2771 eol = min (eol + ncol, buf + UBUFSIZ);
2772 }
2773
2650 } 2774 }
2651 2775
2652 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2777 ch = next_char ();
2654 } 2778 }
2655 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2656 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2657 2783
2658 /* 2784 /*
2659 * If there have been a lot of new lines, then update the screen 2785 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full. 2786 * What the heck I'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which 2787 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2788 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2789 */
2664 if (refreshnow) 2790 if (refreshnow)
2665 { 2791 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2793 refresh_limit++;
2668 else 2794 else
2669 { 2795 {
2670 flag = true; 2796 flag = true;
2671 scr_refresh (refresh_type); 2797 scr_refresh ();
2798 want_refresh = 1;
2672 } 2799 }
2673 } 2800 }
2674 2801
2675 } 2802 }
2676 else 2803 else
… …
2691 } 2818 }
2692 2819
2693 return flag; 2820 return flag;
2694} 2821}
2695 2822
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character 2823// read the next character
2706unicode_t 2824wchar_t
2707rxvt_term::next_char () 2825rxvt_term::next_char ()
2708{ 2826{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2828 {
2711 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2831 return *cmdbuf_ptr++;
2714 2832
2715 wchar_t wc; 2833 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2835
2718 if (len == (size_t)-2) 2836 if (len == (size_t)-2)
2719 { 2837 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2838 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2840 break;
2723 } 2841 }
2724 2842
2725 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2845
2728 // assume wchar == unicode 2846 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2848 return wc & UNICODE_MASK;
2731 } 2849 }
2732 2850
2733 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2734} 2861}
2735 2862
2736/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2737/* 2864/*
2738 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2739 * to the command. 2866 * to the command.
2740 */ 2867 */
2741unicode_t 2868wchar_t
2742rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2743{ 2870{
2744 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2745 2872
2746 if (c == NOCHAR) 2873 if (c == NOCHAR)
2747 throw out_of_input; 2874 throw out_of_input;
2748 2875
2749 return c; 2876 return c;
2750} 2877}
2751 2878
2752unicode_t 2879uint32_t
2753rxvt_term::cmd_get8 () 2880rxvt_term::cmd_get8 ()
2754{ 2881{
2755 unicode_t c = next_octet (); 2882 uint32_t c = next_octet ();
2756 2883
2757 if (c == NOCHAR) 2884 if (c == NOCHAR)
2758 throw out_of_input; 2885 throw out_of_input;
2759 2886
2760 return c; 2887 return c;
… …
2860 case C0_ESC: 2987 case C0_ESC:
2861 process_escape_seq (); 2988 process_escape_seq ();
2862 break; 2989 break;
2863 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 2993 else
2868 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 2995 break;
2871 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2872 scr_bell (); 2997 scr_bell ();
2873 break; 2998 break;
2874 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
3029 break; 3154 break;
3030 3155
3031 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
3033 { 3158 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3161 }
3037 break; 3162 break;
3038 3163
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3187 process_dcs_seq ();
3063 break; 3188 break;
3064 3189
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
3070 3194
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3197 process_csi_seq ();
… …
3313 3437
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3438 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3439 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3440 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3443 break;
3320 3444
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3447 break;
3325 3448
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
3328 break; 3451 break;
… …
3335 break; 3458 break;
3336 case 6: /* CPR requested */ 3459 case 6: /* CPR requested */
3337 scr_report_position (); 3460 scr_report_position ();
3338 break; 3461 break;
3339 case 7: /* unofficial extension */ 3462 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3463 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3464 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3465 break;
3343 case 8: /* unofficial extension */ 3466 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3468 break;
… …
3448 { 3571 {
3449 /* 3572 /*
3450 * commands 3573 * commands
3451 */ 3574 */
3452 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3576 XMapWindow (disp, parent[0]);
3454 break; 3577 break;
3455 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3579 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3580 break;
3458 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3583 break;
3461 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3586 break;
3464 case 5: /* raise window */ 3587 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3588 XRaiseWindow (disp, parent[0]);
3466 break; 3589 break;
3467 case 6: /* lower window */ 3590 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3591 XLowerWindow (disp, parent[0]);
3469 break; 3592 break;
3470 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3471 scr_touch (true); 3594 scr_touch (true);
3472 break; 3595 break;
3473 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
3476 break; 3599 break;
3477 3600
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3602 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
3483 break; 3606 break;
3484 3607
3485 3608
3486 /* 3609 /*
3487 * reports - some output format copied from XTerm 3610 * reports - some output format copied from XTerm
3488 */ 3611 */
3489 case 11: /* report window state */ 3612 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3613 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3615 break;
3493 case 13: /* report window position */ 3616 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3618 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3619 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3620 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3621 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3622 break;
3500 case 14: /* report window size (pixels) */ 3623 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3626 break;
3504 case 18: /* report text area size (chars) */ 3627 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3628 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3629 break;
3507 case 19: /* report window size (chars) */ 3630 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3631 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3632 break;
3510 case 20: /* report icon label */ 3633 case 20: /* report icon label */
3511 { 3634 {
3512 char *s; 3635 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3636 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3638 XFree (s);
3516 } 3639 }
3517 break; 3640 break;
3518 case 21: /* report window title */ 3641 case 21: /* report window title */
3519 { 3642 {
3520 char *s; 3643 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3644 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3646 XFree (s);
3524 } 3647 }
3525 break; 3648 break;
3526 } 3649 }
3527} 3650}
… …
3530/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
3531/* 3654/*
3532 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3656 * ends_how is terminator used. returned input must be free()'d
3534 */ 3657 */
3535unsigned char * 3658char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3660{
3538 unicode_t ch; 3661 unicode_t ch;
3539 bool seen_esc = false; 3662 bool seen_esc = false;
3540 unsigned int n = 0; 3663 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3682 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3683 return NULL; /* other control character - exit */
3561 3684
3562 seen_esc = false; 3685 seen_esc = false;
3563 3686
3564 if (n >= sizeof (string) - 1) 3687 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3688 // stop at some sane length
3566 return NULL; 3689 return NULL;
3567 3690
3568 if (ch == C0_SYN) 3691 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3692 string[n++] = cmd_get8 ();
… …
3573 3696
3574 string[n++] = '\0'; 3697 string[n++] = '\0';
3575 3698
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3700
3578 return (unsigned char *)rxvt_wcstombs (string); 3701 return rxvt_wcstombs (string);
3579} 3702}
3580 3703
3581/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3582/* 3705/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3707 */
3585void 3708void
3586rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3587{ 3710{
3588 unsigned char *s; 3711 char *s;
3589 unicode_t eh; 3712 unicode_t eh;
3590 3713
3591 /* 3714 /*
3592 * Not handled yet 3715 * Not handled yet
3593 */ 3716 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3614 3737
3615 if (ch == ';') 3738 if (ch == ';')
3616 { 3739 {
3617 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3618 3741
3619 if (s) 3742 if (s)
3620 { 3743 {
3621 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3622 free (s); 3745 free (s);
3623 } 3746 }
3624 } 3747 }
3625} 3748}
3626 3749
3627void 3750void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3752{
3630 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3631 { 3754 {
3632 unsigned short r, g, b; 3755 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (display, r, g, b);
… …
3637 set_window_color (color, str); 3760 set_window_color (color, str);
3638} 3761}
3639 3762
3640/* 3763/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3765 */
3665void 3766void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3768{
3668 int changed = 0; 3769 int changed = 0;
3669 int color; 3770 int color;
3670 char *buf, *name; 3771 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3772 bool query = str[0] == '?' && !str[1];
… …
3694 unsigned long bytes_after; 3795 unsigned long bytes_after;
3695 unsigned char *value = 0; 3796 unsigned char *value = 0;
3696 const char *str = ""; 3797 const char *str = "";
3697 3798
3698 if (prop 3799 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3800 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3801 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3802 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3803 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3804 && actual_type != None
3704 && actual_format == 8) 3805 && actual_format == 8)
… …
3716 { 3817 {
3717 *eq = 0; 3818 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3819 set_utf8_property (display->atom (str), eq + 1);
3719 } 3820 }
3720 else 3821 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3822 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3823 display->atom (str));
3723 } 3824 }
3724 break; 3825 break;
3725 3826
3726 case XTerm_Color: 3827 case XTerm_Color:
… …
3728 { 3829 {
3729 if ((name = strchr (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3831 break;
3731 3832
3732 *name++ = '\0'; 3833 *name++ = '\0';
3733 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3734 3835
3735 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3837 break;
3737 3838
3738 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3840 *buf++ = '\0';
3740 3841
3741 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3742 { 3843 {
3743 unsigned short r, g, b; 3844 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 } 3847 }
3747 else 3848 else
3748 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3749 } 3850 }
3750 break; 3851 break;
3751 case XTerm_Color00: 3852 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3753 break; 3854 break;
3754 case XTerm_Color01: 3855 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3756 break; 3857 break;
3757#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3760 break; 3861 break;
… …
3764 break; 3865 break;
3765 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3767 break; 3868 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break;
3778 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3880 break;
3881 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3883 break;
3781#endif 3884#endif
3782#if TRANSPARENT && TINTING 3885#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3886 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3888 check_our_parents ();
3786 if (am_transparent) 3889 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3788 break; 3891 break;
3789#endif 3892#endif
3790 3893
3791 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3792 if (*str != ';') 3895 if (*str != ';')
3793 { 3896 {
3794#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3900 scr_touch (true);
3901#endif
3799 } 3902 }
3903
3800 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3801 { 3905 {
3802 str++; 3906 str++;
3803#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
… …
3807 3911
3808 if (changed) 3912 if (changed)
3809 { 3913 {
3810#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3915 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3916 scr_touch (true);
3917#endif
3814 } 3918 }
3815 break; 3919 break;
3816 3920
3817 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3819 break; 3923 break;
3820 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3822 break; 3926 break;
3823 3927
3824 case XTerm_logfile: 3928 case XTerm_logfile:
3825 // TODO, when secure mode? 3929 // TODO, when secure mode?
3826 break; 3930 break;
3827 3931
3932#if 0
3933 case Rxvt_dumpscreen: /* no error notices */
3934 {
3935 int fd;
3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3937 {
3938 scr_dump (fd);
3939 close (fd);
3940 }
3941 }
3942 break;
3943#endif
3828 case XTerm_font: 3944 case XTerm_font:
3829 op = URxvt_font; 3945 op = URxvt_font;
3830 case URxvt_font: 3946 case URxvt_font:
3831#if ENABLE_STYLES 3947#if ENABLE_STYLES
3832 case URxvt_boldFont: 3948 case URxvt_boldFont:
3833 case URxvt_italicFont: 3949 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3950 case URxvt_boldItalicFont:
3835#endif 3951#endif
3836 if (query) 3952 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3953 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3955 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3956 resp);
3841 else 3957 else
3842 { 3958 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3959 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3960
… …
3847 set_fonts (); 3963 set_fonts ();
3848 } 3964 }
3849 break; 3965 break;
3850 3966
3851#if ENABLE_FRILLS 3967#if ENABLE_FRILLS
3852 case XTerm_locale: 3968 case URxvt_locale:
3853 if (query) 3969 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 3971 else
3856 { 3972 {
3857 set_locale (str); 3973 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3974 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3975 init_xlocale ();
3861# endif
3862 } 3976 }
3863 break; 3977 break;
3864#endif
3865 3978
3866#ifdef MENUBAR 3979 case URxvt_view_up:
3867 case XTerm_Menu: 3980 case URxvt_view_down:
3868 if (options & Opt_insecure) 3981 {
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3982 int lines = atoi (str);
3983
3984 if (lines)
3985 scr_page (op == URxvt_view_up ? UP : DN, lines);
3986 else
3987 scr_erase_savelines ();
3988 }
3989
3870 break; 3990 break;
3871#endif 3991#endif
3872#if 0 3992
3873 case XTerm_dumpscreen: /* no error notices */ 3993#if ENABLE_PERL
3874 { 3994 case URxvt_perl:
3875 int fd; 3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3996 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 3997 break;
3883#endif 3998#endif
3884 } 3999 }
3885} 4000}
3886/*----------------------------------------------------------------------*/ 4001/*----------------------------------------------------------------------*/
… …
3938 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
3939 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
3940 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
3942 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
3943#ifdef menuBar_esc
3944 { menuBar_esc, PrivMode_menuBar },
3945#endif
3946 // 18, 19 printing-related 4058 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
3948#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
3949 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
3950#endif 4062#endif
… …
3995 } 4107 }
3996 4108
3997 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4110 switch (arg[i])
3999 { 4111 {
4112#if ENABLE_STYLES
4113 case 1021:
4114 set_option (Opt_intensityStyles, mode);
4115
4116 scr_touch (true);
4117 break;
4118#endif
4000 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
4001 case 1049: 4120 case 1049:
4002 if (options & Opt_secondaryScreen) 4121 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4122 if (mode == 0)
4004 scr_cursor (RESTORE); 4123 scr_cursor (RESTORE);
4005 else if (mode == 1) 4124 else if (mode == 1)
4006 scr_cursor (SAVE); 4125 scr_cursor (SAVE);
4007 break; 4126 break;
… …
4019 */ 4138 */
4020 PrivMode (1, PrivMode_vt52); 4139 PrivMode (1, PrivMode_vt52);
4021 break; 4140 break;
4022 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4144 break;
4026 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 4146 set_option (Opt_jumpScroll, !state);
4031 break; 4147 break;
4032 case 5: /* reverse video */ 4148 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
4034 break; 4150 break;
4035 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
… …
4041 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
4042 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4043 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4044 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4045 break; 4161 break;
4046#ifdef menuBar_esc
4047 case menuBar_esc:
4048#ifdef MENUBAR
4049 map_menuBar (state);
4050#endif
4051 break;
4052#endif
4053#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4054 case scrollBar_esc: 4163 case scrollBar_esc:
4055 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4056 { 4165 {
4057 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
4076#if 0 4185#if 0
4077 case 1001: 4186 case 1001:
4078 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
4079#endif 4188#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 4190 set_option (Opt_scrollTtyOutput, !state);
4085 break; 4191 break;
4086 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 4193 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 4194 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4198 scr_erase_screen (2);
4096 scr_change_screen (state); 4199 scr_change_screen (state);
4097 break; 4200 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4202 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4205 scr_erase_screen (2);
4103 break; 4206 break;
4104 default: 4207 default:
4105 break; 4208 break;
… …
4233 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
4234 break; 4337 break;
4235 4338
4236 //case 50: // not variable spacing 4339 //case 50: // not variable spacing
4237 4340
4238#ifndef NO_BRIGHTCOLOR 4341#if ENABLE_FRILLS
4239 case 90: 4342 case 90:
4240 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
4241 case 92: 4344 case 92:
4242 case 93: 4345 case 93:
4243 case 94: 4346 case 94:
… …
4255 case 106: 4358 case 106:
4256 case 107: 4359 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4361 break;
4259#endif 4362#endif
4260
4261 } 4363 }
4262 } 4364 }
4263} 4365}
4264/*}}} */ 4366/*}}} */
4265 4367
… …
4289 */ 4391 */
4290void 4392void
4291rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
4292{ 4394{
4293 va_list arg_ptr; 4395 va_list arg_ptr;
4294 unsigned char buf[256]; 4396 char buf[256];
4295 4397
4296 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4400 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4401 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
4305 */ 4407 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4409
4308void 4410void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 4412{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4415
4416 if (pty.pty < 0)
4417 return;
4418
4311 if (v_buflen == 0) 4419 if (v_buflen == 0)
4312 { 4420 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4314 4422
4315 if ((unsigned int)written == len) 4423 if ((unsigned int)written == len)
… …
4317 4425
4318 data += written; 4426 data += written;
4319 len -= written; 4427 len -= written;
4320 } 4428 }
4321 4429
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4431
4324 memcpy (v_buffer + v_buflen, data, len); 4432 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4433 v_buflen += len;
4326 4434
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4435 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4346 } 4454 }
4347 4455
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4456 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4457 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4459 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4460}
4354 4461
4355/*----------------------- end-of-file (C source) -----------------------*/ 4462/*----------------------- end-of-file (C source) -----------------------*/
4356 4463

Diff Legend

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