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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.389 by ayin, Mon Dec 31 13:50:56 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-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,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 201
206 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
207 203
208 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
210 206
211 if (y >= 0) 207 if (y >= 0)
212 { 208 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 221 ch = *chr++;
226 222
227 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
230# if !UNICODE3 226# if !UNICODE_3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
536#endif 548#endif
537 549
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 551 {
540 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
542 switch (keysym) 585 switch (keysym)
543 { 586 {
544#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 588 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
551 } 594 }
552 else 595 else
553 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 597 break;
555#endif 598#endif
556#ifndef NO_DELETE_KEY 599#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: 600 case XK_Delete:
568 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 602 break;
570#endif 603#endif
571 case XK_Tab: 604 case XK_Tab:
572 if (shft) 605 if (shft)
573 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
583#endif 616#endif
584 newlen = 0; 617 newlen = 0;
585 } 618 }
586 break; 619 break;
587 620
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" */ 621 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
620 break; 637 break;
621 638
622#ifndef UNSHIFTED_SCROLLKEYS 639#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: 640 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
635 break; 642 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: 643 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
648 break; 645 break;
649#endif 646#endif
650 case XK_KP_Enter: 647 case XK_KP_Enter:
651 /* allow shift to override */ 648 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
653 { 650 {
654 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
655 break; 652 break;
656 } 653 }
657 654
… …
669 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
671 } 668 }
672 break; 669 break;
673 670
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" */ 671 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 695 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
706 { 697 {
707 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 700 }
710 else 701 else
… …
716 707
717 case XK_Find: 708 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
719 break; 710 break;
720 711
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: 712 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
733 break; 714 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 716 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
740 break; 721 break;
741 case XK_Select: 722 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
743 break; 724 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: 725 case XK_End:
755 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
756 break; 727 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: 728 case XK_Home:
768 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
769 break; 730 break;
770 731
771#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
873 return; 834 return;
874 835
875 if (len <= 0) 836 if (len <= 0)
876 return; /* not mapped */ 837 return; /* not mapped */
877 838
878 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 840 if (view_start)
880 { 841 {
881 view_start = 0; 842 view_start = 0;
882 want_refresh = 1; 843 want_refresh = 1;
883 } 844 }
… …
905 { 866 {
906 const char ch = C0_ESC; 867 const char ch = C0_ESC;
907 tt_write (&ch, 1); 868 tt_write (&ch, 1);
908 } 869 }
909 870
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); 871 tt_write (kbuf, (unsigned int)len);
921} 872}
922/*}}} */
923 873
874void
875rxvt_term::key_release (XKeyEvent &ev)
876{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym;
879
880 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
881#endif
882
883#if ENABLE_FRILLS || ISO_14755
884 // ISO 14755 support
885 if (iso14755buf)
886 if (iso14755buf & ISO_14755_52)
887 {
888# if ISO_14755
889 scr_overlay_off ();
890# endif
891# if ISO_14755
892 // iso14755 part 5.2 handling: release time
893 // first: controls
894 if ((ev.state & ControlMask)
895 && ((keysym >= 0x40 && keysym <= 0x5f)
896 || (keysym >= 0x61 && keysym <= 0x7f)))
897 {
898 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
899 commit_iso14755 ();
900
901 return;
902 }
903
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
905 if (i[0] == keysym)
906 {
907 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 ();
909
910 return;
911 }
912
913 scr_bell ();
914# endif
915 iso14755buf = 0;
916
917 return;
918 }
919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
920 {
921# if ISO_14755
922 scr_overlay_off ();
923# endif
924 if (iso14755buf & ISO_14755_51)
925 commit_iso14755 ();
926#if ISO_14755
927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
928 {
929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
930
931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
933 }
934# endif
935 else
936 iso14755buf = 0;
937 }
938#endif
939
940 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
941 return;
942
943#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
944 if (!(ev.state & ControlMask))
945 slip_wheel_ev.stop ();
946 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0;
948#endif
949}
950
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 951#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 952unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 954{
930 unsigned int n, s; 955 unsigned int n, s;
931 956
… …
959void 984void
960rxvt_term::flush () 985rxvt_term::flush ()
961{ 986{
962 flush_ev.stop (); 987 flush_ev.stop ();
963 988
964#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
966 { 991 {
967 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 993 scr_touch (false);
970 } 994 }
971#endif 995#endif
972 996
973 if (want_refresh) 997 if (want_refresh)
974 { 998 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 999 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1000 {
977 int row = -view_start; 1001 int row = view_start;
978 int end_row = row + nrow; 1002 int end_row = row + nrow;
979 1003
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1004 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1005 --row;
982 1006
983 do 1007 do
984 { 1008 {
985 int start_row = row; 1009 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1032 while (l->is_longer () && row < end_row);
1009 } 1033 }
1010 while (row < end_row); 1034 while (row < end_row);
1011 } 1035 }
1012 1036
1013 scr_refresh (refresh_type); 1037 scr_refresh ();
1014 scrollbar_show (1); 1038 scrollbar_show (1);
1015#ifdef USE_XIM 1039#ifdef USE_XIM
1016 IMSendSpot (); 1040 IMSendSpot ();
1017#endif 1041#endif
1018 } 1042 }
1019 1043
1020 display->flush (); 1044 display->flush ();
1021} 1045}
1022 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1023void 1048void
1024rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1025{ 1050{
1026 SET_R (this); 1051 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1053
1029 display->flush (); 1054 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1055}
1034 1056
1035void 1057void
1036rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1059{
1038 SET_R (this); 1060 make_current ();
1039 SET_LOCALE (locale);
1040 1061
1041 refresh_limit = 1;
1042 refresh_count = 0; 1062 refresh_count = 0;
1043 flush (); 1063 flush ();
1044} 1064}
1045 1065
1046#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1047void 1067void
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1069{
1050 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1071 want_refresh = 1;
1052 1072 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1073}
1055#endif 1074#endif
1056 1075
1057#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1058void 1077void
1059rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1079{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1081 {
1063 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1064 want_refresh = 1; 1083 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1066 } 1085 }
1086 else
1087 w.stop ();
1067} 1088}
1068#endif 1089#endif
1069 1090
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1092void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1094{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1076 { 1097 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1098 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1080 } 1100 }
1101 else
1102 w.stop ();
1081} 1103}
1082#endif 1104#endif
1083 1105
1084#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1085void 1107void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1109{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1111 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1113 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1094 } 1115 }
1116 else
1117 w.stop ();
1095} 1118}
1096#endif 1119#endif
1097 1120
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1122void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1124{
1102 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1126 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1127 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1113 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1114} 1136}
1115#endif 1137#endif
1116 1138
1117#if HAVE_SCHED_YIELD 1139#if LINUX_YIELD_HACK
1118static struct event_handler 1140static struct event_handler
1119{ 1141{
1120 check_watcher cw_yield; 1142 ev::prepare yield_ev;
1121 1143
1122 void yield (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1123 { 1145 {
1124 sched_yield (); 1146 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS.
1150
1151 struct timespec ts = { 0, 0 };
1152 nanosleep (&ts, 0);
1153
1125 w.stop (); 1154 w.stop ();
1126 } 1155 }
1127 1156
1128 event_handler () 1157 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1158 : yield_ev (this, &event_handler::yield_cb)
1130 { 1159 {
1131 } 1160 }
1132} event_handler; 1161} event_handler;
1133#endif 1162#endif
1134 1163
… …
1145 1174
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1176 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1177 cmdbuf_endp = cmdbuf_ptr + n;
1149 1178
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1180
1152 if (r > 0) 1181 if (r > 0)
1153 { 1182 {
1154 cmdbuf_endp += r; 1183 cmdbuf_endp += r;
1155 return true; 1184 return true;
1156 } 1185 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1186 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1187 {
1159#if HAVE_SCHED_YIELD 1188#if LINUX_YIELD_HACK
1160 if (display->is_local) 1189 if (display->is_local)
1161 event_handler.cw_yield.start (); 1190 event_handler.yield_ev.start ();
1162#endif 1191#endif
1163 } 1192 }
1164 else 1193 else
1165 { 1194 {
1166 pty_ev.stop (); 1195 pty_ev.stop ();
1167 1196
1168 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1169 destroy (); 1198 destroy ();
1170 } 1199 }
1171 1200
1172 return false; 1201 return false;
1173} 1202}
1174 1203
1175void 1204void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1206{
1178 SET_R (this); 1207 make_current ();
1179 SET_LOCALE (locale);
1180 1208
1181 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1211 while (pty_fill ())
1184 if (cmd_parse ()) 1212 if (cmd_parse ())
1185 break; 1213 break;
1186 1214
1187 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1188 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1189} 1219}
1190 1220
1191void 1221void
1192rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1193{ 1223{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1225 recolour_cursor ();
1196 1226
1197#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1228 hidden_pointer = 0;
1199 1229
1200 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1202#endif 1232#endif
1203} 1233}
1204 1234
1205#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1206void 1236void
1207rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1208{ 1238{
1209 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1210 return; 1240 return;
1211 1241
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1243 XFlush (dpy);
1214 1244
1215 hidden_pointer = 1; 1245 hidden_pointer = 1;
1216} 1246}
1217 1247
1218void 1248void
1219rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1250{
1221 SET_R (this); 1251 make_current ();
1222 SET_LOCALE (locale);
1223 1252
1224 pointer_blank (); 1253 pointer_blank ();
1225} 1254}
1226#endif 1255#endif
1227 1256
1228void 1257void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1259{
1231 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1232 int x, y; 1261 int x, y;
1262 int code = 32;
1233 1263
1234 x = ev.x; 1264 x = Pixel2Col (ev.x);
1235 y = ev.y; 1265 y = Pixel2Row (ev.y);
1236 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1237 1274
1238 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1239 button_number = 3; 1276 button_number = 3;
1240 else 1277 else
1241 { 1278 {
… …
1287 x + 1, 1324 x + 1,
1288 y + 1); 1325 y + 1);
1289#endif 1326#endif
1290 1327
1291 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1293 (32 + x + 1), 1330 (32 + x + 1),
1294 (32 + y + 1)); 1331 (32 + y + 1));
1295} 1332}
1296
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306 1333
1307/*{{{ process an X event */ 1334/*{{{ process an X event */
1308void 1335void
1309rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1310{ 1337{
1311 dDisp; 1338 make_current ();
1312 1339
1313 SET_R (this); 1340 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1341
1316 if (ev.xany.window == vt 1342 if (ev.xany.window == vt
1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1345 return;
1319 1346
1347 // for XQueryPointer
1320 Window unused_root, unused_child; 1348 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1349 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1350 unsigned int unused_mask;
1323 1351
1324 switch (ev.type) 1352 switch (ev.type)
1325 { 1353 {
1326 case KeyPress: 1354 case KeyPress:
1327#if ISO_14755 1355 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1356 break;
1333 1357
1334 case KeyRelease: 1358 case KeyRelease:
1335 { 1359 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1360 break;
1407 }
1408 1361
1409 case ButtonPress: 1362 case ButtonPress:
1410 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1411 break; 1364 break;
1412 1365
… …
1414 button_release (ev.xbutton); 1367 button_release (ev.xbutton);
1415 break; 1368 break;
1416 1369
1417 case ClientMessage: 1370 case ClientMessage:
1418 if (ev.xclient.format == 32 1371 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1372 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 1373 {
1374 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1377 {
1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1379 {
1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422 destroy (); 1381 destroy ();
1382 }
1423#if ENABLE_EWMH 1383#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev); 1387 &ev);
1388#endif
1389 }
1390 }
1391#if ENABLE_XEMBED
1392 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1393 {
1394 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1395 focus_in ();
1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1397 focus_out ();
1398 }
1428#endif 1399#endif
1429 } 1400 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break;
1466
1467 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1401 break;
1470 1402
1471 /* 1403 /*
1472 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1473 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1492 break; 1424 break;
1493 } 1425 }
1494 break; 1426 break;
1495 1427
1496 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1432 focus_in ();
1498 break; 1433 break;
1499 1434
1500 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1439 focus_out ();
1502 break; 1440 break;
1503 1441
1504 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1505 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1506 { 1447 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 1449 ;
1509 1450
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1452 {
1512 seen_resize = 1; 1453 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1455 }
1515 1456 else
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1457 {
1517 if (OPTION (Opt_transparent)) 1458#ifdef HAVE_BG_PIXMAP
1518 check_our_parents (); 1459 if (bgPixmap.window_position_sensitive ())
1460 update_background ();
1519#endif 1461#endif
1462 }
1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 } 1465 }
1521 break; 1466 break;
1522 1467
1523 case PropertyNotify: 1468 case PropertyNotify:
1469 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1470 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525 && ev.xproperty.state == PropertyNewValue) 1471 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom); 1472 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527 1473
1528 break; 1474 break;
1529 1475
1530 case SelectionClear: 1476 case SelectionClear:
1531 selection_clear (); 1477 selection_clear ();
… …
1541 break; 1487 break;
1542 1488
1543 case MapNotify: 1489 case MapNotify:
1544 mapped = 1; 1490 mapped = 1;
1545#ifdef TEXT_BLINK 1491#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1492 text_blink_ev.start ();
1547#endif 1493#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break; 1495 break;
1550 1496
1551 case UnmapNotify: 1497 case UnmapNotify:
… …
1553#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1554 text_blink_ev.stop (); 1500 text_blink_ev.stop ();
1555#endif 1501#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1557 break; 1503 break;
1558
1559#ifdef TRANSPARENT
1560 case ReparentNotify:
1561 rootwin_cb (ev);
1562 break;
1563#endif /* TRANSPARENT */
1564 1504
1565 case GraphicsExpose: 1505 case GraphicsExpose:
1566 case Expose: 1506 case Expose:
1567 if (ev.xany.window == vt) 1507 if (ev.xany.window == vt)
1568 { 1508 {
1569 do 1509 do
1510 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1513 }
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1515
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1517
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 {
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1522 }
1579 1523
1580 want_refresh = 1; 1524 want_refresh = 1;
1581 } 1525 }
1582 else 1526 else
1583 { 1527 {
1584 XEvent unused_event; 1528 XEvent unused_event;
1585 1529
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1531 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1533 ;
1590 1534
1591 if (isScrollbarWindow (ev.xany.window)) 1535 if (scrollBar.state && ev.xany.window == scrollBar.win)
1592 { 1536 {
1593 scrollBar.setIdle (); 1537 scrollBar.setIdle ();
1594 scrollbar_show (0); 1538 scrollbar_show (0);
1595 } 1539 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1605 } 1540 }
1606 break; 1541 break;
1607 1542
1608 case MotionNotify: 1543 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1545 if (hidden_pointer)
1612 pointer_unblank (); 1546 pointer_unblank ();
1613#endif 1547#endif
1614#if MENUBAR 1548 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 if (isMenuBarWindow (ev.xany.window)) 1549 || priv_modes & PrivMode_MouseAnyEvent)
1616 {
1617 menubar_control (ev.xbutton); 1550 mouse_report (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1552 break;
1623 1553
1624 if (ev.xany.window == vt) 1554 if (ev.xany.window == vt)
1625 { 1555 {
1556 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1557 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1558 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1559 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1560 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631 ; 1562 ;
1632 1563
1633 XQueryPointer (disp, vt, 1564 XQueryPointer (dpy, vt,
1634 &unused_root, &unused_child, 1565 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1566 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1567 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1568 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1569#ifdef MOUSE_THRESHOLD
… …
1658 int dist; 1589 int dist;
1659 1590
1660 /* don't clobber the current delay if we are 1591 /* don't clobber the current delay if we are
1661 * already in the middle of scrolling. 1592 * already in the middle of scrolling.
1662 */ 1593 */
1663 if (!sel_scroll_ev.active) 1594 if (!sel_scroll_ev.is_active ())
1664 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1595 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1665 1596
1666 /* save the event params so we can highlight 1597 /* save the event params so we can highlight
1667 * the selection in the pending-scroll loop 1598 * the selection in the pending-scroll loop
1668 */ 1599 */
1669 selection_save_x = ev.xbutton.x; 1600 selection_save_x = ev.xbutton.x;
… …
1691 else 1622 else
1692 { 1623 {
1693 /* we are within the text window, so we 1624 /* we are within the text window, so we
1694 * shouldn't be scrolling 1625 * shouldn't be scrolling
1695 */ 1626 */
1696 if (sel_scroll_ev.active)
1697 sel_scroll_ev.stop(); 1627 sel_scroll_ev.stop();
1698 } 1628 }
1699#endif 1629#endif
1700#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1701 } 1631 }
1702#endif 1632#endif
1703 } 1633 }
1704 } 1634 }
1705 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1706 { 1636 {
1707 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708 MotionNotify, &ev)) 1638 MotionNotify, &ev))
1709 ; 1639 ;
1710 1640
1711 XQueryPointer (disp, scrollBar.win, 1641 XQueryPointer (dpy, scrollBar.win,
1712 &unused_root, &unused_child, 1642 &unused_root, &unused_child,
1713 &unused_root_x, &unused_root_y, 1643 &unused_root_x, &unused_root_y,
1714 &ev.xbutton.x, &ev.xbutton.y, 1644 &ev.xbutton.x, &ev.xbutton.y,
1715 &unused_mask); 1645 &unused_mask);
1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1717 scrollbar_size ()); 1647 scrollbar_size ());
1718 want_refresh = 1; 1648 want_refresh = 1;
1719 refresh_limit = 0;
1720 scrollbar_show (1); 1649 scrollbar_show (1);
1721 } 1650 }
1722 break; 1651 break;
1723 } 1652 }
1724 1653
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK) 1654#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1655 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1729 { 1656 {
1730 if (hidden_cursor) 1657 if (hidden_cursor)
1731 { 1658 {
1732 hidden_cursor = 0; 1659 hidden_cursor = 0;
1733 want_refresh = 1; 1660 want_refresh = 1;
1734 } 1661 }
1735 1662
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1663 cursor_blink_ev.again ();
1737 } 1664 }
1738#endif 1665#endif
1739 1666
1740#if defined(POINTER_BLANK) 1667#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1668 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 { 1669 {
1743 if (ev.type == MotionNotify 1670 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress 1671 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease) 1672 || ev.type == ButtonRelease)
1746 if (hidden_pointer) 1673 if (hidden_pointer)
… …
1748 1675
1749 if (ev.type == KeyPress && hidden_pointer == 0) 1676 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank (); 1677 pointer_blank ();
1751 } 1678 }
1752#endif 1679#endif
1680
1681 refresh_check ();
1753} 1682}
1754 1683
1755void 1684void
1756rxvt_term::focus_in () 1685rxvt_term::focus_in ()
1757{ 1686{
1758 if (!focus) 1687 if (!focus)
1759 { 1688 {
1760 focus = 1; 1689 focus = 1;
1761 want_refresh = 1; 1690 want_refresh = 1;
1762 1691
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1692 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764 1693
1765#if USE_XIM 1694#if USE_XIM
1766 if (Input_Context != NULL) 1695 if (Input_Context != NULL)
1767 { 1696 {
1768 IMSetStatusPosition (); 1697 IMSetPosition ();
1769 XSetICFocus (Input_Context); 1698 XSetICFocus (Input_Context);
1770 } 1699 }
1771#endif 1700#endif
1772#if CURSOR_BLINK 1701#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1702 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1775#endif 1704#endif
1776#if OFF_FOCUS_FADING 1705#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1706 if (rs[Rs_fade])
1778 { 1707 {
1779 pix_colors = pix_colors_focused; 1708 pix_colors = pix_colors_focused;
1780 scr_recolour (); 1709 scr_recolour ();
1781 } 1710 }
1782#endif 1711#endif
1712#if ENABLE_FRILLS
1713 if (option (Opt_urgentOnBell))
1714 {
1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716 {
1717 h->flags &= ~XUrgencyHint;
1718 XSetWMHints (dpy, parent[0], h);
1719 }
1720 }
1721#endif
1783 } 1722 }
1784} 1723}
1785 1724
1786void 1725void
1787rxvt_term::focus_out () 1726rxvt_term::focus_out ()
… …
1795 1734
1796#if ENABLE_FRILLS || ISO_14755 1735#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf) 1736 if (iso14755buf)
1798 { 1737 {
1799 iso14755buf = 0; 1738 iso14755buf = 0;
1800# if ENABLE_OVERLAY 1739# if ISO_14755
1801 scr_overlay_off (); 1740 scr_overlay_off ();
1802# endif 1741# endif
1803 } 1742 }
1804#endif 1743#endif
1805#if USE_XIM 1744#if USE_XIM
1806 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context); 1746 XUnsetICFocus (Input_Context);
1808#endif 1747#endif
1809#if CURSOR_BLINK 1748#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop (); 1750 cursor_blink_ev.stop ();
1751
1812 hidden_cursor = 0; 1752 hidden_cursor = 0;
1813#endif 1753#endif
1814#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1816 { 1756 {
… …
1819 } 1759 }
1820#endif 1760#endif
1821 } 1761 }
1822} 1762}
1823 1763
1824#if TRANSPARENT 1764void
1765rxvt_term::update_fade_color (unsigned int idx)
1766{
1767#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade])
1769 {
1770 rgba c;
1771 pix_colors [Color_fade].get (c);
1772 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1773 }
1774#endif
1775}
1776
1777#if ENABLE_TRANSPARENCY || ENABLE_PERL
1825void 1778void
1826rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1780{
1828 SET_R (this); 1781 make_current ();
1829 SET_LOCALE (locale);
1830 1782
1783 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1784 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1785 return;
1786
1787# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1788 switch (ev.type)
1832 { 1789 {
1833 case PropertyNotify: 1790 case PropertyNotify:
1834 /* 1791 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1792 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1793 * use the property to determine the pixmap. We use it later on.
1837 */ 1794 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1795 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1797 {
1798 bgPixmap.set_root_pixmap ();
1799 update_background ();
1800 }
1841 1801
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1802 break;
1847 } 1803 }
1804# endif
1805
1806 refresh_check ();
1848} 1807}
1849#endif 1808#endif
1850 1809
1851void 1810void
1852rxvt_term::button_press (XButtonEvent &ev) 1811rxvt_term::button_press (XButtonEvent &ev)
… …
1861 /* 1820 /*
1862 * VT window processing of button press 1821 * VT window processing of button press
1863 */ 1822 */
1864 if (ev.window == vt) 1823 if (ev.window == vt)
1865 { 1824 {
1825 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1826 return;
1827
1866#if ISO_14755 1828#if ISO_14755
1867 // 5.4 1829 // 5.4
1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869 { 1831 {
1870 iso14755_54 (ev.x, ev.y); 1832 iso14755_54 (ev.x, ev.y);
… …
1904 mouse_report (ev); 1866 mouse_report (ev);
1905 } 1867 }
1906#else 1868#else
1907 MEvent.button = ev.button; 1869 MEvent.button = ev.button;
1908 mouse_report (ev); 1870 mouse_report (ev);
1909#endif /* MOUSE_REPORT_DOUBLECLICK */ 1871#endif /* MOUSE_REPORT_DOUBLECLICK */
1910 1872
1911 } 1873 }
1912 else 1874 else
1913 { 1875 {
1914 if (ev.button != MEvent.button) 1876 if (ev.button != MEvent.button)
1915 MEvent.clicks = 0; 1877 MEvent.clicks = 0;
1916 1878
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918 switch (ev.button) 1879 switch (ev.button)
1919 { 1880 {
1920 case Button1: 1881 case Button1:
1921 /* allow meta + click to select rectangular areas */ 1882 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */ 1883 /* should be done in screen.C */
1923#if ENABLE_FRILLS 1884#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask); 1885 selection.rect = !!(ev.state & ModMetaMask);
1925#else 1886#else
1926 selection.rect = false; 1887 selection.rect = false;
1927#endif 1888#endif
1928 1889
1929 /* allow shift+left click to extend selection */ 1890 /* allow shift+left click to extend selection */
1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931 { 1892 {
1932 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1934 else 1895 else
1935 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1936 } 1897 }
1937 else 1898 else
1938 { 1899 {
1939 if (MEvent.button == Button1 && clickintime) 1900 if (MEvent.button == Button1 && clickintime)
1940 MEvent.clicks++; 1901 MEvent.clicks++;
1941 else 1902 else
1942 MEvent.clicks = 1; 1903 MEvent.clicks = 1;
1943 1904
1944 selection_click (MEvent.clicks, ev.x, ev.y); 1905 selection_click (MEvent.clicks, ev.x, ev.y);
1945 } 1906 }
1946 1907
1947 MEvent.button = Button1; 1908 MEvent.button = Button1;
1948 break; 1909 break;
1949 1910
1950 case Button3: 1911 case Button3:
1951 if (MEvent.button == Button3 && clickintime) 1912 if (MEvent.button == Button3 && clickintime)
1952 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1953 else 1914 else
1954 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1955 1916
1956 MEvent.button = Button3; 1917 MEvent.button = Button3;
1957 break; 1918 break;
1958 } 1919 }
1959 } 1920 }
1960 1921
1961 MEvent.time = ev.time; 1922 MEvent.time = ev.time;
1962 return; 1923 return;
1963 } 1924 }
1964 1925
1965 /* 1926 /*
1966 * Scrollbar window processing of button press 1927 * Scrollbar window processing of button press
1967 */ 1928 */
1968 if (isScrollbarWindow (ev.window)) 1929 if (scrollBar.state && ev.window == scrollBar.win)
1969 { 1930 {
1970 scrollBar.setIdle (); 1931 scrollBar.setIdle ();
1971 /* 1932 /*
1972 * Rxvt-style scrollbar: 1933 * Rxvt-style scrollbar:
1973 * move up if mouse is above slider 1934 * move up if mouse is above slider
… …
2009 tt_printf ("\033[5~"); 1970 tt_printf ("\033[5~");
2010 break; 1971 break;
2011 } 1972 }
2012 } 1973 }
2013 else 1974 else
2014#endif /* NO_SCROLLBAR_REPORT */ 1975#endif /* NO_SCROLLBAR_REPORT */
2015 1976
2016 { 1977 {
2017 char upordown = 0; 1978 char upordown = 0;
2018 1979
2019 if (scrollBar.style == R_SB_NEXT) 1980 if (scrollBar.style == R_SB_NEXT)
2020 { 1981 {
2021 if (scrollbarnext_upButton (ev.y)) 1982 if (scrollbarnext_upButton (ev.y))
2022 upordown = -1; /* up */ 1983 upordown = -1; /* up */
… …
2028 if (scrollbarrxvt_upButton (ev.y)) 1989 if (scrollbarrxvt_upButton (ev.y))
2029 upordown = -1; /* up */ 1990 upordown = -1; /* up */
2030 else if (scrollbarrxvt_dnButton (ev.y)) 1991 else if (scrollbarrxvt_dnButton (ev.y))
2031 upordown = 1; /* down */ 1992 upordown = 1; /* down */
2032 } 1993 }
1994
2033 if (upordown) 1995 if (upordown)
2034 { 1996 {
2035#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
2036 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2037#endif 2000#endif
2038 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (upordown < 0 ? UP : DN, 1))
2039 { 2002 {
2040 if (upordown < 0) 2003 if (upordown < 0)
2041 scrollBar.setUp (); 2004 scrollBar.setUp ();
… …
2045 } 2008 }
2046 else 2009 else
2047 switch (ev.button) 2010 switch (ev.button)
2048 { 2011 {
2049 case Button2: 2012 case Button2:
2050 switch (scrollbar_align) 2013 switch (scrollBar.align)
2051 { 2014 {
2052 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
2053 csrO = 0; 2016 csrO = 0;
2054 break; 2017 break;
2055 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
2067 2030
2068 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
2069 break; 2032 break;
2070 2033
2071 case Button1: 2034 case Button1:
2072 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2073 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2074 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2075 2038
2076 case Button3: 2039 case Button3:
2077 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
… …
2103 } 2066 }
2104 } 2067 }
2105 2068
2106 return; 2069 return;
2107 } 2070 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2071}
2117 2072
2118void 2073void
2119rxvt_term::button_release (XButtonEvent &ev) 2074rxvt_term::button_release (XButtonEvent &ev)
2120{ 2075{
… …
2126 2081
2127 if (scrollbar_isUpDn ()) 2082 if (scrollbar_isUpDn ())
2128 { 2083 {
2129 scrollBar.setIdle (); 2084 scrollBar.setIdle ();
2130 scrollbar_show (0); 2085 scrollbar_show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2086 }
2135 2087
2136#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2139#endif 2090#endif
2140 2091
2141 if (ev.window == vt) 2092 if (ev.window == vt)
2142 { 2093 {
2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2095 return;
2096
2143#if ISO_14755 2097#if ISO_14755
2144 // 5.4 2098 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2099 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return; 2100 return;
2147#endif 2101#endif
2102
2148 if (reportmode) 2103 if (reportmode)
2149 { 2104 {
2150 /* mouse report from vt window */ 2105 /* mouse report from vt window */
2151 /* don't report release of wheel "buttons" */ 2106 /* don't report release of wheel "buttons" */
2152 if (ev.button >= 4) 2107 if (ev.button >= 4)
… …
2163 mouse_report (ev); 2118 mouse_report (ev);
2164 } 2119 }
2165#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2166 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2167 mouse_report (ev); 2122 mouse_report (ev);
2168#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2169 return; 2124 return;
2170 } 2125 }
2171 2126
2172 /* 2127 /*
2173 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
… …
2176 if (priv_modes & PrivMode_mouse_report 2131 if (priv_modes & PrivMode_mouse_report
2177 && bypass_keystate 2132 && bypass_keystate
2178 && ev.button == Button1 && MEvent.clicks <= 1) 2133 && ev.button == Button1 && MEvent.clicks <= 1)
2179 selection_extend (ev.x, ev.y, 0); 2134 selection_extend (ev.x, ev.y, 0);
2180 2135
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2184 switch (ev.button) 2136 switch (ev.button)
2185 { 2137 {
2186 case Button1: 2138 case Button1:
2187 case Button3: 2139 case Button3:
2188 selection_make (ev.time); 2140 selection_make (ev.time);
2189 break; 2141 break;
2142
2190 case Button2: 2143 case Button2:
2191 selection_request (ev.time, ev.x, ev.y); 2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2146 break;
2147
2193#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
2194 case Button4: 2149 case Button4:
2195 case Button5: 2150 case Button5:
2196 { 2151 {
2197 int i; 2152 int i;
… …
2199 2154
2200 v = ev.button == Button4 ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
2201 2156
2202 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
2203 i = 1; 2158 i = 1;
2204 else if (OPTION (Opt_mouseWheelScrollPage)) 2159 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2160 i = nrow - 1;
2206 else 2161 else
2207 i = 5; 2162 i = 5;
2208 2163
2209# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
… …
2211 { 2166 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2170
2216 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218
2219 slip_wheel_ev.start ();
2220 } 2173 }
2221 else 2174 else
2222 { 2175 {
2223# endif 2176# endif
2224 scr_page (v, i); 2177 scr_page (v, i);
… …
2229 } 2182 }
2230 break; 2183 break;
2231#endif 2184#endif
2232 } 2185 }
2233 } 2186 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2187}
2239
2240#ifdef TRANSPARENT
2241#if TINTING
2242/* taken from aterm-0.4.2 */
2243
2244typedef uint32_t RUINT32T;
2245
2246void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2247{
2248 int sh_r, sh_g, sh_b;
2249 RUINT32T mask_r, mask_g, mask_b;
2250 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2251 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253 int i;
2254
2255 Visual *visual = display->visual;
2256
2257 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2258
2259 /* for convenience */
2260 mask_r = visual->red_mask;
2261 mask_g = visual->green_mask;
2262 mask_b = visual->blue_mask;
2263
2264 /* boring lookup table pre-initialization */
2265 switch (srcImage->bits_per_pixel) {
2266 case 15:
2267 if ((mask_r != 0x7c00) ||
2268 (mask_g != 0x03e0) ||
2269 (mask_b != 0x001f))
2270 return;
2271 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2272 lookup_r = lookup;
2273 lookup_g = lookup+32;
2274 lookup_b = lookup+32+32;
2275 sh_r = 10;
2276 sh_g = 5;
2277 sh_b = 0;
2278 break;
2279 case 16:
2280 if ((mask_r != 0xf800) ||
2281 (mask_g != 0x07e0) ||
2282 (mask_b != 0x001f))
2283 return;
2284 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2285 lookup_r = lookup;
2286 lookup_g = lookup+32;
2287 lookup_b = lookup+32+64;
2288 sh_r = 11;
2289 sh_g = 5;
2290 sh_b = 0;
2291 break;
2292 case 24:
2293 if ((mask_r != 0xff0000) ||
2294 (mask_g != 0x00ff00) ||
2295 (mask_b != 0x0000ff))
2296 return;
2297 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2298 lookup_r = lookup;
2299 lookup_g = lookup+256;
2300 lookup_b = lookup+256+256;
2301 sh_r = 16;
2302 sh_g = 8;
2303 sh_b = 0;
2304 break;
2305 case 32:
2306 if ((mask_r != 0xff0000) ||
2307 (mask_g != 0x00ff00) ||
2308 (mask_b != 0x0000ff))
2309 return;
2310 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2311 lookup_r = lookup;
2312 lookup_g = lookup+256;
2313 lookup_b = lookup+256+256;
2314 sh_r = 16;
2315 sh_g = 8;
2316 sh_b = 0;
2317 break;
2318 default:
2319 return; /* we do not support this color depth */
2320 }
2321
2322 /* prepare limits for color transformation (each channel is handled separately) */
2323 if (shade < 0) {
2324 shade = -shade;
2325 if (shade < 0) shade = 0;
2326 if (shade > 100) shade = 100;
2327
2328 lower_lim_r = 65535-rm;
2329 lower_lim_g = 65535-gm;
2330 lower_lim_b = 65535-bm;
2331
2332 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2333 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2334 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2335
2336 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2337 } else {
2338 if (shade < 0) shade = 0;
2339 if (shade > 100) shade = 100;
2340
2341 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2342
2343 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2344 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2345 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2346 }
2347
2348 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2349 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2350 {
2351 unsigned int tmp;
2352
2353 tmp = lower_lim_r;
2354 lower_lim_r = lower_lim_b;
2355 lower_lim_b = tmp;
2356
2357 tmp = upper_lim_r;
2358 upper_lim_r = upper_lim_b;
2359 upper_lim_b = tmp;
2360 }
2361
2362 /* fill our lookup tables */
2363 for (i = 0; i <= mask_r>>sh_r; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2367 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2368 lookup_r[i] = (tmp/65535)<<sh_r;
2369 }
2370 for (i = 0; i <= mask_g>>sh_g; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2374 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2375 lookup_g[i] = (tmp/65535)<<sh_g;
2376 }
2377 for (i = 0; i <= mask_b>>sh_b; i++)
2378 {
2379 RUINT32T tmp;
2380 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2381 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2382 lookup_b[i] = (tmp/65535)<<sh_b;
2383 }
2384
2385 /* apply table to input image (replacing colors by newly calculated ones) */
2386 switch (srcImage->bits_per_pixel)
2387 {
2388 case 15:
2389 {
2390 unsigned short *p1, *pf, *p, *pl;
2391 p1 = (unsigned short *) srcImage->data;
2392 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0x7c00)>>10] |
2400 lookup_g[(*p & 0x03e0)>> 5] |
2401 lookup_b[(*p & 0x001f)];
2402 }
2403 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2404 }
2405 break;
2406 }
2407 case 16:
2408 {
2409 unsigned short *p1, *pf, *p, *pl;
2410 p1 = (unsigned short *) srcImage->data;
2411 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2412 while (p1 < pf)
2413 {
2414 p = p1;
2415 pl = p1 + srcImage->width;
2416 for (; p < pl; p++)
2417 {
2418 *p = lookup_r[(*p & 0xf800)>>11] |
2419 lookup_g[(*p & 0x07e0)>> 5] |
2420 lookup_b[(*p & 0x001f)];
2421 }
2422 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2423 }
2424 break;
2425 }
2426 case 24:
2427 {
2428 unsigned char *p1, *pf, *p, *pl;
2429 p1 = (unsigned char *) srcImage->data;
2430 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2431 while (p1 < pf)
2432 {
2433 p = p1;
2434 pl = p1 + srcImage->width * 3;
2435 for (; p < pl; p += 3)
2436 {
2437 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2438 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2439 p[2] = lookup_r[(p[2] & 0x0000ff)];
2440 }
2441 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2442 }
2443 break;
2444 }
2445 case 32:
2446 {
2447 RUINT32T *p1, *pf, *p, *pl;
2448 p1 = (RUINT32T *) srcImage->data;
2449 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2450
2451 while (p1 < pf)
2452 {
2453 p = p1;
2454 pl = p1 + srcImage->width;
2455 for (; p < pl; p++)
2456 {
2457 *p = lookup_r[(*p & 0xff0000)>>16] |
2458 lookup_g[(*p & 0x00ff00)>> 8] |
2459 lookup_b[(*p & 0x0000ff)] |
2460 (*p & ~0xffffff);
2461 }
2462 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2463 }
2464 break;
2465 }
2466 }
2467
2468 free (lookup);
2469}
2470#endif
2471
2472/*
2473 * Check our parents are still who we think they are.
2474 * Do transparency updates if required
2475 */
2476int
2477rxvt_term::check_our_parents ()
2478{
2479 int i, pchanged, aformat, have_pixmap, rootdepth;
2480 unsigned long nitems, bytes_after;
2481 Atom atype;
2482 unsigned char *prop = NULL;
2483 Window root, oldp, *list;
2484 Pixmap rootpixmap = None;
2485 XWindowAttributes wattr, wrootattr;
2486 dDisp;
2487
2488 pchanged = 0;
2489
2490 if (!OPTION (Opt_transparent))
2491 return pchanged; /* Don't try any more */
2492
2493 XGetWindowAttributes (disp, display->root, &wrootattr);
2494 rootdepth = wrootattr.depth;
2495
2496 XGetWindowAttributes (disp, parent[0], &wattr);
2497
2498 if (rootdepth != wattr.depth)
2499 {
2500 if (am_transparent)
2501 {
2502 pchanged = 1;
2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2504 am_transparent = am_pixmap_trans = 0;
2505 }
2506
2507 return pchanged; /* Don't try any more */
2508 }
2509
2510 /* Get all X ops out of the queue so that our information is up-to-date. */
2511 XSync (disp, False);
2512
2513 /*
2514 * Make the frame window set by the window manager have
2515 * the root background. Some window managers put multiple nested frame
2516 * windows for each client, so we have to take care about that.
2517 */
2518 i = (xa[XA_XROOTPMAP_ID]
2519 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2520 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521 &nitems, &bytes_after, &prop) == Success);
2522
2523 if (!i || prop == NULL)
2524 i = (xa[XA_ESETROOT_PMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success);
2528
2529 if (!i || prop == NULL
2530#if TINTING
2531 || !rs[Rs_color + Color_tint]
2532#endif
2533 )
2534 have_pixmap = 0;
2535 else
2536 {
2537 have_pixmap = 1;
2538 rootpixmap = *(Pixmap *)prop;
2539 XFree (prop);
2540 }
2541
2542 if (have_pixmap)
2543 {
2544 /*
2545 * Copy display->root pixmap transparency
2546 */
2547 int sx, sy, nx, ny;
2548 unsigned int nw, nh;
2549 Window cr;
2550 XImage *image;
2551 GC gc;
2552 XGCValues gcvalue;
2553
2554 XTranslateCoordinates (disp, parent[0], display->root,
2555 0, 0, &sx, &sy, &cr);
2556 nw = (unsigned int)szHint.width;
2557 nh = (unsigned int)szHint.height;
2558 nx = ny = 0;
2559
2560 if (sx < 0)
2561 {
2562 nw += sx;
2563 nx = -sx;
2564 sx = 0;
2565 }
2566
2567 if (sy < 0)
2568 {
2569 nh += sy;
2570 ny = -sy;
2571 sy = 0;
2572 }
2573
2574 min_it (nw, (unsigned int) (wrootattr.width - sx));
2575 min_it (nh, (unsigned int) (wrootattr.height - sy));
2576
2577 XSync (disp, False);
2578 allowedxerror = -1;
2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580
2581 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2582 /* XXX: may need a delay here? */
2583 allowedxerror = 0;
2584
2585 if (image == NULL)
2586 {
2587 if (am_transparent && am_pixmap_trans)
2588 {
2589 pchanged = 1;
2590 if (pixmap != None)
2591 {
2592 XFreePixmap (disp, pixmap);
2593 pixmap = None;
2594 }
2595 }
2596
2597 am_pixmap_trans = 0;
2598 }
2599 else
2600 {
2601 if (pixmap != None)
2602 XFreePixmap (disp, pixmap);
2603
2604#if TINTING
2605 if (ISSET_PIXCOLOR (Color_tint))
2606 {
2607 unsigned short rm, gm, bm;
2608 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609
2610 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2611
2612 ShadeXImage (display, image, shade, rm, gm, bm);
2613 }
2614#endif
2615
2616 pixmap = XCreatePixmap (disp, vt,
2617 szHint.width, szHint.height, image->depth);
2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2619 XPutImage (disp, pixmap, gc, image, 0, 0,
2620 nx, ny, image->width, image->height);
2621 XFreeGC (disp, gc);
2622 XDestroyImage (image);
2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2624 XClearWindow (disp, parent[0]);
2625
2626 if (!am_transparent || !am_pixmap_trans)
2627 pchanged = 1;
2628
2629 am_transparent = am_pixmap_trans = 1;
2630 }
2631 }
2632
2633 if (am_pixmap_trans)
2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2635 else
2636 {
2637 unsigned int n;
2638 /*
2639 * InheritPixmap transparency
2640 */
2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642 {
2643 oldp = parent[i];
2644 XQueryTree (disp, parent[i - 1], &root,
2645 &parent[i], &list, &n);
2646 XFree (list);
2647
2648 if (parent[i] == display->root)
2649 {
2650 if (oldp != None)
2651 pchanged = 1;
2652
2653 break;
2654 }
2655
2656 if (oldp != parent[i])
2657 pchanged = 1;
2658 }
2659
2660 n = 0;
2661
2662 if (pchanged)
2663 {
2664 for (; n < (unsigned int)i; n++)
2665 {
2666 XGetWindowAttributes (disp, parent[n], &wattr);
2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2668 {
2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670 break;
2671 }
2672 }
2673 }
2674
2675 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2676 {
2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2679 am_transparent = 0;
2680 /* XXX: also turn off Opt_transparent? */
2681 }
2682 else
2683 {
2684#if WAIT_FOR_WM
2685 /* wait (an arbitrary period) for the WM to do its thing
2686 * needed for fvwm2.2.2 (and before?) */
2687 sleep (1);
2688#endif
2689 for (n = 0; n < (unsigned int)i; n++)
2690 {
2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2692 XClearWindow (disp, parent[n]);
2693 }
2694
2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2696 am_transparent = 1;
2697 }
2698
2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700 parent[i] = None;
2701 }
2702
2703 if (scrollBar.win)
2704 {
2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2706 scrollBar.setIdle ();
2707 scrollbar_show (0);
2708 }
2709
2710 if (am_transparent)
2711 {
2712 want_refresh = want_full_refresh = 1;
2713 if (am_pixmap_trans)
2714 flush ();
2715 }
2716
2717 return pchanged;
2718}
2719#endif
2720 2188
2721/*}}} */ 2189/*}}} */
2722 2190
2723bool 2191bool
2724rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
… …
2773 if (ch == C0_LF) 2241 if (ch == C0_LF)
2774 nlines++; 2242 nlines++;
2775 2243
2776 refresh_count++; 2244 refresh_count++;
2777 2245
2778 if (!OPTION (Opt_jumpScroll) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2780 { 2247 {
2781 refreshnow = true;
2782 refresh_count = 0; 2248 refresh_count = 0;
2249
2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2251 {
2252 refreshnow = true;
2783 ch = NOCHAR; 2253 ch = NOCHAR;
2784 break; 2254 break;
2255 }
2785 } 2256 }
2786 2257
2787 // scr_add_lines only works for nlines <= nrow - 1. 2258 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2259 if (nlines >= nrow - 1)
2789 { 2260 {
2261 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2262 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2263 scr_add_lines (buf, str - buf, nlines);
2792 2264
2793 nlines = 0; 2265 nlines = 0;
2794 str = buf; 2266 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2267 eol = str + min (ncol, UBUFSIZ);
… …
2810 2282
2811 seq_begin = cmdbuf_ptr; 2283 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2284 ch = next_char ();
2813 } 2285 }
2814 2286
2287 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2289 scr_add_lines (buf, str - buf, nlines);
2817 2290
2818 /* 2291 /*
2819 * If there have been a lot of new lines, then update the screen 2292 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2821 * the number of pages between refreshes is refresh_limit, which 2294 * if skipScroll is enabled.
2822 * is incremented here because we must be doing flat-out scrolling.
2823 */ 2295 */
2824 if (refreshnow) 2296 if (refreshnow)
2825 { 2297 {
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++;
2828 else
2829 {
2830 flag = true; 2298 flag = true;
2831 scr_refresh (refresh_type); 2299 scr_refresh ();
2832 want_refresh = 1; 2300 want_refresh = 1;
2833 }
2834 } 2301 }
2835 2302
2836 } 2303 }
2837 else 2304 else
2838 { 2305 {
… …
2854 return flag; 2321 return flag;
2855} 2322}
2856 2323
2857// read the next character 2324// read the next character
2858wchar_t 2325wchar_t
2859rxvt_term::next_char () 2326rxvt_term::next_char () NOTHROW
2860{ 2327{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2329 {
2863 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2885 return NOCHAR; 2352 return NOCHAR;
2886} 2353}
2887 2354
2888// read the next octet 2355// read the next octet
2889uint32_t 2356uint32_t
2890rxvt_term::next_octet () 2357rxvt_term::next_octet () NOTHROW
2891{ 2358{
2892 return cmdbuf_ptr < cmdbuf_endp 2359 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2360 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2361 : NOCHAR;
2895} 2362}
2363
2364static class out_of_input out_of_input;
2896 2365
2897/* rxvt_cmd_getc () - Return next input character */ 2366/* rxvt_cmd_getc () - Return next input character */
2898/* 2367/*
2899 * Return the next input character after first passing any keyboard input 2368 * Return the next input character after first passing any keyboard input
2900 * to the command. 2369 * to the command.
2901 */ 2370 */
2902wchar_t 2371wchar_t
2903rxvt_term::cmd_getc () 2372rxvt_term::cmd_getc () THROW ((class out_of_input))
2904{ 2373{
2905 wchar_t c = next_char (); 2374 wchar_t c = next_char ();
2906 2375
2907 if (c == NOCHAR) 2376 if (c == NOCHAR)
2908 throw out_of_input; 2377 throw out_of_input;
2909 2378
2910 return c; 2379 return c;
2911} 2380}
2912 2381
2913uint32_t 2382uint32_t
2914rxvt_term::cmd_get8 () 2383rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2384{
2916 uint32_t c = next_octet (); 2385 uint32_t c = next_octet ();
2917 2386
2918 if (c == NOCHAR) 2387 if (c == NOCHAR)
2919 throw out_of_input; 2388 throw out_of_input;
… …
2985 { 2454 {
2986 if ((buf[len++] = cmd_getc ()) == 'i') 2455 if ((buf[len++] = cmd_getc ()) == 'i')
2987 break; /* done = 1 */ 2456 break; /* done = 1 */
2988 } 2457 }
2989 } 2458 }
2990 2459
2991 for (i = 0; i < len; i++) 2460 for (i = 0; i < len; i++)
2992 if (putc (buf[i], fd) == EOF) 2461 if (putc (buf[i], fd) == EOF)
2993 { 2462 {
2994 done = 1; 2463 done = 1;
2995 break; 2464 break;
… …
2997 } 2466 }
2998 } 2467 }
2999 2468
3000 pclose_printer (fd); 2469 pclose_printer (fd);
3001} 2470}
3002#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
3003/*}}} */ 2472/*}}} */
3004 2473
3005/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
3006enum { 2475enum {
3007 C1_40 = 0x40, 2476 C1_40 = 0x40,
… …
3057 process_dcs_seq (); 2526 process_dcs_seq ();
3058 break; 2527 break;
3059 case 0x9b: /* CSI */ 2528 case 0x9b: /* CSI */
3060 process_csi_seq (); 2529 process_csi_seq ();
3061 break; 2530 break;
3062 case 0x9d: /* CSI */ 2531 case 0x9d: /* OSC */
3063 process_osc_seq (); 2532 process_osc_seq ();
3064 break; 2533 break;
3065#endif 2534#endif
3066 } 2535 }
3067} 2536}
… …
3157 scr_charset_set (2, (unsigned int)cmd_getc ()); 2626 scr_charset_set (2, (unsigned int)cmd_getc ());
3158 break; 2627 break;
3159 case '+': 2628 case '+':
3160 scr_charset_set (3, (unsigned int)cmd_getc ()); 2629 scr_charset_set (3, (unsigned int)cmd_getc ());
3161 break; 2630 break;
3162#if ENABLE_FRILLS 2631#if !ENABLE_MINIMAL
3163 case '6': 2632 case '6':
3164 scr_backindex (); 2633 scr_backindex ();
3165 break; 2634 break;
3166#endif 2635#endif
3167 case '7': 2636 case '7':
3168 scr_cursor (SAVE); 2637 scr_cursor (SAVE);
3169 break; 2638 break;
3170 case '8': 2639 case '8':
3171 scr_cursor (RESTORE); 2640 scr_cursor (RESTORE);
3172 break; 2641 break;
3173#if ENABLE_FRILLS 2642#if !ENABLE_MINIMAL
3174 case '9': 2643 case '9':
3175 scr_forwardindex (); 2644 scr_forwardindex ();
3176 break; 2645 break;
3177#endif 2646#endif
3178 case '=': 2647 case '=':
… …
3293rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
3294{ 2763{
3295 unicode_t ch, priv, i; 2764 unicode_t ch, priv, i;
3296 unsigned int nargs, p; 2765 unsigned int nargs, p;
3297 int n, ndef; 2766 int n, ndef;
3298 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS] = { };
3299 2768
3300 for (nargs = ESC_ARGS; nargs > 0;) 2769 nargs = 0;
3301 arg[--nargs] = 0;
3302 2770
3303 priv = 0; 2771 priv = 0;
3304 ch = cmd_getc (); 2772 ch = cmd_getc ();
3305 if (ch >= '<' && ch <= '?') 2773 if (ch >= '<' && ch <= '?')
2774 {
3306 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' */
3307 priv = ch; 2776 priv = ch;
3308 ch = cmd_getc (); 2777 ch = cmd_getc ();
3309 } 2778 }
3310 2779
3311 /* read any numerical arguments */ 2780 /* read any numerical arguments */
… …
3340 ndef = get_byte_array_bit (csi_defaults, i); 2809 ndef = get_byte_array_bit (csi_defaults, i);
3341 for (p = 0; p < nargs; p++) 2810 for (p = 0; p < nargs; p++)
3342 if (arg[p] == -1) 2811 if (arg[p] == -1)
3343 arg[p] = ndef; 2812 arg[p] = ndef;
3344 2813
3345#ifdef DEBUG_CMD
3346 fprintf (stderr, "CSI ");
3347 for (p = 0; p < nargs; p++)
3348 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349 fprintf (stderr, "%c\n", ch);
3350#endif
3351
3352 /* 2814 /*
3353 * private mode handling 2815 * private mode handling
3354 */ 2816 */
3355 if (priv) 2817 if (priv)
3356 { 2818 {
3357 switch (priv) 2819 switch (priv)
3358 { 2820 {
3359 case '>': 2821 case '>':
3360 if (ch == CSI_DA) /* secondary device attributes */ 2822 if (ch == CSI_DA) /* secondary device attributes */
3361 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2823 {
2824 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2825 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2826 //
2827 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2828 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2829 // versions.
2830 //
2831 tt_printf ("\033[>%d;95;0c", 'U');
2832 }
3362 break; 2833 break;
3363 case '?': 2834 case '?':
3364 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3366 break; 2837 break;
… …
3492 break; 2963 break;
3493 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3494 scr_report_position (); 2965 scr_report_position ();
3495 break; 2966 break;
3496 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3497 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3498 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3499 break; 2970 break;
3500 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3502 break; 2973 break;
… …
3569 break; 3040 break;
3570 case CSI_75: 3041 case CSI_75:
3571 scr_cursor (RESTORE); 3042 scr_cursor (RESTORE);
3572 break; 3043 break;
3573 3044
3574#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3575 case CSI_74: 3046 case CSI_74:
3576 process_window_ops (arg, nargs); 3047 process_window_ops (arg, nargs);
3577 break; 3048 break;
3578#endif 3049#endif
3579 3050
… …
3586 break; 3057 break;
3587 } 3058 }
3588} 3059}
3589/*}}} */ 3060/*}}} */
3590 3061
3591#if ENABLE_FRILLS 3062#if !ENABLE_MINIMAL
3592/* ARGSUSED */ 3063/* ARGSUSED */
3593void 3064void
3594rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3065rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595{ 3066{
3596 int x, y; 3067 int x, y;
3597 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
3598 Window wdummy; 3069 Window wdummy;
3599 dDisp; 3070
3071 dLocal (Display *, dpy);
3600 3072
3601 if (nargs == 0) 3073 if (nargs == 0)
3602 return; 3074 return;
3603 3075
3604 switch (args[0]) 3076 switch (args[0])
3605 { 3077 {
3606 /* 3078 /*
3607 * commands 3079 * commands
3608 */ 3080 */
3609 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
3610 XMapWindow (disp, parent[0]); 3082 XMapWindow (dpy, parent[0]);
3611 break; 3083 break;
3612 case 2: /* iconify window */ 3084 case 2: /* iconify window */
3613 XIconifyWindow (disp, parent[0], display->screen); 3085 XIconifyWindow (dpy, parent[0], display->screen);
3614 break; 3086 break;
3615 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
3616 XMoveWindow (disp, parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
3617 break; 3089 break;
3618 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620 break; 3092 break;
3621 case 5: /* raise window */ 3093 case 5: /* raise window */
3622 XRaiseWindow (disp, parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
3623 break; 3095 break;
3624 case 6: /* lower window */ 3096 case 6: /* lower window */
3625 XLowerWindow (disp, parent[0]); 3097 XLowerWindow (dpy, parent[0]);
3626 break; 3098 break;
3627 case 7: /* refresh window */ 3099 case 7: /* refresh window */
3628 scr_touch (true); 3100 scr_touch (true);
3629 break; 3101 break;
3630 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
… …
3637 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
3638 set_widthheight ((unsigned int)width, 3110 set_widthheight ((unsigned int)width,
3639 (unsigned int) (args[1] * fheight)); 3111 (unsigned int) (args[1] * fheight));
3640 break; 3112 break;
3641 3113
3642
3643 /* 3114 /*
3644 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
3645 */ 3116 */
3646 case 11: /* report window state */ 3117 case 11: /* report window state */
3647 XGetWindowAttributes (disp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649 break; 3120 break;
3650 case 13: /* report window position */ 3121 case 13: /* report window position */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 XTranslateCoordinates (disp, parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
3653 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
3654 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
3655 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
3656 break; 3127 break;
3657 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660 break; 3131 break;
3661 case 18: /* report text area size (chars) */ 3132 case 18: /* report text area size (chars) */
3662 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663 break; 3134 break;
… …
3665 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666 break; 3137 break;
3667 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3668 { 3139 {
3669 char *s; 3140 char *s;
3670 XGetIconName (disp, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672 XFree (s); 3143 XFree (s);
3673 } 3144 }
3674 break; 3145 break;
3675 case 21: /* report window title */ 3146 case 21: /* report window title */
3676 { 3147 {
3677 char *s; 3148 char *s;
3678 XFetchName (disp, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680 XFree (s); 3151 XFree (s);
3681 } 3152 }
3682 break; 3153 break;
3683 } 3154 }
3684} 3155}
… …
3711 seen_esc = true; 3182 seen_esc = true;
3712 continue; 3183 continue;
3713 } 3184 }
3714 else if (ch == C0_BEL || ch == CHAR_ST) 3185 else if (ch == C0_BEL || ch == CHAR_ST)
3715 break; 3186 break;
3187 else if (ch == C0_SYN)
3188 ch = cmd_get8 ();
3716 else if (ch < 0x20) 3189 else if (ch < 0x20)
3717 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
3718 3191
3719 seen_esc = false; 3192 seen_esc = false;
3720 3193
3721 if (n >= STRING_MAX - 1) 3194 if (n >= STRING_MAX - 1)
3722 // stop at some sane length 3195 // stop at some sane length
3723 return NULL; 3196 return NULL;
3724 3197
3725 if (ch == C0_SYN)
3726 string[n++] = cmd_get8 ();
3727 else
3728 string[n++] = ch; 3198 string[n++] = ch;
3729 } 3199 }
3730 3200
3731 string[n++] = '\0'; 3201 string[n++] = '\0';
3732 3202
3733 ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3784void 3254void
3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3255rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786{ 3256{
3787 if (str[0] == '?' && !str[1]) 3257 if (str[0] == '?' && !str[1])
3788 { 3258 {
3789 unsigned short r, g, b; 3259 rgba c;
3790 pix_colors_focused[color].get (display, r, g, b); 3260 pix_colors_focused[color].get (c);
3261
3262#if XFT
3263 if (c.a != rgba::MAX_CC)
3264 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3265 else
3266#endif
3791 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3267 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792 } 3268 }
3793 else 3269 else
3794 set_window_color (color, str); 3270 set_window_color (color, str);
3795} 3271}
3796 3272
… …
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3275 */
3800void 3276void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3277rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802{ 3278{
3803 int changed = 0;
3804 int color; 3279 int color;
3805 char *buf, *name; 3280 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3281 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3282 int saveop = op;
3808 dDisp; 3283
3284 dLocal (Display *, dpy);
3809 3285
3810 assert (str != NULL); 3286 assert (str != NULL);
3287
3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3289 return;
3290
3811 switch (op) 3291 switch (op)
3812 { 3292 {
3813 case XTerm_name: 3293 case XTerm_name:
3814 set_title (str); 3294 set_title (str);
3815 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
… …
3829 unsigned long bytes_after; 3309 unsigned long bytes_after;
3830 unsigned char *value = 0; 3310 unsigned char *value = 0;
3831 const char *str = ""; 3311 const char *str = "";
3832 3312
3833 if (prop 3313 if (prop
3834 && XGetWindowProperty (disp, parent[0], 3314 && XGetWindowProperty (dpy, parent[0],
3835 prop, 0, 1<<16, 0, AnyPropertyType, 3315 prop, 0, 1<<16, 0, AnyPropertyType,
3836 &actual_type, &actual_format, 3316 &actual_type, &actual_format,
3837 &nitems, &bytes_after, &value) == Success 3317 &nitems, &bytes_after, &value) == Success
3838 && actual_type != None 3318 && actual_type != None
3839 && actual_format == 8) 3319 && actual_format == 8)
3840 str = (const char *)(value); 3320 str = (const char *)(value);
3841 3321
3842 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3322 tt_printf ("\033]%d;%s%c", op, str, resp);
3843 3323
3844 XFree (value); 3324 XFree (value);
3845 } 3325 }
3846 else 3326 else
3847 { 3327 {
… …
3851 { 3331 {
3852 *eq = 0; 3332 *eq = 0;
3853 set_utf8_property (display->atom (str), eq + 1); 3333 set_utf8_property (display->atom (str), eq + 1);
3854 } 3334 }
3855 else 3335 else
3856 XDeleteProperty (disp, parent[0], 3336 XDeleteProperty (dpy, parent[0],
3857 display->atom (str)); 3337 display->atom (str));
3858 } 3338 }
3859 break; 3339 break;
3860 3340
3861 case XTerm_Color: 3341 case XTerm_Color:
… …
3871 break; 3351 break;
3872 3352
3873 if ((buf = strchr (name, ';')) != NULL) 3353 if ((buf = strchr (name, ';')) != NULL)
3874 *buf++ = '\0'; 3354 *buf++ = '\0';
3875 3355
3876 if (name[0] == '?' && !name[1]) 3356 process_color_seq (op, color, name, resp);
3877 {
3878 unsigned short r, g, b;
3879 pix_colors_focused[color].get (display, r, g, b);
3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3881 }
3882 else
3883 set_window_color (color, name);
3884 } 3357 }
3885 break; 3358 break;
3886 case XTerm_Color00: 3359 case XTerm_Color00:
3887 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3360 process_color_seq (op, Color_fg, str, resp);
3888 break; 3361 break;
3889 case XTerm_Color01: 3362 case XTerm_Color01:
3890 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3363 process_color_seq (op, Color_bg, str, resp);
3891 break; 3364 break;
3892#ifndef NO_CURSORCOLOR 3365#ifndef NO_CURSORCOLOR
3893 case XTerm_Color_cursor: 3366 case XTerm_Color_cursor:
3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3367 process_color_seq (op, Color_cursor, str, resp);
3895 break; 3368 break;
3896#endif 3369#endif
3897 case XTerm_Color_pointer_fg: 3370 case XTerm_Color_pointer_fg:
3898 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3371 process_color_seq (op, Color_pointer_fg, str, resp);
3899 break; 3372 break;
3900 case XTerm_Color_pointer_bg: 3373 case XTerm_Color_pointer_bg:
3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3374 process_color_seq (op, Color_pointer_bg, str, resp);
3902 break; 3375 break;
3903#ifndef NO_BOLD_UNDERLINE_REVERSE 3376#ifndef NO_BOLD_UNDERLINE_REVERSE
3904 case XTerm_Color_RV: 3377 case XTerm_Color_RV:
3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3378 process_color_seq (op, Color_RV, str, resp);
3906 break; 3379 break;
3907 case Rxvt_Color_BD: 3380 case Rxvt_Color_BD:
3908 case URxvt_Color_BD: 3381 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp); 3382 process_color_seq (op, Color_BD, str, resp);
3910 break; 3383 break;
3911 case Rxvt_Color_UL: 3384 case Rxvt_Color_UL:
3912 case URxvt_Color_UL: 3385 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp); 3386 process_color_seq (op, Color_UL, str, resp);
3914 break; 3387 break;
3915 case URxvt_Color_IT: 3388 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3389 process_color_seq (op, Color_IT, str, resp);
3917 break; 3390 break;
3918#endif 3391#endif
3919#if TRANSPARENT && TINTING 3392#if ENABLE_TRANSPARENCY
3920 case URxvt_Color_tint: 3393 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3394 process_color_seq (op, Color_tint, str, resp);
3922 check_our_parents (); 3395 {
3923 if (am_transparent) 3396 bool changed = false;
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927 3397
3398 if (ISSET_PIXCOLOR (Color_tint))
3399 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3400 else
3401 changed = bgPixmap.unset_tint ();
3402
3403 if (changed)
3404 update_background ();
3405 }
3406
3407 break;
3408#endif
3409
3410#if BG_IMAGE_FROM_FILE
3928 case Rxvt_Pixmap: 3411 case Rxvt_Pixmap:
3929 if (*str != ';') 3412 if (!strcmp (str, "?"))
3930 { 3413 {
3931#if XPM_BACKGROUND 3414 char str[256];
3932 scale_pixmap (""); /* reset to default scaling */ 3415
3933 set_bgPixmap (str); /* change pixmap */ 3416 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3934 scr_touch (true); 3417 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3935#endif 3418 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3419 process_xterm_seq (XTerm_title, str, CHAR_ST);
3936 } 3420 }
3937 3421 else
3938 while ((str = strchr (str, ';')) != NULL)
3939 { 3422 {
3423 int changed = 0;
3424
3425 if (*str != ';')
3426 {
3427 /* reset to default scaling :*/
3428 bgPixmap.unset_geometry ();
3429 if (bgPixmap.set_file (str)) /* change pixmap */
3430 changed++;
3431 str = strchr (str, ';');
3432 if (str == NULL)
3433 bgPixmap.set_defaultGeometry ();
3434 }
3435
3436 while (str)
3437 {
3940 str++; 3438 str++;
3941#if XPM_BACKGROUND 3439 if (bgPixmap.set_geometry (str))
3942 changed += scale_pixmap (str); 3440 changed++;
3943#endif 3441 str = strchr (str, ';');
3442 }
3443
3444 if (changed)
3445 update_background ();
3944 } 3446 }
3945
3946 if (changed)
3947 {
3948#ifdef XPM_BACKGROUND
3949 resize_pixmap ();
3950 scr_touch (true);
3951#endif
3952 }
3953 break; 3447 break;
3448#endif
3954 3449
3955 case Rxvt_restoreFG: 3450 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str); 3451 set_window_color (Color_fg, str);
3957 break; 3452 break;
3958 case Rxvt_restoreBG: 3453 case Rxvt_restoreBG:
… …
3961 3456
3962 case XTerm_logfile: 3457 case XTerm_logfile:
3963 // TODO, when secure mode? 3458 // TODO, when secure mode?
3964 break; 3459 break;
3965 3460
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3461#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3462 case Rxvt_dumpscreen: /* no error notices */
3974 { 3463 {
3975 int fd; 3464 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3465 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3989 case URxvt_italicFont: 3478 case URxvt_italicFont:
3990 case URxvt_boldItalicFont: 3479 case URxvt_boldItalicFont:
3991#endif 3480#endif
3992 if (query) 3481 if (query)
3993 tt_printf ("\33]%d;%-.250s%c", saveop, 3482 tt_printf ("\33]%d;%-.250s%c", saveop,
3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3483 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3995 ? fontset[op - URxvt_font]->fontdesc : "", 3484 ? fontset[op - URxvt_font]->fontdesc : "",
3996 resp); 3485 resp);
3997 else 3486 else
3998 { 3487 {
3999 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3488 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4002 allocated.push_back ((void *)res); 3491 allocated.push_back ((void *)res);
4003 set_fonts (); 3492 set_fonts ();
4004 } 3493 }
4005 break; 3494 break;
4006 3495
4007#if ENABLE_FRILLS 3496 case URxvt_version:
3497 if (query)
3498 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3499 op,
3500 rs[Rs_name], VERSION[0], VERSION[2],
3501 resp);
3502 break;
3503
3504#if !ENABLE_MINIMAL
4008 case URxvt_locale: 3505 case URxvt_locale:
4009 if (query) 3506 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3507 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4011 else 3508 else
4012 { 3509 {
4013 set_locale (str); 3510 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3511 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3512 init_xlocale ();
4016 } 3513 }
4017 break; 3514 break;
4018 3515
4019 case URxvt_view_up: 3516 case URxvt_view_up:
… …
4030 break; 3527 break;
4031#endif 3528#endif
4032 3529
4033#if ENABLE_PERL 3530#if ENABLE_PERL
4034 case URxvt_perl: 3531 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3532 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4036 ; // no responses yet 3533 ; // no responses yet
4037 break; 3534 break;
4038#endif 3535#endif
4039 } 3536 }
4040} 3537}
… …
4072 return state; 3569 return state;
4073} 3570}
4074 3571
4075/* we're not using priv _yet_ */ 3572/* we're not using priv _yet_ */
4076void 3573void
4077rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3574rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078{ 3575{
4079 unsigned int i, j; 3576 unsigned int i, j;
4080 int state; 3577 int state;
4081 3578
4082 static const struct 3579 static const struct
4083 { 3580 {
4084 const int argval; 3581 const int argval;
4085 const unsigned long bit; 3582 const unsigned long bit;
4086 }
4087
4088 argtopriv[] = { 3583 } argtopriv[] = {
4089 { 1, PrivMode_aplCUR }, 3584 { 1, PrivMode_aplCUR },
4090 { 2, PrivMode_vt52 }, 3585 { 2, PrivMode_vt52 },
4091 { 3, PrivMode_132 }, 3586 { 3, PrivMode_132 },
4092 { 4, PrivMode_smoothScroll }, 3587 { 4, PrivMode_smoothScroll },
4093 { 5, PrivMode_rVideo }, 3588 { 5, PrivMode_rVideo },
4094 { 6, PrivMode_relOrigin }, 3589 { 6, PrivMode_relOrigin },
4095 { 7, PrivMode_Autowrap }, 3590 { 7, PrivMode_Autowrap },
4096 // 8, bi-directional support mode 3591 // 8, bi-directional support mode
4097 { 9, PrivMode_MouseX10 }, 3592 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc
4099 { menuBar_esc, PrivMode_menuBar },
4100#endif
4101 // 18, 19 printing-related 3593 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 3594 { 25, PrivMode_VisibleCursor },
4103#ifdef scrollBar_esc 3595#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 3596 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 3597#endif
… …
4112 { 66, PrivMode_aplKP }, 3604 { 66, PrivMode_aplKP },
4113#ifndef NO_BACKSPACE_KEY 3605#ifndef NO_BACKSPACE_KEY
4114 { 67, PrivMode_BackSpace }, 3606 { 67, PrivMode_BackSpace },
4115#endif 3607#endif
4116 { 1000, PrivMode_MouseX11 }, 3608 { 1000, PrivMode_MouseX11 },
4117 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3609 { 1002, PrivMode_MouseBtnEvent },
4118 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3610 { 1003, PrivMode_MouseAnyEvent },
4119 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4120 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3611 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4121 { 1011, PrivMode_Keypress }, // rxvt extension 3612 { 1011, PrivMode_Keypress }, // rxvt extension
4122 // 1035 enable modifiers for alt, numlock NYI 3613 // 1035 enable modifiers for alt, numlock NYI
4123 // 1036 send ESC for meta keys NYI 3614 // 1036 send ESC for meta keys NYI
4124 // 1037 send DEL for keypad delete NYI 3615 // 1037 send DEL for keypad delete NYI
… …
4159 scr_touch (true); 3650 scr_touch (true);
4160 break; 3651 break;
4161#endif 3652#endif
4162 case 1048: /* alternative cursor save */ 3653 case 1048: /* alternative cursor save */
4163 case 1049: 3654 case 1049:
4164 if (OPTION (Opt_secondaryScreen)) 3655 if (option (Opt_secondaryScreen))
4165 if (mode == 0) 3656 if (mode == 0)
4166 scr_cursor (RESTORE); 3657 scr_cursor (RESTORE);
4167 else if (mode == 1) 3658 else if (mode == 1)
4168 scr_cursor (SAVE); 3659 scr_cursor (SAVE);
4169 break; 3660 break;
… …
4198 scr_autowrap (state); 3689 scr_autowrap (state);
4199 break; 3690 break;
4200 /* case 8: - auto repeat, can't do on a per window basis */ 3691 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 3692 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3695 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 3696#ifdef scrollBar_esc
4213 case scrollBar_esc: 3697 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 3698 if (scrollbar_mapping (state))
4215 { 3699 {
4216 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
… …
4228 break; 3712 break;
4229 /* case 66: - application key pad */ 3713 /* case 66: - application key pad */
4230 /* case 67: - backspace key */ 3714 /* case 67: - backspace key */
4231 case 1000: /* X11 mouse reporting */ 3715 case 1000: /* X11 mouse reporting */
4232 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
4233 priv_modes &= ~PrivMode_MouseX10; 3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4234 break; 3718 break;
4235#if 0
4236 case 1001: 3719 case 1002:
4237 break; /* X11 mouse highlighting */ 3720 case 1003:
4238#endif 3721 if (state)
3722 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask;
3726 }
3727 else
3728 vt_emask_mouse = NoEventMask;
3729 vt_select_input ();
3730 break;
4239 case 1010: /* scroll to bottom on TTY output inhibit */ 3731 case 1010: /* scroll to bottom on TTY output inhibit */
4240 set_option (Opt_scrollTtyOutput, !state); 3732 set_option (Opt_scrollTtyOutput, !state);
4241 break; 3733 break;
4242 case 1011: /* scroll to bottom on key press */ 3734 case 1011: /* scroll to bottom on key press */
4243 set_option (Opt_scrollTtyKeypress, state); 3735 set_option (Opt_scrollTtyKeypress, state);
4244 break; 3736 break;
4245 case 1047: /* secondary screen w/ clearing last */ 3737 case 1047: /* secondary screen w/ clearing last */
4246 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3740 scr_erase_screen (2);
4249 scr_change_screen (state); 3741 scr_change_screen (state);
4250 break; 3742 break;
4251 case 1049: /* secondary screen w/ clearing first */ 3743 case 1049: /* secondary screen w/ clearing first */
4252 scr_change_screen (state); 3744 scr_change_screen (state);
4253 if (OPTION (Opt_secondaryScreen)) 3745 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 3747 scr_erase_screen (2);
4256 break; 3748 break;
4257 default: 3749 default:
4258 break; 3750 break;
… …
4386 scr_color (Color_bg, Color_bg); 3878 scr_color (Color_bg, Color_bg);
4387 break; 3879 break;
4388 3880
4389 //case 50: // not variable spacing 3881 //case 50: // not variable spacing
4390 3882
4391#if ENABLE_FRILLS 3883#if !ENABLE_MINIMAL
4392 case 90: 3884 case 90:
4393 case 91: /* set bright fg color */ 3885 case 91: /* set bright fg color */
4394 case 92: 3886 case 92:
4395 case 93: 3887 case 93:
4396 case 94: 3888 case 94:
… …
4420rxvt_term::process_graphics () 3912rxvt_term::process_graphics ()
4421{ 3913{
4422 unicode_t ch, cmd = cmd_getc (); 3914 unicode_t ch, cmd = cmd_getc ();
4423 3915
4424 if (cmd == 'Q') 3916 if (cmd == 'Q')
3917 {
4425 { /* query graphics */ 3918 /* query graphics */
4426 tt_printf ("\033G0\012"); /* no graphics */ 3919 tt_printf ("\033G0\012"); /* no graphics */
4427 return; 3920 return;
4428 } 3921 }
4429 /* swallow other graphics sequences until terminating ':' */ 3922 /* swallow other graphics sequences until terminating ':' */
4430 do 3923 do
… …
4461rxvt_term::tt_write (const char *data, unsigned int len) 3954rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 3955{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3956 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 3957 return;
4465 3958
4466 if (pty.pty < 0) 3959 if (pty->pty < 0)
4467 return; 3960 return;
4468 3961
4469 if (v_buflen == 0) 3962 if (v_buflen == 0)
4470 { 3963 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3964 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 3965
4473 if ((unsigned int)written == len) 3966 if ((unsigned int)written == len)
4474 return; 3967 return;
4475 3968
4476 data += written; 3969 data += written;
… …
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4481 3974
4482 memcpy (v_buffer + v_buflen, data, len); 3975 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len; 3976 v_buflen += len;
4484 3977
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 3978 pty_ev.set (ev::READ | ev::WRITE);
4486} 3979}
4487 3980
4488void rxvt_term::pty_write () 3981void rxvt_term::pty_write ()
4489{ 3982{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3983 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 3984
4492 if (written > 0) 3985 if (written > 0)
4493 { 3986 {
4494 v_buflen -= written; 3987 v_buflen -= written;
4495 3988
4496 if (v_buflen == 0) 3989 if (v_buflen == 0)
4497 { 3990 {
4498 free (v_buffer); 3991 free (v_buffer);
4499 v_buffer = 0; 3992 v_buffer = 0;
4500 v_buflen = 0;
4501 3993
4502 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4503 return; 3995 return;
4504 } 3996 }
4505 3997
4506 memmove (v_buffer, v_buffer + written, v_buflen); 3998 memmove (v_buffer, v_buffer + written, v_buflen);
4507 } 3999 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4000 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ); 4001 pty_ev.set (ev::READ);
4510} 4002}
4511 4003
4512/*----------------------- end-of-file (C source) -----------------------*/ 4004/*----------------------- end-of-file (C source) -----------------------*/
4513 4005

Diff Legend

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