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.227 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.360 by ayin, Wed Oct 24 10:39:57 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
98 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
99 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
100 97
101 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
105 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
106 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
107 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
108 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 143 return;
148 144
149 for (;;) 145 for (;;)
150 { 146 {
151 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
152 148
153 text_t t = l.t[x]; 149 text_t t = l.t[x];
154 150
155 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
156 { 152 {
… …
229# if !UNICODE3 225# if !UNICODE3
230 if (ch >= 0x10000) 226 if (ch >= 0x10000)
231 ch = 0xfffd; 227 ch = 0xfffd;
232# endif 228# endif
233 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
235 } 233 }
236 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
237 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
239 242
240 free (fname); 243 free (fname);
241 244
… …
267 mb[0] = ch[0]; 270 mb[0] = ch[0];
268 len = 1; 271 len = 1;
269 } 272 }
270 273
271 if (len > 0) 274 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
273 else 276 else
274 scr_bell (); 277 scr_bell ();
275 } 278 }
276 279
277 iso14755buf = 0; 280 iso14755buf = 0;
… …
294 297
295 return -1; 298 return -1;
296} 299}
297#endif 300#endif
298 301
299/*{{{ Convert the keypress event into a string */
300void 302void
301rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
302{ 304{
303 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
304 unsigned int newlen; 306 unsigned int newlen;
305 KeySym keysym; 307 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 308 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
311 315
312 /* 316 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
315 * 319 *
… …
333 Status status_return; 337 Status status_return;
334 338
335#if 0 339#if 0
336#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
340 else 344 else
341#endif 345#endif
342#endif 346#endif
343 { 347 {
… …
380 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
381 } 385 }
382 else 386 else
383#endif 387#endif
384 { 388 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
387 } 391 }
388 392
389 if (valid_keysym) 393 if (valid_keysym)
390 { 394 {
… …
442 scr_move_to (0, 1); 446 scr_move_to (0, 1);
443 return; 447 return;
444 } 448 }
445 else if (keysym == XK_End) 449 else if (keysym == XK_End)
446 { 450 {
447 scr_move_to (1, 0); 451 scr_move_to (1, 1);
448 return; 452 return;
449 } 453 }
450 } 454 }
451#endif 455#endif
452 } 456 }
… …
463 { 467 {
464 switch (keysym) 468 switch (keysym)
465 { 469 {
466 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
469 return; 473 return;
470#if TODO 474#if TODO
471 /* rxvt extras */ 475 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
492 { 496 {
493 commit_iso14755 (); 497 commit_iso14755 ();
494 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
495# if ISO_14755 499# if ISO_14755
496 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
497# endif 509# endif
498 return; 510 return;
499 } 511 }
500 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
501 { 513 {
… …
506# endif 518# endif
507 return; 519 return;
508 } 520 }
509 else 521 else
510 { 522 {
511# if ENABLE_OVERLAY 523# if ISO_14755
512 scr_overlay_off (); 524 scr_overlay_off ();
513# endif 525# endif
514 iso14755buf = 0; 526 iso14755buf = 0;
515 } 527 }
516 } 528 }
517 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
518 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
519 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
520 { 532 {
521 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
522# if ENABLE_OVERLAY 534# if ISO_14755
523 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
524 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
525# endif 537# endif
526 } 538 }
527#endif 539#endif
528 540
529#ifdef PRINTPIPE 541#ifdef PRINTPIPE
530 if (keysym == XK_Print) 542 if (keysym == XK_Print)
531 { 543 {
532 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
533 return; 545 return;
… …
535#endif 547#endif
536 548
537 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
538 { 550 {
539 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
540 newlen = 1; 553 newlen = 1;
541 switch (keysym) 554 switch (keysym)
542 { 555 {
543#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
544 case XK_BackSpace: 557 case XK_BackSpace:
… …
547 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
548 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
549 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
550 } 563 }
551 else 564 else
552 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
553 break; 566 break;
554#endif 567#endif
555#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
556# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
557 case XK_KP_Delete: 570 case XK_KP_Delete:
558 /* allow shift to override */ 571 /* allow shift to override */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
560 { 573 {
561 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
562 break; 575 break;
563 } 576 }
564 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
565# endif 578# endif
566 case XK_Delete: 579 case XK_Delete:
567 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
568 break; 581 break;
569#endif 582#endif
570 case XK_Tab: 583 case XK_Tab:
571 if (shft) 584 if (shft)
572 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
587#ifdef XK_KP_Left 600#ifdef XK_KP_Left
588 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
589 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
590 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
591 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
593 { 606 {
594 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
595 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
596 break; 609 break;
597 } 610 }
… …
620 633
621#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
622# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
623 case XK_KP_Prior: 636 case XK_KP_Prior:
624 /* allow shift to override */ 637 /* allow shift to override */
625 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
626 { 639 {
627 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
628 break; 641 break;
629 } 642 }
630 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
633 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
634 break; 647 break;
635# ifdef XK_KP_Next 648# ifdef XK_KP_Next
636 case XK_KP_Next: 649 case XK_KP_Next:
637 /* allow shift to override */ 650 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
639 { 652 {
640 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
641 break; 654 break;
642 } 655 }
643 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
646 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
647 break; 660 break;
648#endif 661#endif
649 case XK_KP_Enter: 662 case XK_KP_Enter:
650 /* allow shift to override */ 663 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
652 { 665 {
653 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
654 break; 667 break;
655 } 668 }
656 669
… …
699 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
700 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
701 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
702 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
703 /* allow shift to override */ 716 /* allow shift to override */
704 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
705 { 718 {
706 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
707 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
708 } 721 }
709 else 722 else
… …
715 728
716 case XK_Find: 729 case XK_Find:
717 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
718 break; 731 break;
719 732
720#ifdef XK_KP_End 733#ifdef XK_KP_Insert
721 case XK_KP_Insert: 734 case XK_KP_Insert:
722 /* allow shift to override */ 735 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
724 { 737 {
725 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
726 break; 739 break;
727 } 740 }
728 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
741 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
742 break; 755 break;
743#ifdef XK_KP_End 756#ifdef XK_KP_End
744 case XK_KP_End: 757 case XK_KP_End:
745 /* allow shift to override */ 758 /* allow shift to override */
746 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
747 { 760 {
748 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
749 break; 762 break;
750 } 763 }
751 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
754 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
755 break; 768 break;
756#ifdef XK_KP_Home 769#ifdef XK_KP_Home
757 case XK_KP_Home: 770 case XK_KP_Home:
758 /* allow shift to override */ 771 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
760 { 773 {
761 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
762 break; 775 break;
763 } 776 }
764 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
854 { 867 {
855#ifdef META8_OPTION 868#ifdef META8_OPTION
856 /* set 8-bit on */ 869 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
858 { 871 {
859 unsigned char *ch; 872 char *ch;
860 873
861 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 875 *ch |= 0x80;
863 876
864 meta = 0; 877 meta = 0;
… …
866#endif 879#endif
867 /* nil */ ; 880 /* nil */ ;
868 } 881 }
869 } 882 }
870 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
897#ifdef META8_OPTION 913#ifdef META8_OPTION
898 && meta_char == C0_ESC 914 && meta_char == C0_ESC
899#endif 915#endif
900 ) 916 )
901 { 917 {
902 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
917} 923}
918/*}}} */
919 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 1003unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 1005{
926 unsigned int n, s; 1006 unsigned int n, s;
927 1007
928 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
954 1034
955void 1035void
956rxvt_term::flush () 1036rxvt_term::flush ()
957{ 1037{
958 flush_ev.stop (); 1038 flush_ev.stop ();
959 1039
960#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
961 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
962 { 1042 {
963 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
964 scr_clear ();
965 scr_touch (false); 1044 scr_touch (false);
966 } 1045 }
967#endif 1046#endif
968 1047
969 if (want_refresh) 1048 if (want_refresh)
970 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
971 scr_refresh (refresh_type); 1088 scr_refresh ();
972 scrollbar_show (1); 1089 scrollbar_show (1);
973#ifdef USE_XIM 1090#ifdef USE_XIM
974 IMSendSpot (); 1091 IMSendSpot ();
975#endif 1092#endif
976 } 1093 }
… …
979} 1096}
980 1097
981void 1098void
982rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
983{ 1100{
984 SET_R (this); 1101 make_current ();
985 SET_LOCALE (locale);
986 1102
987 display->flush (); 1103 display->flush ();
988 1104
989 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1107}
992 1108
993void 1109void
994rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
995{ 1111{
996 SET_R (this); 1112 make_current ();
997 SET_LOCALE (locale);
998 1113
999 refresh_limit = 1;
1000 refresh_count = 0; 1114 refresh_count = 0;
1001 flush (); 1115 flush ();
1002} 1116}
1003 1117
1004#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1121{
1008 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1123 want_refresh = 1;
1010 1124
1011 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1126}
1013#endif 1127#endif
1014 1128
1015#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1016void 1130void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1145{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1148 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1149 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1151 }
1039} 1152}
1040#endif 1153#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1158{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1160 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1162 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1164 }
1053} 1165}
1054#endif 1166#endif
… …
1059{ 1171{
1060 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1175 {
1064 if (view_start == nsaved || 1176 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1177 mouse_slip_wheel_speed = 0;
1067 1178
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1179 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1181 }
1072} 1182}
1073#endif 1183#endif
1074 1184
1075#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1076static struct event_handler 1186static struct event_handler
1077{ 1187{
1078 check_watcher cw_yield; 1188 check_watcher yield_ev;
1079 1189
1080 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1081 { 1191 {
1082 sched_yield (); 1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1083 w.stop (); 1200 w.stop ();
1084 } 1201 }
1085 1202
1086 event_handler () 1203 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1088 { 1205 {
1089 } 1206 }
1090} event_handler; 1207} event_handler;
1091#endif 1208#endif
1092 1209
… …
1095{ 1212{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1214
1098 if (CBUFSIZ == n) 1215 if (CBUFSIZ == n)
1099 { 1216 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1218 n = 0;
1102 } 1219 }
1103 1220
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1107 1224
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1226
1110 if (r > 0) 1227 if (r > 0)
1111 { 1228 {
1112 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1113 return true; 1230 return true;
1114 } 1231 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1233 {
1117#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1118 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1119#endif 1237#endif
1120 } 1238 }
1121 else 1239 else
1122 { 1240 {
1123 pty_ev.stop (); 1241 pty_ev.stop ();
1124 1242
1125 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1126 destroy (); 1244 destroy ();
1127 } 1245 }
1128 1246
1129 return false; 1247 return false;
1130} 1248}
1131 1249
1132void 1250void
1133rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1134{ 1252{
1135 SET_R (this); 1253 make_current ();
1136 SET_LOCALE (locale);
1137 1254
1138 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1139 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1140 while (pty_fill ()) 1257 while (pty_fill ())
1141 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1146} 1263}
1147 1264
1148void 1265void
1149rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1150{ 1267{
1151 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1152 recolour_cursor (); 1269 recolour_cursor ();
1153 1270
1154#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1155 hidden_pointer = 0; 1272 hidden_pointer = 0;
1156 1273
1157 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1158 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1159#endif 1276#endif
1160} 1277}
1161 1278
1162#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1163void 1280void
1164rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1165{ 1282{
1166 if (! OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1167 return; 1284 return;
1168 1285
1169 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1170 XFlush (display->display); 1287 XFlush (dpy);
1171 1288
1172 hidden_pointer = 1; 1289 hidden_pointer = 1;
1173} 1290}
1174 1291
1175void 1292void
1176rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1177{ 1294{
1178 SET_R (this); 1295 make_current ();
1179 SET_LOCALE (locale);
1180 1296
1181 pointer_blank (); 1297 pointer_blank ();
1182} 1298}
1183#endif 1299#endif
1184 1300
1185void 1301void
1186rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1187{ 1303{
1188 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1189 int x, y; 1305 int x, y;
1306 int code = 32;
1190 1307
1191 x = ev.x; 1308 x = Pixel2Col (ev.x);
1192 y = ev.y; 1309 y = Pixel2Row (ev.y);
1193 pixel_position (&x, &y); 1310 if (ev.type == MotionNotify) {
1311 if (x == mouse_row && y == mouse_col)
1312 return;
1313 mouse_row = x;
1314 mouse_col = y;
1315 code += 32;
1316 }
1194 1317
1195 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1196 button_number = 3; 1319 button_number = 3;
1197 else 1320 else
1198 { 1321 {
… …
1244 x + 1, 1367 x + 1,
1245 y + 1); 1368 y + 1);
1246#endif 1369#endif
1247 1370
1248 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1249 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1250 (32 + x + 1), 1373 (32 + x + 1),
1251 (32 + y + 1)); 1374 (32 + y + 1));
1252} 1375}
1253
1254#ifdef USING_W11LIB
1255void
1256rxvt_W11_process_x_event (XEvent *ev)
1257{
1258 rxvt_t *r = rxvt_get_r ();
1259
1260 x_cb (*ev);
1261}
1262#endif
1263 1376
1264/*{{{ process an X event */ 1377/*{{{ process an X event */
1265void 1378void
1266rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1267{ 1380{
1268 dDisp; 1381 make_current ();
1269 1382
1270 SET_R (this); 1383 dLocal (Display *, dpy);
1271 SET_LOCALE (locale);
1272 1384
1273#if defined(CURSOR_BLINK) 1385 if (ev.xany.window == vt
1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1386 && SHOULD_INVOKE (HOOK_X_EVENT)
1275 { 1387 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1276 if (hidden_cursor) 1388 return;
1277 {
1278 hidden_cursor = 0;
1279 want_refresh = 1;
1280 }
1281 1389
1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 // for XQueryPointer
1283 }
1284#endif
1285
1286#if defined(POINTER_BLANK)
1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1288 {
1289 if (ev.type == MotionNotify
1290 || ev.type == ButtonPress
1291 || ev.type == ButtonRelease)
1292 if (hidden_pointer)
1293 pointer_unblank ();
1294
1295 if (ev.type == KeyPress && hidden_pointer == 0)
1296 pointer_blank ();
1297 }
1298#endif
1299
1300 Window unused_root, unused_child; 1391 Window unused_root, unused_child;
1301 int unused_root_x, unused_root_y; 1392 int unused_root_x, unused_root_y;
1302 unsigned int unused_mask; 1393 unsigned int unused_mask;
1303 1394
1304 switch (ev.type) 1395 switch (ev.type)
1305 { 1396 {
1306 case KeyPress: 1397 case KeyPress:
1307#if ISO_14755 1398 key_press (ev.xkey);
1308 if (!(iso14755buf & ISO_14755_52))
1309#endif
1310 lookup_key (ev.xkey);
1311
1312 break; 1399 break;
1313 1400
1314 case KeyRelease: 1401 case KeyRelease:
1315 { 1402 key_release (ev.xkey);
1316#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1317 KeySym ks;
1318
1319 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1320#endif
1321
1322#if ENABLE_FRILLS || ISO_14755
1323 // ISO 14755 support
1324 if (iso14755buf)
1325 if (iso14755buf & ISO_14755_52)
1326 {
1327# if ENABLE_OVERLAY
1328 scr_overlay_off ();
1329# endif
1330# if ISO_14755
1331 // iso14755 part 5.2 handling: release time
1332 // first: controls
1333 if ((ev.xkey.state & ControlMask)
1334 && ((ks >= 0x40 && ks <= 0x5f)
1335 || (ks >= 0x61 && ks <= 0x7f)))
1336 {
1337 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1338 commit_iso14755 ();
1339 return; // case-break;
1340 }
1341
1342 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1343 if (i[0] == ks)
1344 {
1345 iso14755buf = ISO_14755_51 | i[1];
1346 commit_iso14755 ();
1347 return; // case-break;
1348 }
1349
1350 scr_bell ();
1351# endif
1352 iso14755buf = 0;
1353 break;
1354 }
1355 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1356 {
1357# if ENABLE_OVERLAY
1358 scr_overlay_off ();
1359# endif
1360 if (iso14755buf & ISO_14755_51)
1361 commit_iso14755 ();
1362#if ISO_14755
1363 else if (iso14755buf & ISO_14755_STARTED)
1364 {
1365 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1366
1367 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1368 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1369 }
1370# endif
1371 else
1372 iso14755buf = 0;
1373 }
1374#endif
1375
1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1377 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R)
1380 mouse_slip_wheel_speed = 0;
1381#endif
1382 break; 1403 break;
1383 }
1384 1404
1385 case ButtonPress: 1405 case ButtonPress:
1386 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1387 break; 1407 break;
1388 1408
… …
1390 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1391 break; 1411 break;
1392 1412
1393 case ClientMessage: 1413 case ClientMessage:
1394 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1395 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1415 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1396 { 1416 {
1417 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1418 {
1419 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1420 {
1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1422 {
1423 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1398 destroy (); 1424 destroy ();
1425 }
1399#if ENABLE_EWMH 1426#if ENABLE_EWMH
1400 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1427 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1401 XSendEvent (disp, ev.xclient.window = display->root, 1428 XSendEvent (dpy, ev.xclient.window = display->root,
1402 False, SubstructureRedirectMask | SubstructureNotifyMask, 1429 False, SubstructureRedirectMask | SubstructureNotifyMask,
1403 &ev); 1430 &ev);
1431#endif
1432 }
1433 }
1434#if ENABLE_XEMBED
1435 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1436 {
1437 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1438 focus_in ();
1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1440 focus_out ();
1441 }
1404#endif 1442#endif
1405 } 1443 }
1406#if ENABLE_XEMBED
1407 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1408 {
1409 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1410 focus_in ();
1411 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1412 focus_out ();
1413 }
1414#endif
1415#ifdef OFFIX_DND
1416 /* OffiX Dnd (drag 'n' drop) protocol */
1417 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1418 && (ev.xclient.data.l[0] == DndFile
1419 || ev.xclient.data.l[0] == DndDir
1420 || ev.xclient.data.l[0] == DndLink))
1421 {
1422 /* Get Dnd data */
1423 Atom ActualType;
1424 int ActualFormat;
1425 unsigned char *data;
1426 unsigned long Size, RemainingBytes;
1427
1428 XGetWindowProperty (disp, display->root,
1429 xa[XA_DNDSELECTION],
1430 0L, 1000000L,
1431 False, AnyPropertyType,
1432 &ActualType, &ActualFormat,
1433 &Size, &RemainingBytes,
1434 &data);
1435 set_string_property (XA_CUT_BUFFER0, data);
1436 XFree (data);
1437 selection_paste (display->root, XA_CUT_BUFFER0, true);
1438 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1439 }
1440#endif /* OFFIX_DND */
1441 break;
1442
1443 case MappingNotify:
1444 XRefreshKeyboardMapping (&ev.xmapping);
1445 break; 1444 break;
1446 1445
1447 /* 1446 /*
1448 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1449 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1468 break; 1467 break;
1469 } 1468 }
1470 break; 1469 break;
1471 1470
1472 case FocusIn: 1471 case FocusIn:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1473 focus_in (); 1475 focus_in ();
1474 break; 1476 break;
1475 1477
1476 case FocusOut: 1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1477 focus_out (); 1482 focus_out ();
1478 break; 1483 break;
1479 1484
1480 case ConfigureNotify: 1485 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1481 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1482 { 1490 {
1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ; 1492 ;
1485 1493
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 { 1495 {
1488 seen_resize = 1; 1496 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1498 }
1491 1499 else
1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500 {
1493 if (OPTION (Opt_transparent)) 1501#ifdef HAVE_BG_PIXMAP
1494 check_our_parents (); 1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1495#endif 1504#endif
1505 }
1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1496 } 1507 }
1497 break; 1508 break;
1498 1509
1499 case PropertyNotify: 1510 case PropertyNotify:
1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1500 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1512 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1501 && ev.xproperty.state == PropertyNewValue) 1513 && ev.xproperty.state == PropertyNewValue)
1502 selection_property (ev.xproperty.window, ev.xproperty.atom); 1514 selection_property (ev.xproperty.window, ev.xproperty.atom);
1503 1515
1504 break; 1516 break;
1505 1517
1506 case SelectionClear: 1518 case SelectionClear:
1507 selection_clear (); 1519 selection_clear ();
… …
1512 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1524 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1513 break; 1525 break;
1514 1526
1515 case SelectionRequest: 1527 case SelectionRequest:
1516 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1529 break;
1530
1531 case MapNotify:
1532 mapped = 1;
1533#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1535#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1517 break; 1537 break;
1518 1538
1519 case UnmapNotify: 1539 case UnmapNotify:
1520 mapped = 0; 1540 mapped = 0;
1521#ifdef TEXT_BLINK 1541#ifdef TEXT_BLINK
1522 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1523#endif 1543#endif
1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1545 break;
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1546
1539 case GraphicsExpose: 1547 case GraphicsExpose:
1540 case Expose: 1548 case Expose:
1541 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1542 { 1550 {
1543 do 1551 do
1552 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1557
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1559
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1553 1564 }
1554 scr_refresh (refresh_type); 1565 want_refresh = 1;
1555 } 1566 }
1556 else 1567 else
1557 { 1568 {
1558 XEvent unused_event; 1569 XEvent unused_event;
1559 1570
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1572 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1574 ;
1564 1575
1565 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1566 { 1577 {
1567 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1568 scrollbar_show (0); 1579 scrollbar_show (0);
1569 } 1580 }
1570#ifdef MENUBAR
1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1572 menubar_expose ();
1573#endif
1574
1575#ifdef TRANSPARENT
1576 if (am_transparent && ev.xany.window == parent[0])
1577 XClearWindow (disp, ev.xany.window);
1578#endif
1579 } 1581 }
1580 break; 1582 break;
1581 1583
1582 case MotionNotify: 1584 case MotionNotify:
1583#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1584 if (hidden_pointer) 1586 if (hidden_pointer)
1585 pointer_unblank (); 1587 pointer_unblank ();
1586#endif 1588#endif
1587#if MENUBAR 1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 if (isMenuBarWindow (ev.xany.window)) 1590 || priv_modes & PrivMode_MouseAnyEvent)
1589 {
1590 menubar_control (ev.xbutton); 1591 mouse_report (ev.xbutton);
1591 break;
1592 }
1593#endif
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1593 break;
1596 1594
1597 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1598 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1599 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1600 { 1601 {
1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1602 ; 1603 ;
1603 1604
1604 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1605 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1606 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1607 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1608 &ev.xbutton.state); 1609 &ev.xbutton.state);
1609#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1673#endif 1674#endif
1674 } 1675 }
1675 } 1676 }
1676 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1677 { 1678 {
1678 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1679 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1680 ; 1681 ;
1681 1682
1682 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1683 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1684 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1685 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1686 &unused_mask); 1687 &unused_mask);
1687 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1688 scrollbar_size ()); 1689 scrollbar_size ());
1689 scr_refresh (refresh_type);
1690 refresh_limit = 0; 1690 want_refresh = 1;
1691 scrollbar_show (1); 1691 scrollbar_show (1);
1692 } 1692 }
1693 break; 1693 break;
1694 } 1694 }
1695
1696#if defined(CURSOR_BLINK)
1697 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1698 {
1699 if (hidden_cursor)
1700 {
1701 hidden_cursor = 0;
1702 want_refresh = 1;
1703 }
1704
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1706 }
1707#endif
1708
1709#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1711 {
1712 if (ev.type == MotionNotify
1713 || ev.type == ButtonPress
1714 || ev.type == ButtonRelease)
1715 if (hidden_pointer)
1716 pointer_unblank ();
1717
1718 if (ev.type == KeyPress && hidden_pointer == 0)
1719 pointer_blank ();
1720 }
1721#endif
1695} 1722}
1696 1723
1697void 1724void
1698rxvt_term::focus_in () 1725rxvt_term::focus_in ()
1699{ 1726{
1700 if (!focus) 1727 if (!focus)
1701 { 1728 {
1702 focus = 1; 1729 focus = 1;
1703 want_refresh = 1; 1730 want_refresh = 1;
1704 1731
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1706 1733
1707#if USE_XIM 1734#if USE_XIM
1708 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1709 { 1736 {
1710 IMSetStatusPosition (); 1737 IMSetPosition ();
1711 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1712 } 1739 }
1713#endif 1740#endif
1714#if CURSOR_BLINK 1741#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717#endif 1744#endif
1718#if OFF_FOCUS_FADING 1745#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1746 if (rs[Rs_fade])
1720 { 1747 {
1721 pix_colors = pix_colors_focused; 1748 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1749 scr_recolour ();
1723 } 1750 }
1724#endif 1751#endif
1752#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell))
1754 {
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif
1725 } 1762 }
1726} 1763}
1727 1764
1728void 1765void
1729rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1731 if (focus) 1768 if (focus)
1732 { 1769 {
1733 focus = 0; 1770 focus = 0;
1734 want_refresh = 1; 1771 want_refresh = 1;
1735 1772
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737 1774
1738#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1776 if (iso14755buf)
1740 { 1777 {
1741 iso14755buf = 0; 1778 iso14755buf = 0;
1742# if ENABLE_OVERLAY 1779# if ISO_14755
1743 scr_overlay_off (); 1780 scr_overlay_off ();
1744# endif 1781# endif
1745 } 1782 }
1746#endif 1783#endif
1747#if USE_XIM 1784#if USE_XIM
1748 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1750#endif 1787#endif
1751#if CURSOR_BLINK 1788#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1754 hidden_cursor = 0; 1791 hidden_cursor = 0;
1755#endif 1792#endif
1756#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
… …
1761 } 1798 }
1762#endif 1799#endif
1763 } 1800 }
1764} 1801}
1765 1802
1766#if TRANSPARENT 1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1767void 1817void
1768rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1819{
1770 SET_R (this); 1820 make_current ();
1771 SET_LOCALE (locale);
1772 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1773 switch (ev.type) 1827 switch (ev.type)
1774 { 1828 {
1775 case PropertyNotify: 1829 case PropertyNotify:
1776 /* 1830 /*
1777 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1778 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1779 */ 1833 */
1780 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1782 return; 1836 {
1783 1837 bgPixmap.set_root_pixmap ();
1784 /* FALLTHROUGH */ 1838 update_background ();
1785 case ReparentNotify: 1839 }
1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1787 want_refresh = want_full_refresh = 1;
1788 break; 1840 break;
1789 } 1841 }
1842# endif
1790} 1843}
1791#endif 1844#endif
1792 1845
1793void 1846void
1794rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1795{ 1848{
1796 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1797 1850
1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1799 if (!bypass_keystate) 1853 if (!bypass_keystate)
1800 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801 1855
1802 /* 1856 /*
1803 * VT window processing of button press 1857 * VT window processing of button press
1804 */ 1858 */
1805 if (ev.window == vt) 1859 if (ev.window == vt)
1806 { 1860 {
1861 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1862 return;
1863
1807#if ISO_14755 1864#if ISO_14755
1808 // 5.4 1865 // 5.4
1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1866 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1810 { 1867 {
1811 iso14755_54 (ev.x, ev.y); 1868 iso14755_54 (ev.x, ev.y);
… …
1823#ifdef MOUSE_REPORT_DOUBLECLICK 1880#ifdef MOUSE_REPORT_DOUBLECLICK
1824 if (ev.button == MEvent.button && clickintime) 1881 if (ev.button == MEvent.button && clickintime)
1825 { 1882 {
1826 /* same button, within alloted time */ 1883 /* same button, within alloted time */
1827 MEvent.clicks++; 1884 MEvent.clicks++;
1885
1828 if (MEvent.clicks > 1) 1886 if (MEvent.clicks > 1)
1829 { 1887 {
1830 /* only report double clicks */ 1888 /* only report double clicks */
1831 MEvent.clicks = 2; 1889 MEvent.clicks = 2;
1832 mouse_report (ev); 1890 mouse_report (ev);
… …
1864#else 1922#else
1865 selection.rect = false; 1923 selection.rect = false;
1866#endif 1924#endif
1867 1925
1868 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1870 { 1928 {
1871 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1872 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1873 else 1931 else
1874 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
… …
2039 } 2097 }
2040 2098
2041 break; 2099 break;
2042 } 2100 }
2043 } 2101 }
2102
2044 return; 2103 return;
2045 } 2104 }
2046#if MENUBAR
2047 /*
2048 * Menubar window processing of button press
2049 */
2050 if (isMenuBarWindow (ev.window))
2051 menubar_control (ev);
2052#endif
2053} 2105}
2054 2106
2055void 2107void
2056rxvt_term::button_release (XButtonEvent &ev) 2108rxvt_term::button_release (XButtonEvent &ev)
2057{ 2109{
… …
2063 2115
2064 if (scrollbar_isUpDn ()) 2116 if (scrollbar_isUpDn ())
2065 { 2117 {
2066 scrollBar.setIdle (); 2118 scrollBar.setIdle ();
2067 scrollbar_show (0); 2119 scrollbar_show (0);
2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 refresh_type &= ~SMOOTH_REFRESH;
2070#endif
2071 } 2120 }
2072 2121
2073#ifdef SELECTION_SCROLLING 2122#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active) 2123 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2124 sel_scroll_ev.stop();
2076#endif 2125#endif
2077 2126
2078 if (ev.window == vt) 2127 if (ev.window == vt)
2079 { 2128 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2130 return;
2131
2080#if ISO_14755 2132#if ISO_14755
2081 // 5.4 2133 // 5.4
2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2134 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2083 return; 2135 return;
2084#endif 2136#endif
2137
2085 if (reportmode) 2138 if (reportmode)
2086 { 2139 {
2087 /* mouse report from vt window */ 2140 /* mouse report from vt window */
2088 /* don't report release of wheel "buttons" */ 2141 /* don't report release of wheel "buttons" */
2089 if (ev.button >= 4) 2142 if (ev.button >= 4)
… …
2119 { 2172 {
2120 case Button1: 2173 case Button1:
2121 case Button3: 2174 case Button3:
2122 selection_make (ev.time); 2175 selection_make (ev.time);
2123 break; 2176 break;
2177
2124 case Button2: 2178 case Button2:
2125 selection_request (ev.time, ev.x, ev.y); 2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2126 break; 2181 break;
2182
2127#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2128 case Button4: 2184 case Button4:
2129 case Button5: 2185 case Button5:
2130 { 2186 {
2131 int i; 2187 int i;
… …
2133 2189
2134 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2135 2191
2136 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2137 i = 1; 2193 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2194 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2195 i = nrow - 1;
2140 else 2196 else
2141 i = 5; 2197 i = 5;
2142 2198
2143# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
… …
2153 slip_wheel_ev.start (); 2209 slip_wheel_ev.start ();
2154 } 2210 }
2155 else 2211 else
2156 { 2212 {
2157# endif 2213# endif
2158# ifdef JUMP_MOUSE_WHEEL
2159 scr_page (v, i); 2214 scr_page (v, i);
2160 scr_refresh (SMOOTH_REFRESH);
2161 scrollbar_show (1); 2215 scrollbar_show (1);
2162# else
2163 while (i--)
2164 {
2165 scr_page (v, 1);
2166 scr_refresh (SMOOTH_REFRESH);
2167 scrollbar_show (1);
2168 }
2169# endif
2170# ifdef MOUSE_SLIP_WHEELING 2216# ifdef MOUSE_SLIP_WHEELING
2171 } 2217 }
2172#endif 2218# endif
2173 } 2219 }
2174 break; 2220 break;
2175#endif 2221#endif
2176 } 2222 }
2177 } 2223 }
2178#ifdef MENUBAR
2179 else if (isMenuBarWindow (ev.window))
2180 menubar_control (ev);
2181#endif
2182} 2224}
2183
2184#ifdef TRANSPARENT
2185#if TINTING
2186/* taken from aterm-0.4.2 */
2187
2188typedef uint32_t RUINT32T;
2189
2190void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2191{
2192 int sh_r, sh_g, sh_b;
2193 RUINT32T mask_r, mask_g, mask_b;
2194 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2195 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2196 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2197 int i;
2198
2199 Visual *visual = display->visual;
2200
2201 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2202
2203 /* for convenience */
2204 mask_r = visual->red_mask;
2205 mask_g = visual->green_mask;
2206 mask_b = visual->blue_mask;
2207
2208 /* boring lookup table pre-initialization */
2209 switch (srcImage->bits_per_pixel) {
2210 case 15:
2211 if ((mask_r != 0x7c00) ||
2212 (mask_g != 0x03e0) ||
2213 (mask_b != 0x001f))
2214 return;
2215 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2216 lookup_r = lookup;
2217 lookup_g = lookup+32;
2218 lookup_b = lookup+32+32;
2219 sh_r = 10;
2220 sh_g = 5;
2221 sh_b = 0;
2222 break;
2223 case 16:
2224 if ((mask_r != 0xf800) ||
2225 (mask_g != 0x07e0) ||
2226 (mask_b != 0x001f))
2227 return;
2228 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2229 lookup_r = lookup;
2230 lookup_g = lookup+32;
2231 lookup_b = lookup+32+64;
2232 sh_r = 11;
2233 sh_g = 5;
2234 sh_b = 0;
2235 break;
2236 case 24:
2237 if ((mask_r != 0xff0000) ||
2238 (mask_g != 0x00ff00) ||
2239 (mask_b != 0x0000ff))
2240 return;
2241 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2242 lookup_r = lookup;
2243 lookup_g = lookup+256;
2244 lookup_b = lookup+256+256;
2245 sh_r = 16;
2246 sh_g = 8;
2247 sh_b = 0;
2248 break;
2249 case 32:
2250 if ((mask_r != 0xff0000) ||
2251 (mask_g != 0x00ff00) ||
2252 (mask_b != 0x0000ff))
2253 return;
2254 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2255 lookup_r = lookup;
2256 lookup_g = lookup+256;
2257 lookup_b = lookup+256+256;
2258 sh_r = 16;
2259 sh_g = 8;
2260 sh_b = 0;
2261 break;
2262 default:
2263 return; /* we do not support this color depth */
2264 }
2265
2266 /* prepare limits for color transformation (each channel is handled separately) */
2267 if (shade < 0) {
2268 shade = -shade;
2269 if (shade < 0) shade = 0;
2270 if (shade > 100) shade = 100;
2271
2272 lower_lim_r = 65535-rm;
2273 lower_lim_g = 65535-gm;
2274 lower_lim_b = 65535-bm;
2275
2276 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2277 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2278 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2279
2280 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2281 } else {
2282 if (shade < 0) shade = 0;
2283 if (shade > 100) shade = 100;
2284
2285 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2286
2287 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2288 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2289 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2290 }
2291
2292 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2293 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2294 {
2295 unsigned int tmp;
2296
2297 tmp = lower_lim_r;
2298 lower_lim_r = lower_lim_b;
2299 lower_lim_b = tmp;
2300
2301 tmp = upper_lim_r;
2302 upper_lim_r = upper_lim_b;
2303 upper_lim_b = tmp;
2304 }
2305
2306 /* fill our lookup tables */
2307 for (i = 0; i <= mask_r>>sh_r; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2311 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2312 lookup_r[i] = (tmp/65535)<<sh_r;
2313 }
2314 for (i = 0; i <= mask_g>>sh_g; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2318 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2319 lookup_g[i] = (tmp/65535)<<sh_g;
2320 }
2321 for (i = 0; i <= mask_b>>sh_b; i++)
2322 {
2323 RUINT32T tmp;
2324 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2325 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2326 lookup_b[i] = (tmp/65535)<<sh_b;
2327 }
2328
2329 /* apply table to input image (replacing colors by newly calculated ones) */
2330 switch (srcImage->bits_per_pixel)
2331 {
2332 case 15:
2333 {
2334 unsigned short *p1, *pf, *p, *pl;
2335 p1 = (unsigned short *) srcImage->data;
2336 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337 while (p1 < pf)
2338 {
2339 p = p1;
2340 pl = p1 + srcImage->width;
2341 for (; p < pl; p++)
2342 {
2343 *p = lookup_r[(*p & 0x7c00)>>10] |
2344 lookup_g[(*p & 0x03e0)>> 5] |
2345 lookup_b[(*p & 0x001f)];
2346 }
2347 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2348 }
2349 break;
2350 }
2351 case 16:
2352 {
2353 unsigned short *p1, *pf, *p, *pl;
2354 p1 = (unsigned short *) srcImage->data;
2355 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2356 while (p1 < pf)
2357 {
2358 p = p1;
2359 pl = p1 + srcImage->width;
2360 for (; p < pl; p++)
2361 {
2362 *p = lookup_r[(*p & 0xf800)>>11] |
2363 lookup_g[(*p & 0x07e0)>> 5] |
2364 lookup_b[(*p & 0x001f)];
2365 }
2366 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2367 }
2368 break;
2369 }
2370 case 24:
2371 {
2372 unsigned char *p1, *pf, *p, *pl;
2373 p1 = (unsigned char *) srcImage->data;
2374 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2375 while (p1 < pf)
2376 {
2377 p = p1;
2378 pl = p1 + srcImage->width * 3;
2379 for (; p < pl; p += 3)
2380 {
2381 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2382 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2383 p[2] = lookup_r[(p[2] & 0x0000ff)];
2384 }
2385 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2386 }
2387 break;
2388 }
2389 case 32:
2390 {
2391 RUINT32T *p1, *pf, *p, *pl;
2392 p1 = (RUINT32T *) srcImage->data;
2393 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2394
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0xff0000)>>16] |
2402 lookup_g[(*p & 0x00ff00)>> 8] |
2403 lookup_b[(*p & 0x0000ff)] |
2404 (*p & ~0xffffff);
2405 }
2406 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 }
2411
2412 free (lookup);
2413}
2414#endif
2415
2416/*
2417 * Check our parents are still who we think they are.
2418 * Do transparency updates if required
2419 */
2420int
2421rxvt_term::check_our_parents ()
2422{
2423 int i, pchanged, aformat, have_pixmap, rootdepth;
2424 unsigned long nitems, bytes_after;
2425 Atom atype;
2426 unsigned char *prop = NULL;
2427 Window root, oldp, *list;
2428 Pixmap rootpixmap = None;
2429 XWindowAttributes wattr, wrootattr;
2430 dDisp;
2431
2432 pchanged = 0;
2433
2434 if (!OPTION (Opt_transparent))
2435 return pchanged; /* Don't try any more */
2436
2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2438 rootdepth = wrootattr.depth;
2439
2440 XGetWindowAttributes (disp, parent[0], &wattr);
2441
2442 if (rootdepth != wattr.depth)
2443 {
2444 if (am_transparent)
2445 {
2446 pchanged = 1;
2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2448 am_transparent = am_pixmap_trans = 0;
2449 }
2450
2451 return pchanged; /* Don't try any more */
2452 }
2453
2454 /* Get all X ops out of the queue so that our information is up-to-date. */
2455 XSync (disp, False);
2456
2457 /*
2458 * Make the frame window set by the window manager have
2459 * the root background. Some window managers put multiple nested frame
2460 * windows for each client, so we have to take care about that.
2461 */
2462 i = (xa[XA_XROOTPMAP_ID]
2463 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2464 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2465 &nitems, &bytes_after, &prop) == Success);
2466
2467 if (!i || prop == NULL)
2468 i = (xa[XA_ESETROOT_PMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL
2474#if TINTING
2475 || !rs[Rs_color + Color_tint]
2476#endif
2477 )
2478 have_pixmap = 0;
2479 else
2480 {
2481 have_pixmap = 1;
2482 rootpixmap = *(Pixmap *)prop;
2483 XFree (prop);
2484 }
2485
2486 if (have_pixmap)
2487 {
2488 /*
2489 * Copy display->root pixmap transparency
2490 */
2491 int sx, sy, nx, ny;
2492 unsigned int nw, nh;
2493 Window cr;
2494 XImage *image;
2495 GC gc;
2496 XGCValues gcvalue;
2497
2498 XTranslateCoordinates (disp, parent[0], display->root,
2499 0, 0, &sx, &sy, &cr);
2500 nw = (unsigned int)szHint.width;
2501 nh = (unsigned int)szHint.height;
2502 nx = ny = 0;
2503
2504 if (sx < 0)
2505 {
2506 nw += sx;
2507 nx = -sx;
2508 sx = 0;
2509 }
2510
2511 if (sy < 0)
2512 {
2513 nh += sy;
2514 ny = -sy;
2515 sy = 0;
2516 }
2517
2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2520
2521 XSync (disp, False);
2522 allowedxerror = -1;
2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2524
2525 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2526 /* XXX: may need a delay here? */
2527 allowedxerror = 0;
2528
2529 if (image == NULL)
2530 {
2531 if (am_transparent && am_pixmap_trans)
2532 {
2533 pchanged = 1;
2534 if (pixmap != None)
2535 {
2536 XFreePixmap (disp, pixmap);
2537 pixmap = None;
2538 }
2539 }
2540
2541 am_pixmap_trans = 0;
2542 }
2543 else
2544 {
2545 if (pixmap != None)
2546 XFreePixmap (disp, pixmap);
2547
2548#if TINTING
2549 if (ISSET_PIXCOLOR (Color_tint))
2550 {
2551 unsigned short rm, gm, bm;
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2555
2556 ShadeXImage (display, image, shade, rm, gm, bm);
2557 }
2558#endif
2559
2560 pixmap = XCreatePixmap (disp, vt,
2561 szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (disp, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2568 XClearWindow (disp, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (disp, parent[i - 1], &root,
2589 &parent[i], &list, &n);
2590 XFree (list);
2591
2592 if (parent[i] == display->root)
2593 {
2594 if (oldp != None)
2595 pchanged = 1;
2596
2597 break;
2598 }
2599
2600 if (oldp != parent[i])
2601 pchanged = 1;
2602 }
2603
2604 n = 0;
2605
2606 if (pchanged)
2607 {
2608 for (; n < (unsigned int)i; n++)
2609 {
2610 XGetWindowAttributes (disp, parent[n], &wattr);
2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2612 {
2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2614 break;
2615 }
2616 }
2617 }
2618
2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2620 {
2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2623 am_transparent = 0;
2624 /* XXX: also turn off Opt_transparent? */
2625 }
2626 else
2627 {
2628#if WAIT_FOR_WM
2629 /* wait (an arbitrary period) for the WM to do its thing
2630 * needed for fvwm2.2.2 (and before?) */
2631 sleep (1);
2632#endif
2633 for (n = 0; n < (unsigned int)i; n++)
2634 {
2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2636 XClearWindow (disp, parent[n]);
2637 }
2638
2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2640 am_transparent = 1;
2641 }
2642
2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 parent[i] = None;
2645 }
2646
2647 if (scrollBar.win)
2648 {
2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2650 scrollBar.setIdle ();
2651 scrollbar_show (0);
2652 }
2653
2654 if (am_transparent)
2655 {
2656 want_refresh = want_full_refresh = 1;
2657 if (am_pixmap_trans)
2658 flush ();
2659 }
2660
2661 return pchanged;
2662}
2663#endif
2664 2225
2665/*}}} */ 2226/*}}} */
2666 2227
2667bool 2228bool
2668rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
2669{ 2230{
2670 bool flag = false; 2231 bool flag = false;
2671 unicode_t ch = NOCHAR; 2232 wchar_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here 2233 char *seq_begin; // remember start of esc-sequence here
2673 2234
2674 for (;;) 2235 for (;;)
2675 { 2236 {
2676 if (ch == NOCHAR) 2237 if (ch == NOCHAR)
2677 { 2238 {
2678 seq_begin = cmdbuf_ptr; 2239 seq_begin = cmdbuf_ptr;
2679 ch = next_char (); 2240 ch = next_char ();
2680 }
2681 2241
2682 if (ch == NOCHAR) // TODO: improve 2242 if (ch == NOCHAR)
2683 break; 2243 break;
2244 }
2684 2245
2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2686 { 2247 {
2687 if (!seen_input) 2248 if (!seen_input)
2688 { 2249 {
… …
2697 if (seen_resize && cmd_pid) 2258 if (seen_resize && cmd_pid)
2698 kill (-cmd_pid, SIGWINCH); 2259 kill (-cmd_pid, SIGWINCH);
2699 } 2260 }
2700 2261
2701 /* Read a text string from the input buffer */ 2262 /* Read a text string from the input buffer */
2702 unicode_t buf[UBUFSIZ]; 2263 wchar_t buf[UBUFSIZ];
2703 bool refreshnow = false; 2264 bool refreshnow = false;
2704 int nlines = 0; 2265 int nlines = 0;
2705 unicode_t *str = buf; 2266 wchar_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ); 2267 wchar_t *eol = str + min (ncol, UBUFSIZ);
2707 2268
2708 for (;;) 2269 for (;;)
2709 { 2270 {
2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2711 break; 2272 break;
… …
2717 if (ch == C0_LF) 2278 if (ch == C0_LF)
2718 nlines++; 2279 nlines++;
2719 2280
2720 refresh_count++; 2281 refresh_count++;
2721 2282
2722 if (!OPTION (Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2724 { 2284 {
2725 refreshnow = true;
2726 refresh_count = 0; 2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2289 refreshnow = true;
2727 ch = NOCHAR; 2290 ch = NOCHAR;
2728 break; 2291 break;
2292 }
2729 } 2293 }
2730 2294
2731 // scr_add_lines only works for nlines <= nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1) 2296 if (nlines >= nrow - 1)
2733 { 2297 {
2298 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2299 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2734 scr_add_lines (buf, nlines, str - buf); 2300 scr_add_lines (buf, str - buf, nlines);
2301
2735 nlines = 0; 2302 nlines = 0;
2736 str = buf; 2303 str = buf;
2737 eol = str + min (ncol, UBUFSIZ); 2304 eol = str + min (ncol, UBUFSIZ);
2738 } 2305 }
2739 2306
… …
2752 2319
2753 seq_begin = cmdbuf_ptr; 2320 seq_begin = cmdbuf_ptr;
2754 ch = next_char (); 2321 ch = next_char ();
2755 } 2322 }
2756 2323
2324 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2757 scr_add_lines (buf, nlines, str - buf); 2326 scr_add_lines (buf, str - buf, nlines);
2758 2327
2759 /* 2328 /*
2760 * If there have been a lot of new lines, then update the screen 2329 * If there have been a lot of new lines, then update the screen
2761 * What the heck I'll cheat and only refresh less than every page-full. 2330 * What the heck we'll cheat and only refresh less than every page-full.
2762 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2763 * is incremented here because we must be doing flat-out scrolling.
2764 */ 2332 */
2765 if (refreshnow) 2333 if (refreshnow)
2766 { 2334 {
2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2768 refresh_limit++;
2769 else
2770 {
2771 flag = true; 2335 flag = true;
2772 scr_refresh (refresh_type); 2336 scr_refresh ();
2773 flush_ev.stop (); 2337 want_refresh = 1;
2774 }
2775 } 2338 }
2776 2339
2777 } 2340 }
2778 else 2341 else
2779 { 2342 {
… …
2793 } 2356 }
2794 2357
2795 return flag; 2358 return flag;
2796} 2359}
2797 2360
2798// read the next octet
2799unicode_t
2800rxvt_term::next_octet ()
2801{
2802 return cmdbuf_ptr < cmdbuf_endp
2803 ? *cmdbuf_ptr++
2804 : NOCHAR;
2805}
2806
2807// read the next character 2361// read the next character
2808unicode_t 2362wchar_t
2809rxvt_term::next_char () 2363rxvt_term::next_char () NOTHROW
2810{ 2364{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2365 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2366 {
2813 // assume 7-bit to be ascii ALWAYS 2367 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++; 2369 return *cmdbuf_ptr++;
2816 2370
2817 wchar_t wc; 2371 wchar_t wc;
2818 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819 2373
2820 if (len == (size_t)-2) 2374 if (len == (size_t)-2)
2821 { 2375 {
2822 // the mbstate stores incomplete sequences. didn't know this :/ 2376 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp; 2377 cmdbuf_ptr = cmdbuf_endp;
2824 break; 2378 break;
2825 } 2379 }
2826 2380
2827 if (len == (size_t)-1) 2381 if (len == (size_t)-1)
2828 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2829 2383
2830 // assume wchar == unicode 2384 // assume wchar == unicode
2831 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2833 } 2387 }
2834 2388
2835 return NOCHAR; 2389 return NOCHAR;
2836} 2390}
2391
2392// read the next octet
2393uint32_t
2394rxvt_term::next_octet () NOTHROW
2395{
2396 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR;
2399}
2400
2401static class out_of_input out_of_input;
2837 2402
2838/* rxvt_cmd_getc () - Return next input character */ 2403/* rxvt_cmd_getc () - Return next input character */
2839/* 2404/*
2840 * Return the next input character after first passing any keyboard input 2405 * Return the next input character after first passing any keyboard input
2841 * to the command. 2406 * to the command.
2842 */ 2407 */
2843unicode_t 2408wchar_t
2844rxvt_term::cmd_getc () 2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2845{ 2410{
2846 unicode_t c = next_char (); 2411 wchar_t c = next_char ();
2847 2412
2848 if (c == NOCHAR) 2413 if (c == NOCHAR)
2849 throw out_of_input; 2414 throw out_of_input;
2850 2415
2851 return c; 2416 return c;
2852} 2417}
2853 2418
2854unicode_t 2419uint32_t
2855rxvt_term::cmd_get8 () 2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2856{ 2421{
2857 unicode_t c = next_octet (); 2422 uint32_t c = next_octet ();
2858 2423
2859 if (c == NOCHAR) 2424 if (c == NOCHAR)
2860 throw out_of_input; 2425 throw out_of_input;
2861 2426
2862 return c; 2427 return c;
… …
2926 { 2491 {
2927 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2928 break; /* done = 1 */ 2493 break; /* done = 1 */
2929 } 2494 }
2930 } 2495 }
2931 2496
2932 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2933 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2934 { 2499 {
2935 done = 1; 2500 done = 1;
2936 break; 2501 break;
… …
2962 case C0_ESC: 2527 case C0_ESC:
2963 process_escape_seq (); 2528 process_escape_seq ();
2964 break; 2529 break;
2965 case C0_ENQ: /* terminal Status */ 2530 case C0_ENQ: /* terminal Status */
2966 if (rs[Rs_answerbackstring]) 2531 if (rs[Rs_answerbackstring])
2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2532 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2969 else 2533 else
2970 tt_write ((unsigned char *)VT100_ANS, 2534 tt_write (VT100_ANS, strlen (VT100_ANS));
2971 (unsigned int)strlen (VT100_ANS));
2972 break; 2535 break;
2973 case C0_BEL: /* bell */ 2536 case C0_BEL: /* bell */
2974 scr_bell (); 2537 scr_bell ();
2975 break; 2538 break;
2976 case C0_BS: /* backspace */ 2539 case C0_BS: /* backspace */
… …
3000 process_dcs_seq (); 2563 process_dcs_seq ();
3001 break; 2564 break;
3002 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
3003 process_csi_seq (); 2566 process_csi_seq ();
3004 break; 2567 break;
3005 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3006 process_osc_seq (); 2569 process_osc_seq ();
3007 break; 2570 break;
3008#endif 2571#endif
3009 } 2572 }
3010} 2573}
… …
3100 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3101 break; 2664 break;
3102 case '+': 2665 case '+':
3103 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3104 break; 2667 break;
3105#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3106 case '6': 2669 case '6':
3107 scr_backindex (); 2670 scr_backindex ();
3108 break; 2671 break;
3109#endif 2672#endif
3110 case '7': 2673 case '7':
3111 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3112 break; 2675 break;
3113 case '8': 2676 case '8':
3114 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3115 break; 2678 break;
3116#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3117 case '9': 2680 case '9':
3118 scr_forwardindex (); 2681 scr_forwardindex ();
3119 break; 2682 break;
3120#endif 2683#endif
3121 case '=': 2684 case '=':
… …
3131 break; 2694 break;
3132 2695
3133 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
3134 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
3135 { 2698 {
3136 unicode_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
3137 scr_add_lines (nlcr, 1, 2); 2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3138 } 2701 }
3139 break; 2702 break;
3140 2703
3141 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
3142 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
3164 process_dcs_seq (); 2727 process_dcs_seq ();
3165 break; 2728 break;
3166 2729
3167 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3168 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
3169 tt_write ((const unsigned char *)ESCZ_ANSWER, 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3170 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3171 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
3172 2734
3173 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3174 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
3175 process_csi_seq (); 2737 process_csi_seq ();
… …
3237rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3238{ 2800{
3239 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3240 unsigned int nargs, p; 2802 unsigned int nargs, p;
3241 int n, ndef; 2803 int n, ndef;
3242 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3243 2805
3244 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3245 arg[--nargs] = 0;
3246 2807
3247 priv = 0; 2808 priv = 0;
3248 ch = cmd_getc (); 2809 ch = cmd_getc ();
3249 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
3250 { /* '<' '=' '>' '?' */ 2811 { /* '<' '=' '>' '?' */
… …
3284 ndef = get_byte_array_bit (csi_defaults, i); 2845 ndef = get_byte_array_bit (csi_defaults, i);
3285 for (p = 0; p < nargs; p++) 2846 for (p = 0; p < nargs; p++)
3286 if (arg[p] == -1) 2847 if (arg[p] == -1)
3287 arg[p] = ndef; 2848 arg[p] = ndef;
3288 2849
3289#ifdef DEBUG_CMD
3290 fprintf (stderr, "CSI ");
3291 for (p = 0; p < nargs; p++)
3292 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3293 fprintf (stderr, "%c\n", ch);
3294#endif
3295
3296 /* 2850 /*
3297 * private mode handling 2851 * private mode handling
3298 */ 2852 */
3299 if (priv) 2853 if (priv)
3300 { 2854 {
3301 switch (priv) 2855 switch (priv)
3302 { 2856 {
3303 case '>': 2857 case '>':
3304 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3305 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2859 {
2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2862 //
2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2865 // versions.
2866 //
2867 tt_printf ("\033[>%d;95;0c", 'U');
2868 }
3306 break; 2869 break;
3307 case '?': 2870 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2873 break;
… …
3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2982 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2983 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3421 break; 2984 break;
3422 2985
3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2986 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3424 tt_write ((const unsigned char *)VT100_ANS, 2987 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 break; 2988 break;
3427 2989
3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2990 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3429 process_sgr_mode (nargs, arg); 2991 process_sgr_mode (nargs, arg);
3430 break; 2992 break;
… …
3437 break; 2999 break;
3438 case 6: /* CPR requested */ 3000 case 6: /* CPR requested */
3439 scr_report_position (); 3001 scr_report_position ();
3440 break; 3002 break;
3441 case 7: /* unofficial extension */ 3003 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure)) 3004 if (option (Opt_insecure))
3443 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3005 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3444 break; 3006 break;
3445 case 8: /* unofficial extension */ 3007 case 8: /* unofficial extension */
3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3008 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3447 break; 3009 break;
… …
3514 break; 3076 break;
3515 case CSI_75: 3077 case CSI_75:
3516 scr_cursor (RESTORE); 3078 scr_cursor (RESTORE);
3517 break; 3079 break;
3518 3080
3519#if ENABLE_FRILLS 3081#if !ENABLE_MINIMAL
3520 case CSI_74: 3082 case CSI_74:
3521 process_window_ops (arg, nargs); 3083 process_window_ops (arg, nargs);
3522 break; 3084 break;
3523#endif 3085#endif
3524 3086
… …
3531 break; 3093 break;
3532 } 3094 }
3533} 3095}
3534/*}}} */ 3096/*}}} */
3535 3097
3536#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3537/* ARGSUSED */ 3099/* ARGSUSED */
3538void 3100void
3539rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3540{ 3102{
3541 int x, y; 3103 int x, y;
3542 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
3543 Window wdummy; 3105 Window wdummy;
3544 dDisp; 3106
3107 dLocal (Display *, dpy);
3545 3108
3546 if (nargs == 0) 3109 if (nargs == 0)
3547 return; 3110 return;
3548 3111
3549 switch (args[0]) 3112 switch (args[0])
3550 { 3113 {
3551 /* 3114 /*
3552 * commands 3115 * commands
3553 */ 3116 */
3554 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3555 XMapWindow (disp, parent[0]); 3118 XMapWindow (dpy, parent[0]);
3556 break; 3119 break;
3557 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3558 XIconifyWindow (disp, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent[0], display->screen);
3559 break; 3122 break;
3560 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3561 XMoveWindow (disp, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent[0], args[1], args[2]);
3562 break; 3125 break;
3563 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3128 break;
3566 case 5: /* raise window */ 3129 case 5: /* raise window */
3567 XRaiseWindow (disp, parent[0]); 3130 XRaiseWindow (dpy, parent[0]);
3568 break; 3131 break;
3569 case 6: /* lower window */ 3132 case 6: /* lower window */
3570 XLowerWindow (disp, parent[0]); 3133 XLowerWindow (dpy, parent[0]);
3571 break; 3134 break;
3572 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3573 scr_touch (true); 3136 scr_touch (true);
3574 break; 3137 break;
3575 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3582 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)width,
3584 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3585 break; 3148 break;
3586 3149
3587
3588 /* 3150 /*
3589 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3590 */ 3152 */
3591 case 11: /* report window state */ 3153 case 11: /* report window state */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3594 break; 3156 break;
3595 case 13: /* report window position */ 3157 case 13: /* report window position */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 XTranslateCoordinates (disp, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent[0], wattr.root,
3598 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3599 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3600 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3601 break; 3163 break;
3602 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3605 break; 3167 break;
3606 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break; 3170 break;
… …
3610 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3611 break; 3173 break;
3612 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3613 { 3175 {
3614 char *s; 3176 char *s;
3615 XGetIconName (disp, parent[0], &s); 3177 XGetIconName (dpy, parent[0], &s);
3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3179 XFree (s);
3618 } 3180 }
3619 break; 3181 break;
3620 case 21: /* report window title */ 3182 case 21: /* report window title */
3621 { 3183 {
3622 char *s; 3184 char *s;
3623 XFetchName (disp, parent[0], &s); 3185 XFetchName (dpy, parent[0], &s);
3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3187 XFree (s);
3626 } 3188 }
3627 break; 3189 break;
3628 } 3190 }
3629} 3191}
… …
3632/*----------------------------------------------------------------------*/ 3194/*----------------------------------------------------------------------*/
3633/* 3195/*
3634 * get input up until STRING TERMINATOR (or BEL) 3196 * get input up until STRING TERMINATOR (or BEL)
3635 * ends_how is terminator used. returned input must be free()'d 3197 * ends_how is terminator used. returned input must be free()'d
3636 */ 3198 */
3637unsigned char * 3199char *
3638rxvt_term::get_to_st (unicode_t &ends_how) 3200rxvt_term::get_to_st (unicode_t &ends_how)
3639{ 3201{
3640 unicode_t ch; 3202 unicode_t ch;
3641 bool seen_esc = false; 3203 bool seen_esc = false;
3642 unsigned int n = 0; 3204 unsigned int n = 0;
… …
3656 seen_esc = true; 3218 seen_esc = true;
3657 continue; 3219 continue;
3658 } 3220 }
3659 else if (ch == C0_BEL || ch == CHAR_ST) 3221 else if (ch == C0_BEL || ch == CHAR_ST)
3660 break; 3222 break;
3223 else if (ch == C0_SYN)
3224 ch = cmd_get8 ();
3661 else if (ch < 0x20) 3225 else if (ch < 0x20)
3662 return NULL; /* other control character - exit */ 3226 return NULL; /* other control character - exit */
3663 3227
3664 seen_esc = false; 3228 seen_esc = false;
3665 3229
3666 if (n >= STRING_MAX - 1) 3230 if (n >= STRING_MAX - 1)
3667 // stop at some sane length 3231 // stop at some sane length
3668 return NULL; 3232 return NULL;
3669 3233
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
3673 string[n++] = ch; 3234 string[n++] = ch;
3674 } 3235 }
3675 3236
3676 string[n++] = '\0'; 3237 string[n++] = '\0';
3677 3238
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3239 ends_how = (ch == 0x5c ? C0_ESC : ch);
3679 3240
3680 return (unsigned char *)rxvt_wcstombs (string); 3241 return rxvt_wcstombs (string);
3681} 3242}
3682 3243
3683/*----------------------------------------------------------------------*/ 3244/*----------------------------------------------------------------------*/
3684/* 3245/*
3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3686 */ 3247 */
3687void 3248void
3688rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3689{ 3250{
3690 unsigned char *s; 3251 char *s;
3691 unicode_t eh; 3252 unicode_t eh;
3692 3253
3693 /* 3254 /*
3694 * Not handled yet 3255 * Not handled yet
3695 */ 3256 */
… …
3714 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3715 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3716 3277
3717 if (ch == ';') 3278 if (ch == ';')
3718 { 3279 {
3719 unsigned char *s = get_to_st (eh); 3280 char *s = get_to_st (eh);
3720 3281
3721 if (s) 3282 if (s)
3722 { 3283 {
3723 process_xterm_seq (arg, (char *)s, eh); 3284 process_xterm_seq (arg, s, eh);
3724 free (s); 3285 free (s);
3725 } 3286 }
3726 } 3287 }
3727} 3288}
3728 3289
3729void 3290void
3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3291rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3292{
3732 if (str[0] == '?' && !str[1]) 3293 if (str[0] == '?' && !str[1])
3733 { 3294 {
3734 unsigned short r, g, b; 3295 rgba c;
3735 pix_colors_focused[color].get (display, r, g, b); 3296 pix_colors_focused[color].get (c);
3297
3298#if XFT
3299 if (c.a != rgba::MAX_CC)
3300 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3301 else
3302#endif
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3737 } 3304 }
3738 else 3305 else
3739 set_window_color (color, str); 3306 set_window_color (color, str);
3740} 3307}
3741 3308
3742/* 3309/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3310 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3311 */
3745void 3312void
3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3313rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3314{
3748 int changed = 0;
3749 int color; 3315 int color;
3750 char *buf, *name; 3316 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3317 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3318 int saveop = op;
3753 dDisp; 3319
3320 dLocal (Display *, dpy);
3754 3321
3755 assert (str != NULL); 3322 assert (str != NULL);
3323
3324 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3325 return;
3326
3756 switch (op) 3327 switch (op)
3757 { 3328 {
3758 case XTerm_name: 3329 case XTerm_name:
3759 set_title (str); 3330 set_title (str);
3760 /* FALLTHROUGH */ 3331 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3345 unsigned long bytes_after;
3775 unsigned char *value = 0; 3346 unsigned char *value = 0;
3776 const char *str = ""; 3347 const char *str = "";
3777 3348
3778 if (prop 3349 if (prop
3779 && XGetWindowProperty (disp, parent[0], 3350 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3351 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3352 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3353 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3354 && actual_type != None
3784 && actual_format == 8) 3355 && actual_format == 8)
3785 str = (const char *)(value); 3356 str = (const char *)(value);
3786 3357
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3358 tt_printf ("\033]%d;%s%c", op, str, resp);
3788 3359
3789 XFree (value); 3360 XFree (value);
3790 } 3361 }
3791 else 3362 else
3792 { 3363 {
… …
3796 { 3367 {
3797 *eq = 0; 3368 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3369 set_utf8_property (display->atom (str), eq + 1);
3799 } 3370 }
3800 else 3371 else
3801 XDeleteProperty (disp, parent[0], 3372 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3373 display->atom (str));
3803 } 3374 }
3804 break; 3375 break;
3805 3376
3806 case XTerm_Color: 3377 case XTerm_Color:
… …
3808 { 3379 {
3809 if ((name = strchr (buf, ';')) == NULL) 3380 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3381 break;
3811 3382
3812 *name++ = '\0'; 3383 *name++ = '\0';
3813 color = atoi (buf); 3384 color = atoi (buf) + minCOLOR;
3814 3385
3815 if (color < 0 || color >= TOTAL_COLORS) 3386 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3387 break;
3817 3388
3818 if ((buf = strchr (name, ';')) != NULL) 3389 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3390 *buf++ = '\0';
3820 3391
3821 if (name[0] == '?' && !name[1]) 3392 process_color_seq (op, color, name, resp);
3822 {
3823 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 }
3827 else
3828 set_window_color (color + minCOLOR, name);
3829 } 3393 }
3830 break; 3394 break;
3831 case XTerm_Color00: 3395 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3833 break; 3397 break;
3834 case XTerm_Color01: 3398 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3399 process_color_seq (op, Color_bg, str, resp);
3836 break; 3400 break;
3837#ifndef NO_CURSORCOLOR 3401#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3402 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3403 process_color_seq (op, Color_cursor, str, resp);
3840 break; 3404 break;
3841#endif 3405#endif
3842 case XTerm_Color_pointer_fg: 3406 case XTerm_Color_pointer_fg:
3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3407 process_color_seq (op, Color_pointer_fg, str, resp);
3844 break; 3408 break;
3845 case XTerm_Color_pointer_bg: 3409 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3410 process_color_seq (op, Color_pointer_bg, str, resp);
3847 break; 3411 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3413 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3414 process_color_seq (op, Color_RV, str, resp);
3415 break;
3416 case Rxvt_Color_BD:
3417 case URxvt_Color_BD:
3418 process_color_seq (op, Color_BD, str, resp);
3419 break;
3420 case Rxvt_Color_UL:
3421 case URxvt_Color_UL:
3422 process_color_seq (op, Color_UL, str, resp);
3857 break; 3423 break;
3858 case URxvt_Color_IT: 3424 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3425 process_color_seq (op, Color_IT, str, resp);
3860 break; 3426 break;
3861#endif 3427#endif
3862#if TRANSPARENT && TINTING 3428#if ENABLE_TRANSPARENCY
3863 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3865 check_our_parents (); 3431 {
3866 if (am_transparent) 3432 bool changed = false;
3867 want_full_refresh = want_refresh = 1; 3433 if (ISSET_PIXCOLOR (Color_tint))
3868 break; 3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3869#endif 3435 else
3436 changed = bgPixmap.unset_tint ();
3437 if (changed)
3438 update_background ();
3439 }
3870 3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3871 case XTerm_Pixmap: 3445 case Rxvt_Pixmap:
3872 if (*str != ';') 3446 if (!strcmp (str, "?"))
3873 { 3447 {
3874#if XPM_BACKGROUND 3448 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3449
3876 set_bgPixmap (str); /* change pixmap */ 3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877#endif 3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878 scr_touch (true); 3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3454 }
3880 while ((str = strchr (str, ';')) != NULL) 3455 else
3881 { 3456 {
3457 int changed = 0;
3458
3459 if (*str != ';')
3460 {
3461 /* reset to default scaling :*/
3462 bgPixmap.unset_geometry ();
3463 if (bgPixmap.set_file (str)) /* change pixmap */
3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bgPixmap.set_defaultGeometry ();
3468 }
3469 while (str)
3470 {
3882 str++; 3471 str++;
3883#if XPM_BACKGROUND 3472 if (bgPixmap.set_geometry (str))
3884 changed += scale_pixmap (str); 3473 changed++;
3885#endif 3474 str = strchr (str, ';');
3475 }
3476 if (changed)
3477 update_background ();
3886 } 3478 }
3887
3888 if (changed)
3889 {
3890#ifdef XPM_BACKGROUND
3891 resize_pixmap ();
3892#endif
3893 scr_touch (true);
3894 }
3895 break; 3479 break;
3480#endif
3896 3481
3897 case XTerm_restoreFG: 3482 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3483 set_window_color (Color_fg, str);
3899 break; 3484 break;
3900 case XTerm_restoreBG: 3485 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3486 set_window_color (Color_bg, str);
3902 break; 3487 break;
3903 3488
3904 case XTerm_logfile: 3489 case XTerm_logfile:
3905 // TODO, when secure mode? 3490 // TODO, when secure mode?
3906 break; 3491 break;
3907 3492
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0 3493#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3494 case Rxvt_dumpscreen: /* no error notices */
3916 { 3495 {
3917 int fd; 3496 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3497 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3498 {
3920 scr_dump (fd); 3499 scr_dump (fd);
… …
3931 case URxvt_italicFont: 3510 case URxvt_italicFont:
3932 case URxvt_boldItalicFont: 3511 case URxvt_boldItalicFont:
3933#endif 3512#endif
3934 if (query) 3513 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop, 3514 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3515 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "", 3516 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp); 3517 resp);
3939 else 3518 else
3940 { 3519 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3520 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3944 allocated.push_back ((void *)res); 3523 allocated.push_back ((void *)res);
3945 set_fonts (); 3524 set_fonts ();
3946 } 3525 }
3947 break; 3526 break;
3948 3527
3949#if ENABLE_FRILLS 3528 case URxvt_version:
3529 if (query)
3530 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3531 op,
3532 rs[Rs_name], VERSION[0], VERSION[2],
3533 resp);
3534 break;
3535
3536#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3537 case URxvt_locale:
3951 if (query) 3538 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3539 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3540 else
3954 { 3541 {
3955 set_locale (str); 3542 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3543 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3544 init_xlocale ();
3958 } 3545 }
3959 break; 3546 break;
3960 3547
3961 case URxvt_view_up: 3548 case URxvt_view_up:
3962 case URxvt_view_down: 3549 case URxvt_view_down:
3550 {
3963 int lines = atoi (str); 3551 int lines = atoi (str);
3964 3552
3965 if (lines) 3553 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines); 3554 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else 3555 else
3968 {
3969 scr_erase_savelines (); 3556 scr_erase_savelines ();
3970 } 3557 }
3971 3558
3559 break;
3560#endif
3561
3562#if ENABLE_PERL
3563 case URxvt_perl:
3564 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3565 ; // no responses yet
3972 break; 3566 break;
3973#endif 3567#endif
3974 } 3568 }
3975} 3569}
3976/*----------------------------------------------------------------------*/ 3570/*----------------------------------------------------------------------*/
… …
4007 return state; 3601 return state;
4008} 3602}
4009 3603
4010/* we're not using priv _yet_ */ 3604/* we're not using priv _yet_ */
4011void 3605void
4012rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3606rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4013{ 3607{
4014 unsigned int i, j; 3608 unsigned int i, j;
4015 int state; 3609 int state;
4016 3610
4017 static const struct 3611 static const struct
4018 { 3612 {
4019 const int argval; 3613 const int argval;
4020 const unsigned long bit; 3614 const unsigned long bit;
4021 }
4022
4023 argtopriv[] = { 3615 } argtopriv[] = {
4024 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
4025 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
4026 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
4027 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
4028 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
4029 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
4030 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
4031 // 8, bi-directional support mode 3623 // 8, bi-directional support mode
4032 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
4033#ifdef menuBar_esc
4034 { menuBar_esc, PrivMode_menuBar },
4035#endif
4036 // 18, 19 printing-related 3625 // 18, 19 printing-related
4037 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor },
4038#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
4039 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
4040#endif 3629#endif
… …
4048#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
4050#endif 3639#endif
4051 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
4087 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
4088 switch (arg[i]) 3677 switch (arg[i])
4089 { 3678 {
4090#if ENABLE_STYLES 3679#if ENABLE_STYLES
4091 case 1021: 3680 case 1021:
4092 if (mode) 3681 set_option (Opt_intensityStyles, mode);
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096 3682
4097 scr_touch (true); 3683 scr_touch (true);
4098 break; 3684 break;
4099#endif 3685#endif
4100 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4101 case 1049: 3687 case 1049:
4102 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4103 if (mode == 0) 3689 if (mode == 0)
4104 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4105 else if (mode == 1) 3691 else if (mode == 1)
4106 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4107 break; 3693 break;
… …
4122 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
4123 if (priv_modes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
4124 set_widthheight (((state ? 132 : 80) * fwidth), height); 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
4125 break; 3711 break;
4126 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
4127 if (!state) 3713 set_option (Opt_jumpScroll, !state);
4128 SET_OPTION (Opt_jumpScroll);
4129 else
4130 CLR_OPTION (Opt_jumpScroll);
4131 break; 3714 break;
4132 case 5: /* reverse video */ 3715 case 5: /* reverse video */
4133 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
4134 break; 3717 break;
4135 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
… …
4139 scr_autowrap (state); 3722 scr_autowrap (state);
4140 break; 3723 break;
4141 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4142 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4143 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4144 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4145 break; 3728 break;
4146#ifdef menuBar_esc
4147 case menuBar_esc:
4148#ifdef MENUBAR
4149 map_menuBar (state);
4150#endif
4151 break;
4152#endif
4153#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4154 case scrollBar_esc: 3730 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4156 { 3732 {
4157 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
… …
4169 break; 3745 break;
4170 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3751 break;
4176#if 0 3752#if 0
4177 case 1001: 3753 case 1001:
4178 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4179#endif 3755#endif
3756 case 1002:
3757 case 1003:
3758 if (state) {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask;
3762 } else
3763 vt_emask_mouse = NoEventMask;
3764 vt_select_input ();
3765 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
4181 if (!state) 3767 set_option (Opt_scrollTtyOutput, !state);
4182 SET_OPTION (Opt_scrollTtyOutput);
4183 else
4184 CLR_OPTION (Opt_scrollTtyOutput);
4185 break; 3768 break;
4186 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
4187 if (state) 3770 set_option (Opt_scrollTtyKeypress, state);
4188 SET_OPTION (Opt_scrollTtyKeypress);
4189 else
4190 CLR_OPTION (Opt_scrollTtyKeypress);
4191 break; 3771 break;
4192 case 1047: /* secondary screen w/ clearing last */ 3772 case 1047: /* secondary screen w/ clearing last */
4193 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4195 scr_erase_screen (2); 3775 scr_erase_screen (2);
4196 scr_change_screen (state); 3776 scr_change_screen (state);
4197 break; 3777 break;
4198 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
4199 scr_change_screen (state); 3779 scr_change_screen (state);
4200 if (OPTION (Opt_secondaryScreen)) 3780 if (option (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 3781 if (current_screen != PRIMARY)
4202 scr_erase_screen (2); 3782 scr_erase_screen (2);
4203 break; 3783 break;
4204 default: 3784 default:
4205 break; 3785 break;
… …
4333 scr_color (Color_bg, Color_bg); 3913 scr_color (Color_bg, Color_bg);
4334 break; 3914 break;
4335 3915
4336 //case 50: // not variable spacing 3916 //case 50: // not variable spacing
4337 3917
4338#ifndef NO_BRIGHTCOLOR 3918#if !ENABLE_MINIMAL
4339 case 90: 3919 case 90:
4340 case 91: /* set bright fg color */ 3920 case 91: /* set bright fg color */
4341 case 92: 3921 case 92:
4342 case 93: 3922 case 93:
4343 case 94: 3923 case 94:
… …
4388 */ 3968 */
4389void 3969void
4390rxvt_term::tt_printf (const char *fmt,...) 3970rxvt_term::tt_printf (const char *fmt,...)
4391{ 3971{
4392 va_list arg_ptr; 3972 va_list arg_ptr;
4393 unsigned char buf[256]; 3973 char buf[256];
4394 3974
4395 va_start (arg_ptr, fmt); 3975 va_start (arg_ptr, fmt);
4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3976 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4397 va_end (arg_ptr); 3977 va_end (arg_ptr);
4398 tt_write (buf, strlen (buf)); 3978 tt_write (buf, strlen (buf));
… …
4403 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
4404 */ 3984 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406 3986
4407void 3987void
4408rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
4409{ 3989{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3991 return;
3992
3993 if (pty->pty < 0)
3994 return;
3995
4410 if (v_buflen == 0) 3996 if (v_buflen == 0)
4411 { 3997 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4413 3999
4414 if ((unsigned int)written == len) 4000 if ((unsigned int)written == len)
4415 return; 4001 return;
4416 4002
4417 data += written; 4003 data += written;
4418 len -= written; 4004 len -= written;
4419 } 4005 }
4420 4006
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4008
4423 memcpy (v_buffer + v_buflen, data, len); 4009 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4010 v_buflen += len;
4425 4011
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4012 pty_ev.set (EVENT_READ | EVENT_WRITE);
4427} 4013}
4428 4014
4429void rxvt_term::pty_write () 4015void rxvt_term::pty_write ()
4430{ 4016{
4431 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4432 4018
4433 if (written > 0) 4019 if (written > 0)
4434 { 4020 {
4435 v_buflen -= written; 4021 v_buflen -= written;
4436 4022
4437 if (v_buflen == 0) 4023 if (v_buflen == 0)
4438 { 4024 {
4439 free (v_buffer); 4025 free (v_buffer);
4440 v_buffer = 0; 4026 v_buffer = 0;
4441 v_buflen = 0;
4442 4027
4443 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4444 return; 4029 return;
4445 } 4030 }
4446 4031

Diff Legend

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