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.199 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

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

Diff Legend

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