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.296 by root, Tue Jan 31 14:16:59 2006 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
232 231
… …
280 } 279 }
281 280
282 iso14755buf = 0; 281 iso14755buf = 0;
283} 282}
284 283
285int 284static int
286rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
287{ 286{
288 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
289 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
290 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
291 { 290 {
… …
299 298
300 return -1; 299 return -1;
301} 300}
302#endif 301#endif
303 302
304/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
305void 392void
306rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
307{ 394{
308 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
309 unsigned int newlen;
310 KeySym keysym; 396 KeySym keysym;
311 int valid_keysym; 397 int valid_keysym;
312 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
313 404
314 /* 405 /*
315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 406 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
316 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
317 * 408 *
… …
497# if ISO_14755 588# if ISO_14755
498 iso14755_51 (0); 589 iso14755_51 (0);
499# endif 590# endif
500 return; 591 return;
501 } 592 }
593 else if (keysym == XK_BackSpace)
594 {
595 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
596# if ISO_14755
597 iso14755_51 (iso14755buf & ISO_14755_MASK);
598# endif
599 return;
600 }
502 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
503 { 602 {
504 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 603 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
505 | hv | ISO_14755_51; 604 | hv | ISO_14755_51;
506# if ISO_14755 605# if ISO_14755
… …
508# endif 607# endif
509 return; 608 return;
510 } 609 }
511 else 610 else
512 { 611 {
513# if ENABLE_OVERLAY 612# if ISO_14755
514 scr_overlay_off (); 613 scr_overlay_off ();
515# endif 614# endif
516 iso14755buf = 0; 615 iso14755buf = 0;
517 } 616 }
518 } 617 }
519 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
520 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
521 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
522 { 621 {
523 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
524# if ENABLE_OVERLAY 623# if ISO_14755
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 626# endif
528 } 627 }
529#endif 628#endif
530 629
531#ifdef PRINTPIPE 630#ifdef PRINTPIPE
532 if (keysym == XK_Print) 631 if (keysym == XK_Print)
533 { 632 {
534 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
535 return; 634 return;
536 } 635 }
537#endif 636#endif
538 637
539 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
540 { 639 {
541 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
542 newlen = 1; 641 unsigned int newlen = 1;
543 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
544 { 644 {
545#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
546 case XK_BackSpace: 646 case XK_BackSpace:
547 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
548 { 648 {
549 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
550 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
551 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
552 } 652 }
553 else 653 else
554 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
555 break; 655 break;
556#endif 656#endif
557#ifndef NO_DELETE_KEY 657#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior
559 case XK_KP_Delete:
560 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
562 {
563 strcpy (kbuf, "\033On");
564 break;
565 }
566 /* FALLTHROUGH */
567# endif
568 case XK_Delete: 658 case XK_Delete:
569 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
570 break; 660 break;
571#endif 661#endif
572 case XK_Tab: 662 case XK_Tab:
573 if (shft) 663 if (shft)
574 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
584#endif 674#endif
585 newlen = 0; 675 newlen = 0;
586 } 676 }
587 break; 677 break;
588 678
589#ifdef XK_KP_Left
590 case XK_KP_Up: /* \033Ox or standard */
591 case XK_KP_Down: /* \033Or or standard */
592 case XK_KP_Right: /* \033Ov or standard */
593 case XK_KP_Left: /* \033Ot or standard */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
595 {
596 strcpy (kbuf, "\033OZ");
597 kbuf[2] = "txvr"[keysym - XK_KP_Left];
598 break;
599 }
600 else
601 /* translate to std. cursor key */
602 keysym = XK_Left + (keysym - XK_KP_Left);
603 /* FALLTHROUGH */
604#endif
605 case XK_Up: /* "\033[A" */ 679 case XK_Up: /* "\033[A" */
606 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
607 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
608 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
609 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
618 } 692 }
619 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
620 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
621 break; 695 break;
622 696
623#ifndef UNSHIFTED_SCROLLKEYS
624# ifdef XK_KP_Prior
625 case XK_KP_Prior:
626 /* allow shift to override */
627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
628 {
629 strcpy (kbuf, "\033Oy");
630 break;
631 }
632 /* FALLTHROUGH */
633# endif
634 case XK_Prior:
635 strcpy (kbuf, "\033[5~");
636 break;
637# ifdef XK_KP_Next
638 case XK_KP_Next:
639 /* allow shift to override */
640 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
641 {
642 strcpy (kbuf, "\033Os");
643 break;
644 }
645 /* FALLTHROUGH */
646# endif
647 case XK_Next:
648 strcpy (kbuf, "\033[6~");
649 break;
650#endif
651 case XK_KP_Enter: 697 case XK_KP_Enter:
652 /* allow shift to override */ 698 /* allow shift to override */
653 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
654 { 700 {
655 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
656 break; 702 break;
657 } 703 }
658 704
… …
670 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
671 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
672 } 718 }
673 break; 719 break;
674 720
675#ifdef XK_KP_Begin
676 case XK_KP_Begin:
677 strcpy (kbuf, "\033Ou");
678 break;
679
680#endif
681 case XK_KP_F1: /* "\033OP" */ 721 case XK_KP_F1: /* "\033OP" */
682 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
683 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
684 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
685 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
701 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
702 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
703 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
704 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
705 /* allow shift to override */ 745 /* allow shift to override */
706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
707 { 747 {
708 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
709 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
710 } 750 }
711 else 751 else
… …
713 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
714 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
715 } 755 }
716 break; 756 break;
717 757
718 case XK_Find:
719 strcpy (kbuf, "\033[1~");
720 break;
721
722#ifdef XK_KP_End
723 case XK_KP_Insert:
724 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
726 {
727 strcpy (kbuf, "\033Op");
728 break;
729 }
730 /* FALLTHROUGH */
731#endif
732 case XK_Insert:
733 strcpy (kbuf, "\033[2~");
734 break;
735#ifdef DXK_Remove /* support for DEC remove like key */
736 case DXK_Remove:
737 /* FALLTHROUGH */
738#endif
739 case XK_Execute:
740 strcpy (kbuf, "\033[3~");
741 break;
742 case XK_Select:
743 strcpy (kbuf, "\033[4~");
744 break;
745#ifdef XK_KP_End
746 case XK_KP_End:
747 /* allow shift to override */
748 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
749 {
750 strcpy (kbuf, "\033Oq");
751 break;
752 }
753 /* FALLTHROUGH */
754#endif
755 case XK_End: 758 case XK_End:
756 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
757 break; 760 break;
758#ifdef XK_KP_Home
759 case XK_KP_Home:
760 /* allow shift to override */
761 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
762 {
763 strcpy (kbuf, "\033Ow");
764 break;
765 }
766 /* FALLTHROUGH */
767#endif
768 case XK_Home: 761 case XK_Home:
769 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
770 break; 763 break;
771 764
772#define FKEY(n, fkey) \
773 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
774
775 case XK_F1: /* "\033[11~" */
776 case XK_F2: /* "\033[12~" */
777 case XK_F3: /* "\033[13~" */
778 case XK_F4: /* "\033[14~" */
779 case XK_F5: /* "\033[15~" */
780 FKEY (11, XK_F1);
781 break;
782 case XK_F6: /* "\033[17~" */
783 case XK_F7: /* "\033[18~" */
784 case XK_F8: /* "\033[19~" */
785 case XK_F9: /* "\033[20~" */
786 case XK_F10: /* "\033[21~" */
787 FKEY (17, XK_F6);
788 break;
789 case XK_F11: /* "\033[23~" */
790 case XK_F12: /* "\033[24~" */
791 case XK_F13: /* "\033[25~" */
792 case XK_F14: /* "\033[26~" */
793 FKEY (23, XK_F11);
794 break;
795 case XK_F15: /* "\033[28~" */
796 case XK_F16: /* "\033[29~" */
797 FKEY (28, XK_F15);
798 break;
799 case XK_Help: /* "\033[28~" */
800 FKEY (28, XK_Help);
801 break;
802 case XK_Menu: /* "\033[29~" */
803 FKEY (29, XK_Menu);
804 break;
805 case XK_F17: /* "\033[31~" */
806 case XK_F18: /* "\033[32~" */
807 case XK_F19: /* "\033[33~" */
808 case XK_F20: /* "\033[34~" */
809 case XK_F21: /* "\033[35~" */
810 case XK_F22: /* "\033[36~" */
811 case XK_F23: /* "\033[37~" */
812 case XK_F24: /* "\033[38~" */
813 case XK_F25: /* "\033[39~" */
814 case XK_F26: /* "\033[40~" */
815 case XK_F27: /* "\033[41~" */
816 case XK_F28: /* "\033[42~" */
817 case XK_F29: /* "\033[43~" */
818 case XK_F30: /* "\033[44~" */
819 case XK_F31: /* "\033[45~" */
820 case XK_F32: /* "\033[46~" */
821 case XK_F33: /* "\033[47~" */
822 case XK_F34: /* "\033[48~" */
823 case XK_F35: /* "\033[49~" */
824 FKEY (31, XK_F17);
825 break;
826#undef FKEY
827 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
828 newlen = 0; 771 newlen = 0;
772 }
829 break; 773 break;
830 } 774 }
831 775
832 if (newlen) 776 if (newlen)
833 len = strlen (kbuf); 777 len = strlen (kbuf);
834 }
835 778
836 /* 779 /*
837 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
838 */ 781 */
839#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
874 return; 817 return;
875 818
876 if (len <= 0) 819 if (len <= 0)
877 return; /* not mapped */ 820 return; /* not mapped */
878 821
879 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 823 if (view_start)
881 { 824 {
882 view_start = 0; 825 view_start = 0;
883 want_refresh = 1; 826 want_refresh = 1;
884 } 827 }
… …
908 tt_write (&ch, 1); 851 tt_write (&ch, 1);
909 } 852 }
910 853
911 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
912} 855}
913/*}}} */ 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
914 933
915#if defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
916unsigned int 935unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 937{
… …
948void 967void
949rxvt_term::flush () 968rxvt_term::flush ()
950{ 969{
951 flush_ev.stop (); 970 flush_ev.stop ();
952 971
953#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
954 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
955 { 974 {
956 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
957 scr_clear ();
958 scr_touch (false); 976 scr_touch (false);
959 } 977 }
960#endif 978#endif
961 979
962 if (want_refresh) 980 if (want_refresh)
… …
1007 } 1025 }
1008 1026
1009 display->flush (); 1027 display->flush ();
1010} 1028}
1011 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1012void 1031void
1013rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1033{
1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1038}
1039
1040void
1041rxvt_term::flush_cb (ev::timer &w, int revents)
1014{ 1042{
1015 make_current (); 1043 make_current ();
1016 1044
1017 display->flush ();
1018
1019 if (want_refresh && !flush_ev.active)
1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1021}
1022
1023void
1024rxvt_term::flush_cb (time_watcher &w)
1025{
1026 make_current ();
1027
1028 refresh_limit = 1;
1029 refresh_count = 0; 1045 refresh_count = 0;
1030 flush (); 1046 flush ();
1031} 1047}
1032 1048
1033#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1034void 1050void
1035rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1036{ 1052{
1037 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1038 want_refresh = 1; 1054 want_refresh = 1;
1039 1055 refresh_check ();
1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1041} 1056}
1042#endif 1057#endif
1043 1058
1044#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1045void 1060void
1046rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1047{ 1062{
1048 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1049 { 1064 {
1050 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1051 want_refresh = 1; 1066 want_refresh = 1;
1052 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1053 } 1068 }
1069 else
1070 w.stop ();
1054} 1071}
1055#endif 1072#endif
1056 1073
1057#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1058void 1075void
1059rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1060{ 1077{
1061 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1062 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1063 { 1080 {
1064 want_refresh = 1; 1081 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1066 } 1083 }
1084 else
1085 w.stop ();
1067} 1086}
1068#endif 1087#endif
1069 1088
1070#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1071void 1090void
1072rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1073{ 1092{
1074 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1075 { 1094 {
1076 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1077 want_refresh = 1; 1096 want_refresh = 1;
1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1079 } 1098 }
1099 else
1100 w.stop ();
1080} 1101}
1081#endif 1102#endif
1082 1103
1083#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1084void 1105void
1085rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1086{ 1107{
1087 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1089 : scr_page (UP, mouse_slip_wheel_speed))
1090 { 1109 {
1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1094 want_refresh = 1; 1110 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1096 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1097} 1119}
1098#endif 1120#endif
1099 1121
1100#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1101static struct event_handler 1123static struct event_handler
1102{ 1124{
1103 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1104 1126
1105 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1106 { 1128 {
1107 sched_yield (); 1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1133
1134 struct timespec ts = { 0, 0 };
1135 nanosleep (&ts, 0);
1136
1108 w.stop (); 1137 w.stop ();
1109 } 1138 }
1110 1139
1111 event_handler () 1140 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1141 : yield_ev (this, &event_handler::yield_cb)
1113 { 1142 {
1114 } 1143 }
1115} event_handler; 1144} event_handler;
1116#endif 1145#endif
1117 1146
… …
1137 cmdbuf_endp += r; 1166 cmdbuf_endp += r;
1138 return true; 1167 return true;
1139 } 1168 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1170 {
1142#if HAVE_SCHED_YIELD 1171#if LINUX_YIELD_HACK
1143 if (display->is_local) 1172 if (display->is_local)
1144 event_handler.cw_yield.start (); 1173 event_handler.yield_ev.start ();
1145#endif 1174#endif
1146 } 1175 }
1147 else 1176 else
1148 { 1177 {
1149 pty_ev.stop (); 1178 pty_ev.stop ();
1150 1179
1151 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1152 destroy (); 1181 destroy ();
1153 } 1182 }
1154 1183
1155 return false; 1184 return false;
1156} 1185}
1157 1186
1158void 1187void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1160{ 1189{
1161 make_current (); 1190 make_current ();
1162 1191
1163 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1164 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1165 while (pty_fill ()) 1194 while (pty_fill ())
1166 if (cmd_parse ()) 1195 if (cmd_parse ())
1167 break; 1196 break;
1168 1197
1169 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1170 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1171} 1202}
1172 1203
1173void 1204void
1174rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1175{ 1206{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1208 recolour_cursor ();
1178 1209
1179#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1211 hidden_pointer = 0;
1181 1212
1182 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1184#endif 1215#endif
1185} 1216}
1186 1217
1187#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1188void 1219void
1189rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1190{ 1221{
1191 if (!OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1192 return; 1223 return;
1193 1224
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1226 XFlush (dpy);
1196 1227
1197 hidden_pointer = 1; 1228 hidden_pointer = 1;
1198} 1229}
1199 1230
1200void 1231void
1201rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1202{ 1233{
1203 make_current (); 1234 make_current ();
1204 1235
1205 pointer_blank (); 1236 pointer_blank ();
1206} 1237}
… …
1209void 1240void
1210rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1211{ 1242{
1212 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1213 int x, y; 1244 int x, y;
1245 int code = 32;
1214 1246
1215 x = ev.x; 1247 x = Pixel2Col (ev.x);
1216 y = ev.y; 1248 y = Pixel2Row (ev.y);
1217 pixel_position (&x, &y); 1249 if (ev.type == MotionNotify)
1250 {
1251 if (x == mouse_row && y == mouse_col)
1252 return;
1253 mouse_row = x;
1254 mouse_col = y;
1255 code += 32;
1256 }
1218 1257
1219 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1220 button_number = 3; 1259 button_number = 3;
1221 else 1260 else
1222 { 1261 {
… …
1268 x + 1, 1307 x + 1,
1269 y + 1); 1308 y + 1);
1270#endif 1309#endif
1271 1310
1272 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1273 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1274 (32 + x + 1), 1313 (32 + x + 1),
1275 (32 + y + 1)); 1314 (32 + y + 1));
1276} 1315}
1277 1316
1278/*{{{ process an X event */ 1317/*{{{ process an X event */
1279void 1318void
1280rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1281{ 1320{
1282 make_current (); 1321 make_current ();
1283 1322
1284 dLocal (Display *, xdisp); 1323 dLocal (Display *, dpy);
1285 1324
1286 if (ev.xany.window == vt 1325 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1328 return;
… …
1294 unsigned int unused_mask; 1333 unsigned int unused_mask;
1295 1334
1296 switch (ev.type) 1335 switch (ev.type)
1297 { 1336 {
1298 case KeyPress: 1337 case KeyPress:
1299#if ISO_14755 1338 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1339 break;
1305 1340
1306 case KeyRelease: 1341 case KeyRelease:
1307 { 1342 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1343 break;
1379 }
1380 1344
1381 case ButtonPress: 1345 case ButtonPress:
1382 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1383 break; 1347 break;
1384 1348
… …
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1364 destroy ();
1401 } 1365 }
1402#if ENABLE_EWMH 1366#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1370 &ev);
1407#endif 1371#endif
1408 } 1372 }
1409 } 1373 }
… …
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out (); 1380 focus_out ();
1417 } 1381 }
1418#endif 1382#endif
1419 } 1383 }
1420 break;
1421
1422 case MappingNotify:
1423 XRefreshKeyboardMapping (&ev.xmapping);
1424 break; 1384 break;
1425 1385
1426 /* 1386 /*
1427 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1428 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1447 break; 1407 break;
1448 } 1408 }
1449 break; 1409 break;
1450 1410
1451 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1415 focus_in ();
1453 break; 1416 break;
1454 1417
1455 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1422 focus_out ();
1457 break; 1423 break;
1458 1424
1459 case ConfigureNotify: 1425 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1460 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1461 { 1430 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1432 ;
1464 1433
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1435 {
1467 seen_resize = 1; 1436 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1438 }
1439 else
1440 {
1441#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif
1450 }
1470 1451
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1477 } 1453 }
1478 break; 1454 break;
1479 1455
1480 case PropertyNotify: 1456 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1497 case SelectionRequest: 1473 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1499 break; 1475 break;
1500 1476
1501 case MapNotify: 1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1502 mapped = 1; 1494 mapped = 1;
1503#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1505#endif 1497#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break; 1499 break;
1508 1500
1509 case UnmapNotify: 1501 case UnmapNotify:
… …
1511#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1512 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1513#endif 1505#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1507 break;
1516
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522 1508
1523 case GraphicsExpose: 1509 case GraphicsExpose:
1524 case Expose: 1510 case Expose:
1525 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1526 { 1512 {
1527 do 1513 do
1514 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1519
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1521
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1537 1527
1538 want_refresh = 1; 1528 want_refresh = 1;
1539 } 1529 }
1540 else 1530 else
1541 { 1531 {
1542 XEvent unused_event; 1532 XEvent unused_event;
1543 1533
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1535 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1537 ;
1548 1538
1549 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1540 {
1551 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1552 scrollbar_show (0); 1542 scrollbar_show (0);
1553 } 1543 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1544 }
1560 break; 1545 break;
1561 1546
1562 case MotionNotify: 1547 case MotionNotify:
1563#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1549 if (hidden_pointer)
1565 pointer_unblank (); 1550 pointer_unblank ();
1566#endif 1551#endif
1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1553 || priv_modes & PrivMode_MouseAnyEvent)
1554 mouse_report (ev.xbutton);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1556 break;
1569 1557
1570 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1571 { 1559 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1562 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1564 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1566 ;
1579 1567
1580 XQueryPointer (xdisp, vt, 1568 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1572 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1605 int dist; 1593 int dist;
1606 1594
1607 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1608 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1609 */ 1597 */
1610 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1612 1600
1613 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1614 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1615 */ 1603 */
1616 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1638 else 1626 else
1639 { 1627 {
1640 /* we are within the text window, so we 1628 /* we are within the text window, so we
1641 * shouldn't be scrolling 1629 * shouldn't be scrolling
1642 */ 1630 */
1643 if (sel_scroll_ev.active)
1644 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1645 } 1632 }
1646#endif 1633#endif
1647#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1648 } 1635 }
1649#endif 1636#endif
1650 } 1637 }
1651 } 1638 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1653 { 1640 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1656 ; 1643 ;
1657 1644
1658 XQueryPointer (xdisp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1649 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1651 scrollbar_size ());
1665 want_refresh = 1; 1652 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1653 scrollbar_show (1);
1668 } 1654 }
1669 break; 1655 break;
1670 } 1656 }
1671 1657
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1658#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1660 {
1677 if (hidden_cursor) 1661 if (hidden_cursor)
1678 { 1662 {
1679 hidden_cursor = 0; 1663 hidden_cursor = 0;
1680 want_refresh = 1; 1664 want_refresh = 1;
1681 } 1665 }
1682 1666
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1667 cursor_blink_ev.again ();
1684 } 1668 }
1685#endif 1669#endif
1686 1670
1687#if defined(POINTER_BLANK) 1671#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1673 {
1690 if (ev.type == MotionNotify 1674 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1675 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1676 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1677 if (hidden_pointer)
… …
1695 1679
1696 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank (); 1681 pointer_blank ();
1698 } 1682 }
1699#endif 1683#endif
1684
1685 refresh_check ();
1700} 1686}
1701 1687
1702void 1688void
1703rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1704{ 1690{
1705 if (!focus) 1691 if (!focus)
1706 { 1692 {
1707 focus = 1; 1693 focus = 1;
1708 want_refresh = 1; 1694 want_refresh = 1;
1709 1695
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1697
1712#if USE_XIM 1698#if USE_XIM
1713 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1714 { 1700 {
1715 IMSetStatusPosition (); 1701 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1717 } 1703 }
1718#endif 1704#endif
1719#if CURSOR_BLINK 1705#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1722#endif 1708#endif
1723#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1725 { 1711 {
1726 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1713 scr_recolour ();
1728 } 1714 }
1729#endif 1715#endif
1716#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell))
1718 {
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif
1730 } 1726 }
1731} 1727}
1732 1728
1733void 1729void
1734rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1742 1738
1743#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf) 1740 if (iso14755buf)
1745 { 1741 {
1746 iso14755buf = 0; 1742 iso14755buf = 0;
1747# if ENABLE_OVERLAY 1743# if ISO_14755
1748 scr_overlay_off (); 1744 scr_overlay_off ();
1749# endif 1745# endif
1750 } 1746 }
1751#endif 1747#endif
1752#if USE_XIM 1748#if USE_XIM
1753 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1755#endif 1751#endif
1756#if CURSOR_BLINK 1752#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1759 hidden_cursor = 0; 1756 hidden_cursor = 0;
1760#endif 1757#endif
1761#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1763 { 1760 {
… …
1766 } 1763 }
1767#endif 1764#endif
1768 } 1765 }
1769} 1766}
1770 1767
1771#if TRANSPARENT 1768void
1769rxvt_term::update_fade_color (unsigned int idx)
1770{
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 rgba c;
1775 pix_colors [Color_fade].get (c);
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 }
1778#endif
1779}
1780
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1782void
1773rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1784{
1775 make_current (); 1785 make_current ();
1776 1786
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return;
1790
1791# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1792 switch (ev.type)
1778 { 1793 {
1779 case PropertyNotify: 1794 case PropertyNotify:
1780 /* 1795 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1796 * if user used some Esetroot compatible prog to set the root bg,
1782 * use the property to determine the pixmap. We use it later on. 1797 * use the property to determine the pixmap. We use it later on.
1783 */ 1798 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1787 1805
1788 /* FALLTHROUGH */
1789 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1806 break;
1793 } 1807 }
1808# endif
1809
1810 refresh_check ();
1794} 1811}
1795#endif 1812#endif
1796 1813
1797void 1814void
1798rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1853 mouse_report (ev); 1870 mouse_report (ev);
1854 } 1871 }
1855#else 1872#else
1856 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1857 mouse_report (ev); 1874 mouse_report (ev);
1858#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1859 1876
1860 } 1877 }
1861 else 1878 else
1862 { 1879 {
1863 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1911 } 1928 }
1912 1929
1913 /* 1930 /*
1914 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1915 */ 1932 */
1916 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1917 { 1934 {
1918 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1919 /* 1943 /*
1920 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1921 * move up if mouse is above slider 1945 * move up if mouse is above slider
1922 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1923 * 1947 *
… …
1932 /* 1956 /*
1933 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1934 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1935 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1936 */ 1960 */
1937 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1938 && scrollbarnext_upButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_upButton (ev.y)))
1941 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1942 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1943 && scrollbarnext_dnButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_dnButton (ev.y)))
1946 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1947 else 1965 else
1948 switch (ev.button) 1966 switch (ev.button)
1949 { 1967 {
1950 case Button2: 1968 case Button2:
… …
1957 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1958 break; 1976 break;
1959 } 1977 }
1960 } 1978 }
1961 else 1979 else
1962#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1963
1964 {
1965 char upordown = 0;
1966
1967 if (scrollBar.style == R_SB_NEXT)
1968 { 1981 {
1969 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1970 upordown = -1; /* up */
1971 else if (scrollbarnext_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 else if (scrollBar.style == R_SB_RXVT)
1975 {
1976 if (scrollbarrxvt_upButton (ev.y))
1977 upordown = -1; /* up */
1978 else if (scrollbarrxvt_dnButton (ev.y))
1979 upordown = 1; /* down */
1980 }
1981 if (upordown)
1982 { 1983 {
1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 1987#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1987 { 1989 {
1988 if (upordown < 0) 1990 if (direction == UP)
1989 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1990 else 1992 else
1991 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1992 } 1994 }
1993 } 1995 }
1994 else 1996 else
1995 switch (ev.button) 1997 switch (ev.button)
1996 { 1998 {
1997 case Button2: 1999 case Button2:
1998 switch (scrollbar_align) 2000 switch (scrollBar.align)
1999 { 2001 {
2000 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2003 csrO = 0;
2002 break; 2004 break;
2003 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2011 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2015 2017
2016 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2017 break; 2019 break;
2018 2020
2019 case Button1: 2021 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2023 2025
2024 case Button3: 2026 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2035 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2036# else 2038# else
2037 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2038# endif 2040# endif
2039 else 2041 else
2040 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2041 } 2043 }
2042 else 2044 else
2043 { 2045 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2047 (nrow
… …
2062 2064
2063 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2066 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2068
2067 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2070 {
2069 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2072 scrollbar_show (0);
2071 } 2073 }
2072 2074
2073#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2076#endif 2077#endif
2077 2078
2078 if (ev.window == vt) 2079 if (ev.window == vt)
2079 { 2080 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2104 mouse_report (ev); 2105 mouse_report (ev);
2105 } 2106 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2108 mouse_report (ev); 2109 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2111 return;
2111 } 2112 }
2112 2113
2113 /* 2114 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2126 selection_make (ev.time); 2127 selection_make (ev.time);
2127 break; 2128 break;
2128 2129
2129 case Button2: 2130 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2133 break;
2133 2134
2134#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2135 case Button4: 2136 case Button4:
2136 case Button5: 2137 case Button5:
… …
2140 2141
2141 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2142 2143
2143 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2144 i = 1; 2145 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2147 i = nrow - 1;
2147 else 2148 else
2148 i = 5; 2149 i = 5;
2149 2150
2150# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2152 { 2153 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2157
2157 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159
2160 slip_wheel_ev.start ();
2161 } 2160 }
2162 else 2161 else
2162# endif
2163 { 2163 {
2164# endif
2165 scr_page (v, i); 2164 scr_page (v, i);
2166 scrollbar_show (1); 2165 scrollbar_show (1);
2167# ifdef MOUSE_SLIP_WHEELING
2168 } 2166 }
2169# endif
2170 } 2167 }
2171 break; 2168 break;
2172#endif 2169#endif
2173 } 2170 }
2174 } 2171 }
2175} 2172}
2176
2177#ifdef TRANSPARENT
2178#if TINTING
2179/* taken from aterm-0.4.2 */
2180
2181typedef uint32_t RUINT32T;
2182
2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2184{
2185 int sh_r, sh_g, sh_b;
2186 RUINT32T mask_r, mask_g, mask_b;
2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2190 int i;
2191
2192 Visual *visual = term->visual;
2193
2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2195
2196 /* for convenience */
2197 mask_r = visual->red_mask;
2198 mask_g = visual->green_mask;
2199 mask_b = visual->blue_mask;
2200
2201 /* boring lookup table pre-initialization */
2202 switch (srcImage->bits_per_pixel) {
2203 case 15:
2204 if ((mask_r != 0x7c00) ||
2205 (mask_g != 0x03e0) ||
2206 (mask_b != 0x001f))
2207 return;
2208 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2209 lookup_r = lookup;
2210 lookup_g = lookup+32;
2211 lookup_b = lookup+32+32;
2212 sh_r = 10;
2213 sh_g = 5;
2214 sh_b = 0;
2215 break;
2216 case 16:
2217 if ((mask_r != 0xf800) ||
2218 (mask_g != 0x07e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+64;
2225 sh_r = 11;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 24:
2230 if ((mask_r != 0xff0000) ||
2231 (mask_g != 0x00ff00) ||
2232 (mask_b != 0x0000ff))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2235 lookup_r = lookup;
2236 lookup_g = lookup+256;
2237 lookup_b = lookup+256+256;
2238 sh_r = 16;
2239 sh_g = 8;
2240 sh_b = 0;
2241 break;
2242 case 32:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 default:
2256 return; /* we do not support this color depth */
2257 }
2258
2259 /* prepare limits for color transformation (each channel is handled separately) */
2260 if (shade < 0) {
2261 shade = -shade;
2262 if (shade < 0) shade = 0;
2263 if (shade > 100) shade = 100;
2264
2265 lower_lim_r = 65535-rm;
2266 lower_lim_g = 65535-gm;
2267 lower_lim_b = 65535-bm;
2268
2269 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2270 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2271 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2272
2273 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2274 } else {
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2279
2280 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2281 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2282 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2283 }
2284
2285 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2286 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2287 {
2288 unsigned int tmp;
2289
2290 tmp = lower_lim_r;
2291 lower_lim_r = lower_lim_b;
2292 lower_lim_b = tmp;
2293
2294 tmp = upper_lim_r;
2295 upper_lim_r = upper_lim_b;
2296 upper_lim_b = tmp;
2297 }
2298
2299 /* fill our lookup tables */
2300 for (i = 0; i <= mask_r>>sh_r; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2304 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2305 lookup_r[i] = (tmp/65535)<<sh_r;
2306 }
2307 for (i = 0; i <= mask_g>>sh_g; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2311 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2312 lookup_g[i] = (tmp/65535)<<sh_g;
2313 }
2314 for (i = 0; i <= mask_b>>sh_b; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2318 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2319 lookup_b[i] = (tmp/65535)<<sh_b;
2320 }
2321
2322 /* apply table to input image (replacing colors by newly calculated ones) */
2323 switch (srcImage->bits_per_pixel)
2324 {
2325 case 15:
2326 {
2327 unsigned short *p1, *pf, *p, *pl;
2328 p1 = (unsigned short *) srcImage->data;
2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2330 while (p1 < pf)
2331 {
2332 p = p1;
2333 pl = p1 + srcImage->width;
2334 for (; p < pl; p++)
2335 {
2336 *p = lookup_r[(*p & 0x7c00)>>10] |
2337 lookup_g[(*p & 0x03e0)>> 5] |
2338 lookup_b[(*p & 0x001f)];
2339 }
2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 16:
2345 {
2346 unsigned short *p1, *pf, *p, *pl;
2347 p1 = (unsigned short *) srcImage->data;
2348 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width;
2353 for (; p < pl; p++)
2354 {
2355 *p = lookup_r[(*p & 0xf800)>>11] |
2356 lookup_g[(*p & 0x07e0)>> 5] |
2357 lookup_b[(*p & 0x001f)];
2358 }
2359 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2360 }
2361 break;
2362 }
2363 case 24:
2364 {
2365 unsigned char *p1, *pf, *p, *pl;
2366 p1 = (unsigned char *) srcImage->data;
2367 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width * 3;
2372 for (; p < pl; p += 3)
2373 {
2374 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2375 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2376 p[2] = lookup_r[(p[2] & 0x0000ff)];
2377 }
2378 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 32:
2383 {
2384 RUINT32T *p1, *pf, *p, *pl;
2385 p1 = (RUINT32T *) srcImage->data;
2386 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0xff0000)>>16] |
2395 lookup_g[(*p & 0x00ff00)>> 8] |
2396 lookup_b[(*p & 0x0000ff)] |
2397 (*p & ~0xffffff);
2398 }
2399 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2400 }
2401 break;
2402 }
2403 }
2404
2405 free (lookup);
2406}
2407#endif
2408
2409/*
2410 * Check our parents are still who we think they are.
2411 * Do transparency updates if required
2412 */
2413int
2414rxvt_term::check_our_parents ()
2415{
2416 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after;
2418 Atom atype;
2419 unsigned char *prop = NULL;
2420 Window root, oldp, *list;
2421 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr;
2423
2424 pchanged = 0;
2425
2426 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */
2428
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth;
2431
2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2433
2434 if (rootdepth != wattr.depth)
2435 {
2436 if (am_transparent)
2437 {
2438 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0;
2441 }
2442
2443 return pchanged; /* Don't try any more */
2444 }
2445
2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False);
2448
2449 /*
2450 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that.
2453 */
2454 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL
2466#if TINTING
2467 || !rs[Rs_color + Color_tint]
2468#endif
2469 )
2470 have_pixmap = 0;
2471 else
2472 {
2473 have_pixmap = 1;
2474 rootpixmap = *(Pixmap *)prop;
2475 XFree (prop);
2476 }
2477
2478 if (have_pixmap)
2479 {
2480 /*
2481 * Copy display->root pixmap transparency
2482 */
2483 int sx, sy, nx, ny;
2484 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height;
2494 nx = ny = 0;
2495
2496 if (sx < 0)
2497 {
2498 nw += sx;
2499 nx = -sx;
2500 sx = 0;
2501 }
2502
2503 if (sy < 0)
2504 {
2505 nh += sy;
2506 ny = -sy;
2507 sy = 0;
2508 }
2509
2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2514 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */
2519 allowedxerror = 0;
2520
2521 if (image == NULL)
2522 {
2523 if (am_transparent && am_pixmap_trans)
2524 {
2525 pchanged = 1;
2526 if (pixmap != None)
2527 {
2528 XFreePixmap (xdisp, pixmap);
2529 pixmap = None;
2530 }
2531 }
2532
2533 am_pixmap_trans = 0;
2534 }
2535 else
2536 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2544
2545 rxvt_rgba c;
2546 pix_colors_focused [Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]);
2560
2561 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1;
2563
2564 am_transparent = am_pixmap_trans = 1;
2565 }
2566 }
2567
2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2571 {
2572 unsigned int n;
2573 /*
2574 * InheritPixmap transparency
2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 {
2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root,
2580 &parent[i], &list, &n);
2581 XFree (list);
2582
2583 if (parent[i] == display->root)
2584 {
2585 if (oldp != None)
2586 pchanged = 1;
2587
2588 break;
2589 }
2590
2591 if (oldp != parent[i])
2592 pchanged = 1;
2593 }
2594
2595 n = 0;
2596
2597 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++)
2600 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break;
2606 }
2607 }
2608 }
2609
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2611 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */
2616 }
2617 else
2618 {
2619 for (n = 0; n < (unsigned int)i; n++)
2620 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]);
2623 }
2624
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2626 am_transparent = 1;
2627 }
2628
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None;
2631 }
2632
2633 if (scrollBar.win)
2634 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle ();
2637 scrollbar_show (0);
2638 }
2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2647 return pchanged;
2648}
2649#endif
2650 2173
2651/*}}} */ 2174/*}}} */
2652 2175
2653bool 2176bool
2654rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2703 if (ch == C0_LF) 2226 if (ch == C0_LF)
2704 nlines++; 2227 nlines++;
2705 2228
2706 refresh_count++; 2229 refresh_count++;
2707 2230
2708 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2232 {
2711 refreshnow = true;
2712 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2713 ch = NOCHAR; 2238 ch = NOCHAR;
2714 break; 2239 break;
2240 }
2715 } 2241 }
2716 2242
2717 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2718 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2719 { 2245 {
… …
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2748 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2749 2275
2750 /* 2276 /*
2751 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2752 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2753 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2754 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2280 */
2756 if (refreshnow) 2281 if (refreshnow)
2757 { 2282 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++;
2760 else
2761 {
2762 flag = true; 2283 flag = true;
2763 scr_refresh (); 2284 scr_refresh ();
2764 want_refresh = 1; 2285 want_refresh = 1;
2765 }
2766 } 2286 }
2767 2287
2768 } 2288 }
2769 else 2289 else
2770 { 2290 {
… …
2919 { 2439 {
2920 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2921 break; /* done = 1 */ 2441 break; /* done = 1 */
2922 } 2442 }
2923 } 2443 }
2924 2444
2925 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2926 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2927 { 2447 {
2928 done = 1; 2448 done = 1;
2929 break; 2449 break;
… …
2931 } 2451 }
2932 } 2452 }
2933 2453
2934 pclose_printer (fd); 2454 pclose_printer (fd);
2935} 2455}
2936#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2937/*}}} */ 2457/*}}} */
2938 2458
2939/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2940enum { 2460enum {
2941 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2991 process_dcs_seq (); 2511 process_dcs_seq ();
2992 break; 2512 break;
2993 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
2994 process_csi_seq (); 2514 process_csi_seq ();
2995 break; 2515 break;
2996 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
2997 process_osc_seq (); 2517 process_osc_seq ();
2998 break; 2518 break;
2999#endif 2519#endif
3000 } 2520 }
3001} 2521}
… …
3227rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3228{ 2748{
3229 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3230 unsigned int nargs, p; 2750 unsigned int nargs, p;
3231 int n, ndef; 2751 int n, ndef;
3232 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3233 2753
3234 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3235 arg[--nargs] = 0;
3236 2755
3237 priv = 0; 2756 priv = 0;
3238 ch = cmd_getc (); 2757 ch = cmd_getc ();
3239 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3240 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3241 priv = ch; 2761 priv = ch;
3242 ch = cmd_getc (); 2762 ch = cmd_getc ();
3243 } 2763 }
3244 2764
3245 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3284 switch (priv) 2804 switch (priv)
3285 { 2805 {
3286 case '>': 2806 case '>':
3287 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3288 { 2808 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 // 2811 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3294 // that we do not support xterm mouse reporting (should be 95 when we do). 2814 // versions.
3295 // 2815 //
3296 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
3297 } 2817 }
3298 break; 2818 break;
2819
3299 case '?': 2820 case '?':
3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3301 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3302 break; 2823 break;
3303 } 2824 }
… …
3428 break; 2949 break;
3429 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3430 scr_report_position (); 2951 scr_report_position ();
3431 break; 2952 break;
3432 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 2956 break;
3436 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 2959 break;
… …
3531{ 3052{
3532 int x, y; 3053 int x, y;
3533 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3534 Window wdummy; 3055 Window wdummy;
3535 3056
3536 dLocal (Display *, xdisp); 3057 dLocal (Display *, dpy);
3537 3058
3538 if (nargs == 0) 3059 if (nargs == 0)
3539 return; 3060 return;
3540 3061
3541 switch (args[0]) 3062 switch (args[0])
3542 { 3063 {
3543 /* 3064 /*
3544 * commands 3065 * commands
3545 */ 3066 */
3546 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3548 break; 3069 break;
3549 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3072 break;
3552 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3075 break;
3555 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3078 break;
3558 case 5: /* raise window */ 3079 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3560 break; 3081 break;
3561 case 6: /* lower window */ 3082 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3563 break; 3084 break;
3564 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3565 scr_touch (true); 3086 scr_touch (true);
3566 break; 3087 break;
3567 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3577 break; 3098 break;
3578 3099
3579
3580 /* 3100 /*
3581 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3582 */ 3102 */
3583 case 11: /* report window state */ 3103 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3106 break;
3587 case 13: /* report window position */ 3107 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3113 break;
3594 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3117 break;
3598 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3120 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3123 break;
3604 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3605 { 3125 {
3606 char *s; 3126 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3129 XFree (s);
3610 } 3130 }
3611 break; 3131 break;
3612 case 21: /* report window title */ 3132 case 21: /* report window title */
3613 { 3133 {
3614 char *s; 3134 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3137 XFree (s);
3618 } 3138 }
3619 break; 3139 break;
3620 } 3140 }
3621} 3141}
… …
3648 seen_esc = true; 3168 seen_esc = true;
3649 continue; 3169 continue;
3650 } 3170 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3175 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3655 3177
3656 seen_esc = false; 3178 seen_esc = false;
3657 3179
3658 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3181 // stop at some sane length
3660 return NULL; 3182 return NULL;
3661 3183
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3184 string[n++] = ch;
3666 } 3185 }
3667 3186
3668 string[n++] = '\0'; 3187 string[n++] = '\0';
3669 3188
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3240void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3241rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3242{
3724 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3725 { 3244 {
3726 rxvt_rgba c; 3245 rgba c;
3727 pix_colors_focused[color].get (this, c); 3246 pix_colors_focused[color].get (c);
3728 3247
3729#if XFT 3248#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3249 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3250 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3251 else
3733#endif 3252#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3253 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3254 }
… …
3746 int color; 3265 int color;
3747 char *buf, *name; 3266 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3268 int saveop = op;
3750 3269
3751 dLocal (Display *, xdisp); 3270 dLocal (Display *, dpy);
3752 3271
3753 assert (str != NULL); 3272 assert (str != NULL);
3273
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return;
3276
3754 switch (op) 3277 switch (op)
3755 { 3278 {
3756 case XTerm_name: 3279 case XTerm_name:
3757 set_title (str); 3280 set_title (str);
3758 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3295 unsigned long bytes_after;
3773 unsigned char *value = 0; 3296 unsigned char *value = 0;
3774 const char *str = ""; 3297 const char *str = "";
3775 3298
3776 if (prop 3299 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3304 && actual_type != None
3782 && actual_format == 8) 3305 && actual_format == 8)
… …
3794 { 3317 {
3795 *eq = 0; 3318 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3797 } 3320 }
3798 else 3321 else
3799 XDeleteProperty (xdisp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3323 display->atom (str));
3801 } 3324 }
3802 break; 3325 break;
3803 3326
3804 case XTerm_Color: 3327 case XTerm_Color:
… …
3817 *buf++ = '\0'; 3340 *buf++ = '\0';
3818 3341
3819 process_color_seq (op, color, name, resp); 3342 process_color_seq (op, color, name, resp);
3820 } 3343 }
3821 break; 3344 break;
3345 case Rxvt_restoreFG:
3822 case XTerm_Color00: 3346 case XTerm_Color00:
3823 process_color_seq (op, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3824 break; 3348 break;
3349 case Rxvt_restoreBG:
3825 case XTerm_Color01: 3350 case XTerm_Color01:
3826 process_color_seq (op, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3827 break; 3352 break;
3828#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3829 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
… …
3850 break; 3375 break;
3851 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3853 break; 3378 break;
3854#endif 3379#endif
3855#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3856 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3858 check_our_parents (); 3383 {
3859 if (am_transparent) 3384 bool changed = false;
3860 want_full_refresh = want_refresh = 1;
3861 break;
3862#endif
3863 3385
3386 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390
3391 if (changed)
3392 update_background ();
3393 }
3394
3395 break;
3396#endif
3397
3398#if BG_IMAGE_FROM_FILE
3864 case Rxvt_Pixmap: 3399 case Rxvt_Pixmap:
3865 { 3400 if (!strcmp (str, "?"))
3866 if (*str != ';')
3867 { 3401 {
3868#if XPM_BACKGROUND 3402 char str[256];
3869 scale_pixmap (""); /* reset to default scaling */ 3403
3870 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3871 scr_touch (true); 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3872#endif 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3873 } 3408 }
3874 3409 else
3410 {
3875 int changed = 0; 3411 int changed = 0;
3876 3412
3877 while ((str = strchr (str, ';')) != NULL) 3413 if (*str != ';')
3878 { 3414 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */
3418 changed++;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 }
3423
3424 while (str)
3425 {
3879 str++; 3426 str++;
3880#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3881 changed += scale_pixmap (str); 3428 changed++;
3882#endif 3429 str = strchr (str, ';');
3883 } 3430 }
3884 3431
3885 if (changed) 3432 if (changed)
3886 { 3433 update_background ();
3887#ifdef XPM_BACKGROUND
3888 resize_pixmap ();
3889 scr_touch (true);
3890#endif
3891 } 3434 }
3892 }
3893 break; 3435 break;
3894 3436#endif
3895 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str);
3897 break;
3898 case Rxvt_restoreBG:
3899 set_window_color (Color_bg, str);
3900 break;
3901 3437
3902 case XTerm_logfile: 3438 case XTerm_logfile:
3903 // TODO, when secure mode? 3439 // TODO, when secure mode?
3904 break; 3440 break;
3905 3441
… …
3923 case URxvt_italicFont: 3459 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3925#endif 3461#endif
3926 if (query) 3462 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3466 resp);
3931 else 3467 else
3932 { 3468 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 3483 break;
3948 3484
3949#if !ENABLE_MINIMAL 3485#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3486 case URxvt_locale:
3951 if (query) 3487 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3489 else
3954 { 3490 {
3955 set_locale (str); 3491 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3493 init_xlocale ();
… …
3972 break; 3508 break;
3973#endif 3509#endif
3974 3510
3975#if ENABLE_PERL 3511#if ENABLE_PERL
3976 case URxvt_perl: 3512 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 3514 ; // no responses yet
3979 break; 3515 break;
3980#endif 3516#endif
3981 } 3517 }
3982} 3518}
… …
4020{ 3556{
4021 unsigned int i, j; 3557 unsigned int i, j;
4022 int state; 3558 int state;
4023 3559
4024 static const struct 3560 static const struct
4025 { 3561 {
4026 const int argval; 3562 const int argval;
4027 const unsigned long bit; 3563 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3564 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4032 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4034 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4035 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4051 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4052#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4053 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4054#endif 3588#endif
4055 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4056 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4057 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4058 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4059 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4060 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4061 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4062 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4063 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4064 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4065 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4066 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4067 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4068 }; 3602 };
4069 3603
4070 if (nargs == 0) 3604 if (nargs == 0)
4071 return; 3605 return;
4072 3606
… …
4098 scr_touch (true); 3632 scr_touch (true);
4099 break; 3633 break;
4100#endif 3634#endif
4101 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4102 case 1049: 3636 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3638 if (mode == 0)
4105 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4106 else if (mode == 1) 3640 else if (mode == 1)
4107 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4108 break; 3642 break;
… …
4120 */ 3654 */
4121 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4122 break; 3656 break;
4123 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4126 break; 3663 break;
4127 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4128 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4129 break; 3666 break;
4130 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4137 scr_autowrap (state); 3674 scr_autowrap (state);
4138 break; 3675 break;
4139 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4140 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4141 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3680 break;
4144#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4145 case scrollBar_esc: 3682 case scrollBar_esc:
4146 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4147 { 3684 {
… …
4160 break; 3697 break;
4161 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4162 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4163 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4164 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3703 break;
4167#if 0
4168 case 1001: 3704 case 1002:
4169 break; /* X11 mouse highlighting */ 3705 case 1003:
4170#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4171 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4172 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4173 break; 3718 break;
4174 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3721 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 3725 scr_erase_screen (2);
4181 scr_change_screen (state); 3726 scr_change_screen (state);
4182 break; 3727 break;
4183 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 3729 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3732 scr_erase_screen (2);
4188 break; 3733 break;
4189 default: 3734 default:
4190 break; 3735 break;
… …
4352rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4353{ 3898{
4354 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4355 3900
4356 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4357 { /* query graphics */ 3903 /* query graphics */
4358 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4359 return; 3905 return;
4360 } 3906 }
4361 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4362 do 3908 do
… …
4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4413 3959
4414 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4415 v_buflen += len; 3961 v_buflen += len;
4416 3962
4417 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4418} 3964}
4419 3965
4420void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4421{ 3967{
4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4427 3973
4428 if (v_buflen == 0) 3974 if (v_buflen == 0)
4429 { 3975 {
4430 free (v_buffer); 3976 free (v_buffer);
4431 v_buffer = 0; 3977 v_buffer = 0;
4432 v_buflen = 0;
4433 3978
4434 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4435 return; 3980 return;
4436 } 3981 }
4437 3982
4438 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4439 } 3984 }
4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4441 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4442} 3987}
4443 3988
4444/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4445 3990

Diff Legend

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