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.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC vs.
Revision 1.549 by root, Sun May 11 06:38:39 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 + 1];
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 (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
490#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 710 return;
493#endif 711#endif
494 712
495 if (saveLines) 713 if (saveLines)
496 { 714 {
… …
509#endif 727#endif
510 max_it (lnsppg, 1); 728 max_it (lnsppg, 1);
511 729
512 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
513 { 731 {
514 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
515 return; 733 return;
516 } 734 }
517 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
518 { 736 {
519 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
520 return; 738 return;
521 } 739 }
522 } 740 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
525 { 743 {
526 if (keysym == XK_Up) 744 if (keysym == XK_Up)
527 { 745 {
528 scr_page (UP, 1); 746 scr_page (1);
529 return; 747 return;
530 } 748 }
531 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
532 { 750 {
533 scr_page (DN, 1); 751 scr_page (-1);
534 return; 752 return;
535 } 753 }
536 } 754 }
537#endif 755#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
540 { 758 {
541 if (keysym == XK_Home) 759 if (keysym == XK_Home)
542 { 760 {
543 scr_move_to (0, 1); 761 scr_changeview (top_row);
544 return; 762 return;
545 } 763 }
546 else if (keysym == XK_End) 764 else if (keysym == XK_End)
547 { 765 {
548 scr_move_to (1, 1); 766 scr_changeview (0);
549 return; 767 return;
550 } 768 }
551 } 769 }
552#endif 770#endif
553 } 771 }
… …
569 selection_request (ev.time); 787 selection_request (ev.time);
570 return; 788 return;
571#if TODO 789#if TODO
572 /* rxvt extras */ 790 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 792 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 794 return;
579#endif 795#endif
580 } 796 }
581 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
582 } 813 }
583 814
584#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 816 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 872 {
642 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
643 return; 874 return;
644 } 875 }
645#endif 876#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 switch (translate_keypad (keysym, kp))
655 {
656#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace)
659 {
660 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
661 ^ !!ctrl) ? '\b' : '\177';
662 kbuf[1] = '\0';
663 }
664 else
665 strcpy (kbuf, rs[Rs_backspace_key]);
666 break;
667#endif
668#ifndef NO_DELETE_KEY
669 case XK_Delete:
670 strcpy (kbuf, rs[Rs_delete_key]);
671 break;
672#endif
673 case XK_Tab:
674 if (shft)
675 strcpy (kbuf, "\033[Z");
676 else
677 {
678#ifdef CTRL_TAB_MAKES_META
679 if (ctrl)
680 meta = 1;
681#endif
682#ifdef MOD4_TAB_MAKES_META
683 if (ev.state & Mod4Mask)
684 meta = 1;
685#endif
686 newlen = 0;
687 }
688 break;
689
690 case XK_Up: /* "\033[A" */
691 case XK_Down: /* "\033[B" */
692 case XK_Right: /* "\033[C" */
693 case XK_Left: /* "\033[D" */
694 strcpy (kbuf, "\033[Z");
695 kbuf[2] = "DACB"[keysym - XK_Left];
696 /* do Shift first */
697 if (shft)
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 else if (ctrl)
700 {
701 kbuf[1] = 'O';
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 }
704 else if (priv_modes & PrivMode_aplCUR)
705 kbuf[1] = 'O';
706 break;
707
708 case XK_KP_Enter:
709 /* allow shift to override */
710 if (kp)
711 {
712 strcpy (kbuf, "\033OM");
713 break;
714 }
715
716 /* FALLTHROUGH */
717
718 case XK_Return:
719 if (priv_modes & PrivMode_LFNL)
720 {
721 kbuf[0] = '\015';
722 kbuf[1] = '\012';
723 kbuf[2] = '\0';
724 }
725 else
726 {
727 kbuf[0] = '\015';
728 kbuf[1] = '\0';
729 }
730 break;
731
732 case XK_KP_F1: /* "\033OP" */
733 case XK_KP_F2: /* "\033OQ" */
734 case XK_KP_F3: /* "\033OR" */
735 case XK_KP_F4: /* "\033OS" */
736 strcpy (kbuf, "\033OP");
737 kbuf[2] += (keysym - XK_KP_F1);
738 break;
739
740 case XK_KP_Multiply: /* "\033Oj" : "*" */
741 case XK_KP_Add: /* "\033Ok" : "+" */
742 case XK_KP_Separator: /* "\033Ol" : "," */
743 case XK_KP_Subtract: /* "\033Om" : "-" */
744 case XK_KP_Decimal: /* "\033On" : "." */
745 case XK_KP_Divide: /* "\033Oo" : "/" */
746 case XK_KP_0: /* "\033Op" : "0" */
747 case XK_KP_1: /* "\033Oq" : "1" */
748 case XK_KP_2: /* "\033Or" : "2" */
749 case XK_KP_3: /* "\033Os" : "3" */
750 case XK_KP_4: /* "\033Ot" : "4" */
751 case XK_KP_5: /* "\033Ou" : "5" */
752 case XK_KP_6: /* "\033Ov" : "6" */
753 case XK_KP_7: /* "\033Ow" : "7" */
754 case XK_KP_8: /* "\033Ox" : "8" */
755 case XK_KP_9: /* "\033Oy" : "9" */
756 /* allow shift to override */
757 if (kp)
758 {
759 strcpy (kbuf, "\033Oj");
760 kbuf[2] += (keysym - XK_KP_Multiply);
761 }
762 else
763 {
764 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
765 kbuf[1] = '\0';
766 }
767 break;
768
769 default:
770 {
771 int param = map_function_key (keysym);
772 if (param > 0)
773 sprintf (kbuf,"\033[%d~", param);
774 else
775 newlen = 0;
776 }
777 break;
778 }
779
780 if (newlen)
781 len = strlen (kbuf);
782
783 /*
784 * Pass meta for all function keys, if 'meta' option set
785 */
786#ifdef META8_OPTION
787 if (meta && (meta_char == 0x80) && len > 0)
788 kbuf[len - 1] |= 0x80;
789#endif
790
791 }
792 else if (ctrl && keysym == XK_minus)
793 {
794 len = 1;
795 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
796 }
797 else if (keysym == XK_ISO_Left_Tab)
798 {
799 strcpy (kbuf, "\033[Z");
800 len = 3;
801 }
802 else
803 {
804#ifdef META8_OPTION
805 /* set 8-bit on */
806 if (meta && (meta_char == 0x80))
807 {
808 char *ch;
809
810 for (ch = kbuf; ch < kbuf + len; ch++)
811 *ch |= 0x80;
812
813 meta = 0;
814 }
815#endif
816 /* nil */ ;
817 }
818 } 877 }
819
820 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
821 return;
822 878
823 if (len <= 0) 879 if (len <= 0)
824 return; /* not mapped */ 880 return; /* not mapped */
825 881
826 if (option (Opt_scrollTtyKeypress))
827 if (view_start)
828 {
829 view_start = 0;
830 want_refresh = 1;
831 }
832
833 /*
834 * these modifications only affect the static keybuffer
835 * pass Shift/Control indicators for function keys ending with `~'
836 *
837 * eg,
838 * Prior = "ESC[5~"
839 * Shift+Prior = "ESC[5$"
840 * Ctrl+Prior = "ESC[5^"
841 * Ctrl+Shift+Prior = "ESC[5@"
842 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
843 */
844 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
845 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
846
847 /* escape prefix */
848 if (meta
849#ifdef META8_OPTION
850 && meta_char == C0_ESC
851#endif
852 )
853 {
854 const char ch = C0_ESC;
855 tt_write (&ch, 1);
856 }
857
858 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
859} 883}
860 884
861void 885void ecb_cold
862rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
863{ 887{
864#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
865 KeySym keysym; 889 KeySym keysym;
866 890
… …
886 commit_iso14755 (); 910 commit_iso14755 ();
887 911
888 return; 912 return;
889 } 913 }
890 914
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
892 if (i[0] == keysym) 916 if (i[0] == keysym)
893 { 917 {
894 iso14755buf = ISO_14755_51 | i[1]; 918 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 (); 919 commit_iso14755 ();
896 920
… …
933 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
935#endif 959#endif
936} 960}
937 961
938#if defined (KEYSYM_RESOURCE)
939unsigned int
940rxvt_term::cmd_write (const char *str, unsigned int count)
941{
942 unsigned int n, s;
943
944 n = cmdbuf_ptr - cmdbuf_base;
945 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
946
947 if (n > 0 && s < count)
948 {
949 memmove (cmdbuf_base, cmdbuf_ptr,
950 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
951 cmdbuf_ptr = cmdbuf_base;
952 cmdbuf_endp -= n;
953 s += n;
954 }
955
956 if (count > s)
957 {
958 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
959 count = s;
960 }
961
962 for (; count--;)
963 *cmdbuf_endp++ = *str++;
964
965 cmd_parse ();
966
967 return 0;
968}
969#endif
970
971void 962void
972rxvt_term::flush () 963rxvt_term::flush ()
973{ 964{
974 flush_ev.stop (); 965 flush_ev.stop ();
975 966
976#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
977 if (bgPixmap.check_clearChanged ()) 968 if (bg_flags & BG_NEEDS_REFRESH)
978 { 969 {
979// scr_clear (true); This needs to be researched further! 970 bg_flags &= ~BG_NEEDS_REFRESH;
980 scr_touch (false); 971 scr_touch (false);
981 } 972 }
982#endif 973#endif
983 974
984 if (want_refresh) 975 if (want_refresh)
… …
1021 while (row < end_row); 1012 while (row < end_row);
1022 } 1013 }
1023 1014
1024 scr_refresh (); 1015 scr_refresh ();
1025 scrollBar.show (1); 1016 scrollBar.show (1);
1026#ifdef USE_XIM 1017#if USE_XIM
1027 IMSendSpot (); 1018 im_send_spot ();
1028#endif 1019#endif
1029 } 1020 }
1030 1021
1031 display->flush (); 1022 display->flush ();
1032} 1023}
… …
1050 flush (); 1041 flush ();
1051} 1042}
1052 1043
1053#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1054void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1056{ 1062{
1057 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1058 want_refresh = 1; 1064 want_refresh = 1;
1059 refresh_check (); 1065 refresh_check ();
… …
1077 1083
1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1079void 1085void
1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1081{ 1087{
1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1084 { 1090 {
1085 want_refresh = 1; 1091 want_refresh = 1;
1086 refresh_check (); 1092 refresh_check ();
1087 } 1093 }
1088 else 1094 else
… …
1092 1098
1093#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1094void 1100void
1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1096{ 1102{
1097 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1098 { 1104 {
1099 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1100 want_refresh = 1; 1106 want_refresh = 1;
1101 refresh_check (); 1107 refresh_check ();
1102 } 1108 }
… …
1107 1113
1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1109void 1115void
1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1111{ 1117{
1112 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1113 { 1119 {
1114 want_refresh = 1; 1120 want_refresh = 1;
1115 refresh_check (); 1121 refresh_check ();
1116 } 1122 }
1117 1123
… …
1149 { 1155 {
1150 } 1156 }
1151} event_handler; 1157} event_handler;
1152#endif 1158#endif
1153 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1154bool 1193bool
1155rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1156{ 1195{
1157 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1158 1197
1159 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1160 { 1199
1161 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1162 n = 0;
1163 } 1201 {
1164 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1168 1207
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1209
1171 if (r > 0) 1210 if (r > 0)
1172 { 1211 {
1173 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1174 return true; 1213 return true;
… …
1205 pty_write (); 1244 pty_write ();
1206 1245
1207 refresh_check (); 1246 refresh_check ();
1208} 1247}
1209 1248
1210void 1249void ecb_cold
1211rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1212{ 1251{
1213 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1214 recolour_cursor (); 1253 recolour_cursor ();
1215 1254
… …
1220 pointer_ev.start (pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1221#endif 1260#endif
1222} 1261}
1223 1262
1224#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1225void 1264void ecb_cold
1226rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1227{ 1266{
1228 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1229 return; 1268 return;
1230 1269
… …
1232 XFlush (dpy); 1271 XFlush (dpy);
1233 1272
1234 hidden_pointer = 1; 1273 hidden_pointer = 1;
1235} 1274}
1236 1275
1237void 1276void ecb_cold
1238rxvt_term::pointer_cb (ev::timer &w, int revents) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1239{ 1278{
1240 make_current (); 1279 make_current ();
1241 1280
1242 pointer_blank (); 1281 pointer_blank ();
… …
1248{ 1287{
1249 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1250 int x, y; 1289 int x, y;
1251 int code = 32; 1290 int code = 32;
1252 1291
1253 x = Pixel2Col (ev.x); 1292 x = Pixel2Col (ev.x) + 1;
1254 y = Pixel2Row (ev.y); 1293 y = Pixel2Row (ev.y) + 1;
1294
1255 if (ev.type == MotionNotify) 1295 if (ev.type == MotionNotify)
1256 { 1296 {
1257 if (x == mouse_row && y == mouse_col) 1297 if (x == mouse_row && y == mouse_col)
1258 return; 1298 return;
1299
1259 mouse_row = x; 1300 mouse_row = x;
1260 mouse_col = y; 1301 mouse_col = y;
1261 code += 32; 1302 code += 32;
1262 } 1303 }
1263 1304
… …
1266 else 1307 else
1267 { 1308 {
1268 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1311 if (button_number >= 3)
1271 button_number += (64 - 3); 1312 button_number += 64 - 3;
1272 } 1313 }
1273 1314
1274 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1275 { 1316 {
1276 /* 1317 /*
… …
1308 fputc ('A', stderr); 1349 fputc ('A', stderr);
1309 if (key_state & 32) 1350 if (key_state & 32)
1310 fputc ('2', stderr); 1351 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1353 button_number,
1313 x + 1, 1354 x,
1314 y + 1); 1355 y);
1315#endif 1356#endif
1316 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1317 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1372 code + button_number + key_state,
1319 (32 + x + 1), 1373 32 + x,
1320 (32 + y + 1)); 1374 32 + y);
1321} 1375}
1322 1376
1323/*{{{ process an X event */ 1377/*{{{ process an X event */
1324void 1378void ecb_hot
1325rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1326{ 1380{
1327 make_current (); 1381 make_current ();
1328 1382
1329 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1427 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1482 focus_out ();
1429 break; 1483 break;
1430 1484
1431 case ConfigureNotify: 1485 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1436 { 1487 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1489 ;
1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1505 int x, y;
1506
1507 if (ev.xconfigure.send_event)
1508 {
1509 x = ev.xconfigure.x;
1510 y = ev.xconfigure.y;
1511 }
1512 else
1513 get_window_origin (x, y);
1514
1515 if (x != parent_x || y != parent_y)
1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 }
1522 }
1439 1523
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1525 {
1442 seen_resize = 1; 1526 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1528 }
1445 else 1529 else
1446 { 1530 {
1447#ifdef HAVE_BG_PIXMAP 1531#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped) 1532 if (moved)
1451 update_background (); 1533 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif 1534#endif
1456 } 1535 }
1457 1536
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1538 }
1460 break; 1539 break;
1461 1540
1462 case PropertyNotify: 1541 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1543 break;
1469 1544
1470 case SelectionClear: 1545 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1547 break;
1473 1548
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break;
1478
1479 case SelectionRequest: 1549 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1481 break; 1551 break;
1482 1552
1483 case MapNotify: 1553 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1486 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1489 * reparenting. 1559 // events at startup when the window manager reparents the
1490 * We should not render background immidiately, as there could be several 1560 // window, so as to perform the computation after we have
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1561 // received all of them.
1492 * by scheduling background redraw as soon as we can, but giving a short 1562 if (bg_img == 0)
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025); 1563 update_background_ev.start (0.025);
1499#endif 1564#endif
1500 mapped = 1; 1565 mapped = 1;
1501#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1518 { 1583 {
1519 do 1584 do
1520 { 1585 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1588 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1590
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1592
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1594 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1597 }
1533 1598
1534 want_refresh = 1; 1599 want_refresh = 1;
1535 } 1600 }
1536 else 1601 else
… …
1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1543 ; 1608 ;
1544 1609
1545 if (scrollBar.state && ev.xany.window == scrollBar.win) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1546 { 1611 {
1547 scrollBar.state = STATE_IDLE; 1612 scrollBar.state = SB_STATE_IDLE;
1548 scrollBar.show (0); 1613 scrollBar.show (0);
1549 } 1614 }
1550 } 1615 }
1551 break; 1616 break;
1552 1617
… …
1594 1659
1595#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1596 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1597 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1598 { 1663 {
1664 page_dirn scroll_selection_dir;
1599 int dist; 1665 int dist;
1600 1666
1601 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1602 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1603 */ 1669 */
… …
1618 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1619 } 1685 }
1620 else 1686 else
1621 { 1687 {
1622 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1623 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1624 } 1690 }
1625 1691
1626 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1627 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1628 + 1; 1694 + 1;
1629 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1630 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1631 } 1698 }
1632 else 1699 else
1633 { 1700 {
1634 /* we are within the text window, so we 1701 /* we are within the text window, so we
1635 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1640#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1641 } 1708 }
1642#endif 1709#endif
1643 } 1710 }
1644 } 1711 }
1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1713 {
1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1649 ; 1716 ;
1650 1717
1651 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1722 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1657 scrollBar.size ()); 1724 scrollBar.size ());
1658 want_refresh = 1; 1725 want_refresh = 1;
1659 scrollBar.show (1); 1726 scrollBar.show (1);
1660 } 1727 }
1661 break; 1728 break;
1662 } 1729 }
1663 1730
1664#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1665 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1666 {
1667 if (hidden_cursor)
1668 {
1669 hidden_cursor = 0;
1670 want_refresh = 1;
1671 }
1672
1673 cursor_blink_ev.again (); 1733 cursor_blink_reset ();
1674 }
1675#endif 1734#endif
1676 1735
1677#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1679 { 1738 {
… …
1690 1749
1691 refresh_check (); 1750 refresh_check ();
1692} 1751}
1693 1752
1694#if ENABLE_FRILLS 1753#if ENABLE_FRILLS
1695void 1754void ecb_cold
1696rxvt_term::set_urgency (bool enable) 1755rxvt_term::set_urgency (bool enable)
1697{ 1756{
1698 if (enable == urgency_hint) 1757 if (enable == urgency_hint)
1699 return; 1758 return;
1700 1759
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1761 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1763 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1764 urgency_hint = enable;
1765 XFree (h);
1706 } 1766 }
1707} 1767}
1708#endif 1768#endif
1709 1769
1710void 1770void ecb_cold
1711rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1712{ 1772{
1713 if (!focus) 1773 if (!focus)
1714 { 1774 {
1715 focus = 1; 1775 focus = 1;
1716 want_refresh = 1; 1776 want_refresh = 1;
1717 1777
1718#if USE_XIM 1778#if USE_XIM
1719 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1720 { 1780 {
1721 IMSetPosition (); 1781 im_set_position ();
1722 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1723 } 1783 }
1724#endif 1784#endif
1725#if CURSOR_BLINK 1785#if CURSOR_BLINK
1726 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
… …
1740 1800
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1742 } 1802 }
1743} 1803}
1744 1804
1745void 1805void ecb_cold
1746rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1747{ 1807{
1748 if (focus) 1808 if (focus)
1749 { 1809 {
1750 focus = 0; 1810 focus = 0;
… …
1783 1843
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785 } 1845 }
1786} 1846}
1787 1847
1788void 1848void ecb_cold
1789rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1790{ 1850{
1791#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1793 { 1853 {
… …
1796 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1797 } 1857 }
1798#endif 1858#endif
1799} 1859}
1800 1860
1801#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1802void 1862void ecb_hot
1803rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1804{ 1864{
1805 make_current (); 1865 make_current ();
1806 1866
1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1809 return; 1869 return;
1810 1870
1811# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1871 switch (ev.type)
1813 { 1872 {
1814 case PropertyNotify: 1873 case PropertyNotify:
1815 /* 1874 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1818 */ 1877 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1880 {
1822 bgPixmap.set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1823 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1824 } 1889 }
1825 1890
1826 break; 1891 break;
1827 } 1892 }
1828# endif
1829 1893
1830 refresh_check (); 1894 refresh_check ();
1831} 1895}
1832#endif 1896#endif
1833 1897
… …
1866 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1870 { 1934 {
1871 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1872 MEvent.clicks++; 1936 MEvent.clicks++;
1873 1937
1874 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1875 { 1939 {
1876 /* only report double clicks */ 1940 /* only report double clicks */
… …
1957 if (scrollBar.upButton (ev.y)) 2021 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */ 2022 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y)) 2023 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */ 2024 direction = DN; /* down */
1961 2025
1962 scrollBar.state = STATE_IDLE; 2026 scrollBar.state = SB_STATE_IDLE;
1963 /* 2027 /*
1964 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 2029 * move up if mouse is above slider
1966 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1967 * 2031 *
… …
2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2071#endif
2008 if (scr_page (direction, 1)) 2072 if (scr_page (direction, 1))
2009 { 2073 {
2010 if (direction == UP) 2074 if (direction == UP)
2011 scrollBar.state = STATE_UP; 2075 scrollBar.state = SB_STATE_UP;
2012 else 2076 else
2013 scrollBar.state = STATE_DOWN; 2077 scrollBar.state = SB_STATE_DOWN;
2014 } 2078 }
2015 } 2079 }
2016 else 2080 else
2017 switch (ev.button) 2081 switch (ev.button)
2018 { 2082 {
2019 case Button2: 2083 case Button2:
2020 switch (scrollBar.align) 2084 switch (scrollBar.align)
2021 { 2085 {
2022 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2023 csrO = 0; 2087 csrO = 0;
2024 break; 2088 break;
2025 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2091 break;
2028 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2094 break;
2031 } 2095 }
2032 2096
2033 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2101
2038 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2039 break; 2103 break;
2040 2104
2041 case Button1: 2105 case Button1:
2042 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2045 2109
2046 case Button3: 2110 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2112 {
2049 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2052# else 2116# else
2053 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2054# endif 2118# endif
2055 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2058# else 2122# else
2059 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2060# endif 2124# endif
2061 else 2125 else
2062 scrollBar.state = STATE_MOTION; 2126 scrollBar.state = SB_STATE_MOTION;
2063 } 2127 }
2064 else 2128 else
2065 { 2129 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2131 (nrow
2068 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2069 / scrollBar.size ())); 2133 / scrollBar.size ()));
2070 } 2134 }
2071 2135
2072 break; 2136 break;
2073 } 2137 }
… …
2084 2148
2085 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2150 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2152
2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2154 {
2091 scrollBar.state = STATE_IDLE; 2155 scrollBar.state = SB_STATE_IDLE;
2092 scrollBar.show (0); 2156 scrollBar.show (0);
2093 } 2157 }
2094 2158
2095#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2096 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
… …
2146 case Button3: 2210 case Button3:
2147 selection_make (ev.time); 2211 selection_make (ev.time);
2148 break; 2212 break;
2149 2213
2150 case Button2: 2214 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2217 break;
2154 2218
2155#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2156 case Button4: 2220 case Button4:
2157 case Button5: 2221 case Button5:
2158 { 2222 {
2159 int i; 2223 int lines;
2160 page_dirn v; 2224 page_dirn dirn;
2161 2225
2162 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2163 2227
2164 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2165 i = 1; 2229 lines = 1;
2166 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2167 i = nrow - 1; 2231 lines = nrow - 1;
2168 else 2232 else
2169 i = 5; 2233 lines = 5;
2170 2234
2171# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2172 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2173 { 2237 {
2174 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2177 2240
2178 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2180 } 2243 }
2181 else 2244 else
2182# endif 2245# endif
2183 { 2246 {
2184 scr_page (v, i); 2247 scr_page (dirn, lines);
2185 scrollBar.show (1); 2248 scrollBar.show (1);
2186 } 2249 }
2187 } 2250 }
2188 break; 2251 break;
2189#endif 2252#endif
… …
2191 } 2254 }
2192} 2255}
2193 2256
2194/*}}} */ 2257/*}}} */
2195 2258
2196void 2259void ecb_hot
2197rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2198{ 2261{
2199 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2200 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2201 2264
2202 for (;;) 2265 for (;;)
2203 { 2266 {
2204 if (expect_false (ch == NOCHAR)) 2267 if (ecb_unlikely (ch == NOCHAR))
2205 { 2268 {
2206 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2207 ch = next_char (); 2270 ch = next_char ();
2208 2271
2209 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2210 break; 2273 break;
2211 } 2274 }
2212 2275
2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2214 { 2277 {
2215 if (expect_false (!seen_input)) 2278 if (ecb_unlikely (!seen_input))
2216 { 2279 {
2217 seen_input = 1; 2280 seen_input = 1;
2218 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2219 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2220 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2233 wchar_t *str = buf; 2296 wchar_t *str = buf;
2234 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2235 2298
2236 for (;;) 2299 for (;;)
2237 { 2300 {
2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2239 break; 2302 break;
2240 2303
2241 *str++ = ch; 2304 *str++ = ch;
2242 2305
2243 if (expect_false (ch == C0_LF || str >= eol)) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2244 { 2307 {
2245 if (ch == C0_LF) 2308 if (ch == C0_LF)
2246 nlines++; 2309 nlines++;
2247 2310
2248 refresh_count++; 2311 refresh_count++;
… …
2320 } 2383 }
2321 } 2384 }
2322} 2385}
2323 2386
2324// read the next character 2387// read the next character
2325wchar_t 2388wchar_t ecb_hot
2326rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2327{ 2390{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2392 {
2330 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2333 2396
2334 wchar_t wc; 2397 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2399
… …
2342 } 2405 }
2343 2406
2344 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2345 { 2408 {
2346 mbstate.reset (); // reset now undefined conversion state 2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 } 2413 }
2349 2414
2350 // assume wchar == unicode 2415 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
… …
2354 2419
2355 return NOCHAR; 2420 return NOCHAR;
2356} 2421}
2357 2422
2358// read the next octet 2423// read the next octet
2359uint32_t 2424uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2361{ 2426{
2362 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2429 : NOCHAR;
2365} 2430}
2366 2431
2367static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2368 2433
2369/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2436{
2377 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2378 2438
2379 if (c == NOCHAR) 2439 if (c == NOCHAR)
2380 throw out_of_input; 2440 throw out_of_input;
2381 2441
2382 return c; 2442 return c;
2383} 2443}
2384 2444
2385uint32_t 2445uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2447{
2388 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2389 2449
2390 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2394} 2454}
2395 2455
2396/*{{{ print pipe */ 2456/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2399FILE * 2459FILE * ecb_cold
2400rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2401{ 2461{
2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2463
2404 if (stream == NULL) 2464 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2466
2407 return stream; 2467 return stream;
2408} 2468}
2409 2469
2410int 2470int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2412{ 2472{
2413 fflush (stream); 2473 fflush (stream);
2414 return pclose (stream); 2474 return pclose (stream);
2415} 2475}
2416 2476
2417/* 2477/*
2418 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2419 */ 2479 */
2420void 2480void ecb_cold
2421rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2422{ 2482{
2423 FILE *fd = popen_printer (); 2483 FILE *fd = popen_printer ();
2424 2484
2425 if (!fd) 2485 if (!fd)
… …
2471 pclose_printer (fd); 2531 pclose_printer (fd);
2472} 2532}
2473#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2474/*}}} */ 2534/*}}} */
2475 2535
2476/* *INDENT-OFF* */
2477enum { 2536enum {
2478 C1_40 = 0x40, 2537 C1_40 = 0x40,
2479 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2480 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2481 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2482 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2483}; 2542};
2484/* *INDENT-ON* */
2485 2543
2486/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2487void 2545void ecb_hot
2488rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2547{
2490 switch (ch) 2548 switch (ch)
2491 { 2549 {
2492 case C0_ESC: 2550 case C0_ESC:
… …
2538} 2596}
2539/*}}} */ 2597/*}}} */
2540 2598
2541 2599
2542/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2543void 2601void ecb_cold
2544rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2545{ 2603{
2546 int row, col; 2604 int row, col;
2547 2605
2548 switch (ch) 2606 switch (ch)
… …
2582 break; 2640 break;
2583 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2643 break;
2586 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2587 set_privmode (PrivMode_vt52, 0); 2645 priv_modes &= ~PrivMode_vt52;
2588 break; 2646 break;
2589 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2591 /* unimplemented */ 2649 /* unimplemented */
2592 break; 2650 break;
… …
2598} 2656}
2599/*}}} */ 2657/*}}} */
2600 2658
2601 2659
2602/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2603void 2661void ecb_hot
2604rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2605{ 2663{
2606 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2607 2665
2608 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2611 return; 2669 return;
2612 } 2670 }
2613 2671
2614 switch (ch) 2672 switch (ch)
2615 { 2673 {
2616 /* case 1: do_tek_mode (); break; */
2617 case '#': 2674 case '#':
2618 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2619 scr_E (); 2676 scr_E ();
2620 break; 2677 break;
2621 case '(': 2678 case '(':
… …
2644#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
2645 case '9': 2702 case '9':
2646 scr_forwardindex (); 2703 scr_forwardindex ();
2647 break; 2704 break;
2648#endif 2705#endif
2706 // DECPAM/DECPNM
2649 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2650 case '>': 2710 case '>':
2651 set_privmode (PrivMode_aplKP, ch == '='); 2711 priv_modes &= ~PrivMode_aplKP;
2652 break; 2712 break;
2653 2713
2654 case C1_40: 2714 case C1_40:
2655 cmd_getc (); 2715 cmd_getc ();
2656 break; 2716 break;
… …
2660 2720
2661 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
2663 { 2723 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2666 } 2726 }
2667 break; 2727 break;
2668 2728
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
2671 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2672 break; 2734 break;
2673 2735
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2738 scr_set_tab (1);
… …
2680 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
2681 scr_index (DN); 2743 scr_index (DN);
2682 break; 2744 break;
2683 2745
2684 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
2685 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
2686 2748
2687 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
2688 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
2689 2751
2690 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
2691 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
2692 process_dcs_seq (); 2754 process_dcs_seq ();
2693 break; 2755 break;
… …
2726 } 2788 }
2727} 2789}
2728/*}}} */ 2790/*}}} */
2729 2791
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2793enum {
2733 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
2734 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2735 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2736 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2803};
2743 2804
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2810
2750const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
2751 { 2812 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2756 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2757 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2758 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2759 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2760 }; 2821 };
2761/* *INDENT-ON* */
2762 2822
2763void 2823void ecb_hot
2764rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2765{ 2825{
2766 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2767 unsigned int nargs, p; 2827 unsigned int nargs, p;
2768 int n, ndef; 2828 int n, ndef;
2769 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2770 2830
2771 nargs = 0; 2831 nargs = 0;
… …
2777 /* '<' '=' '>' '?' '!' */ 2837 /* '<' '=' '>' '?' '!' */
2778 priv = ch; 2838 priv = ch;
2779 ch = cmd_getc (); 2839 ch = cmd_getc ();
2780 } 2840 }
2781 2841
2842 prev_ch = 0;
2782 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2783 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2784 { 2845 {
2785 if (isdigit (ch)) 2846 if (isdigit (ch))
2786 { 2847 {
… …
2796 n = -1; 2857 n = -1;
2797 } 2858 }
2798 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2799 process_nonprinting (ch); 2860 process_nonprinting (ch);
2800 2861
2862 prev_ch = ch;
2801 ch = cmd_getc (); 2863 ch = cmd_getc ();
2802 } 2864 }
2803 2865
2804 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2805 return; 2867 return;
… …
2844 { 2906 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2908 scr_soft_reset ();
2847 2909
2848 static const int pm_h[] = { 7, 25 }; 2910 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2912
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2915 }
2854 break; 2916 break;
2855 } 2917 }
2856 2918
2857 return; 2919 return;
… …
2875 } 2937 }
2876 break; 2938 break;
2877#endif 2939#endif
2878 2940
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2948 break;
2887 2949
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3039 scr_insert_mode (1); 3101 scr_insert_mode (1);
3040 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3042 break; 3104 break;
3043 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3044 /* 3111 /*
3045 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3046 */ 3113 */
3047 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3048 if (nargs == 1) 3115 if (nargs == 1)
… …
3076 } 3143 }
3077} 3144}
3078/*}}} */ 3145/*}}} */
3079 3146
3080#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3148void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3150{
3085 int x, y; 3151 int x, y;
3086 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3095 { 3161 {
3096 /* 3162 /*
3097 * commands 3163 * commands
3098 */ 3164 */
3099 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3101 break; 3167 break;
3102 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3170 break;
3105 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3173 break;
3108 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3176 break;
3111 case 5: /* raise window */ 3177 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3113 break; 3179 break;
3114 case 6: /* lower window */ 3180 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3116 break; 3182 break;
3117 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3118 scr_touch (true); 3184 scr_touch (true);
3119 break; 3185 break;
3120 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3123 break; 3189 break;
3124 3190
3125 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3126 default: 3192 default:
3127 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3128 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3129 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3130 break; 3196 break;
3131 3197
3132 /* 3198 /*
3133 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3134 */ 3200 */
3135 case 11: /* report window state */ 3201 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3204 break;
3139 case 13: /* report window position */ 3205 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3211 break;
3146 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3215 break;
3150 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3218 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3221 break;
3156 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3157 { 3223 {
3158 char *s; 3224 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3227 XFree (s);
3162 } 3228 }
3163 break; 3229 break;
3164 case 21: /* report window title */ 3230 case 21: /* report window title */
3165 { 3231 {
3166 char *s; 3232 char *s;
3167 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3235 XFree (s);
3170 } 3236 }
3171 break; 3237 break;
3172 } 3238 }
… …
3182rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3183{ 3249{
3184 unicode_t ch; 3250 unicode_t ch;
3185 bool seen_esc = false; 3251 bool seen_esc = false;
3186 unsigned int n = 0; 3252 unsigned int n = 0;
3187 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3188 3254
3189 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3190 { 3256 {
3191 if (seen_esc) 3257 if (seen_esc)
3192 { 3258 {
… …
3207 else if (ch < 0x20) 3273 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3209 3275
3210 seen_esc = false; 3276 seen_esc = false;
3211 3277
3212 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3213 // stop at some sane length 3279 // stop at some sane length
3214 return NULL; 3280 return NULL;
3215 3281
3216 string[n++] = ch; 3282 string[n++] = ch;
3217 } 3283 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3294 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3295 */
3230void 3296void
3231rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3232{ 3298{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3299 /*
3237 * Not handled yet 3300 * Not handled yet
3238 */ 3301 */
3302
3303 unicode_t eh;
3239 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3240 if (s) 3305 if (s)
3241 free (s); 3306 free (s);
3242 3307
3243 return; 3308 return;
3244} 3309}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3314 */
3250void 3315void
3251rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3252{ 3317{
3253 unicode_t ch, eh;
3254 int arg; 3318 int arg;
3255 3319
3256 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3259 3323
3260 if (ch == ';') 3324 if (ch == ';')
3261 { 3325 {
3326 unicode_t eh;
3262 char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3263 3328
3264 if (s) 3329 if (s)
3265 { 3330 {
3266 process_xterm_seq (arg, s, eh); 3331 process_xterm_seq (arg, s, eh);
… …
3327 unsigned long bytes_after; 3392 unsigned long bytes_after;
3328 unsigned char *value = 0; 3393 unsigned char *value = 0;
3329 const char *str = ""; 3394 const char *str = "";
3330 3395
3331 if (prop 3396 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3401 && actual_type != None
3337 && actual_format == 8) 3402 && actual_format == 8)
3338 str = (const char *)(value); 3403 str = (const char *)(value);
3339 3404
3340 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3341 3406
3342 XFree (value); 3407 XFree (value);
3343 } 3408 }
3344 else 3409 else
3345 { 3410 {
… …
3349 { 3414 {
3350 *eq = 0; 3415 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3352 } 3417 }
3353 else 3418 else
3354 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3420 display->atom (str));
3356 } 3421 }
3357 break; 3422 break;
3358 3423
3359 case XTerm_Color: 3424 case XTerm_Color:
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3456 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3457 break;
3393 case XTerm_Color_pointer_bg: 3458 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3459 process_color_seq (op, Color_pointer_bg, str, resp);
3395 break; 3460 break;
3461#ifdef OPTION_HC
3462 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp);
3464 break;
3465 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp);
3467 break;
3468#endif
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3469#ifndef NO_BOLD_UNDERLINE_REVERSE
3397 case XTerm_Color_RV:
3398 process_color_seq (op, Color_RV, str, resp);
3399 break;
3400 case Rxvt_Color_BD:
3401 case URxvt_Color_BD: 3470 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3471 process_color_seq (op, Color_BD, str, resp);
3403 break; 3472 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3473 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3474 process_color_seq (op, Color_UL, str, resp);
3407 break; 3475 break;
3408 case URxvt_Color_IT: 3476 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3477 process_color_seq (op, Color_IT, str, resp);
3410 break; 3478 break;
3411#endif 3479#endif
3412 case URxvt_Color_border: 3480 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp); 3481 process_color_seq (op, Color_border, str, resp);
3414 break; 3482 break;
3415#if ENABLE_TRANSPARENCY 3483
3484#if BG_IMAGE_FROM_ROOT
3416 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3417 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3418 { 3487 {
3419 bool changed = false; 3488 bool changed = false;
3420 3489
3421 if (ISSET_PIXCOLOR (Color_tint)) 3490 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425 3492
3426 if (changed) 3493 if (changed)
3427 update_background (); 3494 update_background ();
3428 } 3495 }
3429 3496
… …
3433#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3434 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3436 { 3503 {
3437 char str[256]; 3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3438 3509
3439 sprintf (str, "[%dx%d+%d+%d]", 3510 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3511 h_scale, v_scale,
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3512 h_align, v_align);
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3514 }
3444 else 3515 else
3445 { 3516 {
3446 int changed = 0; 3517 bool changed = false;
3447 3518
3448 if (*str != ';') 3519 if (*str != ';')
3449 { 3520 {
3450 /* reset to default scaling :*/ 3521 try
3451 bgPixmap.unset_geometry (); 3522 {
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3523 fimage.set_file_geometry (this, str);
3453 changed++; 3524 changed = true;
3454 str = strchr (str, ';'); 3525 }
3455 if (str == NULL) 3526 catch (const class rxvt_failure_exception &e)
3456 bgPixmap.set_defaultGeometry (); 3527 {
3528 }
3457 } 3529 }
3458 3530 else
3459 while (str)
3460 { 3531 {
3461 str++; 3532 str++;
3462 if (bgPixmap.set_geometry (str)) 3533 if (fimage.set_geometry (str, true))
3463 changed++; 3534 changed = true;
3464 str = strchr (str, ';');
3465 } 3535 }
3466 3536
3467 if (changed) 3537 if (changed)
3538 {
3539 if (bg_window_position_sensitive ())
3540 {
3541 int x, y;
3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3468 update_background (); 3546 update_background ();
3547 }
3469 } 3548 }
3470 break; 3549 break;
3471#endif 3550#endif
3472 3551
3473 case XTerm_logfile: 3552 case XTerm_logfile:
… …
3560 * 's' = save 3639 * 's' = save
3561 * 'r' = restore 3640 * 'r' = restore
3562 * 't' = toggle 3641 * 't' = toggle
3563 * so no need for fancy checking 3642 * so no need for fancy checking
3564 */ 3643 */
3565int 3644int ecb_cold
3566rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3567{ 3646{
3568 int state; 3647 int state;
3569 3648
3570 if (mode == 's') 3649 if (mode == 's')
3571 { 3650 {
3572 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3573 return -1; 3655 return -1;
3574 } 3656 }
3575 else 3657 else
3576 { 3658 {
3577 if (mode == 'r') 3659 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3661 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581 set_privmode (bit, state); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3582 } 3668 }
3583 3669
3584 return state; 3670 return state;
3585} 3671}
3586 3672
3587/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3588void 3674void
3589rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3590{ 3676{
3591 unsigned int i, j; 3677 unsigned int i, j;
3592 int state; 3678 int state;
3593 3679
3594 static const struct 3680 static const struct
3595 { 3681 {
3596 const int argval; 3682 const int argval;
3597 const unsigned long bit; 3683 const unsigned long bit;
3598 } argtopriv[] = { 3684 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, // DECCKM 3685 { 1, PrivMode_aplCUR }, // DECCKM
3600 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3601 { 3, PrivMode_132 }, // DECCOLM 3687 { 3, PrivMode_132 }, // DECCOLM
3602 { 4, PrivMode_smoothScroll }, // DECSCLM 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3603 { 5, PrivMode_rVideo }, // DECSCNM 3689 { 5, PrivMode_rVideo }, // DECSCNM
3604 { 6, PrivMode_relOrigin }, // DECOM 3690 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3691 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3692 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3694 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3695 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3699#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK 3701 // 38, tektronix mode // DECTEK
3616 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3617 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3618 // 45 margin bell NYI 3704 // 45 margin bell NYI
3619 // 46 start logging 3705 // 46 start logging
3620 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3707 { 66, PrivMode_aplKP }, // DECNKM
3622#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3623 { 67, PrivMode_BackSpace }, // DECBKM 3709 { 67, PrivMode_BackSpace }, // DECBKM
3624#endif 3710#endif
3625 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3626 { 1002, PrivMode_MouseBtnEvent }, 3712 { 1002, PrivMode_MouseBtnEvent },
3627 { 1003, PrivMode_MouseAnyEvent }, 3713 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
3630 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
3631 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
3632 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
3633 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
3634 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste }, 3729 { 2004, PrivMode_BracketPaste },
3638 }; 3730 };
3639 3731
… …
3649 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3650 { 3742 {
3651 state = -1; 3743 state = -1;
3652 3744
3653 /* basic handling */ 3745 /* basic handling */
3654 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3655 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3656 { 3748 {
3657 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3658 break; 3750 break;
3659 } 3751 }
… …
3685 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3686 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3687 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3688 * within VT52 mode 3780 * within VT52 mode
3689 */ 3781 */
3690 set_privmode (PrivMode_vt52, 1); 3782 priv_modes |= PrivMode_vt52;
3691 break; 3783 break;
3692 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3693 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3695 break; 3787 break;
… …
3710 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3804 break;
3713#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
3714 case scrollBar_esc: 3806 case scrollBar_esc:
3715 if (scrollBar.map (state)) 3807 scrollBar.map (state);
3716 {
3717 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3809 scr_touch (true);
3719 }
3720 break; 3810 break;
3721#endif 3811#endif
3722 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3723 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3724 break; 3814 break;
… …
3737 case 1003: 3827 case 1003:
3738 if (state) 3828 if (state)
3739 { 3829 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3833 vt_emask_mouse = PointerMotionMask;
3743 } 3834 }
3744 else 3835 else
3745 vt_emask_mouse = NoEventMask; 3836 vt_emask_mouse = NoEventMask;
3746 3837
… …
3778 } 3869 }
3779} 3870}
3780/*}}} */ 3871/*}}} */
3781 3872
3782/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3783void 3874void ecb_hot
3784rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3785{ 3876{
3786 unsigned int i; 3877 unsigned int i;
3787 short rendset; 3878 short rendset;
3788 int rendstyle; 3879 int rendstyle;
… …
3929 break; 4020 break;
3930#endif 4021#endif
3931 } 4022 }
3932 } 4023 }
3933} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3934/*}}} */ 4041/*}}} */
3935 4042
3936/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3937void
3938rxvt_term::process_graphics ()
3939{
3940 unicode_t ch, cmd = cmd_getc ();
3941
3942 if (cmd == 'Q')
3943 {
3944 /* query graphics */
3945 tt_printf ("\033G0\012"); /* no graphics */
3946 return;
3947 }
3948 /* swallow other graphics sequences until terminating ':' */
3949 do
3950 ch = cmd_getc ();
3951 while (ch != ':');
3952}
3953/*}}} */
3954
3955/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
3956 4047
3957/* 4048/*
3958 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
3960 */ 4051 */
… …
3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3969 va_end (arg_ptr); 4060 va_end (arg_ptr);
3970 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
3971} 4062}
3972 4063
3973/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
3975 * or generated by us in response to a query ESC sequence. 4065void
3976 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3977const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
3978 4080
3979void 4081void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4083{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return; 4085 return;
3984 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
3985 if (pty->pty < 0) 4095 if (pty->pty < 0)
3986 return; 4096 return;
3987 4097
3988 if (v_buflen == 0) 4098 if (v_buflen == 0)
3989 { 4099 {
3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4100 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3991 4101
4102 max_it (written, 0);
4103
3992 if ((unsigned int)written == len) 4104 if (written == len)
3993 return; 4105 return;
3994 4106
3995 data += written; 4107 data += written;
3996 len -= written; 4108 len -= written;
3997 } 4109 }
3998 4110
3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4111 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4000 4112
4001 memcpy (v_buffer + v_buflen, data, len); 4113 memcpy (v_buffer + v_buflen, data, len);
4002 v_buflen += len; 4114 v_buflen += len;
4003 4115
4004 pty_ev.set (ev::READ | ev::WRITE); 4116 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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