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.221 by root, Sat Dec 31 18:27:57 2005 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
95 97
96 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 143 return;
143 144
144 for (;;) 145 for (;;)
145 { 146 {
146 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
147 148
148 text_t t = l.t[x]; 149 text_t t = l.t[x];
149 150
150 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
151 { 152 {
… …
224# if !UNICODE3 225# if !UNICODE3
225 if (ch >= 0x10000) 226 if (ch >= 0x10000)
226 ch = 0xfffd; 227 ch = 0xfffd;
227# endif 228# endif
228 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
230 } 233 }
231 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
232 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
233 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
234 242
235 free (fname); 243 free (fname);
236 244
… …
262 mb[0] = ch[0]; 270 mb[0] = ch[0];
263 len = 1; 271 len = 1;
264 } 272 }
265 273
266 if (len > 0) 274 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
268 else 276 else
269 scr_bell (); 277 scr_bell ();
270 } 278 }
271 279
272 iso14755buf = 0; 280 iso14755buf = 0;
… …
289 297
290 return -1; 298 return -1;
291} 299}
292#endif 300#endif
293 301
294/*{{{ Convert the keypress event into a string */
295void 302void
296rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
297{ 304{
298 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
299 unsigned int newlen; 306 unsigned int newlen;
300 KeySym keysym; 307 KeySym keysym;
301#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */
303#endif
304 int valid_keysym; 308 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * 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
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
328 Status status_return; 337 Status status_return;
329 338
330#if 0 339#if 0
331#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
335 else 344 else
336#endif 345#endif
337#endif 346#endif
338 { 347 {
… …
375 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
376 } 385 }
377 else 386 else
378#endif 387#endif
379 { 388 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
382 } 391 }
383 392
384 if (valid_keysym) 393 if (valid_keysym)
385 { 394 {
… …
437 scr_move_to (0, 1); 446 scr_move_to (0, 1);
438 return; 447 return;
439 } 448 }
440 else if (keysym == XK_End) 449 else if (keysym == XK_End)
441 { 450 {
442 scr_move_to (1, 0); 451 scr_move_to (1, 1);
443 return; 452 return;
444 } 453 }
445 } 454 }
446#endif 455#endif
447 } 456 }
… …
458 { 467 {
459 switch (keysym) 468 switch (keysym)
460 { 469 {
461 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
462 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
463 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
464 return; 473 return;
465#if TODO 474#if TODO
466 /* rxvt extras */ 475 /* rxvt extras */
467 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
468 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
487 { 496 {
488 commit_iso14755 (); 497 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
490# if ISO_14755 499# if ISO_14755
491 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);
492# endif 509# endif
493 return; 510 return;
494 } 511 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
… …
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 550 {
534 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
536 switch (keysym) 584 switch (keysym)
537 { 585 {
538#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 587 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
545 } 593 }
546 else 594 else
547 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 596 break;
549#endif 597#endif
550#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 599 case XK_Delete:
562 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 601 break;
564#endif 602#endif
565 case XK_Tab: 603 case XK_Tab:
566 if (shft) 604 if (shft)
567 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
577#endif 615#endif
578 newlen = 0; 616 newlen = 0;
579 } 617 }
580 break; 618 break;
581 619
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
614 break; 636 break;
615 637
616#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 639 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
629 break; 641 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 642 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
642 break; 644 break;
643#endif 645#endif
644 case XK_KP_Enter: 646 case XK_KP_Enter:
645 /* allow shift to override */ 647 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
647 { 649 {
648 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
649 break; 651 break;
650 } 652 }
651 653
… …
663 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
665 } 667 }
666 break; 668 break;
667 669
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 694 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
700 { 696 {
701 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 699 }
704 else 700 else
… …
710 706
711 case XK_Find: 707 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
713 break; 709 break;
714 710
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 711 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
727 break; 713 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 715 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
734 break; 720 break;
735 case XK_Select: 721 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
737 break; 723 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 724 case XK_End:
749 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
750 break; 726 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 727 case XK_Home:
762 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
763 break; 729 break;
764 730
765#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
849 { 815 {
850#ifdef META8_OPTION 816#ifdef META8_OPTION
851 /* set 8-bit on */ 817 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
853 { 819 {
854 unsigned char *ch; 820 char *ch;
855 821
856 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 823 *ch |= 0x80;
858 824
859 meta = 0; 825 meta = 0;
… …
861#endif 827#endif
862 /* nil */ ; 828 /* nil */ ;
863 } 829 }
864 } 830 }
865 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
866 if (len <= 0) 835 if (len <= 0)
867 return; /* not mapped */ 836 return; /* not mapped */
868 837
869 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
870 if (view_start) 839 if (view_start)
871 { 840 {
872 view_start = 0; 841 view_start = 0;
873 want_refresh = 1; 842 want_refresh = 1;
874 } 843 }
… …
892#ifdef META8_OPTION 861#ifdef META8_OPTION
893 && meta_char == C0_ESC 862 && meta_char == C0_ESC
894#endif 863#endif
895 ) 864 )
896 { 865 {
897 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
898 tt_write (&ch, 1); 867 tt_write (&ch, 1);
899 } 868 }
900 869
901#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */
903 unsigned char *p;
904 int i;
905
906 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
907 for (i = 0, p = kbuf; i < len; i++, p++)
908 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
909 fprintf (stderr, "'\n");
910#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
912} 871}
913/*}}} */
914 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 951unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 953{
921 unsigned int n, s; 954 unsigned int n, s;
922 955
923 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
950void 983void
951rxvt_term::flush () 984rxvt_term::flush ()
952{ 985{
953 flush_ev.stop (); 986 flush_ev.stop ();
954 987
955#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
956 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
957 { 990 {
958 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
959 scr_clear ();
960 scr_touch (false); 992 scr_touch (false);
961 } 993 }
962#endif 994#endif
963 995
964 if (want_refresh) 996 if (want_refresh)
965 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
966 scr_refresh (refresh_type); 1036 scr_refresh ();
967 scrollbar_show (1); 1037 scrollbar_show (1);
968#ifdef USE_XIM 1038#ifdef USE_XIM
969 IMSendSpot (); 1039 IMSendSpot ();
970#endif 1040#endif
971 } 1041 }
972 1042
973 display->flush (); 1043 display->flush ();
974} 1044}
975 1045
976void 1046void
977rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
978{ 1048{
979 SET_R (this); 1049 make_current ();
980 SET_LOCALE (locale);
981 1050
982 display->flush (); 1051 display->flush ();
983 1052
984 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
985 flush_ev.start (NOW + 0.01); 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
986} 1055}
987 1056
988void 1057void
989rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
990{ 1059{
991 SET_R (this); 1060 make_current ();
992 SET_LOCALE (locale);
993 1061
994 refresh_limit = 1;
995 refresh_count = 0; 1062 refresh_count = 0;
996 flush (); 1063 flush ();
997} 1064}
998 1065
999#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1000void 1067void
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1002{ 1069{
1003 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1071 want_refresh = 1;
1005
1006 w.start (w.at + BLINK_INTERVAL);
1007} 1072}
1008#endif 1073#endif
1009 1074
1010#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1011void 1076void
1012rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1013{ 1078{
1014 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1015 { 1080 {
1016 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1017 want_refresh = 1; 1082 want_refresh = 1;
1018 w.start (w.at + TEXT_BLINK_INTERVAL);
1019 } 1083 }
1084 else
1085 w.stop ();
1020} 1086}
1021#endif 1087#endif
1022 1088
1023#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1024void 1090void
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1026{ 1092{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1029 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1095 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1033 } 1097 w.stop ();
1034} 1098}
1035#endif 1099#endif
1036 1100
1037#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1038void 1102void
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1040{ 1104{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1106 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1108 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1109 }
1110 else
1111 w.stop ();
1048} 1112}
1049#endif 1113#endif
1050 1114
1051#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1052void 1116void
1053rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1054{ 1118{
1055 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1122 {
1059 if (view_start == nsaved || 1123 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1062 1125
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1126 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 }
1128 else
1129 w.stop ();
1130}
1131#endif
1132
1133#if LINUX_YIELD_HACK
1134static struct event_handler
1135{
1136 ev::prepare yield_ev;
1137
1138 void yield_cb (ev::prepare &w, int revents)
1139 {
1140 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS.
1144
1145 struct timespec ts = { 0, 0 };
1146 nanosleep (&ts, 0);
1147
1148 w.stop ();
1066 } 1149 }
1067} 1150
1151 event_handler ()
1152 : yield_ev (this, &event_handler::yield_cb)
1153 {
1154 }
1155} event_handler;
1068#endif 1156#endif
1069 1157
1070bool 1158bool
1071rxvt_term::pty_fill () 1159rxvt_term::pty_fill ()
1072{ 1160{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1162
1075 if (CBUFSIZ == n) 1163 if (CBUFSIZ == n)
1076 { 1164 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1166 n = 0;
1079 } 1167 }
1080 1168
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
1084 1172
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086 1174
1087 if (n > 0) 1175 if (r > 0)
1088 { 1176 {
1089 cmdbuf_endp += n; 1177 cmdbuf_endp += r;
1090 return true; 1178 return true;
1091 } 1179 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1181 {
1182#if LINUX_YIELD_HACK
1183 if (display->is_local)
1184 event_handler.yield_ev.start ();
1185#endif
1186 }
1187 else
1093 { 1188 {
1094 pty_ev.stop (); 1189 pty_ev.stop ();
1095 1190
1096 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1097 destroy (); 1192 destroy ();
1098 } 1193 }
1099 1194
1100 return false; 1195 return false;
1101} 1196}
1102 1197
1103void 1198void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1105{ 1200{
1106 SET_R (this); 1201 make_current ();
1107 SET_LOCALE (locale);
1108 1202
1109 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1110 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1205 while (pty_fill ())
1112 if (cmd_parse ()) 1206 if (cmd_parse ())
1113 break; 1207 break;
1114 1208
1115 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1116 pty_write (); 1210 pty_write ();
1117} 1211}
1118 1212
1119void 1213void
1120rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1121{ 1215{
1122 XDefineCursor (display->display, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1123 recolour_cursor (); 1217 recolour_cursor ();
1124 1218
1125#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1126 hidden_pointer = 0; 1220 hidden_pointer = 0;
1127 1221
1128 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1129 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1130#endif 1224#endif
1131} 1225}
1132 1226
1133#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1134void 1228void
1135rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1136{ 1230{
1137 if (! OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1138 return; 1232 return;
1139 1233
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1141 XFlush (display->display); 1235 XFlush (dpy);
1142 1236
1143 hidden_pointer = 1; 1237 hidden_pointer = 1;
1144} 1238}
1145 1239
1146void 1240void
1147rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1148{ 1242{
1149 SET_R (this); 1243 make_current ();
1150 SET_LOCALE (locale);
1151 1244
1152 pointer_blank (); 1245 pointer_blank ();
1153} 1246}
1154#endif 1247#endif
1155 1248
1156void 1249void
1157rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1158{ 1251{
1159 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1160 int x, y; 1253 int x, y;
1254 int code = 32;
1161 1255
1162 x = ev.x; 1256 x = Pixel2Col (ev.x);
1163 y = ev.y; 1257 y = Pixel2Row (ev.y);
1164 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1165 1266
1166 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1167 button_number = 3; 1268 button_number = 3;
1168 else 1269 else
1169 { 1270 {
… …
1215 x + 1, 1316 x + 1,
1216 y + 1); 1317 y + 1);
1217#endif 1318#endif
1218 1319
1219 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1220 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1221 (32 + x + 1), 1322 (32 + x + 1),
1222 (32 + y + 1)); 1323 (32 + y + 1));
1223} 1324}
1224
1225#ifdef USING_W11LIB
1226void
1227rxvt_W11_process_x_event (XEvent *ev)
1228{
1229 rxvt_t *r = rxvt_get_r ();
1230
1231 x_cb (*ev);
1232}
1233#endif
1234 1325
1235/*{{{ process an X event */ 1326/*{{{ process an X event */
1236void 1327void
1237rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1238{ 1329{
1239 dDisp; 1330 make_current ();
1240 1331
1241 SET_R (this); 1332 dLocal (Display *, dpy);
1242 SET_LOCALE (locale);
1243 1333
1244#if defined(CURSOR_BLINK) 1334 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1246 { 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1247 if (hidden_cursor) 1337 return;
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252 1338
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1339 // for XQueryPointer
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1340 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1341 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1342 unsigned int unused_mask;
1274 1343
1275 switch (ev.type) 1344 switch (ev.type)
1276 { 1345 {
1277 case KeyPress: 1346 case KeyPress:
1278#if ISO_14755 1347 key_press (ev.xkey);
1279 if (!(iso14755buf & ISO_14755_52))
1280#endif
1281 lookup_key (ev.xkey);
1282
1283 break; 1348 break;
1284 1349
1285 case KeyRelease: 1350 case KeyRelease:
1286 { 1351 key_release (ev.xkey);
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1288 KeySym ks;
1289
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif
1292
1293#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support
1295 if (iso14755buf)
1296 if (iso14755buf & ISO_14755_52)
1297 {
1298# if ENABLE_OVERLAY
1299 scr_overlay_off ();
1300# endif
1301# if ISO_14755
1302 // iso14755 part 5.2 handling: release time
1303 // first: controls
1304 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f)))
1307 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1309 commit_iso14755 ();
1310 return; // case-break;
1311 }
1312
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks)
1315 {
1316 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 ();
1318 return; // case-break;
1319 }
1320
1321 scr_bell ();
1322# endif
1323 iso14755buf = 0;
1324 break;
1325 }
1326 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331 if (iso14755buf & ISO_14755_51)
1332 commit_iso14755 ();
1333#if ISO_14755
1334 else if (iso14755buf & ISO_14755_STARTED)
1335 {
1336 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1337
1338 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1339 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1340 }
1341# endif
1342 else
1343 iso14755buf = 0;
1344 }
1345#endif
1346
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R)
1351 mouse_slip_wheel_speed = 0;
1352#endif
1353 break; 1352 break;
1354 }
1355 1353
1356 case ButtonPress: 1354 case ButtonPress:
1357 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1358 break; 1356 break;
1359 1357
… …
1361 button_release (ev.xbutton); 1359 button_release (ev.xbutton);
1362 break; 1360 break;
1363 1361
1364 case ClientMessage: 1362 case ClientMessage:
1365 if (ev.xclient.format == 32 1363 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1364 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 1365 {
1366 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1367 {
1368 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1369 {
1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1369 destroy (); 1373 destroy ();
1374 }
1370#if ENABLE_EWMH 1375#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1376 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev); 1379 &ev);
1380#endif
1381 }
1382 }
1383#if ENABLE_XEMBED
1384 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1385 {
1386 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1387 focus_in ();
1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1389 focus_out ();
1390 }
1375#endif 1391#endif
1376 } 1392 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1386#ifdef OFFIX_DND
1387 /* OffiX Dnd (drag 'n' drop) protocol */
1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1389 && (ev.xclient.data.l[0] == DndFile
1390 || ev.xclient.data.l[0] == DndDir
1391 || ev.xclient.data.l[0] == DndLink))
1392 {
1393 /* Get Dnd data */
1394 Atom ActualType;
1395 int ActualFormat;
1396 unsigned char *data;
1397 unsigned long Size, RemainingBytes;
1398
1399 XGetWindowProperty (disp, display->root,
1400 xa[XA_DNDSELECTION],
1401 0L, 1000000L,
1402 False, AnyPropertyType,
1403 &ActualType, &ActualFormat,
1404 &Size, &RemainingBytes,
1405 &data);
1406 set_string_property (XA_CUT_BUFFER0, data);
1407 XFree (data);
1408 selection_paste (display->root, XA_CUT_BUFFER0, true);
1409 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1410 }
1411#endif /* OFFIX_DND */
1412 break;
1413
1414 case MappingNotify:
1415 XRefreshKeyboardMapping (&ev.xmapping);
1416 break; 1393 break;
1417 1394
1418 /* 1395 /*
1419 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1420 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1439 break; 1416 break;
1440 } 1417 }
1441 break; 1418 break;
1442 1419
1443 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1444 focus_in (); 1424 focus_in ();
1445 break; 1425 break;
1446 1426
1447 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1448 focus_out (); 1431 focus_out ();
1449 break; 1432 break;
1450 1433
1451 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1452 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1453 { 1439 {
1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ; 1441 ;
1456 1442
1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1458 { 1444 {
1459 seen_resize = 1; 1445 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1447 }
1462 1448 else
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449 {
1464 if (OPTION (Opt_transparent)) 1450#ifdef HAVE_BG_PIXMAP
1465 check_our_parents (); 1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1466#endif 1453#endif
1454 }
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1456 }
1468 break; 1457 break;
1469 1458
1470 case PropertyNotify: 1459 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1471 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1472 && ev.xproperty.state == PropertyNewValue) 1462 && ev.xproperty.state == PropertyNewValue)
1473 selection_property (ev.xproperty.window, ev.xproperty.atom); 1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1474 1464
1475 break; 1465 break;
1476 1466
1477 case SelectionClear: 1467 case SelectionClear:
1478 selection_clear (); 1468 selection_clear ();
… …
1483 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 break; 1474 break;
1485 1475
1486 case SelectionRequest: 1476 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1478 break;
1479
1480 case MapNotify:
1481 mapped = 1;
1482#ifdef TEXT_BLINK
1483 text_blink_ev.start ();
1484#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 break; 1486 break;
1489 1487
1490 case UnmapNotify: 1488 case UnmapNotify:
1491 mapped = 0; 1489 mapped = 0;
1492#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1494#endif 1492#endif
1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 break; 1494 break;
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break;
1503
1504#ifdef TRANSPARENT
1505 case ReparentNotify:
1506 rootwin_cb (ev);
1507 break;
1508#endif /* TRANSPARENT */
1509 1495
1510 case GraphicsExpose: 1496 case GraphicsExpose:
1511 case Expose: 1497 case Expose:
1512 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1513 { 1499 {
1514 do 1500 do
1501 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1506
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1508
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1524 1513 }
1525 scr_refresh (refresh_type); 1514 want_refresh = 1;
1526 } 1515 }
1527 else 1516 else
1528 { 1517 {
1529 XEvent unused_event; 1518 XEvent unused_event;
1530 1519
1531 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1532 ; 1521 ;
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1534 ; 1523 ;
1535 1524
1536 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1537 { 1526 {
1538 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1539 scrollbar_show (0); 1528 scrollbar_show (0);
1540 } 1529 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545
1546#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window);
1549#endif
1550 } 1530 }
1551 break; 1531 break;
1552 1532
1553 case MotionNotify: 1533 case MotionNotify:
1554#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1535 if (hidden_pointer)
1556 pointer_unblank (); 1536 pointer_unblank ();
1557#endif 1537#endif
1558#if MENUBAR 1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1559 if (isMenuBarWindow (ev.xany.window)) 1539 || priv_modes & PrivMode_MouseAnyEvent)
1560 {
1561 menubar_control (ev.xbutton); 1540 mouse_report (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1542 break;
1567 1543
1568 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1569 { 1545 {
1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1550 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1552 ;
1574 1553
1575 XQueryPointer (disp, vt, 1554 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1558 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1600 int dist; 1579 int dist;
1601 1580
1602 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1604 */ 1583 */
1605 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1607 1586
1608 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1609 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1610 */ 1589 */
1611 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1633 else 1612 else
1634 { 1613 {
1635 /* we are within the text window, so we 1614 /* we are within the text window, so we
1636 * shouldn't be scrolling 1615 * shouldn't be scrolling
1637 */ 1616 */
1638 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1639 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1640 } 1619 }
1641#endif 1620#endif
1642#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1643 } 1622 }
1644#endif 1623#endif
1645 } 1624 }
1646 } 1625 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1627 {
1649 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1629 MotionNotify, &ev))
1651 ; 1630 ;
1652 1631
1653 XQueryPointer (disp, scrollBar.win, 1632 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1636 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1638 scrollbar_size ());
1660 scr_refresh (refresh_type);
1661 refresh_limit = 0; 1639 want_refresh = 1;
1662 scrollbar_show (1); 1640 scrollbar_show (1);
1663 } 1641 }
1664 break; 1642 break;
1665 } 1643 }
1644
1645#if defined(CURSOR_BLINK)
1646 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1647 {
1648 if (hidden_cursor)
1649 {
1650 hidden_cursor = 0;
1651 want_refresh = 1;
1652 }
1653
1654 cursor_blink_ev.again ();
1655 }
1656#endif
1657
1658#if defined(POINTER_BLANK)
1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1660 {
1661 if (ev.type == MotionNotify
1662 || ev.type == ButtonPress
1663 || ev.type == ButtonRelease)
1664 if (hidden_pointer)
1665 pointer_unblank ();
1666
1667 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank ();
1669 }
1670#endif
1666} 1671}
1667 1672
1668void 1673void
1669rxvt_term::focus_in () 1674rxvt_term::focus_in ()
1670{ 1675{
1671 if (!focus) 1676 if (!focus)
1672 { 1677 {
1673 focus = 1; 1678 focus = 1;
1674 want_refresh = 1; 1679 want_refresh = 1;
1680
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682
1675#if USE_XIM 1683#if USE_XIM
1676 if (Input_Context != NULL) 1684 if (Input_Context != NULL)
1677 { 1685 {
1678 IMSetStatusPosition (); 1686 IMSetPosition ();
1679 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1680 } 1688 }
1681#endif 1689#endif
1682#if CURSOR_BLINK 1690#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1685#endif 1693#endif
1686#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1688 { 1696 {
1689 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
1690 scr_recolour (); 1698 scr_recolour ();
1691 } 1699 }
1692#endif 1700#endif
1701#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell))
1703 {
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif
1693 } 1711 }
1694} 1712}
1695 1713
1696void 1714void
1697rxvt_term::focus_out () 1715rxvt_term::focus_out ()
… …
1699 if (focus) 1717 if (focus)
1700 { 1718 {
1701 focus = 0; 1719 focus = 0;
1702 want_refresh = 1; 1720 want_refresh = 1;
1703 1721
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1723
1704#if ENABLE_FRILLS || ISO_14755 1724#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf)
1726 {
1705 iso14755buf = 0; 1727 iso14755buf = 0;
1706#endif 1728# if ISO_14755
1707#if ENABLE_OVERLAY
1708 scr_overlay_off (); 1729 scr_overlay_off ();
1730# endif
1731 }
1709#endif 1732#endif
1710#if USE_XIM 1733#if USE_XIM
1711 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1735 XUnsetICFocus (Input_Context);
1713#endif 1736#endif
1714#if CURSOR_BLINK 1737#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1738 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.stop (); 1739 cursor_blink_ev.stop ();
1740
1717 hidden_cursor = 0; 1741 hidden_cursor = 0;
1718#endif 1742#endif
1719#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1721 { 1745 {
… …
1724 } 1748 }
1725#endif 1749#endif
1726 } 1750 }
1727} 1751}
1728 1752
1729#if TRANSPARENT 1753void
1754rxvt_term::update_fade_color (unsigned int idx)
1755{
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 rgba c;
1760 pix_colors [Color_fade].get (c);
1761 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1762 }
1763#endif
1764}
1765
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL
1730void 1767void
1731rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1769{
1733 SET_R (this); 1770 make_current ();
1734 SET_LOCALE (locale);
1735 1771
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return;
1775
1776# if ENABLE_TRANSPARENCY
1736 switch (ev.type) 1777 switch (ev.type)
1737 { 1778 {
1738 case PropertyNotify: 1779 case PropertyNotify:
1739 /* 1780 /*
1740 * if user used some Esetroot compatible prog to set the root bg, 1781 * if user used some Esetroot compatible prog to set the root bg,
1741 * use the property to determine the pixmap. We use it later on. 1782 * use the property to determine the pixmap. We use it later on.
1742 */ 1783 */
1743 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1745 return; 1786 {
1746 1787 bgPixmap.set_root_pixmap ();
1747 /* FALLTHROUGH */ 1788 update_background ();
1748 case ReparentNotify: 1789 }
1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1750 want_refresh = want_full_refresh = 1;
1751 break; 1790 break;
1752 } 1791 }
1792# endif
1753} 1793}
1754#endif 1794#endif
1755 1795
1756void 1796void
1757rxvt_term::button_press (XButtonEvent &ev) 1797rxvt_term::button_press (XButtonEvent &ev)
1758{ 1798{
1759 int reportmode = 0, clickintime; 1799 int reportmode = 0, clickintime;
1760 1800
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1801 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1802
1762 if (!bypass_keystate) 1803 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1804 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1805
1765 /* 1806 /*
1766 * VT window processing of button press 1807 * VT window processing of button press
1767 */ 1808 */
1768 if (ev.window == vt) 1809 if (ev.window == vt)
1769 { 1810 {
1811 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1770#if ISO_14755 1814#if ISO_14755
1771 // 5.4 1815 // 5.4
1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1816 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1773 { 1817 {
1774 iso14755_54 (ev.x, ev.y); 1818 iso14755_54 (ev.x, ev.y);
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1830#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1831 if (ev.button == MEvent.button && clickintime)
1788 { 1832 {
1789 /* same button, within alloted time */ 1833 /* same button, within alloted time */
1790 MEvent.clicks++; 1834 MEvent.clicks++;
1835
1791 if (MEvent.clicks > 1) 1836 if (MEvent.clicks > 1)
1792 { 1837 {
1793 /* only report double clicks */ 1838 /* only report double clicks */
1794 MEvent.clicks = 2; 1839 MEvent.clicks = 2;
1795 mouse_report (ev); 1840 mouse_report (ev);
… …
1807 mouse_report (ev); 1852 mouse_report (ev);
1808 } 1853 }
1809#else 1854#else
1810 MEvent.button = ev.button; 1855 MEvent.button = ev.button;
1811 mouse_report (ev); 1856 mouse_report (ev);
1812#endif /* MOUSE_REPORT_DOUBLECLICK */ 1857#endif /* MOUSE_REPORT_DOUBLECLICK */
1813 1858
1814 } 1859 }
1815 else 1860 else
1816 { 1861 {
1817 if (ev.button != MEvent.button) 1862 if (ev.button != MEvent.button)
… …
1827#else 1872#else
1828 selection.rect = false; 1873 selection.rect = false;
1829#endif 1874#endif
1830 1875
1831 /* allow shift+left click to extend selection */ 1876 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1877 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1878 {
1834 if (MEvent.button == Button1 && clickintime) 1879 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1880 selection_rotate (ev.x, ev.y);
1836 else 1881 else
1837 selection_extend (ev.x, ev.y, 1); 1882 selection_extend (ev.x, ev.y, 1);
… …
1911 tt_printf ("\033[5~"); 1956 tt_printf ("\033[5~");
1912 break; 1957 break;
1913 } 1958 }
1914 } 1959 }
1915 else 1960 else
1916#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1917 1962
1918 { 1963 {
1919 char upordown = 0; 1964 char upordown = 0;
1920 1965
1921 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
1922 { 1967 {
1923 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
1924 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
1933 upordown = 1; /* down */ 1978 upordown = 1; /* down */
1934 } 1979 }
1935 if (upordown) 1980 if (upordown)
1936 { 1981 {
1937#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1938 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1939#endif 1984#endif
1940 if (scr_page (upordown < 0 ? UP : DN, 1)) 1985 if (scr_page (upordown < 0 ? UP : DN, 1))
1941 { 1986 {
1942 if (upordown < 0) 1987 if (upordown < 0)
1943 scrollBar.setUp (); 1988 scrollBar.setUp ();
… …
2002 } 2047 }
2003 2048
2004 break; 2049 break;
2005 } 2050 }
2006 } 2051 }
2052
2007 return; 2053 return;
2008 } 2054 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2055}
2017 2056
2018void 2057void
2019rxvt_term::button_release (XButtonEvent &ev) 2058rxvt_term::button_release (XButtonEvent &ev)
2020{ 2059{
… …
2026 2065
2027 if (scrollbar_isUpDn ()) 2066 if (scrollbar_isUpDn ())
2028 { 2067 {
2029 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2030 scrollbar_show (0); 2069 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2070 }
2035 2071
2036#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2038 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2039#endif 2075#endif
2040 2076
2041 if (ev.window == vt) 2077 if (ev.window == vt)
2042 { 2078 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2080 return;
2081
2043#if ISO_14755 2082#if ISO_14755
2044 // 5.4 2083 // 5.4
2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2084 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2046 return; 2085 return;
2047#endif 2086#endif
2087
2048 if (reportmode) 2088 if (reportmode)
2049 { 2089 {
2050 /* mouse report from vt window */ 2090 /* mouse report from vt window */
2051 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
2052 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
2063 mouse_report (ev); 2103 mouse_report (ev);
2064 } 2104 }
2065#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2066 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2067 mouse_report (ev); 2107 mouse_report (ev);
2068#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2069 return; 2109 return;
2070 } 2110 }
2071 2111
2072 /* 2112 /*
2073 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2082 { 2122 {
2083 case Button1: 2123 case Button1:
2084 case Button3: 2124 case Button3:
2085 selection_make (ev.time); 2125 selection_make (ev.time);
2086 break; 2126 break;
2127
2087 case Button2: 2128 case Button2:
2088 selection_request (ev.time, ev.x, ev.y); 2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2089 break; 2131 break;
2132
2090#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2091 case Button4: 2134 case Button4:
2092 case Button5: 2135 case Button5:
2093 { 2136 {
2094 int i; 2137 int i;
… …
2096 2139
2097 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2098 2141
2099 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2100 i = 1; 2143 i = 1;
2101 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2102 i = nrow - 1; 2145 i = nrow - 1;
2103 else 2146 else
2104 i = 5; 2147 i = 5;
2105 2148
2106# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
… …
2108 { 2151 {
2109 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2110 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2111 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2112 2155
2113 if (slip_wheel_ev.at < NOW) 2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2114 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2115
2116 slip_wheel_ev.start ();
2117 } 2157 }
2118 else 2158 else
2119 { 2159 {
2120# endif 2160# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2161 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2162 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2163# ifdef MOUSE_SLIP_WHEELING
2134 } 2164 }
2135#endif 2165# endif
2136 } 2166 }
2137 break; 2167 break;
2138#endif 2168#endif
2139 } 2169 }
2140 } 2170 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2171}
2146
2147#ifdef TRANSPARENT
2148#if TINTING
2149/* taken from aterm-0.4.2 */
2150
2151typedef uint32_t RUINT32T;
2152
2153void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2154{
2155 int sh_r, sh_g, sh_b;
2156 RUINT32T mask_r, mask_g, mask_b;
2157 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2158 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2159 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2160 int i;
2161
2162 Visual *visual = display->visual;
2163
2164 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2165
2166 /* for convenience */
2167 mask_r = visual->red_mask;
2168 mask_g = visual->green_mask;
2169 mask_b = visual->blue_mask;
2170
2171 /* boring lookup table pre-initialization */
2172 switch (srcImage->bits_per_pixel) {
2173 case 15:
2174 if ((mask_r != 0x7c00) ||
2175 (mask_g != 0x03e0) ||
2176 (mask_b != 0x001f))
2177 return;
2178 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2179 lookup_r = lookup;
2180 lookup_g = lookup+32;
2181 lookup_b = lookup+32+32;
2182 sh_r = 10;
2183 sh_g = 5;
2184 sh_b = 0;
2185 break;
2186 case 16:
2187 if ((mask_r != 0xf800) ||
2188 (mask_g != 0x07e0) ||
2189 (mask_b != 0x001f))
2190 return;
2191 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2192 lookup_r = lookup;
2193 lookup_g = lookup+32;
2194 lookup_b = lookup+32+64;
2195 sh_r = 11;
2196 sh_g = 5;
2197 sh_b = 0;
2198 break;
2199 case 24:
2200 if ((mask_r != 0xff0000) ||
2201 (mask_g != 0x00ff00) ||
2202 (mask_b != 0x0000ff))
2203 return;
2204 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2205 lookup_r = lookup;
2206 lookup_g = lookup+256;
2207 lookup_b = lookup+256+256;
2208 sh_r = 16;
2209 sh_g = 8;
2210 sh_b = 0;
2211 break;
2212 case 32:
2213 if ((mask_r != 0xff0000) ||
2214 (mask_g != 0x00ff00) ||
2215 (mask_b != 0x0000ff))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2218 lookup_r = lookup;
2219 lookup_g = lookup+256;
2220 lookup_b = lookup+256+256;
2221 sh_r = 16;
2222 sh_g = 8;
2223 sh_b = 0;
2224 break;
2225 default:
2226 return; /* we do not support this color depth */
2227 }
2228
2229 /* prepare limits for color transformation (each channel is handled separately) */
2230 if (shade < 0) {
2231 shade = -shade;
2232 if (shade < 0) shade = 0;
2233 if (shade > 100) shade = 100;
2234
2235 lower_lim_r = 65535-rm;
2236 lower_lim_g = 65535-gm;
2237 lower_lim_b = 65535-bm;
2238
2239 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2240 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2241 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2242
2243 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2244 } else {
2245 if (shade < 0) shade = 0;
2246 if (shade > 100) shade = 100;
2247
2248 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2249
2250 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2251 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2252 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2253 }
2254
2255 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2256 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2257 {
2258 unsigned int tmp;
2259
2260 tmp = lower_lim_r;
2261 lower_lim_r = lower_lim_b;
2262 lower_lim_b = tmp;
2263
2264 tmp = upper_lim_r;
2265 upper_lim_r = upper_lim_b;
2266 upper_lim_b = tmp;
2267 }
2268
2269 /* fill our lookup tables */
2270 for (i = 0; i <= mask_r>>sh_r; i++)
2271 {
2272 RUINT32T tmp;
2273 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2274 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2275 lookup_r[i] = (tmp/65535)<<sh_r;
2276 }
2277 for (i = 0; i <= mask_g>>sh_g; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2281 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2282 lookup_g[i] = (tmp/65535)<<sh_g;
2283 }
2284 for (i = 0; i <= mask_b>>sh_b; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2288 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2289 lookup_b[i] = (tmp/65535)<<sh_b;
2290 }
2291
2292 /* apply table to input image (replacing colors by newly calculated ones) */
2293 switch (srcImage->bits_per_pixel)
2294 {
2295 case 15:
2296 {
2297 unsigned short *p1, *pf, *p, *pl;
2298 p1 = (unsigned short *) srcImage->data;
2299 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2300 while (p1 < pf)
2301 {
2302 p = p1;
2303 pl = p1 + srcImage->width;
2304 for (; p < pl; p++)
2305 {
2306 *p = lookup_r[(*p & 0x7c00)>>10] |
2307 lookup_g[(*p & 0x03e0)>> 5] |
2308 lookup_b[(*p & 0x001f)];
2309 }
2310 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2311 }
2312 break;
2313 }
2314 case 16:
2315 {
2316 unsigned short *p1, *pf, *p, *pl;
2317 p1 = (unsigned short *) srcImage->data;
2318 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2319 while (p1 < pf)
2320 {
2321 p = p1;
2322 pl = p1 + srcImage->width;
2323 for (; p < pl; p++)
2324 {
2325 *p = lookup_r[(*p & 0xf800)>>11] |
2326 lookup_g[(*p & 0x07e0)>> 5] |
2327 lookup_b[(*p & 0x001f)];
2328 }
2329 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2330 }
2331 break;
2332 }
2333 case 24:
2334 {
2335 unsigned char *p1, *pf, *p, *pl;
2336 p1 = (unsigned char *) srcImage->data;
2337 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width * 3;
2342 for (; p < pl; p += 3)
2343 {
2344 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2345 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2346 p[2] = lookup_r[(p[2] & 0x0000ff)];
2347 }
2348 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 32:
2353 {
2354 RUINT32T *p1, *pf, *p, *pl;
2355 p1 = (RUINT32T *) srcImage->data;
2356 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xff0000)>>16] |
2365 lookup_g[(*p & 0x00ff00)>> 8] |
2366 lookup_b[(*p & 0x0000ff)] |
2367 (*p & ~0xffffff);
2368 }
2369 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 }
2374
2375 free (lookup);
2376}
2377#endif
2378
2379/*
2380 * Check our parents are still who we think they are.
2381 * Do transparency updates if required
2382 */
2383int
2384rxvt_term::check_our_parents ()
2385{
2386 int i, pchanged, aformat, have_pixmap, rootdepth;
2387 unsigned long nitems, bytes_after;
2388 Atom atype;
2389 unsigned char *prop = NULL;
2390 Window root, oldp, *list;
2391 Pixmap rootpixmap = None;
2392 XWindowAttributes wattr, wrootattr;
2393 dDisp;
2394
2395 pchanged = 0;
2396
2397 if (!OPTION (Opt_transparent))
2398 return pchanged; /* Don't try any more */
2399
2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2401 rootdepth = wrootattr.depth;
2402
2403 XGetWindowAttributes (disp, parent[0], &wattr);
2404
2405 if (rootdepth != wattr.depth)
2406 {
2407 if (am_transparent)
2408 {
2409 pchanged = 1;
2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2411 am_transparent = am_pixmap_trans = 0;
2412 }
2413
2414 return pchanged; /* Don't try any more */
2415 }
2416
2417 /* Get all X ops out of the queue so that our information is up-to-date. */
2418 XSync (disp, False);
2419
2420 /*
2421 * Make the frame window set by the window manager have
2422 * the root background. Some window managers put multiple nested frame
2423 * windows for each client, so we have to take care about that.
2424 */
2425 i = (xa[XA_XROOTPMAP_ID]
2426 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2427 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2428 &nitems, &bytes_after, &prop) == Success);
2429
2430 if (!i || prop == NULL)
2431 i = (xa[XA_ESETROOT_PMAP_ID]
2432 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL
2437#if TINTING
2438 || !rs[Rs_color + Color_tint]
2439#endif
2440 )
2441 have_pixmap = 0;
2442 else
2443 {
2444 have_pixmap = 1;
2445 rootpixmap = *(Pixmap *)prop;
2446 XFree (prop);
2447 }
2448
2449 if (have_pixmap)
2450 {
2451 /*
2452 * Copy display->root pixmap transparency
2453 */
2454 int sx, sy, nx, ny;
2455 unsigned int nw, nh;
2456 Window cr;
2457 XImage *image;
2458 GC gc;
2459 XGCValues gcvalue;
2460
2461 XTranslateCoordinates (disp, parent[0], display->root,
2462 0, 0, &sx, &sy, &cr);
2463 nw = (unsigned int)szHint.width;
2464 nh = (unsigned int)szHint.height;
2465 nx = ny = 0;
2466
2467 if (sx < 0)
2468 {
2469 nw += sx;
2470 nx = -sx;
2471 sx = 0;
2472 }
2473
2474 if (sy < 0)
2475 {
2476 nh += sy;
2477 ny = -sy;
2478 sy = 0;
2479 }
2480
2481 min_it (nw, (unsigned int) (wrootattr.width - sx));
2482 min_it (nh, (unsigned int) (wrootattr.height - sy));
2483
2484 XSync (disp, False);
2485 allowedxerror = -1;
2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2487
2488 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2489 /* XXX: may need a delay here? */
2490 allowedxerror = 0;
2491
2492 if (image == NULL)
2493 {
2494 if (am_transparent && am_pixmap_trans)
2495 {
2496 pchanged = 1;
2497 if (pixmap != None)
2498 {
2499 XFreePixmap (disp, pixmap);
2500 pixmap = None;
2501 }
2502 }
2503
2504 am_pixmap_trans = 0;
2505 }
2506 else
2507 {
2508 if (pixmap != None)
2509 XFreePixmap (disp, pixmap);
2510
2511#if TINTING
2512 if (ISSET_PIXCOLOR (Color_tint))
2513 {
2514 unsigned short rm, gm, bm;
2515 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2516
2517 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2518
2519 ShadeXImage (display, image, shade, rm, gm, bm);
2520 }
2521#endif
2522
2523 pixmap = XCreatePixmap (disp, vt,
2524 szHint.width, szHint.height, image->depth);
2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2526 XPutImage (disp, pixmap, gc, image, 0, 0,
2527 nx, ny, image->width, image->height);
2528 XFreeGC (disp, gc);
2529 XDestroyImage (image);
2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2531 XClearWindow (disp, parent[0]);
2532
2533 if (!am_transparent || !am_pixmap_trans)
2534 pchanged = 1;
2535
2536 am_transparent = am_pixmap_trans = 1;
2537 }
2538 }
2539
2540 if (am_pixmap_trans)
2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2542 else
2543 {
2544 unsigned int n;
2545 /*
2546 * InheritPixmap transparency
2547 */
2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2549 {
2550 oldp = parent[i];
2551 XQueryTree (disp, parent[i - 1], &root,
2552 &parent[i], &list, &n);
2553 XFree (list);
2554
2555 if (parent[i] == display->root)
2556 {
2557 if (oldp != None)
2558 pchanged = 1;
2559
2560 break;
2561 }
2562
2563 if (oldp != parent[i])
2564 pchanged = 1;
2565 }
2566
2567 n = 0;
2568
2569 if (pchanged)
2570 {
2571 for (; n < (unsigned int)i; n++)
2572 {
2573 XGetWindowAttributes (disp, parent[n], &wattr);
2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2575 {
2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2577 break;
2578 }
2579 }
2580 }
2581
2582 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2583 {
2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2586 am_transparent = 0;
2587 /* XXX: also turn off Opt_transparent? */
2588 }
2589 else
2590 {
2591#if WAIT_FOR_WM
2592 /* wait (an arbitrary period) for the WM to do its thing
2593 * needed for fvwm2.2.2 (and before?) */
2594 sleep (1);
2595#endif
2596 for (n = 0; n < (unsigned int)i; n++)
2597 {
2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2599 XClearWindow (disp, parent[n]);
2600 }
2601
2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2603 am_transparent = 1;
2604 }
2605
2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 parent[i] = None;
2608 }
2609
2610 if (scrollBar.win)
2611 {
2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2613 scrollBar.setIdle ();
2614 scrollbar_show (0);
2615 }
2616
2617 if (am_transparent)
2618 {
2619 want_refresh = want_full_refresh = 1;
2620 if (am_pixmap_trans)
2621 flush ();
2622 }
2623
2624 return pchanged;
2625}
2626#endif
2627 2172
2628/*}}} */ 2173/*}}} */
2629 2174
2630bool 2175bool
2631rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
2632{ 2177{
2633 bool flag = false; 2178 bool flag = false;
2634 unicode_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2636 2181
2637 for (;;) 2182 for (;;)
2638 { 2183 {
2639 if (ch == NOCHAR) 2184 if (ch == NOCHAR)
2640 { 2185 {
2641 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2187 ch = next_char ();
2643 }
2644 2188
2645 if (ch == NOCHAR) // TODO: improve 2189 if (ch == NOCHAR)
2646 break; 2190 break;
2191 }
2647 2192
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2194 {
2650 if (!seen_input) 2195 if (!seen_input)
2651 { 2196 {
… …
2660 if (seen_resize && cmd_pid) 2205 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2206 kill (-cmd_pid, SIGWINCH);
2662 } 2207 }
2663 2208
2664 /* Read a text string from the input buffer */ 2209 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2210 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2211 bool refreshnow = false;
2667 int nlines = 0; 2212 int nlines = 0;
2668 unicode_t *str = buf; 2213 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2215
2671 for (;;) 2216 for (;;)
2672 { 2217 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2219 break;
… …
2680 if (ch == C0_LF) 2225 if (ch == C0_LF)
2681 nlines++; 2226 nlines++;
2682 2227
2683 refresh_count++; 2228 refresh_count++;
2684 2229
2685 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2231 {
2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2688 refreshnow = true; 2236 refreshnow = true;
2689 ch = NOCHAR; 2237 ch = NOCHAR;
2690 break; 2238 break;
2239 }
2691 } 2240 }
2692 2241
2693 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2695 { 2244 {
2245 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2246 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2247 scr_add_lines (buf, str - buf, nlines);
2248
2697 nlines = 0; 2249 nlines = 0;
2698 str = buf; 2250 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2251 eol = str + min (ncol, UBUFSIZ);
2700 } 2252 }
2701 2253
… …
2714 2266
2715 seq_begin = cmdbuf_ptr; 2267 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2268 ch = next_char ();
2717 } 2269 }
2718 2270
2271 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2273 scr_add_lines (buf, str - buf, nlines);
2720 2274
2721 /* 2275 /*
2722 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2725 * is incremented here because we must be doing flat-out scrolling.
2726 */ 2279 */
2727 if (refreshnow) 2280 if (refreshnow)
2728 { 2281 {
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++;
2731 else
2732 {
2733 flag = true; 2282 flag = true;
2734 scr_refresh (refresh_type); 2283 scr_refresh ();
2735 } 2284 want_refresh = 1;
2736 } 2285 }
2737 2286
2738 } 2287 }
2739 else 2288 else
2740 { 2289 {
… …
2754 } 2303 }
2755 2304
2756 return flag; 2305 return flag;
2757} 2306}
2758 2307
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2308// read the next character
2769unicode_t 2309wchar_t
2770rxvt_term::next_char () 2310rxvt_term::next_char () NOTHROW
2771{ 2311{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2313 {
2774 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2777 2317
2778 wchar_t wc; 2318 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2320
2781 if (len == (size_t)-2) 2321 if (len == (size_t)-2)
2782 { 2322 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2323 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2325 break;
2786 } 2326 }
2787 2327
2788 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2330
2791 // assume wchar == unicode 2331 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2332 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2333 return wc & UNICODE_MASK;
2794 } 2334 }
2795 2335
2796 return NOCHAR; 2336 return NOCHAR;
2797} 2337}
2338
2339// read the next octet
2340uint32_t
2341rxvt_term::next_octet () NOTHROW
2342{
2343 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR;
2346}
2347
2348static class out_of_input out_of_input;
2798 2349
2799/* rxvt_cmd_getc () - Return next input character */ 2350/* rxvt_cmd_getc () - Return next input character */
2800/* 2351/*
2801 * Return the next input character after first passing any keyboard input 2352 * Return the next input character after first passing any keyboard input
2802 * to the command. 2353 * to the command.
2803 */ 2354 */
2804unicode_t 2355wchar_t
2805rxvt_term::cmd_getc () 2356rxvt_term::cmd_getc () THROW ((class out_of_input))
2806{ 2357{
2807 unicode_t c = next_char (); 2358 wchar_t c = next_char ();
2808 2359
2809 if (c == NOCHAR) 2360 if (c == NOCHAR)
2810 throw out_of_input; 2361 throw out_of_input;
2811 2362
2812 return c; 2363 return c;
2813} 2364}
2814 2365
2815unicode_t 2366uint32_t
2816rxvt_term::cmd_get8 () 2367rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2368{
2818 unicode_t c = next_octet (); 2369 uint32_t c = next_octet ();
2819 2370
2820 if (c == NOCHAR) 2371 if (c == NOCHAR)
2821 throw out_of_input; 2372 throw out_of_input;
2822 2373
2823 return c; 2374 return c;
… …
2887 { 2438 {
2888 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2889 break; /* done = 1 */ 2440 break; /* done = 1 */
2890 } 2441 }
2891 } 2442 }
2892 2443
2893 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2894 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2895 { 2446 {
2896 done = 1; 2447 done = 1;
2897 break; 2448 break;
… …
2899 } 2450 }
2900 } 2451 }
2901 2452
2902 pclose_printer (fd); 2453 pclose_printer (fd);
2903} 2454}
2904#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2905/*}}} */ 2456/*}}} */
2906 2457
2907/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2908enum { 2459enum {
2909 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
2923 case C0_ESC: 2474 case C0_ESC:
2924 process_escape_seq (); 2475 process_escape_seq ();
2925 break; 2476 break;
2926 case C0_ENQ: /* terminal Status */ 2477 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2478 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2479 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2480 else
2931 tt_write ((unsigned char *)VT100_ANS, 2481 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2482 break;
2934 case C0_BEL: /* bell */ 2483 case C0_BEL: /* bell */
2935 scr_bell (); 2484 scr_bell ();
2936 break; 2485 break;
2937 case C0_BS: /* backspace */ 2486 case C0_BS: /* backspace */
… …
2961 process_dcs_seq (); 2510 process_dcs_seq ();
2962 break; 2511 break;
2963 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
2964 process_csi_seq (); 2513 process_csi_seq ();
2965 break; 2514 break;
2966 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
2967 process_osc_seq (); 2516 process_osc_seq ();
2968 break; 2517 break;
2969#endif 2518#endif
2970 } 2519 }
2971} 2520}
… …
3061 scr_charset_set (2, (unsigned int)cmd_getc ()); 2610 scr_charset_set (2, (unsigned int)cmd_getc ());
3062 break; 2611 break;
3063 case '+': 2612 case '+':
3064 scr_charset_set (3, (unsigned int)cmd_getc ()); 2613 scr_charset_set (3, (unsigned int)cmd_getc ());
3065 break; 2614 break;
3066#if ENABLE_FRILLS 2615#if !ENABLE_MINIMAL
3067 case '6': 2616 case '6':
3068 scr_backindex (); 2617 scr_backindex ();
3069 break; 2618 break;
3070#endif 2619#endif
3071 case '7': 2620 case '7':
3072 scr_cursor (SAVE); 2621 scr_cursor (SAVE);
3073 break; 2622 break;
3074 case '8': 2623 case '8':
3075 scr_cursor (RESTORE); 2624 scr_cursor (RESTORE);
3076 break; 2625 break;
3077#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3078 case '9': 2627 case '9':
3079 scr_forwardindex (); 2628 scr_forwardindex ();
3080 break; 2629 break;
3081#endif 2630#endif
3082 case '=': 2631 case '=':
… …
3092 break; 2641 break;
3093 2642
3094 /* 8.3.87: NEXT LINE */ 2643 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 2644 case C1_NEL: /* ESC E */
3096 { 2645 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 2646 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 2648 }
3100 break; 2649 break;
3101 2650
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 2651 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 2652 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 2674 process_dcs_seq ();
3126 break; 2675 break;
3127 2676
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 2678 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 2680 break; /* steal obsolete ESC [ c */
3133 2681
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 2683 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 2684 process_csi_seq ();
… …
3198rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3199{ 2747{
3200 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3201 unsigned int nargs, p; 2749 unsigned int nargs, p;
3202 int n, ndef; 2750 int n, ndef;
3203 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3204 2752
3205 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3206 arg[--nargs] = 0;
3207 2754
3208 priv = 0; 2755 priv = 0;
3209 ch = cmd_getc (); 2756 ch = cmd_getc ();
3210 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3211 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3212 priv = ch; 2760 priv = ch;
3213 ch = cmd_getc (); 2761 ch = cmd_getc ();
3214 } 2762 }
3215 2763
3216 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3245 ndef = get_byte_array_bit (csi_defaults, i); 2793 ndef = get_byte_array_bit (csi_defaults, i);
3246 for (p = 0; p < nargs; p++) 2794 for (p = 0; p < nargs; p++)
3247 if (arg[p] == -1) 2795 if (arg[p] == -1)
3248 arg[p] = ndef; 2796 arg[p] = ndef;
3249 2797
3250#ifdef DEBUG_CMD
3251 fprintf (stderr, "CSI ");
3252 for (p = 0; p < nargs; p++)
3253 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3254 fprintf (stderr, "%c\n", ch);
3255#endif
3256
3257 /* 2798 /*
3258 * private mode handling 2799 * private mode handling
3259 */ 2800 */
3260 if (priv) 2801 if (priv)
3261 { 2802 {
3262 switch (priv) 2803 switch (priv)
3263 { 2804 {
3264 case '>': 2805 case '>':
3265 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3266 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2807 {
2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2810 //
2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2813 // versions.
2814 //
2815 tt_printf ("\033[>%d;95;0c", 'U');
2816 }
3267 break; 2817 break;
3268 case '?': 2818 case '?':
3269 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3270 process_terminal_mode (ch, priv, nargs, arg); 2820 process_terminal_mode (ch, priv, nargs, arg);
3271 break; 2821 break;
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2930 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2931 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 2932 break;
3383 2933
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2934 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 2935 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 2936 break;
3388 2937
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2938 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 2939 process_sgr_mode (nargs, arg);
3391 break; 2940 break;
… …
3398 break; 2947 break;
3399 case 6: /* CPR requested */ 2948 case 6: /* CPR requested */
3400 scr_report_position (); 2949 scr_report_position ();
3401 break; 2950 break;
3402 case 7: /* unofficial extension */ 2951 case 7: /* unofficial extension */
3403 if (OPTION (Opt_insecure)) 2952 if (option (Opt_insecure))
3404 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2953 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3405 break; 2954 break;
3406 case 8: /* unofficial extension */ 2955 case 8: /* unofficial extension */
3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2956 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3408 break; 2957 break;
… …
3475 break; 3024 break;
3476 case CSI_75: 3025 case CSI_75:
3477 scr_cursor (RESTORE); 3026 scr_cursor (RESTORE);
3478 break; 3027 break;
3479 3028
3480#if ENABLE_FRILLS 3029#if !ENABLE_MINIMAL
3481 case CSI_74: 3030 case CSI_74:
3482 process_window_ops (arg, nargs); 3031 process_window_ops (arg, nargs);
3483 break; 3032 break;
3484#endif 3033#endif
3485 3034
… …
3492 break; 3041 break;
3493 } 3042 }
3494} 3043}
3495/*}}} */ 3044/*}}} */
3496 3045
3497#if ENABLE_FRILLS 3046#if !ENABLE_MINIMAL
3498/* ARGSUSED */ 3047/* ARGSUSED */
3499void 3048void
3500rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3049rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3501{ 3050{
3502 int x, y; 3051 int x, y;
3503 XWindowAttributes wattr; 3052 XWindowAttributes wattr;
3504 Window wdummy; 3053 Window wdummy;
3505 dDisp; 3054
3055 dLocal (Display *, dpy);
3506 3056
3507 if (nargs == 0) 3057 if (nargs == 0)
3508 return; 3058 return;
3509 3059
3510 switch (args[0]) 3060 switch (args[0])
3511 { 3061 {
3512 /* 3062 /*
3513 * commands 3063 * commands
3514 */ 3064 */
3515 case 1: /* deiconify window */ 3065 case 1: /* deiconify window */
3516 XMapWindow (disp, parent[0]); 3066 XMapWindow (dpy, parent[0]);
3517 break; 3067 break;
3518 case 2: /* iconify window */ 3068 case 2: /* iconify window */
3519 XIconifyWindow (disp, parent[0], display->screen); 3069 XIconifyWindow (dpy, parent[0], display->screen);
3520 break; 3070 break;
3521 case 3: /* set position (pixels) */ 3071 case 3: /* set position (pixels) */
3522 XMoveWindow (disp, parent[0], args[1], args[2]); 3072 XMoveWindow (dpy, parent[0], args[1], args[2]);
3523 break; 3073 break;
3524 case 4: /* set size (pixels) */ 3074 case 4: /* set size (pixels) */
3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3526 break; 3076 break;
3527 case 5: /* raise window */ 3077 case 5: /* raise window */
3528 XRaiseWindow (disp, parent[0]); 3078 XRaiseWindow (dpy, parent[0]);
3529 break; 3079 break;
3530 case 6: /* lower window */ 3080 case 6: /* lower window */
3531 XLowerWindow (disp, parent[0]); 3081 XLowerWindow (dpy, parent[0]);
3532 break; 3082 break;
3533 case 7: /* refresh window */ 3083 case 7: /* refresh window */
3534 scr_touch (true); 3084 scr_touch (true);
3535 break; 3085 break;
3536 case 8: /* set size (chars) */ 3086 case 8: /* set size (chars) */
… …
3543 if (args[0] >= 24) /* set height (chars) */ 3093 if (args[0] >= 24) /* set height (chars) */
3544 set_widthheight ((unsigned int)width, 3094 set_widthheight ((unsigned int)width,
3545 (unsigned int) (args[1] * fheight)); 3095 (unsigned int) (args[1] * fheight));
3546 break; 3096 break;
3547 3097
3548
3549 /* 3098 /*
3550 * reports - some output format copied from XTerm 3099 * reports - some output format copied from XTerm
3551 */ 3100 */
3552 case 11: /* report window state */ 3101 case 11: /* report window state */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3555 break; 3104 break;
3556 case 13: /* report window position */ 3105 case 13: /* report window position */
3557 XGetWindowAttributes (disp, parent[0], &wattr); 3106 XGetWindowAttributes (dpy, parent[0], &wattr);
3558 XTranslateCoordinates (disp, parent[0], wattr.root, 3107 XTranslateCoordinates (dpy, parent[0], wattr.root,
3559 -wattr.border_width, -wattr.border_width, 3108 -wattr.border_width, -wattr.border_width,
3560 &x, &y, &wdummy); 3109 &x, &y, &wdummy);
3561 tt_printf ("\033[3;%d;%dt", x, y); 3110 tt_printf ("\033[3;%d;%dt", x, y);
3562 break; 3111 break;
3563 case 14: /* report window size (pixels) */ 3112 case 14: /* report window size (pixels) */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3566 break; 3115 break;
3567 case 18: /* report text area size (chars) */ 3116 case 18: /* report text area size (chars) */
3568 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3569 break; 3118 break;
… …
3571 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3572 break; 3121 break;
3573 case 20: /* report icon label */ 3122 case 20: /* report icon label */
3574 { 3123 {
3575 char *s; 3124 char *s;
3576 XGetIconName (disp, parent[0], &s); 3125 XGetIconName (dpy, parent[0], &s);
3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3578 XFree (s); 3127 XFree (s);
3579 } 3128 }
3580 break; 3129 break;
3581 case 21: /* report window title */ 3130 case 21: /* report window title */
3582 { 3131 {
3583 char *s; 3132 char *s;
3584 XFetchName (disp, parent[0], &s); 3133 XFetchName (dpy, parent[0], &s);
3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3586 XFree (s); 3135 XFree (s);
3587 } 3136 }
3588 break; 3137 break;
3589 } 3138 }
3590} 3139}
… …
3593/*----------------------------------------------------------------------*/ 3142/*----------------------------------------------------------------------*/
3594/* 3143/*
3595 * get input up until STRING TERMINATOR (or BEL) 3144 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3145 * ends_how is terminator used. returned input must be free()'d
3597 */ 3146 */
3598unsigned char * 3147char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3148rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3149{
3601 unicode_t ch; 3150 unicode_t ch;
3602 bool seen_esc = false; 3151 bool seen_esc = false;
3603 unsigned int n = 0; 3152 unsigned int n = 0;
… …
3617 seen_esc = true; 3166 seen_esc = true;
3618 continue; 3167 continue;
3619 } 3168 }
3620 else if (ch == C0_BEL || ch == CHAR_ST) 3169 else if (ch == C0_BEL || ch == CHAR_ST)
3621 break; 3170 break;
3171 else if (ch == C0_SYN)
3172 ch = cmd_get8 ();
3622 else if (ch < 0x20) 3173 else if (ch < 0x20)
3623 return NULL; /* other control character - exit */ 3174 return NULL; /* other control character - exit */
3624 3175
3625 seen_esc = false; 3176 seen_esc = false;
3626 3177
3627 if (n >= STRING_MAX - 1) 3178 if (n >= STRING_MAX - 1)
3628 // stop at some sane length 3179 // stop at some sane length
3629 return NULL; 3180 return NULL;
3630 3181
3631 if (ch == C0_SYN)
3632 string[n++] = cmd_get8 ();
3633 else
3634 string[n++] = ch; 3182 string[n++] = ch;
3635 } 3183 }
3636 3184
3637 string[n++] = '\0'; 3185 string[n++] = '\0';
3638 3186
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3187 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3188
3641 return (unsigned char *)rxvt_wcstombs (string); 3189 return rxvt_wcstombs (string);
3642} 3190}
3643 3191
3644/*----------------------------------------------------------------------*/ 3192/*----------------------------------------------------------------------*/
3645/* 3193/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3194 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3195 */
3648void 3196void
3649rxvt_term::process_dcs_seq () 3197rxvt_term::process_dcs_seq ()
3650{ 3198{
3651 unsigned char *s; 3199 char *s;
3652 unicode_t eh; 3200 unicode_t eh;
3653 3201
3654 /* 3202 /*
3655 * Not handled yet 3203 * Not handled yet
3656 */ 3204 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3223 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3224 arg = arg * 10 + (ch - '0');
3677 3225
3678 if (ch == ';') 3226 if (ch == ';')
3679 { 3227 {
3680 unsigned char *s = get_to_st (eh); 3228 char *s = get_to_st (eh);
3681 3229
3682 if (s) 3230 if (s)
3683 { 3231 {
3684 process_xterm_seq (arg, (char *)s, eh); 3232 process_xterm_seq (arg, s, eh);
3685 free (s); 3233 free (s);
3686 } 3234 }
3687 } 3235 }
3688} 3236}
3689 3237
3690void 3238void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3239rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3240{
3693 if (str[0] == '?' && !str[1]) 3241 if (str[0] == '?' && !str[1])
3694 { 3242 {
3695 unsigned short r, g, b; 3243 rgba c;
3696 pix_colors_focused[color].get (display, r, g, b); 3244 pix_colors_focused[color].get (c);
3245
3246#if XFT
3247 if (c.a != rgba::MAX_CC)
3248 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3249 else
3250#endif
3697 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3251 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3698 } 3252 }
3699 else 3253 else
3700 set_window_color (color, str); 3254 set_window_color (color, str);
3701} 3255}
3702 3256
3703/* 3257/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3258 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3259 */
3706void 3260void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3261rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3262{
3709 int changed = 0;
3710 int color; 3263 int color;
3711 char *buf, *name; 3264 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3265 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3266 int saveop = op;
3714 dDisp; 3267
3268 dLocal (Display *, dpy);
3715 3269
3716 assert (str != NULL); 3270 assert (str != NULL);
3271
3272 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3273 return;
3274
3717 switch (op) 3275 switch (op)
3718 { 3276 {
3719 case XTerm_name: 3277 case XTerm_name:
3720 set_title (str); 3278 set_title (str);
3721 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
… …
3735 unsigned long bytes_after; 3293 unsigned long bytes_after;
3736 unsigned char *value = 0; 3294 unsigned char *value = 0;
3737 const char *str = ""; 3295 const char *str = "";
3738 3296
3739 if (prop 3297 if (prop
3740 && XGetWindowProperty (disp, parent[0], 3298 && XGetWindowProperty (dpy, parent[0],
3741 prop, 0, 1<<16, 0, AnyPropertyType, 3299 prop, 0, 1<<16, 0, AnyPropertyType,
3742 &actual_type, &actual_format, 3300 &actual_type, &actual_format,
3743 &nitems, &bytes_after, &value) == Success 3301 &nitems, &bytes_after, &value) == Success
3744 && actual_type != None 3302 && actual_type != None
3745 && actual_format == 8) 3303 && actual_format == 8)
3746 str = (const char *)(value); 3304 str = (const char *)(value);
3747 3305
3748 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3306 tt_printf ("\033]%d;%s%c", op, str, resp);
3749 3307
3750 XFree (value); 3308 XFree (value);
3751 } 3309 }
3752 else 3310 else
3753 { 3311 {
… …
3757 { 3315 {
3758 *eq = 0; 3316 *eq = 0;
3759 set_utf8_property (display->atom (str), eq + 1); 3317 set_utf8_property (display->atom (str), eq + 1);
3760 } 3318 }
3761 else 3319 else
3762 XDeleteProperty (disp, parent[0], 3320 XDeleteProperty (dpy, parent[0],
3763 display->atom (str)); 3321 display->atom (str));
3764 } 3322 }
3765 break; 3323 break;
3766 3324
3767 case XTerm_Color: 3325 case XTerm_Color:
… …
3769 { 3327 {
3770 if ((name = strchr (buf, ';')) == NULL) 3328 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3329 break;
3772 3330
3773 *name++ = '\0'; 3331 *name++ = '\0';
3774 color = atoi (buf); 3332 color = atoi (buf) + minCOLOR;
3775 3333
3776 if (color < 0 || color >= TOTAL_COLORS) 3334 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3335 break;
3778 3336
3779 if ((buf = strchr (name, ';')) != NULL) 3337 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3338 *buf++ = '\0';
3781 3339
3782 if (name[0] == '?' && !name[1]) 3340 process_color_seq (op, color, name, resp);
3783 {
3784 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 }
3788 else
3789 set_window_color (color + minCOLOR, name);
3790 } 3341 }
3791 break; 3342 break;
3792 case XTerm_Color00: 3343 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3344 process_color_seq (op, Color_fg, str, resp);
3794 break; 3345 break;
3795 case XTerm_Color01: 3346 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3347 process_color_seq (op, Color_bg, str, resp);
3797 break; 3348 break;
3798#ifndef NO_CURSORCOLOR 3349#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3350 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3351 process_color_seq (op, Color_cursor, str, resp);
3801 break; 3352 break;
3802#endif 3353#endif
3803 case XTerm_Color_pointer_fg: 3354 case XTerm_Color_pointer_fg:
3804 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3355 process_color_seq (op, Color_pointer_fg, str, resp);
3805 break; 3356 break;
3806 case XTerm_Color_pointer_bg: 3357 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3358 process_color_seq (op, Color_pointer_bg, str, resp);
3808 break; 3359 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3360#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3361 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3362 process_color_seq (op, Color_RV, str, resp);
3363 break;
3364 case Rxvt_Color_BD:
3365 case URxvt_Color_BD:
3366 process_color_seq (op, Color_BD, str, resp);
3367 break;
3368 case Rxvt_Color_UL:
3369 case URxvt_Color_UL:
3370 process_color_seq (op, Color_UL, str, resp);
3818 break; 3371 break;
3819 case URxvt_Color_IT: 3372 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3373 process_color_seq (op, Color_IT, str, resp);
3821 break; 3374 break;
3822#endif 3375#endif
3823#if TRANSPARENT && TINTING 3376#if ENABLE_TRANSPARENCY
3824 case URxvt_Color_tint: 3377 case URxvt_Color_tint:
3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3378 process_color_seq (op, Color_tint, str, resp);
3826 check_our_parents (); 3379 {
3827 if (am_transparent) 3380 bool changed = false;
3828 want_full_refresh = want_refresh = 1; 3381 if (ISSET_PIXCOLOR (Color_tint))
3829 break; 3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3830#endif 3383 else
3384 changed = bgPixmap.unset_tint ();
3385 if (changed)
3386 update_background ();
3387 }
3831 3388
3389 break;
3390#endif
3391
3392#if BG_IMAGE_FROM_FILE
3832 case XTerm_Pixmap: 3393 case Rxvt_Pixmap:
3833 if (*str != ';') 3394 if (!strcmp (str, "?"))
3834 { 3395 {
3835#if XPM_BACKGROUND 3396 char str[256];
3836 scale_pixmap (""); /* reset to default scaling */ 3397
3837 set_bgPixmap (str); /* change pixmap */ 3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3838#endif 3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3839 scr_touch (true); 3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST);
3840 } 3402 }
3841 while ((str = strchr (str, ';')) != NULL) 3403 else
3842 { 3404 {
3405 int changed = 0;
3406
3407 if (*str != ';')
3408 {
3409 /* reset to default scaling :*/
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */
3412 changed++;
3413 str = strchr (str, ';');
3414 if (str == NULL)
3415 bgPixmap.set_defaultGeometry ();
3416 }
3417 while (str)
3418 {
3843 str++; 3419 str++;
3844#if XPM_BACKGROUND 3420 if (bgPixmap.set_geometry (str))
3845 changed += scale_pixmap (str); 3421 changed++;
3846#endif 3422 str = strchr (str, ';');
3423 }
3424 if (changed)
3425 update_background ();
3847 } 3426 }
3848
3849 if (changed)
3850 {
3851#ifdef XPM_BACKGROUND
3852 resize_pixmap ();
3853#endif
3854 scr_touch (true);
3855 }
3856 break; 3427 break;
3428#endif
3857 3429
3858 case XTerm_restoreFG: 3430 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3431 set_window_color (Color_fg, str);
3860 break; 3432 break;
3861 case XTerm_restoreBG: 3433 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3434 set_window_color (Color_bg, str);
3863 break; 3435 break;
3864 3436
3865 case XTerm_logfile: 3437 case XTerm_logfile:
3866 // TODO, when secure mode? 3438 // TODO, when secure mode?
3867 break; 3439 break;
3868 3440
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3441#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3442 case Rxvt_dumpscreen: /* no error notices */
3877 { 3443 {
3878 int fd; 3444 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3445 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3446 {
3881 scr_dump (fd); 3447 scr_dump (fd);
… …
3892 case URxvt_italicFont: 3458 case URxvt_italicFont:
3893 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3894#endif 3460#endif
3895 if (query) 3461 if (query)
3896 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3898 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3899 resp); 3465 resp);
3900 else 3466 else
3901 { 3467 {
3902 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3905 allocated.push_back ((void *)res); 3471 allocated.push_back ((void *)res);
3906 set_fonts (); 3472 set_fonts ();
3907 } 3473 }
3908 break; 3474 break;
3909 3475
3910#if ENABLE_FRILLS 3476 case URxvt_version:
3477 if (query)
3478 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3479 op,
3480 rs[Rs_name], VERSION[0], VERSION[2],
3481 resp);
3482 break;
3483
3484#if !ENABLE_MINIMAL
3911 case URxvt_locale: 3485 case URxvt_locale:
3912 if (query) 3486 if (query)
3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3914 else 3488 else
3915 { 3489 {
3916 set_locale (str); 3490 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3492 init_xlocale ();
3919 } 3493 }
3920 break; 3494 break;
3921 3495
3922 case URxvt_view_up: 3496 case URxvt_view_up:
3923 case URxvt_view_down: 3497 case URxvt_view_down:
3498 {
3924 int lines = atoi (str); 3499 int lines = atoi (str);
3925 3500
3926 if (lines) 3501 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3502 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3503 else
3929 {
3930 scr_erase_savelines (); 3504 scr_erase_savelines ();
3931 } 3505 }
3932 3506
3507 break;
3508#endif
3509
3510#if ENABLE_PERL
3511 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3513 ; // no responses yet
3933 break; 3514 break;
3934#endif 3515#endif
3935 } 3516 }
3936} 3517}
3937/*----------------------------------------------------------------------*/ 3518/*----------------------------------------------------------------------*/
… …
3968 return state; 3549 return state;
3969} 3550}
3970 3551
3971/* we're not using priv _yet_ */ 3552/* we're not using priv _yet_ */
3972void 3553void
3973rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3974{ 3555{
3975 unsigned int i, j; 3556 unsigned int i, j;
3976 int state; 3557 int state;
3977 3558
3978 static const struct 3559 static const struct
3979 { 3560 {
3980 const int argval; 3561 const int argval;
3981 const unsigned long bit; 3562 const unsigned long bit;
3982 }
3983
3984 argtopriv[] = { 3563 } argtopriv[] = {
3985 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
3986 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
3987 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
3988 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
3989 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 3569 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 3570 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 3571 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 3572 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 3573 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 3574 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 3575#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 3576 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 3577#endif
… …
4008 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4009#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4010 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4011#endif 3587#endif
4012 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4013 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4014 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4015 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4016 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4017 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4018 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4019 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4020 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
… …
4048 /* extra handling for values with state unkept */ 3623 /* extra handling for values with state unkept */
4049 switch (arg[i]) 3624 switch (arg[i])
4050 { 3625 {
4051#if ENABLE_STYLES 3626#if ENABLE_STYLES
4052 case 1021: 3627 case 1021:
4053 if (mode) 3628 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 3629
3630 scr_touch (true);
4055 else 3631 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 3632#endif
4058 case 1048: /* alternative cursor save */ 3633 case 1048: /* alternative cursor save */
4059 case 1049: 3634 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 3635 if (option (Opt_secondaryScreen))
4061 if (mode == 0) 3636 if (mode == 0)
4062 scr_cursor (RESTORE); 3637 scr_cursor (RESTORE);
4063 else if (mode == 1) 3638 else if (mode == 1)
4064 scr_cursor (SAVE); 3639 scr_cursor (SAVE);
4065 break; 3640 break;
… …
4080 case 3: /* 80/132 */ 3655 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 3656 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 3657 set_widthheight (((state ? 132 : 80) * fwidth), height);
4083 break; 3658 break;
4084 case 4: /* smooth scrolling */ 3659 case 4: /* smooth scrolling */
4085 if (!state) 3660 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 3661 break;
4090 case 5: /* reverse video */ 3662 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 3663 scr_rvideo_mode (state);
4092 break; 3664 break;
4093 case 6: /* relative/absolute origins */ 3665 case 6: /* relative/absolute origins */
… …
4097 scr_autowrap (state); 3669 scr_autowrap (state);
4098 break; 3670 break;
4099 /* case 8: - auto repeat, can't do on a per window basis */ 3671 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 3672 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 3673 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4103 break; 3675 break;
4104#ifdef menuBar_esc
4105 case menuBar_esc:
4106#ifdef MENUBAR
4107 map_menuBar (state);
4108#endif
4109 break;
4110#endif
4111#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
4112 case scrollBar_esc: 3677 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 3678 if (scrollbar_mapping (state))
4114 { 3679 {
4115 resize_all_windows (0, 0, 0); 3680 resize_all_windows (0, 0, 0);
… …
4127 break; 3692 break;
4128 /* case 66: - application key pad */ 3693 /* case 66: - application key pad */
4129 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
4130 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
4131 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
4132 priv_modes &= ~PrivMode_MouseX10; 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4133 break; 3698 break;
4134#if 0
4135 case 1001: 3699 case 1002:
4136 break; /* X11 mouse highlighting */ 3700 case 1003:
4137#endif 3701 if (state)
3702 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 }
3707 else
3708 vt_emask_mouse = NoEventMask;
3709 vt_select_input ();
3710 break;
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 3711 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 3712 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 3713 break;
4144 case 1011: /* scroll to bottom on key press */ 3714 case 1011: /* scroll to bottom on key press */
4145 if (state) 3715 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 3716 break;
4150 case 1047: /* secondary screen w/ clearing last */ 3717 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 3718 if (option (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 3719 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 3720 scr_erase_screen (2);
4154 scr_change_screen (state); 3721 scr_change_screen (state);
4155 break; 3722 break;
4156 case 1049: /* secondary screen w/ clearing first */ 3723 case 1049: /* secondary screen w/ clearing first */
4157 scr_change_screen (state); 3724 scr_change_screen (state);
4158 if (OPTION (Opt_secondaryScreen)) 3725 if (option (Opt_secondaryScreen))
4159 if (current_screen != PRIMARY) 3726 if (current_screen != PRIMARY)
4160 scr_erase_screen (2); 3727 scr_erase_screen (2);
4161 break; 3728 break;
4162 default: 3729 default:
4163 break; 3730 break;
… …
4291 scr_color (Color_bg, Color_bg); 3858 scr_color (Color_bg, Color_bg);
4292 break; 3859 break;
4293 3860
4294 //case 50: // not variable spacing 3861 //case 50: // not variable spacing
4295 3862
4296#ifndef NO_BRIGHTCOLOR 3863#if !ENABLE_MINIMAL
4297 case 90: 3864 case 90:
4298 case 91: /* set bright fg color */ 3865 case 91: /* set bright fg color */
4299 case 92: 3866 case 92:
4300 case 93: 3867 case 93:
4301 case 94: 3868 case 94:
… …
4325rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
4326{ 3893{
4327 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
4328 3895
4329 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
4330 { /* query graphics */ 3898 /* query graphics */
4331 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
4332 return; 3900 return;
4333 } 3901 }
4334 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
4335 do 3903 do
… …
4346 */ 3914 */
4347void 3915void
4348rxvt_term::tt_printf (const char *fmt,...) 3916rxvt_term::tt_printf (const char *fmt,...)
4349{ 3917{
4350 va_list arg_ptr; 3918 va_list arg_ptr;
4351 unsigned char buf[256]; 3919 char buf[256];
4352 3920
4353 va_start (arg_ptr, fmt); 3921 va_start (arg_ptr, fmt);
4354 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3922 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355 va_end (arg_ptr); 3923 va_end (arg_ptr);
4356 tt_write (buf, strlen (buf)); 3924 tt_write (buf, strlen (buf));
… …
4361 * or generated by us in response to a query ESC sequence. 3929 * or generated by us in response to a query ESC sequence.
4362 */ 3930 */
4363const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3931const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364 3932
4365void 3933void
4366rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3934rxvt_term::tt_write (const char *data, unsigned int len)
4367{ 3935{
3936 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3937 return;
3938
3939 if (pty->pty < 0)
3940 return;
3941
4368 if (v_buflen == 0) 3942 if (v_buflen == 0)
4369 { 3943 {
4370 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3944 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4371 3945
4372 if ((unsigned int)written == len) 3946 if ((unsigned int)written == len)
4373 return; 3947 return;
4374 3948
4375 data += written; 3949 data += written;
4376 len -= written; 3950 len -= written;
4377 } 3951 }
4378 3952
4379 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4380 3954
4381 memcpy (v_buffer + v_buflen, data, len); 3955 memcpy (v_buffer + v_buflen, data, len);
4382 v_buflen += len; 3956 v_buflen += len;
4383 3957
4384 pty_ev.set (EVENT_READ | EVENT_WRITE); 3958 pty_ev.set (ev::READ | ev::WRITE);
4385} 3959}
4386 3960
4387void rxvt_term::pty_write () 3961void rxvt_term::pty_write ()
4388{ 3962{
4389 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3963 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4390 3964
4391 if (written > 0) 3965 if (written > 0)
4392 { 3966 {
4393 v_buflen -= written; 3967 v_buflen -= written;
4394 3968
4395 if (v_buflen == 0) 3969 if (v_buflen == 0)
4396 { 3970 {
4397 free (v_buffer); 3971 free (v_buffer);
4398 v_buffer = 0; 3972 v_buffer = 0;
4399 v_buflen = 0;
4400 3973
4401 pty_ev.set (EVENT_READ); 3974 pty_ev.set (ev::READ);
4402 return; 3975 return;
4403 } 3976 }
4404 3977
4405 memmove (v_buffer, v_buffer + written, v_buflen); 3978 memmove (v_buffer, v_buffer + written, v_buflen);
4406 } 3979 }
4407 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3980 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4408 pty_ev.set (EVENT_READ); 3981 pty_ev.set (ev::READ);
4409} 3982}
4410 3983
4411/*----------------------- end-of-file (C source) -----------------------*/ 3984/*----------------------- end-of-file (C source) -----------------------*/
4412 3985

Diff Legend

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