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.236 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

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

Diff Legend

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