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.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 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>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 201
206 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
207 203
208 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
210 206
211 if (y >= 0) 207 if (y >= 0)
212 { 208 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 221 ch = *chr++;
226 222
227 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
230# if !UNICODE3 226# if !UNICODE_3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 unsigned int newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
542 switch (keysym) 584 switch (keysym)
543 { 585 {
544#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 587 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
551 } 593 }
552 else 594 else
553 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 596 break;
555#endif 597#endif
556#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 599 case XK_Delete:
568 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 601 break;
570#endif 602#endif
571 case XK_Tab: 603 case XK_Tab:
572 if (shft) 604 if (shft)
573 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
583#endif 615#endif
584 newlen = 0; 616 newlen = 0;
585 } 617 }
586 break; 618 break;
587 619
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
620 break; 636 break;
621 637
622#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 639 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
635 break; 641 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 642 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
648 break; 644 break;
649#endif 645#endif
650 case XK_KP_Enter: 646 case XK_KP_Enter:
651 /* allow shift to override */ 647 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
653 { 649 {
654 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
655 break; 651 break;
656 } 652 }
657 653
… …
669 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
671 } 667 }
672 break; 668 break;
673 669
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 694 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
706 { 696 {
707 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 699 }
710 else 700 else
… …
716 706
717 case XK_Find: 707 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
719 break; 709 break;
720 710
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 711 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
733 break; 713 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 715 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
740 break; 720 break;
741 case XK_Select: 721 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
743 break; 723 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 724 case XK_End:
755 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
756 break; 726 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 727 case XK_Home:
768 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
769 break; 729 break;
770 730
771#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
873 return; 833 return;
874 834
875 if (len <= 0) 835 if (len <= 0)
876 return; /* not mapped */ 836 return; /* not mapped */
877 837
878 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 839 if (view_start)
880 { 840 {
881 view_start = 0; 841 view_start = 0;
882 want_refresh = 1; 842 want_refresh = 1;
883 } 843 }
… …
905 { 865 {
906 const char ch = C0_ESC; 866 const char ch = C0_ESC;
907 tt_write (&ch, 1); 867 tt_write (&ch, 1);
908 } 868 }
909 869
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
921} 871}
922/*}}} */ 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
923 949
924#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
925unsigned int 951unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 953{
… …
957void 983void
958rxvt_term::flush () 984rxvt_term::flush ()
959{ 985{
960 flush_ev.stop (); 986 flush_ev.stop ();
961 987
962#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
964 { 990 {
965 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 992 scr_touch (false);
968 } 993 }
969#endif 994#endif
970 995
971 if (want_refresh) 996 if (want_refresh)
… …
1016 } 1041 }
1017 1042
1018 display->flush (); 1043 display->flush ();
1019} 1044}
1020 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1021void 1047void
1022rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1023{ 1058{
1024 make_current (); 1059 make_current ();
1025 1060
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0; 1061 refresh_count = 0;
1039 flush (); 1062 flush ();
1040} 1063}
1041 1064
1042#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1043void 1066void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1068{
1046 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1070 want_refresh = 1;
1048 1071 refresh_check ();
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1072}
1051#endif 1073#endif
1052 1074
1053#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1054void 1076void
1055rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1078{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1080 {
1059 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1060 want_refresh = 1; 1082 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1062 } 1084 }
1085 else
1086 w.stop ();
1063} 1087}
1064#endif 1088#endif
1065 1089
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1091void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1093{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1072 { 1096 {
1073 want_refresh = 1; 1097 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1075 } 1099 }
1100 else
1101 w.stop ();
1076} 1102}
1077#endif 1103#endif
1078 1104
1079#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1080void 1106void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1108{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1110 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1112 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1088 } 1114 }
1115 else
1116 w.stop ();
1089} 1117}
1090#endif 1118#endif
1091 1119
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1121void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1123{
1096 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1125 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1; 1126 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1105 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1106} 1135}
1107#endif 1136#endif
1108 1137
1109#if HAVE_SCHED_YIELD 1138#if LINUX_YIELD_HACK
1110static struct event_handler 1139static struct event_handler
1111{ 1140{
1112 check_watcher cw_yield; 1141 ev::prepare yield_ev;
1113 1142
1114 void yield (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1115 { 1144 {
1116 sched_yield (); 1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1117 w.stop (); 1153 w.stop ();
1118 } 1154 }
1119 1155
1120 event_handler () 1156 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1157 : yield_ev (this, &event_handler::yield_cb)
1122 { 1158 {
1123 } 1159 }
1124} event_handler; 1160} event_handler;
1125#endif 1161#endif
1126 1162
… …
1146 cmdbuf_endp += r; 1182 cmdbuf_endp += r;
1147 return true; 1183 return true;
1148 } 1184 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1186 {
1151#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1152 if (display->is_local) 1188 if (display->is_local)
1153 event_handler.cw_yield.start (); 1189 event_handler.yield_ev.start ();
1154#endif 1190#endif
1155 } 1191 }
1156 else 1192 else
1157 { 1193 {
1158 pty_ev.stop (); 1194 pty_ev.stop ();
1159 1195
1160 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1161 destroy (); 1197 destroy ();
1162 } 1198 }
1163 1199
1164 return false; 1200 return false;
1165} 1201}
1166 1202
1167void 1203void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1205{
1170 make_current (); 1206 make_current ();
1171 1207
1172 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1210 while (pty_fill ())
1175 if (cmd_parse ()) 1211 if (cmd_parse ())
1176 break; 1212 break;
1177 1213
1178 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1179 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1180} 1218}
1181 1219
1182void 1220void
1183rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1184{ 1222{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1223 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1224 recolour_cursor ();
1187 1225
1188#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1227 hidden_pointer = 0;
1190 1228
1191 if (OPTION (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1193#endif 1231#endif
1194} 1232}
1195 1233
1196#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1197void 1235void
1198rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1199{ 1237{
1200 if (!OPTION (Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1201 return; 1239 return;
1202 1240
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1242 XFlush (dpy);
1205 1243
1206 hidden_pointer = 1; 1244 hidden_pointer = 1;
1207} 1245}
1208 1246
1209void 1247void
1210rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1249{
1212 make_current (); 1250 make_current ();
1213 1251
1214 pointer_blank (); 1252 pointer_blank ();
1215} 1253}
… …
1218void 1256void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1258{
1221 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1222 int x, y; 1260 int x, y;
1261 int code = 32;
1223 1262
1224 x = ev.x; 1263 x = Pixel2Col (ev.x);
1225 y = ev.y; 1264 y = Pixel2Row (ev.y);
1226 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1227 1273
1228 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1229 button_number = 3; 1275 button_number = 3;
1230 else 1276 else
1231 { 1277 {
… …
1277 x + 1, 1323 x + 1,
1278 y + 1); 1324 y + 1);
1279#endif 1325#endif
1280 1326
1281 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1283 (32 + x + 1), 1329 (32 + x + 1),
1284 (32 + y + 1)); 1330 (32 + y + 1));
1285} 1331}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1332
1297/*{{{ process an X event */ 1333/*{{{ process an X event */
1298void 1334void
1299rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
1300{ 1336{
1301 make_current (); 1337 make_current ();
1302 1338
1303 dDisp; 1339 dLocal (Display *, dpy);
1304 1340
1305 if (ev.xany.window == vt 1341 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1342 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1343 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1344 return;
… …
1313 unsigned int unused_mask; 1349 unsigned int unused_mask;
1314 1350
1315 switch (ev.type) 1351 switch (ev.type)
1316 { 1352 {
1317 case KeyPress: 1353 case KeyPress:
1318#if ISO_14755 1354 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1355 break;
1324 1356
1325 case KeyRelease: 1357 case KeyRelease:
1326 { 1358 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1359 break;
1398 }
1399 1360
1400 case ButtonPress: 1361 case ButtonPress:
1401 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1402 break; 1363 break;
1403 1364
… …
1405 button_release (ev.xbutton); 1366 button_release (ev.xbutton);
1406 break; 1367 break;
1407 1368
1408 case ClientMessage: 1369 case ClientMessage:
1409 if (ev.xclient.format == 32 1370 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1371 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1372 {
1373 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1374 {
1375 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1376 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1377 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1378 {
1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1380 destroy ();
1381 }
1414#if ENABLE_EWMH 1382#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1386 &ev);
1387#endif
1388 }
1389 }
1390#if ENABLE_XEMBED
1391 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1392 {
1393 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1394 focus_in ();
1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1396 focus_out ();
1397 }
1419#endif 1398#endif
1420 } 1399 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1400 break;
1461 1401
1462 /* 1402 /*
1463 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1483 break; 1423 break;
1484 } 1424 }
1485 break; 1425 break;
1486 1426
1487 case FocusIn: 1427 case FocusIn:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1431 focus_in ();
1489 break; 1432 break;
1490 1433
1491 case FocusOut: 1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1438 focus_out ();
1493 break; 1439 break;
1494 1440
1495 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height);*/
1496 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1497 { 1446 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1448 ;
1500 1449
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1451 {
1503 seen_resize = 1; 1452 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 if (mapped)
1461 update_background ();
1462 else
1463 bgPixmap.invalidate ();
1464 }
1465#endif
1466 }
1506 1467
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1469 }
1514 break; 1470 break;
1515 1471
1516 case PropertyNotify: 1472 case PropertyNotify:
1473 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1474 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1475 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1476 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1477
1521 break; 1478 break;
1522 1479
1523 case SelectionClear: 1480 case SelectionClear:
1524 selection_clear (); 1481 selection_clear ();
… …
1532 case SelectionRequest: 1489 case SelectionRequest:
1533 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1534 break; 1491 break;
1535 1492
1536 case MapNotify: 1493 case MapNotify:
1494#ifdef HAVE_BG_PIXMAP
1495 /* This is needed spcifically to fix the case of no window manager or a
1496 * non-reparenting window manager. In those cases we never get first
1497 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1498 * care of multiplicity of ConfigureNotify events arriwing while WM does
1499 * reparenting.
1500 * We should not render background immidiately, as there could be several
1501 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1502 * by scheduling background redraw as soon as we can, but giving a short
1503 * bit of time for ConfigureNotifies to arrive.
1504 * We should render background PRIOR to drawing any text, but AFTER all
1505 * of ConfigureNotifys for the best results.
1506 */
1507 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1508 update_background_ev.start (0.025);
1509#endif
1537 mapped = 1; 1510 mapped = 1;
1538#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1512 text_blink_ev.start ();
1540#endif 1513#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1515 break;
1543 1516
1544 case UnmapNotify: 1517 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1519#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1520 text_blink_ev.stop ();
1548#endif 1521#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1522 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1523 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1524
1558 case GraphicsExpose: 1525 case GraphicsExpose:
1559 case Expose: 1526 case Expose:
1560 if (ev.xany.window == vt) 1527 if (ev.xany.window == vt)
1561 { 1528 {
1562 do 1529 do
1530 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1533 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1534 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1535
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1536 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1537
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1538 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1539 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1542 }
1572 1543
1573 want_refresh = 1; 1544 want_refresh = 1;
1574 } 1545 }
1575 else 1546 else
1576 { 1547 {
1577 XEvent unused_event; 1548 XEvent unused_event;
1578 1549
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1551 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1553 ;
1583 1554
1584 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1585 { 1556 {
1586 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1587 scrollbar_show (0); 1558 scrollbar_show (0);
1588 } 1559 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1560 }
1595 break; 1561 break;
1596 1562
1597 case MotionNotify: 1563 case MotionNotify:
1598#ifdef POINTER_BLANK 1564#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1565 if (hidden_pointer)
1600 pointer_unblank (); 1566 pointer_unblank ();
1601#endif 1567#endif
1568 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1569 || priv_modes & PrivMode_MouseAnyEvent)
1570 mouse_report (ev.xbutton);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1572 break;
1604 1573
1605 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1606 { 1575 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1578 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1580 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1582 ;
1614 1583
1615 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1588 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1640 int dist; 1609 int dist;
1641 1610
1642 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1644 */ 1613 */
1645 if (!sel_scroll_ev.active) 1614 if (!sel_scroll_ev.is_active ())
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1615 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1616
1648 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1650 */ 1619 */
1651 selection_save_x = ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
… …
1673 else 1642 else
1674 { 1643 {
1675 /* we are within the text window, so we 1644 /* we are within the text window, so we
1676 * shouldn't be scrolling 1645 * shouldn't be scrolling
1677 */ 1646 */
1678 if (sel_scroll_ev.active)
1679 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1680 } 1648 }
1681#endif 1649#endif
1682#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1683 } 1651 }
1684#endif 1652#endif
1685 } 1653 }
1686 } 1654 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1688 { 1656 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1691 ; 1659 ;
1692 1660
1693 XQueryPointer (disp, scrollBar.win, 1661 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1664 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1665 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1667 scrollbar_size ());
1700 want_refresh = 1; 1668 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1669 scrollbar_show (1);
1703 } 1670 }
1704 break; 1671 break;
1705 } 1672 }
1706 1673
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1674#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1675 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1676 {
1712 if (hidden_cursor) 1677 if (hidden_cursor)
1713 { 1678 {
1714 hidden_cursor = 0; 1679 hidden_cursor = 0;
1715 want_refresh = 1; 1680 want_refresh = 1;
1716 } 1681 }
1717 1682
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1683 cursor_blink_ev.again ();
1719 } 1684 }
1720#endif 1685#endif
1721 1686
1722#if defined(POINTER_BLANK) 1687#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1688 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1689 {
1725 if (ev.type == MotionNotify 1690 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1691 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1692 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1693 if (hidden_pointer)
… …
1730 1695
1731 if (ev.type == KeyPress && hidden_pointer == 0) 1696 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank (); 1697 pointer_blank ();
1733 } 1698 }
1734#endif 1699#endif
1700
1701 refresh_check ();
1735} 1702}
1736 1703
1737void 1704void
1738rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1739{ 1706{
1740 if (!focus) 1707 if (!focus)
1741 { 1708 {
1742 focus = 1; 1709 focus = 1;
1743 want_refresh = 1; 1710 want_refresh = 1;
1744 1711
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1712 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1713
1747#if USE_XIM 1714#if USE_XIM
1748 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1749 { 1716 {
1750 IMSetStatusPosition (); 1717 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1752 } 1719 }
1753#endif 1720#endif
1754#if CURSOR_BLINK 1721#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1757#endif 1724#endif
1758#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1760 { 1727 {
1761 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1729 scr_recolour ();
1763 } 1730 }
1764#endif 1731#endif
1732#if ENABLE_FRILLS
1733 if (option (Opt_urgentOnBell))
1734 {
1735 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1736 {
1737 h->flags &= ~XUrgencyHint;
1738 XSetWMHints (dpy, parent[0], h);
1739 }
1740 }
1741#endif
1765 } 1742 }
1766} 1743}
1767 1744
1768void 1745void
1769rxvt_term::focus_out () 1746rxvt_term::focus_out ()
… …
1777 1754
1778#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1756 if (iso14755buf)
1780 { 1757 {
1781 iso14755buf = 0; 1758 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1759# if ISO_14755
1783 scr_overlay_off (); 1760 scr_overlay_off ();
1784# endif 1761# endif
1785 } 1762 }
1786#endif 1763#endif
1787#if USE_XIM 1764#if USE_XIM
1788 if (Input_Context != NULL) 1765 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1790#endif 1767#endif
1791#if CURSOR_BLINK 1768#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1794 hidden_cursor = 0; 1772 hidden_cursor = 0;
1795#endif 1773#endif
1796#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1798 { 1776 {
… …
1801 } 1779 }
1802#endif 1780#endif
1803 } 1781 }
1804} 1782}
1805 1783
1806#if TRANSPARENT 1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1795}
1796
1797#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1798void
1808rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1800{
1810 make_current (); 1801 make_current ();
1811 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1808 switch (ev.type)
1813 { 1809 {
1814 case PropertyNotify: 1810 case PropertyNotify:
1815 /* 1811 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1818 */ 1814 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1822 1821
1823 /* FALLTHROUGH */
1824 case ReparentNotify:
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1822 break;
1828 } 1823 }
1824# endif
1825
1826 refresh_check ();
1829} 1827}
1830#endif 1828#endif
1831 1829
1832void 1830void
1833rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1840 /*
1843 * VT window processing of button press 1841 * VT window processing of button press
1844 */ 1842 */
1845 if (ev.window == vt) 1843 if (ev.window == vt)
1846 { 1844 {
1845 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1846 return;
1847
1847#if ISO_14755 1848#if ISO_14755
1848 // 5.4 1849 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1851 {
1851 iso14755_54 (ev.x, ev.y); 1852 iso14755_54 (ev.x, ev.y);
… …
1885 mouse_report (ev); 1886 mouse_report (ev);
1886 } 1887 }
1887#else 1888#else
1888 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1889 mouse_report (ev); 1890 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1892
1892 } 1893 }
1893 else 1894 else
1894 { 1895 {
1895 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1897 1898
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1899 switch (ev.button)
1900 { 1900 {
1901 case Button1: 1901 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1906#else
1907 selection.rect = false; 1907 selection.rect = false;
1908#endif 1908#endif
1909 1909
1910 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1912 {
1913 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1915 else 1915 else
1916 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1917 } 1917 }
1918 else 1918 else
1919 { 1919 {
1920 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1921 MEvent.clicks++;
1922 else 1922 else
1923 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1924 1924
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1926 }
1927 1927
1928 MEvent.button = Button1; 1928 MEvent.button = Button1;
1929 break; 1929 break;
1930 1930
1931 case Button3: 1931 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1934 else 1934 else
1935 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1936 1936
1937 MEvent.button = Button3; 1937 MEvent.button = Button3;
1938 break; 1938 break;
1939 } 1939 }
1940 } 1940 }
1941 1941
1942 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1943 return; 1943 return;
1944 } 1944 }
1945 1945
1946 /* 1946 /*
1947 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1948 */ 1948 */
1949 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1950 { 1950 {
1951 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1952 /* 1959 /*
1953 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1954 * move up if mouse is above slider 1961 * move up if mouse is above slider
1955 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1956 * 1963 *
… …
1965 /* 1972 /*
1966 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1967 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1968 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1969 */ 1976 */
1970 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1971 && scrollbarnext_upButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_upButton (ev.y)))
1974 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1975 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1976 && scrollbarnext_dnButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_dnButton (ev.y)))
1979 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1980 else 1981 else
1981 switch (ev.button) 1982 switch (ev.button)
1982 { 1983 {
1983 case Button2: 1984 case Button2:
… …
1990 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1991 break; 1992 break;
1992 } 1993 }
1993 } 1994 }
1994 else 1995 else
1995#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1996
1997 {
1998 char upordown = 0;
1999
2000 if (scrollBar.style == R_SB_NEXT)
2001 { 1997 {
2002 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
2003 upordown = -1; /* up */
2004 else if (scrollbarnext_dnButton (ev.y))
2005 upordown = 1; /* down */
2006 }
2007 else if (scrollBar.style == R_SB_RXVT)
2008 {
2009 if (scrollbarrxvt_upButton (ev.y))
2010 upordown = -1; /* up */
2011 else if (scrollbarrxvt_dnButton (ev.y))
2012 upordown = 1; /* down */
2013 }
2014 if (upordown)
2015 { 1999 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 2003#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2020 { 2005 {
2021 if (upordown < 0) 2006 if (direction == UP)
2022 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2023 else 2008 else
2024 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2025 } 2010 }
2026 } 2011 }
2027 else 2012 else
2028 switch (ev.button) 2013 switch (ev.button)
2029 { 2014 {
2030 case Button2: 2015 case Button2:
2031 switch (scrollbar_align) 2016 switch (scrollBar.align)
2032 { 2017 {
2033 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2034 csrO = 0; 2019 csrO = 0;
2035 break; 2020 break;
2036 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2044 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2045 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2046 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2047 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2048 2033
2049 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2050 break; 2035 break;
2051 2036
2052 case Button1: 2037 case Button1:
2053 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2054 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2055 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2056 2041
2057 case Button3: 2042 case Button3:
2058 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2068 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2069# else 2054# else
2070 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2071# endif 2056# endif
2072 else 2057 else
2073 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2074 } 2059 }
2075 else 2060 else
2076 { 2061 {
2077 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2078 (nrow 2063 (nrow
… …
2095 2080
2096 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2097 if (!bypass_keystate) 2082 if (!bypass_keystate)
2098 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2099 2084
2100 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2101 { 2086 {
2102 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2103 scrollbar_show (0); 2088 scrollbar_show (0);
2104 } 2089 }
2105 2090
2106#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2107 if (sel_scroll_ev.active)
2108 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2109#endif 2093#endif
2110 2094
2111 if (ev.window == vt) 2095 if (ev.window == vt)
2112 { 2096 {
2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2098 return;
2099
2113#if ISO_14755 2100#if ISO_14755
2114 // 5.4 2101 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2102 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2103 return;
2117#endif 2104#endif
2105
2118 if (reportmode) 2106 if (reportmode)
2119 { 2107 {
2120 /* mouse report from vt window */ 2108 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2109 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2110 if (ev.button >= 4)
… …
2133 mouse_report (ev); 2121 mouse_report (ev);
2134 } 2122 }
2135#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2136 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2137 mouse_report (ev); 2125 mouse_report (ev);
2138#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2139 return; 2127 return;
2140 } 2128 }
2141 2129
2142 /* 2130 /*
2143 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2146 if (priv_modes & PrivMode_mouse_report 2134 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2135 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2136 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2137 selection_extend (ev.x, ev.y, 0);
2150 2138
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2139 switch (ev.button)
2155 { 2140 {
2156 case Button1: 2141 case Button1:
2157 case Button3: 2142 case Button3:
2158 selection_make (ev.time); 2143 selection_make (ev.time);
2159 break; 2144 break;
2145
2160 case Button2: 2146 case Button2:
2161 selection_request (ev.time, ev.x, ev.y); 2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2149 break;
2150
2163#ifdef MOUSE_WHEEL 2151#ifdef MOUSE_WHEEL
2164 case Button4: 2152 case Button4:
2165 case Button5: 2153 case Button5:
2166 { 2154 {
2167 int i; 2155 int i;
… …
2169 2157
2170 v = ev.button == Button4 ? UP : DN; 2158 v = ev.button == Button4 ? UP : DN;
2171 2159
2172 if (ev.state & ShiftMask) 2160 if (ev.state & ShiftMask)
2173 i = 1; 2161 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2162 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2163 i = nrow - 1;
2176 else 2164 else
2177 i = 5; 2165 i = 5;
2178 2166
2179# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
… …
2181 { 2169 {
2182 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185 2173
2186 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2188
2189 slip_wheel_ev.start ();
2190 } 2176 }
2191 else 2177 else
2178# endif
2192 { 2179 {
2193# endif
2194 scr_page (v, i); 2180 scr_page (v, i);
2195 scrollbar_show (1); 2181 scrollbar_show (1);
2196# ifdef MOUSE_SLIP_WHEELING
2197 } 2182 }
2198# endif
2199 } 2183 }
2200 break; 2184 break;
2201#endif 2185#endif
2202 } 2186 }
2203 } 2187 }
2204} 2188}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2189
2687/*}}} */ 2190/*}}} */
2688 2191
2689bool 2192bool
2690rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
… …
2739 if (ch == C0_LF) 2242 if (ch == C0_LF)
2740 nlines++; 2243 nlines++;
2741 2244
2742 refresh_count++; 2245 refresh_count++;
2743 2246
2744 if (!OPTION (Opt_jumpScroll) 2247 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2248 {
2747 refreshnow = true;
2748 refresh_count = 0; 2249 refresh_count = 0;
2250
2251 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2252 {
2253 refreshnow = true;
2749 ch = NOCHAR; 2254 ch = NOCHAR;
2750 break; 2255 break;
2256 }
2751 } 2257 }
2752 2258
2753 // scr_add_lines only works for nlines <= nrow - 1. 2259 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2260 if (nlines >= nrow - 1)
2755 { 2261 {
… …
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2290 scr_add_lines (buf, str - buf, nlines);
2785 2291
2786 /* 2292 /*
2787 * If there have been a lot of new lines, then update the screen 2293 * If there have been a lot of new lines, then update the screen
2788 * What the heck I'll cheat and only refresh less than every page-full. 2294 * What the heck we'll cheat and only refresh less than every page-full.
2789 * the number of pages between refreshes is refresh_limit, which 2295 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2296 */
2792 if (refreshnow) 2297 if (refreshnow)
2793 { 2298 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2299 flag = true;
2799 scr_refresh (); 2300 scr_refresh ();
2800 want_refresh = 1; 2301 want_refresh = 1;
2801 }
2802 } 2302 }
2803 2303
2804 } 2304 }
2805 else 2305 else
2806 { 2306 {
… …
2822 return flag; 2322 return flag;
2823} 2323}
2824 2324
2825// read the next character 2325// read the next character
2826wchar_t 2326wchar_t
2827rxvt_term::next_char () 2327rxvt_term::next_char () NOTHROW
2828{ 2328{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2329 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2330 {
2831 // assume 7-bit to be ascii ALWAYS 2331 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2332 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2853 return NOCHAR; 2353 return NOCHAR;
2854} 2354}
2855 2355
2856// read the next octet 2356// read the next octet
2857uint32_t 2357uint32_t
2858rxvt_term::next_octet () 2358rxvt_term::next_octet () NOTHROW
2859{ 2359{
2860 return cmdbuf_ptr < cmdbuf_endp 2360 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++ 2361 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR; 2362 : NOCHAR;
2863} 2363}
2364
2365static class out_of_input out_of_input;
2864 2366
2865/* rxvt_cmd_getc () - Return next input character */ 2367/* rxvt_cmd_getc () - Return next input character */
2866/* 2368/*
2867 * Return the next input character after first passing any keyboard input 2369 * Return the next input character after first passing any keyboard input
2868 * to the command. 2370 * to the command.
2869 */ 2371 */
2870wchar_t 2372wchar_t
2871rxvt_term::cmd_getc () 2373rxvt_term::cmd_getc () THROW ((class out_of_input))
2872{ 2374{
2873 wchar_t c = next_char (); 2375 wchar_t c = next_char ();
2874 2376
2875 if (c == NOCHAR) 2377 if (c == NOCHAR)
2876 throw out_of_input; 2378 throw out_of_input;
2877 2379
2878 return c; 2380 return c;
2879} 2381}
2880 2382
2881uint32_t 2383uint32_t
2882rxvt_term::cmd_get8 () 2384rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883{ 2385{
2884 uint32_t c = next_octet (); 2386 uint32_t c = next_octet ();
2885 2387
2886 if (c == NOCHAR) 2388 if (c == NOCHAR)
2887 throw out_of_input; 2389 throw out_of_input;
… …
2953 { 2455 {
2954 if ((buf[len++] = cmd_getc ()) == 'i') 2456 if ((buf[len++] = cmd_getc ()) == 'i')
2955 break; /* done = 1 */ 2457 break; /* done = 1 */
2956 } 2458 }
2957 } 2459 }
2958 2460
2959 for (i = 0; i < len; i++) 2461 for (i = 0; i < len; i++)
2960 if (putc (buf[i], fd) == EOF) 2462 if (putc (buf[i], fd) == EOF)
2961 { 2463 {
2962 done = 1; 2464 done = 1;
2963 break; 2465 break;
… …
2965 } 2467 }
2966 } 2468 }
2967 2469
2968 pclose_printer (fd); 2470 pclose_printer (fd);
2969} 2471}
2970#endif /* PRINTPIPE */ 2472#endif /* PRINTPIPE */
2971/*}}} */ 2473/*}}} */
2972 2474
2973/* *INDENT-OFF* */ 2475/* *INDENT-OFF* */
2974enum { 2476enum {
2975 C1_40 = 0x40, 2477 C1_40 = 0x40,
… …
3025 process_dcs_seq (); 2527 process_dcs_seq ();
3026 break; 2528 break;
3027 case 0x9b: /* CSI */ 2529 case 0x9b: /* CSI */
3028 process_csi_seq (); 2530 process_csi_seq ();
3029 break; 2531 break;
3030 case 0x9d: /* CSI */ 2532 case 0x9d: /* OSC */
3031 process_osc_seq (); 2533 process_osc_seq ();
3032 break; 2534 break;
3033#endif 2535#endif
3034 } 2536 }
3035} 2537}
… …
3125 scr_charset_set (2, (unsigned int)cmd_getc ()); 2627 scr_charset_set (2, (unsigned int)cmd_getc ());
3126 break; 2628 break;
3127 case '+': 2629 case '+':
3128 scr_charset_set (3, (unsigned int)cmd_getc ()); 2630 scr_charset_set (3, (unsigned int)cmd_getc ());
3129 break; 2631 break;
3130#if ENABLE_FRILLS 2632#if !ENABLE_MINIMAL
3131 case '6': 2633 case '6':
3132 scr_backindex (); 2634 scr_backindex ();
3133 break; 2635 break;
3134#endif 2636#endif
3135 case '7': 2637 case '7':
3136 scr_cursor (SAVE); 2638 scr_cursor (SAVE);
3137 break; 2639 break;
3138 case '8': 2640 case '8':
3139 scr_cursor (RESTORE); 2641 scr_cursor (RESTORE);
3140 break; 2642 break;
3141#if ENABLE_FRILLS 2643#if !ENABLE_MINIMAL
3142 case '9': 2644 case '9':
3143 scr_forwardindex (); 2645 scr_forwardindex ();
3144 break; 2646 break;
3145#endif 2647#endif
3146 case '=': 2648 case '=':
… …
3261rxvt_term::process_csi_seq () 2763rxvt_term::process_csi_seq ()
3262{ 2764{
3263 unicode_t ch, priv, i; 2765 unicode_t ch, priv, i;
3264 unsigned int nargs, p; 2766 unsigned int nargs, p;
3265 int n, ndef; 2767 int n, ndef;
3266 int arg[ESC_ARGS]; 2768 int arg[ESC_ARGS] = { };
3267 2769
3268 for (nargs = ESC_ARGS; nargs > 0;) 2770 nargs = 0;
3269 arg[--nargs] = 0;
3270 2771
3271 priv = 0; 2772 priv = 0;
3272 ch = cmd_getc (); 2773 ch = cmd_getc ();
3273 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
3274 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
3275 priv = ch; 2777 priv = ch;
3276 ch = cmd_getc (); 2778 ch = cmd_getc ();
3277 } 2779 }
3278 2780
3279 /* read any numerical arguments */ 2781 /* read any numerical arguments */
… …
3308 ndef = get_byte_array_bit (csi_defaults, i); 2810 ndef = get_byte_array_bit (csi_defaults, i);
3309 for (p = 0; p < nargs; p++) 2811 for (p = 0; p < nargs; p++)
3310 if (arg[p] == -1) 2812 if (arg[p] == -1)
3311 arg[p] = ndef; 2813 arg[p] = ndef;
3312 2814
3313#ifdef DEBUG_CMD
3314 fprintf (stderr, "CSI ");
3315 for (p = 0; p < nargs; p++)
3316 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317 fprintf (stderr, "%c\n", ch);
3318#endif
3319
3320 /* 2815 /*
3321 * private mode handling 2816 * private mode handling
3322 */ 2817 */
3323 if (priv) 2818 if (priv)
3324 { 2819 {
3325 switch (priv) 2820 switch (priv)
3326 { 2821 {
3327 case '>': 2822 case '>':
3328 if (ch == CSI_DA) /* secondary device attributes */ 2823 if (ch == CSI_DA) /* secondary device attributes */
3329 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2824 {
2825 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2826 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2827 //
2828 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2829 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2830 // versions.
2831 //
2832 tt_printf ("\033[>%d;95;0c", 'U');
2833 }
3330 break; 2834 break;
2835
3331 case '?': 2836 case '?':
3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3333 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
3334 break; 2839 break;
3335 } 2840 }
… …
3460 break; 2965 break;
3461 case 6: /* CPR requested */ 2966 case 6: /* CPR requested */
3462 scr_report_position (); 2967 scr_report_position ();
3463 break; 2968 break;
3464 case 7: /* unofficial extension */ 2969 case 7: /* unofficial extension */
3465 if (OPTION (Opt_insecure)) 2970 if (option (Opt_insecure))
3466 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2971 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3467 break; 2972 break;
3468 case 8: /* unofficial extension */ 2973 case 8: /* unofficial extension */
3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2974 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3470 break; 2975 break;
… …
3537 break; 3042 break;
3538 case CSI_75: 3043 case CSI_75:
3539 scr_cursor (RESTORE); 3044 scr_cursor (RESTORE);
3540 break; 3045 break;
3541 3046
3542#if ENABLE_FRILLS 3047#if !ENABLE_MINIMAL
3543 case CSI_74: 3048 case CSI_74:
3544 process_window_ops (arg, nargs); 3049 process_window_ops (arg, nargs);
3545 break; 3050 break;
3546#endif 3051#endif
3547 3052
… …
3554 break; 3059 break;
3555 } 3060 }
3556} 3061}
3557/*}}} */ 3062/*}}} */
3558 3063
3559#if ENABLE_FRILLS 3064#if !ENABLE_MINIMAL
3560/* ARGSUSED */ 3065/* ARGSUSED */
3561void 3066void
3562rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3067rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563{ 3068{
3564 int x, y; 3069 int x, y;
3565 XWindowAttributes wattr; 3070 XWindowAttributes wattr;
3566 Window wdummy; 3071 Window wdummy;
3567 dDisp; 3072
3073 dLocal (Display *, dpy);
3568 3074
3569 if (nargs == 0) 3075 if (nargs == 0)
3570 return; 3076 return;
3571 3077
3572 switch (args[0]) 3078 switch (args[0])
3573 { 3079 {
3574 /* 3080 /*
3575 * commands 3081 * commands
3576 */ 3082 */
3577 case 1: /* deiconify window */ 3083 case 1: /* deiconify window */
3578 XMapWindow (disp, parent[0]); 3084 XMapWindow (dpy, parent[0]);
3579 break; 3085 break;
3580 case 2: /* iconify window */ 3086 case 2: /* iconify window */
3581 XIconifyWindow (disp, parent[0], display->screen); 3087 XIconifyWindow (dpy, parent[0], display->screen);
3582 break; 3088 break;
3583 case 3: /* set position (pixels) */ 3089 case 3: /* set position (pixels) */
3584 XMoveWindow (disp, parent[0], args[1], args[2]); 3090 XMoveWindow (dpy, parent[0], args[1], args[2]);
3585 break; 3091 break;
3586 case 4: /* set size (pixels) */ 3092 case 4: /* set size (pixels) */
3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3093 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588 break; 3094 break;
3589 case 5: /* raise window */ 3095 case 5: /* raise window */
3590 XRaiseWindow (disp, parent[0]); 3096 XRaiseWindow (dpy, parent[0]);
3591 break; 3097 break;
3592 case 6: /* lower window */ 3098 case 6: /* lower window */
3593 XLowerWindow (disp, parent[0]); 3099 XLowerWindow (dpy, parent[0]);
3594 break; 3100 break;
3595 case 7: /* refresh window */ 3101 case 7: /* refresh window */
3596 scr_touch (true); 3102 scr_touch (true);
3597 break; 3103 break;
3598 case 8: /* set size (chars) */ 3104 case 8: /* set size (chars) */
… …
3605 if (args[0] >= 24) /* set height (chars) */ 3111 if (args[0] >= 24) /* set height (chars) */
3606 set_widthheight ((unsigned int)width, 3112 set_widthheight ((unsigned int)width,
3607 (unsigned int) (args[1] * fheight)); 3113 (unsigned int) (args[1] * fheight));
3608 break; 3114 break;
3609 3115
3610
3611 /* 3116 /*
3612 * reports - some output format copied from XTerm 3117 * reports - some output format copied from XTerm
3613 */ 3118 */
3614 case 11: /* report window state */ 3119 case 11: /* report window state */
3615 XGetWindowAttributes (disp, parent[0], &wattr); 3120 XGetWindowAttributes (dpy, parent[0], &wattr);
3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3121 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617 break; 3122 break;
3618 case 13: /* report window position */ 3123 case 13: /* report window position */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3124 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 XTranslateCoordinates (disp, parent[0], wattr.root, 3125 XTranslateCoordinates (dpy, parent[0], wattr.root,
3621 -wattr.border_width, -wattr.border_width, 3126 -wattr.border_width, -wattr.border_width,
3622 &x, &y, &wdummy); 3127 &x, &y, &wdummy);
3623 tt_printf ("\033[3;%d;%dt", x, y); 3128 tt_printf ("\033[3;%d;%dt", x, y);
3624 break; 3129 break;
3625 case 14: /* report window size (pixels) */ 3130 case 14: /* report window size (pixels) */
3626 XGetWindowAttributes (disp, parent[0], &wattr); 3131 XGetWindowAttributes (dpy, parent[0], &wattr);
3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3132 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628 break; 3133 break;
3629 case 18: /* report text area size (chars) */ 3134 case 18: /* report text area size (chars) */
3630 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3135 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631 break; 3136 break;
… …
3633 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3138 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634 break; 3139 break;
3635 case 20: /* report icon label */ 3140 case 20: /* report icon label */
3636 { 3141 {
3637 char *s; 3142 char *s;
3638 XGetIconName (disp, parent[0], &s); 3143 XGetIconName (dpy, parent[0], &s);
3639 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3144 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3640 XFree (s); 3145 XFree (s);
3641 } 3146 }
3642 break; 3147 break;
3643 case 21: /* report window title */ 3148 case 21: /* report window title */
3644 { 3149 {
3645 char *s; 3150 char *s;
3646 XFetchName (disp, parent[0], &s); 3151 XFetchName (dpy, parent[0], &s);
3647 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3152 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3153 XFree (s);
3649 } 3154 }
3650 break; 3155 break;
3651 } 3156 }
3652} 3157}
… …
3679 seen_esc = true; 3184 seen_esc = true;
3680 continue; 3185 continue;
3681 } 3186 }
3682 else if (ch == C0_BEL || ch == CHAR_ST) 3187 else if (ch == C0_BEL || ch == CHAR_ST)
3683 break; 3188 break;
3189 else if (ch == C0_SYN)
3190 ch = cmd_get8 ();
3684 else if (ch < 0x20) 3191 else if (ch < 0x20)
3685 return NULL; /* other control character - exit */ 3192 return NULL; /* other control character - exit */
3686 3193
3687 seen_esc = false; 3194 seen_esc = false;
3688 3195
3689 if (n >= STRING_MAX - 1) 3196 if (n >= STRING_MAX - 1)
3690 // stop at some sane length 3197 // stop at some sane length
3691 return NULL; 3198 return NULL;
3692 3199
3693 if (ch == C0_SYN)
3694 string[n++] = cmd_get8 ();
3695 else
3696 string[n++] = ch; 3200 string[n++] = ch;
3697 } 3201 }
3698 3202
3699 string[n++] = '\0'; 3203 string[n++] = '\0';
3700 3204
3701 ends_how = (ch == 0x5c ? C0_ESC : ch); 3205 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3752void 3256void
3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3257rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3754{ 3258{
3755 if (str[0] == '?' && !str[1]) 3259 if (str[0] == '?' && !str[1])
3756 { 3260 {
3757 unsigned short r, g, b; 3261 rgba c;
3758 pix_colors_focused[color].get (display, r, g, b); 3262 pix_colors_focused[color].get (c);
3263
3264#if XFT
3265 if (c.a != rgba::MAX_CC)
3266 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3267 else
3268#endif
3759 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3269 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3760 } 3270 }
3761 else 3271 else
3762 set_window_color (color, str); 3272 set_window_color (color, str);
3763} 3273}
3764 3274
… …
3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3276 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3767 */ 3277 */
3768void 3278void
3769rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3279rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3770{ 3280{
3771 int changed = 0;
3772 int color; 3281 int color;
3773 char *buf, *name; 3282 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3283 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3284 int saveop = op;
3776 dDisp; 3285
3286 dLocal (Display *, dpy);
3777 3287
3778 assert (str != NULL); 3288 assert (str != NULL);
3289
3290 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3291 return;
3292
3779 switch (op) 3293 switch (op)
3780 { 3294 {
3781 case XTerm_name: 3295 case XTerm_name:
3782 set_title (str); 3296 set_title (str);
3783 /* FALLTHROUGH */ 3297 /* FALLTHROUGH */
… …
3797 unsigned long bytes_after; 3311 unsigned long bytes_after;
3798 unsigned char *value = 0; 3312 unsigned char *value = 0;
3799 const char *str = ""; 3313 const char *str = "";
3800 3314
3801 if (prop 3315 if (prop
3802 && XGetWindowProperty (disp, parent[0], 3316 && XGetWindowProperty (dpy, parent[0],
3803 prop, 0, 1<<16, 0, AnyPropertyType, 3317 prop, 0, 1<<16, 0, AnyPropertyType,
3804 &actual_type, &actual_format, 3318 &actual_type, &actual_format,
3805 &nitems, &bytes_after, &value) == Success 3319 &nitems, &bytes_after, &value) == Success
3806 && actual_type != None 3320 && actual_type != None
3807 && actual_format == 8) 3321 && actual_format == 8)
3808 str = (const char *)(value); 3322 str = (const char *)(value);
3809 3323
3810 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3324 tt_printf ("\033]%d;%s%c", op, str, resp);
3811 3325
3812 XFree (value); 3326 XFree (value);
3813 } 3327 }
3814 else 3328 else
3815 { 3329 {
… …
3819 { 3333 {
3820 *eq = 0; 3334 *eq = 0;
3821 set_utf8_property (display->atom (str), eq + 1); 3335 set_utf8_property (display->atom (str), eq + 1);
3822 } 3336 }
3823 else 3337 else
3824 XDeleteProperty (disp, parent[0], 3338 XDeleteProperty (dpy, parent[0],
3825 display->atom (str)); 3339 display->atom (str));
3826 } 3340 }
3827 break; 3341 break;
3828 3342
3829 case XTerm_Color: 3343 case XTerm_Color:
… …
3839 break; 3353 break;
3840 3354
3841 if ((buf = strchr (name, ';')) != NULL) 3355 if ((buf = strchr (name, ';')) != NULL)
3842 *buf++ = '\0'; 3356 *buf++ = '\0';
3843 3357
3844 if (name[0] == '?' && !name[1]) 3358 process_color_seq (op, color, name, resp);
3845 {
3846 unsigned short r, g, b;
3847 pix_colors_focused[color].get (display, r, g, b);
3848 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3849 }
3850 else
3851 set_window_color (color, name);
3852 } 3359 }
3853 break; 3360 break;
3361 case Rxvt_restoreFG:
3854 case XTerm_Color00: 3362 case XTerm_Color00:
3855 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3856 break; 3364 break;
3365 case Rxvt_restoreBG:
3857 case XTerm_Color01: 3366 case XTerm_Color01:
3858 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3859 break; 3368 break;
3860#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3861 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
3862 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3371 process_color_seq (op, Color_cursor, str, resp);
3863 break; 3372 break;
3864#endif 3373#endif
3865 case XTerm_Color_pointer_fg: 3374 case XTerm_Color_pointer_fg:
3866 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3375 process_color_seq (op, Color_pointer_fg, str, resp);
3867 break; 3376 break;
3868 case XTerm_Color_pointer_bg: 3377 case XTerm_Color_pointer_bg:
3869 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3378 process_color_seq (op, Color_pointer_bg, str, resp);
3870 break; 3379 break;
3871#ifndef NO_BOLD_UNDERLINE_REVERSE 3380#ifndef NO_BOLD_UNDERLINE_REVERSE
3872 case XTerm_Color_RV: 3381 case XTerm_Color_RV:
3873 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3382 process_color_seq (op, Color_RV, str, resp);
3874 break; 3383 break;
3875 case Rxvt_Color_BD: 3384 case Rxvt_Color_BD:
3876 case URxvt_Color_BD: 3385 case URxvt_Color_BD:
3877 process_color_seq (op, Color_BD, str, resp); 3386 process_color_seq (op, Color_BD, str, resp);
3878 break; 3387 break;
3879 case Rxvt_Color_UL: 3388 case Rxvt_Color_UL:
3880 case URxvt_Color_UL: 3389 case URxvt_Color_UL:
3881 process_color_seq (op, Color_UL, str, resp); 3390 process_color_seq (op, Color_UL, str, resp);
3882 break; 3391 break;
3883 case URxvt_Color_IT: 3392 case URxvt_Color_IT:
3884 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3393 process_color_seq (op, Color_IT, str, resp);
3885 break; 3394 break;
3886#endif 3395#endif
3887#if TRANSPARENT && TINTING 3396#if ENABLE_TRANSPARENCY
3888 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3889 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3890 check_our_parents (); 3399 {
3891 if (am_transparent) 3400 bool changed = false;
3892 want_full_refresh = want_refresh = 1;
3893 break;
3894#endif
3895 3401
3402 if (ISSET_PIXCOLOR (Color_tint))
3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3404 else
3405 changed = bgPixmap.unset_tint ();
3406
3407 if (changed)
3408 update_background ();
3409 }
3410
3411 break;
3412#endif
3413
3414#if BG_IMAGE_FROM_FILE
3896 case Rxvt_Pixmap: 3415 case Rxvt_Pixmap:
3897 if (*str != ';') 3416 if (!strcmp (str, "?"))
3898 { 3417 {
3899#if XPM_BACKGROUND 3418 char str[256];
3900 scale_pixmap (""); /* reset to default scaling */ 3419
3901 set_bgPixmap (str); /* change pixmap */ 3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3902 scr_touch (true); 3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3903#endif 3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423 process_xterm_seq (XTerm_title, str, CHAR_ST);
3904 } 3424 }
3905 3425 else
3906 while ((str = strchr (str, ';')) != NULL)
3907 { 3426 {
3427 int changed = 0;
3428
3429 if (*str != ';')
3430 {
3431 /* reset to default scaling :*/
3432 bgPixmap.unset_geometry ();
3433 if (bgPixmap.set_file (str)) /* change pixmap */
3434 changed++;
3435 str = strchr (str, ';');
3436 if (str == NULL)
3437 bgPixmap.set_defaultGeometry ();
3438 }
3439
3440 while (str)
3441 {
3908 str++; 3442 str++;
3909#if XPM_BACKGROUND 3443 if (bgPixmap.set_geometry (str))
3910 changed += scale_pixmap (str); 3444 changed++;
3911#endif 3445 str = strchr (str, ';');
3446 }
3447
3448 if (changed)
3449 update_background ();
3912 } 3450 }
3913
3914 if (changed)
3915 {
3916#ifdef XPM_BACKGROUND
3917 resize_pixmap ();
3918 scr_touch (true);
3919#endif
3920 }
3921 break; 3451 break;
3922 3452#endif
3923 case Rxvt_restoreFG:
3924 set_window_color (Color_fg, str);
3925 break;
3926 case Rxvt_restoreBG:
3927 set_window_color (Color_bg, str);
3928 break;
3929 3453
3930 case XTerm_logfile: 3454 case XTerm_logfile:
3931 // TODO, when secure mode? 3455 // TODO, when secure mode?
3932 break; 3456 break;
3933 3457
… …
3951 case URxvt_italicFont: 3475 case URxvt_italicFont:
3952 case URxvt_boldItalicFont: 3476 case URxvt_boldItalicFont:
3953#endif 3477#endif
3954 if (query) 3478 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", saveop, 3479 tt_printf ("\33]%d;%-.250s%c", saveop,
3956 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3480 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3957 ? fontset[op - URxvt_font]->fontdesc : "", 3481 ? fontset[op - URxvt_font]->fontdesc : "",
3958 resp); 3482 resp);
3959 else 3483 else
3960 { 3484 {
3961 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3485 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3964 allocated.push_back ((void *)res); 3488 allocated.push_back ((void *)res);
3965 set_fonts (); 3489 set_fonts ();
3966 } 3490 }
3967 break; 3491 break;
3968 3492
3969#if ENABLE_FRILLS 3493 case URxvt_version:
3494 if (query)
3495 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3496 op,
3497 rs[Rs_name], VERSION[0], VERSION[2],
3498 resp);
3499 break;
3500
3501#if !ENABLE_MINIMAL
3970 case URxvt_locale: 3502 case URxvt_locale:
3971 if (query) 3503 if (query)
3972 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3504 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3973 else 3505 else
3974 { 3506 {
3975 set_locale (str); 3507 set_locale (str);
3976 pty->set_utf8_mode (enc_utf8); 3508 pty->set_utf8_mode (enc_utf8);
3977 init_xlocale (); 3509 init_xlocale ();
… …
3992 break; 3524 break;
3993#endif 3525#endif
3994 3526
3995#if ENABLE_PERL 3527#if ENABLE_PERL
3996 case URxvt_perl: 3528 case URxvt_perl:
3997 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3529 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3998 ; // no responses yet 3530 ; // no responses yet
3999 break; 3531 break;
4000#endif 3532#endif
4001 } 3533 }
4002} 3534}
… …
4034 return state; 3566 return state;
4035} 3567}
4036 3568
4037/* we're not using priv _yet_ */ 3569/* we're not using priv _yet_ */
4038void 3570void
4039rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3571rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4040{ 3572{
4041 unsigned int i, j; 3573 unsigned int i, j;
4042 int state; 3574 int state;
4043 3575
4044 static const struct 3576 static const struct
4045 { 3577 {
4046 const int argval; 3578 const int argval;
4047 const unsigned long bit; 3579 const unsigned long bit;
4048 }
4049
4050 argtopriv[] = { 3580 } argtopriv[] = {
4051 { 1, PrivMode_aplCUR }, 3581 { 1, PrivMode_aplCUR },
4052 { 2, PrivMode_vt52 }, 3582 { 2, PrivMode_vt52 },
4053 { 3, PrivMode_132 }, 3583 { 3, PrivMode_132 },
4054 { 4, PrivMode_smoothScroll }, 3584 { 4, PrivMode_smoothScroll },
4055 { 5, PrivMode_rVideo }, 3585 { 5, PrivMode_rVideo },
… …
4071 { 66, PrivMode_aplKP }, 3601 { 66, PrivMode_aplKP },
4072#ifndef NO_BACKSPACE_KEY 3602#ifndef NO_BACKSPACE_KEY
4073 { 67, PrivMode_BackSpace }, 3603 { 67, PrivMode_BackSpace },
4074#endif 3604#endif
4075 { 1000, PrivMode_MouseX11 }, 3605 { 1000, PrivMode_MouseX11 },
4076 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3606 { 1002, PrivMode_MouseBtnEvent },
4077 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3607 { 1003, PrivMode_MouseAnyEvent },
4078 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4079 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3608 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4080 { 1011, PrivMode_Keypress }, // rxvt extension 3609 { 1011, PrivMode_Keypress }, // rxvt extension
4081 // 1035 enable modifiers for alt, numlock NYI 3610 // 1035 enable modifiers for alt, numlock NYI
4082 // 1036 send ESC for meta keys NYI 3611 // 1036 send ESC for meta keys NYI
4083 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
4084 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
4085 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
4086 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3615 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4087 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
4088 }; 3618 };
4089 3619
4090 if (nargs == 0) 3620 if (nargs == 0)
4091 return; 3621 return;
4092 3622
… …
4118 scr_touch (true); 3648 scr_touch (true);
4119 break; 3649 break;
4120#endif 3650#endif
4121 case 1048: /* alternative cursor save */ 3651 case 1048: /* alternative cursor save */
4122 case 1049: 3652 case 1049:
4123 if (OPTION (Opt_secondaryScreen)) 3653 if (option (Opt_secondaryScreen))
4124 if (mode == 0) 3654 if (mode == 0)
4125 scr_cursor (RESTORE); 3655 scr_cursor (RESTORE);
4126 else if (mode == 1) 3656 else if (mode == 1)
4127 scr_cursor (SAVE); 3657 scr_cursor (SAVE);
4128 break; 3658 break;
… …
4140 */ 3670 */
4141 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
4142 break; 3672 break;
4143 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
4144 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
4145 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
4146 break; 3679 break;
4147 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
4148 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
4149 break; 3682 break;
4150 case 5: /* reverse video */ 3683 case 5: /* reverse video */
… …
4157 scr_autowrap (state); 3690 scr_autowrap (state);
4158 break; 3691 break;
4159 /* case 8: - auto repeat, can't do on a per window basis */ 3692 /* case 8: - auto repeat, can't do on a per window basis */
4160 case 9: /* X10 mouse reporting */ 3693 case 9: /* X10 mouse reporting */
4161 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4162 priv_modes &= ~PrivMode_MouseX11; 3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4163 break; 3696 break;
4164#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
4165 case scrollBar_esc: 3698 case scrollBar_esc:
4166 if (scrollbar_mapping (state)) 3699 if (scrollbar_mapping (state))
4167 { 3700 {
… …
4180 break; 3713 break;
4181 /* case 66: - application key pad */ 3714 /* case 66: - application key pad */
4182 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
4183 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
4184 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
4185 priv_modes &= ~PrivMode_MouseX10; 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4186 break; 3719 break;
4187#if 0
4188 case 1001: 3720 case 1002:
4189 break; /* X11 mouse highlighting */ 3721 case 1003:
4190#endif 3722 if (state)
3723 {
3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3725 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726 vt_emask_mouse = PointerMotionMask;
3727 }
3728 else
3729 vt_emask_mouse = NoEventMask;
3730 vt_select_input ();
3731 break;
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 3732 case 1010: /* scroll to bottom on TTY output inhibit */
4192 set_option (Opt_scrollTtyOutput, !state); 3733 set_option (Opt_scrollTtyOutput, !state);
4193 break; 3734 break;
4194 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
4195 set_option (Opt_scrollTtyKeypress, state); 3736 set_option (Opt_scrollTtyKeypress, state);
4196 break; 3737 break;
4197 case 1047: /* secondary screen w/ clearing last */ 3738 case 1047: /* secondary screen w/ clearing last */
4198 if (OPTION (Opt_secondaryScreen)) 3739 if (option (Opt_secondaryScreen))
4199 if (current_screen != PRIMARY) 3740 if (current_screen != PRIMARY)
4200 scr_erase_screen (2); 3741 scr_erase_screen (2);
4201 scr_change_screen (state); 3742 scr_change_screen (state);
4202 break; 3743 break;
4203 case 1049: /* secondary screen w/ clearing first */ 3744 case 1049: /* secondary screen w/ clearing first */
4204 scr_change_screen (state); 3745 scr_change_screen (state);
4205 if (OPTION (Opt_secondaryScreen)) 3746 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3747 if (current_screen != PRIMARY)
4207 scr_erase_screen (2); 3748 scr_erase_screen (2);
4208 break; 3749 break;
4209 default: 3750 default:
4210 break; 3751 break;
… …
4338 scr_color (Color_bg, Color_bg); 3879 scr_color (Color_bg, Color_bg);
4339 break; 3880 break;
4340 3881
4341 //case 50: // not variable spacing 3882 //case 50: // not variable spacing
4342 3883
4343#if ENABLE_FRILLS 3884#if !ENABLE_MINIMAL
4344 case 90: 3885 case 90:
4345 case 91: /* set bright fg color */ 3886 case 91: /* set bright fg color */
4346 case 92: 3887 case 92:
4347 case 93: 3888 case 93:
4348 case 94: 3889 case 94:
… …
4372rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
4373{ 3914{
4374 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
4375 3916
4376 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
4377 { /* query graphics */ 3919 /* query graphics */
4378 tt_printf ("\033G0\012"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
4379 return; 3921 return;
4380 } 3922 }
4381 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
4382 do 3924 do
… …
4432 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 3975
4434 memcpy (v_buffer + v_buflen, data, len); 3976 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 3977 v_buflen += len;
4436 3978
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 3979 pty_ev.set (ev::READ | ev::WRITE);
4438} 3980}
4439 3981
4440void rxvt_term::pty_write () 3982void rxvt_term::pty_write ()
4441{ 3983{
4442 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3984 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4447 3989
4448 if (v_buflen == 0) 3990 if (v_buflen == 0)
4449 { 3991 {
4450 free (v_buffer); 3992 free (v_buffer);
4451 v_buffer = 0; 3993 v_buffer = 0;
4452 v_buflen = 0;
4453 3994
4454 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4455 return; 3996 return;
4456 } 3997 }
4457 3998
4458 memmove (v_buffer, v_buffer + written, v_buflen); 3999 memmove (v_buffer, v_buffer + written, v_buflen);
4459 } 4000 }
4460 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4001 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4461 pty_ev.set (EVENT_READ); 4002 pty_ev.set (ev::READ);
4462} 4003}
4463 4004
4464/*----------------------- end-of-file (C source) -----------------------*/ 4005/*----------------------- end-of-file (C source) -----------------------*/
4465 4006

Diff Legend

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