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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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