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.264 by root, Mon Jan 16 06:37:51 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
1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1328 return;
1313 1329
1314 // for XQueryPointer 1330 // for XQueryPointer
1315 Window unused_root, unused_child; 1331 Window unused_root, unused_child;
… …
1317 unsigned int unused_mask; 1333 unsigned int unused_mask;
1318 1334
1319 switch (ev.type) 1335 switch (ev.type)
1320 { 1336 {
1321 case KeyPress: 1337 case KeyPress:
1322#if ISO_14755 1338 key_press (ev.xkey);
1323 if (!(iso14755buf & ISO_14755_52))
1324#endif
1325 lookup_key (ev.xkey);
1326
1327 break; 1339 break;
1328 1340
1329 case KeyRelease: 1341 case KeyRelease:
1330 { 1342 key_release (ev.xkey);
1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1332 KeySym keysym;
1333
1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1335#endif
1336
1337#if ENABLE_FRILLS || ISO_14755
1338 // ISO 14755 support
1339 if (iso14755buf)
1340 if (iso14755buf & ISO_14755_52)
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345# if ISO_14755
1346 // iso14755 part 5.2 handling: release time
1347 // first: controls
1348 if ((ev.xkey.state & ControlMask)
1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1351 {
1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1353 commit_iso14755 ();
1354 goto skip_switch;
1355 }
1356
1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1358 if (i[0] == keysym)
1359 {
1360 iso14755buf = ISO_14755_51 | i[1];
1361 commit_iso14755 ();
1362 goto skip_switch;
1363 }
1364
1365 scr_bell ();
1366# endif
1367 iso14755buf = 0;
1368 break;
1369 }
1370 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1371 {
1372# if ENABLE_OVERLAY
1373 scr_overlay_off ();
1374# endif
1375 if (iso14755buf & ISO_14755_51)
1376 commit_iso14755 ();
1377#if ISO_14755
1378 else if (iso14755buf & ISO_14755_STARTED)
1379 {
1380 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1381
1382 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1383 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1384 }
1385# endif
1386 else
1387 iso14755buf = 0;
1388 }
1389#endif
1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393 break;
1394
1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1396 if (!(ev.xkey.state & ControlMask))
1397 slip_wheel_ev.stop ();
1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1399 mouse_slip_wheel_speed = 0;
1400#endif
1401 break; 1343 break;
1402 }
1403 1344
1404 case ButtonPress: 1345 case ButtonPress:
1405 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1406 break; 1347 break;
1407 1348
… …
1409 button_release (ev.xbutton); 1350 button_release (ev.xbutton);
1410 break; 1351 break;
1411 1352
1412 case ClientMessage: 1353 case ClientMessage:
1413 if (ev.xclient.format == 32 1354 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1355 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 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 {
1416 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)))
1417 destroy (); 1364 destroy ();
1365 }
1418#if ENABLE_EWMH 1366#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1370 &ev);
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 }
1423#endif 1382#endif
1424 } 1383 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1434#ifdef OFFIX_DND
1435 /* OffiX Dnd (drag 'n' drop) protocol */
1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1437 && (ev.xclient.data.l[0] == DndFile
1438 || ev.xclient.data.l[0] == DndDir
1439 || ev.xclient.data.l[0] == DndLink))
1440 {
1441 /* Get Dnd data */
1442 Atom ActualType;
1443 int ActualFormat;
1444 unsigned char *data;
1445 unsigned long Size, RemainingBytes;
1446
1447 XGetWindowProperty (disp, display->root,
1448 xa[XA_DNDSELECTION],
1449 0L, 1000000L,
1450 False, AnyPropertyType,
1451 &ActualType, &ActualFormat,
1452 &Size, &RemainingBytes,
1453 &data);
1454 set_string_property (XA_CUT_BUFFER0, data);
1455 XFree (data);
1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1458 }
1459#endif /* OFFIX_DND */
1460 break;
1461
1462 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1384 break;
1465 1385
1466 /* 1386 /*
1467 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1468 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1487 break; 1407 break;
1488 } 1408 }
1489 break; 1409 break;
1490 1410
1491 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1492 focus_in (); 1415 focus_in ();
1493 break; 1416 break;
1494 1417
1495 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1496 focus_out (); 1422 focus_out ();
1497 break; 1423 break;
1498 1424
1499 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);*/
1500 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1501 { 1430 {
1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1503 ; 1432 ;
1504 1433
1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506 { 1435 {
1507 seen_resize = 1; 1436 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1438 }
1510 1439 else
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1440 {
1512 if (OPTION (Opt_transparent)) 1441#ifdef HAVE_BG_PIXMAP
1513 check_our_parents (); 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1514#endif 1449#endif
1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 } 1453 }
1516 break; 1454 break;
1517 1455
1518 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1461
1523 break; 1462 break;
1524 1463
1525 case SelectionClear: 1464 case SelectionClear:
1526 selection_clear (); 1465 selection_clear ();
… …
1534 case SelectionRequest: 1473 case SelectionRequest:
1535 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1536 break; 1475 break;
1537 1476
1538 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
1539 mapped = 1; 1494 mapped = 1;
1540#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1541 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1542#endif 1497#endif
1543 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 break; 1499 break;
1545 1500
1546 case UnmapNotify: 1501 case UnmapNotify:
… …
1548#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1549 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1550#endif 1505#endif
1551 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1552 break; 1507 break;
1553
1554#ifdef TRANSPARENT
1555 case ReparentNotify:
1556 rootwin_cb (ev);
1557 break;
1558#endif /* TRANSPARENT */
1559 1508
1560 case GraphicsExpose: 1509 case GraphicsExpose:
1561 case Expose: 1510 case Expose:
1562 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1563 { 1512 {
1564 do 1513 do
1514 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1568 1519
1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570 1521
1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1572 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1573 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1574 1527
1575 want_refresh = 1; 1528 want_refresh = 1;
1576 } 1529 }
1577 else 1530 else
1578 { 1531 {
1579 XEvent unused_event; 1532 XEvent unused_event;
1580 1533
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1582 ; 1535 ;
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1584 ; 1537 ;
1585 1538
1586 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1587 { 1540 {
1588 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1589 scrollbar_show (0); 1542 scrollbar_show (0);
1590 } 1543 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595
1596#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window);
1599#endif
1600 } 1544 }
1601 break; 1545 break;
1602 1546
1603 case MotionNotify: 1547 case MotionNotify:
1604#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1549 if (hidden_pointer)
1606 pointer_unblank (); 1550 pointer_unblank ();
1607#endif 1551#endif
1608#if MENUBAR 1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1609 if (isMenuBarWindow (ev.xany.window)) 1553 || priv_modes & PrivMode_MouseAnyEvent)
1610 {
1611 menubar_control (ev.xbutton); 1554 mouse_report (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1556 break;
1617 1557
1618 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1619 { 1559 {
1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1562 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1564 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1625 ; 1566 ;
1626 1567
1627 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1628 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1629 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1630 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1631 &ev.xbutton.state); 1572 &ev.xbutton.state);
1632#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1652 int dist; 1593 int dist;
1653 1594
1654 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1655 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1656 */ 1597 */
1657 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1658 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1659 1600
1660 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1661 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1662 */ 1603 */
1663 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1685 else 1626 else
1686 { 1627 {
1687 /* we are within the text window, so we 1628 /* we are within the text window, so we
1688 * shouldn't be scrolling 1629 * shouldn't be scrolling
1689 */ 1630 */
1690 if (sel_scroll_ev.active)
1691 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1692 } 1632 }
1693#endif 1633#endif
1694#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1695 } 1635 }
1696#endif 1636#endif
1697 } 1637 }
1698 } 1638 }
1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1700 { 1640 {
1701 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1702 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1703 ; 1643 ;
1704 1644
1705 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1706 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1707 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1708 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1709 &unused_mask); 1649 &unused_mask);
1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1711 scrollbar_size ()); 1651 scrollbar_size ());
1712 want_refresh = 1; 1652 want_refresh = 1;
1713 refresh_limit = 0;
1714 scrollbar_show (1); 1653 scrollbar_show (1);
1715 } 1654 }
1716 break; 1655 break;
1717 } 1656 }
1718 1657
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK) 1658#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1723 { 1660 {
1724 if (hidden_cursor) 1661 if (hidden_cursor)
1725 { 1662 {
1726 hidden_cursor = 0; 1663 hidden_cursor = 0;
1727 want_refresh = 1; 1664 want_refresh = 1;
1728 } 1665 }
1729 1666
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1667 cursor_blink_ev.again ();
1731 } 1668 }
1732#endif 1669#endif
1733 1670
1734#if defined(POINTER_BLANK) 1671#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 { 1673 {
1737 if (ev.type == MotionNotify 1674 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress 1675 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease) 1676 || ev.type == ButtonRelease)
1740 if (hidden_pointer) 1677 if (hidden_pointer)
… …
1742 1679
1743 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1744 pointer_blank (); 1681 pointer_blank ();
1745 } 1682 }
1746#endif 1683#endif
1684
1685 refresh_check ();
1747} 1686}
1748 1687
1749void 1688void
1750rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1751{ 1690{
1752 if (!focus) 1691 if (!focus)
1753 { 1692 {
1754 focus = 1; 1693 focus = 1;
1755 want_refresh = 1; 1694 want_refresh = 1;
1756 1695
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1697
1759#if USE_XIM 1698#if USE_XIM
1760 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1761 { 1700 {
1762 IMSetStatusPosition (); 1701 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1764 } 1703 }
1765#endif 1704#endif
1766#if CURSOR_BLINK 1705#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1769#endif 1708#endif
1770#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1772 { 1711 {
1773 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1774 scr_recolour (); 1713 scr_recolour ();
1775 } 1714 }
1776#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
1777 } 1726 }
1778} 1727}
1779 1728
1780void 1729void
1781rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1789 1738
1790#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf) 1740 if (iso14755buf)
1792 { 1741 {
1793 iso14755buf = 0; 1742 iso14755buf = 0;
1794# if ENABLE_OVERLAY 1743# if ISO_14755
1795 scr_overlay_off (); 1744 scr_overlay_off ();
1796# endif 1745# endif
1797 } 1746 }
1798#endif 1747#endif
1799#if USE_XIM 1748#if USE_XIM
1800 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1802#endif 1751#endif
1803#if CURSOR_BLINK 1752#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1806 hidden_cursor = 0; 1756 hidden_cursor = 0;
1807#endif 1757#endif
1808#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1810 { 1760 {
… …
1813 } 1763 }
1814#endif 1764#endif
1815 } 1765 }
1816} 1766}
1817 1767
1818#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
1819void 1782void
1820rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1784{
1822 make_current (); 1785 make_current ();
1823 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
1824 switch (ev.type) 1792 switch (ev.type)
1825 { 1793 {
1826 case PropertyNotify: 1794 case PropertyNotify:
1827 /* 1795 /*
1828 * 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,
1829 * 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.
1830 */ 1798 */
1831 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1832 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1833 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1834 1805
1835 /* FALLTHROUGH */
1836 case ReparentNotify:
1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1838 want_refresh = want_full_refresh = 1;
1839 break; 1806 break;
1840 } 1807 }
1808# endif
1809
1810 refresh_check ();
1841} 1811}
1842#endif 1812#endif
1843 1813
1844void 1814void
1845rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1854 /* 1824 /*
1855 * VT window processing of button press 1825 * VT window processing of button press
1856 */ 1826 */
1857 if (ev.window == vt) 1827 if (ev.window == vt)
1858 { 1828 {
1829 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1859#if ISO_14755 1832#if ISO_14755
1860 // 5.4 1833 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1834 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1835 {
1863 iso14755_54 (ev.x, ev.y); 1836 iso14755_54 (ev.x, ev.y);
… …
1897 mouse_report (ev); 1870 mouse_report (ev);
1898 } 1871 }
1899#else 1872#else
1900 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1901 mouse_report (ev); 1874 mouse_report (ev);
1902#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1903 1876
1904 } 1877 }
1905 else 1878 else
1906 { 1879 {
1907 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1881 MEvent.clicks = 0;
1909 1882
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1883 switch (ev.button)
1912 { 1884 {
1913 case Button1: 1885 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1886 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1887 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1888#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1889 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1890#else
1919 selection.rect = false; 1891 selection.rect = false;
1920#endif 1892#endif
1921 1893
1922 /* allow shift+left click to extend selection */ 1894 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1895 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1896 {
1925 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1898 selection_rotate (ev.x, ev.y);
1927 else 1899 else
1928 selection_extend (ev.x, ev.y, 1); 1900 selection_extend (ev.x, ev.y, 1);
1929 } 1901 }
1930 else 1902 else
1931 { 1903 {
1932 if (MEvent.button == Button1 && clickintime) 1904 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1905 MEvent.clicks++;
1934 else 1906 else
1935 MEvent.clicks = 1; 1907 MEvent.clicks = 1;
1936 1908
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1909 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1910 }
1939 1911
1940 MEvent.button = Button1; 1912 MEvent.button = Button1;
1941 break; 1913 break;
1942 1914
1943 case Button3: 1915 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1916 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1917 selection_rotate (ev.x, ev.y);
1946 else 1918 else
1947 selection_extend (ev.x, ev.y, 1); 1919 selection_extend (ev.x, ev.y, 1);
1948 1920
1949 MEvent.button = Button3; 1921 MEvent.button = Button3;
1950 break; 1922 break;
1951 } 1923 }
1952 } 1924 }
1953 1925
1954 MEvent.time = ev.time; 1926 MEvent.time = ev.time;
1955 return; 1927 return;
1956 } 1928 }
1957 1929
1958 /* 1930 /*
1959 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1960 */ 1932 */
1961 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 1934 {
1963 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;
1964 /* 1943 /*
1965 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1945 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1968 * 1947 *
… …
1977 /* 1956 /*
1978 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1981 */ 1960 */
1982 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1988 && scrollbarnext_dnButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_dnButton (ev.y)))
1991 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1992 else 1965 else
1993 switch (ev.button) 1966 switch (ev.button)
1994 { 1967 {
1995 case Button2: 1968 case Button2:
… …
2002 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
2003 break; 1976 break;
2004 } 1977 }
2005 } 1978 }
2006 else 1979 else
2007#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 1981 {
2014 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
2015 upordown = -1; /* up */
2016 else if (scrollbarnext_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 else if (scrollBar.style == R_SB_RXVT)
2020 {
2021 if (scrollbarrxvt_upButton (ev.y))
2022 upordown = -1; /* up */
2023 else if (scrollbarrxvt_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 if (upordown)
2027 { 1983 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 1987#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
2032 { 1989 {
2033 if (upordown < 0) 1990 if (direction == UP)
2034 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
2035 else 1992 else
2036 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
2037 } 1994 }
2038 } 1995 }
2039 else 1996 else
2040 switch (ev.button) 1997 switch (ev.button)
2041 { 1998 {
2042 case Button2: 1999 case Button2:
2043 switch (scrollbar_align) 2000 switch (scrollBar.align)
2044 { 2001 {
2045 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2046 csrO = 0; 2003 csrO = 0;
2047 break; 2004 break;
2048 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2056 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2057 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2060 2017
2061 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2062 break; 2019 break;
2063 2020
2064 case Button1: 2021 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2068 2025
2069 case Button3: 2026 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2080 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2081# else 2038# else
2082 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2083# endif 2040# endif
2084 else 2041 else
2085 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2086 } 2043 }
2087 else 2044 else
2088 { 2045 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2047 (nrow
… …
2096 } 2053 }
2097 } 2054 }
2098 2055
2099 return; 2056 return;
2100 } 2057 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2058}
2110 2059
2111void 2060void
2112rxvt_term::button_release (XButtonEvent &ev) 2061rxvt_term::button_release (XButtonEvent &ev)
2113{ 2062{
… …
2115 2064
2116 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2117 if (!bypass_keystate) 2066 if (!bypass_keystate)
2118 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2119 2068
2120 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2121 { 2070 {
2122 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2123 scrollbar_show (0); 2072 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2073 }
2128 2074
2129#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2132#endif 2077#endif
2133 2078
2134 if (ev.window == vt) 2079 if (ev.window == vt)
2135 { 2080 {
2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2082 return;
2083
2136#if ISO_14755 2084#if ISO_14755
2137 // 5.4 2085 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2087 return;
2140#endif 2088#endif
2089
2141 if (reportmode) 2090 if (reportmode)
2142 { 2091 {
2143 /* mouse report from vt window */ 2092 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2093 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2094 if (ev.button >= 4)
… …
2156 mouse_report (ev); 2105 mouse_report (ev);
2157 } 2106 }
2158#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2159 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2160 mouse_report (ev); 2109 mouse_report (ev);
2161#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2162 return; 2111 return;
2163 } 2112 }
2164 2113
2165 /* 2114 /*
2166 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2169 if (priv_modes & PrivMode_mouse_report 2118 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2119 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2120 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2121 selection_extend (ev.x, ev.y, 0);
2173 2122
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2123 switch (ev.button)
2178 { 2124 {
2179 case Button1: 2125 case Button1:
2180 case Button3: 2126 case Button3:
2181 selection_make (ev.time); 2127 selection_make (ev.time);
2182 break; 2128 break;
2129
2183 case Button2: 2130 case Button2:
2184 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);
2185 break; 2133 break;
2134
2186#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2187 case Button4: 2136 case Button4:
2188 case Button5: 2137 case Button5:
2189 { 2138 {
2190 int i; 2139 int i;
… …
2192 2141
2193 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2194 2143
2195 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2196 i = 1; 2145 i = 1;
2197 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2198 i = nrow - 1; 2147 i = nrow - 1;
2199 else 2148 else
2200 i = 5; 2149 i = 5;
2201 2150
2202# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2204 { 2153 {
2205 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2206 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2207 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2208 2157
2209 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2210 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2211
2212 slip_wheel_ev.start ();
2213 } 2160 }
2214 else 2161 else
2162# endif
2215 { 2163 {
2216# endif
2217 scr_page (v, i); 2164 scr_page (v, i);
2218 scrollbar_show (1); 2165 scrollbar_show (1);
2219# ifdef MOUSE_SLIP_WHEELING
2220 } 2166 }
2221# endif
2222 } 2167 }
2223 break; 2168 break;
2224#endif 2169#endif
2225 } 2170 }
2226 } 2171 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2172}
2232
2233#ifdef TRANSPARENT
2234#if TINTING
2235/* taken from aterm-0.4.2 */
2236
2237typedef uint32_t RUINT32T;
2238
2239void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2240{
2241 int sh_r, sh_g, sh_b;
2242 RUINT32T mask_r, mask_g, mask_b;
2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246 int i;
2247
2248 Visual *visual = display->visual;
2249
2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251
2252 /* for convenience */
2253 mask_r = visual->red_mask;
2254 mask_g = visual->green_mask;
2255 mask_b = visual->blue_mask;
2256
2257 /* boring lookup table pre-initialization */
2258 switch (srcImage->bits_per_pixel) {
2259 case 15:
2260 if ((mask_r != 0x7c00) ||
2261 (mask_g != 0x03e0) ||
2262 (mask_b != 0x001f))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2265 lookup_r = lookup;
2266 lookup_g = lookup+32;
2267 lookup_b = lookup+32+32;
2268 sh_r = 10;
2269 sh_g = 5;
2270 sh_b = 0;
2271 break;
2272 case 16:
2273 if ((mask_r != 0xf800) ||
2274 (mask_g != 0x07e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+64;
2281 sh_r = 11;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 24:
2286 if ((mask_r != 0xff0000) ||
2287 (mask_g != 0x00ff00) ||
2288 (mask_b != 0x0000ff))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2291 lookup_r = lookup;
2292 lookup_g = lookup+256;
2293 lookup_b = lookup+256+256;
2294 sh_r = 16;
2295 sh_g = 8;
2296 sh_b = 0;
2297 break;
2298 case 32:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 default:
2312 return; /* we do not support this color depth */
2313 }
2314
2315 /* prepare limits for color transformation (each channel is handled separately) */
2316 if (shade < 0) {
2317 shade = -shade;
2318 if (shade < 0) shade = 0;
2319 if (shade > 100) shade = 100;
2320
2321 lower_lim_r = 65535-rm;
2322 lower_lim_g = 65535-gm;
2323 lower_lim_b = 65535-bm;
2324
2325 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2326 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2327 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2328
2329 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2330 } else {
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2335
2336 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2337 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2338 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2339 }
2340
2341 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2342 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2343 {
2344 unsigned int tmp;
2345
2346 tmp = lower_lim_r;
2347 lower_lim_r = lower_lim_b;
2348 lower_lim_b = tmp;
2349
2350 tmp = upper_lim_r;
2351 upper_lim_r = upper_lim_b;
2352 upper_lim_b = tmp;
2353 }
2354
2355 /* fill our lookup tables */
2356 for (i = 0; i <= mask_r>>sh_r; i++)
2357 {
2358 RUINT32T tmp;
2359 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2360 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2361 lookup_r[i] = (tmp/65535)<<sh_r;
2362 }
2363 for (i = 0; i <= mask_g>>sh_g; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2367 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2368 lookup_g[i] = (tmp/65535)<<sh_g;
2369 }
2370 for (i = 0; i <= mask_b>>sh_b; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2374 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2375 lookup_b[i] = (tmp/65535)<<sh_b;
2376 }
2377
2378 /* apply table to input image (replacing colors by newly calculated ones) */
2379 switch (srcImage->bits_per_pixel)
2380 {
2381 case 15:
2382 {
2383 unsigned short *p1, *pf, *p, *pl;
2384 p1 = (unsigned short *) srcImage->data;
2385 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2386 while (p1 < pf)
2387 {
2388 p = p1;
2389 pl = p1 + srcImage->width;
2390 for (; p < pl; p++)
2391 {
2392 *p = lookup_r[(*p & 0x7c00)>>10] |
2393 lookup_g[(*p & 0x03e0)>> 5] |
2394 lookup_b[(*p & 0x001f)];
2395 }
2396 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2397 }
2398 break;
2399 }
2400 case 16:
2401 {
2402 unsigned short *p1, *pf, *p, *pl;
2403 p1 = (unsigned short *) srcImage->data;
2404 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2405 while (p1 < pf)
2406 {
2407 p = p1;
2408 pl = p1 + srcImage->width;
2409 for (; p < pl; p++)
2410 {
2411 *p = lookup_r[(*p & 0xf800)>>11] |
2412 lookup_g[(*p & 0x07e0)>> 5] |
2413 lookup_b[(*p & 0x001f)];
2414 }
2415 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 case 24:
2420 {
2421 unsigned char *p1, *pf, *p, *pl;
2422 p1 = (unsigned char *) srcImage->data;
2423 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2424 while (p1 < pf)
2425 {
2426 p = p1;
2427 pl = p1 + srcImage->width * 3;
2428 for (; p < pl; p += 3)
2429 {
2430 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2431 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2432 p[2] = lookup_r[(p[2] & 0x0000ff)];
2433 }
2434 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2435 }
2436 break;
2437 }
2438 case 32:
2439 {
2440 RUINT32T *p1, *pf, *p, *pl;
2441 p1 = (RUINT32T *) srcImage->data;
2442 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2443
2444 while (p1 < pf)
2445 {
2446 p = p1;
2447 pl = p1 + srcImage->width;
2448 for (; p < pl; p++)
2449 {
2450 *p = lookup_r[(*p & 0xff0000)>>16] |
2451 lookup_g[(*p & 0x00ff00)>> 8] |
2452 lookup_b[(*p & 0x0000ff)] |
2453 (*p & ~0xffffff);
2454 }
2455 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2456 }
2457 break;
2458 }
2459 }
2460
2461 free (lookup);
2462}
2463#endif
2464
2465/*
2466 * Check our parents are still who we think they are.
2467 * Do transparency updates if required
2468 */
2469int
2470rxvt_term::check_our_parents ()
2471{
2472 int i, pchanged, aformat, have_pixmap, rootdepth;
2473 unsigned long nitems, bytes_after;
2474 Atom atype;
2475 unsigned char *prop = NULL;
2476 Window root, oldp, *list;
2477 Pixmap rootpixmap = None;
2478 XWindowAttributes wattr, wrootattr;
2479 dDisp;
2480
2481 pchanged = 0;
2482
2483 if (!OPTION (Opt_transparent))
2484 return pchanged; /* Don't try any more */
2485
2486 XGetWindowAttributes (disp, display->root, &wrootattr);
2487 rootdepth = wrootattr.depth;
2488
2489 XGetWindowAttributes (disp, parent[0], &wattr);
2490
2491 if (rootdepth != wattr.depth)
2492 {
2493 if (am_transparent)
2494 {
2495 pchanged = 1;
2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2497 am_transparent = am_pixmap_trans = 0;
2498 }
2499
2500 return pchanged; /* Don't try any more */
2501 }
2502
2503 /* Get all X ops out of the queue so that our information is up-to-date. */
2504 XSync (disp, False);
2505
2506 /*
2507 * Make the frame window set by the window manager have
2508 * the root background. Some window managers put multiple nested frame
2509 * windows for each client, so we have to take care about that.
2510 */
2511 i = (xa[XA_XROOTPMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success);
2515
2516 if (!i || prop == NULL)
2517 i = (xa[XA_ESETROOT_PMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL
2523#if TINTING
2524 || !rs[Rs_color + Color_tint]
2525#endif
2526 )
2527 have_pixmap = 0;
2528 else
2529 {
2530 have_pixmap = 1;
2531 rootpixmap = *(Pixmap *)prop;
2532 XFree (prop);
2533 }
2534
2535 if (have_pixmap)
2536 {
2537 /*
2538 * Copy display->root pixmap transparency
2539 */
2540 int sx, sy, nx, ny;
2541 unsigned int nw, nh;
2542 Window cr;
2543 XImage *image;
2544 GC gc;
2545 XGCValues gcvalue;
2546
2547 XTranslateCoordinates (disp, parent[0], display->root,
2548 0, 0, &sx, &sy, &cr);
2549 nw = (unsigned int)szHint.width;
2550 nh = (unsigned int)szHint.height;
2551 nx = ny = 0;
2552
2553 if (sx < 0)
2554 {
2555 nw += sx;
2556 nx = -sx;
2557 sx = 0;
2558 }
2559
2560 if (sy < 0)
2561 {
2562 nh += sy;
2563 ny = -sy;
2564 sy = 0;
2565 }
2566
2567 min_it (nw, (unsigned int) (wrootattr.width - sx));
2568 min_it (nh, (unsigned int) (wrootattr.height - sy));
2569
2570 XSync (disp, False);
2571 allowedxerror = -1;
2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573
2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2575 /* XXX: may need a delay here? */
2576 allowedxerror = 0;
2577
2578 if (image == NULL)
2579 {
2580 if (am_transparent && am_pixmap_trans)
2581 {
2582 pchanged = 1;
2583 if (pixmap != None)
2584 {
2585 XFreePixmap (disp, pixmap);
2586 pixmap = None;
2587 }
2588 }
2589
2590 am_pixmap_trans = 0;
2591 }
2592 else
2593 {
2594 if (pixmap != None)
2595 XFreePixmap (disp, pixmap);
2596
2597#if TINTING
2598 if (ISSET_PIXCOLOR (Color_tint))
2599 {
2600 unsigned short rm, gm, bm;
2601 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602
2603 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2604
2605 ShadeXImage (display, image, shade, rm, gm, bm);
2606 }
2607#endif
2608
2609 pixmap = XCreatePixmap (disp, vt,
2610 szHint.width, szHint.height, image->depth);
2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2612 XPutImage (disp, pixmap, gc, image, 0, 0,
2613 nx, ny, image->width, image->height);
2614 XFreeGC (disp, gc);
2615 XDestroyImage (image);
2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2617 XClearWindow (disp, parent[0]);
2618
2619 if (!am_transparent || !am_pixmap_trans)
2620 pchanged = 1;
2621
2622 am_transparent = am_pixmap_trans = 1;
2623 }
2624 }
2625
2626 if (am_pixmap_trans)
2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2628 else
2629 {
2630 unsigned int n;
2631 /*
2632 * InheritPixmap transparency
2633 */
2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 {
2636 oldp = parent[i];
2637 XQueryTree (disp, parent[i - 1], &root,
2638 &parent[i], &list, &n);
2639 XFree (list);
2640
2641 if (parent[i] == display->root)
2642 {
2643 if (oldp != None)
2644 pchanged = 1;
2645
2646 break;
2647 }
2648
2649 if (oldp != parent[i])
2650 pchanged = 1;
2651 }
2652
2653 n = 0;
2654
2655 if (pchanged)
2656 {
2657 for (; n < (unsigned int)i; n++)
2658 {
2659 XGetWindowAttributes (disp, parent[n], &wattr);
2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2661 {
2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663 break;
2664 }
2665 }
2666 }
2667
2668 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2669 {
2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2672 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */
2674 }
2675 else
2676 {
2677#if WAIT_FOR_WM
2678 /* wait (an arbitrary period) for the WM to do its thing
2679 * needed for fvwm2.2.2 (and before?) */
2680 sleep (1);
2681#endif
2682 for (n = 0; n < (unsigned int)i; n++)
2683 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]);
2686 }
2687
2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2689 am_transparent = 1;
2690 }
2691
2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693 parent[i] = None;
2694 }
2695
2696 if (scrollBar.win)
2697 {
2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2699 scrollBar.setIdle ();
2700 scrollbar_show (0);
2701 }
2702
2703 if (am_transparent)
2704 {
2705 want_refresh = want_full_refresh = 1;
2706 if (am_pixmap_trans)
2707 flush ();
2708 }
2709
2710 return pchanged;
2711}
2712#endif
2713 2173
2714/*}}} */ 2174/*}}} */
2715 2175
2716bool 2176bool
2717rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2766 if (ch == C0_LF) 2226 if (ch == C0_LF)
2767 nlines++; 2227 nlines++;
2768 2228
2769 refresh_count++; 2229 refresh_count++;
2770 2230
2771 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2772 || (refresh_count >= refresh_limit * (nrow - 1)))
2773 { 2232 {
2774 refreshnow = true;
2775 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2776 ch = NOCHAR; 2238 ch = NOCHAR;
2777 break; 2239 break;
2240 }
2778 } 2241 }
2779 2242
2780 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2782 { 2245 {
2246 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2247 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2248 scr_add_lines (buf, str - buf, nlines);
2785 2249
2786 nlines = 0; 2250 nlines = 0;
2787 str = buf; 2251 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2252 eol = str + min (ncol, UBUFSIZ);
… …
2803 2267
2804 seq_begin = cmdbuf_ptr; 2268 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2269 ch = next_char ();
2806 } 2270 }
2807 2271
2272 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 if (!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))))
2809 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2810 2275
2811 /* 2276 /*
2812 * 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
2813 * 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.
2814 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2815 * is incremented here because we must be doing flat-out scrolling.
2816 */ 2280 */
2817 if (refreshnow) 2281 if (refreshnow)
2818 { 2282 {
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++;
2821 else
2822 {
2823 flag = true; 2283 flag = true;
2824 scr_refresh (refresh_type); 2284 scr_refresh ();
2825 want_refresh = 1; 2285 want_refresh = 1;
2826 }
2827 } 2286 }
2828 2287
2829 } 2288 }
2830 else 2289 else
2831 { 2290 {
… …
2847 return flag; 2306 return flag;
2848} 2307}
2849 2308
2850// read the next character 2309// read the next character
2851wchar_t 2310wchar_t
2852rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2853{ 2312{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2314 {
2856 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2878 return NOCHAR; 2337 return NOCHAR;
2879} 2338}
2880 2339
2881// read the next octet 2340// read the next octet
2882uint32_t 2341uint32_t
2883rxvt_term::next_octet () 2342rxvt_term::next_octet () NOTHROW
2884{ 2343{
2885 return cmdbuf_ptr < cmdbuf_endp 2344 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2345 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2346 : NOCHAR;
2888} 2347}
2348
2349static class out_of_input out_of_input;
2889 2350
2890/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2891/* 2352/*
2892 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2893 * to the command. 2354 * to the command.
2894 */ 2355 */
2895wchar_t 2356wchar_t
2896rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2358{
2898 wchar_t c = next_char (); 2359 wchar_t c = next_char ();
2899 2360
2900 if (c == NOCHAR) 2361 if (c == NOCHAR)
2901 throw out_of_input; 2362 throw out_of_input;
2902 2363
2903 return c; 2364 return c;
2904} 2365}
2905 2366
2906uint32_t 2367uint32_t
2907rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2369{
2909 uint32_t c = next_octet (); 2370 uint32_t c = next_octet ();
2910 2371
2911 if (c == NOCHAR) 2372 if (c == NOCHAR)
2912 throw out_of_input; 2373 throw out_of_input;
… …
2978 { 2439 {
2979 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2980 break; /* done = 1 */ 2441 break; /* done = 1 */
2981 } 2442 }
2982 } 2443 }
2983 2444
2984 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2985 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2986 { 2447 {
2987 done = 1; 2448 done = 1;
2988 break; 2449 break;
… …
2990 } 2451 }
2991 } 2452 }
2992 2453
2993 pclose_printer (fd); 2454 pclose_printer (fd);
2994} 2455}
2995#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2996/*}}} */ 2457/*}}} */
2997 2458
2998/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2999enum { 2460enum {
3000 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
3050 process_dcs_seq (); 2511 process_dcs_seq ();
3051 break; 2512 break;
3052 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3053 process_csi_seq (); 2514 process_csi_seq ();
3054 break; 2515 break;
3055 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3056 process_osc_seq (); 2517 process_osc_seq ();
3057 break; 2518 break;
3058#endif 2519#endif
3059 } 2520 }
3060} 2521}
… …
3150 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3151 break; 2612 break;
3152 case '+': 2613 case '+':
3153 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3154 break; 2615 break;
3155#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3156 case '6': 2617 case '6':
3157 scr_backindex (); 2618 scr_backindex ();
3158 break; 2619 break;
3159#endif 2620#endif
3160 case '7': 2621 case '7':
3161 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3162 break; 2623 break;
3163 case '8': 2624 case '8':
3164 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3165 break; 2626 break;
3166#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3167 case '9': 2628 case '9':
3168 scr_forwardindex (); 2629 scr_forwardindex ();
3169 break; 2630 break;
3170#endif 2631#endif
3171 case '=': 2632 case '=':
… …
3286rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3287{ 2748{
3288 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3289 unsigned int nargs, p; 2750 unsigned int nargs, p;
3290 int n, ndef; 2751 int n, ndef;
3291 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3292 2753
3293 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3294 arg[--nargs] = 0;
3295 2755
3296 priv = 0; 2756 priv = 0;
3297 ch = cmd_getc (); 2757 ch = cmd_getc ();
3298 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3299 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3300 priv = ch; 2761 priv = ch;
3301 ch = cmd_getc (); 2762 ch = cmd_getc ();
3302 } 2763 }
3303 2764
3304 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3333 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3334 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3335 if (arg[p] == -1) 2796 if (arg[p] == -1)
3336 arg[p] = ndef; 2797 arg[p] = ndef;
3337 2798
3338#ifdef DEBUG_CMD
3339 fprintf (stderr, "CSI ");
3340 for (p = 0; p < nargs; p++)
3341 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3342 fprintf (stderr, "%c\n", ch);
3343#endif
3344
3345 /* 2799 /*
3346 * private mode handling 2800 * private mode handling
3347 */ 2801 */
3348 if (priv) 2802 if (priv)
3349 { 2803 {
3350 switch (priv) 2804 switch (priv)
3351 { 2805 {
3352 case '>': 2806 case '>':
3353 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3354 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 }
3355 break; 2818 break;
2819
3356 case '?': 2820 case '?':
3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3359 break; 2823 break;
3360 } 2824 }
… …
3485 break; 2949 break;
3486 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3487 scr_report_position (); 2951 scr_report_position ();
3488 break; 2952 break;
3489 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3490 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3491 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3492 break; 2956 break;
3493 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3494 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3495 break; 2959 break;
… …
3562 break; 3026 break;
3563 case CSI_75: 3027 case CSI_75:
3564 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3565 break; 3029 break;
3566 3030
3567#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3568 case CSI_74: 3032 case CSI_74:
3569 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3570 break; 3034 break;
3571#endif 3035#endif
3572 3036
… …
3579 break; 3043 break;
3580 } 3044 }
3581} 3045}
3582/*}}} */ 3046/*}}} */
3583 3047
3584#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3585/* ARGSUSED */ 3049/* ARGSUSED */
3586void 3050void
3587rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588{ 3052{
3589 int x, y; 3053 int x, y;
3590 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3591 Window wdummy; 3055 Window wdummy;
3592 dDisp; 3056
3057 dLocal (Display *, dpy);
3593 3058
3594 if (nargs == 0) 3059 if (nargs == 0)
3595 return; 3060 return;
3596 3061
3597 switch (args[0]) 3062 switch (args[0])
3598 { 3063 {
3599 /* 3064 /*
3600 * commands 3065 * commands
3601 */ 3066 */
3602 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3603 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3604 break; 3069 break;
3605 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3606 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3607 break; 3072 break;
3608 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3609 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3610 break; 3075 break;
3611 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613 break; 3078 break;
3614 case 5: /* raise window */ 3079 case 5: /* raise window */
3615 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3616 break; 3081 break;
3617 case 6: /* lower window */ 3082 case 6: /* lower window */
3618 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3619 break; 3084 break;
3620 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3621 scr_touch (true); 3086 scr_touch (true);
3622 break; 3087 break;
3623 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3630 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3631 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3632 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3633 break; 3098 break;
3634 3099
3635
3636 /* 3100 /*
3637 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3638 */ 3102 */
3639 case 11: /* report window state */ 3103 case 11: /* report window state */
3640 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642 break; 3106 break;
3643 case 13: /* report window position */ 3107 case 13: /* report window position */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3646 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3647 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3648 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3649 break; 3113 break;
3650 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653 break; 3117 break;
3654 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3655 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656 break; 3120 break;
… …
3658 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659 break; 3123 break;
3660 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3661 { 3125 {
3662 char *s; 3126 char *s;
3663 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3664 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 */
3665 XFree (s); 3129 XFree (s);
3666 } 3130 }
3667 break; 3131 break;
3668 case 21: /* report window title */ 3132 case 21: /* report window title */
3669 { 3133 {
3670 char *s; 3134 char *s;
3671 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3672 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 */
3673 XFree (s); 3137 XFree (s);
3674 } 3138 }
3675 break; 3139 break;
3676 } 3140 }
3677} 3141}
… …
3704 seen_esc = true; 3168 seen_esc = true;
3705 continue; 3169 continue;
3706 } 3170 }
3707 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3708 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3709 else if (ch < 0x20) 3175 else if (ch < 0x20)
3710 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3711 3177
3712 seen_esc = false; 3178 seen_esc = false;
3713 3179
3714 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3715 // stop at some sane length 3181 // stop at some sane length
3716 return NULL; 3182 return NULL;
3717 3183
3718 if (ch == C0_SYN)
3719 string[n++] = cmd_get8 ();
3720 else
3721 string[n++] = ch; 3184 string[n++] = ch;
3722 } 3185 }
3723 3186
3724 string[n++] = '\0'; 3187 string[n++] = '\0';
3725 3188
3726 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3777void 3240void
3778rxvt_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)
3779{ 3242{
3780 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3781 { 3244 {
3782 unsigned short r, g, b; 3245 rgba c;
3783 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
3784 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);
3785 } 3254 }
3786 else 3255 else
3787 set_window_color (color, str); 3256 set_window_color (color, str);
3788} 3257}
3789 3258
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3261 */
3793void 3262void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3263rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3264{
3796 int changed = 0;
3797 int color; 3265 int color;
3798 char *buf, *name; 3266 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3268 int saveop = op;
3801 dDisp; 3269
3270 dLocal (Display *, dpy);
3802 3271
3803 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
3804 switch (op) 3277 switch (op)
3805 { 3278 {
3806 case XTerm_name: 3279 case XTerm_name:
3807 set_title (str); 3280 set_title (str);
3808 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3822 unsigned long bytes_after; 3295 unsigned long bytes_after;
3823 unsigned char *value = 0; 3296 unsigned char *value = 0;
3824 const char *str = ""; 3297 const char *str = "";
3825 3298
3826 if (prop 3299 if (prop
3827 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3828 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3829 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3830 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3831 && actual_type != None 3304 && actual_type != None
3832 && actual_format == 8) 3305 && actual_format == 8)
3833 str = (const char *)(value); 3306 str = (const char *)(value);
3834 3307
3835 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3836 3309
3837 XFree (value); 3310 XFree (value);
3838 } 3311 }
3839 else 3312 else
3840 { 3313 {
… …
3844 { 3317 {
3845 *eq = 0; 3318 *eq = 0;
3846 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3847 } 3320 }
3848 else 3321 else
3849 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3850 display->atom (str)); 3323 display->atom (str));
3851 } 3324 }
3852 break; 3325 break;
3853 3326
3854 case XTerm_Color: 3327 case XTerm_Color:
… …
3864 break; 3337 break;
3865 3338
3866 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3867 *buf++ = '\0'; 3340 *buf++ = '\0';
3868 3341
3869 if (name[0] == '?' && !name[1]) 3342 process_color_seq (op, color, name, resp);
3870 {
3871 unsigned short r, g, b;
3872 pix_colors_focused[color].get (display, r, g, b);
3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3874 }
3875 else
3876 set_window_color (color, name);
3877 } 3343 }
3878 break; 3344 break;
3345 case Rxvt_restoreFG:
3879 case XTerm_Color00: 3346 case XTerm_Color00:
3880 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3881 break; 3348 break;
3349 case Rxvt_restoreBG:
3882 case XTerm_Color01: 3350 case XTerm_Color01:
3883 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3884 break; 3352 break;
3885#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3886 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3888 break; 3356 break;
3889#endif 3357#endif
3890 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3891 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3892 break; 3360 break;
3893 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3895 break; 3363 break;
3896#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#ifndef NO_BOLD_UNDERLINE_REVERSE
3897 case XTerm_Color_RV: 3365 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3366 process_color_seq (op, Color_RV, str, resp);
3899 break; 3367 break;
3900 case Rxvt_Color_BD: 3368 case Rxvt_Color_BD:
3901 case URxvt_Color_BD: 3369 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp); 3370 process_color_seq (op, Color_BD, str, resp);
3903 break; 3371 break;
3904 case Rxvt_Color_UL: 3372 case Rxvt_Color_UL:
3905 case URxvt_Color_UL: 3373 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp); 3374 process_color_seq (op, Color_UL, str, resp);
3907 break; 3375 break;
3908 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3910 break; 3378 break;
3911#endif 3379#endif
3912#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3913 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3915 check_our_parents (); 3383 {
3916 if (am_transparent) 3384 bool changed = false;
3917 want_full_refresh = want_refresh = 1;
3918 break;
3919#endif
3920 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
3921 case Rxvt_Pixmap: 3399 case Rxvt_Pixmap:
3922 if (*str != ';') 3400 if (!strcmp (str, "?"))
3923 { 3401 {
3924#if XPM_BACKGROUND 3402 char str[256];
3925 scale_pixmap (""); /* reset to default scaling */ 3403
3926 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3927 scr_touch (true); 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3928#endif 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3929 } 3408 }
3930 3409 else
3931 while ((str = strchr (str, ';')) != NULL)
3932 { 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 {
3933 str++; 3426 str++;
3934#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3935 changed += scale_pixmap (str); 3428 changed++;
3936#endif 3429 str = strchr (str, ';');
3430 }
3431
3432 if (changed)
3433 update_background ();
3937 } 3434 }
3938
3939 if (changed)
3940 {
3941#ifdef XPM_BACKGROUND
3942 resize_pixmap ();
3943 scr_touch (true);
3944#endif
3945 }
3946 break; 3435 break;
3947 3436#endif
3948 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str);
3950 break;
3951 case Rxvt_restoreBG:
3952 set_window_color (Color_bg, str);
3953 break;
3954 3437
3955 case XTerm_logfile: 3438 case XTerm_logfile:
3956 // TODO, when secure mode? 3439 // TODO, when secure mode?
3957 break; 3440 break;
3958 3441
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3442#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3967 { 3444 {
3968 int fd; 3445 int fd;
3969 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)
… …
3982 case URxvt_italicFont: 3459 case URxvt_italicFont:
3983 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3984#endif 3461#endif
3985 if (query) 3462 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp); 3466 resp);
3990 else 3467 else
3991 { 3468 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3995 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3996 set_fonts (); 3473 set_fonts ();
3997 } 3474 }
3998 break; 3475 break;
3999 3476
4000#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
4001 case URxvt_locale: 3486 case URxvt_locale:
4002 if (query) 3487 if (query)
4003 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);
4004 else 3489 else
4005 { 3490 {
4006 set_locale (str); 3491 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3493 init_xlocale ();
4009 } 3494 }
4010 break; 3495 break;
4011 3496
4012 case URxvt_view_up: 3497 case URxvt_view_up:
… …
4023 break; 3508 break;
4024#endif 3509#endif
4025 3510
4026#if ENABLE_PERL 3511#if ENABLE_PERL
4027 case URxvt_perl: 3512 case URxvt_perl:
4028 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)))
4029 ; // no responses yet 3514 ; // no responses yet
4030 break; 3515 break;
4031#endif 3516#endif
4032 } 3517 }
4033} 3518}
… …
4065 return state; 3550 return state;
4066} 3551}
4067 3552
4068/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
4069void 3554void
4070rxvt_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)
4071{ 3556{
4072 unsigned int i, j; 3557 unsigned int i, j;
4073 int state; 3558 int state;
4074 3559
4075 static const struct 3560 static const struct
4076 { 3561 {
4077 const int argval; 3562 const int argval;
4078 const unsigned long bit; 3563 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3564 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4083 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4085 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4086 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 3574 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 3578#endif
… …
4105 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4106#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4107 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4108#endif 3588#endif
4109 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4110 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4111 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4112 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4113 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4114 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4115 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4116 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4117 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4118 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4119 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4120 { 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 */
4121 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4122 }; 3602 };
4123 3603
4124 if (nargs == 0) 3604 if (nargs == 0)
4125 return; 3605 return;
4126 3606
… …
4152 scr_touch (true); 3632 scr_touch (true);
4153 break; 3633 break;
4154#endif 3634#endif
4155 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4156 case 1049: 3636 case 1049:
4157 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4158 if (mode == 0) 3638 if (mode == 0)
4159 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4160 else if (mode == 1) 3640 else if (mode == 1)
4161 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4162 break; 3642 break;
… …
4174 */ 3654 */
4175 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4176 break; 3656 break;
4177 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4178 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4179 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4180 break; 3663 break;
4181 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4182 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4183 break; 3666 break;
4184 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4191 scr_autowrap (state); 3674 scr_autowrap (state);
4192 break; 3675 break;
4193 /* 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 */
4194 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4197 break; 3680 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4206 case scrollBar_esc: 3682 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4208 { 3684 {
4209 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
… …
4221 break; 3697 break;
4222 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4223 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4224 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4225 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4226 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4227 break; 3703 break;
4228#if 0
4229 case 1001: 3704 case 1002:
4230 break; /* X11 mouse highlighting */ 3705 case 1003:
4231#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;
4232 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4233 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4234 break; 3718 break;
4235 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4236 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4237 break; 3721 break;
4238 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4239 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4240 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4241 scr_erase_screen (2); 3725 scr_erase_screen (2);
4242 scr_change_screen (state); 3726 scr_change_screen (state);
4243 break; 3727 break;
4244 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4245 scr_change_screen (state); 3729 scr_change_screen (state);
4246 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3732 scr_erase_screen (2);
4249 break; 3733 break;
4250 default: 3734 default:
4251 break; 3735 break;
… …
4379 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4380 break; 3864 break;
4381 3865
4382 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4383 3867
4384#if ENABLE_FRILLS 3868#if !ENABLE_MINIMAL
4385 case 90: 3869 case 90:
4386 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4387 case 92: 3871 case 92:
4388 case 93: 3872 case 93:
4389 case 94: 3873 case 94:
… …
4413rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4414{ 3898{
4415 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4416 3900
4417 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4418 { /* query graphics */ 3903 /* query graphics */
4419 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4420 return; 3905 return;
4421 } 3906 }
4422 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4423 do 3908 do
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 3939rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 3940{
4456 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)))
4457 return; 3942 return;
4458 3943
4459 if (pty.pty < 0) 3944 if (pty->pty < 0)
4460 return; 3945 return;
4461 3946
4462 if (v_buflen == 0) 3947 if (v_buflen == 0)
4463 { 3948 {
4464 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));
4465 3950
4466 if ((unsigned int)written == len) 3951 if ((unsigned int)written == len)
4467 return; 3952 return;
4468 3953
4469 data += written; 3954 data += written;
… …
4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4474 3959
4475 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4476 v_buflen += len; 3961 v_buflen += len;
4477 3962
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4479} 3964}
4480 3965
4481void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4482{ 3967{
4483 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));
4484 3969
4485 if (written > 0) 3970 if (written > 0)
4486 { 3971 {
4487 v_buflen -= written; 3972 v_buflen -= written;
4488 3973
4489 if (v_buflen == 0) 3974 if (v_buflen == 0)
4490 { 3975 {
4491 free (v_buffer); 3976 free (v_buffer);
4492 v_buffer = 0; 3977 v_buffer = 0;
4493 v_buflen = 0;
4494 3978
4495 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4496 return; 3980 return;
4497 } 3981 }
4498 3982
4499 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4500 } 3984 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4503} 3987}
4504 3988
4505/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4506 3990

Diff Legend

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