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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.364 by ayin, Mon Nov 12 14:53:13 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
98 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
99 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
100 97
101 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
105 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
106 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
107 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
108 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 143 return;
148 144
149 for (;;) 145 for (;;)
150 { 146 {
151 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
152 148
153 text_t t = l.t[x]; 149 text_t t = l.t[x];
154 150
155 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
156 { 152 {
… …
229# if !UNICODE3 225# if !UNICODE3
230 if (ch >= 0x10000) 226 if (ch >= 0x10000)
231 ch = 0xfffd; 227 ch = 0xfffd;
232# endif 228# endif
233 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
235 } 233 }
236 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
237 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
239 242
240 free (fname); 243 free (fname);
241 244
… …
267 mb[0] = ch[0]; 270 mb[0] = ch[0];
268 len = 1; 271 len = 1;
269 } 272 }
270 273
271 if (len > 0) 274 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
273 else 276 else
274 scr_bell (); 277 scr_bell ();
275 } 278 }
276 279
277 iso14755buf = 0; 280 iso14755buf = 0;
… …
294 297
295 return -1; 298 return -1;
296} 299}
297#endif 300#endif
298 301
299/*{{{ Convert the keypress event into a string */
300void 302void
301rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
302{ 304{
303 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
304 unsigned int newlen; 306 unsigned int newlen;
305 KeySym keysym; 307 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 308 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
311 315
312 /* 316 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
315 * 319 *
… …
333 Status status_return; 337 Status status_return;
334 338
335#if 0 339#if 0
336#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
340 else 344 else
341#endif 345#endif
342#endif 346#endif
343 { 347 {
… …
380 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
381 } 385 }
382 else 386 else
383#endif 387#endif
384 { 388 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
387 } 391 }
388 392
389 if (valid_keysym) 393 if (valid_keysym)
390 { 394 {
… …
442 scr_move_to (0, 1); 446 scr_move_to (0, 1);
443 return; 447 return;
444 } 448 }
445 else if (keysym == XK_End) 449 else if (keysym == XK_End)
446 { 450 {
447 scr_move_to (1, 0); 451 scr_move_to (1, 1);
448 return; 452 return;
449 } 453 }
450 } 454 }
451#endif 455#endif
452 } 456 }
… …
463 { 467 {
464 switch (keysym) 468 switch (keysym)
465 { 469 {
466 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
469 return; 473 return;
470#if TODO 474#if TODO
471 /* rxvt extras */ 475 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
492 { 496 {
493 commit_iso14755 (); 497 commit_iso14755 ();
494 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
495# if ISO_14755 499# if ISO_14755
496 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
497# endif 509# endif
498 return; 510 return;
499 } 511 }
500 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
501 { 513 {
… …
506# endif 518# endif
507 return; 519 return;
508 } 520 }
509 else 521 else
510 { 522 {
511# if ENABLE_OVERLAY 523# if ISO_14755
512 scr_overlay_off (); 524 scr_overlay_off ();
513# endif 525# endif
514 iso14755buf = 0; 526 iso14755buf = 0;
515 } 527 }
516 } 528 }
517 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
518 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
519 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
520 { 532 {
521 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
522# if ENABLE_OVERLAY 534# if ISO_14755
523 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
524 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
525# endif 537# endif
526 } 538 }
527#endif 539#endif
528 540
529#ifdef PRINTPIPE 541#ifdef PRINTPIPE
530 if (keysym == XK_Print) 542 if (keysym == XK_Print)
531 { 543 {
532 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
533 return; 545 return;
… …
535#endif 547#endif
536 548
537 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
538 { 550 {
539 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
540 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
541 switch (keysym) 584 switch (keysym)
542 { 585 {
543#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
544 case XK_BackSpace: 587 case XK_BackSpace:
545 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
547 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
548 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
549 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
550 } 593 }
551 else 594 else
552 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
553 break; 596 break;
554#endif 597#endif
555#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
556# ifdef XK_KP_Prior
557 case XK_KP_Delete:
558 /* allow shift to override */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
560 {
561 strcpy (kbuf, "\033On");
562 break;
563 }
564 /* FALLTHROUGH */
565# endif
566 case XK_Delete: 599 case XK_Delete:
567 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
568 break; 601 break;
569#endif 602#endif
570 case XK_Tab: 603 case XK_Tab:
571 if (shft) 604 if (shft)
572 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
582#endif 615#endif
583 newlen = 0; 616 newlen = 0;
584 } 617 }
585 break; 618 break;
586 619
587#ifdef XK_KP_Left
588 case XK_KP_Up: /* \033Ox or standard */
589 case XK_KP_Down: /* \033Or or standard */
590 case XK_KP_Right: /* \033Ov or standard */
591 case XK_KP_Left: /* \033Ot or standard */
592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
593 {
594 strcpy (kbuf, "\033OZ");
595 kbuf[2] = "txvr"[keysym - XK_KP_Left];
596 break;
597 }
598 else
599 /* translate to std. cursor key */
600 keysym = XK_Left + (keysym - XK_KP_Left);
601 /* FALLTHROUGH */
602#endif
603 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
604 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
605 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
606 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
607 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
617 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
618 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
619 break; 636 break;
620 637
621#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
622# ifdef XK_KP_Prior
623 case XK_KP_Prior:
624 /* allow shift to override */
625 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
626 {
627 strcpy (kbuf, "\033Oy");
628 break;
629 }
630 /* FALLTHROUGH */
631# endif
632 case XK_Prior: 639 case XK_Prior:
633 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
634 break; 641 break;
635# ifdef XK_KP_Next
636 case XK_KP_Next:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Os");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Next: 642 case XK_Next:
646 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
647 break; 644 break;
648#endif 645#endif
649 case XK_KP_Enter: 646 case XK_KP_Enter:
650 /* allow shift to override */ 647 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
652 { 649 {
653 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
654 break; 651 break;
655 } 652 }
656 653
… …
668 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
669 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
670 } 667 }
671 break; 668 break;
672 669
673#ifdef XK_KP_Begin
674 case XK_KP_Begin:
675 strcpy (kbuf, "\033Ou");
676 break;
677
678#endif
679 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
680 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
681 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
682 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
683 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
699 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
700 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
701 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
702 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
703 /* allow shift to override */ 694 /* allow shift to override */
704 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
705 { 696 {
706 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
707 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
708 } 699 }
709 else 700 else
… …
715 706
716 case XK_Find: 707 case XK_Find:
717 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
718 break; 709 break;
719 710
720#ifdef XK_KP_End
721 case XK_KP_Insert:
722 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 {
725 strcpy (kbuf, "\033Op");
726 break;
727 }
728 /* FALLTHROUGH */
729#endif
730 case XK_Insert: 711 case XK_Insert:
731 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
732 break; 713 break;
733#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
734 case DXK_Remove: 715 case DXK_Remove:
… …
738 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
739 break; 720 break;
740 case XK_Select: 721 case XK_Select:
741 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
742 break; 723 break;
743#ifdef XK_KP_End
744 case XK_KP_End:
745 /* allow shift to override */
746 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
747 {
748 strcpy (kbuf, "\033Oq");
749 break;
750 }
751 /* FALLTHROUGH */
752#endif
753 case XK_End: 724 case XK_End:
754 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
755 break; 726 break;
756#ifdef XK_KP_Home
757 case XK_KP_Home:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Ow");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_Home: 727 case XK_Home:
767 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
768 break; 729 break;
769 730
770#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
854 { 815 {
855#ifdef META8_OPTION 816#ifdef META8_OPTION
856 /* set 8-bit on */ 817 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
858 { 819 {
859 unsigned char *ch; 820 char *ch;
860 821
861 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 823 *ch |= 0x80;
863 824
864 meta = 0; 825 meta = 0;
… …
866#endif 827#endif
867 /* nil */ ; 828 /* nil */ ;
868 } 829 }
869 } 830 }
870 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
871 if (len <= 0) 835 if (len <= 0)
872 return; /* not mapped */ 836 return; /* not mapped */
873 837
874 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 839 if (view_start)
876 { 840 {
877 view_start = 0; 841 view_start = 0;
878 want_refresh = 1; 842 want_refresh = 1;
879 } 843 }
… …
897#ifdef META8_OPTION 861#ifdef META8_OPTION
898 && meta_char == C0_ESC 862 && meta_char == C0_ESC
899#endif 863#endif
900 ) 864 )
901 { 865 {
902 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
903 tt_write (&ch, 1); 867 tt_write (&ch, 1);
904 } 868 }
905 869
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
917} 871}
918/*}}} */
919 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 951unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 953{
926 unsigned int n, s; 954 unsigned int n, s;
927 955
928 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
955void 983void
956rxvt_term::flush () 984rxvt_term::flush ()
957{ 985{
958 flush_ev.stop (); 986 flush_ev.stop ();
959 987
960#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
961 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
962 { 990 {
963 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
964 scr_clear ();
965 scr_touch (false); 992 scr_touch (false);
966 } 993 }
967#endif 994#endif
968 995
969 if (want_refresh) 996 if (want_refresh)
970 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
971 scr_refresh (refresh_type); 1036 scr_refresh ();
972 scrollbar_show (1); 1037 scrollbar_show (1);
973#ifdef USE_XIM 1038#ifdef USE_XIM
974 IMSendSpot (); 1039 IMSendSpot ();
975#endif 1040#endif
976 } 1041 }
977 1042
978 display->flush (); 1043 display->flush ();
979} 1044}
980 1045
981void 1046void
982rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
983{ 1048{
984 SET_R (this); 1049 make_current ();
985 SET_LOCALE (locale);
986 1050
987 display->flush (); 1051 display->flush ();
988 1052
989 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
991} 1055}
992 1056
993void 1057void
994rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
995{ 1059{
996 SET_R (this); 1060 make_current ();
997 SET_LOCALE (locale);
998 1061
999 refresh_limit = 1;
1000 refresh_count = 0; 1062 refresh_count = 0;
1001 flush (); 1063 flush ();
1002} 1064}
1003 1065
1004#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1005void 1067void
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1007{ 1069{
1008 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1071 want_refresh = 1;
1010
1011 w.start (w.at + BLINK_INTERVAL);
1012} 1072}
1013#endif 1073#endif
1014 1074
1015#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1016void 1076void
1017rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1018{ 1078{
1019 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1020 { 1080 {
1021 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1022 want_refresh = 1; 1082 want_refresh = 1;
1023 w.start (w.at + TEXT_BLINK_INTERVAL);
1024 } 1083 }
1025} 1084}
1026#endif 1085#endif
1027 1086
1028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1029void 1088void
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1031{ 1090{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1093 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1038 } 1095 w.stop ();
1039} 1096}
1040#endif 1097#endif
1041 1098
1042#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1043void 1100void
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1045{ 1102{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1104 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1106 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1107 }
1108 else
1109 w.stop ();
1053} 1110}
1054#endif 1111#endif
1055 1112
1056#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1057void 1114void
1058rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1059{ 1116{
1060 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1120 {
1064 if (view_start == nsaved || 1121 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1067 1123
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1124 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1125 }
1126 else
1127 w.stop ();
1072} 1128}
1073#endif 1129#endif
1074 1130
1075#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1076static struct event_handler 1132static struct event_handler
1077{ 1133{
1078 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1079 1135
1080 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1081 { 1137 {
1082 sched_yield (); 1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1083 w.stop (); 1146 w.stop ();
1084 } 1147 }
1085 1148
1086 event_handler () 1149 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1088 { 1151 {
1089 } 1152 }
1090} event_handler; 1153} event_handler;
1091#endif 1154#endif
1092 1155
… …
1095{ 1158{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1160
1098 if (CBUFSIZ == n) 1161 if (CBUFSIZ == n)
1099 { 1162 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1164 n = 0;
1102 } 1165 }
1103 1166
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
1107 1170
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1172
1110 if (r > 0) 1173 if (r > 0)
1111 { 1174 {
1112 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1113 return true; 1176 return true;
1114 } 1177 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1179 {
1117#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1118 if (display->is_local) 1181 if (display->is_local)
1119 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1120#endif 1183#endif
1121 } 1184 }
1122 else 1185 else
1123 { 1186 {
1124 pty_ev.stop (); 1187 pty_ev.stop ();
1125 1188
1126 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1127 destroy (); 1190 destroy ();
1128 } 1191 }
1129 1192
1130 return false; 1193 return false;
1131} 1194}
1132 1195
1133void 1196void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1135{ 1198{
1136 SET_R (this); 1199 make_current ();
1137 SET_LOCALE (locale);
1138 1200
1139 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1140 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1203 while (pty_fill ())
1142 if (cmd_parse ()) 1204 if (cmd_parse ())
1143 break; 1205 break;
1144 1206
1145 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1146 pty_write (); 1208 pty_write ();
1147} 1209}
1148 1210
1149void 1211void
1150rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1151{ 1213{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1215 recolour_cursor ();
1154 1216
1155#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1218 hidden_pointer = 0;
1157 1219
1158 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1160#endif 1222#endif
1161} 1223}
1162 1224
1163#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1164void 1226void
1165rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1166{ 1228{
1167 if (! OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1168 return; 1230 return;
1169 1231
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1233 XFlush (dpy);
1172 1234
1173 hidden_pointer = 1; 1235 hidden_pointer = 1;
1174} 1236}
1175 1237
1176void 1238void
1177rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1178{ 1240{
1179 SET_R (this); 1241 make_current ();
1180 SET_LOCALE (locale);
1181 1242
1182 pointer_blank (); 1243 pointer_blank ();
1183} 1244}
1184#endif 1245#endif
1185 1246
1186void 1247void
1187rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1188{ 1249{
1189 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1190 int x, y; 1251 int x, y;
1252 int code = 32;
1191 1253
1192 x = ev.x; 1254 x = Pixel2Col (ev.x);
1193 y = ev.y; 1255 y = Pixel2Row (ev.y);
1194 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify) {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1195 1263
1196 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1197 button_number = 3; 1265 button_number = 3;
1198 else 1266 else
1199 { 1267 {
… …
1245 x + 1, 1313 x + 1,
1246 y + 1); 1314 y + 1);
1247#endif 1315#endif
1248 1316
1249 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1250 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1251 (32 + x + 1), 1319 (32 + x + 1),
1252 (32 + y + 1)); 1320 (32 + y + 1));
1253} 1321}
1254
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264 1322
1265/*{{{ process an X event */ 1323/*{{{ process an X event */
1266void 1324void
1267rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1268{ 1326{
1269 dDisp; 1327 make_current ();
1270 1328
1271 SET_R (this); 1329 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1330
1274#if defined(CURSOR_BLINK) 1331 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1333 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1334 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1335
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1336 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1337 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1338 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1339 unsigned int unused_mask;
1304 1340
1305 switch (ev.type) 1341 switch (ev.type)
1306 { 1342 {
1307 case KeyPress: 1343 case KeyPress:
1308#if ISO_14755 1344 key_press (ev.xkey);
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1311 lookup_key (ev.xkey);
1312
1313 break; 1345 break;
1314 1346
1315 case KeyRelease: 1347 case KeyRelease:
1316 { 1348 key_release (ev.xkey);
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1349 break;
1384 }
1385 1350
1386 case ButtonPress: 1351 case ButtonPress:
1387 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1388 break; 1353 break;
1389 1354
… …
1391 button_release (ev.xbutton); 1356 button_release (ev.xbutton);
1392 break; 1357 break;
1393 1358
1394 case ClientMessage: 1359 case ClientMessage:
1395 if (ev.xclient.format == 32 1360 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1361 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1362 {
1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1364 {
1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1366 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1368 {
1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1370 destroy ();
1371 }
1400#if ENABLE_EWMH 1372#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1376 &ev);
1377#endif
1378 }
1379 }
1380#if ENABLE_XEMBED
1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1382 {
1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1405#endif 1388#endif
1406 } 1389 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break;
1443
1444 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1390 break;
1447 1391
1448 /* 1392 /*
1449 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1450 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1469 break; 1413 break;
1470 } 1414 }
1471 break; 1415 break;
1472 1416
1473 case FocusIn: 1417 case FocusIn:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1474 focus_in (); 1421 focus_in ();
1475 break; 1422 break;
1476 1423
1477 case FocusOut: 1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1478 focus_out (); 1428 focus_out ();
1479 break; 1429 break;
1480 1430
1481 case ConfigureNotify: 1431 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); */
1482 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1483 { 1436 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1438 ;
1486 1439
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1441 {
1489 seen_resize = 1; 1442 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1444 }
1492 1445 else
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1446 {
1494 if (OPTION (Opt_transparent)) 1447#ifdef HAVE_BG_PIXMAP
1495 check_our_parents (); 1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1496#endif 1450#endif
1451 }
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 } 1453 }
1498 break; 1454 break;
1499 1455
1500 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1461
1505 break; 1462 break;
1506 1463
1507 case SelectionClear: 1464 case SelectionClear:
1508 selection_clear (); 1465 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1471 break;
1515 1472
1516 case SelectionRequest: 1473 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1475 break;
1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1481#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1483 break;
1519 1484
1520 case UnmapNotify: 1485 case UnmapNotify:
1521 mapped = 0; 1486 mapped = 0;
1522#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1524#endif 1489#endif
1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break; 1491 break;
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1492
1540 case GraphicsExpose: 1493 case GraphicsExpose:
1541 case Expose: 1494 case Expose:
1542 if (ev.xany.window == vt) 1495 if (ev.xany.window == vt)
1543 { 1496 {
1544 do 1497 do
1498 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1503
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1505
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1554 1510 }
1555 scr_refresh (refresh_type); 1511 want_refresh = 1;
1556 } 1512 }
1557 else 1513 else
1558 { 1514 {
1559 XEvent unused_event; 1515 XEvent unused_event;
1560 1516
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1518 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1520 ;
1565 1521
1566 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1567 { 1523 {
1568 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1569 scrollbar_show (0); 1525 scrollbar_show (0);
1570 } 1526 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1580 } 1527 }
1581 break; 1528 break;
1582 1529
1583 case MotionNotify: 1530 case MotionNotify:
1584#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1532 if (hidden_pointer)
1586 pointer_unblank (); 1533 pointer_unblank ();
1587#endif 1534#endif
1588#if MENUBAR 1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1589 if (isMenuBarWindow (ev.xany.window)) 1536 || priv_modes & PrivMode_MouseAnyEvent)
1590 {
1591 menubar_control (ev.xbutton); 1537 mouse_report (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1539 break;
1597 1540
1598 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1599 { 1542 {
1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1545 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1547 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1549 ;
1604 1550
1605 XQueryPointer (disp, vt, 1551 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1555 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1631 1577
1632 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1634 */ 1580 */
1635 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.active)
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1583
1638 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1640 */ 1586 */
1641 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
… …
1674#endif 1620#endif
1675 } 1621 }
1676 } 1622 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1624 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1626 MotionNotify, &ev))
1681 ; 1627 ;
1682 1628
1683 XQueryPointer (disp, scrollBar.win, 1629 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1633 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1635 scrollbar_size ());
1690 scr_refresh (refresh_type);
1691 refresh_limit = 0; 1636 want_refresh = 1;
1692 scrollbar_show (1); 1637 scrollbar_show (1);
1693 } 1638 }
1694 break; 1639 break;
1695 } 1640 }
1641
1642#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again ();
1652 }
1653#endif
1654
1655#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 {
1658 if (ev.type == MotionNotify
1659 || ev.type == ButtonPress
1660 || ev.type == ButtonRelease)
1661 if (hidden_pointer)
1662 pointer_unblank ();
1663
1664 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank ();
1666 }
1667#endif
1696} 1668}
1697 1669
1698void 1670void
1699rxvt_term::focus_in () 1671rxvt_term::focus_in ()
1700{ 1672{
1701 if (!focus) 1673 if (!focus)
1702 { 1674 {
1703 focus = 1; 1675 focus = 1;
1704 want_refresh = 1; 1676 want_refresh = 1;
1705 1677
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 1679
1708#if USE_XIM 1680#if USE_XIM
1709 if (Input_Context != NULL) 1681 if (Input_Context != NULL)
1710 { 1682 {
1711 IMSetStatusPosition (); 1683 IMSetPosition ();
1712 XSetICFocus (Input_Context); 1684 XSetICFocus (Input_Context);
1713 } 1685 }
1714#endif 1686#endif
1715#if CURSOR_BLINK 1687#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1688 if (option (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1718#endif 1690#endif
1719#if OFF_FOCUS_FADING 1691#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1692 if (rs[Rs_fade])
1721 { 1693 {
1722 pix_colors = pix_colors_focused; 1694 pix_colors = pix_colors_focused;
1723 scr_recolour (); 1695 scr_recolour ();
1724 } 1696 }
1725#endif 1697#endif
1698#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell))
1700 {
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1726 } 1708 }
1727} 1709}
1728 1710
1729void 1711void
1730rxvt_term::focus_out () 1712rxvt_term::focus_out ()
… …
1732 if (focus) 1714 if (focus)
1733 { 1715 {
1734 focus = 0; 1716 focus = 0;
1735 want_refresh = 1; 1717 want_refresh = 1;
1736 1718
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1720
1739#if ENABLE_FRILLS || ISO_14755 1721#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1722 if (iso14755buf)
1741 { 1723 {
1742 iso14755buf = 0; 1724 iso14755buf = 0;
1743# if ENABLE_OVERLAY 1725# if ISO_14755
1744 scr_overlay_off (); 1726 scr_overlay_off ();
1745# endif 1727# endif
1746 } 1728 }
1747#endif 1729#endif
1748#if USE_XIM 1730#if USE_XIM
1749 if (Input_Context != NULL) 1731 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context); 1732 XUnsetICFocus (Input_Context);
1751#endif 1733#endif
1752#if CURSOR_BLINK 1734#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.stop (); 1736 cursor_blink_ev.stop ();
1737
1755 hidden_cursor = 0; 1738 hidden_cursor = 0;
1756#endif 1739#endif
1757#if OFF_FOCUS_FADING 1740#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1741 if (rs[Rs_fade])
1759 { 1742 {
… …
1762 } 1745 }
1763#endif 1746#endif
1764 } 1747 }
1765} 1748}
1766 1749
1767#if TRANSPARENT 1750void
1751rxvt_term::update_fade_color (unsigned int idx)
1752{
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 rgba c;
1757 pix_colors [Color_fade].get (c);
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 }
1760#endif
1761}
1762
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL
1768void 1764void
1769rxvt_term::rootwin_cb (XEvent &ev) 1765rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1766{
1771 SET_R (this); 1767 make_current ();
1772 SET_LOCALE (locale);
1773 1768
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return;
1772
1773# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1774 switch (ev.type)
1775 { 1775 {
1776 case PropertyNotify: 1776 case PropertyNotify:
1777 /* 1777 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1778 * if user used some Esetroot compatible prog to set the root bg,
1779 * use the property to determine the pixmap. We use it later on. 1779 * use the property to determine the pixmap. We use it later on.
1780 */ 1780 */
1781 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 return; 1783 {
1784 1784 bgPixmap.set_root_pixmap ();
1785 /* FALLTHROUGH */ 1785 update_background ();
1786 case ReparentNotify: 1786 }
1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1788 want_refresh = want_full_refresh = 1;
1789 break; 1787 break;
1790 } 1788 }
1789# endif
1791} 1790}
1792#endif 1791#endif
1793 1792
1794void 1793void
1795rxvt_term::button_press (XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1796{ 1795{
1797 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1798 1797
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1799
1800 if (!bypass_keystate) 1800 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1802
1803 /* 1803 /*
1804 * VT window processing of button press 1804 * VT window processing of button press
1805 */ 1805 */
1806 if (ev.window == vt) 1806 if (ev.window == vt)
1807 { 1807 {
1808 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1808#if ISO_14755 1811#if ISO_14755
1809 // 5.4 1812 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1813 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 { 1814 {
1812 iso14755_54 (ev.x, ev.y); 1815 iso14755_54 (ev.x, ev.y);
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1827#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1828 if (ev.button == MEvent.button && clickintime)
1826 { 1829 {
1827 /* same button, within alloted time */ 1830 /* same button, within alloted time */
1828 MEvent.clicks++; 1831 MEvent.clicks++;
1832
1829 if (MEvent.clicks > 1) 1833 if (MEvent.clicks > 1)
1830 { 1834 {
1831 /* only report double clicks */ 1835 /* only report double clicks */
1832 MEvent.clicks = 2; 1836 MEvent.clicks = 2;
1833 mouse_report (ev); 1837 mouse_report (ev);
… …
1865#else 1869#else
1866 selection.rect = false; 1870 selection.rect = false;
1867#endif 1871#endif
1868 1872
1869 /* allow shift+left click to extend selection */ 1873 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1874 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1871 { 1875 {
1872 if (MEvent.button == Button1 && clickintime) 1876 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1874 else 1878 else
1875 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
… …
1971 upordown = 1; /* down */ 1975 upordown = 1; /* down */
1972 } 1976 }
1973 if (upordown) 1977 if (upordown)
1974 { 1978 {
1975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1976 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1977#endif 1981#endif
1978 if (scr_page (upordown < 0 ? UP : DN, 1)) 1982 if (scr_page (upordown < 0 ? UP : DN, 1))
1979 { 1983 {
1980 if (upordown < 0) 1984 if (upordown < 0)
1981 scrollBar.setUp (); 1985 scrollBar.setUp ();
… …
2040 } 2044 }
2041 2045
2042 break; 2046 break;
2043 } 2047 }
2044 } 2048 }
2049
2045 return; 2050 return;
2046 } 2051 }
2047#if MENUBAR
2048 /*
2049 * Menubar window processing of button press
2050 */
2051 if (isMenuBarWindow (ev.window))
2052 menubar_control (ev);
2053#endif
2054} 2052}
2055 2053
2056void 2054void
2057rxvt_term::button_release (XButtonEvent &ev) 2055rxvt_term::button_release (XButtonEvent &ev)
2058{ 2056{
… …
2064 2062
2065 if (scrollbar_isUpDn ()) 2063 if (scrollbar_isUpDn ())
2066 { 2064 {
2067 scrollBar.setIdle (); 2065 scrollBar.setIdle ();
2068 scrollbar_show (0); 2066 scrollbar_show (0);
2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2070 refresh_type &= ~SMOOTH_REFRESH;
2071#endif
2072 } 2067 }
2073 2068
2074#ifdef SELECTION_SCROLLING 2069#ifdef SELECTION_SCROLLING
2075 if (sel_scroll_ev.active) 2070 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop(); 2071 sel_scroll_ev.stop();
2077#endif 2072#endif
2078 2073
2079 if (ev.window == vt) 2074 if (ev.window == vt)
2080 { 2075 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2077 return;
2078
2081#if ISO_14755 2079#if ISO_14755
2082 // 5.4 2080 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2081 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return; 2082 return;
2085#endif 2083#endif
2084
2086 if (reportmode) 2085 if (reportmode)
2087 { 2086 {
2088 /* mouse report from vt window */ 2087 /* mouse report from vt window */
2089 /* don't report release of wheel "buttons" */ 2088 /* don't report release of wheel "buttons" */
2090 if (ev.button >= 4) 2089 if (ev.button >= 4)
… …
2120 { 2119 {
2121 case Button1: 2120 case Button1:
2122 case Button3: 2121 case Button3:
2123 selection_make (ev.time); 2122 selection_make (ev.time);
2124 break; 2123 break;
2124
2125 case Button2: 2125 case Button2:
2126 selection_request (ev.time, ev.x, ev.y); 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2128 break;
2129
2128#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
2129 case Button4: 2131 case Button4:
2130 case Button5: 2132 case Button5:
2131 { 2133 {
2132 int i; 2134 int i;
… …
2134 2136
2135 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2136 2138
2137 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2138 i = 1; 2140 i = 1;
2139 else if (OPTION (Opt_mouseWheelScrollPage)) 2141 else if (option (Opt_mouseWheelScrollPage))
2140 i = nrow - 1; 2142 i = nrow - 1;
2141 else 2143 else
2142 i = 5; 2144 i = 5;
2143 2145
2144# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
… …
2146 { 2148 {
2147 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2148 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2149 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2150 2152
2151 if (slip_wheel_ev.at < NOW) 2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2153
2154 slip_wheel_ev.start ();
2155 } 2154 }
2156 else 2155 else
2157 { 2156 {
2158# endif 2157# endif
2159# ifdef JUMP_MOUSE_WHEEL
2160 scr_page (v, i); 2158 scr_page (v, i);
2161 scr_refresh (SMOOTH_REFRESH);
2162 scrollbar_show (1); 2159 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING 2160# ifdef MOUSE_SLIP_WHEELING
2172 } 2161 }
2173#endif 2162# endif
2174 } 2163 }
2175 break; 2164 break;
2176#endif 2165#endif
2177 } 2166 }
2178 } 2167 }
2179#ifdef MENUBAR
2180 else if (isMenuBarWindow (ev.window))
2181 menubar_control (ev);
2182#endif
2183} 2168}
2184
2185#ifdef TRANSPARENT
2186#if TINTING
2187/* taken from aterm-0.4.2 */
2188
2189typedef uint32_t RUINT32T;
2190
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{
2193 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
2199
2200 Visual *visual = display->visual;
2201
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203
2204 /* for convenience */
2205 mask_r = visual->red_mask;
2206 mask_g = visual->green_mask;
2207 mask_b = visual->blue_mask;
2208
2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2282 } else {
2283 if (shade < 0) shade = 0;
2284 if (shade > 100) shade = 100;
2285
2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2287
2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2291 }
2292
2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2295 {
2296 unsigned int tmp;
2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 16:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0xf800)>>11] |
2364 lookup_g[(*p & 0x07e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xff0000)>>16] |
2403 lookup_g[(*p & 0x00ff00)>> 8] |
2404 lookup_b[(*p & 0x0000ff)] |
2405 (*p & ~0xffffff);
2406 }
2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 }
2412
2413 free (lookup);
2414}
2415#endif
2416
2417/*
2418 * Check our parents are still who we think they are.
2419 * Do transparency updates if required
2420 */
2421int
2422rxvt_term::check_our_parents ()
2423{
2424 int i, pchanged, aformat, have_pixmap, rootdepth;
2425 unsigned long nitems, bytes_after;
2426 Atom atype;
2427 unsigned char *prop = NULL;
2428 Window root, oldp, *list;
2429 Pixmap rootpixmap = None;
2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (disp, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (disp, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (disp, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (disp, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
2523 allowedxerror = -1;
2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (disp, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (disp, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2556
2557 ShadeXImage (display, image, shade, rm, gm, bm);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (disp, vt,
2562 szHint.width, szHint.height, image->depth);
2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2565 nx, ny, image->width, image->height);
2566 XFreeGC (disp, gc);
2567 XDestroyImage (image);
2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2569 XClearWindow (disp, parent[0]);
2570
2571 if (!am_transparent || !am_pixmap_trans)
2572 pchanged = 1;
2573
2574 am_transparent = am_pixmap_trans = 1;
2575 }
2576 }
2577
2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2581 {
2582 unsigned int n;
2583 /*
2584 * InheritPixmap transparency
2585 */
2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 {
2588 oldp = parent[i];
2589 XQueryTree (disp, parent[i - 1], &root,
2590 &parent[i], &list, &n);
2591 XFree (list);
2592
2593 if (parent[i] == display->root)
2594 {
2595 if (oldp != None)
2596 pchanged = 1;
2597
2598 break;
2599 }
2600
2601 if (oldp != parent[i])
2602 pchanged = 1;
2603 }
2604
2605 n = 0;
2606
2607 if (pchanged)
2608 {
2609 for (; n < (unsigned int)i; n++)
2610 {
2611 XGetWindowAttributes (disp, parent[n], &wattr);
2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613 {
2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615 break;
2616 }
2617 }
2618 }
2619
2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2621 {
2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2624 am_transparent = 0;
2625 /* XXX: also turn off Opt_transparent? */
2626 }
2627 else
2628 {
2629#if WAIT_FOR_WM
2630 /* wait (an arbitrary period) for the WM to do its thing
2631 * needed for fvwm2.2.2 (and before?) */
2632 sleep (1);
2633#endif
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2169
2666/*}}} */ 2170/*}}} */
2667 2171
2668bool 2172bool
2669rxvt_term::cmd_parse () 2173rxvt_term::cmd_parse ()
2670{ 2174{
2671 bool flag = false; 2175 bool flag = false;
2672 unicode_t ch = NOCHAR; 2176 wchar_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2177 char *seq_begin; // remember start of esc-sequence here
2674 2178
2675 for (;;) 2179 for (;;)
2676 { 2180 {
2677 if (ch == NOCHAR) 2181 if (ch == NOCHAR)
2678 { 2182 {
2679 seq_begin = cmdbuf_ptr; 2183 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2184 ch = next_char ();
2681 }
2682 2185
2683 if (ch == NOCHAR) // TODO: improve 2186 if (ch == NOCHAR)
2684 break; 2187 break;
2188 }
2685 2189
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2190 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 { 2191 {
2688 if (!seen_input) 2192 if (!seen_input)
2689 { 2193 {
… …
2698 if (seen_resize && cmd_pid) 2202 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH); 2203 kill (-cmd_pid, SIGWINCH);
2700 } 2204 }
2701 2205
2702 /* Read a text string from the input buffer */ 2206 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ]; 2207 wchar_t buf[UBUFSIZ];
2704 bool refreshnow = false; 2208 bool refreshnow = false;
2705 int nlines = 0; 2209 int nlines = 0;
2706 unicode_t *str = buf; 2210 wchar_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ); 2211 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2212
2709 for (;;) 2213 for (;;)
2710 { 2214 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2215 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break; 2216 break;
… …
2718 if (ch == C0_LF) 2222 if (ch == C0_LF)
2719 nlines++; 2223 nlines++;
2720 2224
2721 refresh_count++; 2225 refresh_count++;
2722 2226
2723 if (!OPTION (Opt_jumpScroll) 2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2228 {
2726 refreshnow = true;
2727 refresh_count = 0; 2229 refresh_count = 0;
2230
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2232 {
2233 refreshnow = true;
2728 ch = NOCHAR; 2234 ch = NOCHAR;
2729 break; 2235 break;
2236 }
2730 } 2237 }
2731 2238
2732 // scr_add_lines only works for nlines <= nrow - 1. 2239 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2240 if (nlines >= nrow - 1)
2734 { 2241 {
2242 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2243 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2735 scr_add_lines (buf, nlines, str - buf); 2244 scr_add_lines (buf, str - buf, nlines);
2245
2736 nlines = 0; 2246 nlines = 0;
2737 str = buf; 2247 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2248 eol = str + min (ncol, UBUFSIZ);
2739 } 2249 }
2740 2250
… …
2753 2263
2754 seq_begin = cmdbuf_ptr; 2264 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2265 ch = next_char ();
2756 } 2266 }
2757 2267
2268 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2269 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2758 scr_add_lines (buf, nlines, str - buf); 2270 scr_add_lines (buf, str - buf, nlines);
2759 2271
2760 /* 2272 /*
2761 * If there have been a lot of new lines, then update the screen 2273 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full. 2274 * What the heck we'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which 2275 * if skipScroll is enabled.
2764 * is incremented here because we must be doing flat-out scrolling.
2765 */ 2276 */
2766 if (refreshnow) 2277 if (refreshnow)
2767 { 2278 {
2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2769 refresh_limit++;
2770 else
2771 {
2772 flag = true; 2279 flag = true;
2773 scr_refresh (refresh_type); 2280 scr_refresh ();
2774 flush_ev.stop (); 2281 want_refresh = 1;
2775 }
2776 } 2282 }
2777 2283
2778 } 2284 }
2779 else 2285 else
2780 { 2286 {
… …
2794 } 2300 }
2795 2301
2796 return flag; 2302 return flag;
2797} 2303}
2798 2304
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character 2305// read the next character
2809unicode_t 2306wchar_t
2810rxvt_term::next_char () 2307rxvt_term::next_char () NOTHROW
2811{ 2308{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2309 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2310 {
2814 // assume 7-bit to be ascii ALWAYS 2311 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2312 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2313 return *cmdbuf_ptr++;
2817 2314
2818 wchar_t wc; 2315 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2316 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2317
2821 if (len == (size_t)-2) 2318 if (len == (size_t)-2)
2822 { 2319 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2320 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2321 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2322 break;
2826 } 2323 }
2827 2324
2828 if (len == (size_t)-1) 2325 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2326 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830 2327
2831 // assume wchar == unicode 2328 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2329 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2330 return wc & UNICODE_MASK;
2834 } 2331 }
2835 2332
2836 return NOCHAR; 2333 return NOCHAR;
2837} 2334}
2335
2336// read the next octet
2337uint32_t
2338rxvt_term::next_octet () NOTHROW
2339{
2340 return cmdbuf_ptr < cmdbuf_endp
2341 ? (unsigned char)*cmdbuf_ptr++
2342 : NOCHAR;
2343}
2344
2345static class out_of_input out_of_input;
2838 2346
2839/* rxvt_cmd_getc () - Return next input character */ 2347/* rxvt_cmd_getc () - Return next input character */
2840/* 2348/*
2841 * Return the next input character after first passing any keyboard input 2349 * Return the next input character after first passing any keyboard input
2842 * to the command. 2350 * to the command.
2843 */ 2351 */
2844unicode_t 2352wchar_t
2845rxvt_term::cmd_getc () 2353rxvt_term::cmd_getc () THROW ((class out_of_input))
2846{ 2354{
2847 unicode_t c = next_char (); 2355 wchar_t c = next_char ();
2848 2356
2849 if (c == NOCHAR) 2357 if (c == NOCHAR)
2850 throw out_of_input; 2358 throw out_of_input;
2851 2359
2852 return c; 2360 return c;
2853} 2361}
2854 2362
2855unicode_t 2363uint32_t
2856rxvt_term::cmd_get8 () 2364rxvt_term::cmd_get8 () THROW ((class out_of_input))
2857{ 2365{
2858 unicode_t c = next_octet (); 2366 uint32_t c = next_octet ();
2859 2367
2860 if (c == NOCHAR) 2368 if (c == NOCHAR)
2861 throw out_of_input; 2369 throw out_of_input;
2862 2370
2863 return c; 2371 return c;
… …
2927 { 2435 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2436 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2437 break; /* done = 1 */
2930 } 2438 }
2931 } 2439 }
2932 2440
2933 for (i = 0; i < len; i++) 2441 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2442 if (putc (buf[i], fd) == EOF)
2935 { 2443 {
2936 done = 1; 2444 done = 1;
2937 break; 2445 break;
… …
2963 case C0_ESC: 2471 case C0_ESC:
2964 process_escape_seq (); 2472 process_escape_seq ();
2965 break; 2473 break;
2966 case C0_ENQ: /* terminal Status */ 2474 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 2475 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2476 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 2477 else
2971 tt_write ((unsigned char *)VT100_ANS, 2478 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 2479 break;
2974 case C0_BEL: /* bell */ 2480 case C0_BEL: /* bell */
2975 scr_bell (); 2481 scr_bell ();
2976 break; 2482 break;
2977 case C0_BS: /* backspace */ 2483 case C0_BS: /* backspace */
… …
3001 process_dcs_seq (); 2507 process_dcs_seq ();
3002 break; 2508 break;
3003 case 0x9b: /* CSI */ 2509 case 0x9b: /* CSI */
3004 process_csi_seq (); 2510 process_csi_seq ();
3005 break; 2511 break;
3006 case 0x9d: /* CSI */ 2512 case 0x9d: /* OSC */
3007 process_osc_seq (); 2513 process_osc_seq ();
3008 break; 2514 break;
3009#endif 2515#endif
3010 } 2516 }
3011} 2517}
… …
3101 scr_charset_set (2, (unsigned int)cmd_getc ()); 2607 scr_charset_set (2, (unsigned int)cmd_getc ());
3102 break; 2608 break;
3103 case '+': 2609 case '+':
3104 scr_charset_set (3, (unsigned int)cmd_getc ()); 2610 scr_charset_set (3, (unsigned int)cmd_getc ());
3105 break; 2611 break;
3106#if ENABLE_FRILLS 2612#if !ENABLE_MINIMAL
3107 case '6': 2613 case '6':
3108 scr_backindex (); 2614 scr_backindex ();
3109 break; 2615 break;
3110#endif 2616#endif
3111 case '7': 2617 case '7':
3112 scr_cursor (SAVE); 2618 scr_cursor (SAVE);
3113 break; 2619 break;
3114 case '8': 2620 case '8':
3115 scr_cursor (RESTORE); 2621 scr_cursor (RESTORE);
3116 break; 2622 break;
3117#if ENABLE_FRILLS 2623#if !ENABLE_MINIMAL
3118 case '9': 2624 case '9':
3119 scr_forwardindex (); 2625 scr_forwardindex ();
3120 break; 2626 break;
3121#endif 2627#endif
3122 case '=': 2628 case '=':
… …
3132 break; 2638 break;
3133 2639
3134 /* 8.3.87: NEXT LINE */ 2640 /* 8.3.87: NEXT LINE */
3135 case C1_NEL: /* ESC E */ 2641 case C1_NEL: /* ESC E */
3136 { 2642 {
3137 unicode_t nlcr[] = { C0_LF, C0_CR }; 2643 wchar_t nlcr[] = { C0_LF, C0_CR };
3138 scr_add_lines (nlcr, 1, 2); 2644 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3139 } 2645 }
3140 break; 2646 break;
3141 2647
3142 /* kidnapped escape sequence: Should be 8.3.48 */ 2648 /* kidnapped escape sequence: Should be 8.3.48 */
3143 case C1_ESA: /* ESC G */ 2649 case C1_ESA: /* ESC G */
… …
3165 process_dcs_seq (); 2671 process_dcs_seq ();
3166 break; 2672 break;
3167 2673
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2674 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 2675 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 2676 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 2677 break; /* steal obsolete ESC [ c */
3173 2678
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2679 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 2680 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 2681 process_csi_seq ();
… …
3238rxvt_term::process_csi_seq () 2743rxvt_term::process_csi_seq ()
3239{ 2744{
3240 unicode_t ch, priv, i; 2745 unicode_t ch, priv, i;
3241 unsigned int nargs, p; 2746 unsigned int nargs, p;
3242 int n, ndef; 2747 int n, ndef;
3243 int arg[ESC_ARGS]; 2748 int arg[ESC_ARGS] = { };
3244 2749
3245 for (nargs = ESC_ARGS; nargs > 0;) 2750 nargs = 0;
3246 arg[--nargs] = 0;
3247 2751
3248 priv = 0; 2752 priv = 0;
3249 ch = cmd_getc (); 2753 ch = cmd_getc ();
3250 if (ch >= '<' && ch <= '?') 2754 if (ch >= '<' && ch <= '?')
3251 { /* '<' '=' '>' '?' */ 2755 { /* '<' '=' '>' '?' */
… …
3285 ndef = get_byte_array_bit (csi_defaults, i); 2789 ndef = get_byte_array_bit (csi_defaults, i);
3286 for (p = 0; p < nargs; p++) 2790 for (p = 0; p < nargs; p++)
3287 if (arg[p] == -1) 2791 if (arg[p] == -1)
3288 arg[p] = ndef; 2792 arg[p] = ndef;
3289 2793
3290#ifdef DEBUG_CMD
3291 fprintf (stderr, "CSI ");
3292 for (p = 0; p < nargs; p++)
3293 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3294 fprintf (stderr, "%c\n", ch);
3295#endif
3296
3297 /* 2794 /*
3298 * private mode handling 2795 * private mode handling
3299 */ 2796 */
3300 if (priv) 2797 if (priv)
3301 { 2798 {
3302 switch (priv) 2799 switch (priv)
3303 { 2800 {
3304 case '>': 2801 case '>':
3305 if (ch == CSI_DA) /* secondary device attributes */ 2802 if (ch == CSI_DA) /* secondary device attributes */
3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2803 {
2804 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2805 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2806 //
2807 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2808 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2809 // versions.
2810 //
2811 tt_printf ("\033[>%d;95;0c", 'U');
2812 }
3307 break; 2813 break;
3308 case '?': 2814 case '?':
3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3310 process_terminal_mode (ch, priv, nargs, arg); 2816 process_terminal_mode (ch, priv, nargs, arg);
3311 break; 2817 break;
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2926 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2927 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 2928 break;
3423 2929
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2930 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 2931 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 2932 break;
3428 2933
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2934 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 2935 process_sgr_mode (nargs, arg);
3431 break; 2936 break;
… …
3438 break; 2943 break;
3439 case 6: /* CPR requested */ 2944 case 6: /* CPR requested */
3440 scr_report_position (); 2945 scr_report_position ();
3441 break; 2946 break;
3442 case 7: /* unofficial extension */ 2947 case 7: /* unofficial extension */
3443 if (OPTION (Opt_insecure)) 2948 if (option (Opt_insecure))
3444 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2949 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3445 break; 2950 break;
3446 case 8: /* unofficial extension */ 2951 case 8: /* unofficial extension */
3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2952 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3448 break; 2953 break;
… …
3515 break; 3020 break;
3516 case CSI_75: 3021 case CSI_75:
3517 scr_cursor (RESTORE); 3022 scr_cursor (RESTORE);
3518 break; 3023 break;
3519 3024
3520#if ENABLE_FRILLS 3025#if !ENABLE_MINIMAL
3521 case CSI_74: 3026 case CSI_74:
3522 process_window_ops (arg, nargs); 3027 process_window_ops (arg, nargs);
3523 break; 3028 break;
3524#endif 3029#endif
3525 3030
… …
3532 break; 3037 break;
3533 } 3038 }
3534} 3039}
3535/*}}} */ 3040/*}}} */
3536 3041
3537#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
3538/* ARGSUSED */ 3043/* ARGSUSED */
3539void 3044void
3540rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3045rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3541{ 3046{
3542 int x, y; 3047 int x, y;
3543 XWindowAttributes wattr; 3048 XWindowAttributes wattr;
3544 Window wdummy; 3049 Window wdummy;
3545 dDisp; 3050
3051 dLocal (Display *, dpy);
3546 3052
3547 if (nargs == 0) 3053 if (nargs == 0)
3548 return; 3054 return;
3549 3055
3550 switch (args[0]) 3056 switch (args[0])
3551 { 3057 {
3552 /* 3058 /*
3553 * commands 3059 * commands
3554 */ 3060 */
3555 case 1: /* deiconify window */ 3061 case 1: /* deiconify window */
3556 XMapWindow (disp, parent[0]); 3062 XMapWindow (dpy, parent[0]);
3557 break; 3063 break;
3558 case 2: /* iconify window */ 3064 case 2: /* iconify window */
3559 XIconifyWindow (disp, parent[0], display->screen); 3065 XIconifyWindow (dpy, parent[0], display->screen);
3560 break; 3066 break;
3561 case 3: /* set position (pixels) */ 3067 case 3: /* set position (pixels) */
3562 XMoveWindow (disp, parent[0], args[1], args[2]); 3068 XMoveWindow (dpy, parent[0], args[1], args[2]);
3563 break; 3069 break;
3564 case 4: /* set size (pixels) */ 3070 case 4: /* set size (pixels) */
3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3071 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3566 break; 3072 break;
3567 case 5: /* raise window */ 3073 case 5: /* raise window */
3568 XRaiseWindow (disp, parent[0]); 3074 XRaiseWindow (dpy, parent[0]);
3569 break; 3075 break;
3570 case 6: /* lower window */ 3076 case 6: /* lower window */
3571 XLowerWindow (disp, parent[0]); 3077 XLowerWindow (dpy, parent[0]);
3572 break; 3078 break;
3573 case 7: /* refresh window */ 3079 case 7: /* refresh window */
3574 scr_touch (true); 3080 scr_touch (true);
3575 break; 3081 break;
3576 case 8: /* set size (chars) */ 3082 case 8: /* set size (chars) */
… …
3583 if (args[0] >= 24) /* set height (chars) */ 3089 if (args[0] >= 24) /* set height (chars) */
3584 set_widthheight ((unsigned int)width, 3090 set_widthheight ((unsigned int)width,
3585 (unsigned int) (args[1] * fheight)); 3091 (unsigned int) (args[1] * fheight));
3586 break; 3092 break;
3587 3093
3588
3589 /* 3094 /*
3590 * reports - some output format copied from XTerm 3095 * reports - some output format copied from XTerm
3591 */ 3096 */
3592 case 11: /* report window state */ 3097 case 11: /* report window state */
3593 XGetWindowAttributes (disp, parent[0], &wattr); 3098 XGetWindowAttributes (dpy, parent[0], &wattr);
3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3099 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3595 break; 3100 break;
3596 case 13: /* report window position */ 3101 case 13: /* report window position */
3597 XGetWindowAttributes (disp, parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 XTranslateCoordinates (disp, parent[0], wattr.root, 3103 XTranslateCoordinates (dpy, parent[0], wattr.root,
3599 -wattr.border_width, -wattr.border_width, 3104 -wattr.border_width, -wattr.border_width,
3600 &x, &y, &wdummy); 3105 &x, &y, &wdummy);
3601 tt_printf ("\033[3;%d;%dt", x, y); 3106 tt_printf ("\033[3;%d;%dt", x, y);
3602 break; 3107 break;
3603 case 14: /* report window size (pixels) */ 3108 case 14: /* report window size (pixels) */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3110 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3606 break; 3111 break;
3607 case 18: /* report text area size (chars) */ 3112 case 18: /* report text area size (chars) */
3608 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3113 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3609 break; 3114 break;
… …
3611 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3116 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3612 break; 3117 break;
3613 case 20: /* report icon label */ 3118 case 20: /* report icon label */
3614 { 3119 {
3615 char *s; 3120 char *s;
3616 XGetIconName (disp, parent[0], &s); 3121 XGetIconName (dpy, parent[0], &s);
3617 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3122 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3618 XFree (s); 3123 XFree (s);
3619 } 3124 }
3620 break; 3125 break;
3621 case 21: /* report window title */ 3126 case 21: /* report window title */
3622 { 3127 {
3623 char *s; 3128 char *s;
3624 XFetchName (disp, parent[0], &s); 3129 XFetchName (dpy, parent[0], &s);
3625 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3130 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3131 XFree (s);
3627 } 3132 }
3628 break; 3133 break;
3629 } 3134 }
3630} 3135}
… …
3633/*----------------------------------------------------------------------*/ 3138/*----------------------------------------------------------------------*/
3634/* 3139/*
3635 * get input up until STRING TERMINATOR (or BEL) 3140 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3141 * ends_how is terminator used. returned input must be free()'d
3637 */ 3142 */
3638unsigned char * 3143char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3144rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3145{
3641 unicode_t ch; 3146 unicode_t ch;
3642 bool seen_esc = false; 3147 bool seen_esc = false;
3643 unsigned int n = 0; 3148 unsigned int n = 0;
… …
3657 seen_esc = true; 3162 seen_esc = true;
3658 continue; 3163 continue;
3659 } 3164 }
3660 else if (ch == C0_BEL || ch == CHAR_ST) 3165 else if (ch == C0_BEL || ch == CHAR_ST)
3661 break; 3166 break;
3167 else if (ch == C0_SYN)
3168 ch = cmd_get8 ();
3662 else if (ch < 0x20) 3169 else if (ch < 0x20)
3663 return NULL; /* other control character - exit */ 3170 return NULL; /* other control character - exit */
3664 3171
3665 seen_esc = false; 3172 seen_esc = false;
3666 3173
3667 if (n >= STRING_MAX - 1) 3174 if (n >= STRING_MAX - 1)
3668 // stop at some sane length 3175 // stop at some sane length
3669 return NULL; 3176 return NULL;
3670 3177
3671 if (ch == C0_SYN)
3672 string[n++] = cmd_get8 ();
3673 else
3674 string[n++] = ch; 3178 string[n++] = ch;
3675 } 3179 }
3676 3180
3677 string[n++] = '\0'; 3181 string[n++] = '\0';
3678 3182
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3183 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3184
3681 return (unsigned char *)rxvt_wcstombs (string); 3185 return rxvt_wcstombs (string);
3682} 3186}
3683 3187
3684/*----------------------------------------------------------------------*/ 3188/*----------------------------------------------------------------------*/
3685/* 3189/*
3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3190 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3687 */ 3191 */
3688void 3192void
3689rxvt_term::process_dcs_seq () 3193rxvt_term::process_dcs_seq ()
3690{ 3194{
3691 unsigned char *s; 3195 char *s;
3692 unicode_t eh; 3196 unicode_t eh;
3693 3197
3694 /* 3198 /*
3695 * Not handled yet 3199 * Not handled yet
3696 */ 3200 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3219 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3220 arg = arg * 10 + (ch - '0');
3717 3221
3718 if (ch == ';') 3222 if (ch == ';')
3719 { 3223 {
3720 unsigned char *s = get_to_st (eh); 3224 char *s = get_to_st (eh);
3721 3225
3722 if (s) 3226 if (s)
3723 { 3227 {
3724 process_xterm_seq (arg, (char *)s, eh); 3228 process_xterm_seq (arg, s, eh);
3725 free (s); 3229 free (s);
3726 } 3230 }
3727 } 3231 }
3728} 3232}
3729 3233
3730void 3234void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3235rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3732{ 3236{
3733 if (str[0] == '?' && !str[1]) 3237 if (str[0] == '?' && !str[1])
3734 { 3238 {
3735 unsigned short r, g, b; 3239 rgba c;
3736 pix_colors_focused[color].get (display, r, g, b); 3240 pix_colors_focused[color].get (c);
3241
3242#if XFT
3243 if (c.a != rgba::MAX_CC)
3244 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3245 else
3246#endif
3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3247 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3738 } 3248 }
3739 else 3249 else
3740 set_window_color (color, str); 3250 set_window_color (color, str);
3741} 3251}
3742 3252
3743/* 3253/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3254 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3255 */
3746void 3256void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3257rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3258{
3749 int changed = 0;
3750 int color; 3259 int color;
3751 char *buf, *name; 3260 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3261 bool query = str[0] == '?' && !str[1];
3753 int saveop = op; 3262 int saveop = op;
3754 dDisp; 3263
3264 dLocal (Display *, dpy);
3755 3265
3756 assert (str != NULL); 3266 assert (str != NULL);
3267
3268 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3269 return;
3270
3757 switch (op) 3271 switch (op)
3758 { 3272 {
3759 case XTerm_name: 3273 case XTerm_name:
3760 set_title (str); 3274 set_title (str);
3761 /* FALLTHROUGH */ 3275 /* FALLTHROUGH */
… …
3775 unsigned long bytes_after; 3289 unsigned long bytes_after;
3776 unsigned char *value = 0; 3290 unsigned char *value = 0;
3777 const char *str = ""; 3291 const char *str = "";
3778 3292
3779 if (prop 3293 if (prop
3780 && XGetWindowProperty (disp, parent[0], 3294 && XGetWindowProperty (dpy, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3295 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3296 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3297 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3298 && actual_type != None
3785 && actual_format == 8) 3299 && actual_format == 8)
3786 str = (const char *)(value); 3300 str = (const char *)(value);
3787 3301
3788 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3302 tt_printf ("\033]%d;%s%c", op, str, resp);
3789 3303
3790 XFree (value); 3304 XFree (value);
3791 } 3305 }
3792 else 3306 else
3793 { 3307 {
… …
3797 { 3311 {
3798 *eq = 0; 3312 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3313 set_utf8_property (display->atom (str), eq + 1);
3800 } 3314 }
3801 else 3315 else
3802 XDeleteProperty (disp, parent[0], 3316 XDeleteProperty (dpy, parent[0],
3803 display->atom (str)); 3317 display->atom (str));
3804 } 3318 }
3805 break; 3319 break;
3806 3320
3807 case XTerm_Color: 3321 case XTerm_Color:
… …
3809 { 3323 {
3810 if ((name = strchr (buf, ';')) == NULL) 3324 if ((name = strchr (buf, ';')) == NULL)
3811 break; 3325 break;
3812 3326
3813 *name++ = '\0'; 3327 *name++ = '\0';
3814 color = atoi (buf); 3328 color = atoi (buf) + minCOLOR;
3815 3329
3816 if (color < 0 || color >= TOTAL_COLORS) 3330 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3817 break; 3331 break;
3818 3332
3819 if ((buf = strchr (name, ';')) != NULL) 3333 if ((buf = strchr (name, ';')) != NULL)
3820 *buf++ = '\0'; 3334 *buf++ = '\0';
3821 3335
3822 if (name[0] == '?' && !name[1]) 3336 process_color_seq (op, color, name, resp);
3823 {
3824 unsigned short r, g, b;
3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3827 }
3828 else
3829 set_window_color (color + minCOLOR, name);
3830 } 3337 }
3831 break; 3338 break;
3832 case XTerm_Color00: 3339 case XTerm_Color00:
3833 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3340 process_color_seq (op, Color_fg, str, resp);
3834 break; 3341 break;
3835 case XTerm_Color01: 3342 case XTerm_Color01:
3836 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3343 process_color_seq (op, Color_bg, str, resp);
3837 break; 3344 break;
3838#ifndef NO_CURSORCOLOR 3345#ifndef NO_CURSORCOLOR
3839 case XTerm_Color_cursor: 3346 case XTerm_Color_cursor:
3840 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3347 process_color_seq (op, Color_cursor, str, resp);
3841 break; 3348 break;
3842#endif 3349#endif
3843 case XTerm_Color_pointer_fg: 3350 case XTerm_Color_pointer_fg:
3844 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3351 process_color_seq (op, Color_pointer_fg, str, resp);
3845 break; 3352 break;
3846 case XTerm_Color_pointer_bg: 3353 case XTerm_Color_pointer_bg:
3847 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3354 process_color_seq (op, Color_pointer_bg, str, resp);
3848 break; 3355 break;
3849#ifndef NO_BOLD_UNDERLINE_REVERSE 3356#ifndef NO_BOLD_UNDERLINE_REVERSE
3850 case XTerm_Color_BD:
3851 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3852 break;
3853 case XTerm_Color_UL:
3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3855 break;
3856 case XTerm_Color_RV: 3357 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3358 process_color_seq (op, Color_RV, str, resp);
3359 break;
3360 case Rxvt_Color_BD:
3361 case URxvt_Color_BD:
3362 process_color_seq (op, Color_BD, str, resp);
3363 break;
3364 case Rxvt_Color_UL:
3365 case URxvt_Color_UL:
3366 process_color_seq (op, Color_UL, str, resp);
3858 break; 3367 break;
3859 case URxvt_Color_IT: 3368 case URxvt_Color_IT:
3860 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3369 process_color_seq (op, Color_IT, str, resp);
3861 break; 3370 break;
3862#endif 3371#endif
3863#if TRANSPARENT && TINTING 3372#if ENABLE_TRANSPARENCY
3864 case URxvt_Color_tint: 3373 case URxvt_Color_tint:
3865 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3374 process_color_seq (op, Color_tint, str, resp);
3866 check_our_parents (); 3375 {
3867 if (am_transparent) 3376 bool changed = false;
3868 want_full_refresh = want_refresh = 1; 3377 if (ISSET_PIXCOLOR (Color_tint))
3869 break; 3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3870#endif 3379 else
3380 changed = bgPixmap.unset_tint ();
3381 if (changed)
3382 update_background ();
3383 }
3871 3384
3385 break;
3386#endif
3387
3388#if BG_IMAGE_FROM_FILE
3872 case XTerm_Pixmap: 3389 case Rxvt_Pixmap:
3873 if (*str != ';') 3390 if (!strcmp (str, "?"))
3874 { 3391 {
3875#if XPM_BACKGROUND 3392 char str[256];
3876 scale_pixmap (""); /* reset to default scaling */ 3393
3877 set_bgPixmap (str); /* change pixmap */ 3394 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3878#endif 3395 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3879 scr_touch (true); 3396 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3397 process_xterm_seq (XTerm_title, str, CHAR_ST);
3880 } 3398 }
3881 while ((str = strchr (str, ';')) != NULL) 3399 else
3882 { 3400 {
3401 int changed = 0;
3402
3403 if (*str != ';')
3404 {
3405 /* reset to default scaling :*/
3406 bgPixmap.unset_geometry ();
3407 if (bgPixmap.set_file (str)) /* change pixmap */
3408 changed++;
3409 str = strchr (str, ';');
3410 if (str == NULL)
3411 bgPixmap.set_defaultGeometry ();
3412 }
3413 while (str)
3414 {
3883 str++; 3415 str++;
3884#if XPM_BACKGROUND 3416 if (bgPixmap.set_geometry (str))
3885 changed += scale_pixmap (str); 3417 changed++;
3886#endif 3418 str = strchr (str, ';');
3419 }
3420 if (changed)
3421 update_background ();
3887 } 3422 }
3888
3889 if (changed)
3890 {
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893#endif
3894 scr_touch (true);
3895 }
3896 break; 3423 break;
3424#endif
3897 3425
3898 case XTerm_restoreFG: 3426 case Rxvt_restoreFG:
3899 set_window_color (Color_fg, str); 3427 set_window_color (Color_fg, str);
3900 break; 3428 break;
3901 case XTerm_restoreBG: 3429 case Rxvt_restoreBG:
3902 set_window_color (Color_bg, str); 3430 set_window_color (Color_bg, str);
3903 break; 3431 break;
3904 3432
3905 case XTerm_logfile: 3433 case XTerm_logfile:
3906 // TODO, when secure mode? 3434 // TODO, when secure mode?
3907 break; 3435 break;
3908 3436
3909#ifdef MENUBAR
3910 case URxvt_Menu:
3911 if (OPTION (Opt_insecure))
3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3913 break;
3914#endif
3915#if 0 3437#if 0
3916 case XTerm_dumpscreen: /* no error notices */ 3438 case Rxvt_dumpscreen: /* no error notices */
3917 { 3439 {
3918 int fd; 3440 int fd;
3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3441 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3920 { 3442 {
3921 scr_dump (fd); 3443 scr_dump (fd);
… …
3932 case URxvt_italicFont: 3454 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3455 case URxvt_boldItalicFont:
3934#endif 3456#endif
3935 if (query) 3457 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3458 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3459 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3460 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3461 resp);
3940 else 3462 else
3941 { 3463 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3464 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3945 allocated.push_back ((void *)res); 3467 allocated.push_back ((void *)res);
3946 set_fonts (); 3468 set_fonts ();
3947 } 3469 }
3948 break; 3470 break;
3949 3471
3950#if ENABLE_FRILLS 3472 case URxvt_version:
3473 if (query)
3474 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3475 op,
3476 rs[Rs_name], VERSION[0], VERSION[2],
3477 resp);
3478 break;
3479
3480#if !ENABLE_MINIMAL
3951 case URxvt_locale: 3481 case URxvt_locale:
3952 if (query) 3482 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3483 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3954 else 3484 else
3955 { 3485 {
3956 set_locale (str); 3486 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8); 3487 pty->set_utf8_mode (enc_utf8);
3958 init_xlocale (); 3488 init_xlocale ();
3959 } 3489 }
3960 break; 3490 break;
3961 3491
3962 case URxvt_view_up: 3492 case URxvt_view_up:
3963 case URxvt_view_down: 3493 case URxvt_view_down:
3494 {
3964 int lines = atoi (str); 3495 int lines = atoi (str);
3965 3496
3966 if (lines) 3497 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 3498 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 3499 else
3969 {
3970 scr_erase_savelines (); 3500 scr_erase_savelines ();
3971 } 3501 }
3972 3502
3503 break;
3504#endif
3505
3506#if ENABLE_PERL
3507 case URxvt_perl:
3508 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3509 ; // no responses yet
3973 break; 3510 break;
3974#endif 3511#endif
3975 } 3512 }
3976} 3513}
3977/*----------------------------------------------------------------------*/ 3514/*----------------------------------------------------------------------*/
… …
4008 return state; 3545 return state;
4009} 3546}
4010 3547
4011/* we're not using priv _yet_ */ 3548/* we're not using priv _yet_ */
4012void 3549void
4013rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3550rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4014{ 3551{
4015 unsigned int i, j; 3552 unsigned int i, j;
4016 int state; 3553 int state;
4017 3554
4018 static const struct 3555 static const struct
4019 { 3556 {
4020 const int argval; 3557 const int argval;
4021 const unsigned long bit; 3558 const unsigned long bit;
4022 }
4023
4024 argtopriv[] = { 3559 } argtopriv[] = {
4025 { 1, PrivMode_aplCUR }, 3560 { 1, PrivMode_aplCUR },
4026 { 2, PrivMode_vt52 }, 3561 { 2, PrivMode_vt52 },
4027 { 3, PrivMode_132 }, 3562 { 3, PrivMode_132 },
4028 { 4, PrivMode_smoothScroll }, 3563 { 4, PrivMode_smoothScroll },
4029 { 5, PrivMode_rVideo }, 3564 { 5, PrivMode_rVideo },
4030 { 6, PrivMode_relOrigin }, 3565 { 6, PrivMode_relOrigin },
4031 { 7, PrivMode_Autowrap }, 3566 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode 3567 // 8, bi-directional support mode
4033 { 9, PrivMode_MouseX10 }, 3568 { 9, PrivMode_MouseX10 },
4034#ifdef menuBar_esc
4035 { menuBar_esc, PrivMode_menuBar },
4036#endif
4037 // 18, 19 printing-related 3569 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor }, 3570 { 25, PrivMode_VisibleCursor },
4039#ifdef scrollBar_esc 3571#ifdef scrollBar_esc
4040 { scrollBar_esc, PrivMode_scrollBar }, 3572 { scrollBar_esc, PrivMode_scrollBar },
4041#endif 3573#endif
… …
4049#ifndef NO_BACKSPACE_KEY 3581#ifndef NO_BACKSPACE_KEY
4050 { 67, PrivMode_BackSpace }, 3582 { 67, PrivMode_BackSpace },
4051#endif 3583#endif
4052 { 1000, PrivMode_MouseX11 }, 3584 { 1000, PrivMode_MouseX11 },
4053 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4054 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3586 { 1002, PrivMode_MouseBtnEvent },
4055 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3587 { 1003, PrivMode_MouseAnyEvent },
4056 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4057 { 1011, PrivMode_Keypress }, // rxvt extension 3589 { 1011, PrivMode_Keypress }, // rxvt extension
4058 // 1035 enable modifiers for alt, numlock NYI 3590 // 1035 enable modifiers for alt, numlock NYI
4059 // 1036 send ESC for meta keys NYI 3591 // 1036 send ESC for meta keys NYI
4060 // 1037 send DEL for keypad delete NYI 3592 // 1037 send DEL for keypad delete NYI
… …
4088 /* extra handling for values with state unkept */ 3620 /* extra handling for values with state unkept */
4089 switch (arg[i]) 3621 switch (arg[i])
4090 { 3622 {
4091#if ENABLE_STYLES 3623#if ENABLE_STYLES
4092 case 1021: 3624 case 1021:
4093 if (mode) 3625 set_option (Opt_intensityStyles, mode);
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097 3626
4098 scr_touch (true); 3627 scr_touch (true);
4099 break; 3628 break;
4100#endif 3629#endif
4101 case 1048: /* alternative cursor save */ 3630 case 1048: /* alternative cursor save */
4102 case 1049: 3631 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3632 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3633 if (mode == 0)
4105 scr_cursor (RESTORE); 3634 scr_cursor (RESTORE);
4106 else if (mode == 1) 3635 else if (mode == 1)
4107 scr_cursor (SAVE); 3636 scr_cursor (SAVE);
4108 break; 3637 break;
… …
4123 case 3: /* 80/132 */ 3652 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3653 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3654 set_widthheight (((state ? 132 : 80) * fwidth), height);
4126 break; 3655 break;
4127 case 4: /* smooth scrolling */ 3656 case 4: /* smooth scrolling */
4128 if (!state) 3657 set_option (Opt_jumpScroll, !state);
4129 SET_OPTION (Opt_jumpScroll);
4130 else
4131 CLR_OPTION (Opt_jumpScroll);
4132 break; 3658 break;
4133 case 5: /* reverse video */ 3659 case 5: /* reverse video */
4134 scr_rvideo_mode (state); 3660 scr_rvideo_mode (state);
4135 break; 3661 break;
4136 case 6: /* relative/absolute origins */ 3662 case 6: /* relative/absolute origins */
… …
4140 scr_autowrap (state); 3666 scr_autowrap (state);
4141 break; 3667 break;
4142 /* case 8: - auto repeat, can't do on a per window basis */ 3668 /* case 8: - auto repeat, can't do on a per window basis */
4143 case 9: /* X10 mouse reporting */ 3669 case 9: /* X10 mouse reporting */
4144 if (state) /* orthogonal */ 3670 if (state) /* orthogonal */
4145 priv_modes &= ~PrivMode_MouseX11; 3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4146 break; 3672 break;
4147#ifdef menuBar_esc
4148 case menuBar_esc:
4149#ifdef MENUBAR
4150 map_menuBar (state);
4151#endif
4152 break;
4153#endif
4154#ifdef scrollBar_esc 3673#ifdef scrollBar_esc
4155 case scrollBar_esc: 3674 case scrollBar_esc:
4156 if (scrollbar_mapping (state)) 3675 if (scrollbar_mapping (state))
4157 { 3676 {
4158 resize_all_windows (0, 0, 0); 3677 resize_all_windows (0, 0, 0);
… …
4170 break; 3689 break;
4171 /* case 66: - application key pad */ 3690 /* case 66: - application key pad */
4172 /* case 67: - backspace key */ 3691 /* case 67: - backspace key */
4173 case 1000: /* X11 mouse reporting */ 3692 case 1000: /* X11 mouse reporting */
4174 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
4175 priv_modes &= ~PrivMode_MouseX10; 3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4176 break; 3695 break;
4177#if 0 3696#if 0
4178 case 1001: 3697 case 1001:
4179 break; /* X11 mouse highlighting */ 3698 break; /* X11 mouse highlighting */
4180#endif 3699#endif
3700 case 1002:
3701 case 1003:
3702 if (state) {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 } else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
4181 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
4182 if (!state) 3711 set_option (Opt_scrollTtyOutput, !state);
4183 SET_OPTION (Opt_scrollTtyOutput);
4184 else
4185 CLR_OPTION (Opt_scrollTtyOutput);
4186 break; 3712 break;
4187 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
4188 if (state) 3714 set_option (Opt_scrollTtyKeypress, state);
4189 SET_OPTION (Opt_scrollTtyKeypress);
4190 else
4191 CLR_OPTION (Opt_scrollTtyKeypress);
4192 break; 3715 break;
4193 case 1047: /* secondary screen w/ clearing last */ 3716 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 3717 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3718 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3719 scr_erase_screen (2);
4197 scr_change_screen (state); 3720 scr_change_screen (state);
4198 break; 3721 break;
4199 case 1049: /* secondary screen w/ clearing first */ 3722 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state); 3723 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3726 scr_erase_screen (2);
4204 break; 3727 break;
4205 default: 3728 default:
4206 break; 3729 break;
… …
4334 scr_color (Color_bg, Color_bg); 3857 scr_color (Color_bg, Color_bg);
4335 break; 3858 break;
4336 3859
4337 //case 50: // not variable spacing 3860 //case 50: // not variable spacing
4338 3861
4339#ifndef NO_BRIGHTCOLOR 3862#if !ENABLE_MINIMAL
4340 case 90: 3863 case 90:
4341 case 91: /* set bright fg color */ 3864 case 91: /* set bright fg color */
4342 case 92: 3865 case 92:
4343 case 93: 3866 case 93:
4344 case 94: 3867 case 94:
… …
4389 */ 3912 */
4390void 3913void
4391rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
4392{ 3915{
4393 va_list arg_ptr; 3916 va_list arg_ptr;
4394 unsigned char buf[256]; 3917 char buf[256];
4395 3918
4396 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 3921 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 3922 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 3927 * or generated by us in response to a query ESC sequence.
4405 */ 3928 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 3930
4408void 3931void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 3933{
3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
3936
3937 if (pty->pty < 0)
3938 return;
3939
4411 if (v_buflen == 0) 3940 if (v_buflen == 0)
4412 { 3941 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4414 3943
4415 if ((unsigned int)written == len) 3944 if ((unsigned int)written == len)
4416 return; 3945 return;
4417 3946
4418 data += written; 3947 data += written;
4419 len -= written; 3948 len -= written;
4420 } 3949 }
4421 3950
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 3952
4424 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 3954 v_buflen += len;
4426 3955
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4428} 3957}
4429 3958
4430void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4431{ 3960{
4432 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4433 3962
4434 if (written > 0) 3963 if (written > 0)
4435 { 3964 {
4436 v_buflen -= written; 3965 v_buflen -= written;
4437 3966
4438 if (v_buflen == 0) 3967 if (v_buflen == 0)
4439 { 3968 {
4440 free (v_buffer); 3969 free (v_buffer);
4441 v_buffer = 0; 3970 v_buffer = 0;
4442 v_buflen = 0;
4443 3971
4444 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4445 return; 3973 return;
4446 } 3974 }
4447 3975
4448 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4449 } 3977 }
4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4451 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4452} 3980}
4453 3981
4454/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4455 3983

Diff Legend

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