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.280 by root, Mon Jan 23 23:33:58 2006 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 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>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 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// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
273 } 279 }
274 280
275 iso14755buf = 0; 281 iso14755buf = 0;
276} 282}
277 283
278int 284static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
280{ 286{
281 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
284 { 290 {
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ 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
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
298void 392void
299rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
300{ 394{
301 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 396 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 397 int valid_keysym;
308 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
309 404
310 /* 405 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 406 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
313 * 408 *
… …
493# if ISO_14755 588# if ISO_14755
494 iso14755_51 (0); 589 iso14755_51 (0);
495# endif 590# endif
496 return; 591 return;
497 } 592 }
593 else if (keysym == XK_BackSpace)
594 {
595 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
596# if ISO_14755
597 iso14755_51 (iso14755buf & ISO_14755_MASK);
598# endif
599 return;
600 }
498 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
499 { 602 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 603 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 604 | hv | ISO_14755_51;
502# if ISO_14755 605# if ISO_14755
… …
504# endif 607# endif
505 return; 608 return;
506 } 609 }
507 else 610 else
508 { 611 {
509# if ENABLE_OVERLAY 612# if ISO_14755
510 scr_overlay_off (); 613 scr_overlay_off ();
511# endif 614# endif
512 iso14755buf = 0; 615 iso14755buf = 0;
513 } 616 }
514 } 617 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
518 { 621 {
519 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 623# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 626# endif
524 } 627 }
525#endif 628#endif
526 629
527#ifdef PRINTPIPE 630#ifdef PRINTPIPE
528 if (keysym == XK_Print) 631 if (keysym == XK_Print)
529 { 632 {
530 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
531 return; 634 return;
532 } 635 }
533#endif 636#endif
534 637
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 639 {
537 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 newlen = 1; 641 unsigned int newlen = 1;
539 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
540 { 644 {
541#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 646 case XK_BackSpace:
543 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
544 { 648 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
548 } 652 }
549 else 653 else
550 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 655 break;
552#endif 656#endif
553#ifndef NO_DELETE_KEY 657#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete: 658 case XK_Delete:
565 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 660 break;
567#endif 661#endif
568 case XK_Tab: 662 case XK_Tab:
569 if (shft) 663 if (shft)
570 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
580#endif 674#endif
581 newlen = 0; 675 newlen = 0;
582 } 676 }
583 break; 677 break;
584 678
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */ 679 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
614 } 692 }
615 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
617 break; 695 break;
618 696
619#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior:
631 strcpy (kbuf, "\033[5~");
632 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter: 697 case XK_KP_Enter:
648 /* allow shift to override */ 698 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
650 { 700 {
651 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
652 break; 702 break;
653 } 703 }
654 704
… …
666 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
667 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
668 } 718 }
669 break; 719 break;
670 720
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */ 721 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 745 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
703 { 747 {
704 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 750 }
707 else 751 else
… …
709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
710 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
711 } 755 }
712 break; 756 break;
713 757
714 case XK_Find:
715 strcpy (kbuf, "\033[1~");
716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert:
729 strcpy (kbuf, "\033[2~");
730 break;
731#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove:
733 /* FALLTHROUGH */
734#endif
735 case XK_Execute:
736 strcpy (kbuf, "\033[3~");
737 break;
738 case XK_Select:
739 strcpy (kbuf, "\033[4~");
740 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End: 758 case XK_End:
752 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
753 break; 760 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home: 761 case XK_Home:
765 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
766 break; 763 break;
767 764
768#define FKEY(n, fkey) \
769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
770
771 case XK_F1: /* "\033[11~" */
772 case XK_F2: /* "\033[12~" */
773 case XK_F3: /* "\033[13~" */
774 case XK_F4: /* "\033[14~" */
775 case XK_F5: /* "\033[15~" */
776 FKEY (11, XK_F1);
777 break;
778 case XK_F6: /* "\033[17~" */
779 case XK_F7: /* "\033[18~" */
780 case XK_F8: /* "\033[19~" */
781 case XK_F9: /* "\033[20~" */
782 case XK_F10: /* "\033[21~" */
783 FKEY (17, XK_F6);
784 break;
785 case XK_F11: /* "\033[23~" */
786 case XK_F12: /* "\033[24~" */
787 case XK_F13: /* "\033[25~" */
788 case XK_F14: /* "\033[26~" */
789 FKEY (23, XK_F11);
790 break;
791 case XK_F15: /* "\033[28~" */
792 case XK_F16: /* "\033[29~" */
793 FKEY (28, XK_F15);
794 break;
795 case XK_Help: /* "\033[28~" */
796 FKEY (28, XK_Help);
797 break;
798 case XK_Menu: /* "\033[29~" */
799 FKEY (29, XK_Menu);
800 break;
801 case XK_F17: /* "\033[31~" */
802 case XK_F18: /* "\033[32~" */
803 case XK_F19: /* "\033[33~" */
804 case XK_F20: /* "\033[34~" */
805 case XK_F21: /* "\033[35~" */
806 case XK_F22: /* "\033[36~" */
807 case XK_F23: /* "\033[37~" */
808 case XK_F24: /* "\033[38~" */
809 case XK_F25: /* "\033[39~" */
810 case XK_F26: /* "\033[40~" */
811 case XK_F27: /* "\033[41~" */
812 case XK_F28: /* "\033[42~" */
813 case XK_F29: /* "\033[43~" */
814 case XK_F30: /* "\033[44~" */
815 case XK_F31: /* "\033[45~" */
816 case XK_F32: /* "\033[46~" */
817 case XK_F33: /* "\033[47~" */
818 case XK_F34: /* "\033[48~" */
819 case XK_F35: /* "\033[49~" */
820 FKEY (31, XK_F17);
821 break;
822#undef FKEY
823 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
824 newlen = 0; 771 newlen = 0;
772 }
825 break; 773 break;
826 } 774 }
827 775
828 if (newlen) 776 if (newlen)
829 len = strlen (kbuf); 777 len = strlen (kbuf);
830 }
831 778
832 /* 779 /*
833 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
834 */ 781 */
835#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
870 return; 817 return;
871 818
872 if (len <= 0) 819 if (len <= 0)
873 return; /* not mapped */ 820 return; /* not mapped */
874 821
875 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 823 if (view_start)
877 { 824 {
878 view_start = 0; 825 view_start = 0;
879 want_refresh = 1; 826 want_refresh = 1;
880 } 827 }
… …
902 { 849 {
903 const char ch = C0_ESC; 850 const char ch = C0_ESC;
904 tt_write (&ch, 1); 851 tt_write (&ch, 1);
905 } 852 }
906 853
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
918} 855}
919/*}}} */ 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
920 933
921#if defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
922unsigned int 935unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 937{
… …
954void 967void
955rxvt_term::flush () 968rxvt_term::flush ()
956{ 969{
957 flush_ev.stop (); 970 flush_ev.stop ();
958 971
959#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
961 { 974 {
962 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 976 scr_touch (false);
965 } 977 }
966#endif 978#endif
967 979
968 if (want_refresh) 980 if (want_refresh)
… …
1013 } 1025 }
1014 1026
1015 display->flush (); 1027 display->flush ();
1016} 1028}
1017 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1018void 1031void
1019rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1033{
1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1038}
1039
1040void
1041rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1042{
1021 make_current (); 1043 make_current ();
1022 1044
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1045 refresh_count = 0;
1036 flush (); 1046 flush ();
1037} 1047}
1038 1048
1039#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1040void 1050void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1052{
1043 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1054 want_refresh = 1;
1045 1055 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1056}
1048#endif 1057#endif
1049 1058
1050#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1051void 1060void
1052rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1062{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1064 {
1056 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1057 want_refresh = 1; 1066 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1059 } 1068 }
1069 else
1070 w.stop ();
1060} 1071}
1061#endif 1072#endif
1062 1073
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1075void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1077{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1080 {
1070 want_refresh = 1; 1081 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1072 } 1083 }
1084 else
1085 w.stop ();
1073} 1086}
1074#endif 1087#endif
1075 1088
1076#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1077void 1090void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1092{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1094 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1096 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1085 } 1098 }
1099 else
1100 w.stop ();
1086} 1101}
1087#endif 1102#endif
1088 1103
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1105void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1107{
1093 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1109 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1110 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1103} 1119}
1104#endif 1120#endif
1105 1121
1106#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1107static struct event_handler 1123static struct event_handler
1108{ 1124{
1109 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1110 1126
1111 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1112 { 1128 {
1113 sched_yield (); 1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1133
1134 struct timespec ts = { 0, 0 };
1135 nanosleep (&ts, 0);
1136
1114 w.stop (); 1137 w.stop ();
1115 } 1138 }
1116 1139
1117 event_handler () 1140 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1141 : yield_ev (this, &event_handler::yield_cb)
1119 { 1142 {
1120 } 1143 }
1121} event_handler; 1144} event_handler;
1122#endif 1145#endif
1123 1146
… …
1143 cmdbuf_endp += r; 1166 cmdbuf_endp += r;
1144 return true; 1167 return true;
1145 } 1168 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1170 {
1148#if HAVE_SCHED_YIELD 1171#if LINUX_YIELD_HACK
1149 if (display->is_local) 1172 if (display->is_local)
1150 event_handler.cw_yield.start (); 1173 event_handler.yield_ev.start ();
1151#endif 1174#endif
1152 } 1175 }
1153 else 1176 else
1154 { 1177 {
1155 pty_ev.stop (); 1178 pty_ev.stop ();
1156 1179
1157 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1158 destroy (); 1181 destroy ();
1159 } 1182 }
1160 1183
1161 return false; 1184 return false;
1162} 1185}
1163 1186
1164void 1187void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1189{
1167 make_current (); 1190 make_current ();
1168 1191
1169 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1194 while (pty_fill ())
1172 if (cmd_parse ()) 1195 if (cmd_parse ())
1173 break; 1196 break;
1174 1197
1175 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1176 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1177} 1202}
1178 1203
1179void 1204void
1180rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1181{ 1206{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1208 recolour_cursor ();
1184 1209
1185#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1211 hidden_pointer = 0;
1187 1212
1188 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1190#endif 1215#endif
1191} 1216}
1192 1217
1193#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1194void 1219void
1195rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1196{ 1221{
1197 if (!OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1198 return; 1223 return;
1199 1224
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1226 XFlush (dpy);
1202 1227
1203 hidden_pointer = 1; 1228 hidden_pointer = 1;
1204} 1229}
1205 1230
1206void 1231void
1207rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1233{
1209 make_current (); 1234 make_current ();
1210 1235
1211 pointer_blank (); 1236 pointer_blank ();
1212} 1237}
… …
1215void 1240void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1242{
1218 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1219 int x, y; 1244 int x, y;
1245 int code = 32;
1220 1246
1221 x = ev.x; 1247 x = Pixel2Col (ev.x);
1222 y = ev.y; 1248 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1249 if (ev.type == MotionNotify)
1250 {
1251 if (x == mouse_row && y == mouse_col)
1252 return;
1253 mouse_row = x;
1254 mouse_col = y;
1255 code += 32;
1256 }
1224 1257
1225 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1226 button_number = 3; 1259 button_number = 3;
1227 else 1260 else
1228 { 1261 {
… …
1274 x + 1, 1307 x + 1,
1275 y + 1); 1308 y + 1);
1276#endif 1309#endif
1277 1310
1278 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1280 (32 + x + 1), 1313 (32 + x + 1),
1281 (32 + y + 1)); 1314 (32 + y + 1));
1282} 1315}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1316
1294/*{{{ process an X event */ 1317/*{{{ process an X event */
1295void 1318void
1296rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1297{ 1320{
1298 make_current (); 1321 make_current ();
1299 1322
1300 dDisp; 1323 dLocal (Display *, dpy);
1301 1324
1302 if (ev.xany.window == vt 1325 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1328 return;
… …
1310 unsigned int unused_mask; 1333 unsigned int unused_mask;
1311 1334
1312 switch (ev.type) 1335 switch (ev.type)
1313 { 1336 {
1314 case KeyPress: 1337 case KeyPress:
1315#if ISO_14755 1338 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1339 break;
1321 1340
1322 case KeyRelease: 1341 case KeyRelease:
1323 { 1342 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1343 break;
1395 }
1396 1344
1397 case ButtonPress: 1345 case ButtonPress:
1398 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1399 break; 1347 break;
1400 1348
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1364 destroy ();
1417 } 1365 }
1418#if ENABLE_EWMH 1366#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1370 &ev);
1423#endif 1371#endif
1424 } 1372 }
1425 } 1373 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1380 focus_out ();
1433 } 1381 }
1434#endif 1382#endif
1435 } 1383 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1384 break;
1441 1385
1442 /* 1386 /*
1443 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1463 break; 1407 break;
1464 } 1408 }
1465 break; 1409 break;
1466 1410
1467 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1415 focus_in ();
1469 break; 1416 break;
1470 1417
1471 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1422 focus_out ();
1473 break; 1423 break;
1474 1424
1475 case ConfigureNotify: 1425 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1477 { 1430 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1432 ;
1480 1433
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1435 {
1483 seen_resize = 1; 1436 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1438 }
1439 else
1440 {
1441#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif
1450 }
1486 1451
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1453 }
1494 break; 1454 break;
1495 1455
1496 case PropertyNotify: 1456 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1513 case SelectionRequest: 1473 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1515 break; 1475 break;
1516 1476
1517 case MapNotify: 1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1518 mapped = 1; 1494 mapped = 1;
1519#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1521#endif 1497#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1499 break;
1524 1500
1525 case UnmapNotify: 1501 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1529#endif 1505#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1507 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1508
1539 case GraphicsExpose: 1509 case GraphicsExpose:
1540 case Expose: 1510 case Expose:
1541 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1542 { 1512 {
1543 do 1513 do
1514 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1519
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1521
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1553 1527
1554 want_refresh = 1; 1528 want_refresh = 1;
1555 } 1529 }
1556 else 1530 else
1557 { 1531 {
1558 XEvent unused_event; 1532 XEvent unused_event;
1559 1533
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1535 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1537 ;
1564 1538
1565 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1540 {
1567 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1542 scrollbar_show (0);
1569 } 1543 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1544 }
1576 break; 1545 break;
1577 1546
1578 case MotionNotify: 1547 case MotionNotify:
1579#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1549 if (hidden_pointer)
1581 pointer_unblank (); 1550 pointer_unblank ();
1582#endif 1551#endif
1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1553 || priv_modes & PrivMode_MouseAnyEvent)
1554 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1556 break;
1585 1557
1586 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1587 { 1559 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1562 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1564 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1566 ;
1595 1567
1596 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1572 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1593 int dist;
1622 1594
1623 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1625 */ 1597 */
1626 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1600
1629 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1631 */ 1603 */
1632 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1654 else 1626 else
1655 { 1627 {
1656 /* we are within the text window, so we 1628 /* we are within the text window, so we
1657 * shouldn't be scrolling 1629 * shouldn't be scrolling
1658 */ 1630 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1661 } 1632 }
1662#endif 1633#endif
1663#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1664 } 1635 }
1665#endif 1636#endif
1666 } 1637 }
1667 } 1638 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1640 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1672 ; 1643 ;
1673 1644
1674 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1649 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1651 scrollbar_size ());
1681 want_refresh = 1; 1652 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1653 scrollbar_show (1);
1684 } 1654 }
1685 break; 1655 break;
1686 } 1656 }
1687 1657
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1658#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1660 {
1693 if (hidden_cursor) 1661 if (hidden_cursor)
1694 { 1662 {
1695 hidden_cursor = 0; 1663 hidden_cursor = 0;
1696 want_refresh = 1; 1664 want_refresh = 1;
1697 } 1665 }
1698 1666
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1667 cursor_blink_ev.again ();
1700 } 1668 }
1701#endif 1669#endif
1702 1670
1703#if defined(POINTER_BLANK) 1671#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1673 {
1706 if (ev.type == MotionNotify 1674 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1675 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1676 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1677 if (hidden_pointer)
… …
1711 1679
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1681 pointer_blank ();
1714 } 1682 }
1715#endif 1683#endif
1684
1685 refresh_check ();
1716} 1686}
1717 1687
1718void 1688void
1719rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1720{ 1690{
1721 if (!focus) 1691 if (!focus)
1722 { 1692 {
1723 focus = 1; 1693 focus = 1;
1724 want_refresh = 1; 1694 want_refresh = 1;
1725 1695
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1697
1728#if USE_XIM 1698#if USE_XIM
1729 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1730 { 1700 {
1731 IMSetStatusPosition (); 1701 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1733 } 1703 }
1734#endif 1704#endif
1735#if CURSOR_BLINK 1705#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1738#endif 1708#endif
1739#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1741 { 1711 {
1742 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1713 scr_recolour ();
1744 } 1714 }
1745#endif 1715#endif
1716#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell))
1718 {
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif
1746 } 1726 }
1747} 1727}
1748 1728
1749void 1729void
1750rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1758 1738
1759#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1740 if (iso14755buf)
1761 { 1741 {
1762 iso14755buf = 0; 1742 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1743# if ISO_14755
1764 scr_overlay_off (); 1744 scr_overlay_off ();
1765# endif 1745# endif
1766 } 1746 }
1767#endif 1747#endif
1768#if USE_XIM 1748#if USE_XIM
1769 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1771#endif 1751#endif
1772#if CURSOR_BLINK 1752#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1775 hidden_cursor = 0; 1756 hidden_cursor = 0;
1776#endif 1757#endif
1777#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1779 { 1760 {
… …
1782 } 1763 }
1783#endif 1764#endif
1784 } 1765 }
1785} 1766}
1786 1767
1787#if TRANSPARENT 1768void
1769rxvt_term::update_fade_color (unsigned int idx)
1770{
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 rgba c;
1775 pix_colors [Color_fade].get (c);
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 }
1778#endif
1779}
1780
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1782void
1789rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1784{
1791 make_current (); 1785 make_current ();
1792 1786
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return;
1790
1791# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1792 switch (ev.type)
1794 { 1793 {
1795 case PropertyNotify: 1794 case PropertyNotify:
1796 /* 1795 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1796 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1797 * use the property to determine the pixmap. We use it later on.
1799 */ 1798 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1803 1805
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1806 break;
1809 } 1807 }
1808# endif
1809
1810 refresh_check ();
1810} 1811}
1811#endif 1812#endif
1812 1813
1813void 1814void
1814rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1869 mouse_report (ev); 1870 mouse_report (ev);
1870 } 1871 }
1871#else 1872#else
1872 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1873 mouse_report (ev); 1874 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 1876
1876 } 1877 }
1877 else 1878 else
1878 { 1879 {
1879 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1927 } 1928 }
1928 1929
1929 /* 1930 /*
1930 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1931 */ 1932 */
1932 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1933 { 1934 {
1934 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1935 /* 1943 /*
1936 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1937 * move up if mouse is above slider 1945 * move up if mouse is above slider
1938 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1939 * 1947 *
… …
1948 /* 1956 /*
1949 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1950 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1951 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1952 */ 1960 */
1953 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1954 && scrollbarnext_upButton (ev.y))
1955 || (scrollBar.style == R_SB_RXVT
1956 && scrollbarrxvt_upButton (ev.y)))
1957 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1958 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1959 && scrollbarnext_dnButton (ev.y))
1960 || (scrollBar.style == R_SB_RXVT
1961 && scrollbarrxvt_dnButton (ev.y)))
1962 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1963 else 1965 else
1964 switch (ev.button) 1966 switch (ev.button)
1965 { 1967 {
1966 case Button2: 1968 case Button2:
… …
1973 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1974 break; 1976 break;
1975 } 1977 }
1976 } 1978 }
1977 else 1979 else
1978#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1979
1980 {
1981 char upordown = 0;
1982
1983 if (scrollBar.style == R_SB_NEXT)
1984 { 1981 {
1985 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1986 upordown = -1; /* up */
1987 else if (scrollbarnext_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 else if (scrollBar.style == R_SB_RXVT)
1991 {
1992 if (scrollbarrxvt_upButton (ev.y))
1993 upordown = -1; /* up */
1994 else if (scrollbarrxvt_dnButton (ev.y))
1995 upordown = 1; /* down */
1996 }
1997 if (upordown)
1998 { 1983 {
1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
2000 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 1987#endif
2002 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
2003 { 1989 {
2004 if (upordown < 0) 1990 if (direction == UP)
2005 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
2006 else 1992 else
2007 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
2008 } 1994 }
2009 } 1995 }
2010 else 1996 else
2011 switch (ev.button) 1997 switch (ev.button)
2012 { 1998 {
2013 case Button2: 1999 case Button2:
2014 switch (scrollbar_align) 2000 switch (scrollBar.align)
2015 { 2001 {
2016 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2017 csrO = 0; 2003 csrO = 0;
2018 break; 2004 break;
2019 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2027 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2031 2017
2032 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2033 break; 2019 break;
2034 2020
2035 case Button1: 2021 case Button1:
2036 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2039 2025
2040 case Button3: 2026 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2051 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2052# else 2038# else
2053 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2054# endif 2040# endif
2055 else 2041 else
2056 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2057 } 2043 }
2058 else 2044 else
2059 { 2045 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2047 (nrow
… …
2078 2064
2079 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2066 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2068
2083 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2070 {
2085 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2072 scrollbar_show (0);
2087 } 2073 }
2088 2074
2089#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2090 if (sel_scroll_ev.active)
2091 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2092#endif 2077#endif
2093 2078
2094 if (ev.window == vt) 2079 if (ev.window == vt)
2095 { 2080 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2120 mouse_report (ev); 2105 mouse_report (ev);
2121 } 2106 }
2122#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2123 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2124 mouse_report (ev); 2109 mouse_report (ev);
2125#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2126 return; 2111 return;
2127 } 2112 }
2128 2113
2129 /* 2114 /*
2130 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2142 selection_make (ev.time); 2127 selection_make (ev.time);
2143 break; 2128 break;
2144 2129
2145 case Button2: 2130 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2133 break;
2149 2134
2150#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2151 case Button4: 2136 case Button4:
2152 case Button5: 2137 case Button5:
… …
2156 2141
2157 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2158 2143
2159 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2160 i = 1; 2145 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2147 i = nrow - 1;
2163 else 2148 else
2164 i = 5; 2149 i = 5;
2165 2150
2166# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2168 { 2153 {
2169 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2172 2157
2173 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2175
2176 slip_wheel_ev.start ();
2177 } 2160 }
2178 else 2161 else
2162# endif
2179 { 2163 {
2180# endif
2181 scr_page (v, i); 2164 scr_page (v, i);
2182 scrollbar_show (1); 2165 scrollbar_show (1);
2183# ifdef MOUSE_SLIP_WHEELING
2184 } 2166 }
2185# endif
2186 } 2167 }
2187 break; 2168 break;
2188#endif 2169#endif
2189 } 2170 }
2190 } 2171 }
2191} 2172}
2192
2193#ifdef TRANSPARENT
2194#if TINTING
2195/* taken from aterm-0.4.2 */
2196
2197typedef uint32_t RUINT32T;
2198
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{
2201 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i;
2207
2208 Visual *visual = display->visual;
2209
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211
2212 /* for convenience */
2213 mask_r = visual->red_mask;
2214 mask_g = visual->green_mask;
2215 mask_b = visual->blue_mask;
2216
2217 /* boring lookup table pre-initialization */
2218 switch (srcImage->bits_per_pixel) {
2219 case 15:
2220 if ((mask_r != 0x7c00) ||
2221 (mask_g != 0x03e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+32;
2228 sh_r = 10;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 16:
2233 if ((mask_r != 0xf800) ||
2234 (mask_g != 0x07e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+64;
2241 sh_r = 11;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 24:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 case 32:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 default:
2272 return; /* we do not support this color depth */
2273 }
2274
2275 /* prepare limits for color transformation (each channel is handled separately) */
2276 if (shade < 0) {
2277 shade = -shade;
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = 65535-rm;
2282 lower_lim_g = 65535-gm;
2283 lower_lim_b = 65535-bm;
2284
2285 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2286 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2287 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2288
2289 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2290 } else {
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2295
2296 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2297 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2298 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2299 }
2300
2301 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2302 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2303 {
2304 unsigned int tmp;
2305
2306 tmp = lower_lim_r;
2307 lower_lim_r = lower_lim_b;
2308 lower_lim_b = tmp;
2309
2310 tmp = upper_lim_r;
2311 upper_lim_r = upper_lim_b;
2312 upper_lim_b = tmp;
2313 }
2314
2315 /* fill our lookup tables */
2316 for (i = 0; i <= mask_r>>sh_r; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2320 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2321 lookup_r[i] = (tmp/65535)<<sh_r;
2322 }
2323 for (i = 0; i <= mask_g>>sh_g; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2327 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2328 lookup_g[i] = (tmp/65535)<<sh_g;
2329 }
2330 for (i = 0; i <= mask_b>>sh_b; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2334 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2335 lookup_b[i] = (tmp/65535)<<sh_b;
2336 }
2337
2338 /* apply table to input image (replacing colors by newly calculated ones) */
2339 switch (srcImage->bits_per_pixel)
2340 {
2341 case 15:
2342 {
2343 unsigned short *p1, *pf, *p, *pl;
2344 p1 = (unsigned short *) srcImage->data;
2345 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2346 while (p1 < pf)
2347 {
2348 p = p1;
2349 pl = p1 + srcImage->width;
2350 for (; p < pl; p++)
2351 {
2352 *p = lookup_r[(*p & 0x7c00)>>10] |
2353 lookup_g[(*p & 0x03e0)>> 5] |
2354 lookup_b[(*p & 0x001f)];
2355 }
2356 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2357 }
2358 break;
2359 }
2360 case 16:
2361 {
2362 unsigned short *p1, *pf, *p, *pl;
2363 p1 = (unsigned short *) srcImage->data;
2364 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xf800)>>11] |
2372 lookup_g[(*p & 0x07e0)>> 5] |
2373 lookup_b[(*p & 0x001f)];
2374 }
2375 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2376 }
2377 break;
2378 }
2379 case 24:
2380 {
2381 unsigned char *p1, *pf, *p, *pl;
2382 p1 = (unsigned char *) srcImage->data;
2383 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2384 while (p1 < pf)
2385 {
2386 p = p1;
2387 pl = p1 + srcImage->width * 3;
2388 for (; p < pl; p += 3)
2389 {
2390 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2391 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2392 p[2] = lookup_r[(p[2] & 0x0000ff)];
2393 }
2394 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 case 32:
2399 {
2400 RUINT32T *p1, *pf, *p, *pl;
2401 p1 = (RUINT32T *) srcImage->data;
2402 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2403
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xff0000)>>16] |
2411 lookup_g[(*p & 0x00ff00)>> 8] |
2412 lookup_b[(*p & 0x0000ff)] |
2413 (*p & ~0xffffff);
2414 }
2415 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 }
2420
2421 free (lookup);
2422}
2423#endif
2424
2425/*
2426 * Check our parents are still who we think they are.
2427 * Do transparency updates if required
2428 */
2429int
2430rxvt_term::check_our_parents ()
2431{
2432 int i, pchanged, aformat, have_pixmap, rootdepth;
2433 unsigned long nitems, bytes_after;
2434 Atom atype;
2435 unsigned char *prop = NULL;
2436 Window root, oldp, *list;
2437 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440
2441 pchanged = 0;
2442
2443 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */
2445
2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth;
2448
2449 XGetWindowAttributes (disp, parent[0], &wattr);
2450
2451 if (rootdepth != wattr.depth)
2452 {
2453 if (am_transparent)
2454 {
2455 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0;
2458 }
2459
2460 return pchanged; /* Don't try any more */
2461 }
2462
2463 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False);
2465
2466 /*
2467 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that.
2470 */
2471 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success);
2481
2482 if (!i || prop == NULL
2483#if TINTING
2484 || !rs[Rs_color + Color_tint]
2485#endif
2486 )
2487 have_pixmap = 0;
2488 else
2489 {
2490 have_pixmap = 1;
2491 rootpixmap = *(Pixmap *)prop;
2492 XFree (prop);
2493 }
2494
2495 if (have_pixmap)
2496 {
2497 /*
2498 * Copy display->root pixmap transparency
2499 */
2500 int sx, sy, nx, ny;
2501 unsigned int nw, nh;
2502 Window cr;
2503 XImage *image;
2504 GC gc;
2505 XGCValues gcvalue;
2506
2507 XTranslateCoordinates (disp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height;
2511 nx = ny = 0;
2512
2513 if (sx < 0)
2514 {
2515 nw += sx;
2516 nx = -sx;
2517 sx = 0;
2518 }
2519
2520 if (sy < 0)
2521 {
2522 nh += sy;
2523 ny = -sy;
2524 sy = 0;
2525 }
2526
2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529
2530 XSync (disp, False);
2531 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */
2536 allowedxerror = 0;
2537
2538 if (image == NULL)
2539 {
2540 if (am_transparent && am_pixmap_trans)
2541 {
2542 pchanged = 1;
2543 if (pixmap != None)
2544 {
2545 XFreePixmap (disp, pixmap);
2546 pixmap = None;
2547 }
2548 }
2549
2550 am_pixmap_trans = 0;
2551 }
2552 else
2553 {
2554 if (pixmap != None)
2555 XFreePixmap (disp, pixmap);
2556
2557#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint))
2559 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565 ShadeXImage (display, image, shade, rm, gm, bm);
2566 }
2567#endif
2568
2569 pixmap = XCreatePixmap (disp, vt,
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc);
2575 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]);
2578
2579 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1;
2581
2582 am_transparent = am_pixmap_trans = 1;
2583 }
2584 }
2585
2586 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2588 else
2589 {
2590 unsigned int n;
2591 /*
2592 * InheritPixmap transparency
2593 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 {
2596 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root,
2598 &parent[i], &list, &n);
2599 XFree (list);
2600
2601 if (parent[i] == display->root)
2602 {
2603 if (oldp != None)
2604 pchanged = 1;
2605
2606 break;
2607 }
2608
2609 if (oldp != parent[i])
2610 pchanged = 1;
2611 }
2612
2613 n = 0;
2614
2615 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++)
2618 {
2619 XGetWindowAttributes (disp, parent[n], &wattr);
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break;
2624 }
2625 }
2626 }
2627
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */
2634 }
2635 else
2636 {
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2173
2669/*}}} */ 2174/*}}} */
2670 2175
2671bool 2176bool
2672rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2721 if (ch == C0_LF) 2226 if (ch == C0_LF)
2722 nlines++; 2227 nlines++;
2723 2228
2724 refresh_count++; 2229 refresh_count++;
2725 2230
2726 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2232 {
2729 refreshnow = true;
2730 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2731 ch = NOCHAR; 2238 ch = NOCHAR;
2732 break; 2239 break;
2240 }
2733 } 2241 }
2734 2242
2735 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2737 { 2245 {
… …
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2767 2275
2768 /* 2276 /*
2769 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2770 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2771 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2772 * is incremented here because we must be doing flat-out scrolling.
2773 */ 2280 */
2774 if (refreshnow) 2281 if (refreshnow)
2775 { 2282 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++;
2778 else
2779 {
2780 flag = true; 2283 flag = true;
2781 scr_refresh (); 2284 scr_refresh ();
2782 want_refresh = 1; 2285 want_refresh = 1;
2783 }
2784 } 2286 }
2785 2287
2786 } 2288 }
2787 else 2289 else
2788 { 2290 {
… …
2937 { 2439 {
2938 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2939 break; /* done = 1 */ 2441 break; /* done = 1 */
2940 } 2442 }
2941 } 2443 }
2942 2444
2943 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2944 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2945 { 2447 {
2946 done = 1; 2448 done = 1;
2947 break; 2449 break;
… …
2949 } 2451 }
2950 } 2452 }
2951 2453
2952 pclose_printer (fd); 2454 pclose_printer (fd);
2953} 2455}
2954#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2955/*}}} */ 2457/*}}} */
2956 2458
2957/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2958enum { 2460enum {
2959 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
3009 process_dcs_seq (); 2511 process_dcs_seq ();
3010 break; 2512 break;
3011 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3012 process_csi_seq (); 2514 process_csi_seq ();
3013 break; 2515 break;
3014 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3015 process_osc_seq (); 2517 process_osc_seq ();
3016 break; 2518 break;
3017#endif 2519#endif
3018 } 2520 }
3019} 2521}
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 2612 break;
3111 case '+': 2613 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 2615 break;
3114#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3115 case '6': 2617 case '6':
3116 scr_backindex (); 2618 scr_backindex ();
3117 break; 2619 break;
3118#endif 2620#endif
3119 case '7': 2621 case '7':
3120 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3121 break; 2623 break;
3122 case '8': 2624 case '8':
3123 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3124 break; 2626 break;
3125#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3126 case '9': 2628 case '9':
3127 scr_forwardindex (); 2629 scr_forwardindex ();
3128 break; 2630 break;
3129#endif 2631#endif
3130 case '=': 2632 case '=':
… …
3245rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3246{ 2748{
3247 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3248 unsigned int nargs, p; 2750 unsigned int nargs, p;
3249 int n, ndef; 2751 int n, ndef;
3250 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3251 2753
3252 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3253 arg[--nargs] = 0;
3254 2755
3255 priv = 0; 2756 priv = 0;
3256 ch = cmd_getc (); 2757 ch = cmd_getc ();
3257 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3258 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3259 priv = ch; 2761 priv = ch;
3260 ch = cmd_getc (); 2762 ch = cmd_getc ();
3261 } 2763 }
3262 2764
3263 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 2796 if (arg[p] == -1)
3295 arg[p] = ndef; 2797 arg[p] = ndef;
3296 2798
3297#ifdef DEBUG_CMD
3298 fprintf (stderr, "CSI ");
3299 for (p = 0; p < nargs; p++)
3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301 fprintf (stderr, "%c\n", ch);
3302#endif
3303
3304 /* 2799 /*
3305 * private mode handling 2800 * private mode handling
3306 */ 2801 */
3307 if (priv) 2802 if (priv)
3308 { 2803 {
3309 switch (priv) 2804 switch (priv)
3310 { 2805 {
3311 case '>': 2806 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2808 {
2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2811 //
2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2814 // versions.
2815 //
2816 tt_printf ("\033[>%d;95;0c", 'U');
2817 }
3314 break; 2818 break;
2819
3315 case '?': 2820 case '?':
3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3318 break; 2823 break;
3319 } 2824 }
… …
3444 break; 2949 break;
3445 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3446 scr_report_position (); 2951 scr_report_position ();
3447 break; 2952 break;
3448 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3449 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3450 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451 break; 2956 break;
3452 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454 break; 2959 break;
… …
3521 break; 3026 break;
3522 case CSI_75: 3027 case CSI_75:
3523 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3524 break; 3029 break;
3525 3030
3526#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3527 case CSI_74: 3032 case CSI_74:
3528 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3529 break; 3034 break;
3530#endif 3035#endif
3531 3036
… …
3538 break; 3043 break;
3539 } 3044 }
3540} 3045}
3541/*}}} */ 3046/*}}} */
3542 3047
3543#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3544/* ARGSUSED */ 3049/* ARGSUSED */
3545void 3050void
3546rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547{ 3052{
3548 int x, y; 3053 int x, y;
3549 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3550 Window wdummy; 3055 Window wdummy;
3551 dDisp; 3056
3057 dLocal (Display *, dpy);
3552 3058
3553 if (nargs == 0) 3059 if (nargs == 0)
3554 return; 3060 return;
3555 3061
3556 switch (args[0]) 3062 switch (args[0])
3557 { 3063 {
3558 /* 3064 /*
3559 * commands 3065 * commands
3560 */ 3066 */
3561 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3562 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3563 break; 3069 break;
3564 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3565 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3566 break; 3072 break;
3567 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3568 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3569 break; 3075 break;
3570 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572 break; 3078 break;
3573 case 5: /* raise window */ 3079 case 5: /* raise window */
3574 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3575 break; 3081 break;
3576 case 6: /* lower window */ 3082 case 6: /* lower window */
3577 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3578 break; 3084 break;
3579 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3580 scr_touch (true); 3086 scr_touch (true);
3581 break; 3087 break;
3582 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3589 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3590 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3591 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3592 break; 3098 break;
3593 3099
3594
3595 /* 3100 /*
3596 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3597 */ 3102 */
3598 case 11: /* report window state */ 3103 case 11: /* report window state */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601 break; 3106 break;
3602 case 13: /* report window position */ 3107 case 13: /* report window position */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3605 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3606 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3607 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3608 break; 3113 break;
3609 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3610 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612 break; 3117 break;
3613 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break; 3120 break;
… …
3617 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618 break; 3123 break;
3619 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3620 { 3125 {
3621 char *s; 3126 char *s;
3622 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3129 XFree (s);
3625 } 3130 }
3626 break; 3131 break;
3627 case 21: /* report window title */ 3132 case 21: /* report window title */
3628 { 3133 {
3629 char *s; 3134 char *s;
3630 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632 XFree (s); 3137 XFree (s);
3633 } 3138 }
3634 break; 3139 break;
3635 } 3140 }
3636} 3141}
… …
3663 seen_esc = true; 3168 seen_esc = true;
3664 continue; 3169 continue;
3665 } 3170 }
3666 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3667 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3668 else if (ch < 0x20) 3175 else if (ch < 0x20)
3669 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3670 3177
3671 seen_esc = false; 3178 seen_esc = false;
3672 3179
3673 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3674 // stop at some sane length 3181 // stop at some sane length
3675 return NULL; 3182 return NULL;
3676 3183
3677 if (ch == C0_SYN)
3678 string[n++] = cmd_get8 ();
3679 else
3680 string[n++] = ch; 3184 string[n++] = ch;
3681 } 3185 }
3682 3186
3683 string[n++] = '\0'; 3187 string[n++] = '\0';
3684 3188
3685 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3736void 3240void
3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3241rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738{ 3242{
3739 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3740 { 3244 {
3741 unsigned short r, g, b; 3245 rgba c;
3742 pix_colors_focused[color].get (display, r, g, b); 3246 pix_colors_focused[color].get (c);
3247
3248#if XFT
3249 if (c.a != rgba::MAX_CC)
3250 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3251 else
3252#endif
3743 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3253 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744 } 3254 }
3745 else 3255 else
3746 set_window_color (color, str); 3256 set_window_color (color, str);
3747} 3257}
3748 3258
… …
3754{ 3264{
3755 int color; 3265 int color;
3756 char *buf, *name; 3266 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3758 int saveop = op; 3268 int saveop = op;
3759 dDisp; 3269
3270 dLocal (Display *, dpy);
3760 3271
3761 assert (str != NULL); 3272 assert (str != NULL);
3273
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return;
3276
3762 switch (op) 3277 switch (op)
3763 { 3278 {
3764 case XTerm_name: 3279 case XTerm_name:
3765 set_title (str); 3280 set_title (str);
3766 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3780 unsigned long bytes_after; 3295 unsigned long bytes_after;
3781 unsigned char *value = 0; 3296 unsigned char *value = 0;
3782 const char *str = ""; 3297 const char *str = "";
3783 3298
3784 if (prop 3299 if (prop
3785 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None 3304 && actual_type != None
3790 && actual_format == 8) 3305 && actual_format == 8)
3791 str = (const char *)(value); 3306 str = (const char *)(value);
3792 3307
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3794 3309
3795 XFree (value); 3310 XFree (value);
3796 } 3311 }
3797 else 3312 else
3798 { 3313 {
… …
3802 { 3317 {
3803 *eq = 0; 3318 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3805 } 3320 }
3806 else 3321 else
3807 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3808 display->atom (str)); 3323 display->atom (str));
3809 } 3324 }
3810 break; 3325 break;
3811 3326
3812 case XTerm_Color: 3327 case XTerm_Color:
… …
3822 break; 3337 break;
3823 3338
3824 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3825 *buf++ = '\0'; 3340 *buf++ = '\0';
3826 3341
3827 if (name[0] == '?' && !name[1]) 3342 process_color_seq (op, color, name, resp);
3828 {
3829 unsigned short r, g, b;
3830 pix_colors_focused[color].get (display, r, g, b);
3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832 }
3833 else
3834 set_window_color (color, name);
3835 } 3343 }
3836 break; 3344 break;
3345 case Rxvt_restoreFG:
3837 case XTerm_Color00: 3346 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3839 break; 3348 break;
3349 case Rxvt_restoreBG:
3840 case XTerm_Color01: 3350 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3842 break; 3352 break;
3843#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3844 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3846 break; 3356 break;
3847#endif 3357#endif
3848 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3850 break; 3360 break;
3851 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3853 break; 3363 break;
3854#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#ifndef NO_BOLD_UNDERLINE_REVERSE
3855 case XTerm_Color_RV: 3365 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3366 process_color_seq (op, Color_RV, str, resp);
3857 break; 3367 break;
3858 case Rxvt_Color_BD: 3368 case Rxvt_Color_BD:
3859 case URxvt_Color_BD: 3369 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp); 3370 process_color_seq (op, Color_BD, str, resp);
3861 break; 3371 break;
3862 case Rxvt_Color_UL: 3372 case Rxvt_Color_UL:
3863 case URxvt_Color_UL: 3373 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp); 3374 process_color_seq (op, Color_UL, str, resp);
3865 break; 3375 break;
3866 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3868 break; 3378 break;
3869#endif 3379#endif
3870#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3871 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3873 check_our_parents (); 3383 {
3874 if (am_transparent) 3384 bool changed = false;
3875 want_full_refresh = want_refresh = 1;
3876 break;
3877#endif
3878 3385
3386 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390
3391 if (changed)
3392 update_background ();
3393 }
3394
3395 break;
3396#endif
3397
3398#if BG_IMAGE_FROM_FILE
3879 case Rxvt_Pixmap: 3399 case Rxvt_Pixmap:
3880 { 3400 if (!strcmp (str, "?"))
3881 if (*str != ';')
3882 { 3401 {
3883#if XPM_BACKGROUND 3402 char str[256];
3884 scale_pixmap (""); /* reset to default scaling */ 3403
3885 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3886 scr_touch (true); 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3887#endif 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3888 } 3408 }
3889 3409 else
3410 {
3890 int changed = 0; 3411 int changed = 0;
3891 3412
3892 while ((str = strchr (str, ';')) != NULL) 3413 if (*str != ';')
3893 { 3414 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */
3418 changed++;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 }
3423
3424 while (str)
3425 {
3894 str++; 3426 str++;
3895#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3896 changed += scale_pixmap (str); 3428 changed++;
3897#endif 3429 str = strchr (str, ';');
3898 } 3430 }
3899 3431
3900 if (changed) 3432 if (changed)
3901 { 3433 update_background ();
3902#ifdef XPM_BACKGROUND
3903 resize_pixmap ();
3904 scr_touch (true);
3905#endif
3906 } 3434 }
3907 }
3908 break; 3435 break;
3909 3436#endif
3910 case Rxvt_restoreFG:
3911 set_window_color (Color_fg, str);
3912 break;
3913 case Rxvt_restoreBG:
3914 set_window_color (Color_bg, str);
3915 break;
3916 3437
3917 case XTerm_logfile: 3438 case XTerm_logfile:
3918 // TODO, when secure mode? 3439 // TODO, when secure mode?
3919 break; 3440 break;
3920 3441
… …
3938 case URxvt_italicFont: 3459 case URxvt_italicFont:
3939 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3940#endif 3461#endif
3941 if (query) 3462 if (query)
3942 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3945 resp); 3466 resp);
3946 else 3467 else
3947 { 3468 {
3948 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3951 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3952 set_fonts (); 3473 set_fonts ();
3953 } 3474 }
3954 break; 3475 break;
3955 3476
3956#if ENABLE_FRILLS 3477 case URxvt_version:
3478 if (query)
3479 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3480 op,
3481 rs[Rs_name], VERSION[0], VERSION[2],
3482 resp);
3483 break;
3484
3485#if !ENABLE_MINIMAL
3957 case URxvt_locale: 3486 case URxvt_locale:
3958 if (query) 3487 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3960 else 3489 else
3961 { 3490 {
3962 set_locale (str); 3491 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale (); 3493 init_xlocale ();
… …
3979 break; 3508 break;
3980#endif 3509#endif
3981 3510
3982#if ENABLE_PERL 3511#if ENABLE_PERL
3983 case URxvt_perl: 3512 case URxvt_perl:
3984 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3985 ; // no responses yet 3514 ; // no responses yet
3986 break; 3515 break;
3987#endif 3516#endif
3988 } 3517 }
3989} 3518}
… …
4027{ 3556{
4028 unsigned int i, j; 3557 unsigned int i, j;
4029 int state; 3558 int state;
4030 3559
4031 static const struct 3560 static const struct
4032 { 3561 {
4033 const int argval; 3562 const int argval;
4034 const unsigned long bit; 3563 const unsigned long bit;
4035 }
4036
4037 argtopriv[] = { 3564 } argtopriv[] = {
4038 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4039 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4040 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4041 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4042 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4058 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4059#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4060 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4061#endif 3588#endif
4062 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4063 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4064 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4065 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4066 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4067 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4068 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4069 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4070 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4071 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4072 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4073 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4074 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4075 }; 3602 };
4076 3603
4077 if (nargs == 0) 3604 if (nargs == 0)
4078 return; 3605 return;
4079 3606
… …
4105 scr_touch (true); 3632 scr_touch (true);
4106 break; 3633 break;
4107#endif 3634#endif
4108 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4109 case 1049: 3636 case 1049:
4110 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4111 if (mode == 0) 3638 if (mode == 0)
4112 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4113 else if (mode == 1) 3640 else if (mode == 1)
4114 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4115 break; 3642 break;
… …
4127 */ 3654 */
4128 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4129 break; 3656 break;
4130 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4131 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4132 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4133 break; 3663 break;
4134 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4135 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4136 break; 3666 break;
4137 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4144 scr_autowrap (state); 3674 scr_autowrap (state);
4145 break; 3675 break;
4146 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4147 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4148 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4149 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4150 break; 3680 break;
4151#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4152 case scrollBar_esc: 3682 case scrollBar_esc:
4153 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4154 { 3684 {
… …
4167 break; 3697 break;
4168 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4169 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4170 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4171 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4172 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4173 break; 3703 break;
4174#if 0
4175 case 1001: 3704 case 1002:
4176 break; /* X11 mouse highlighting */ 3705 case 1003:
4177#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4178 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4179 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4180 break; 3718 break;
4181 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4182 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4183 break; 3721 break;
4184 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4185 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3725 scr_erase_screen (2);
4188 scr_change_screen (state); 3726 scr_change_screen (state);
4189 break; 3727 break;
4190 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4191 scr_change_screen (state); 3729 scr_change_screen (state);
4192 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 3732 scr_erase_screen (2);
4195 break; 3733 break;
4196 default: 3734 default:
4197 break; 3735 break;
… …
4325 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4326 break; 3864 break;
4327 3865
4328 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4329 3867
4330#if ENABLE_FRILLS 3868#if !ENABLE_MINIMAL
4331 case 90: 3869 case 90:
4332 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4333 case 92: 3871 case 92:
4334 case 93: 3872 case 93:
4335 case 94: 3873 case 94:
… …
4359rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4360{ 3898{
4361 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4362 3900
4363 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4364 { /* query graphics */ 3903 /* query graphics */
4365 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4366 return; 3905 return;
4367 } 3906 }
4368 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4369 do 3908 do
… …
4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4420 3959
4421 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4422 v_buflen += len; 3961 v_buflen += len;
4423 3962
4424 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4425} 3964}
4426 3965
4427void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4428{ 3967{
4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4434 3973
4435 if (v_buflen == 0) 3974 if (v_buflen == 0)
4436 { 3975 {
4437 free (v_buffer); 3976 free (v_buffer);
4438 v_buffer = 0; 3977 v_buffer = 0;
4439 v_buflen = 0;
4440 3978
4441 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4442 return; 3980 return;
4443 } 3981 }
4444 3982
4445 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4446 } 3984 }
4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4448 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4449} 3987}
4450 3988
4451/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4452 3990

Diff Legend

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