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

Diff Legend

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