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.206 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.281 by root, Tue Jan 24 17:28:06 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"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
136{ 139{
137 x = Pixel2Col (x); 140 x = Pixel2Col (x);
138 y = Pixel2Row (y); 141 y = Pixel2Row (y);
139 142
140 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
147 152
148 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
149 { 154 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 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; 156 iso14755buf = ISO_14755_54;
153 break; 157 break;
154 } 158 }
155 159
156 x--; 160 x--;
157 } 161 }
158
159} 162}
160#endif
161 163
162#if ENABLE_OVERLAY
163void 164void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 166{
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
170 171
171 fname = rxvt_utf8towcs (f->name); 172 fname = rxvt_utf8towcs (f->name);
172 173
173#if ENABLE_COMBINING 174# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
175 { 176 {
176 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
179 } 180 }
180 else 181 else
181#endif 182# endif
182 { 183 {
183 ch2 = ch; 184 ch2 = ch;
184 185
185 alloc = 0; 186 alloc = 0;
186 chr = &ch2; 187 chr = &ch2;
187 len = 1; 188 len = 1;
188 } 189 }
189 190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
190 int width = wcswidth (fname, wcslen (fname)); 203 int width = wcswidth (fname, wcslen (fname));
191 204
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
193 215
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 217
196 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
197 { 219 {
… …
200 ch = *chr++; 222 ch = *chr++;
201 223
202 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
205#if !UNICODE3 227# if !UNICODE3
206 if (ch >= 0x10000) 228 if (ch >= 0x10000)
207 ch = 0xfffd; 229 ch = 0xfffd;
208#endif 230# endif
209 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
211 } 233 }
212 234
235 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 236 scr_overlay_set (0, len + 1, fname);
214 237
215 free (fname); 238 free (fname);
216 239
217#if ENABLE_COMBINING 240# if ENABLE_COMBINING
218 if (alloc) 241 if (alloc)
219 delete [] alloc; 242 delete [] alloc;
220#endif 243# endif
221} 244}
222#endif 245#endif
223 246
224void 247void
225rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 265 mb[0] = ch[0];
243 len = 1; 266 len = 1;
244 } 267 }
245 268
246 if (len > 0) 269 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
248 else 271 else
249 scr_bell (); 272 scr_bell ();
250 } 273 }
251 274
252 iso14755buf = 0; 275 iso14755buf = 0;
… …
280 KeySym keysym; 303 KeySym keysym;
281#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
283#endif 306#endif
284 int valid_keysym; 307 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
286 309
287 /* 310 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
290 * 313 *
… …
308 Status status_return; 331 Status status_return;
309 332
310#if 0 333#if 0
311#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
315 else 338 else
316#endif 339#endif
317#endif 340#endif
318 { 341 {
… …
355 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
356 } 379 }
357 else 380 else
358#endif 381#endif
359 { 382 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
362 } 385 }
363 386
364 if (valid_keysym) 387 if (valid_keysym)
365 { 388 {
366#ifdef KEYSYM_RESOURCE 389#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 390 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 391 return;
369#endif 392#endif
370 393
371 if (TermWin.saveLines) 394 if (saveLines)
372 { 395 {
373#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 397 if (!ctrl && !meta)
375#else 398#else
376 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
377#endif 400#endif
378 { 401 {
379 int lnsppg; 402 int lnsppg;
380 403
381#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 406#else
384 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
385#endif 408#endif
386 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
387 { 410 {
388 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
389 return; 412 return;
… …
417 scr_move_to (0, 1); 440 scr_move_to (0, 1);
418 return; 441 return;
419 } 442 }
420 else if (keysym == XK_End) 443 else if (keysym == XK_End)
421 { 444 {
422 scr_move_to (1, 0); 445 scr_move_to (1, 1);
423 return; 446 return;
424 } 447 }
425 } 448 }
426#endif 449#endif
427 } 450 }
… …
438 { 461 {
439 switch (keysym) 462 switch (keysym)
440 { 463 {
441 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
444 return; 467 return;
445#if TODO 468#if TODO
446 /* rxvt extras */ 469 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
829 { 852 {
830#ifdef META8_OPTION 853#ifdef META8_OPTION
831 /* set 8-bit on */ 854 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
833 { 856 {
834 unsigned char *ch; 857 char *ch;
835 858
836 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 860 *ch |= 0x80;
838 861
839 meta = 0; 862 meta = 0;
… …
841#endif 864#endif
842 /* nil */ ; 865 /* nil */ ;
843 } 866 }
844 } 867 }
845 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
846 if (len <= 0) 872 if (len <= 0)
847 return; /* not mapped */ 873 return; /* not mapped */
848 874
849 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 876 if (view_start)
851 { 877 {
852 TermWin.view_start = 0; 878 view_start = 0;
853 want_refresh = 1; 879 want_refresh = 1;
854 } 880 }
855 881
856 /* 882 /*
857 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 898#ifdef META8_OPTION
873 && meta_char == C0_ESC 899 && meta_char == C0_ESC
874#endif 900#endif
875 ) 901 )
876 { 902 {
877 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
878 tt_write (&ch, 1); 904 tt_write (&ch, 1);
879 } 905 }
880 906
881#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
890#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
892} 918}
893/*}}} */ 919/*}}} */
894 920
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 922unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 924{
901 unsigned int n, s; 925 unsigned int n, s;
902 926
903 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 965 }
942#endif 966#endif
943 967
944 if (want_refresh) 968 if (want_refresh)
945 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
946 scr_refresh (refresh_type); 1008 scr_refresh ();
947 scrollbar_show (1); 1009 scrollbar_show (1);
948#ifdef USE_XIM 1010#ifdef USE_XIM
949 IMSendSpot (); 1011 IMSendSpot ();
950#endif 1012#endif
951 } 1013 }
… …
954} 1016}
955 1017
956void 1018void
957rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
958{ 1020{
959 SET_R (this); 1021 make_current ();
960 SET_LOCALE (locale);
961 1022
962 display->flush (); 1023 display->flush ();
963 1024
964 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1027}
967 1028
968void 1029void
969rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
970{ 1031{
971 SET_R (this); 1032 make_current ();
972 SET_LOCALE (locale);
973 1033
974 refresh_limit = 1; 1034 refresh_limit = 1;
975 refresh_count = 0; 1035 refresh_count = 0;
976 flush (); 1036 flush ();
977} 1037}
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1042{
983 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1044 want_refresh = 1;
985 1045
986 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1047}
988#endif 1048#endif
989 1049
990#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
991void 1051void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1066{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1069 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1070 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1072 }
1014} 1073}
1015#endif 1074#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1079{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1081 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1083 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1085 }
1028} 1086}
1029#endif 1087#endif
… …
1034{ 1092{
1035 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1096 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1097 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1042 1099
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1100 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1102 }
1047} 1103}
1048#endif 1104#endif
1049 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1050bool 1124bool
1051rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1052{ 1126{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1128
1055 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1056 { 1130 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1132 n = 0;
1059 } 1133 }
1060 1134
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1064 1138
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1140
1067 if (n > 0) 1141 if (r > 0)
1068 { 1142 {
1069 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1070 return true; 1144 return true;
1071 } 1145 }
1072 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1073 destroy (); 1158 destroy ();
1159 }
1074 1160
1075 return false; 1161 return false;
1076} 1162}
1077 1163
1078void 1164void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1166{
1081 SET_R (this); 1167 make_current ();
1082 SET_LOCALE (locale);
1083 1168
1084 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1171 while (pty_fill ())
1087 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1092} 1177}
1093 1178
1094void 1179void
1095rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1096{ 1181{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1183 recolour_cursor ();
1099 1184
1100#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1186 hidden_pointer = 0;
1102 1187
1103 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1190#endif
1106} 1191}
1107 1192
1108#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1109void 1194void
1110rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1111{ 1196{
1112 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1113 return; 1198 return;
1114 1199
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1201 XFlush (display->display);
1117 1202
1118 hidden_pointer = 1; 1203 hidden_pointer = 1;
1119} 1204}
1120 1205
1121void 1206void
1122rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1123{ 1208{
1124 SET_R (this); 1209 make_current ();
1125 SET_LOCALE (locale);
1126 1210
1127 pointer_blank (); 1211 pointer_blank ();
1128} 1212}
1129#endif 1213#endif
1130 1214
… …
1209 1293
1210/*{{{ process an X event */ 1294/*{{{ process an X event */
1211void 1295void
1212rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1213{ 1297{
1298 make_current ();
1299
1214 dDisp; 1300 dDisp;
1215 1301
1216 SET_R (this); 1302 if (ev.xany.window == vt
1217 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1218 1306
1219#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1221 {
1222 if (hidden_cursor)
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1310 unsigned int unused_mask;
1249 1311
1250 switch (ev.type) 1312 switch (ev.type)
… …
1257 1319
1258 break; 1320 break;
1259 1321
1260 case KeyRelease: 1322 case KeyRelease:
1261 { 1323 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1325 KeySym keysym;
1264 1326
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1328#endif
1267 1329
1268#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1331 // ISO 14755 support
1270 if (iso14755buf) 1332 if (iso14755buf)
… …
1275# endif 1337# endif
1276# if ISO_14755 1338# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1278 // first: controls 1340 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1344 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1346 commit_iso14755 ();
1285 return; // case-break; 1347 goto skip_switch;
1286 } 1348 }
1287 1349
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1351 if (i[0] == keysym)
1290 { 1352 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1354 commit_iso14755 ();
1293 return; // case-break; 1355 goto skip_switch;
1294 } 1356 }
1295 1357
1296 scr_bell (); 1358 scr_bell ();
1297# endif 1359# endif
1298 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1317 else 1379 else
1318 iso14755buf = 0; 1380 iso14755buf = 0;
1319 } 1381 }
1320#endif 1382#endif
1321 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1327#endif 1393#endif
1328 break; 1394 break;
1329 } 1395 }
1330 1396
… …
1336 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1337 break; 1403 break;
1338 1404
1339 case ClientMessage: 1405 case ClientMessage:
1340 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1408 {
1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1410 {
1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1412 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1414 {
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1416 destroy ();
1417 }
1345#if ENABLE_EWMH 1418#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1422 &ev);
1423#endif
1424 }
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1350#endif 1434#endif
1351 } 1435 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break; 1436 break;
1388 1437
1389 case MappingNotify: 1438 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1440 break;
… …
1422 case FocusOut: 1471 case FocusOut:
1423 focus_out (); 1472 focus_out ();
1424 break; 1473 break;
1425 1474
1426 case ConfigureNotify: 1475 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1476 if (ev.xconfigure.window == parent[0])
1428 { 1477 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ;
1438 1480
1439 if (szHint.width != width || szHint.height != height) 1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1482 {
1441 seen_resize = 1; 1483 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1485 }
1444 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1490 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1491 check_our_parents ();
1448#endif 1492#endif
1449 } 1493 }
1450 break; 1494 break;
1451 1495
1452 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456 1501
1457 break; 1502 break;
1458 1503
1459 case SelectionClear: 1504 case SelectionClear:
1460 selection_clear (); 1505 selection_clear ();
… …
1467 1512
1468 case SelectionRequest: 1513 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1470 break; 1515 break;
1471 1516
1517 case MapNotify:
1518 mapped = 1;
1519#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1521#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break;
1524
1472 case UnmapNotify: 1525 case UnmapNotify:
1473 TermWin.mapped = 0; 1526 mapped = 0;
1474#ifdef TEXT_BLINK 1527#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1528 text_blink_ev.stop ();
1476#endif 1529#endif
1477 break; 1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479 case MapNotify:
1480 TermWin.mapped = 1;
1481#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif
1484 break; 1531 break;
1485 1532
1486#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1487 case ReparentNotify: 1534 case ReparentNotify:
1488 rootwin_cb (ev); 1535 rootwin_cb (ev);
1489 break; 1536 break;
1490#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1491 1538
1492 case GraphicsExpose: 1539 case GraphicsExpose:
1493 case Expose: 1540 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1495 { 1542 {
1496 do 1543 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1547
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1549
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1506 1553
1507 scr_refresh (refresh_type); 1554 want_refresh = 1;
1508 } 1555 }
1509 else 1556 else
1510 { 1557 {
1511 XEvent unused_event; 1558 XEvent unused_event;
1512 1559
… …
1518 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1519 { 1566 {
1520 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1521 scrollbar_show (0); 1568 scrollbar_show (0);
1522 } 1569 }
1523#ifdef MENUBAR
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose ();
1526#endif
1527 1570
1528#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1531#endif 1574#endif
1532 } 1575 }
1533 break; 1576 break;
1534 1577
1535 case MotionNotify: 1578 case MotionNotify:
1536#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1580 if (hidden_pointer)
1538 pointer_unblank (); 1581 pointer_unblank ();
1539#endif 1582#endif
1540#if MENUBAR
1541 if (isMenuBarWindow (ev.xany.window))
1542 {
1543 menubar_control (ev.xbutton);
1544 break;
1545 }
1546#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1584 break;
1549 1585
1550 if (ev.xany.window == TermWin.vt) 1586 if (ev.xany.window == vt)
1551 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1592 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1594 ;
1556 1595
1557 XQueryPointer (disp, TermWin.vt, 1596 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1600 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1574#endif 1613#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1614 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1615 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1616
1578#ifdef SELECTION_SCROLLING 1617#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1618 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1619 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1620 {
1582 int dist; 1621 int dist;
1583 1622
1584 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1633 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1634 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1635
1597 /* calc number of lines to scroll */ 1636 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1637 if (ev.xbutton.y < int_bwidth)
1599 { 1638 {
1600 scroll_selection_dir = UP; 1639 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1640 dist = int_bwidth - ev.xbutton.y;
1602 } 1641 }
1603 else 1642 else
1604 { 1643 {
1605 scroll_selection_dir = DN; 1644 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1645 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1646 }
1608 1647
1609 scroll_selection_lines = Pixel2Height (dist) 1648 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1649 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1650 + 1;
1612 MIN_IT (scroll_selection_lines, 1651 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1652 SELECTION_SCROLL_MAX_LINES);
1614 } 1653 }
1615 else 1654 else
1616 { 1655 {
1617 /* we are within the text window, so we 1656 /* we are within the text window, so we
… …
1637 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1678 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1680 scrollbar_size ());
1642 scr_refresh (refresh_type); 1681 want_refresh = 1;
1643 refresh_limit = 0; 1682 refresh_limit = 0;
1644 scrollbar_show (1); 1683 scrollbar_show (1);
1645 } 1684 }
1646 break; 1685 break;
1647 } 1686 }
1687
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1648} 1716}
1649 1717
1650void 1718void
1651rxvt_term::focus_in () 1719rxvt_term::focus_in ()
1652{ 1720{
1653 if (!TermWin.focus) 1721 if (!focus)
1654 { 1722 {
1655 TermWin.focus = 1; 1723 focus = 1;
1656 want_refresh = 1; 1724 want_refresh = 1;
1725
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1657#if USE_XIM 1728#if USE_XIM
1658 if (Input_Context != NULL) 1729 if (Input_Context != NULL)
1659 { 1730 {
1660 IMSetStatusPosition (); 1731 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1662 } 1733 }
1663#endif 1734#endif
1664#if CURSOR_BLINK 1735#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1736 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1667#endif 1738#endif
1668#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1670 { 1741 {
1671 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
1676} 1747}
1677 1748
1678void 1749void
1679rxvt_term::focus_out () 1750rxvt_term::focus_out ()
1680{ 1751{
1681 if (TermWin.focus) 1752 if (focus)
1682 { 1753 {
1683 TermWin.focus = 0; 1754 focus = 0;
1684 want_refresh = 1; 1755 want_refresh = 1;
1685 1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1686#if ENABLE_FRILLS || ISO_14755 1759#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf)
1761 {
1687 iso14755buf = 0; 1762 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1763# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1764 scr_overlay_off ();
1765# endif
1766 }
1691#endif 1767#endif
1692#if USE_XIM 1768#if USE_XIM
1693 if (Input_Context != NULL) 1769 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1770 XUnsetICFocus (Input_Context);
1695#endif 1771#endif
1696#if CURSOR_BLINK 1772#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1773 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1774 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1775 hidden_cursor = 0;
1700#endif 1776#endif
1701#if OFF_FOCUS_FADING 1777#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1778 if (rs[Rs_fade])
… …
1710 1786
1711#if TRANSPARENT 1787#if TRANSPARENT
1712void 1788void
1713rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1790{
1715 SET_R (this); 1791 make_current ();
1716 SET_LOCALE (locale);
1717 1792
1718 switch (ev.type) 1793 switch (ev.type)
1719 { 1794 {
1720 case PropertyNotify: 1795 case PropertyNotify:
1721 /* 1796 /*
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1802 return;
1728 1803
1729 /* FALLTHROUGH */ 1804 /* FALLTHROUGH */
1730 case ReparentNotify: 1805 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1807 want_refresh = want_full_refresh = 1;
1733 break; 1808 break;
1734 } 1809 }
1735} 1810}
1736#endif 1811#endif
… …
1739rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1740{ 1815{
1741 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1742 1817
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1744 if (!bypass_keystate) 1820 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1822
1747 /* 1823 /*
1748 * VT window processing of button press 1824 * VT window processing of button press
1749 */ 1825 */
1750 if (ev.window == TermWin.vt) 1826 if (ev.window == vt)
1751 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1752#if ISO_14755 1831#if ISO_14755
1753 // 5.4 1832 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1834 {
1756 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1847#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1848 if (ev.button == MEvent.button && clickintime)
1770 { 1849 {
1771 /* same button, within alloted time */ 1850 /* same button, within alloted time */
1772 MEvent.clicks++; 1851 MEvent.clicks++;
1852
1773 if (MEvent.clicks > 1) 1853 if (MEvent.clicks > 1)
1774 { 1854 {
1775 /* only report double clicks */ 1855 /* only report double clicks */
1776 MEvent.clicks = 2; 1856 MEvent.clicks = 2;
1777 mouse_report (ev); 1857 mouse_report (ev);
… …
1809#else 1889#else
1810 selection.rect = false; 1890 selection.rect = false;
1811#endif 1891#endif
1812 1892
1813 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1895 {
1816 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1818 else 1898 else
1819 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
… …
1960 case Button3: 2040 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
1962 { 2042 {
1963 if (scrollbar_above_slider (ev.y)) 2043 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2045 scr_page (UP, nrow - 1);
1966# else 2046# else
1967 scr_page (UP, TermWin.nrow / 4); 2047 scr_page (UP, nrow / 4);
1968# endif 2048# endif
1969 else if (scrollbar_below_slider (ev.y)) 2049 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2050# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2051 scr_page (DN, nrow - 1);
1972# else 2052# else
1973 scr_page (DN, TermWin.nrow / 4); 2053 scr_page (DN, nrow / 4);
1974# endif 2054# endif
1975 else 2055 else
1976 scrollBar.setMotion (); 2056 scrollBar.setMotion ();
1977 } 2057 }
1978 else 2058 else
1979 { 2059 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2061 (nrow
1982 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2063 / scrollbar_size ()));
1984 } 2064 }
1985 2065
1986 break; 2066 break;
1987 } 2067 }
1988 } 2068 }
2069
1989 return; 2070 return;
1990 } 2071 }
1991#if MENUBAR
1992 /*
1993 * Menubar window processing of button press
1994 */
1995 if (isMenuBarWindow (ev.window))
1996 menubar_control (ev);
1997#endif
1998} 2072}
1999 2073
2000void 2074void
2001rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
2002{ 2076{
… …
2008 2082
2009 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
2010 { 2084 {
2011 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
2012 scrollbar_show (0); 2086 scrollbar_show (0);
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 refresh_type &= ~SMOOTH_REFRESH;
2015#endif
2016 } 2087 }
2017 2088
2018#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2021#endif 2092#endif
2022 2093
2023 if (ev.window == TermWin.vt) 2094 if (ev.window == vt)
2024 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
2025#if ISO_14755 2099#if ISO_14755
2026 // 5.4 2100 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2102 return;
2029#endif 2103#endif
2104
2030 if (reportmode) 2105 if (reportmode)
2031 { 2106 {
2032 /* mouse report from vt window */ 2107 /* mouse report from vt window */
2033 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
2034 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2064 { 2139 {
2065 case Button1: 2140 case Button1:
2066 case Button3: 2141 case Button3:
2067 selection_make (ev.time); 2142 selection_make (ev.time);
2068 break; 2143 break;
2144
2069 case Button2: 2145 case Button2:
2070 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2071 break; 2148 break;
2149
2072#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2073 case Button4: 2151 case Button4:
2074 case Button5: 2152 case Button5:
2075 { 2153 {
2076 int i; 2154 int i;
… …
2078 2156
2079 v = ev.button == Button4 ? UP : DN; 2157 v = ev.button == Button4 ? UP : DN;
2080 2158
2081 if (ev.state & ShiftMask) 2159 if (ev.state & ShiftMask)
2082 i = 1; 2160 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2161 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2162 i = nrow - 1;
2085 else 2163 else
2086 i = 5; 2164 i = 5;
2087 2165
2088# ifdef MOUSE_SLIP_WHEELING 2166# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2167 if (ev.state & ControlMask)
2090 { 2168 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2169 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2172
2095 if (slip_wheel_ev.at < NOW) 2173 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2175
2098 slip_wheel_ev.start (); 2176 slip_wheel_ev.start ();
2099 } 2177 }
2100 else 2178 else
2101 { 2179 {
2102# endif 2180# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2181 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2182 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING 2183# ifdef MOUSE_SLIP_WHEELING
2116 } 2184 }
2117#endif 2185# endif
2118 } 2186 }
2119 break; 2187 break;
2120#endif 2188#endif
2121 } 2189 }
2122 } 2190 }
2123#ifdef MENUBAR
2124 else if (isMenuBarWindow (ev.window))
2125 menubar_control (ev);
2126#endif
2127} 2191}
2128 2192
2129#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2130#if TINTING 2194#if TINTING
2131/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2374 XWindowAttributes wattr, wrootattr; 2438 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2439 dDisp;
2376 2440
2377 pchanged = 0; 2441 pchanged = 0;
2378 2442
2379 if (!(options & Opt_transparent)) 2443 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2444 return pchanged; /* Don't try any more */
2381 2445
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2447 rootdepth = wrootattr.depth;
2384 2448
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2449 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2450
2387 if (rootdepth != wattr.depth) 2451 if (rootdepth != wattr.depth)
2388 { 2452 {
2389 if (am_transparent) 2453 if (am_transparent)
2390 { 2454 {
2391 pchanged = 1; 2455 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2457 am_transparent = am_pixmap_trans = 0;
2394 } 2458 }
2395 2459
2396 return pchanged; /* Don't try any more */ 2460 return pchanged; /* Don't try any more */
2397 } 2461 }
… …
2438 Window cr; 2502 Window cr;
2439 XImage *image; 2503 XImage *image;
2440 GC gc; 2504 GC gc;
2441 XGCValues gcvalue; 2505 XGCValues gcvalue;
2442 2506
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2507 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2508 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2509 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2510 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2511 nx = ny = 0;
2448 2512
… …
2458 nh += sy; 2522 nh += sy;
2459 ny = -sy; 2523 ny = -sy;
2460 sy = 0; 2524 sy = 0;
2461 } 2525 }
2462 2526
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2529
2466 XSync (disp, False); 2530 XSync (disp, False);
2467 allowedxerror = -1; 2531 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2533
… …
2474 if (image == NULL) 2538 if (image == NULL)
2475 { 2539 {
2476 if (am_transparent && am_pixmap_trans) 2540 if (am_transparent && am_pixmap_trans)
2477 { 2541 {
2478 pchanged = 1; 2542 pchanged = 1;
2479 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2480 { 2544 {
2481 XFreePixmap (disp, TermWin.pixmap); 2545 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2546 pixmap = None;
2483 } 2547 }
2484 } 2548 }
2485 2549
2486 am_pixmap_trans = 0; 2550 am_pixmap_trans = 0;
2487 } 2551 }
2488 else 2552 else
2489 { 2553 {
2490 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2555 XFreePixmap (disp, pixmap);
2492 2556
2493#if TINTING 2557#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2558 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2559 {
2496 unsigned short rm, gm, bm; 2560 unsigned short rm, gm, bm;
… …
2500 2564
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2565 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2566 }
2503#endif 2567#endif
2504 2568
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2569 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2570 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2573 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2574 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2575 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2577 XClearWindow (disp, parent[0]);
2514 2578
2515 if (!am_transparent || !am_pixmap_trans) 2579 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2580 pchanged = 1;
2517 2581
2518 am_transparent = am_pixmap_trans = 1; 2582 am_transparent = am_pixmap_trans = 1;
2519 } 2583 }
2520 } 2584 }
2521 2585
2522 if (am_pixmap_trans) 2586 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2588 else
2525 { 2589 {
2526 unsigned int n; 2590 unsigned int n;
2527 /* 2591 /*
2528 * InheritPixmap transparency 2592 * InheritPixmap transparency
2529 */ 2593 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2595 {
2532 oldp = TermWin.parent[i]; 2596 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2597 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2598 &parent[i], &list, &n);
2535 XFree (list); 2599 XFree (list);
2536 2600
2537 if (TermWin.parent[i] == display->root) 2601 if (parent[i] == display->root)
2538 { 2602 {
2539 if (oldp != None) 2603 if (oldp != None)
2540 pchanged = 1; 2604 pchanged = 1;
2541 2605
2542 break; 2606 break;
2543 } 2607 }
2544 2608
2545 if (oldp != TermWin.parent[i]) 2609 if (oldp != parent[i])
2546 pchanged = 1; 2610 pchanged = 1;
2547 } 2611 }
2548 2612
2549 n = 0; 2613 n = 0;
2550 2614
2551 if (pchanged) 2615 if (pchanged)
2552 { 2616 {
2553 for (; n < (unsigned int)i; n++) 2617 for (; n < (unsigned int)i; n++)
2554 { 2618 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2619 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2621 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2623 break;
2560 } 2624 }
2561 } 2625 }
2562 } 2626 }
2563 2627
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2629 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2632 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2570 } 2634 }
2571 else 2635 else
2572 { 2636 {
2573#if WAIT_FOR_WM
2574 /* wait (an arbitrary period) for the WM to do its thing
2575 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1);
2577#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2579 { 2638 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2582 } 2641 }
2583 2642
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2644 am_transparent = 1;
2586 } 2645 }
2587 2646
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2648 parent[i] = None;
2590 } 2649 }
2591 2650
2592 if (scrollBar.win) 2651 if (scrollBar.win)
2593 { 2652 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2611 2670
2612bool 2671bool
2613rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2614{ 2673{
2615 bool flag = false; 2674 bool flag = false;
2616 unicode_t ch = NOCHAR; 2675 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2618 2677
2619 for (;;) 2678 for (;;)
2620 { 2679 {
2621 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2622 { 2681 {
2623 seq_begin = cmdbuf_ptr; 2682 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2683 ch = next_char ();
2625 }
2626 2684
2627 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR)
2628 break; 2686 break;
2687 }
2629 2688
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2690 {
2632 if (!seen_input) 2691 if (!seen_input)
2633 { 2692 {
… …
2642 if (seen_resize && cmd_pid) 2701 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2644 } 2703 }
2645 2704
2646 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2706 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2707 bool refreshnow = false;
2649 int nlines = 0; 2708 int nlines = 0;
2650 unicode_t *str = buf; 2709 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2710 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2711
2653 for (;;) 2712 for (;;)
2654 { 2713 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2715 break;
… …
2662 if (ch == C0_LF) 2721 if (ch == C0_LF)
2663 nlines++; 2722 nlines++;
2664 2723
2665 refresh_count++; 2724 refresh_count++;
2666 2725
2667 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2728 {
2670 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2671 ch = NOCHAR; 2731 ch = NOCHAR;
2672 break; 2732 break;
2673 } 2733 }
2674 2734
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2677 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2740 scr_add_lines (buf, str - buf, nlines);
2741
2679 nlines = 0; 2742 nlines = 0;
2680 str = buf; 2743 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2744 eol = str + min (ncol, UBUFSIZ);
2682 } 2745 }
2683 2746
2684 if (str >= eol) 2747 if (str >= eol)
2685 { 2748 {
2686 if (eol >= buf + UBUFSIZ) 2749 if (eol >= buf + UBUFSIZ)
2687 { 2750 {
2688 ch = NOCHAR; 2751 ch = NOCHAR;
2689 break; 2752 break;
2690 } 2753 }
2691 else 2754 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2755 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2756 }
2694 2757
2695 } 2758 }
2696 2759
2697 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2761 ch = next_char ();
2699 } 2762 }
2700 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2701 scr_add_lines (buf, nlines, str - buf); 2766 scr_add_lines (buf, str - buf, nlines);
2702 2767
2703 /* 2768 /*
2704 * If there have been a lot of new lines, then update the screen 2769 * If there have been a lot of new lines, then update the screen
2705 * What the heck I'll cheat and only refresh less than every page-full. 2770 * What the heck I'll cheat and only refresh less than every page-full.
2706 * the number of pages between refreshes is refresh_limit, which 2771 * the number of pages between refreshes is refresh_limit, which
2707 * is incremented here because we must be doing flat-out scrolling. 2772 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2773 */
2709 if (refreshnow) 2774 if (refreshnow)
2710 { 2775 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++; 2777 refresh_limit++;
2713 else 2778 else
2714 { 2779 {
2715 flag = true; 2780 flag = true;
2716 scr_refresh (refresh_type); 2781 scr_refresh ();
2782 want_refresh = 1;
2717 } 2783 }
2718 } 2784 }
2719 2785
2720 } 2786 }
2721 else 2787 else
… …
2736 } 2802 }
2737 2803
2738 return flag; 2804 return flag;
2739} 2805}
2740 2806
2741// read the next octet
2742unicode_t
2743rxvt_term::next_octet ()
2744{
2745 return cmdbuf_ptr < cmdbuf_endp
2746 ? *cmdbuf_ptr++
2747 : NOCHAR;
2748}
2749
2750// read the next character 2807// read the next character
2751unicode_t 2808wchar_t
2752rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2753{ 2810{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2812 {
2756 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2815 return *cmdbuf_ptr++;
2759 2816
2760 wchar_t wc; 2817 wchar_t wc;
2761 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2818 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2762 2819
2763 if (len == (size_t)-2) 2820 if (len == (size_t)-2)
2764 { 2821 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2822 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2823 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2824 break;
2768 } 2825 }
2769 2826
2770 if (len == (size_t)-1) 2827 if (len == (size_t)-1)
2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2828 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2772 2829
2773 // assume wchar == unicode 2830 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2831 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2832 return wc & UNICODE_MASK;
2776 } 2833 }
2777 2834
2778 return NOCHAR; 2835 return NOCHAR;
2779} 2836}
2837
2838// read the next octet
2839uint32_t
2840rxvt_term::next_octet () NOTHROW
2841{
2842 return cmdbuf_ptr < cmdbuf_endp
2843 ? (unsigned char)*cmdbuf_ptr++
2844 : NOCHAR;
2845}
2846
2847static class out_of_input out_of_input;
2780 2848
2781/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2782/* 2850/*
2783 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2784 * to the command. 2852 * to the command.
2785 */ 2853 */
2786unicode_t 2854wchar_t
2787rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2788{ 2856{
2789 unicode_t c = next_char (); 2857 wchar_t c = next_char ();
2790 2858
2791 if (c == NOCHAR) 2859 if (c == NOCHAR)
2792 throw out_of_input; 2860 throw out_of_input;
2793 2861
2794 return c; 2862 return c;
2795} 2863}
2796 2864
2797unicode_t 2865uint32_t
2798rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2799{ 2867{
2800 unicode_t c = next_octet (); 2868 uint32_t c = next_octet ();
2801 2869
2802 if (c == NOCHAR) 2870 if (c == NOCHAR)
2803 throw out_of_input; 2871 throw out_of_input;
2804 2872
2805 return c; 2873 return c;
… …
2905 case C0_ESC: 2973 case C0_ESC:
2906 process_escape_seq (); 2974 process_escape_seq ();
2907 break; 2975 break;
2908 case C0_ENQ: /* terminal Status */ 2976 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 2977 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2978 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 2979 else
2913 tt_write ((unsigned char *)VT100_ANS, 2980 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 2981 break;
2916 case C0_BEL: /* bell */ 2982 case C0_BEL: /* bell */
2917 scr_bell (); 2983 scr_bell ();
2918 break; 2984 break;
2919 case C0_BS: /* backspace */ 2985 case C0_BS: /* backspace */
… …
3074 break; 3140 break;
3075 3141
3076 /* 8.3.87: NEXT LINE */ 3142 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 3143 case C1_NEL: /* ESC E */
3078 { 3144 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 3145 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 3146 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 3147 }
3082 break; 3148 break;
3083 3149
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 3150 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 3151 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 3173 process_dcs_seq ();
3108 break; 3174 break;
3109 3175
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3176 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 3177 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 3178 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 3179 break; /* steal obsolete ESC [ c */
3115 3180
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3181 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 3182 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 3183 process_csi_seq ();
… …
3358 3423
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3424 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3425 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3426 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3427 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3428 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3429 break;
3365 3430
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3431 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3432 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 3433 break;
3370 3434
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3435 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 3436 process_sgr_mode (nargs, arg);
3373 break; 3437 break;
… …
3380 break; 3444 break;
3381 case 6: /* CPR requested */ 3445 case 6: /* CPR requested */
3382 scr_report_position (); 3446 scr_report_position ();
3383 break; 3447 break;
3384 case 7: /* unofficial extension */ 3448 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 3449 if (OPTION (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3450 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 3451 break;
3388 case 8: /* unofficial extension */ 3452 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 3454 break;
… …
3493 { 3557 {
3494 /* 3558 /*
3495 * commands 3559 * commands
3496 */ 3560 */
3497 case 1: /* deiconify window */ 3561 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3562 XMapWindow (disp, parent[0]);
3499 break; 3563 break;
3500 case 2: /* iconify window */ 3564 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3565 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3566 break;
3503 case 3: /* set position (pixels) */ 3567 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3568 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3569 break;
3506 case 4: /* set size (pixels) */ 3570 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3572 break;
3509 case 5: /* raise window */ 3573 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3574 XRaiseWindow (disp, parent[0]);
3511 break; 3575 break;
3512 case 6: /* lower window */ 3576 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3577 XLowerWindow (disp, parent[0]);
3514 break; 3578 break;
3515 case 7: /* refresh window */ 3579 case 7: /* refresh window */
3516 scr_touch (true); 3580 scr_touch (true);
3517 break; 3581 break;
3518 case 8: /* set size (chars) */ 3582 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3583 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3521 break; 3585 break;
3522 3586
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3587 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3588 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3589 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3590 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3591 (unsigned int) (args[1] * fheight));
3528 break; 3592 break;
3529 3593
3530 3594
3531 /* 3595 /*
3532 * reports - some output format copied from XTerm 3596 * reports - some output format copied from XTerm
3533 */ 3597 */
3534 case 11: /* report window state */ 3598 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3601 break;
3538 case 13: /* report window position */ 3602 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3604 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3605 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3606 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3607 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3608 break;
3545 case 14: /* report window size (pixels) */ 3609 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3610 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3612 break;
3549 case 18: /* report text area size (chars) */ 3613 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3615 break;
3552 case 19: /* report window size (chars) */ 3616 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3617 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3618 break;
3555 case 20: /* report icon label */ 3619 case 20: /* report icon label */
3556 { 3620 {
3557 char *s; 3621 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3622 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3624 XFree (s);
3561 } 3625 }
3562 break; 3626 break;
3563 case 21: /* report window title */ 3627 case 21: /* report window title */
3564 { 3628 {
3565 char *s; 3629 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3630 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3632 XFree (s);
3569 } 3633 }
3570 break; 3634 break;
3571 } 3635 }
3572} 3636}
… …
3575/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
3576/* 3640/*
3577 * get input up until STRING TERMINATOR (or BEL) 3641 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3642 * ends_how is terminator used. returned input must be free()'d
3579 */ 3643 */
3580unsigned char * 3644char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3645rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3646{
3583 unicode_t ch; 3647 unicode_t ch;
3584 bool seen_esc = false; 3648 bool seen_esc = false;
3585 unsigned int n = 0; 3649 unsigned int n = 0;
… …
3618 3682
3619 string[n++] = '\0'; 3683 string[n++] = '\0';
3620 3684
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3685 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3686
3623 return (unsigned char *)rxvt_wcstombs (string); 3687 return rxvt_wcstombs (string);
3624} 3688}
3625 3689
3626/*----------------------------------------------------------------------*/ 3690/*----------------------------------------------------------------------*/
3627/* 3691/*
3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3692 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3629 */ 3693 */
3630void 3694void
3631rxvt_term::process_dcs_seq () 3695rxvt_term::process_dcs_seq ()
3632{ 3696{
3633 unsigned char *s; 3697 char *s;
3634 unicode_t eh; 3698 unicode_t eh;
3635 3699
3636 /* 3700 /*
3637 * Not handled yet 3701 * Not handled yet
3638 */ 3702 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3721 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3722 arg = arg * 10 + (ch - '0');
3659 3723
3660 if (ch == ';') 3724 if (ch == ';')
3661 { 3725 {
3662 unsigned char *s = get_to_st (eh); 3726 char *s = get_to_st (eh);
3663 3727
3664 if (s) 3728 if (s)
3665 { 3729 {
3666 process_xterm_seq (arg, (char *)s, eh); 3730 process_xterm_seq (arg, s, eh);
3667 free (s); 3731 free (s);
3668 } 3732 }
3669 } 3733 }
3670} 3734}
3671 3735
3672void 3736void
3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3674{ 3738{
3675 if (str[0] == '?' && !str[1]) 3739 if (str[0] == '?' && !str[1])
3676 { 3740 {
3677 unsigned short r, g, b; 3741 unsigned short r, g, b;
3678 pix_colors_focused[color].get (display, r, g, b); 3742 pix_colors_focused[color].get (display, r, g, b);
… …
3684 3748
3685/* 3749/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3751 */
3688void 3752void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3754{
3691 int changed = 0;
3692 int color; 3755 int color;
3693 char *buf, *name; 3756 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3757 bool query = str[0] == '?' && !str[1];
3695 int saveop = op; 3758 int saveop = op;
3696 dDisp; 3759 dDisp;
… …
3717 unsigned long bytes_after; 3780 unsigned long bytes_after;
3718 unsigned char *value = 0; 3781 unsigned char *value = 0;
3719 const char *str = ""; 3782 const char *str = "";
3720 3783
3721 if (prop 3784 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3785 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3786 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3787 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3788 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3789 && actual_type != None
3727 && actual_format == 8) 3790 && actual_format == 8)
… …
3739 { 3802 {
3740 *eq = 0; 3803 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3804 set_utf8_property (display->atom (str), eq + 1);
3742 } 3805 }
3743 else 3806 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3807 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3808 display->atom (str));
3746 } 3809 }
3747 break; 3810 break;
3748 3811
3749 case XTerm_Color: 3812 case XTerm_Color:
… …
3751 { 3814 {
3752 if ((name = strchr (buf, ';')) == NULL) 3815 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3816 break;
3754 3817
3755 *name++ = '\0'; 3818 *name++ = '\0';
3756 color = atoi (buf); 3819 color = atoi (buf) + minCOLOR;
3757 3820
3758 if (color < 0 || color >= TOTAL_COLORS) 3821 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3822 break;
3760 3823
3761 if ((buf = strchr (name, ';')) != NULL) 3824 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3825 *buf++ = '\0';
3763 3826
3764 if (name[0] == '?' && !name[1]) 3827 if (name[0] == '?' && !name[1])
3765 { 3828 {
3766 unsigned short r, g, b; 3829 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3830 pix_colors_focused[color].get (display, r, g, b);
3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 } 3832 }
3770 else 3833 else
3771 set_window_color (color + minCOLOR, name); 3834 set_window_color (color, name);
3772 } 3835 }
3773 break; 3836 break;
3774 case XTerm_Color00: 3837 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3838 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3776 break; 3839 break;
3777 case XTerm_Color01: 3840 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3841 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3779 break; 3842 break;
3780#ifndef NO_CURSORCOLOR 3843#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3844 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3783 break; 3846 break;
… …
3787 break; 3850 break;
3788 case XTerm_Color_pointer_bg: 3851 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3790 break; 3853 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3854#ifndef NO_BOLD_UNDERLINE_REVERSE
3792 case XTerm_Color_BD:
3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3794 break;
3795 case XTerm_Color_UL:
3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3797 break;
3798 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3857 break;
3858 case Rxvt_Color_BD:
3859 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp);
3861 break;
3862 case Rxvt_Color_UL:
3863 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp);
3800 break; 3865 break;
3801 case URxvt_Color_IT: 3866 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3803 break; 3868 break;
3804#endif 3869#endif
… …
3809 if (am_transparent) 3874 if (am_transparent)
3810 want_full_refresh = want_refresh = 1; 3875 want_full_refresh = want_refresh = 1;
3811 break; 3876 break;
3812#endif 3877#endif
3813 3878
3814 case XTerm_Pixmap: 3879 case Rxvt_Pixmap:
3880 {
3815 if (*str != ';') 3881 if (*str != ';')
3816 { 3882 {
3817#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3818 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3819 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3820#endif
3821 scr_touch (true); 3886 scr_touch (true);
3887#endif
3822 } 3888 }
3889
3890 int changed = 0;
3891
3823 while ((str = strchr (str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3824 { 3893 {
3825 str++; 3894 str++;
3826#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3827 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3828#endif 3897#endif
3829 } 3898 }
3830 3899
3831 if (changed) 3900 if (changed)
3832 { 3901 {
3833#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3834 resize_pixmap (); 3903 resize_pixmap ();
3835#endif
3836 scr_touch (true); 3904 scr_touch (true);
3905#endif
3837 } 3906 }
3907 }
3838 break; 3908 break;
3839 3909
3840 case XTerm_restoreFG: 3910 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3842 break; 3912 break;
3843 case XTerm_restoreBG: 3913 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3914 set_window_color (Color_bg, str);
3845 break; 3915 break;
3846 3916
3847 case XTerm_logfile: 3917 case XTerm_logfile:
3848 // TODO, when secure mode? 3918 // TODO, when secure mode?
3849 break; 3919 break;
3850 3920
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0 3921#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3922 case Rxvt_dumpscreen: /* no error notices */
3859 { 3923 {
3860 int fd; 3924 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3925 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3926 {
3863 scr_dump (fd); 3927 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3938 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3939 case URxvt_boldItalicFont:
3876#endif 3940#endif
3877 if (query) 3941 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3942 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3944 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3945 resp);
3882 else 3946 else
3883 { 3947 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3948 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3949
… …
3890 break; 3954 break;
3891 3955
3892#if ENABLE_FRILLS 3956#if ENABLE_FRILLS
3893 case URxvt_locale: 3957 case URxvt_locale:
3894 if (query) 3958 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3896 else 3960 else
3897 { 3961 {
3898 set_locale (str); 3962 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 3963 pty->set_utf8_mode (enc_utf8);
3900 init_xlocale (); 3964 init_xlocale ();
3901 } 3965 }
3902 break; 3966 break;
3903 3967
3904 case URxvt_view_up: 3968 case URxvt_view_up:
3905 case URxvt_view_down: 3969 case URxvt_view_down:
3970 {
3906 int lines = atoi (str); 3971 int lines = atoi (str);
3907 3972
3908 if (lines) 3973 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 3974 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 3975 else
3911 {
3912 scr_erase_savelines (); 3976 scr_erase_savelines ();
3913 } 3977 }
3914 3978
3979 break;
3980#endif
3981
3982#if ENABLE_PERL
3983 case URxvt_perl:
3984 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3985 ; // no responses yet
3915 break; 3986 break;
3916#endif 3987#endif
3917 } 3988 }
3918} 3989}
3919/*----------------------------------------------------------------------*/ 3990/*----------------------------------------------------------------------*/
… …
3950 return state; 4021 return state;
3951} 4022}
3952 4023
3953/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
3954void 4025void
3955rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4026rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3956{ 4027{
3957 unsigned int i, j; 4028 unsigned int i, j;
3958 int state; 4029 int state;
3959 4030
3960 static const struct 4031 static const struct
… …
3971 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
3972 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
3973 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
3974 // 8, bi-directional support mode 4045 // 8, bi-directional support mode
3975 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
3976#ifdef menuBar_esc
3977 { menuBar_esc, PrivMode_menuBar },
3978#endif
3979 // 18, 19 printing-related 4047 // 18, 19 printing-related
3980 { 25, PrivMode_VisibleCursor }, 4048 { 25, PrivMode_VisibleCursor },
3981#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
3982 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
3983#endif 4051#endif
… …
4028 } 4096 }
4029 4097
4030 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
4031 switch (arg[i]) 4099 switch (arg[i])
4032 { 4100 {
4101#if ENABLE_STYLES
4102 case 1021:
4103 set_option (Opt_intensityStyles, mode);
4104
4105 scr_touch (true);
4106 break;
4107#endif
4033 case 1048: /* alternative cursor save */ 4108 case 1048: /* alternative cursor save */
4034 case 1049: 4109 case 1049:
4035 if (options & Opt_secondaryScreen) 4110 if (OPTION (Opt_secondaryScreen))
4036 if (mode == 0) 4111 if (mode == 0)
4037 scr_cursor (RESTORE); 4112 scr_cursor (RESTORE);
4038 else if (mode == 1) 4113 else if (mode == 1)
4039 scr_cursor (SAVE); 4114 scr_cursor (SAVE);
4040 break; 4115 break;
… …
4052 */ 4127 */
4053 PrivMode (1, PrivMode_vt52); 4128 PrivMode (1, PrivMode_vt52);
4054 break; 4129 break;
4055 case 3: /* 80/132 */ 4130 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4131 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4132 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4133 break;
4059 case 4: /* smooth scrolling */ 4134 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 4135 set_option (Opt_jumpScroll, !state);
4064 break; 4136 break;
4065 case 5: /* reverse video */ 4137 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 4138 scr_rvideo_mode (state);
4067 break; 4139 break;
4068 case 6: /* relative/absolute origins */ 4140 case 6: /* relative/absolute origins */
… …
4074 /* case 8: - auto repeat, can't do on a per window basis */ 4146 /* case 8: - auto repeat, can't do on a per window basis */
4075 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
4076 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
4077 priv_modes &= ~PrivMode_MouseX11; 4149 priv_modes &= ~PrivMode_MouseX11;
4078 break; 4150 break;
4079#ifdef menuBar_esc
4080 case menuBar_esc:
4081#ifdef MENUBAR
4082 map_menuBar (state);
4083#endif
4084 break;
4085#endif
4086#ifdef scrollBar_esc 4151#ifdef scrollBar_esc
4087 case scrollBar_esc: 4152 case scrollBar_esc:
4088 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
4089 { 4154 {
4090 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
… …
4109#if 0 4174#if 0
4110 case 1001: 4175 case 1001:
4111 break; /* X11 mouse highlighting */ 4176 break; /* X11 mouse highlighting */
4112#endif 4177#endif
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 4178 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 4179 set_option (Opt_scrollTtyOutput, !state);
4118 break; 4180 break;
4119 case 1011: /* scroll to bottom on key press */ 4181 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 4182 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 4183 break;
4125 case 1047: /* secondary screen w/ clearing last */ 4184 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4187 scr_erase_screen (2);
4129 scr_change_screen (state); 4188 scr_change_screen (state);
4130 break; 4189 break;
4131 case 1049: /* secondary screen w/ clearing first */ 4190 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 4191 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 4192 if (OPTION (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 4193 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 4194 scr_erase_screen (2);
4136 break; 4195 break;
4137 default: 4196 default:
4138 break; 4197 break;
… …
4266 scr_color (Color_bg, Color_bg); 4325 scr_color (Color_bg, Color_bg);
4267 break; 4326 break;
4268 4327
4269 //case 50: // not variable spacing 4328 //case 50: // not variable spacing
4270 4329
4271#ifndef NO_BRIGHTCOLOR 4330#if ENABLE_FRILLS
4272 case 90: 4331 case 90:
4273 case 91: /* set bright fg color */ 4332 case 91: /* set bright fg color */
4274 case 92: 4333 case 92:
4275 case 93: 4334 case 93:
4276 case 94: 4335 case 94:
… …
4288 case 106: 4347 case 106:
4289 case 107: 4348 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4349 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 4350 break;
4292#endif 4351#endif
4293
4294 } 4352 }
4295 } 4353 }
4296} 4354}
4297/*}}} */ 4355/*}}} */
4298 4356
… …
4322 */ 4380 */
4323void 4381void
4324rxvt_term::tt_printf (const char *fmt,...) 4382rxvt_term::tt_printf (const char *fmt,...)
4325{ 4383{
4326 va_list arg_ptr; 4384 va_list arg_ptr;
4327 unsigned char buf[256]; 4385 char buf[256];
4328 4386
4329 va_start (arg_ptr, fmt); 4387 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4388 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 4389 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 4390 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 4395 * or generated by us in response to a query ESC sequence.
4338 */ 4396 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4397const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 4398
4341void 4399void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 4401{
4402 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4403 return;
4404
4405 if (pty->pty < 0)
4406 return;
4407
4344 if (v_buflen == 0) 4408 if (v_buflen == 0)
4345 { 4409 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4410 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4347 4411
4348 if ((unsigned int)written == len) 4412 if ((unsigned int)written == len)
4349 return; 4413 return;
4350 4414
4351 data += written; 4415 data += written;
4352 len -= written; 4416 len -= written;
4353 } 4417 }
4354 4418
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 4420
4357 memcpy (v_buffer + v_buflen, data, len); 4421 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 4422 v_buflen += len;
4359 4423
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4361} 4425}
4362 4426
4363void rxvt_term::pty_write () 4427void rxvt_term::pty_write ()
4364{ 4428{
4365 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4366 4430
4367 if (written > 0) 4431 if (written > 0)
4368 { 4432 {
4369 v_buflen -= written; 4433 v_buflen -= written;
4370 4434
… …
4379 } 4443 }
4380 4444
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4445 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4446 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4448 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4449}
4387 4450
4388/*----------------------- end-of-file (C source) -----------------------*/ 4451/*----------------------- end-of-file (C source) -----------------------*/
4389 4452

Diff Legend

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