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.312 by root, Sat Mar 4 22:05:05 2006 UTC vs.
Revision 1.548 by sf-exg, Tue Apr 29 13:10:06 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
305{ 416{
306 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 418 KeySym keysym;
309 int valid_keysym; 419 int valid_keysym;
310 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
311 422
312#if ISO_14755 423#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
314 return; 425 return;
315#endif 426#endif
… …
322 */ 433 */
323 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
326 437
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 438 kbuf[0] = 0;
334 439
335#ifdef USE_XIM 440#if USE_XIM
336 if (Input_Context) 441 if (Input_Context)
337 { 442 {
338 Status status_return; 443 Status status_return;
339 444
340#if 0 445#if 0
… …
391 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
392 } 497 }
393 498
394 if (valid_keysym) 499 if (valid_keysym)
395 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
396#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 710 return;
399#endif 711#endif
400 712
401 if (saveLines) 713 if (saveLines)
402 { 714 {
… …
411#ifdef PAGING_CONTEXT_LINES 723#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 724 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 725#else
414 lnsppg = nrow * 4 / 5; 726 lnsppg = nrow * 4 / 5;
415#endif 727#endif
728 max_it (lnsppg, 1);
729
416 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
417 { 731 {
418 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
419 return; 733 return;
420 } 734 }
421 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
422 { 736 {
423 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
424 return; 738 return;
425 } 739 }
426 } 740 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
429 { 743 {
430 if (keysym == XK_Up) 744 if (keysym == XK_Up)
431 { 745 {
432 scr_page (UP, 1); 746 scr_page (1);
433 return; 747 return;
434 } 748 }
435 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
436 { 750 {
437 scr_page (DN, 1); 751 scr_page (-1);
438 return; 752 return;
439 } 753 }
440 } 754 }
441#endif 755#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
444 { 758 {
445 if (keysym == XK_Home) 759 if (keysym == XK_Home)
446 { 760 {
447 scr_move_to (0, 1); 761 scr_changeview (top_row);
448 return; 762 return;
449 } 763 }
450 else if (keysym == XK_End) 764 else if (keysym == XK_End)
451 { 765 {
452 scr_move_to (1, 1); 766 scr_changeview (0);
453 return; 767 return;
454 } 768 }
455 } 769 }
456#endif 770#endif
457 } 771 }
… …
473 selection_request (ev.time); 787 selection_request (ev.time);
474 return; 788 return;
475#if TODO 789#if TODO
476 /* rxvt extras */ 790 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 792 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 794 return;
483#endif 795#endif
484 } 796 }
485 } 797 }
486 } 798 }
487 799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
813 }
814
488#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 816 // ISO 14755 support
490 if (shft && ctrl) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 818 {
492 int hv; 819 int hv;
493 820
494 if (iso14755buf & ISO_14755_51 821 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 822 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 824 {
498 commit_iso14755 (); 825 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 826 iso14755buf = ISO_14755_51;
500# if ISO_14755 827# if ISO_14755
501 iso14755_51 (0); 828 iso14755_51 (0);
829# endif
830 return;
831 }
832 else if (keysym == XK_BackSpace)
833 {
834 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
835# if ISO_14755
836 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 837# endif
503 return; 838 return;
504 } 839 }
505 else if ((hv = hex_keyval (ev)) >= 0) 840 else if ((hv = hex_keyval (ev)) >= 0)
506 { 841 {
… …
511# endif 846# endif
512 return; 847 return;
513 } 848 }
514 else 849 else
515 { 850 {
516# if ENABLE_OVERLAY 851# if ISO_14755
517 scr_overlay_off (); 852 scr_overlay_off ();
518# endif 853# endif
519 iso14755buf = 0; 854 iso14755buf = 0;
520 } 855 }
521 } 856 }
857 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 858 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 859 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 860 if (!(iso14755buf & ISO_14755_STARTED))
525 { 861 {
526 iso14755buf |= ISO_14755_STARTED; 862 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 863# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 864 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 865 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 866# endif
531 } 867 }
532#endif 868#endif
533 869
534#ifdef PRINTPIPE 870#ifdef PRINTPIPE
535 if (keysym == XK_Print) 871 if (keysym == XK_Print)
536 { 872 {
537 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
538 return; 874 return;
539 } 875 }
540#endif 876#endif
541
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 {
544 {
545 newlen = 1;
546 switch (keysym)
547 {
548#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace)
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0;
832 break;
833 }
834
835 if (newlen)
836 len = strlen (kbuf);
837 }
838
839 /*
840 * Pass meta for all function keys, if 'meta' option set
841 */
842#ifdef META8_OPTION
843 if (meta && (meta_char == 0x80) && len > 0)
844 kbuf[len - 1] |= 0x80;
845#endif
846
847 }
848 else if (ctrl && keysym == XK_minus)
849 {
850 len = 1;
851 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
852 }
853 else if (keysym == XK_ISO_Left_Tab)
854 {
855 strcpy (kbuf, "\033[Z");
856 len = 3;
857 }
858 else
859 {
860#ifdef META8_OPTION
861 /* set 8-bit on */
862 if (meta && (meta_char == 0x80))
863 {
864 char *ch;
865
866 for (ch = kbuf; ch < kbuf + len; ch++)
867 *ch |= 0x80;
868
869 meta = 0;
870 }
871#endif
872 /* nil */ ;
873 }
874 } 877 }
875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878 878
879 if (len <= 0) 879 if (len <= 0)
880 return; /* not mapped */ 880 return; /* not mapped */
881 881
882 if (OPTION (Opt_scrollTtyKeypress))
883 if (view_start)
884 {
885 view_start = 0;
886 want_refresh = 1;
887 }
888
889 /*
890 * these modifications only affect the static keybuffer
891 * pass Shift/Control indicators for function keys ending with `~'
892 *
893 * eg,
894 * Prior = "ESC[5~"
895 * Shift+Prior = "ESC[5$"
896 * Ctrl+Prior = "ESC[5^"
897 * Ctrl+Shift+Prior = "ESC[5@"
898 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
899 */
900 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
901 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
902
903 /* escape prefix */
904 if (meta
905#ifdef META8_OPTION
906 && meta_char == C0_ESC
907#endif
908 )
909 {
910 const char ch = C0_ESC;
911 tt_write (&ch, 1);
912 }
913
914 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
915} 883}
916 884
917void 885void ecb_cold
918rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
919{ 887{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym; 889 KeySym keysym;
922 890
… …
926#if ENABLE_FRILLS || ISO_14755 894#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 895 // ISO 14755 support
928 if (iso14755buf) 896 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 897 if (iso14755buf & ISO_14755_52)
930 { 898 {
931# if ENABLE_OVERLAY 899# if ISO_14755
932 scr_overlay_off (); 900 scr_overlay_off ();
933# endif 901# endif
934# if ISO_14755 902# if ISO_14755
935 // iso14755 part 5.2 handling: release time 903 // iso14755 part 5.2 handling: release time
936 // first: controls 904 // first: controls
… …
942 commit_iso14755 (); 910 commit_iso14755 ();
943 911
944 return; 912 return;
945 } 913 }
946 914
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 916 if (i[0] == keysym)
949 { 917 {
950 iso14755buf = ISO_14755_51 | i[1]; 918 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 919 commit_iso14755 ();
952 920
… …
959 927
960 return; 928 return;
961 } 929 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 930 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 931 {
964# if ENABLE_OVERLAY 932# if ISO_14755
965 scr_overlay_off (); 933 scr_overlay_off ();
966# endif 934# endif
967 if (iso14755buf & ISO_14755_51) 935 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 936 commit_iso14755 ();
969#if ISO_14755 937#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 938 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 939 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 940 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 941
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 942 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 943 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
991#endif 959#endif
992} 960}
993 961
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 962void
1028rxvt_term::flush () 963rxvt_term::flush ()
1029{ 964{
1030 flush_ev.stop (); 965 flush_ev.stop ();
1031 966
1032#ifdef TRANSPARENT 967#ifdef HAVE_IMG
1033 if (want_full_refresh) 968 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 969 {
1035 want_full_refresh = 0; 970 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 971 scr_touch (false);
1038 } 972 }
1039#endif 973#endif
1040 974
1041 if (want_refresh) 975 if (want_refresh)
… …
1077 } 1011 }
1078 while (row < end_row); 1012 while (row < end_row);
1079 } 1013 }
1080 1014
1081 scr_refresh (); 1015 scr_refresh ();
1082 scrollbar_show (1); 1016 scrollBar.show (1);
1083#ifdef USE_XIM 1017#if USE_XIM
1084 IMSendSpot (); 1018 im_send_spot ();
1085#endif 1019#endif
1086 } 1020 }
1087 1021
1088 display->flush (); 1022 display->flush ();
1089} 1023}
1090 1024
1025/* checks whether a refresh is requested and starts the refresh timer */
1091void 1026void
1092rxvt_term::check_cb (check_watcher &w) 1027rxvt_term::refresh_check ()
1028{
1029 if (want_refresh && !flush_ev.is_active ())
1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1031
1032 display->flush ();
1033}
1034
1035void
1036rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1037{
1094 make_current (); 1038 make_current ();
1095 1039
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1040 refresh_count = 0;
1109 flush (); 1041 flush ();
1110} 1042}
1111 1043
1112#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1113void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1062{
1116 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1064 want_refresh = 1;
1118 1065 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1066}
1121#endif 1067#endif
1122 1068
1123#ifdef TEXT_BLINK 1069#ifdef TEXT_BLINK
1124void 1070void
1125rxvt_term::text_blink_cb (time_watcher &w) 1071rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1072{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1073 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1074 {
1129 hidden_text = !hidden_text; 1075 hidden_text = !hidden_text;
1130 want_refresh = 1; 1076 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1077 refresh_check ();
1132 } 1078 }
1079 else
1080 w.stop ();
1133} 1081}
1134#endif 1082#endif
1135 1083
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1085void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1087{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1142 { 1090 {
1143 want_refresh = 1; 1091 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1092 refresh_check ();
1145 } 1093 }
1094 else
1095 w.stop ();
1146} 1096}
1147#endif 1097#endif
1148 1098
1149#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1150void 1100void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1102{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1154 { 1104 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1106 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 refresh_check ();
1158 } 1108 }
1109 else
1110 w.stop ();
1159} 1111}
1160#endif 1112#endif
1161 1113
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1115void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1117{
1166 if (mouse_slip_wheel_speed == 0 1118 if (scr_page (mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1119 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1120 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1121 refresh_check ();
1122 }
1123
1124 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 {
1126 mouse_slip_wheel_speed = 0;
1127 w.stop ();
1175 } 1128 }
1176} 1129}
1177#endif 1130#endif
1178 1131
1179#if LINUX_YIELD_HACK 1132#if LINUX_YIELD_HACK
1180static struct event_handler 1133static struct event_handler
1181{ 1134{
1182 check_watcher yield_ev; 1135 ev::prepare yield_ev;
1183 1136
1184 void yield_cb (check_watcher &w) 1137 void yield_cb (ev::prepare &w, int revents)
1185 { 1138 {
1186 // this should really be sched_yield(), but the linux guys thought 1139 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1140 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1141 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1142 // allowed by the sus... as is returning ENOSYS.
1143 // since the linux guys additionally thought that breaking the only
1144 // known workaround against their unusable sched_yield hack is cool,
1145 // we just nanosleep a bit and hope for the best.
1190 1146
1191 struct timespec ts = { 0, 0 }; 1147 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1148 nanosleep (&ts, 0);
1193 1149
1194 w.stop (); 1150 w.stop ();
1195 } 1151 }
1196 1152
… …
1199 { 1155 {
1200 } 1156 }
1201} event_handler; 1157} event_handler;
1202#endif 1158#endif
1203 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1204bool 1193bool
1205rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1206{ 1195{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1208 1197
1209 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1199
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1212 n = 0;
1213 } 1201 {
1214 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1218 1207
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1209
1221 if (r > 0) 1210 if (r > 0)
1222 { 1211 {
1223 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1224 return true; 1213 return true;
… …
1232 } 1221 }
1233 else 1222 else
1234 { 1223 {
1235 pty_ev.stop (); 1224 pty_ev.stop ();
1236 1225
1237 if (!OPTION (Opt_hold)) 1226 if (!option (Opt_hold))
1238 destroy (); 1227 destroy ();
1239 } 1228 }
1240 1229
1241 return false; 1230 return false;
1242} 1231}
1243 1232
1244void 1233void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1234rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1235{
1247 make_current (); 1236 make_current ();
1248 1237
1249 if (revents & EVENT_READ) 1238 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1239 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1240 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1241 cmd_parse ();
1253 break;
1254 1242
1255 if (revents & EVENT_WRITE) 1243 if (revents & ev::WRITE)
1256 pty_write (); 1244 pty_write ();
1257}
1258 1245
1259void 1246 refresh_check ();
1247}
1248
1249void ecb_cold
1260rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1261{ 1251{
1262 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1263 recolour_cursor (); 1253 recolour_cursor ();
1264 1254
1265#ifdef POINTER_BLANK 1255#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1256 hidden_pointer = 0;
1267 1257
1268 if (OPTION (Opt_pointerBlank)) 1258 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1270#endif 1260#endif
1271} 1261}
1272 1262
1273#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1274void 1264void ecb_cold
1275rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1276{ 1266{
1277 if (!OPTION (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1278 return; 1268 return;
1279 1269
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1270 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1271 XFlush (dpy);
1282 1272
1283 hidden_pointer = 1; 1273 hidden_pointer = 1;
1284} 1274}
1285 1275
1286void 1276void ecb_cold
1287rxvt_term::pointer_cb (time_watcher &w) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1278{
1289 make_current (); 1279 make_current ();
1290 1280
1291 pointer_blank (); 1281 pointer_blank ();
1292} 1282}
… …
1295void 1285void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1286rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1287{
1298 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1299 int x, y; 1289 int x, y;
1290 int code = 32;
1300 1291
1301 x = ev.x; 1292 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1293 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1294
1295 if (ev.type == MotionNotify)
1296 {
1297 if (x == mouse_row && y == mouse_col)
1298 return;
1299
1300 mouse_row = x;
1301 mouse_col = y;
1302 code += 32;
1303 }
1304 1304
1305 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
1306 button_number = 3; 1306 button_number = 3;
1307 else 1307 else
1308 { 1308 {
1309 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1311 if (button_number >= 3)
1312 button_number += (64 - 3); 1312 button_number += 64 - 3;
1313 } 1313 }
1314 1314
1315 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1316 { 1316 {
1317 /* 1317 /*
… …
1349 fputc ('A', stderr); 1349 fputc ('A', stderr);
1350 if (key_state & 32) 1350 if (key_state & 32)
1351 fputc ('2', stderr); 1351 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1353 button_number,
1354 x + 1, 1354 x,
1355 y + 1); 1355 y);
1356#endif 1356#endif
1357 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1358 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1372 code + button_number + key_state,
1360 (32 + x + 1), 1373 32 + x,
1361 (32 + y + 1)); 1374 32 + y);
1362} 1375}
1363 1376
1364/*{{{ process an X event */ 1377/*{{{ process an X event */
1365void 1378void ecb_hot
1366rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1367{ 1380{
1368 make_current (); 1381 make_current ();
1369 1382
1370 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1440 focus_out ();
1428 } 1441 }
1429#endif 1442#endif
1430 } 1443 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1444 break;
1436 1445
1437 /* 1446 /*
1438 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1458 break; 1467 break;
1459 } 1468 }
1460 break; 1469 break;
1461 1470
1462 case FocusIn: 1471 case FocusIn:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1475 focus_in ();
1464 break; 1476 break;
1465 1477
1466 case FocusOut: 1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1482 focus_out ();
1468 break; 1483 break;
1469 1484
1470 case ConfigureNotify: 1485 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1472 { 1487 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1489 ;
1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1505 int x, y;
1506
1507 if (ev.xconfigure.send_event)
1508 {
1509 x = ev.xconfigure.x;
1510 y = ev.xconfigure.y;
1511 }
1512 else
1513 get_window_origin (x, y);
1514
1515 if (x != parent_x || y != parent_y)
1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 }
1522 }
1475 1523
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1525 {
1478 seen_resize = 1; 1526 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1528 }
1529 else
1530 {
1531#ifdef HAVE_BG_PIXMAP
1532 if (moved)
1533 update_background ();
1534#endif
1535 }
1481 1536
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1538 }
1489 break; 1539 break;
1490 1540
1491 case PropertyNotify: 1541 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496
1497 break; 1543 break;
1498 1544
1499 case SelectionClear: 1545 case SelectionClear:
1500 selection_clear (); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break;
1502
1503 case SelectionNotify:
1504 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1506 break; 1547 break;
1507 1548
1508 case SelectionRequest: 1549 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1510 break; 1551 break;
1511 1552
1512 case MapNotify: 1553 case MapNotify:
1554#ifdef HAVE_BG_PIXMAP
1555 // This is needed at startup for the case of no window manager
1556 // or a non-reparenting window manager and also because we
1557 // defer bg image updates if the window is not mapped. The
1558 // short delay is to optimize for multiple ConfigureNotify
1559 // events at startup when the window manager reparents the
1560 // window, so as to perform the computation after we have
1561 // received all of them.
1562 if (bg_img == 0)
1563 update_background_ev.start (0.025);
1564#endif
1513 mapped = 1; 1565 mapped = 1;
1514#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1567 text_blink_ev.start ();
1516#endif 1568#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1570 break;
1519 1571
1520 case UnmapNotify: 1572 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1574#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1575 text_blink_ev.stop ();
1524#endif 1576#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1577 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1578 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1579
1534 case GraphicsExpose: 1580 case GraphicsExpose:
1535 case Expose: 1581 case Expose:
1536 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1537 { 1583 {
1538 do 1584 do
1585 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1590
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1592
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1594 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1597 }
1548 1598
1549 want_refresh = 1; 1599 want_refresh = 1;
1550 } 1600 }
1551 else 1601 else
1552 { 1602 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1605 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1606 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1608 ;
1559 1609
1560 if (isScrollbarWindow (ev.xany.window)) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1611 {
1562 scrollBar.setIdle (); 1612 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1613 scrollBar.show (0);
1564 } 1614 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1615 }
1571 break; 1616 break;
1572 1617
1573 case MotionNotify: 1618 case MotionNotify:
1574#ifdef POINTER_BLANK 1619#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1620 if (hidden_pointer)
1576 pointer_unblank (); 1621 pointer_unblank ();
1577#endif 1622#endif
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent)
1625 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1627 break;
1580 1628
1581 if (ev.xany.window == vt) 1629 if (ev.xany.window == vt)
1582 { 1630 {
… …
1611 1659
1612#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1613 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1614 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1615 { 1663 {
1664 page_dirn scroll_selection_dir;
1616 int dist; 1665 int dist;
1617 1666
1618 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1620 */ 1669 */
1621 if (!sel_scroll_ev.active) 1670 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1671 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1672
1624 /* save the event params so we can highlight 1673 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1674 * the selection in the pending-scroll loop
1626 */ 1675 */
1627 selection_save_x = ev.xbutton.x; 1676 selection_save_x = ev.xbutton.x;
… …
1635 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1636 } 1685 }
1637 else 1686 else
1638 { 1687 {
1639 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1640 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1641 } 1690 }
1642 1691
1643 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1644 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1; 1694 + 1;
1646 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1647 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1648 } 1698 }
1649 else 1699 else
1650 { 1700 {
1651 /* we are within the text window, so we 1701 /* we are within the text window, so we
1652 * shouldn't be scrolling 1702 * shouldn't be scrolling
1653 */ 1703 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1704 sel_scroll_ev.stop();
1656 } 1705 }
1657#endif 1706#endif
1658#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1659 } 1708 }
1660#endif 1709#endif
1661 } 1710 }
1662 } 1711 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1713 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1667 ; 1716 ;
1668 1717
1669 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1722 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1724 scrollBar.size ());
1676 want_refresh = 1; 1725 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1726 scrollBar.show (1);
1679 } 1727 }
1680 break; 1728 break;
1681 } 1729 }
1682 1730
1683#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1685 { 1733 cursor_blink_reset ();
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif 1734#endif
1695 1735
1696#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1738 {
1699 if (ev.type == MotionNotify 1739 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1740 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1741 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1742 if (hidden_pointer)
… …
1704 1744
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1745 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1746 pointer_blank ();
1707 } 1747 }
1708#endif 1748#endif
1709}
1710 1749
1711void 1750 refresh_check ();
1751}
1752
1753#if ENABLE_FRILLS
1754void ecb_cold
1755rxvt_term::set_urgency (bool enable)
1756{
1757 if (enable == urgency_hint)
1758 return;
1759
1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1761 {
1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1763 XSetWMHints (dpy, parent, h);
1764 urgency_hint = enable;
1765 XFree (h);
1766 }
1767}
1768#endif
1769
1770void ecb_cold
1712rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1713{ 1772{
1714 if (!focus) 1773 if (!focus)
1715 { 1774 {
1716 focus = 1; 1775 focus = 1;
1717 want_refresh = 1; 1776 want_refresh = 1;
1718 1777
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1778#if USE_XIM
1722 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1723 { 1780 {
1724 IMSetPosition (); 1781 im_set_position ();
1725 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1726 } 1783 }
1727#endif 1784#endif
1728#if CURSOR_BLINK 1785#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1787 cursor_blink_ev.again ();
1731#endif 1788#endif
1732#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
1734 { 1791 {
1735 pix_colors = pix_colors_focused; 1792 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1793 scr_recolour ();
1737 } 1794 }
1738#endif 1795#endif
1739 } 1796#if ENABLE_FRILLS
1740} 1797 if (option (Opt_urgentOnBell))
1798 set_urgency (0);
1799#endif
1741 1800
1742void 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 }
1803}
1804
1805void ecb_cold
1743rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1744{ 1807{
1745 if (focus) 1808 if (focus)
1746 { 1809 {
1747 focus = 0; 1810 focus = 0;
1748 want_refresh = 1; 1811 want_refresh = 1;
1749 1812
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1813#if ENABLE_FRILLS
1751 1814 if (option (Opt_urgentOnBell))
1815 set_urgency (0);
1816#endif
1752#if ENABLE_FRILLS || ISO_14755 1817#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1818 if (iso14755buf)
1754 { 1819 {
1755 iso14755buf = 0; 1820 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1821# if ISO_14755
1757 scr_overlay_off (); 1822 scr_overlay_off ();
1758# endif 1823# endif
1759 } 1824 }
1760#endif 1825#endif
1761#if USE_XIM 1826#if USE_XIM
1762 if (Input_Context != NULL) 1827 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1828 XUnsetICFocus (Input_Context);
1764#endif 1829#endif
1765#if CURSOR_BLINK 1830#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1831 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1832 cursor_blink_ev.stop ();
1833
1768 hidden_cursor = 0; 1834 hidden_cursor = 0;
1769#endif 1835#endif
1770#if OFF_FOCUS_FADING 1836#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1837 if (rs[Rs_fade])
1772 { 1838 {
1773 pix_colors = pix_colors_unfocused; 1839 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1840 scr_recolour ();
1775 } 1841 }
1776#endif 1842#endif
1843
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 }
1846}
1847
1848void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx)
1850{
1851#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade])
1777 } 1853 {
1854 rgba c;
1855 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 }
1858#endif
1778} 1859}
1779 1860
1780#if TRANSPARENT 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1781void 1862void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1864{
1784 make_current (); 1865 make_current ();
1866
1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1869 return;
1785 1870
1786 switch (ev.type) 1871 switch (ev.type)
1787 { 1872 {
1788 case PropertyNotify: 1873 case PropertyNotify:
1789 /* 1874 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1792 */ 1877 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1880 {
1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 }
1796 1890
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1891 break;
1802 } 1892 }
1893
1894 refresh_check ();
1803} 1895}
1804#endif 1896#endif
1805 1897
1806void 1898void
1807rxvt_term::button_press (XButtonEvent &ev) 1899rxvt_term::button_press (XButtonEvent &ev)
… …
1838 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1839 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1840#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1841 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1842 { 1934 {
1843 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1844 MEvent.clicks++; 1936 MEvent.clicks++;
1845 1937
1846 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1847 { 1939 {
1848 /* only report double clicks */ 1940 /* only report double clicks */
… …
1862 mouse_report (ev); 1954 mouse_report (ev);
1863 } 1955 }
1864#else 1956#else
1865 MEvent.button = ev.button; 1957 MEvent.button = ev.button;
1866 mouse_report (ev); 1958 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1959#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1960
1869 } 1961 }
1870 else 1962 else
1871 { 1963 {
1872 if (ev.button != MEvent.button) 1964 if (ev.button != MEvent.button)
… …
1920 } 2012 }
1921 2013
1922 /* 2014 /*
1923 * Scrollbar window processing of button press 2015 * Scrollbar window processing of button press
1924 */ 2016 */
1925 if (isScrollbarWindow (ev.window)) 2017 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 2018 {
1927 scrollBar.setIdle (); 2019 page_dirn direction = NO_DIR;
2020
2021 if (scrollBar.upButton (ev.y))
2022 direction = UP; /* up */
2023 else if (scrollBar.dnButton (ev.y))
2024 direction = DN; /* down */
2025
2026 scrollBar.state = SB_STATE_IDLE;
1928 /* 2027 /*
1929 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 2029 * move up if mouse is above slider
1931 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1932 * 2031 *
… …
1941 /* 2040 /*
1942 * Mouse report disabled scrollbar: 2041 * Mouse report disabled scrollbar:
1943 * arrow buttons - send up/down 2042 * arrow buttons - send up/down
1944 * click on scrollbar - send pageup/down 2043 * click on scrollbar - send pageup/down
1945 */ 2044 */
1946 if ((scrollBar.style == R_SB_NEXT 2045 if (direction == UP)
1947 && scrollbarnext_upButton (ev.y))
1948 || (scrollBar.style == R_SB_RXVT
1949 && scrollbarrxvt_upButton (ev.y)))
1950 tt_printf ("\033[A"); 2046 tt_printf ("\033[A");
1951 else if ((scrollBar.style == R_SB_NEXT 2047 else if (direction == DN)
1952 && scrollbarnext_dnButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_dnButton (ev.y)))
1955 tt_printf ("\033[B"); 2048 tt_printf ("\033[B");
1956 else 2049 else
1957 switch (ev.button) 2050 switch (ev.button)
1958 { 2051 {
1959 case Button2: 2052 case Button2:
… …
1966 tt_printf ("\033[5~"); 2059 tt_printf ("\033[5~");
1967 break; 2060 break;
1968 } 2061 }
1969 } 2062 }
1970 else 2063 else
1971#endif /* NO_SCROLLBAR_REPORT */ 2064#endif /* NO_SCROLLBAR_REPORT */
1972
1973 {
1974 char upordown = 0;
1975
1976 if (scrollBar.style == R_SB_NEXT)
1977 { 2065 {
1978 if (scrollbarnext_upButton (ev.y)) 2066 if (direction != NO_DIR)
1979 upordown = -1; /* up */
1980 else if (scrollbarnext_dnButton (ev.y))
1981 upordown = 1; /* down */
1982 }
1983 else if (scrollBar.style == R_SB_RXVT)
1984 {
1985 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 if (upordown)
1991 { 2067 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2071#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2072 if (scr_page (direction, 1))
1996 { 2073 {
1997 if (upordown < 0) 2074 if (direction == UP)
1998 scrollBar.setUp (); 2075 scrollBar.state = SB_STATE_UP;
1999 else 2076 else
2000 scrollBar.setDn (); 2077 scrollBar.state = SB_STATE_DOWN;
2001 } 2078 }
2002 } 2079 }
2003 else 2080 else
2004 switch (ev.button) 2081 switch (ev.button)
2005 { 2082 {
2006 case Button2: 2083 case Button2:
2007 switch (scrollbar_align) 2084 switch (scrollBar.align)
2008 { 2085 {
2009 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2010 csrO = 0; 2087 csrO = 0;
2011 break; 2088 break;
2012 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2013 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2014 break; 2091 break;
2015 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2016 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2017 break; 2094 break;
2018 } 2095 }
2019 2096
2020 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2021 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2022 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2024 2101
2025 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
2026 break; 2103 break;
2027 2104
2028 case Button1: 2105 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2032 2109
2033 case Button3: 2110 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2035 { 2112 {
2036 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2037# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2038 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2039# else 2116# else
2040 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2041# endif 2118# endif
2042 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2044 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2045# else 2122# else
2046 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2047# endif 2124# endif
2048 else 2125 else
2049 scrollBar.setMotion (); 2126 scrollBar.state = SB_STATE_MOTION;
2050 } 2127 }
2051 else 2128 else
2052 { 2129 {
2053 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2054 (nrow 2131 (nrow
2055 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2056 / scrollbar_size ())); 2133 / scrollBar.size ()));
2057 } 2134 }
2058 2135
2059 break; 2136 break;
2060 } 2137 }
2061 } 2138 }
… …
2071 2148
2072 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2073 if (!bypass_keystate) 2150 if (!bypass_keystate)
2074 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2075 2152
2076 if (scrollbar_isUpDn ()) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2077 { 2154 {
2078 scrollBar.setIdle (); 2155 scrollBar.state = SB_STATE_IDLE;
2079 scrollbar_show (0); 2156 scrollBar.show (0);
2080 } 2157 }
2081 2158
2082#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
2085#endif 2161#endif
2086 2162
2087 if (ev.window == vt) 2163 if (ev.window == vt)
2088 { 2164 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2165 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2113 mouse_report (ev); 2189 mouse_report (ev);
2114 } 2190 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2191#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2192 MEvent.button = AnyButton;
2117 mouse_report (ev); 2193 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2194#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2195 return;
2120 } 2196 }
2121 2197
2122 /* 2198 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2199 * dumb hack to compensate for the failure of click-and-drag
… …
2134 case Button3: 2210 case Button3:
2135 selection_make (ev.time); 2211 selection_make (ev.time);
2136 break; 2212 break;
2137 2213
2138 case Button2: 2214 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2217 break;
2142 2218
2143#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2144 case Button4: 2220 case Button4:
2145 case Button5: 2221 case Button5:
2146 { 2222 {
2147 int i; 2223 int lines;
2148 page_dirn v; 2224 page_dirn dirn;
2149 2225
2150 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2151 2227
2152 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2153 i = 1; 2229 lines = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2231 lines = nrow - 1;
2156 else 2232 else
2157 i = 5; 2233 lines = 5;
2158 2234
2159# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2160 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2161 { 2237 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2240
2166 if (slip_wheel_ev.at < NOW) 2241 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2243 }
2171 else 2244 else
2245# endif
2172 { 2246 {
2173# endif
2174 scr_page (v, i); 2247 scr_page (dirn, lines);
2175 scrollbar_show (1); 2248 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2249 }
2178# endif
2179 } 2250 }
2180 break; 2251 break;
2181#endif 2252#endif
2182 } 2253 }
2183 } 2254 }
2184} 2255}
2185 2256
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657
2658/*}}} */ 2257/*}}} */
2659 2258
2660bool 2259void ecb_hot
2661rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2662{ 2261{
2663 bool flag = false;
2664 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2665 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2666 2264
2667 for (;;) 2265 for (;;)
2668 { 2266 {
2669 if (ch == NOCHAR) 2267 if (ecb_unlikely (ch == NOCHAR))
2670 { 2268 {
2671 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2672 ch = next_char (); 2270 ch = next_char ();
2673 2271
2674 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2675 break; 2273 break;
2676 } 2274 }
2677 2275
2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2679 { 2277 {
2680 if (!seen_input) 2278 if (ecb_unlikely (!seen_input))
2681 { 2279 {
2682 seen_input = 1; 2280 seen_input = 1;
2683 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2684 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2685 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2698 wchar_t *str = buf; 2296 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2700 2298
2701 for (;;) 2299 for (;;)
2702 { 2300 {
2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2704 break; 2302 break;
2705 2303
2706 *str++ = ch; 2304 *str++ = ch;
2707 2305
2708 if (ch == C0_LF || str >= eol) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2709 { 2307 {
2710 if (ch == C0_LF) 2308 if (ch == C0_LF)
2711 nlines++; 2309 nlines++;
2712 2310
2713 refresh_count++; 2311 refresh_count++;
2714 2312
2715 if (!OPTION (Opt_jumpScroll) 2313 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2314 {
2718 refreshnow = true;
2719 refresh_count = 0; 2315 refresh_count = 0;
2316
2317 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2318 {
2319 refreshnow = true;
2720 ch = NOCHAR; 2320 ch = NOCHAR;
2721 break; 2321 break;
2322 }
2722 } 2323 }
2723 2324
2724 // scr_add_lines only works for nlines <= nrow - 1. 2325 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2326 if (nlines >= nrow - 1)
2726 { 2327 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2355 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2356 scr_add_lines (buf, str - buf, nlines);
2756 2357
2757 /* 2358 /*
2758 * If there have been a lot of new lines, then update the screen 2359 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2360 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2361 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2362 */
2763 if (refreshnow) 2363 if (refreshnow)
2764 { 2364 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2365 scr_refresh ();
2772 want_refresh = 1; 2366 want_refresh = 1;
2773 }
2774 } 2367 }
2775
2776 } 2368 }
2777 else 2369 else
2778 { 2370 {
2779 try 2371 try
2780 { 2372 {
… …
2788 } 2380 }
2789 2381
2790 ch = NOCHAR; 2382 ch = NOCHAR;
2791 } 2383 }
2792 } 2384 }
2793
2794 return flag;
2795} 2385}
2796 2386
2797// read the next character 2387// read the next character
2798wchar_t 2388wchar_t ecb_hot
2799rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2800{ 2390{
2801 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2802 { 2392 {
2803 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2805 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2806 2396
2807 wchar_t wc; 2397 wchar_t wc;
2808 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2809 2399
… …
2813 cmdbuf_ptr = cmdbuf_endp; 2403 cmdbuf_ptr = cmdbuf_endp;
2814 break; 2404 break;
2815 } 2405 }
2816 2406
2817 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2408 {
2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2413 }
2819 2414
2820 // assume wchar == unicode 2415 // assume wchar == unicode
2821 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
2822 return wc & UNICODE_MASK; 2417 return wc & UNICODE_MASK;
2823 } 2418 }
2824 2419
2825 return NOCHAR; 2420 return NOCHAR;
2826} 2421}
2827 2422
2828// read the next octet 2423// read the next octet
2829uint32_t 2424uint32_t ecb_hot
2830rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2831{ 2426{
2832 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2833 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2834 : NOCHAR; 2429 : NOCHAR;
2835} 2430}
2836 2431
2837static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2838 2433
2839/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2840/*
2841 * Return the next input character after first passing any keyboard input
2842 * to the command.
2843 */
2844wchar_t
2845rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2846{ 2436{
2847 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2848 2438
2849 if (c == NOCHAR) 2439 if (c == NOCHAR)
2850 throw out_of_input; 2440 throw out_of_input;
2851 2441
2852 return c; 2442 return c;
2853} 2443}
2854 2444
2855uint32_t 2445uint32_t ecb_hot
2856rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2857{ 2447{
2858 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2859 2449
2860 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2864} 2454}
2865 2455
2866/*{{{ print pipe */ 2456/*{{{ print pipe */
2867/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2868#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2869FILE * 2459FILE * ecb_cold
2870rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2871{ 2461{
2872 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2873 2463
2874 if (stream == NULL) 2464 if (stream == NULL)
2875 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2876 2466
2877 return stream; 2467 return stream;
2878} 2468}
2879 2469
2880int 2470int ecb_cold
2881rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2882{ 2472{
2883 fflush (stream); 2473 fflush (stream);
2884 return pclose (stream); 2474 return pclose (stream);
2885} 2475}
2886 2476
2887/* 2477/*
2888 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2889 */ 2479 */
2890void 2480void ecb_cold
2891rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2892{ 2482{
2893 int done; 2483 FILE *fd = popen_printer ();
2894 FILE *fd;
2895 2484
2896 if ((fd = popen_printer ()) == NULL) 2485 if (!fd)
2897 return; 2486 return;
2898 2487
2899 /* 2488 /*
2900 * Send all input to the printer until either ESC[4i or ESC[?4i 2489 * Send all input to the printer until either ESC[4i or ESC[?4i
2901 * is received. 2490 * is received.
2902 */ 2491 */
2903 for (done = 0; !done;) 2492 for (int done = 0; !done; )
2904 { 2493 {
2905 unsigned char buf[8]; 2494 unsigned char buf[8];
2906 unicode_t ch; 2495 unicode_t ch;
2907 unsigned int i, len; 2496 unsigned int i, len;
2908 2497
… …
2927 { 2516 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2517 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2518 break; /* done = 1 */
2930 } 2519 }
2931 } 2520 }
2932 2521
2933 for (i = 0; i < len; i++) 2522 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2523 if (putc (buf[i], fd) == EOF)
2935 { 2524 {
2936 done = 1; 2525 done = 1;
2937 break; 2526 break;
… …
2939 } 2528 }
2940 } 2529 }
2941 2530
2942 pclose_printer (fd); 2531 pclose_printer (fd);
2943} 2532}
2944#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2945/*}}} */ 2534/*}}} */
2946 2535
2947/* *INDENT-OFF* */
2948enum { 2536enum {
2949 C1_40 = 0x40, 2537 C1_40 = 0x40,
2950 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2951 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2952 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2953 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2954}; 2542};
2955/* *INDENT-ON* */
2956 2543
2957/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2958void 2545void ecb_hot
2959rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2960{ 2547{
2961 switch (ch) 2548 switch (ch)
2962 { 2549 {
2963 case C0_ESC: 2550 case C0_ESC:
… …
2999 process_dcs_seq (); 2586 process_dcs_seq ();
3000 break; 2587 break;
3001 case 0x9b: /* CSI */ 2588 case 0x9b: /* CSI */
3002 process_csi_seq (); 2589 process_csi_seq ();
3003 break; 2590 break;
3004 case 0x9d: /* CSI */ 2591 case 0x9d: /* OSC */
3005 process_osc_seq (); 2592 process_osc_seq ();
3006 break; 2593 break;
3007#endif 2594#endif
3008 } 2595 }
3009} 2596}
3010/*}}} */ 2597/*}}} */
3011 2598
3012 2599
3013/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
3014void 2601void ecb_cold
3015rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
3016{ 2603{
3017 int row, col; 2604 int row, col;
3018 2605
3019 switch (ch) 2606 switch (ch)
… …
3053 break; 2640 break;
3054 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
3055 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3056 break; 2643 break;
3057 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
3058 PrivMode (0, PrivMode_vt52); 2645 priv_modes &= ~PrivMode_vt52;
3059 break; 2646 break;
3060 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
3061 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
3062 /* unimplemented */ 2649 /* unimplemented */
3063 break; 2650 break;
… …
3069} 2656}
3070/*}}} */ 2657/*}}} */
3071 2658
3072 2659
3073/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
3074void 2661void ecb_hot
3075rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
3076{ 2663{
3077 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
3078 2665
3079 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
3082 return; 2669 return;
3083 } 2670 }
3084 2671
3085 switch (ch) 2672 switch (ch)
3086 { 2673 {
3087 /* case 1: do_tek_mode (); break; */
3088 case '#': 2674 case '#':
3089 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
3090 scr_E (); 2676 scr_E ();
3091 break; 2677 break;
3092 case '(': 2678 case '(':
… …
3115#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
3116 case '9': 2702 case '9':
3117 scr_forwardindex (); 2703 scr_forwardindex ();
3118 break; 2704 break;
3119#endif 2705#endif
2706 // DECPAM/DECPNM
3120 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
3121 case '>': 2710 case '>':
3122 PrivMode ((ch == '='), PrivMode_aplKP); 2711 priv_modes &= ~PrivMode_aplKP;
3123 break; 2712 break;
3124 2713
3125 case C1_40: 2714 case C1_40:
3126 cmd_getc (); 2715 cmd_getc ();
3127 break; 2716 break;
… …
3131 2720
3132 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
3133 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
3134 { 2723 {
3135 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3137 } 2726 }
3138 break; 2727 break;
3139 2728
3140 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
3141 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
3142 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3143 break; 2734 break;
3144 2735
3145 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
3146 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
3147 scr_set_tab (1); 2738 scr_set_tab (1);
… …
3151 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
3152 scr_index (DN); 2743 scr_index (DN);
3153 break; 2744 break;
3154 2745
3155 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
3156 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
3157 2748
3158 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
3159 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
3160 2751
3161 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
3162 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
3163 process_dcs_seq (); 2754 process_dcs_seq ();
3164 break; 2755 break;
… …
3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2757 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3167 case C1_SCI: /* ESC Z */ 2758 case C1_SCI: /* ESC Z */
3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2759 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3169 break; /* steal obsolete ESC [ c */ 2760 break; /* steal obsolete ESC [ c */
3170 2761
3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2762 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3172 case C1_CSI: /* ESC [ */ 2763 case C1_CSI: /* ESC [ */
3173 process_csi_seq (); 2764 process_csi_seq ();
3174 break; 2765 break;
3175 2766
3176 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2767 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3177 case C1_OSC: /* ESC ] */ 2768 case C1_OSC: /* ESC ] */
3178 process_osc_seq (); 2769 process_osc_seq ();
3179 break; 2770 break;
3180 2771
3181 /* 8.3.106: RESET TO INITIAL STATE */ 2772 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3182 case 'c': 2773 case 'c':
3183 mbstate.reset (); 2774 mbstate.reset ();
3184 scr_poweron (); 2775 scr_poweron ();
3185 scrollbar_show (1); 2776 scrollBar.show (1);
3186 break; 2777 break;
3187 2778
3188 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2779 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3189 case 'n': 2780 case 'n':
3190 scr_charset_choose (2); 2781 scr_charset_choose (2);
… …
3197 } 2788 }
3198} 2789}
3199/*}}} */ 2790/*}}} */
3200 2791
3201/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3202/* *INDENT-OFF* */
3203enum { 2793enum {
3204 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
3205 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3206 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3207 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3210 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3211 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3212 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3213}; 2803};
3214 2804
3215#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3216 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3217 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3218#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
3219 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3220 2810
3221const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
3222 { 2812 {
3223 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3224 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3225 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3226 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3227 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3228 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3229 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3230 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3231 }; 2821 };
3232/* *INDENT-ON* */
3233 2822
3234void 2823void ecb_hot
3235rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
3236{ 2825{
3237 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
3238 unsigned int nargs, p; 2827 unsigned int nargs, p;
3239 int n, ndef; 2828 int n, ndef;
3240 int arg[ESC_ARGS]; 2829 int arg[ESC_ARGS] = { };
3241 2830
3242 for (nargs = ESC_ARGS; nargs > 0;) 2831 nargs = 0;
3243 arg[--nargs] = 0;
3244 2832
3245 priv = 0; 2833 priv = 0;
3246 ch = cmd_getc (); 2834 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2835 if ((ch >= '<' && ch <= '?') || ch == '!')
2836 {
3248 { /* '<' '=' '>' '?' */ 2837 /* '<' '=' '>' '?' '!' */
3249 priv = ch; 2838 priv = ch;
3250 ch = cmd_getc (); 2839 ch = cmd_getc ();
3251 } 2840 }
3252 2841
2842 prev_ch = 0;
3253 /* read any numerical arguments */ 2843 /* read any numerical arguments */
3254 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
3255 { 2845 {
3256 if (isdigit (ch)) 2846 if (isdigit (ch))
3257 { 2847 {
… …
3267 n = -1; 2857 n = -1;
3268 } 2858 }
3269 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
3270 process_nonprinting (ch); 2860 process_nonprinting (ch);
3271 2861
2862 prev_ch = ch;
3272 ch = cmd_getc (); 2863 ch = cmd_getc ();
3273 } 2864 }
3274 2865
3275 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
3276 return; 2867 return;
… …
3292 switch (priv) 2883 switch (priv)
3293 { 2884 {
3294 case '>': 2885 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2886 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2887 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2888 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2889 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2890 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2891 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2892 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2893 // versions.
3303 // 2894 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2895 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2896 }
3306 break; 2897 break;
2898
3307 case '?': 2899 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2901 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2902 break;
2903
2904 case '!':
2905 if (ch == CSI_70)
2906 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset ();
2909
2910 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2912
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3311 } 2915 }
2916 break;
2917 }
2918
3312 return; 2919 return;
3313 } 2920 }
3314 2921
3315 switch (ch) 2922 switch (ch)
3316 { 2923 {
… …
3330 } 2937 }
3331 break; 2938 break;
3332#endif 2939#endif
3333 2940
3334 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3335 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3336 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
3337 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
3338 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3339 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3340 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
3341 break; 2948 break;
3342 2949
3343 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3344 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3436 break; 3043 break;
3437 case 6: /* CPR requested */ 3044 case 6: /* CPR requested */
3438 scr_report_position (); 3045 scr_report_position ();
3439 break; 3046 break;
3440 case 7: /* unofficial extension */ 3047 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 3048 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3049 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 3050 break;
3444 case 8: /* unofficial extension */ 3051 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3052 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 3053 break;
… …
3494 scr_insert_mode (1); 3101 scr_insert_mode (1);
3495 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3496 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3497 break; 3104 break;
3498 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3499 /* 3111 /*
3500 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3501 */ 3113 */
3502 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3503 if (nargs == 1) 3115 if (nargs == 1)
… …
3531 } 3143 }
3532} 3144}
3533/*}}} */ 3145/*}}} */
3534 3146
3535#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3536/* ARGSUSED */
3537void 3148void
3538rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3539{ 3150{
3540 int x, y; 3151 int x, y;
3541 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3550 { 3161 {
3551 /* 3162 /*
3552 * commands 3163 * commands
3553 */ 3164 */
3554 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3555 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3556 break; 3167 break;
3557 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3558 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3559 break; 3170 break;
3560 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3561 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3562 break; 3173 break;
3563 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3176 break;
3566 case 5: /* raise window */ 3177 case 5: /* raise window */
3567 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3568 break; 3179 break;
3569 case 6: /* lower window */ 3180 case 6: /* lower window */
3570 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3571 break; 3182 break;
3572 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3573 scr_touch (true); 3184 scr_touch (true);
3574 break; 3185 break;
3575 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3578 break; 3189 break;
3579 3190
3580 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3581 default: 3192 default:
3582 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3584 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3585 break; 3196 break;
3586 3197
3587 /* 3198 /*
3588 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3589 */ 3200 */
3590 case 11: /* report window state */ 3201 case 11: /* report window state */
3591 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3593 break; 3204 break;
3594 case 13: /* report window position */ 3205 case 13: /* report window position */
3595 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3596 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3597 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3598 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3599 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3600 break; 3211 break;
3601 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3602 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3604 break; 3215 break;
3605 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3606 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3607 break; 3218 break;
… …
3609 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3610 break; 3221 break;
3611 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3612 { 3223 {
3613 char *s; 3224 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3227 XFree (s);
3617 } 3228 }
3618 break; 3229 break;
3619 case 21: /* report window title */ 3230 case 21: /* report window title */
3620 { 3231 {
3621 char *s; 3232 char *s;
3622 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3235 XFree (s);
3625 } 3236 }
3626 break; 3237 break;
3627 } 3238 }
3628} 3239}
… …
3637rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3638{ 3249{
3639 unicode_t ch; 3250 unicode_t ch;
3640 bool seen_esc = false; 3251 bool seen_esc = false;
3641 unsigned int n = 0; 3252 unsigned int n = 0;
3642 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3643 3254
3644 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3645 { 3256 {
3646 if (seen_esc) 3257 if (seen_esc)
3647 { 3258 {
… …
3655 seen_esc = true; 3266 seen_esc = true;
3656 continue; 3267 continue;
3657 } 3268 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3269 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3270 break;
3271 else if (ch == C0_SYN)
3272 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3273 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3662 3275
3663 seen_esc = false; 3276 seen_esc = false;
3664 3277
3665 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3666 // stop at some sane length 3279 // stop at some sane length
3667 return NULL; 3280 return NULL;
3668 3281
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3282 string[n++] = ch;
3673 } 3283 }
3674 3284
3675 string[n++] = '\0'; 3285 string[n++] = '\0';
3676 3286
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3287 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3684 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3294 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3685 */ 3295 */
3686void 3296void
3687rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3688{ 3298{
3689 char *s;
3690 unicode_t eh;
3691
3692 /* 3299 /*
3693 * Not handled yet 3300 * Not handled yet
3694 */ 3301 */
3302
3303 unicode_t eh;
3695 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3696 if (s) 3305 if (s)
3697 free (s); 3306 free (s);
3698 3307
3699 return; 3308 return;
3700} 3309}
… …
3704 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3705 */ 3314 */
3706void 3315void
3707rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3708{ 3317{
3709 unicode_t ch, eh;
3710 int arg; 3318 int arg;
3711 3319
3712 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3713 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3714 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3715 3323
3716 if (ch == ';') 3324 if (ch == ';')
3717 { 3325 {
3326 unicode_t eh;
3718 char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3719 3328
3720 if (s) 3329 if (s)
3721 { 3330 {
3722 process_xterm_seq (arg, s, eh); 3331 process_xterm_seq (arg, s, eh);
… …
3746 3355
3747/* 3356/*
3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3749 */ 3358 */
3750void 3359void
3751rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3360rxvt_term::process_xterm_seq (int op, char *str, char resp)
3752{ 3361{
3753 int color; 3362 int color;
3754 char *buf, *name; 3363 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3364 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3365 int saveop = op;
3757 3366
3758 dLocal (Display *, dpy); 3367 dLocal (Display *, dpy);
3759 3368
3760 assert (str != NULL); 3369 assert (str != NULL);
3761 3370
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3371 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 return; 3372 return;
3764 3373
3765 switch (op) 3374 switch (op)
3766 { 3375 {
… …
3783 unsigned long bytes_after; 3392 unsigned long bytes_after;
3784 unsigned char *value = 0; 3393 unsigned char *value = 0;
3785 const char *str = ""; 3394 const char *str = "";
3786 3395
3787 if (prop 3396 if (prop
3788 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3789 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3790 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3791 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3792 && actual_type != None 3401 && actual_type != None
3793 && actual_format == 8) 3402 && actual_format == 8)
3794 str = (const char *)(value); 3403 str = (const char *)(value);
3795 3404
3796 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3797 3406
3798 XFree (value); 3407 XFree (value);
3799 } 3408 }
3800 else 3409 else
3801 { 3410 {
3802 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3411 char *eq = strchr (str, '=');
3803 3412
3804 if (eq) 3413 if (eq)
3805 { 3414 {
3806 *eq = 0; 3415 *eq = 0;
3807 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3808 } 3417 }
3809 else 3418 else
3810 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3811 display->atom (str)); 3420 display->atom (str));
3812 } 3421 }
3813 break; 3422 break;
3814 3423
3815 case XTerm_Color: 3424 case XTerm_Color:
… …
3828 *buf++ = '\0'; 3437 *buf++ = '\0';
3829 3438
3830 process_color_seq (op, color, name, resp); 3439 process_color_seq (op, color, name, resp);
3831 } 3440 }
3832 break; 3441 break;
3442 case Rxvt_restoreFG:
3833 case XTerm_Color00: 3443 case XTerm_Color00:
3834 process_color_seq (op, Color_fg, str, resp); 3444 process_color_seq (op, Color_fg, str, resp);
3835 break; 3445 break;
3446 case Rxvt_restoreBG:
3836 case XTerm_Color01: 3447 case XTerm_Color01:
3837 process_color_seq (op, Color_bg, str, resp); 3448 process_color_seq (op, Color_bg, str, resp);
3838 break; 3449 break;
3839#ifndef NO_CURSORCOLOR 3450#ifndef NO_CURSORCOLOR
3840 case XTerm_Color_cursor: 3451 case XTerm_Color_cursor:
… …
3845 process_color_seq (op, Color_pointer_fg, str, resp); 3456 process_color_seq (op, Color_pointer_fg, str, resp);
3846 break; 3457 break;
3847 case XTerm_Color_pointer_bg: 3458 case XTerm_Color_pointer_bg:
3848 process_color_seq (op, Color_pointer_bg, str, resp); 3459 process_color_seq (op, Color_pointer_bg, str, resp);
3849 break; 3460 break;
3461#ifdef OPTION_HC
3462 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp);
3464 break;
3465 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp);
3467 break;
3468#endif
3850#ifndef NO_BOLD_UNDERLINE_REVERSE 3469#ifndef NO_BOLD_UNDERLINE_REVERSE
3851 case XTerm_Color_RV:
3852 process_color_seq (op, Color_RV, str, resp);
3853 break;
3854 case Rxvt_Color_BD:
3855 case URxvt_Color_BD: 3470 case URxvt_Color_BD:
3856 process_color_seq (op, Color_BD, str, resp); 3471 process_color_seq (op, Color_BD, str, resp);
3857 break; 3472 break;
3858 case Rxvt_Color_UL:
3859 case URxvt_Color_UL: 3473 case URxvt_Color_UL:
3860 process_color_seq (op, Color_UL, str, resp); 3474 process_color_seq (op, Color_UL, str, resp);
3861 break; 3475 break;
3862 case URxvt_Color_IT: 3476 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3477 process_color_seq (op, Color_IT, str, resp);
3864 break; 3478 break;
3865#endif 3479#endif
3866#if TRANSPARENT && TINTING 3480 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp);
3482 break;
3483
3484#if BG_IMAGE_FROM_ROOT
3867 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3487 {
3488 bool changed = false;
3869 3489
3870 check_our_parents (); 3490 if (ISSET_PIXCOLOR (Color_tint))
3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3871 3492
3872 if (am_transparent) 3493 if (changed)
3873 want_full_refresh = want_refresh = 1; 3494 update_background ();
3495 }
3874 3496
3875 break; 3497 break;
3876#endif 3498#endif
3877 3499
3500#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3502 if (!strcmp (str, "?"))
3879 { 3503 {
3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3509
3510 sprintf (str, "[%dx%d+%d+%d]",
3511 h_scale, v_scale,
3512 h_align, v_align);
3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3514 }
3515 else
3516 {
3517 bool changed = false;
3518
3880 if (*str != ';') 3519 if (*str != ';')
3881 { 3520 {
3882#if XPM_BACKGROUND 3521 try
3883 scale_pixmap (""); /* reset to default scaling */ 3522 {
3884 set_bgPixmap (str); /* change pixmap */ 3523 fimage.set_file_geometry (this, str);
3885 scr_touch (true); 3524 changed = true;
3886#endif 3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3528 }
3887 } 3529 }
3888 3530 else
3889 int changed = 0;
3890
3891 while ((str = strchr (str, ';')) != NULL)
3892 { 3531 {
3893 str++; 3532 str++;
3894#if XPM_BACKGROUND 3533 if (fimage.set_geometry (str, true))
3895 changed += scale_pixmap (str); 3534 changed = true;
3896#endif
3897 } 3535 }
3898 3536
3899 if (changed) 3537 if (changed)
3900 { 3538 {
3901#ifdef XPM_BACKGROUND 3539 if (bg_window_position_sensitive ())
3902 resize_pixmap (); 3540 {
3903 scr_touch (true); 3541 int x, y;
3904#endif 3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3546 update_background ();
3905 } 3547 }
3906 } 3548 }
3907 break; 3549 break;
3908 3550#endif
3909 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str);
3911 break;
3912 case Rxvt_restoreBG:
3913 set_window_color (Color_bg, str);
3914 break;
3915 3551
3916 case XTerm_logfile: 3552 case XTerm_logfile:
3917 // TODO, when secure mode? 3553 // TODO, when secure mode?
3918 break; 3554 break;
3919 3555
… …
3937 case URxvt_italicFont: 3573 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3574 case URxvt_boldItalicFont:
3939#endif 3575#endif
3940 if (query) 3576 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3577 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3578 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3579 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3580 resp);
3945 else 3581 else
3946 { 3582 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3583 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3597 break;
3962 3598
3963#if !ENABLE_MINIMAL 3599#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3600 case URxvt_locale:
3965 if (query) 3601 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3602 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3603 else
3968 { 3604 {
3969 set_locale (str); 3605 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3606 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3607 init_xlocale ();
… …
3986 break; 3622 break;
3987#endif 3623#endif
3988 3624
3989#if ENABLE_PERL 3625#if ENABLE_PERL
3990 case URxvt_perl: 3626 case URxvt_perl:
3991 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3627 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3992 ; // no responses yet
3993 break; 3628 break;
3994#endif 3629#endif
3995 } 3630 }
3996} 3631}
3997/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
… …
4004 * 's' = save 3639 * 's' = save
4005 * 'r' = restore 3640 * 'r' = restore
4006 * 't' = toggle 3641 * 't' = toggle
4007 * so no need for fancy checking 3642 * so no need for fancy checking
4008 */ 3643 */
4009int 3644int ecb_cold
4010rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
4011{ 3646{
4012 int state; 3647 int state;
4013 3648
4014 if (mode == 's') 3649 if (mode == 's')
4015 { 3650 {
4016 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
4017 return -1; 3655 return -1;
4018 } 3656 }
4019 else 3657 else
4020 { 3658 {
4021 if (mode == 'r') 3659 if (mode == 'r')
4022 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4023 else 3661 else
4024 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4025 PrivMode (state, bit); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
4026 } 3668 }
4027 3669
4028 return state; 3670 return state;
4029} 3671}
4030 3672
4031/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
4032void 3674void
4033rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4034{ 3676{
4035 unsigned int i, j; 3677 unsigned int i, j;
4036 int state; 3678 int state;
4037 3679
4038 static const struct 3680 static const struct
4039 { 3681 {
4040 const int argval; 3682 const int argval;
4041 const unsigned long bit; 3683 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3684 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3685 { 1, PrivMode_aplCUR }, // DECCKM
4046 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
4047 { 3, PrivMode_132 }, 3687 { 3, PrivMode_132 }, // DECCOLM
4048 { 4, PrivMode_smoothScroll }, 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
4049 { 5, PrivMode_rVideo }, 3689 { 5, PrivMode_rVideo }, // DECSCNM
4050 { 6, PrivMode_relOrigin }, 3690 { 6, PrivMode_relOrigin }, // DECOM
4051 { 7, PrivMode_Autowrap }, 3691 { 7, PrivMode_Autowrap }, // DECAWM
4052 // 8, bi-directional support mode 3692 // 8, auto-repeat keys // DECARM
4053 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
4054 // 18, 19 printing-related 3694 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region
4055 { 25, PrivMode_VisibleCursor }, 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4056#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
4057 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
4058#endif 3699#endif
4059 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3701 // 38, tektronix mode // DECTEK
4060 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
4061 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
4062 // 45 margin bell NYI 3704 // 45 margin bell NYI
4063 // 46 start logging 3705 // 46 start logging
4064 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
4065 { 66, PrivMode_aplKP }, 3707 { 66, PrivMode_aplKP }, // DECNKM
4066#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3709 { 67, PrivMode_BackSpace }, // DECBKM
4068#endif 3710#endif
4069 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3712 { 1002, PrivMode_MouseBtnEvent },
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3713 { 1003, PrivMode_MouseAnyEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
4075 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
4078 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
4079 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
4080 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4081 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3729 { 2004, PrivMode_BracketPaste },
4082 }; 3730 };
4083 3731
4084 if (nargs == 0) 3732 if (nargs == 0)
4085 return; 3733 return;
4086 3734
… …
4093 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
4094 { 3742 {
4095 state = -1; 3743 state = -1;
4096 3744
4097 /* basic handling */ 3745 /* basic handling */
4098 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
4099 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
4100 { 3748 {
4101 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
4102 break; 3750 break;
4103 } 3751 }
… …
4111 3759
4112 scr_touch (true); 3760 scr_touch (true);
4113 break; 3761 break;
4114#endif 3762#endif
4115 case 1048: /* alternative cursor save */ 3763 case 1048: /* alternative cursor save */
4116 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3765 if (mode == 0)
4119 scr_cursor (RESTORE); 3766 scr_cursor (RESTORE);
4120 else if (mode == 1) 3767 else if (mode == 1)
4121 scr_cursor (SAVE); 3768 scr_cursor (SAVE);
4122 break; 3769 break;
… …
4130 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
4131 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
4132 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
4133 * within VT52 mode 3780 * within VT52 mode
4134 */ 3781 */
4135 PrivMode (1, PrivMode_vt52); 3782 priv_modes |= PrivMode_vt52;
4136 break; 3783 break;
4137 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
4138 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
4139 set_widthheight (((state ? 132 : 80) * fwidth), height); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4140 break; 3787 break;
4141 case 4: /* smooth scrolling */ 3788 case 4: /* smooth scrolling */
4142 set_option (Opt_jumpScroll, !state); 3789 set_option (Opt_jumpScroll, !state);
4143 break; 3790 break;
4144 case 5: /* reverse video */ 3791 case 5: /* reverse video */
… …
4151 scr_autowrap (state); 3798 scr_autowrap (state);
4152 break; 3799 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3800 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3801 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3804 break;
4158#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
4159 case scrollBar_esc: 3806 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3807 scrollBar.map (state);
4161 {
4162 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
4163 scr_touch (true); 3809 scr_touch (true);
4164 }
4165 break; 3810 break;
4166#endif 3811#endif
4167 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
4168 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
4169 break; 3814 break;
… …
4174 break; 3819 break;
4175 /* case 66: - application key pad */ 3820 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3821 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3822 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3823 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3824 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3825 break;
4181#if 0
4182 case 1001: 3826 case 1002:
4183 break; /* X11 mouse highlighting */ 3827 case 1003:
4184#endif 3828 if (state)
3829 {
3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3833 vt_emask_mouse = PointerMotionMask;
3834 }
3835 else
3836 vt_emask_mouse = NoEventMask;
3837
3838 vt_select_input ();
3839 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3841 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3842 break;
4188 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3844 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3845 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3847 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3848 if (!state)
4194 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
4195 scr_change_screen (state); 3851 scr_change_screen (state);
4196 break; 3852 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3853 case 1049: /* secondary screen w/ clearing first */
3854 if (option (Opt_secondaryScreen))
3855 if (state)
3856 scr_cursor (SAVE);
3857
4198 scr_change_screen (state); 3858 scr_change_screen (state);
3859
4199 if (OPTION (Opt_secondaryScreen)) 3860 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3861 if (state)
4201 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
4202 break; 3865 break;
4203 default: 3866 default:
4204 break; 3867 break;
4205 } 3868 }
4206 } 3869 }
4207} 3870}
4208/*}}} */ 3871/*}}} */
4209 3872
4210/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
4211void 3874void ecb_hot
4212rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4213{ 3876{
4214 unsigned int i; 3877 unsigned int i;
4215 short rendset; 3878 short rendset;
4216 int rendstyle; 3879 int rendstyle;
… …
4357 break; 4020 break;
4358#endif 4021#endif
4359 } 4022 }
4360 } 4023 }
4361} 4024}
4362/*}}} */
4363 4025
4364/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4365void 4026void
4366rxvt_term::process_graphics () 4027rxvt_term::set_cursor_style (int style)
4367{ 4028{
4368 unicode_t ch, cmd = cmd_getc (); 4029 if (!IN_RANGE_INC (style, 0, 4))
4369
4370 if (cmd == 'Q')
4371 { /* query graphics */
4372 tt_printf ("\033G0\012"); /* no graphics */
4373 return; 4030 return;
4374 } 4031
4375 /* swallow other graphics sequences until terminating ':' */ 4032 set_option (Opt_cursorUnderline, style >= 3);
4376 do 4033
4377 ch = cmd_getc (); 4034#ifdef CURSOR_BLINK
4378 while (ch != ':'); 4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4379} 4040}
4380/*}}} */ 4041/*}}} */
4381 4042
4382/* ------------------------------------------------------------------------- */ 4043/* ------------------------------------------------------------------------- */
4383 4044
… …
4395 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4056 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4396 va_end (arg_ptr); 4057 va_end (arg_ptr);
4397 tt_write (buf, strlen (buf)); 4058 tt_write (buf, strlen (buf));
4398} 4059}
4399 4060
4061/* Write data to the pty as typed by the user. */
4062void
4063rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4064{
4065 if (option (Opt_scrollTtyKeypress))
4066 if (view_start)
4067 {
4068 view_start = 0;
4069 want_refresh = 1;
4070 }
4071
4072 tt_write (data, len);
4073}
4074
4400/* ---------------------------------------------------------------------- */ 4075/* ---------------------------------------------------------------------- */
4401/* Write data to the pty as typed by the user, pasted with the mouse, 4076/* Write data to the pty as typed by the user, pasted with the mouse,
4402 * or generated by us in response to a query ESC sequence. 4077 * or generated by us in response to a query ESC sequence.
4403 */ 4078 */
4404const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4079static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4405 4080
4406void 4081void
4407rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
4408{ 4083{
4409 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4414 4089
4415 if (v_buflen == 0) 4090 if (v_buflen == 0)
4416 { 4091 {
4417 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4092 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4418 4093
4094 max_it (written, 0);
4095
4419 if ((unsigned int)written == len) 4096 if (written == len)
4420 return; 4097 return;
4421 4098
4422 data += written; 4099 data += written;
4423 len -= written; 4100 len -= written;
4424 } 4101 }
4425 4102
4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4103 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4427 4104
4428 memcpy (v_buffer + v_buflen, data, len); 4105 memcpy (v_buffer + v_buflen, data, len);
4429 v_buflen += len; 4106 v_buflen += len;
4430 4107
4431 pty_ev.set (EVENT_READ | EVENT_WRITE); 4108 pty_ev.set (ev::READ | ev::WRITE);
4432} 4109}
4433 4110
4434void rxvt_term::pty_write () 4111void rxvt_term::pty_write ()
4435{ 4112{
4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4113 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4441 4118
4442 if (v_buflen == 0) 4119 if (v_buflen == 0)
4443 { 4120 {
4444 free (v_buffer); 4121 free (v_buffer);
4445 v_buffer = 0; 4122 v_buffer = 0;
4446 v_buflen = 0;
4447 4123
4448 pty_ev.set (EVENT_READ); 4124 pty_ev.set (ev::READ);
4449 return; 4125 return;
4450 } 4126 }
4451 4127
4452 memmove (v_buffer, v_buffer + written, v_buflen); 4128 memmove (v_buffer, v_buffer + written, v_buflen);
4453 } 4129 }
4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4130 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4455 pty_ev.set (EVENT_READ); 4131 pty_ev.set (ev::READ);
4456} 4132}
4457 4133
4458/*----------------------- end-of-file (C source) -----------------------*/ 4134/*----------------------- end-of-file (C source) -----------------------*/
4459 4135

Diff Legend

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