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.266 by root, Mon Jan 16 08:57:02 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>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 201
206 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
207 203
208 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
210 206
211 if (y >= 0) 207 if (y >= 0)
212 { 208 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 221 ch = *chr++;
226 222
227 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
230# if !UNICODE3 226# if !UNICODE_3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
276 } 279 }
277 280
278 iso14755buf = 0; 281 iso14755buf = 0;
279} 282}
280 283
281int 284static int
282rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
283{ 286{
284 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
287 { 290 {
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
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
301void 392void
302rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
303{ 394{
304 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
305 unsigned int newlen;
306 KeySym keysym; 396 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 397 int valid_keysym;
311 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
312 404
313 /* 405 /*
314 * 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
315 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
316 * 408 *
… …
464 { 556 {
465 switch (keysym) 557 switch (keysym)
466 { 558 {
467 /* normal XTerm key bindings */ 559 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 560 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 561 selection_request (ev.time);
470 return; 562 return;
471#if TODO 563#if TODO
472 /* rxvt extras */ 564 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 565 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 566 change_font (FONT_UP);
… …
493 { 585 {
494 commit_iso14755 (); 586 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 587 iso14755buf = ISO_14755_51;
496# if ISO_14755 588# if ISO_14755
497 iso14755_51 (0); 589 iso14755_51 (0);
590# endif
591 return;
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);
498# endif 598# endif
499 return; 599 return;
500 } 600 }
501 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
502 { 602 {
… …
507# endif 607# endif
508 return; 608 return;
509 } 609 }
510 else 610 else
511 { 611 {
512# if ENABLE_OVERLAY 612# if ISO_14755
513 scr_overlay_off (); 613 scr_overlay_off ();
514# endif 614# endif
515 iso14755buf = 0; 615 iso14755buf = 0;
516 } 616 }
517 } 617 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
521 { 621 {
522 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 623# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 626# endif
527 } 627 }
528#endif 628#endif
529 629
530#ifdef PRINTPIPE 630#ifdef PRINTPIPE
531 if (keysym == XK_Print) 631 if (keysym == XK_Print)
532 { 632 {
533 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
534 return; 634 return;
535 } 635 }
536#endif 636#endif
537 637
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 639 {
540 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 641 unsigned int newlen = 1;
542 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
543 { 644 {
544#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 646 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
547 { 648 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
551 } 652 }
552 else 653 else
553 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 655 break;
555#endif 656#endif
556#ifndef NO_DELETE_KEY 657#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 658 case XK_Delete:
568 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 660 break;
570#endif 661#endif
571 case XK_Tab: 662 case XK_Tab:
572 if (shft) 663 if (shft)
573 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
583#endif 674#endif
584 newlen = 0; 675 newlen = 0;
585 } 676 }
586 break; 677 break;
587 678
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 679 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
617 } 692 }
618 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
620 break; 695 break;
621 696
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter: 697 case XK_KP_Enter:
651 /* allow shift to override */ 698 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
653 { 700 {
654 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
655 break; 702 break;
656 } 703 }
657 704
… …
669 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
671 } 718 }
672 break; 719 break;
673 720
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 721 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 745 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
706 { 747 {
707 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 750 }
710 else 751 else
… …
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
714 } 755 }
715 break; 756 break;
716 757
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 758 case XK_End:
755 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
756 break; 760 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 761 case XK_Home:
768 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
769 break; 763 break;
770 764
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
827 newlen = 0; 771 newlen = 0;
772 }
828 break; 773 break;
829 } 774 }
830 775
831 if (newlen) 776 if (newlen)
832 len = strlen (kbuf); 777 len = strlen (kbuf);
833 }
834 778
835 /* 779 /*
836 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
837 */ 781 */
838#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
873 return; 817 return;
874 818
875 if (len <= 0) 819 if (len <= 0)
876 return; /* not mapped */ 820 return; /* not mapped */
877 821
878 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 823 if (view_start)
880 { 824 {
881 view_start = 0; 825 view_start = 0;
882 want_refresh = 1; 826 want_refresh = 1;
883 } 827 }
… …
905 { 849 {
906 const char ch = C0_ESC; 850 const char ch = C0_ESC;
907 tt_write (&ch, 1); 851 tt_write (&ch, 1);
908 } 852 }
909 853
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
921} 855}
922/*}}} */
923 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}
933
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 935unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 937{
930 unsigned int n, s; 938 unsigned int n, s;
931 939
… …
959void 967void
960rxvt_term::flush () 968rxvt_term::flush ()
961{ 969{
962 flush_ev.stop (); 970 flush_ev.stop ();
963 971
964#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
966 { 974 {
967 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 976 scr_touch (false);
970 } 977 }
971#endif 978#endif
972 979
973 if (want_refresh) 980 if (want_refresh)
… …
1008 while (l->is_longer () && row < end_row); 1015 while (l->is_longer () && row < end_row);
1009 } 1016 }
1010 while (row < end_row); 1017 while (row < end_row);
1011 } 1018 }
1012 1019
1013 scr_refresh (refresh_type); 1020 scr_refresh ();
1014 scrollbar_show (1); 1021 scrollbar_show (1);
1015#ifdef USE_XIM 1022#ifdef USE_XIM
1016 IMSendSpot (); 1023 IMSendSpot ();
1017#endif 1024#endif
1018 } 1025 }
1019 1026
1020 display->flush (); 1027 display->flush ();
1021} 1028}
1022 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1023void 1031void
1024rxvt_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)
1025{ 1042{
1026 make_current (); 1043 make_current ();
1027 1044
1028 display->flush ();
1029
1030 if (want_refresh && !flush_ev.active)
1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1032}
1033
1034void
1035rxvt_term::flush_cb (time_watcher &w)
1036{
1037 make_current ();
1038
1039 refresh_limit = 1;
1040 refresh_count = 0; 1045 refresh_count = 0;
1041 flush (); 1046 flush ();
1042} 1047}
1043 1048
1044#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1045void 1050void
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1047{ 1052{
1048 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1054 want_refresh = 1;
1050 1055 refresh_check ();
1051 w.start (w.at + BLINK_INTERVAL);
1052} 1056}
1053#endif 1057#endif
1054 1058
1055#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1056void 1060void
1057rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1058{ 1062{
1059 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1060 { 1064 {
1061 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1062 want_refresh = 1; 1066 want_refresh = 1;
1063 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1064 } 1068 }
1069 else
1070 w.stop ();
1065} 1071}
1066#endif 1072#endif
1067 1073
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void 1075void
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1071{ 1077{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1074 { 1080 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1081 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1078 } 1083 }
1084 else
1085 w.stop ();
1079} 1086}
1080#endif 1087#endif
1081 1088
1082#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1083void 1090void
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1085{ 1092{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1094 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1096 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1092 } 1098 }
1099 else
1100 w.stop ();
1093} 1101}
1094#endif 1102#endif
1095 1103
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void 1105void
1098rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1099{ 1107{
1100 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1109 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1110 want_refresh = 1;
1109 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)
1110 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1111} 1119}
1112#endif 1120#endif
1113 1121
1114#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1115static struct event_handler 1123static struct event_handler
1116{ 1124{
1117 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1118 1126
1119 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1120 { 1128 {
1121 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
1122 w.stop (); 1137 w.stop ();
1123 } 1138 }
1124 1139
1125 event_handler () 1140 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1141 : yield_ev (this, &event_handler::yield_cb)
1127 { 1142 {
1128 } 1143 }
1129} event_handler; 1144} event_handler;
1130#endif 1145#endif
1131 1146
… …
1142 1157
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1159 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1160 cmdbuf_endp = cmdbuf_ptr + n;
1146 1161
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1163
1149 if (r > 0) 1164 if (r > 0)
1150 { 1165 {
1151 cmdbuf_endp += r; 1166 cmdbuf_endp += r;
1152 return true; 1167 return true;
1153 } 1168 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1170 {
1156#if HAVE_SCHED_YIELD 1171#if LINUX_YIELD_HACK
1157 if (display->is_local) 1172 if (display->is_local)
1158 event_handler.cw_yield.start (); 1173 event_handler.yield_ev.start ();
1159#endif 1174#endif
1160 } 1175 }
1161 else 1176 else
1162 { 1177 {
1163 pty_ev.stop (); 1178 pty_ev.stop ();
1164 1179
1165 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1166 destroy (); 1181 destroy ();
1167 } 1182 }
1168 1183
1169 return false; 1184 return false;
1170} 1185}
1171 1186
1172void 1187void
1173rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1174{ 1189{
1175 make_current (); 1190 make_current ();
1176 1191
1177 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1178 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1179 while (pty_fill ()) 1194 while (pty_fill ())
1180 if (cmd_parse ()) 1195 if (cmd_parse ())
1181 break; 1196 break;
1182 1197
1183 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1184 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1185} 1202}
1186 1203
1187void 1204void
1188rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1189{ 1206{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1208 recolour_cursor ();
1192 1209
1193#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1211 hidden_pointer = 0;
1195 1212
1196 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1198#endif 1215#endif
1199} 1216}
1200 1217
1201#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1202void 1219void
1203rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1204{ 1221{
1205 if (!OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1206 return; 1223 return;
1207 1224
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1226 XFlush (dpy);
1210 1227
1211 hidden_pointer = 1; 1228 hidden_pointer = 1;
1212} 1229}
1213 1230
1214void 1231void
1215rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1216{ 1233{
1217 make_current (); 1234 make_current ();
1218 1235
1219 pointer_blank (); 1236 pointer_blank ();
1220} 1237}
… …
1223void 1240void
1224rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1225{ 1242{
1226 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1227 int x, y; 1244 int x, y;
1245 int code = 32;
1228 1246
1229 x = ev.x; 1247 x = Pixel2Col (ev.x);
1230 y = ev.y; 1248 y = Pixel2Row (ev.y);
1231 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 }
1232 1257
1233 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1234 button_number = 3; 1259 button_number = 3;
1235 else 1260 else
1236 { 1261 {
… …
1282 x + 1, 1307 x + 1,
1283 y + 1); 1308 y + 1);
1284#endif 1309#endif
1285 1310
1286 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1287 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1288 (32 + x + 1), 1313 (32 + x + 1),
1289 (32 + y + 1)); 1314 (32 + y + 1));
1290} 1315}
1291
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301 1316
1302/*{{{ process an X event */ 1317/*{{{ process an X event */
1303void 1318void
1304rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1305{ 1320{
1306 make_current (); 1321 make_current ();
1307 1322
1308 dDisp; 1323 dLocal (Display *, dpy);
1309 1324
1310 if (ev.xany.window == vt 1325 if (ev.xany.window == vt
1311 && SHOULD_INVOKE (HOOK_X_EVENT) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return; 1328 return;
… …
1318 unsigned int unused_mask; 1333 unsigned int unused_mask;
1319 1334
1320 switch (ev.type) 1335 switch (ev.type)
1321 { 1336 {
1322 case KeyPress: 1337 case KeyPress:
1323#if ISO_14755 1338 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1339 break;
1329 1340
1330 case KeyRelease: 1341 case KeyRelease:
1331 { 1342 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1343 break;
1403 }
1404 1344
1405 case ButtonPress: 1345 case ButtonPress:
1406 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1407 break; 1347 break;
1408 1348
… …
1410 button_release (ev.xbutton); 1350 button_release (ev.xbutton);
1411 break; 1351 break;
1412 1352
1413 case ClientMessage: 1353 case ClientMessage:
1414 if (ev.xclient.format == 32 1354 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1355 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1356 {
1357 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1358 {
1359 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1360 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1361 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1362 {
1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1364 destroy ();
1365 }
1419#if ENABLE_EWMH 1366#if ENABLE_EWMH
1420 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])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1370 &ev);
1371#endif
1372 }
1373 }
1374#if ENABLE_XEMBED
1375 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1376 {
1377 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1378 focus_in ();
1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1380 focus_out ();
1381 }
1424#endif 1382#endif
1425 } 1383 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1384 break;
1466 1385
1467 /* 1386 /*
1468 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1488 break; 1407 break;
1489 } 1408 }
1490 break; 1409 break;
1491 1410
1492 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1415 focus_in ();
1494 break; 1416 break;
1495 1417
1496 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1422 focus_out ();
1498 break; 1423 break;
1499 1424
1500 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);*/
1501 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1502 { 1430 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1432 ;
1505 1433
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1435 {
1508 seen_resize = 1; 1436 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1438 }
1511 1439 else
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1440 {
1513 if (OPTION (Opt_transparent)) 1441#ifdef HAVE_BG_PIXMAP
1514 check_our_parents (); 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1515#endif 1449#endif
1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 } 1453 }
1517 break; 1454 break;
1518 1455
1519 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1461
1524 break; 1462 break;
1525 1463
1526 case SelectionClear: 1464 case SelectionClear:
1527 selection_clear (); 1465 selection_clear ();
… …
1535 case SelectionRequest: 1473 case SelectionRequest:
1536 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1537 break; 1475 break;
1538 1476
1539 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
1540 mapped = 1; 1494 mapped = 1;
1541#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1543#endif 1497#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break; 1499 break;
1546 1500
1547 case UnmapNotify: 1501 case UnmapNotify:
… …
1549#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1550 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1551#endif 1505#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1507 break;
1554
1555#ifdef TRANSPARENT
1556 case ReparentNotify:
1557 rootwin_cb (ev);
1558 break;
1559#endif /* TRANSPARENT */
1560 1508
1561 case GraphicsExpose: 1509 case GraphicsExpose:
1562 case Expose: 1510 case Expose:
1563 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1564 { 1512 {
1565 do 1513 do
1514 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1519
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1521
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1575 1527
1576 want_refresh = 1; 1528 want_refresh = 1;
1577 } 1529 }
1578 else 1530 else
1579 { 1531 {
1580 XEvent unused_event; 1532 XEvent unused_event;
1581 1533
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1535 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1537 ;
1586 1538
1587 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1588 { 1540 {
1589 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1590 scrollbar_show (0); 1542 scrollbar_show (0);
1591 } 1543 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1544 }
1602 break; 1545 break;
1603 1546
1604 case MotionNotify: 1547 case MotionNotify:
1605#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1549 if (hidden_pointer)
1607 pointer_unblank (); 1550 pointer_unblank ();
1608#endif 1551#endif
1609#if MENUBAR 1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1610 if (isMenuBarWindow (ev.xany.window)) 1553 || priv_modes & PrivMode_MouseAnyEvent)
1611 {
1612 menubar_control (ev.xbutton); 1554 mouse_report (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1556 break;
1618 1557
1619 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1620 { 1559 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1562 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1564 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1566 ;
1628 1567
1629 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1572 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1654 int dist; 1593 int dist;
1655 1594
1656 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1657 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1658 */ 1597 */
1659 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1661 1600
1662 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1663 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1664 */ 1603 */
1665 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1687 else 1626 else
1688 { 1627 {
1689 /* we are within the text window, so we 1628 /* we are within the text window, so we
1690 * shouldn't be scrolling 1629 * shouldn't be scrolling
1691 */ 1630 */
1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1694 } 1632 }
1695#endif 1633#endif
1696#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1697 } 1635 }
1698#endif 1636#endif
1699 } 1637 }
1700 } 1638 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1702 { 1640 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1705 ; 1643 ;
1706 1644
1707 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1649 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1651 scrollbar_size ());
1714 want_refresh = 1; 1652 want_refresh = 1;
1715 refresh_limit = 0;
1716 scrollbar_show (1); 1653 scrollbar_show (1);
1717 } 1654 }
1718 break; 1655 break;
1719 } 1656 }
1720 1657
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1658#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1660 {
1726 if (hidden_cursor) 1661 if (hidden_cursor)
1727 { 1662 {
1728 hidden_cursor = 0; 1663 hidden_cursor = 0;
1729 want_refresh = 1; 1664 want_refresh = 1;
1730 } 1665 }
1731 1666
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1667 cursor_blink_ev.again ();
1733 } 1668 }
1734#endif 1669#endif
1735 1670
1736#if defined(POINTER_BLANK) 1671#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1673 {
1739 if (ev.type == MotionNotify 1674 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1675 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1676 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1677 if (hidden_pointer)
… …
1744 1679
1745 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank (); 1681 pointer_blank ();
1747 } 1682 }
1748#endif 1683#endif
1684
1685 refresh_check ();
1749} 1686}
1750 1687
1751void 1688void
1752rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1753{ 1690{
1754 if (!focus) 1691 if (!focus)
1755 { 1692 {
1756 focus = 1; 1693 focus = 1;
1757 want_refresh = 1; 1694 want_refresh = 1;
1758 1695
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 1697
1761#if USE_XIM 1698#if USE_XIM
1762 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1763 { 1700 {
1764 IMSetStatusPosition (); 1701 IMSetPosition ();
1765 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1766 } 1703 }
1767#endif 1704#endif
1768#if CURSOR_BLINK 1705#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1771#endif 1708#endif
1772#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1774 { 1711 {
1775 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1713 scr_recolour ();
1777 } 1714 }
1778#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
1779 } 1726 }
1780} 1727}
1781 1728
1782void 1729void
1783rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1791 1738
1792#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf) 1740 if (iso14755buf)
1794 { 1741 {
1795 iso14755buf = 0; 1742 iso14755buf = 0;
1796# if ENABLE_OVERLAY 1743# if ISO_14755
1797 scr_overlay_off (); 1744 scr_overlay_off ();
1798# endif 1745# endif
1799 } 1746 }
1800#endif 1747#endif
1801#if USE_XIM 1748#if USE_XIM
1802 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1804#endif 1751#endif
1805#if CURSOR_BLINK 1752#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1808 hidden_cursor = 0; 1756 hidden_cursor = 0;
1809#endif 1757#endif
1810#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1812 { 1760 {
… …
1815 } 1763 }
1816#endif 1764#endif
1817 } 1765 }
1818} 1766}
1819 1767
1820#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
1821void 1782void
1822rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1784{
1824 make_current (); 1785 make_current ();
1825 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
1826 switch (ev.type) 1792 switch (ev.type)
1827 { 1793 {
1828 case PropertyNotify: 1794 case PropertyNotify:
1829 /* 1795 /*
1830 * 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,
1831 * 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.
1832 */ 1798 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1836 1805
1837 /* FALLTHROUGH */
1838 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1806 break;
1842 } 1807 }
1808# endif
1809
1810 refresh_check ();
1843} 1811}
1844#endif 1812#endif
1845 1813
1846void 1814void
1847rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1824 /*
1857 * VT window processing of button press 1825 * VT window processing of button press
1858 */ 1826 */
1859 if (ev.window == vt) 1827 if (ev.window == vt)
1860 { 1828 {
1829 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1861#if ISO_14755 1832#if ISO_14755
1862 // 5.4 1833 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1834 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1835 {
1865 iso14755_54 (ev.x, ev.y); 1836 iso14755_54 (ev.x, ev.y);
… …
1899 mouse_report (ev); 1870 mouse_report (ev);
1900 } 1871 }
1901#else 1872#else
1902 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1903 mouse_report (ev); 1874 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1876
1906 } 1877 }
1907 else 1878 else
1908 { 1879 {
1909 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1881 MEvent.clicks = 0;
1911 1882
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1883 switch (ev.button)
1914 { 1884 {
1915 case Button1: 1885 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1886 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1887 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1888#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1889 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1890#else
1921 selection.rect = false; 1891 selection.rect = false;
1922#endif 1892#endif
1923 1893
1924 /* allow shift+left click to extend selection */ 1894 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1895 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1896 {
1927 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1898 selection_rotate (ev.x, ev.y);
1929 else 1899 else
1930 selection_extend (ev.x, ev.y, 1); 1900 selection_extend (ev.x, ev.y, 1);
1931 } 1901 }
1932 else 1902 else
1933 { 1903 {
1934 if (MEvent.button == Button1 && clickintime) 1904 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1905 MEvent.clicks++;
1936 else 1906 else
1937 MEvent.clicks = 1; 1907 MEvent.clicks = 1;
1938 1908
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1909 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1910 }
1941 1911
1942 MEvent.button = Button1; 1912 MEvent.button = Button1;
1943 break; 1913 break;
1944 1914
1945 case Button3: 1915 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1916 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1917 selection_rotate (ev.x, ev.y);
1948 else 1918 else
1949 selection_extend (ev.x, ev.y, 1); 1919 selection_extend (ev.x, ev.y, 1);
1950 1920
1951 MEvent.button = Button3; 1921 MEvent.button = Button3;
1952 break; 1922 break;
1953 } 1923 }
1954 } 1924 }
1955 1925
1956 MEvent.time = ev.time; 1926 MEvent.time = ev.time;
1957 return; 1927 return;
1958 } 1928 }
1959 1929
1960 /* 1930 /*
1961 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1962 */ 1932 */
1963 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 1934 {
1965 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;
1966 /* 1943 /*
1967 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 1945 * move up if mouse is above slider
1969 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1970 * 1947 *
… …
1979 /* 1956 /*
1980 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1983 */ 1960 */
1984 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1994 else 1965 else
1995 switch (ev.button) 1966 switch (ev.button)
1996 { 1967 {
1997 case Button2: 1968 case Button2:
… …
2004 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
2005 break; 1976 break;
2006 } 1977 }
2007 } 1978 }
2008 else 1979 else
2009#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 1981 {
2016 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 1983 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 1987#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
2034 { 1989 {
2035 if (upordown < 0) 1990 if (direction == UP)
2036 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
2037 else 1992 else
2038 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
2039 } 1994 }
2040 } 1995 }
2041 else 1996 else
2042 switch (ev.button) 1997 switch (ev.button)
2043 { 1998 {
2044 case Button2: 1999 case Button2:
2045 switch (scrollbar_align) 2000 switch (scrollBar.align)
2046 { 2001 {
2047 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2048 csrO = 0; 2003 csrO = 0;
2049 break; 2004 break;
2050 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2058 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2059 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2062 2017
2063 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2064 break; 2019 break;
2065 2020
2066 case Button1: 2021 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2070 2025
2071 case Button3: 2026 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2082 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2083# else 2038# else
2084 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2085# endif 2040# endif
2086 else 2041 else
2087 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2088 } 2043 }
2089 else 2044 else
2090 { 2045 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2047 (nrow
… …
2098 } 2053 }
2099 } 2054 }
2100 2055
2101 return; 2056 return;
2102 } 2057 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2058}
2112 2059
2113void 2060void
2114rxvt_term::button_release (XButtonEvent &ev) 2061rxvt_term::button_release (XButtonEvent &ev)
2115{ 2062{
… …
2117 2064
2118 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2066 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2068
2122 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2123 { 2070 {
2124 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2125 scrollbar_show (0); 2072 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2073 }
2130 2074
2131#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2134#endif 2077#endif
2135 2078
2136 if (ev.window == vt) 2079 if (ev.window == vt)
2137 { 2080 {
2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2082 return;
2083
2138#if ISO_14755 2084#if ISO_14755
2139 // 5.4 2085 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2087 return;
2142#endif 2088#endif
2089
2143 if (reportmode) 2090 if (reportmode)
2144 { 2091 {
2145 /* mouse report from vt window */ 2092 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2093 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2094 if (ev.button >= 4)
… …
2158 mouse_report (ev); 2105 mouse_report (ev);
2159 } 2106 }
2160#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2161 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2162 mouse_report (ev); 2109 mouse_report (ev);
2163#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2164 return; 2111 return;
2165 } 2112 }
2166 2113
2167 /* 2114 /*
2168 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2171 if (priv_modes & PrivMode_mouse_report 2118 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2119 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2120 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2121 selection_extend (ev.x, ev.y, 0);
2175 2122
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2123 switch (ev.button)
2180 { 2124 {
2181 case Button1: 2125 case Button1:
2182 case Button3: 2126 case Button3:
2183 selection_make (ev.time); 2127 selection_make (ev.time);
2184 break; 2128 break;
2129
2185 case Button2: 2130 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2133 break;
2134
2188#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2189 case Button4: 2136 case Button4:
2190 case Button5: 2137 case Button5:
2191 { 2138 {
2192 int i; 2139 int i;
… …
2194 2141
2195 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2196 2143
2197 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2198 i = 1; 2145 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2147 i = nrow - 1;
2201 else 2148 else
2202 i = 5; 2149 i = 5;
2203 2150
2204# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2206 { 2153 {
2207 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210 2157
2211 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213
2214 slip_wheel_ev.start ();
2215 } 2160 }
2216 else 2161 else
2162# endif
2217 { 2163 {
2218# endif
2219 scr_page (v, i); 2164 scr_page (v, i);
2220 scrollbar_show (1); 2165 scrollbar_show (1);
2221# ifdef MOUSE_SLIP_WHEELING
2222 } 2166 }
2223# endif
2224 } 2167 }
2225 break; 2168 break;
2226#endif 2169#endif
2227 } 2170 }
2228 } 2171 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2172}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2173
2716/*}}} */ 2174/*}}} */
2717 2175
2718bool 2176bool
2719rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2768 if (ch == C0_LF) 2226 if (ch == C0_LF)
2769 nlines++; 2227 nlines++;
2770 2228
2771 refresh_count++; 2229 refresh_count++;
2772 2230
2773 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2232 {
2776 refreshnow = true;
2777 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2778 ch = NOCHAR; 2238 ch = NOCHAR;
2779 break; 2239 break;
2240 }
2780 } 2241 }
2781 2242
2782 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2784 { 2245 {
… …
2812 && 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))))
2813 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2814 2275
2815 /* 2276 /*
2816 * 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
2817 * 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.
2818 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2819 * is incremented here because we must be doing flat-out scrolling.
2820 */ 2280 */
2821 if (refreshnow) 2281 if (refreshnow)
2822 { 2282 {
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++;
2825 else
2826 {
2827 flag = true; 2283 flag = true;
2828 scr_refresh (refresh_type); 2284 scr_refresh ();
2829 want_refresh = 1; 2285 want_refresh = 1;
2830 }
2831 } 2286 }
2832 2287
2833 } 2288 }
2834 else 2289 else
2835 { 2290 {
… …
2851 return flag; 2306 return flag;
2852} 2307}
2853 2308
2854// read the next character 2309// read the next character
2855wchar_t 2310wchar_t
2856rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2857{ 2312{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2314 {
2860 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2882 return NOCHAR; 2337 return NOCHAR;
2883} 2338}
2884 2339
2885// read the next octet 2340// read the next octet
2886uint32_t 2341uint32_t
2887rxvt_term::next_octet () 2342rxvt_term::next_octet () NOTHROW
2888{ 2343{
2889 return cmdbuf_ptr < cmdbuf_endp 2344 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2345 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2346 : NOCHAR;
2892} 2347}
2348
2349static class out_of_input out_of_input;
2893 2350
2894/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2895/* 2352/*
2896 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2897 * to the command. 2354 * to the command.
2898 */ 2355 */
2899wchar_t 2356wchar_t
2900rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2358{
2902 wchar_t c = next_char (); 2359 wchar_t c = next_char ();
2903 2360
2904 if (c == NOCHAR) 2361 if (c == NOCHAR)
2905 throw out_of_input; 2362 throw out_of_input;
2906 2363
2907 return c; 2364 return c;
2908} 2365}
2909 2366
2910uint32_t 2367uint32_t
2911rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2369{
2913 uint32_t c = next_octet (); 2370 uint32_t c = next_octet ();
2914 2371
2915 if (c == NOCHAR) 2372 if (c == NOCHAR)
2916 throw out_of_input; 2373 throw out_of_input;
… …
2982 { 2439 {
2983 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2984 break; /* done = 1 */ 2441 break; /* done = 1 */
2985 } 2442 }
2986 } 2443 }
2987 2444
2988 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2989 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2990 { 2447 {
2991 done = 1; 2448 done = 1;
2992 break; 2449 break;
… …
2994 } 2451 }
2995 } 2452 }
2996 2453
2997 pclose_printer (fd); 2454 pclose_printer (fd);
2998} 2455}
2999#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
3000/*}}} */ 2457/*}}} */
3001 2458
3002/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
3003enum { 2460enum {
3004 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
3054 process_dcs_seq (); 2511 process_dcs_seq ();
3055 break; 2512 break;
3056 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3057 process_csi_seq (); 2514 process_csi_seq ();
3058 break; 2515 break;
3059 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3060 process_osc_seq (); 2517 process_osc_seq ();
3061 break; 2518 break;
3062#endif 2519#endif
3063 } 2520 }
3064} 2521}
… …
3154 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3155 break; 2612 break;
3156 case '+': 2613 case '+':
3157 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3158 break; 2615 break;
3159#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3160 case '6': 2617 case '6':
3161 scr_backindex (); 2618 scr_backindex ();
3162 break; 2619 break;
3163#endif 2620#endif
3164 case '7': 2621 case '7':
3165 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3166 break; 2623 break;
3167 case '8': 2624 case '8':
3168 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3169 break; 2626 break;
3170#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3171 case '9': 2628 case '9':
3172 scr_forwardindex (); 2629 scr_forwardindex ();
3173 break; 2630 break;
3174#endif 2631#endif
3175 case '=': 2632 case '=':
… …
3290rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3291{ 2748{
3292 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3293 unsigned int nargs, p; 2750 unsigned int nargs, p;
3294 int n, ndef; 2751 int n, ndef;
3295 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3296 2753
3297 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3298 arg[--nargs] = 0;
3299 2755
3300 priv = 0; 2756 priv = 0;
3301 ch = cmd_getc (); 2757 ch = cmd_getc ();
3302 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3303 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3304 priv = ch; 2761 priv = ch;
3305 ch = cmd_getc (); 2762 ch = cmd_getc ();
3306 } 2763 }
3307 2764
3308 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3337 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 2796 if (arg[p] == -1)
3340 arg[p] = ndef; 2797 arg[p] = ndef;
3341 2798
3342#ifdef DEBUG_CMD
3343 fprintf (stderr, "CSI ");
3344 for (p = 0; p < nargs; p++)
3345 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346 fprintf (stderr, "%c\n", ch);
3347#endif
3348
3349 /* 2799 /*
3350 * private mode handling 2800 * private mode handling
3351 */ 2801 */
3352 if (priv) 2802 if (priv)
3353 { 2803 {
3354 switch (priv) 2804 switch (priv)
3355 { 2805 {
3356 case '>': 2806 case '>':
3357 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3358 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 }
3359 break; 2818 break;
2819
3360 case '?': 2820 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 2823 break;
3364 } 2824 }
… …
3489 break; 2949 break;
3490 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3491 scr_report_position (); 2951 scr_report_position ();
3492 break; 2952 break;
3493 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3494 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3495 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3496 break; 2956 break;
3497 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3499 break; 2959 break;
… …
3566 break; 3026 break;
3567 case CSI_75: 3027 case CSI_75:
3568 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3569 break; 3029 break;
3570 3030
3571#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3572 case CSI_74: 3032 case CSI_74:
3573 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3574 break; 3034 break;
3575#endif 3035#endif
3576 3036
… …
3583 break; 3043 break;
3584 } 3044 }
3585} 3045}
3586/*}}} */ 3046/*}}} */
3587 3047
3588#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3589/* ARGSUSED */ 3049/* ARGSUSED */
3590void 3050void
3591rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592{ 3052{
3593 int x, y; 3053 int x, y;
3594 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3595 Window wdummy; 3055 Window wdummy;
3596 dDisp; 3056
3057 dLocal (Display *, dpy);
3597 3058
3598 if (nargs == 0) 3059 if (nargs == 0)
3599 return; 3060 return;
3600 3061
3601 switch (args[0]) 3062 switch (args[0])
3602 { 3063 {
3603 /* 3064 /*
3604 * commands 3065 * commands
3605 */ 3066 */
3606 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3607 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3608 break; 3069 break;
3609 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3610 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3611 break; 3072 break;
3612 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3613 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3614 break; 3075 break;
3615 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617 break; 3078 break;
3618 case 5: /* raise window */ 3079 case 5: /* raise window */
3619 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3620 break; 3081 break;
3621 case 6: /* lower window */ 3082 case 6: /* lower window */
3622 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3623 break; 3084 break;
3624 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3625 scr_touch (true); 3086 scr_touch (true);
3626 break; 3087 break;
3627 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3634 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3635 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3636 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3637 break; 3098 break;
3638 3099
3639
3640 /* 3100 /*
3641 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3642 */ 3102 */
3643 case 11: /* report window state */ 3103 case 11: /* report window state */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646 break; 3106 break;
3647 case 13: /* report window position */ 3107 case 13: /* report window position */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3650 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3651 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3652 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3653 break; 3113 break;
3654 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657 break; 3117 break;
3658 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3659 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660 break; 3120 break;
… …
3662 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663 break; 3123 break;
3664 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3665 { 3125 {
3666 char *s; 3126 char *s;
3667 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3668 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 */
3669 XFree (s); 3129 XFree (s);
3670 } 3130 }
3671 break; 3131 break;
3672 case 21: /* report window title */ 3132 case 21: /* report window title */
3673 { 3133 {
3674 char *s; 3134 char *s;
3675 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3676 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 */
3677 XFree (s); 3137 XFree (s);
3678 } 3138 }
3679 break; 3139 break;
3680 } 3140 }
3681} 3141}
… …
3708 seen_esc = true; 3168 seen_esc = true;
3709 continue; 3169 continue;
3710 } 3170 }
3711 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3712 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3713 else if (ch < 0x20) 3175 else if (ch < 0x20)
3714 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3715 3177
3716 seen_esc = false; 3178 seen_esc = false;
3717 3179
3718 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3719 // stop at some sane length 3181 // stop at some sane length
3720 return NULL; 3182 return NULL;
3721 3183
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3725 string[n++] = ch; 3184 string[n++] = ch;
3726 } 3185 }
3727 3186
3728 string[n++] = '\0'; 3187 string[n++] = '\0';
3729 3188
3730 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3781void 3240void
3782rxvt_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)
3783{ 3242{
3784 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3785 { 3244 {
3786 unsigned short r, g, b; 3245 rgba c;
3787 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
3788 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);
3789 } 3254 }
3790 else 3255 else
3791 set_window_color (color, str); 3256 set_window_color (color, str);
3792} 3257}
3793 3258
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3261 */
3797void 3262void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3263rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3264{
3800 int changed = 0;
3801 int color; 3265 int color;
3802 char *buf, *name; 3266 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3268 int saveop = op;
3805 dDisp; 3269
3270 dLocal (Display *, dpy);
3806 3271
3807 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
3808 switch (op) 3277 switch (op)
3809 { 3278 {
3810 case XTerm_name: 3279 case XTerm_name:
3811 set_title (str); 3280 set_title (str);
3812 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3826 unsigned long bytes_after; 3295 unsigned long bytes_after;
3827 unsigned char *value = 0; 3296 unsigned char *value = 0;
3828 const char *str = ""; 3297 const char *str = "";
3829 3298
3830 if (prop 3299 if (prop
3831 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3832 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None 3304 && actual_type != None
3836 && actual_format == 8) 3305 && actual_format == 8)
3837 str = (const char *)(value); 3306 str = (const char *)(value);
3838 3307
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3840 3309
3841 XFree (value); 3310 XFree (value);
3842 } 3311 }
3843 else 3312 else
3844 { 3313 {
… …
3848 { 3317 {
3849 *eq = 0; 3318 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3851 } 3320 }
3852 else 3321 else
3853 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3854 display->atom (str)); 3323 display->atom (str));
3855 } 3324 }
3856 break; 3325 break;
3857 3326
3858 case XTerm_Color: 3327 case XTerm_Color:
… …
3868 break; 3337 break;
3869 3338
3870 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3340 *buf++ = '\0';
3872 3341
3873 if (name[0] == '?' && !name[1]) 3342 process_color_seq (op, color, name, resp);
3874 {
3875 unsigned short r, g, b;
3876 pix_colors_focused[color].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 }
3879 else
3880 set_window_color (color, name);
3881 } 3343 }
3882 break; 3344 break;
3345 case Rxvt_restoreFG:
3883 case XTerm_Color00: 3346 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3885 break; 3348 break;
3349 case Rxvt_restoreBG:
3886 case XTerm_Color01: 3350 case XTerm_Color01:
3887 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3888 break; 3352 break;
3889#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3892 break; 3356 break;
3893#endif 3357#endif
3894 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3896 break; 3360 break;
3897 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3899 break; 3363 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_RV: 3365 case XTerm_Color_RV:
3902 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3366 process_color_seq (op, Color_RV, str, resp);
3903 break; 3367 break;
3904 case Rxvt_Color_BD: 3368 case Rxvt_Color_BD:
3905 case URxvt_Color_BD: 3369 case URxvt_Color_BD:
3906 process_color_seq (op, Color_BD, str, resp); 3370 process_color_seq (op, Color_BD, str, resp);
3907 break; 3371 break;
3908 case Rxvt_Color_UL: 3372 case Rxvt_Color_UL:
3909 case URxvt_Color_UL: 3373 case URxvt_Color_UL:
3910 process_color_seq (op, Color_UL, str, resp); 3374 process_color_seq (op, Color_UL, str, resp);
3911 break; 3375 break;
3912 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3913 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3914 break; 3378 break;
3915#endif 3379#endif
3916#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3917 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3918 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3919 check_our_parents (); 3383 {
3920 if (am_transparent) 3384 bool changed = false;
3921 want_full_refresh = want_refresh = 1;
3922 break;
3923#endif
3924 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
3925 case Rxvt_Pixmap: 3399 case Rxvt_Pixmap:
3926 if (*str != ';') 3400 if (!strcmp (str, "?"))
3927 { 3401 {
3928#if XPM_BACKGROUND 3402 char str[256];
3929 scale_pixmap (""); /* reset to default scaling */ 3403
3930 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3931 scr_touch (true); 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3932#endif 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3933 } 3408 }
3934 3409 else
3935 while ((str = strchr (str, ';')) != NULL)
3936 { 3410 {
3411 int changed = 0;
3412
3413 if (*str != ';')
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 {
3937 str++; 3426 str++;
3938#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3939 changed += scale_pixmap (str); 3428 changed++;
3940#endif 3429 str = strchr (str, ';');
3430 }
3431
3432 if (changed)
3433 update_background ();
3941 } 3434 }
3942
3943 if (changed)
3944 {
3945#ifdef XPM_BACKGROUND
3946 resize_pixmap ();
3947 scr_touch (true);
3948#endif
3949 }
3950 break; 3435 break;
3951 3436#endif
3952 case Rxvt_restoreFG:
3953 set_window_color (Color_fg, str);
3954 break;
3955 case Rxvt_restoreBG:
3956 set_window_color (Color_bg, str);
3957 break;
3958 3437
3959 case XTerm_logfile: 3438 case XTerm_logfile:
3960 // TODO, when secure mode? 3439 // TODO, when secure mode?
3961 break; 3440 break;
3962 3441
3963#ifdef MENUBAR
3964 case URxvt_Menu:
3965 if (OPTION (Opt_insecure))
3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967 break;
3968#endif
3969#if 0 3442#if 0
3970 case Rxvt_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3971 { 3444 {
3972 int fd; 3445 int fd;
3973 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3446 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3986 case URxvt_italicFont: 3459 case URxvt_italicFont:
3987 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3988#endif 3461#endif
3989 if (query) 3462 if (query)
3990 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3991 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3992 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3993 resp); 3466 resp);
3994 else 3467 else
3995 { 3468 {
3996 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3999 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
4000 set_fonts (); 3473 set_fonts ();
4001 } 3474 }
4002 break; 3475 break;
4003 3476
4004#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
4005 case URxvt_locale: 3486 case URxvt_locale:
4006 if (query) 3487 if (query)
4007 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);
4008 else 3489 else
4009 { 3490 {
4010 set_locale (str); 3491 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
4012 init_xlocale (); 3493 init_xlocale ();
4013 } 3494 }
4014 break; 3495 break;
4015 3496
4016 case URxvt_view_up: 3497 case URxvt_view_up:
… …
4027 break; 3508 break;
4028#endif 3509#endif
4029 3510
4030#if ENABLE_PERL 3511#if ENABLE_PERL
4031 case URxvt_perl: 3512 case URxvt_perl:
4032 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)))
4033 ; // no responses yet 3514 ; // no responses yet
4034 break; 3515 break;
4035#endif 3516#endif
4036 } 3517 }
4037} 3518}
… …
4069 return state; 3550 return state;
4070} 3551}
4071 3552
4072/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
4073void 3554void
4074rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4075{ 3556{
4076 unsigned int i, j; 3557 unsigned int i, j;
4077 int state; 3558 int state;
4078 3559
4079 static const struct 3560 static const struct
4080 { 3561 {
4081 const int argval; 3562 const int argval;
4082 const unsigned long bit; 3563 const unsigned long bit;
4083 }
4084
4085 argtopriv[] = { 3564 } argtopriv[] = {
4086 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4087 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4088 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4089 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4090 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
4091 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
4092 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
4093 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
4094 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
4095#ifdef menuBar_esc
4096 { menuBar_esc, PrivMode_menuBar },
4097#endif
4098 // 18, 19 printing-related 3574 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
4100#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
4101 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
4102#endif 3578#endif
… …
4109 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4110#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4111 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4112#endif 3588#endif
4113 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4114 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4115 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4116 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4117 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4118 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4119 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4120 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4121 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4122 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4123 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4124 { 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 */
4125 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4126 }; 3602 };
4127 3603
4128 if (nargs == 0) 3604 if (nargs == 0)
4129 return; 3605 return;
4130 3606
… …
4156 scr_touch (true); 3632 scr_touch (true);
4157 break; 3633 break;
4158#endif 3634#endif
4159 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4160 case 1049: 3636 case 1049:
4161 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4162 if (mode == 0) 3638 if (mode == 0)
4163 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4164 else if (mode == 1) 3640 else if (mode == 1)
4165 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4166 break; 3642 break;
… …
4178 */ 3654 */
4179 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4180 break; 3656 break;
4181 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4182 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4183 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4184 break; 3663 break;
4185 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4186 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4187 break; 3666 break;
4188 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4195 scr_autowrap (state); 3674 scr_autowrap (state);
4196 break; 3675 break;
4197 /* 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 */
4198 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4199 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4200 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4201 break; 3680 break;
4202#ifdef menuBar_esc
4203 case menuBar_esc:
4204#ifdef MENUBAR
4205 map_menuBar (state);
4206#endif
4207 break;
4208#endif
4209#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4210 case scrollBar_esc: 3682 case scrollBar_esc:
4211 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4212 { 3684 {
4213 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
… …
4225 break; 3697 break;
4226 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4227 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4228 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4229 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4230 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4231 break; 3703 break;
4232#if 0
4233 case 1001: 3704 case 1002:
4234 break; /* X11 mouse highlighting */ 3705 case 1003:
4235#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;
4236 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4237 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4238 break; 3718 break;
4239 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4240 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4241 break; 3721 break;
4242 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4243 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4244 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4245 scr_erase_screen (2); 3725 scr_erase_screen (2);
4246 scr_change_screen (state); 3726 scr_change_screen (state);
4247 break; 3727 break;
4248 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4249 scr_change_screen (state); 3729 scr_change_screen (state);
4250 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 3732 scr_erase_screen (2);
4253 break; 3733 break;
4254 default: 3734 default:
4255 break; 3735 break;
… …
4383 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4384 break; 3864 break;
4385 3865
4386 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4387 3867
4388#if ENABLE_FRILLS 3868#if !ENABLE_MINIMAL
4389 case 90: 3869 case 90:
4390 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4391 case 92: 3871 case 92:
4392 case 93: 3872 case 93:
4393 case 94: 3873 case 94:
… …
4417rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4418{ 3898{
4419 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4420 3900
4421 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4422 { /* query graphics */ 3903 /* query graphics */
4423 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4424 return; 3905 return;
4425 } 3906 }
4426 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4427 do 3908 do
… …
4458rxvt_term::tt_write (const char *data, unsigned int len) 3939rxvt_term::tt_write (const char *data, unsigned int len)
4459{ 3940{
4460 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461 return; 3942 return;
4462 3943
4463 if (pty.pty < 0) 3944 if (pty->pty < 0)
4464 return; 3945 return;
4465 3946
4466 if (v_buflen == 0) 3947 if (v_buflen == 0)
4467 { 3948 {
4468 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469 3950
4470 if ((unsigned int)written == len) 3951 if ((unsigned int)written == len)
4471 return; 3952 return;
4472 3953
4473 data += written; 3954 data += written;
… …
4477 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4478 3959
4479 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4480 v_buflen += len; 3961 v_buflen += len;
4481 3962
4482 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4483} 3964}
4484 3965
4485void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4486{ 3967{
4487 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));
4488 3969
4489 if (written > 0) 3970 if (written > 0)
4490 { 3971 {
4491 v_buflen -= written; 3972 v_buflen -= written;
4492 3973
4493 if (v_buflen == 0) 3974 if (v_buflen == 0)
4494 { 3975 {
4495 free (v_buffer); 3976 free (v_buffer);
4496 v_buffer = 0; 3977 v_buffer = 0;
4497 v_buflen = 0;
4498 3978
4499 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4500 return; 3980 return;
4501 } 3981 }
4502 3982
4503 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4504 } 3984 }
4505 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4506 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4507} 3987}
4508 3988
4509/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4510 3990

Diff Legend

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