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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

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

Diff Legend

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