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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.545 by sf-exg, Sat Apr 26 15:05:17 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-2007 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 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",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 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
405rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
406{ 416{
407 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
408 KeySym keysym; 418 KeySym keysym;
409 int valid_keysym; 419 int valid_keysym;
410 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
411 422
412#if ISO_14755 423#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
414 return; 425 return;
415#endif 426#endif
… …
424 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
426 437
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
… …
485 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
486 } 497 }
487 498
488 if (valid_keysym) 499 if (valid_keysym)
489 { 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 (valid_keysym)
704 {
490#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 707 return;
493#endif 708#endif
494 709
495 if (saveLines) 710 if (saveLines)
496 { 711 {
… …
509#endif 724#endif
510 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
511 726
512 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
513 { 728 {
514 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
515 return; 730 return;
516 } 731 }
517 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
518 { 733 {
519 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
520 return; 735 return;
521 } 736 }
522 } 737 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
525 { 740 {
526 if (keysym == XK_Up) 741 if (keysym == XK_Up)
527 { 742 {
528 scr_page (UP, 1); 743 scr_page (1);
529 return; 744 return;
530 } 745 }
531 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
532 { 747 {
533 scr_page (DN, 1); 748 scr_page (-1);
534 return; 749 return;
535 } 750 }
536 } 751 }
537#endif 752#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
540 { 755 {
541 if (keysym == XK_Home) 756 if (keysym == XK_Home)
542 { 757 {
543 scr_move_to (0, 1); 758 scr_changeview (top_row);
544 return; 759 return;
545 } 760 }
546 else if (keysym == XK_End) 761 else if (keysym == XK_End)
547 { 762 {
548 scr_move_to (1, 1); 763 scr_changeview (0);
549 return; 764 return;
550 } 765 }
551 } 766 }
552#endif 767#endif
553 } 768 }
… …
569 selection_request (ev.time); 784 selection_request (ev.time);
570 return; 785 return;
571#if TODO 786#if TODO
572 /* rxvt extras */ 787 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 788 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 789 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 790 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 791 return;
579#endif 792#endif
580 } 793 }
581 } 794 }
795 }
796
797 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
798 {
799 if (keysym == XK_v)
800 selection_request (ev.time, Sel_Clipboard);
801 else if (selection.len > 0)
802 {
803 free (selection.clip_text);
804 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
805 selection.clip_len = selection.len;
806 selection_grab (CurrentTime, true);
807 }
808
809 return;
582 } 810 }
583 811
584#if ENABLE_FRILLS || ISO_14755 812#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 813 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 869 {
642 scr_printscreen (ctrl | shft); 870 scr_printscreen (ctrl | shft);
643 return; 871 return;
644 } 872 }
645#endif 873#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 874 }
822 875
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return; 877 return;
825 878
… …
831 { 884 {
832 view_start = 0; 885 view_start = 0;
833 want_refresh = 1; 886 want_refresh = 1;
834 } 887 }
835 888
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
862} 890}
863 891
864void 892void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 893rxvt_term::key_release (XKeyEvent &ev)
866{ 894{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 896 KeySym keysym;
869 897
… …
889 commit_iso14755 (); 917 commit_iso14755 ();
890 918
891 return; 919 return;
892 } 920 }
893 921
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 922 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 923 if (i[0] == keysym)
896 { 924 {
897 iso14755buf = ISO_14755_51 | i[1]; 925 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 926 commit_iso14755 ();
899 927
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 964 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 965 mouse_slip_wheel_speed = 0;
938#endif 966#endif
939} 967}
940 968
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 969void
975rxvt_term::flush () 970rxvt_term::flush ()
976{ 971{
977 flush_ev.stop (); 972 flush_ev.stop ();
978 973
979#ifdef HAVE_BG_PIXMAP 974#ifdef HAVE_IMG
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 975 if (bg_flags & BG_NEEDS_REFRESH)
981 { 976 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 977 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 978 scr_touch (false);
985 } 979 }
986#endif 980#endif
987 981
988 if (want_refresh) 982 if (want_refresh)
… …
1025 while (row < end_row); 1019 while (row < end_row);
1026 } 1020 }
1027 1021
1028 scr_refresh (); 1022 scr_refresh ();
1029 scrollBar.show (1); 1023 scrollBar.show (1);
1030#ifdef USE_XIM 1024#if USE_XIM
1031 IMSendSpot (); 1025 im_send_spot ();
1032#endif 1026#endif
1033 } 1027 }
1034 1028
1035 display->flush (); 1029 display->flush ();
1036} 1030}
… …
1054 flush (); 1048 flush ();
1055} 1049}
1056 1050
1057#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1058void 1052void
1053rxvt_term::cursor_blink_reset ()
1054{
1055 if (hidden_cursor)
1056 {
1057 hidden_cursor = 0;
1058 want_refresh = 1;
1059 }
1060
1061 if (option (Opt_cursorBlink))
1062 cursor_blink_ev.again ();
1063 else
1064 cursor_blink_ev.stop ();
1065}
1066
1067void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1069{
1061 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1071 want_refresh = 1;
1063 refresh_check (); 1072 refresh_check ();
… …
1081 1090
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1092void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1094{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1097 {
1089 want_refresh = 1; 1098 want_refresh = 1;
1090 refresh_check (); 1099 refresh_check ();
1091 } 1100 }
1092 else 1101 else
… …
1096 1105
1097#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1098void 1107void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1109{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1102 { 1111 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1113 want_refresh = 1;
1105 refresh_check (); 1114 refresh_check ();
1106 } 1115 }
… …
1111 1120
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1122void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1124{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1125 if (scr_page (mouse_slip_wheel_speed))
1117 { 1126 {
1118 want_refresh = 1; 1127 want_refresh = 1;
1119 refresh_check (); 1128 refresh_check ();
1120 } 1129 }
1121 1130
… …
1153 { 1162 {
1154 } 1163 }
1155} event_handler; 1164} event_handler;
1156#endif 1165#endif
1157 1166
1167/* make sure all the cmd data is at beginning of cmdbuf */
1168void
1169rxvt_term::cmdbuf_reify ()
1170{
1171 if (cmdbuf_ptr == cmdbuf_base)
1172 return;
1173
1174 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1175
1176 memmove (cmdbuf_base, cmdbuf_ptr, used);
1177 cmdbuf_ptr = cmdbuf_base;
1178 cmdbuf_endp = cmdbuf_ptr + used;
1179
1180}
1181
1182#if defined (KEYSYM_RESOURCE)
1183void
1184rxvt_term::cmdbuf_append (const char *str, size_t count)
1185{
1186 cmdbuf_reify ();
1187
1188 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1189
1190 if (count > avail)
1191 return;
1192
1193 memcpy (cmdbuf_endp, str, count);
1194 cmdbuf_endp += count;
1195
1196 cmd_parse ();
1197}
1198#endif
1199
1158bool 1200bool
1159rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1160{ 1202{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1162 1204
1163 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1206
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1166 n = 0;
1167 } 1208 {
1168 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1172 1214
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1216
1175 if (r > 0) 1217 if (r > 0)
1176 { 1218 {
1177 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1178 return true; 1220 return true;
… …
1209 pty_write (); 1251 pty_write ();
1210 1252
1211 refresh_check (); 1253 refresh_check ();
1212} 1254}
1213 1255
1214void 1256void ecb_cold
1215rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1216{ 1258{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1260 recolour_cursor ();
1219 1261
… …
1224 pointer_ev.start (pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1225#endif 1267#endif
1226} 1268}
1227 1269
1228#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1229void 1271void ecb_cold
1230rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1231{ 1273{
1232 if (!option (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1233 return; 1275 return;
1234 1276
… …
1236 XFlush (dpy); 1278 XFlush (dpy);
1237 1279
1238 hidden_pointer = 1; 1280 hidden_pointer = 1;
1239} 1281}
1240 1282
1241void 1283void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1285{
1244 make_current (); 1286 make_current ();
1245 1287
1246 pointer_blank (); 1288 pointer_blank ();
… …
1252{ 1294{
1253 int button_number, key_state = 0; 1295 int button_number, key_state = 0;
1254 int x, y; 1296 int x, y;
1255 int code = 32; 1297 int code = 32;
1256 1298
1257 x = Pixel2Col (ev.x); 1299 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1300 y = Pixel2Row (ev.y) + 1;
1301
1259 if (ev.type == MotionNotify) 1302 if (ev.type == MotionNotify)
1260 { 1303 {
1261 if (x == mouse_row && y == mouse_col) 1304 if (x == mouse_row && y == mouse_col)
1262 return; 1305 return;
1306
1263 mouse_row = x; 1307 mouse_row = x;
1264 mouse_col = y; 1308 mouse_col = y;
1265 code += 32; 1309 code += 32;
1266 } 1310 }
1267 1311
… …
1270 else 1314 else
1271 { 1315 {
1272 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1318 if (button_number >= 3)
1275 button_number += (64 - 3); 1319 button_number += 64 - 3;
1276 } 1320 }
1277 1321
1278 if (priv_modes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1279 { 1323 {
1280 /* 1324 /*
… …
1312 fputc ('A', stderr); 1356 fputc ('A', stderr);
1313 if (key_state & 32) 1357 if (key_state & 32)
1314 fputc ('2', stderr); 1358 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1360 button_number,
1317 x + 1, 1361 x,
1318 y + 1); 1362 y);
1319#endif 1363#endif
1320 1364
1365#if ENABLE_FRILLS
1366 if (priv_modes & PrivMode_ExtMouseRight)
1367 tt_printf ("\033[%d;%d;%dM",
1368 code + button_number + key_state,
1369 x,
1370 y);
1371 else if (priv_modes & PrivMode_ExtModeMouse)
1372 tt_printf ("\033[M%c%lc%lc",
1373 code + button_number + key_state,
1374 wint_t (32 + x),
1375 wint_t (32 + y));
1376 else
1377#endif
1321 tt_printf ("\033[M%c%c%c", 1378 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1379 code + button_number + key_state,
1323 (32 + x + 1), 1380 32 + x,
1324 (32 + y + 1)); 1381 32 + y);
1325} 1382}
1326 1383
1327/*{{{ process an X event */ 1384/*{{{ process an X event */
1328void 1385void ecb_hot
1329rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1330{ 1387{
1331 make_current (); 1388 make_current ();
1332 1389
1333 dLocal (Display *, dpy); 1390 dLocal (Display *, dpy);
… …
1431 && ev.xfocus.mode != NotifyGrab) 1488 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1489 focus_out ();
1433 break; 1490 break;
1434 1491
1435 case ConfigureNotify: 1492 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1437 { 1494 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1496 ;
1440 1497
1498 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1499
1500 bool moved = false;
1441#ifdef HAVE_BG_PIXMAP 1501#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1502 if (bg_window_position_sensitive ())
1503 {
1504 want_position_change = true;
1505 if (bg_img == 0)
1506 moved = true;
1507 }
1508#endif
1509
1510 if (want_position_change)
1444 { 1511 {
1445 int x, y; 1512 int x, y;
1513
1446 if (ev.xconfigure.send_event) 1514 if (ev.xconfigure.send_event)
1447 { 1515 {
1448 x = ev.xconfigure.x; 1516 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1517 y = ev.xconfigure.y;
1450 } 1518 }
1451 else 1519 else
1452 get_window_origin (x, y); 1520 get_window_origin (x, y);
1453 1521
1454 if (bgPixmap.set_position (x, y) 1522 if (x != parent_x || y != parent_y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1523 {
1524 parent_x = x;
1525 parent_y = y;
1526 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1456 moved = true; 1527 moved = true;
1528 }
1457 } 1529 }
1458#endif
1459 1530
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1532 {
1462 seen_resize = 1; 1533 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1535 }
1465 else 1536 else
1466 { 1537 {
1467#ifdef HAVE_BG_PIXMAP 1538#ifdef HAVE_BG_PIXMAP
1468 if (moved) 1539 if (moved)
1469 {
1470 if (mapped)
1471 update_background (); 1540 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif 1541#endif
1476 } 1542 }
1477 1543
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1545 }
1480 break; 1546 break;
1481 1547
1482 case PropertyNotify: 1548 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1550 break;
1489 1551
1490 case SelectionClear: 1552 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break; 1554 break;
1493 1555
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break;
1498
1499 case SelectionRequest: 1556 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1501 break; 1558 break;
1502 1559
1503 case MapNotify: 1560 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP 1561#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a 1562 // This is needed at startup for the case of no window manager
1506 * non-reparenting window manager. In those cases we never get first 1563 // or a non-reparenting window manager and also because we
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1564 // defer bg image updates if the window is not mapped. The
1508 * care of multiplicity of ConfigureNotify events arriving while WM does 1565 // short delay is to optimize for multiple ConfigureNotify
1509 * reparenting. 1566 // events at startup when the window manager reparents the
1510 * We should not render background immediately, as there could be several 1567 // window, so as to perform the computation after we have
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1568 // received all of them.
1512 * by scheduling background redraw as soon as we can, but giving a short 1569 if (bg_img == 0)
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1518 update_background_ev.start (0.025); 1570 update_background_ev.start (0.025);
1519#endif 1571#endif
1520 mapped = 1; 1572 mapped = 1;
1521#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1574 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1538 { 1590 {
1539 do 1591 do
1540 { 1592 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1595 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1597
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1599
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1601 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1604 }
1553 1605
1554 want_refresh = 1; 1606 want_refresh = 1;
1555 } 1607 }
1556 else 1608 else
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1615 ;
1564 1616
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1618 {
1567 scrollBar.state = STATE_IDLE; 1619 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1620 scrollBar.show (0);
1569 } 1621 }
1570 } 1622 }
1571 break; 1623 break;
1572 1624
… …
1614 1666
1615#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1616 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1617 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1618 { 1670 {
1671 page_dirn scroll_selection_dir;
1619 int dist; 1672 int dist;
1620 1673
1621 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1623 */ 1676 */
… …
1638 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1639 } 1692 }
1640 else 1693 else
1641 { 1694 {
1642 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1697 }
1645 1698
1646 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1701 + 1;
1649 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1650 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1651 } 1705 }
1652 else 1706 else
1653 { 1707 {
1654 /* we are within the text window, so we 1708 /* we are within the text window, so we
1655 * shouldn't be scrolling 1709 * shouldn't be scrolling
… …
1660#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1661 } 1715 }
1662#endif 1716#endif
1663 } 1717 }
1664 } 1718 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1720 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1669 ; 1723 ;
1670 1724
1671 XQueryPointer (dpy, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1729 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1731 scrollBar.size ());
1678 want_refresh = 1; 1732 want_refresh = 1;
1679 scrollBar.show (1); 1733 scrollBar.show (1);
1680 } 1734 }
1681 break; 1735 break;
1682 } 1736 }
1683 1737
1684#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1740 cursor_blink_reset ();
1694 }
1695#endif 1741#endif
1696 1742
1697#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1745 {
… …
1710 1756
1711 refresh_check (); 1757 refresh_check ();
1712} 1758}
1713 1759
1714#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1715void 1761void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1762rxvt_term::set_urgency (bool enable)
1717{ 1763{
1718 if (enable == urgency_hint) 1764 if (enable == urgency_hint)
1719 return; 1765 return;
1720 1766
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1767 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1768 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1769 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1770 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1771 urgency_hint = enable;
1772 XFree (h);
1726 } 1773 }
1727} 1774}
1728#endif 1775#endif
1729 1776
1730void 1777void ecb_cold
1731rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1732{ 1779{
1733 if (!focus) 1780 if (!focus)
1734 { 1781 {
1735 focus = 1; 1782 focus = 1;
1736 want_refresh = 1; 1783 want_refresh = 1;
1737 1784
1738#if USE_XIM 1785#if USE_XIM
1739 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1740 { 1787 {
1741 IMSetPosition (); 1788 im_set_position ();
1742 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1743 } 1790 }
1744#endif 1791#endif
1745#if CURSOR_BLINK 1792#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
… …
1760 1807
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1809 }
1763} 1810}
1764 1811
1765void 1812void ecb_cold
1766rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1767{ 1814{
1768 if (focus) 1815 if (focus)
1769 { 1816 {
1770 focus = 0; 1817 focus = 0;
… …
1803 1850
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1851 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1852 }
1806} 1853}
1807 1854
1808void 1855void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1856rxvt_term::update_fade_color (unsigned int idx)
1810{ 1857{
1811#if OFF_FOCUS_FADING 1858#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1859 if (rs[Rs_fade])
1813 { 1860 {
… …
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1863 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1864 }
1818#endif 1865#endif
1819} 1866}
1820 1867
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1869void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1871{
1825 make_current (); 1872 make_current ();
1826 1873
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1876 return;
1830 1877
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1878 switch (ev.type)
1833 { 1879 {
1834 case PropertyNotify: 1880 case PropertyNotify:
1835 /* 1881 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1882 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1883 * use the property to determine the pixmap. We use it later on.
1838 */ 1884 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1887 {
1842 bgPixmap.set_root_pixmap (); 1888#if BG_IMAGE_FROM_ROOT
1889 if (option (Opt_transparent))
1890 {
1891 rxvt_img::new_from_root (this)->replace (root_img);
1843 update_background (); 1892 update_background ();
1893 }
1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844 } 1896 }
1845 1897
1846 break; 1898 break;
1847 } 1899 }
1848# endif
1849 1900
1850 refresh_check (); 1901 refresh_check ();
1851} 1902}
1852#endif 1903#endif
1853 1904
… …
1977 if (scrollBar.upButton (ev.y)) 2028 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 2029 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 2030 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2031 direction = DN; /* down */
1981 2032
1982 scrollBar.state = STATE_IDLE; 2033 scrollBar.state = SB_STATE_IDLE;
1983 /* 2034 /*
1984 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2036 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
1987 * 2038 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2078#endif
2028 if (scr_page (direction, 1)) 2079 if (scr_page (direction, 1))
2029 { 2080 {
2030 if (direction == UP) 2081 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2082 scrollBar.state = SB_STATE_UP;
2032 else 2083 else
2033 scrollBar.state = STATE_DOWN; 2084 scrollBar.state = SB_STATE_DOWN;
2034 } 2085 }
2035 } 2086 }
2036 else 2087 else
2037 switch (ev.button) 2088 switch (ev.button)
2038 { 2089 {
2039 case Button2: 2090 case Button2:
2040 switch (scrollBar.align) 2091 switch (scrollBar.align)
2041 { 2092 {
2042 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2043 csrO = 0; 2094 csrO = 0;
2044 break; 2095 break;
2045 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2098 break;
2048 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2101 break;
2051 } 2102 }
2052 2103
2053 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2108
2058 scrollBar.state = STATE_MOTION; 2109 scrollBar.state = SB_STATE_MOTION;
2059 break; 2110 break;
2060 2111
2061 case Button1: 2112 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2065 2116
2066 case Button3: 2117 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2119 {
2069 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2072# else 2123# else
2073 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2074# endif 2125# endif
2075 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2078# else 2129# else
2079 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2080# endif 2131# endif
2081 else 2132 else
2082 scrollBar.state = STATE_MOTION; 2133 scrollBar.state = SB_STATE_MOTION;
2083 } 2134 }
2084 else 2135 else
2085 { 2136 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2138 (nrow
2088 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2140 / scrollBar.size ()));
2090 } 2141 }
2091 2142
2092 break; 2143 break;
2093 } 2144 }
… …
2104 2155
2105 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2157 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2159
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2161 {
2111 scrollBar.state = STATE_IDLE; 2162 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2163 scrollBar.show (0);
2113 } 2164 }
2114 2165
2115#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
… …
2166 case Button3: 2217 case Button3:
2167 selection_make (ev.time); 2218 selection_make (ev.time);
2168 break; 2219 break;
2169 2220
2170 case Button2: 2221 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2222 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2223 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2224 break;
2174 2225
2175#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2176 case Button4: 2227 case Button4:
2177 case Button5: 2228 case Button5:
2178 { 2229 {
2179 int i; 2230 int lines;
2180 page_dirn v; 2231 page_dirn dirn;
2181 2232
2182 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2183 2234
2184 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2185 i = 1; 2236 lines = 1;
2186 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2187 i = nrow - 1; 2238 lines = nrow - 1;
2188 else 2239 else
2189 i = 5; 2240 lines = 5;
2190 2241
2191# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2192 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2193 { 2244 {
2194 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197 2247
2198 if (!slip_wheel_ev.is_active ()) 2248 if (!slip_wheel_ev.is_active ())
2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200 } 2250 }
2201 else 2251 else
2202# endif 2252# endif
2203 { 2253 {
2204 scr_page (v, i); 2254 scr_page (dirn, lines);
2205 scrollBar.show (1); 2255 scrollBar.show (1);
2206 } 2256 }
2207 } 2257 }
2208 break; 2258 break;
2209#endif 2259#endif
… …
2211 } 2261 }
2212} 2262}
2213 2263
2214/*}}} */ 2264/*}}} */
2215 2265
2216void 2266void ecb_hot
2217rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2218{ 2268{
2219 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2221 2271
2222 for (;;) 2272 for (;;)
2223 { 2273 {
2224 if (expect_false (ch == NOCHAR)) 2274 if (ecb_unlikely (ch == NOCHAR))
2225 { 2275 {
2226 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2277 ch = next_char ();
2228 2278
2229 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2230 break; 2280 break;
2231 } 2281 }
2232 2282
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2283 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2284 {
2235 if (expect_false (!seen_input)) 2285 if (ecb_unlikely (!seen_input))
2236 { 2286 {
2237 seen_input = 1; 2287 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2303 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2305
2256 for (;;) 2306 for (;;)
2257 { 2307 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2308 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2309 break;
2260 2310
2261 *str++ = ch; 2311 *str++ = ch;
2262 2312
2263 if (expect_false (ch == C0_LF || str >= eol)) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2314 {
2265 if (ch == C0_LF) 2315 if (ch == C0_LF)
2266 nlines++; 2316 nlines++;
2267 2317
2268 refresh_count++; 2318 refresh_count++;
… …
2340 } 2390 }
2341 } 2391 }
2342} 2392}
2343 2393
2344// read the next character 2394// read the next character
2345wchar_t 2395wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2396rxvt_term::next_char () NOTHROW
2347{ 2397{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2399 {
2350 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2353 2403
2354 wchar_t wc; 2404 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2405 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2406
… …
2362 } 2412 }
2363 2413
2364 if (len == (size_t)-1) 2414 if (len == (size_t)-1)
2365 { 2415 {
2366 mbstate.reset (); // reset now undefined conversion state 2416 mbstate.reset (); // reset now undefined conversion state
2417 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2418 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2419 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2420 }
2369 2421
2370 // assume wchar == unicode 2422 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
… …
2374 2426
2375 return NOCHAR; 2427 return NOCHAR;
2376} 2428}
2377 2429
2378// read the next octet 2430// read the next octet
2379uint32_t 2431uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2432rxvt_term::next_octet () NOTHROW
2381{ 2433{
2382 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2436 : NOCHAR;
2385} 2437}
2386 2438
2387static class out_of_input out_of_input; 2439static class out_of_input out_of_input;
2388 2440
2389/* rxvt_cmd_getc () - Return next input character */ 2441wchar_t ecb_hot
2390/*
2391 * Return the next input character after first passing any keyboard input
2392 * to the command.
2393 */
2394wchar_t
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2443{
2397 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2398 2445
2399 if (c == NOCHAR) 2446 if (c == NOCHAR)
2400 throw out_of_input; 2447 throw out_of_input;
2401 2448
2402 return c; 2449 return c;
2403} 2450}
2404 2451
2405uint32_t 2452uint32_t ecb_hot
2406rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407{ 2454{
2408 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2409 2456
2410 if (c == NOCHAR) 2457 if (c == NOCHAR)
… …
2414} 2461}
2415 2462
2416/*{{{ print pipe */ 2463/*{{{ print pipe */
2417/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2418#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2419FILE * 2466FILE * ecb_cold
2420rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2421{ 2468{
2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2423 2470
2424 if (stream == NULL) 2471 if (stream == NULL)
2425 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2426 2473
2427 return stream; 2474 return stream;
2428} 2475}
2429 2476
2430int 2477int ecb_cold
2431rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2432{ 2479{
2433 fflush (stream); 2480 fflush (stream);
2434 return pclose (stream); 2481 return pclose (stream);
2435} 2482}
2436 2483
2437/* 2484/*
2438 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2439 */ 2486 */
2440void 2487void ecb_cold
2441rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2442{ 2489{
2443 FILE *fd = popen_printer (); 2490 FILE *fd = popen_printer ();
2444 2491
2445 if (!fd) 2492 if (!fd)
… …
2491 pclose_printer (fd); 2538 pclose_printer (fd);
2492} 2539}
2493#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
2494/*}}} */ 2541/*}}} */
2495 2542
2496/* *INDENT-OFF* */
2497enum { 2543enum {
2498 C1_40 = 0x40, 2544 C1_40 = 0x40,
2499 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2545 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2546 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2547 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2502 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2548 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2503}; 2549};
2504/* *INDENT-ON* */
2505 2550
2506/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
2507void 2552void ecb_hot
2508rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2554{
2510 switch (ch) 2555 switch (ch)
2511 { 2556 {
2512 case C0_ESC: 2557 case C0_ESC:
… …
2558} 2603}
2559/*}}} */ 2604/*}}} */
2560 2605
2561 2606
2562/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
2563void 2608void ecb_cold
2564rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
2565{ 2610{
2566 int row, col; 2611 int row, col;
2567 2612
2568 switch (ch) 2613 switch (ch)
… …
2602 break; 2647 break;
2603 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2650 break;
2606 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2652 priv_modes &= ~PrivMode_vt52;
2608 break; 2653 break;
2609 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
2611 /* unimplemented */ 2656 /* unimplemented */
2612 break; 2657 break;
… …
2618} 2663}
2619/*}}} */ 2664/*}}} */
2620 2665
2621 2666
2622/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
2623void 2668void ecb_hot
2624rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
2625{ 2670{
2626 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
2627 2672
2628 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
2631 return; 2676 return;
2632 } 2677 }
2633 2678
2634 switch (ch) 2679 switch (ch)
2635 { 2680 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2681 case '#':
2638 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
2639 scr_E (); 2683 scr_E ();
2640 break; 2684 break;
2641 case '(': 2685 case '(':
… …
2664#if !ENABLE_MINIMAL 2708#if !ENABLE_MINIMAL
2665 case '9': 2709 case '9':
2666 scr_forwardindex (); 2710 scr_forwardindex ();
2667 break; 2711 break;
2668#endif 2712#endif
2713 // DECPAM/DECPNM
2669 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
2670 case '>': 2717 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2718 priv_modes &= ~PrivMode_aplKP;
2672 break; 2719 break;
2673 2720
2674 case C1_40: 2721 case C1_40:
2675 cmd_getc (); 2722 cmd_getc ();
2676 break; 2723 break;
… …
2680 2727
2681 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
2683 { 2730 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2733 }
2687 break; 2734 break;
2688 2735
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
2691 process_graphics (); 2738 // used by original rxvt for rob nations own graphics mode
2739 if (cmd_getc () == 'Q')
2740 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2692 break; 2741 break;
2693 2742
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2745 scr_set_tab (1);
… …
2700 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
2701 scr_index (DN); 2750 scr_index (DN);
2702 break; 2751 break;
2703 2752
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
2706 2755
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
2709 2758
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2761 process_dcs_seq ();
2713 break; 2762 break;
… …
2746 } 2795 }
2747} 2796}
2748/*}}} */ 2797/*}}} */
2749 2798
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2800enum {
2753 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2802 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2803 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2804 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2807 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2808 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2809 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762}; 2810};
2763 2811
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2812#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2813 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2814 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2815#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2816 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2817
2770const unsigned char csi_defaults[] = 2818static const unsigned char csi_defaults[] =
2771 { 2819 {
2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2820 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2821 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2822 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2823 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2824 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2825 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2826 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2827 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2828 };
2781/* *INDENT-ON* */
2782 2829
2783void 2830void ecb_hot
2784rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
2785{ 2832{
2786 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
2787 unsigned int nargs, p; 2834 unsigned int nargs, p;
2788 int n, ndef; 2835 int n, ndef;
2789 int arg[ESC_ARGS] = { }; 2836 int arg[ESC_ARGS] = { };
2790 2837
2791 nargs = 0; 2838 nargs = 0;
… …
2797 /* '<' '=' '>' '?' '!' */ 2844 /* '<' '=' '>' '?' '!' */
2798 priv = ch; 2845 priv = ch;
2799 ch = cmd_getc (); 2846 ch = cmd_getc ();
2800 } 2847 }
2801 2848
2849 prev_ch = 0;
2802 /* read any numerical arguments */ 2850 /* read any numerical arguments */
2803 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
2804 { 2852 {
2805 if (isdigit (ch)) 2853 if (isdigit (ch))
2806 { 2854 {
… …
2816 n = -1; 2864 n = -1;
2817 } 2865 }
2818 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
2819 process_nonprinting (ch); 2867 process_nonprinting (ch);
2820 2868
2869 prev_ch = ch;
2821 ch = cmd_getc (); 2870 ch = cmd_getc ();
2822 } 2871 }
2823 2872
2824 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
2825 return; 2874 return;
… …
2864 { 2913 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2914 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2915 scr_soft_reset ();
2867 2916
2868 static const int pm_h[] = { 7, 25 }; 2917 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2918 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2919
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2920 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2921 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2922 }
2874 break; 2923 break;
2875 } 2924 }
2876 2925
2877 return; 2926 return;
… …
2895 } 2944 }
2896 break; 2945 break;
2897#endif 2946#endif
2898 2947
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2955 break;
2907 2956
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3059 scr_insert_mode (1); 3108 scr_insert_mode (1);
3060 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3062 break; 3111 break;
3063 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3064 /* 3118 /*
3065 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3066 */ 3120 */
3067 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3068 if (nargs == 1) 3122 if (nargs == 1)
… …
3096 } 3150 }
3097} 3151}
3098/*}}} */ 3152/*}}} */
3099 3153
3100#if !ENABLE_MINIMAL 3154#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3155void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3157{
3105 int x, y; 3158 int x, y;
3106 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
… …
3115 { 3168 {
3116 /* 3169 /*
3117 * commands 3170 * commands
3118 */ 3171 */
3119 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3173 XMapWindow (dpy, parent);
3121 break; 3174 break;
3122 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3177 break;
3125 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3180 break;
3128 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3183 break;
3131 case 5: /* raise window */ 3184 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3185 XRaiseWindow (dpy, parent);
3133 break; 3186 break;
3134 case 6: /* lower window */ 3187 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3188 XLowerWindow (dpy, parent);
3136 break; 3189 break;
3137 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3138 scr_touch (true); 3191 scr_touch (true);
3139 break; 3192 break;
3140 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3143 break; 3196 break;
3144 3197
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3199 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3150 break; 3203 break;
3151 3204
3152 /* 3205 /*
3153 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3154 */ 3207 */
3155 case 11: /* report window state */ 3208 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3211 break;
3159 case 13: /* report window position */ 3212 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3218 break;
3166 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3222 break;
3170 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3225 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3228 break;
3176 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3177 { 3230 {
3178 char *s; 3231 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3233 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3234 XFree (s);
3182 } 3235 }
3183 break; 3236 break;
3184 case 21: /* report window title */ 3237 case 21: /* report window title */
3185 { 3238 {
3186 char *s; 3239 char *s;
3187 XFetchName (dpy, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3241 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3242 XFree (s);
3190 } 3243 }
3191 break; 3244 break;
3192 } 3245 }
… …
3202rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3203{ 3256{
3204 unicode_t ch; 3257 unicode_t ch;
3205 bool seen_esc = false; 3258 bool seen_esc = false;
3206 unsigned int n = 0; 3259 unsigned int n = 0;
3207 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3208 3261
3209 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3210 { 3263 {
3211 if (seen_esc) 3264 if (seen_esc)
3212 { 3265 {
… …
3227 else if (ch < 0x20) 3280 else if (ch < 0x20)
3228 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3229 3282
3230 seen_esc = false; 3283 seen_esc = false;
3231 3284
3232 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3233 // stop at some sane length 3286 // stop at some sane length
3234 return NULL; 3287 return NULL;
3235 3288
3236 string[n++] = ch; 3289 string[n++] = ch;
3237 } 3290 }
… …
3346 unsigned long bytes_after; 3399 unsigned long bytes_after;
3347 unsigned char *value = 0; 3400 unsigned char *value = 0;
3348 const char *str = ""; 3401 const char *str = "";
3349 3402
3350 if (prop 3403 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3408 && actual_type != None
3356 && actual_format == 8) 3409 && actual_format == 8)
3357 str = (const char *)(value); 3410 str = (const char *)(value);
3358 3411
3359 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3360 3413
3361 XFree (value); 3414 XFree (value);
3362 } 3415 }
3363 else 3416 else
3364 { 3417 {
… …
3368 { 3421 {
3369 *eq = 0; 3422 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3371 } 3424 }
3372 else 3425 else
3373 XDeleteProperty (dpy, parent[0], 3426 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3427 display->atom (str));
3375 } 3428 }
3376 break; 3429 break;
3377 3430
3378 case XTerm_Color: 3431 case XTerm_Color:
… …
3432 break; 3485 break;
3433#endif 3486#endif
3434 case URxvt_Color_border: 3487 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp); 3488 process_color_seq (op, Color_border, str, resp);
3436 break; 3489 break;
3437#if ENABLE_TRANSPARENCY 3490
3491#if BG_IMAGE_FROM_ROOT
3438 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3440 { 3494 {
3441 bool changed = false; 3495 bool changed = false;
3442 3496
3443 if (ISSET_PIXCOLOR (Color_tint)) 3497 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3498 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3499
3448 if (changed) 3500 if (changed)
3449 update_background (); 3501 update_background ();
3450 } 3502 }
3451 3503
… …
3455#if BG_IMAGE_FROM_FILE 3507#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3509 if (!strcmp (str, "?"))
3458 { 3510 {
3459 char str[256]; 3511 char str[256];
3512 int h_scale = fimage.h_scale;
3513 int v_scale = fimage.v_scale;
3514 int h_align = fimage.h_align;
3515 int v_align = fimage.v_align;
3460 3516
3461 sprintf (str, "[%dx%d+%d+%d]", 3517 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3518 h_scale, v_scale,
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3519 h_align, v_align);
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3520 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3521 }
3466 else 3522 else
3467 { 3523 {
3468 int changed = 0; 3524 bool changed = false;
3469 3525
3470 if (*str != ';') 3526 if (*str != ';')
3471 { 3527 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3528 try
3473 { 3529 {
3530 fimage.set_file_geometry (this, str);
3474 changed++; 3531 changed = true;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bgPixmap.set_defaultGeometry ();
3478 else 3532 }
3479 bgPixmap.set_geometry (str+1); 3533 catch (const class rxvt_failure_exception &e)
3534 {
3480 } 3535 }
3481 } 3536 }
3482 else 3537 else
3483 { 3538 {
3484 str++; 3539 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3540 if (fimage.set_geometry (str, true))
3486 changed++; 3541 changed = true;
3487 } 3542 }
3488 3543
3489 if (changed) 3544 if (changed)
3490 { 3545 {
3491 if (bgPixmap.window_position_sensitive ()) 3546 if (bg_window_position_sensitive ())
3492 { 3547 {
3493 int x, y; 3548 int x, y;
3494 get_window_origin (x, y); 3549 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3550 parent_x = x;
3551 parent_y = y;
3496 } 3552 }
3497 update_background (); 3553 update_background ();
3498 } 3554 }
3499 } 3555 }
3500 break; 3556 break;
… …
3590 * 's' = save 3646 * 's' = save
3591 * 'r' = restore 3647 * 'r' = restore
3592 * 't' = toggle 3648 * 't' = toggle
3593 * so no need for fancy checking 3649 * so no need for fancy checking
3594 */ 3650 */
3595int 3651int ecb_cold
3596rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
3597{ 3653{
3598 int state; 3654 int state;
3599 3655
3600 if (mode == 's') 3656 if (mode == 's')
3601 { 3657 {
3602 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
3603 return -1; 3662 return -1;
3604 } 3663 }
3605 else 3664 else
3606 { 3665 {
3607 if (mode == 'r') 3666 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3668 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3670
3612 set_privmode (bit, state); 3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
3613 } 3675 }
3614 3676
3615 return state; 3677 return state;
3616} 3678}
3617 3679
3618/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
3619void 3681void
3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3682rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621{ 3683{
3622 unsigned int i, j; 3684 unsigned int i, j;
3623 int state; 3685 int state;
3624 3686
3625 static const struct 3687 static const struct
3626 { 3688 {
3627 const int argval; 3689 const int argval;
3628 const unsigned long bit; 3690 const unsigned long bit;
3629 } argtopriv[] = { 3691 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3692 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3694 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3696 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3697 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3698 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3699 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3701 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3702 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3706#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3708 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3711 // 45 margin bell NYI
3650 // 46 start logging 3712 // 46 start logging
3651 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3714 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3716 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3717#endif
3656 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3719 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3720 { 1003, PrivMode_MouseAnyEvent },
3721#if ENABLE_FRILLS
3722 { 1005, PrivMode_ExtModeMouse },
3723#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3725 { 1011, PrivMode_Keypress }, // rxvt extension
3726#if ENABLE_FRILLS
3727 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3728#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3733 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3734 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3735 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3736 { 2004, PrivMode_BracketPaste },
3669 }; 3737 };
3670 3738
… …
3680 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
3681 { 3749 {
3682 state = -1; 3750 state = -1;
3683 3751
3684 /* basic handling */ 3752 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
3687 { 3755 {
3688 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
3689 break; 3757 break;
3690 } 3758 }
… …
3716 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
3717 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
3718 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
3719 * within VT52 mode 3787 * within VT52 mode
3720 */ 3788 */
3721 set_privmode (PrivMode_vt52, 1); 3789 priv_modes |= PrivMode_vt52;
3722 break; 3790 break;
3723 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
3724 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3726 break; 3794 break;
… …
3741 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3743 break; 3811 break;
3744#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
3745 case scrollBar_esc: 3813 case scrollBar_esc:
3746 if (scrollBar.map (state)) 3814 scrollBar.map (state);
3747 {
3748 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
3749 scr_touch (true); 3816 scr_touch (true);
3750 }
3751 break; 3817 break;
3752#endif 3818#endif
3753 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
3754 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
3755 break; 3821 break;
… …
3768 case 1003: 3834 case 1003:
3769 if (state) 3835 if (state)
3770 { 3836 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3837 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3838 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3839 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3840 vt_emask_mouse = PointerMotionMask;
3774 } 3841 }
3775 else 3842 else
3776 vt_emask_mouse = NoEventMask; 3843 vt_emask_mouse = NoEventMask;
3777 3844
… …
3809 } 3876 }
3810} 3877}
3811/*}}} */ 3878/*}}} */
3812 3879
3813/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
3814void 3881void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3883{
3817 unsigned int i; 3884 unsigned int i;
3818 short rendset; 3885 short rendset;
3819 int rendstyle; 3886 int rendstyle;
… …
3960 break; 4027 break;
3961#endif 4028#endif
3962 } 4029 }
3963 } 4030 }
3964} 4031}
3965/*}}} */
3966 4032
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void 4033void
3969rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
3970{ 4035{
3971 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return; 4037 return;
3978 } 4038
3979 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
3980 do 4040
3981 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
3982 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
3983} 4047}
3984/*}}} */ 4048/*}}} */
3985 4049
3986/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
3987 4051
… …
4003 4067
4004/* ---------------------------------------------------------------------- */ 4068/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user, pasted with the mouse,
4006 * or generated by us in response to a query ESC sequence. 4070 * or generated by us in response to a query ESC sequence.
4007 */ 4071 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 4073
4010void 4074void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4076{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4018 4082
4019 if (v_buflen == 0) 4083 if (v_buflen == 0)
4020 { 4084 {
4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4085 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022 4086
4087 max_it (written, 0);
4088
4023 if ((unsigned int)written == len) 4089 if (written == len)
4024 return; 4090 return;
4025 4091
4026 data += written; 4092 data += written;
4027 len -= written; 4093 len -= written;
4028 } 4094 }
4029 4095
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4097
4032 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4099 v_buflen += len;
4034 4100
4035 pty_ev.set (ev::READ | ev::WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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