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.230 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.353 by sasha, Wed Sep 12 19:51:41 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;
… …
955void 1035void
956rxvt_term::flush () 1036rxvt_term::flush ()
957{ 1037{
958 flush_ev.stop (); 1038 flush_ev.stop ();
959 1039
960#ifdef TRANSPARENT
961 if (want_full_refresh)
962 {
963 want_full_refresh = 0;
964 scr_clear ();
965 scr_touch (false);
966 }
967#endif
968
969 if (want_refresh) 1040 if (want_refresh)
970 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
971 scr_refresh (refresh_type); 1080 scr_refresh ();
972 scrollbar_show (1); 1081 scrollbar_show (1);
973#ifdef USE_XIM 1082#ifdef USE_XIM
974 IMSendSpot (); 1083 IMSendSpot ();
975#endif 1084#endif
976 } 1085 }
… …
979} 1088}
980 1089
981void 1090void
982rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
983{ 1092{
984 SET_R (this); 1093 make_current ();
985 SET_LOCALE (locale);
986 1094
987 display->flush (); 1095 display->flush ();
988 1096
989 if (want_refresh && !flush_ev.active) 1097 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1099}
992 1100
993void 1101void
994rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
995{ 1103{
996 SET_R (this); 1104 make_current ();
997 SET_LOCALE (locale);
998 1105
999 refresh_limit = 1;
1000 refresh_count = 0; 1106 refresh_count = 0;
1001 flush (); 1107 flush ();
1002} 1108}
1003 1109
1004#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1113{
1008 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1115 want_refresh = 1;
1010 1116
1011 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1118}
1013#endif 1119#endif
1014 1120
1015#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
1016void 1122void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1136rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1137{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1140 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1141 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1143 }
1039} 1144}
1040#endif 1145#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1149rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1150{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1152 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1154 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1156 }
1053} 1157}
1054#endif 1158#endif
… …
1059{ 1163{
1060 if (mouse_slip_wheel_speed == 0 1164 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1166 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1167 {
1064 if (view_start == nsaved || 1168 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1169 mouse_slip_wheel_speed = 0;
1067 1170
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1171 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1173 }
1072} 1174}
1073#endif 1175#endif
1074 1176
1075#if HAVE_SCHED_YIELD 1177#if LINUX_YIELD_HACK
1076static struct event_handler 1178static struct event_handler
1077{ 1179{
1078 check_watcher cw_yield; 1180 check_watcher yield_ev;
1079 1181
1080 void yield (check_watcher &w) 1182 void yield_cb (check_watcher &w)
1081 { 1183 {
1082 sched_yield (); 1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1083 w.stop (); 1192 w.stop ();
1084 } 1193 }
1085 1194
1086 event_handler () 1195 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1196 : yield_ev (this, &event_handler::yield_cb)
1088 { 1197 {
1089 } 1198 }
1090} event_handler; 1199} event_handler;
1091#endif 1200#endif
1092 1201
… …
1095{ 1204{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1206
1098 if (CBUFSIZ == n) 1207 if (CBUFSIZ == n)
1099 { 1208 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1210 n = 0;
1102 } 1211 }
1103 1212
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
1107 1216
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1218
1110 if (r > 0) 1219 if (r > 0)
1111 { 1220 {
1112 cmdbuf_endp += r; 1221 cmdbuf_endp += r;
1113 return true; 1222 return true;
1114 } 1223 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1225 {
1117#if HAVE_SCHED_YIELD 1226#if LINUX_YIELD_HACK
1118 if (display->is_local) 1227 if (display->is_local)
1119 event_handler.cw_yield.start (); 1228 event_handler.yield_ev.start ();
1120#endif 1229#endif
1121 } 1230 }
1122 else 1231 else
1123 { 1232 {
1124 pty_ev.stop (); 1233 pty_ev.stop ();
1125 1234
1126 if (!OPTION (Opt_hold)) 1235 if (!option (Opt_hold))
1127 destroy (); 1236 destroy ();
1128 } 1237 }
1129 1238
1130 return false; 1239 return false;
1131} 1240}
1132 1241
1133void 1242void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1244{
1136 SET_R (this); 1245 make_current ();
1137 SET_LOCALE (locale);
1138 1246
1139 if (revents & EVENT_READ) 1247 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1248 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1249 while (pty_fill ())
1142 if (cmd_parse ()) 1250 if (cmd_parse ())
… …
1147} 1255}
1148 1256
1149void 1257void
1150rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1151{ 1259{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1261 recolour_cursor ();
1154 1262
1155#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1264 hidden_pointer = 0;
1157 1265
1158 if (OPTION (Opt_pointerBlank)) 1266 if (option (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1160#endif 1268#endif
1161} 1269}
1162 1270
1163#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1164void 1272void
1165rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1166{ 1274{
1167 if (! OPTION (Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1168 return; 1276 return;
1169 1277
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1279 XFlush (dpy);
1172 1280
1173 hidden_pointer = 1; 1281 hidden_pointer = 1;
1174} 1282}
1175 1283
1176void 1284void
1177rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
1178{ 1286{
1179 SET_R (this); 1287 make_current ();
1180 SET_LOCALE (locale);
1181 1288
1182 pointer_blank (); 1289 pointer_blank ();
1183} 1290}
1184#endif 1291#endif
1185 1292
… …
1250 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1251 (32 + x + 1), 1358 (32 + x + 1),
1252 (32 + y + 1)); 1359 (32 + y + 1));
1253} 1360}
1254 1361
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264
1265/*{{{ process an X event */ 1362/*{{{ process an X event */
1266void 1363void
1267rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1268{ 1365{
1269 dDisp; 1366 make_current ();
1270 1367
1271 SET_R (this); 1368 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1369
1274#if defined(CURSOR_BLINK) 1370 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1373 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1374
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1375 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1378 unsigned int unused_mask;
1304 1379
1305 switch (ev.type) 1380 switch (ev.type)
1306 { 1381 {
1307 case KeyPress: 1382 case KeyPress:
1308#if ISO_14755 1383 key_press (ev.xkey);
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1311 lookup_key (ev.xkey);
1312
1313 break; 1384 break;
1314 1385
1315 case KeyRelease: 1386 case KeyRelease:
1316 { 1387 key_release (ev.xkey);
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1388 break;
1384 }
1385 1389
1386 case ButtonPress: 1390 case ButtonPress:
1387 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1388 break; 1392 break;
1389 1393
… …
1391 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1392 break; 1396 break;
1393 1397
1394 case ClientMessage: 1398 case ClientMessage:
1395 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1401 {
1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1405 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1407 {
1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1409 destroy ();
1410 }
1400#if ENABLE_EWMH 1411#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1415 &ev);
1416#endif
1417 }
1418 }
1419#if ENABLE_XEMBED
1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1405#endif 1427#endif
1406 } 1428 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break;
1443
1444 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1429 break;
1447 1430
1448 /* 1431 /*
1449 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1450 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1469 break; 1452 break;
1470 } 1453 }
1471 break; 1454 break;
1472 1455
1473 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1474 focus_in (); 1460 focus_in ();
1475 break; 1461 break;
1476 1462
1477 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1478 focus_out (); 1467 focus_out ();
1479 break; 1468 break;
1480 1469
1481 case ConfigureNotify: 1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1483 { 1475 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1477 ;
1486 1478
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1480 {
1489 seen_resize = 1; 1481 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1483 }
1492 1484 else
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485 {
1494 if (OPTION (Opt_transparent)) 1486#ifdef HAVE_BG_PIXMAP
1495 check_our_parents (); 1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1496#endif 1489#endif
1490 }
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 } 1492 }
1498 break; 1493 break;
1499 1494
1500 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1500
1505 break; 1501 break;
1506 1502
1507 case SelectionClear: 1503 case SelectionClear:
1508 selection_clear (); 1504 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1510 break;
1515 1511
1516 case SelectionRequest: 1512 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1514 break;
1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1522 break;
1519 1523
1520 case UnmapNotify: 1524 case UnmapNotify:
1521 mapped = 0; 1525 mapped = 0;
1522#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1524#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break; 1530 break;
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1531
1540 case GraphicsExpose: 1532 case GraphicsExpose:
1541 case Expose: 1533 case Expose:
1542 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1543 { 1535 {
1544 do 1536 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1540
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1542
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1554 1546
1555 scr_refresh (refresh_type); 1547 want_refresh = 1;
1556 } 1548 }
1557 else 1549 else
1558 { 1550 {
1559 XEvent unused_event; 1551 XEvent unused_event;
1560 1552
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1554 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1556 ;
1565 1557
1566 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1567 { 1559 {
1568 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1569 scrollbar_show (0); 1561 scrollbar_show (0);
1570 } 1562 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1580 } 1563 }
1581 break; 1564 break;
1582 1565
1583 case MotionNotify: 1566 case MotionNotify:
1584#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1568 if (hidden_pointer)
1586 pointer_unblank (); 1569 pointer_unblank ();
1587#endif 1570#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1572 break;
1597 1573
1598 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1599 { 1575 {
1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1578 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1580 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1582 ;
1604 1583
1605 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1588 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1674#endif 1653#endif
1675 } 1654 }
1676 } 1655 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1657 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1681 ; 1660 ;
1682 1661
1683 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1666 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1668 scrollbar_size ());
1690 scr_refresh (refresh_type);
1691 refresh_limit = 0; 1669 want_refresh = 1;
1692 scrollbar_show (1); 1670 scrollbar_show (1);
1693 } 1671 }
1694 break; 1672 break;
1695 } 1673 }
1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1696} 1701}
1697 1702
1698void 1703void
1699rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1700{ 1705{
1701 if (!focus) 1706 if (!focus)
1702 { 1707 {
1703 focus = 1; 1708 focus = 1;
1704 want_refresh = 1; 1709 want_refresh = 1;
1705 1710
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 1712
1708#if USE_XIM 1713#if USE_XIM
1709 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1710 { 1715 {
1711 IMSetStatusPosition (); 1716 IMSetPosition ();
1712 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1713 } 1718 }
1714#endif 1719#endif
1715#if CURSOR_BLINK 1720#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1723#endif
1719#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1721 { 1726 {
1722 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1723 scr_recolour (); 1728 scr_recolour ();
1724 } 1729 }
1725#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1726 } 1744 }
1727} 1745}
1728 1746
1729void 1747void
1730rxvt_term::focus_out () 1748rxvt_term::focus_out ()
… …
1732 if (focus) 1750 if (focus)
1733 { 1751 {
1734 focus = 0; 1752 focus = 0;
1735 want_refresh = 1; 1753 want_refresh = 1;
1736 1754
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1756
1739#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1758 if (iso14755buf)
1741 { 1759 {
1742 iso14755buf = 0; 1760 iso14755buf = 0;
1743# if ENABLE_OVERLAY 1761# if ISO_14755
1744 scr_overlay_off (); 1762 scr_overlay_off ();
1745# endif 1763# endif
1746 } 1764 }
1747#endif 1765#endif
1748#if USE_XIM 1766#if USE_XIM
1749 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1751#endif 1769#endif
1752#if CURSOR_BLINK 1770#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1755 hidden_cursor = 0; 1773 hidden_cursor = 0;
1756#endif 1774#endif
1757#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
… …
1762 } 1780 }
1763#endif 1781#endif
1764 } 1782 }
1765} 1783}
1766 1784
1767#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1768void 1799void
1769rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1801{
1771 SET_R (this); 1802 make_current ();
1772 SET_LOCALE (locale);
1773 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1809 switch (ev.type)
1775 { 1810 {
1776 case PropertyNotify: 1811 case PropertyNotify:
1777 /* 1812 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1779 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1780 */ 1815 */
1781 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 return; 1818 {
1784 1819 bgPixmap.set_root_pixmap ();
1785 /* FALLTHROUGH */ 1820 update_background ();
1786 case ReparentNotify: 1821 }
1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1788 want_refresh = want_full_refresh = 1;
1789 break; 1822 break;
1790 } 1823 }
1824# endif
1791} 1825}
1792#endif 1826#endif
1793 1827
1794void 1828void
1795rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1804 /* 1838 /*
1805 * VT window processing of button press 1839 * VT window processing of button press
1806 */ 1840 */
1807 if (ev.window == vt) 1841 if (ev.window == vt)
1808 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1809#if ISO_14755 1846#if ISO_14755
1810 // 5.4 1847 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1849 {
1813 iso14755_54 (ev.x, ev.y); 1850 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1862#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1863 if (ev.button == MEvent.button && clickintime)
1827 { 1864 {
1828 /* same button, within alloted time */ 1865 /* same button, within alloted time */
1829 MEvent.clicks++; 1866 MEvent.clicks++;
1867
1830 if (MEvent.clicks > 1) 1868 if (MEvent.clicks > 1)
1831 { 1869 {
1832 /* only report double clicks */ 1870 /* only report double clicks */
1833 MEvent.clicks = 2; 1871 MEvent.clicks = 2;
1834 mouse_report (ev); 1872 mouse_report (ev);
… …
1854 else 1892 else
1855 { 1893 {
1856 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1895 MEvent.clicks = 0;
1858 1896
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1897 switch (ev.button)
1861 { 1898 {
1862 case Button1: 1899 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1901 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1902#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1903 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1904#else
1868 selection.rect = false; 1905 selection.rect = false;
1869#endif 1906#endif
1870 1907
1871 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1910 {
1874 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1876 else 1913 else
1877 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1878 } 1915 }
1879 else 1916 else
1880 { 1917 {
1881 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1919 MEvent.clicks++;
1883 else 1920 else
1884 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1885 1922
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1924 }
1888 1925
1889 MEvent.button = Button1; 1926 MEvent.button = Button1;
1890 break; 1927 break;
1891 1928
1892 case Button3: 1929 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1895 else 1932 else
1896 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1897 1934
1898 MEvent.button = Button3; 1935 MEvent.button = Button3;
1899 break; 1936 break;
1900 } 1937 }
1901 } 1938 }
1902 1939
1903 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1904 return; 1941 return;
1905 } 1942 }
1906 1943
… …
2042 } 2079 }
2043 2080
2044 break; 2081 break;
2045 } 2082 }
2046 } 2083 }
2084
2047 return; 2085 return;
2048 } 2086 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2087}
2057 2088
2058void 2089void
2059rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2060{ 2091{
… …
2066 2097
2067 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2068 { 2099 {
2069 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2070 scrollbar_show (0); 2101 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2102 }
2075 2103
2076#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
2079#endif 2107#endif
2080 2108
2081 if (ev.window == vt) 2109 if (ev.window == vt)
2082 { 2110 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2112 return;
2113
2083#if ISO_14755 2114#if ISO_14755
2084 // 5.4 2115 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2116 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2117 return;
2087#endif 2118#endif
2119
2088 if (reportmode) 2120 if (reportmode)
2089 { 2121 {
2090 /* mouse report from vt window */ 2122 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2123 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2124 if (ev.button >= 4)
… …
2122 { 2154 {
2123 case Button1: 2155 case Button1:
2124 case Button3: 2156 case Button3:
2125 selection_make (ev.time); 2157 selection_make (ev.time);
2126 break; 2158 break;
2159
2127 case Button2: 2160 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2163 break;
2164
2130#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
2131 case Button4: 2166 case Button4:
2132 case Button5: 2167 case Button5:
2133 { 2168 {
2134 int i; 2169 int i;
… …
2136 2171
2137 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2138 2173
2139 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
2140 i = 1; 2175 i = 1;
2141 else if (OPTION (Opt_mouseWheelScrollPage)) 2176 else if (option (Opt_mouseWheelScrollPage))
2142 i = nrow - 1; 2177 i = nrow - 1;
2143 else 2178 else
2144 i = 5; 2179 i = 5;
2145 2180
2146# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
… …
2156 slip_wheel_ev.start (); 2191 slip_wheel_ev.start ();
2157 } 2192 }
2158 else 2193 else
2159 { 2194 {
2160# endif 2195# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2196 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2197 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
2174 } 2199 }
2175#endif 2200# endif
2176 } 2201 }
2177 break; 2202 break;
2178#endif 2203#endif
2179 } 2204 }
2180 } 2205 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2206}
2186
2187#ifdef TRANSPARENT
2188#if TINTING
2189/* taken from aterm-0.4.2 */
2190
2191typedef uint32_t RUINT32T;
2192
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{
2195 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i;
2201
2202 Visual *visual = display->visual;
2203
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205
2206 /* for convenience */
2207 mask_r = visual->red_mask;
2208 mask_g = visual->green_mask;
2209 mask_b = visual->blue_mask;
2210
2211 /* boring lookup table pre-initialization */
2212 switch (srcImage->bits_per_pixel) {
2213 case 15:
2214 if ((mask_r != 0x7c00) ||
2215 (mask_g != 0x03e0) ||
2216 (mask_b != 0x001f))
2217 return;
2218 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2219 lookup_r = lookup;
2220 lookup_g = lookup+32;
2221 lookup_b = lookup+32+32;
2222 sh_r = 10;
2223 sh_g = 5;
2224 sh_b = 0;
2225 break;
2226 case 16:
2227 if ((mask_r != 0xf800) ||
2228 (mask_g != 0x07e0) ||
2229 (mask_b != 0x001f))
2230 return;
2231 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2232 lookup_r = lookup;
2233 lookup_g = lookup+32;
2234 lookup_b = lookup+32+64;
2235 sh_r = 11;
2236 sh_g = 5;
2237 sh_b = 0;
2238 break;
2239 case 24:
2240 if ((mask_r != 0xff0000) ||
2241 (mask_g != 0x00ff00) ||
2242 (mask_b != 0x0000ff))
2243 return;
2244 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2245 lookup_r = lookup;
2246 lookup_g = lookup+256;
2247 lookup_b = lookup+256+256;
2248 sh_r = 16;
2249 sh_g = 8;
2250 sh_b = 0;
2251 break;
2252 case 32:
2253 if ((mask_r != 0xff0000) ||
2254 (mask_g != 0x00ff00) ||
2255 (mask_b != 0x0000ff))
2256 return;
2257 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2258 lookup_r = lookup;
2259 lookup_g = lookup+256;
2260 lookup_b = lookup+256+256;
2261 sh_r = 16;
2262 sh_g = 8;
2263 sh_b = 0;
2264 break;
2265 default:
2266 return; /* we do not support this color depth */
2267 }
2268
2269 /* prepare limits for color transformation (each channel is handled separately) */
2270 if (shade < 0) {
2271 shade = -shade;
2272 if (shade < 0) shade = 0;
2273 if (shade > 100) shade = 100;
2274
2275 lower_lim_r = 65535-rm;
2276 lower_lim_g = 65535-gm;
2277 lower_lim_b = 65535-bm;
2278
2279 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2280 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2281 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2282
2283 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2284 } else {
2285 if (shade < 0) shade = 0;
2286 if (shade > 100) shade = 100;
2287
2288 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2289
2290 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2291 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2292 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2293 }
2294
2295 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2296 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2297 {
2298 unsigned int tmp;
2299
2300 tmp = lower_lim_r;
2301 lower_lim_r = lower_lim_b;
2302 lower_lim_b = tmp;
2303
2304 tmp = upper_lim_r;
2305 upper_lim_r = upper_lim_b;
2306 upper_lim_b = tmp;
2307 }
2308
2309 /* fill our lookup tables */
2310 for (i = 0; i <= mask_r>>sh_r; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2314 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2315 lookup_r[i] = (tmp/65535)<<sh_r;
2316 }
2317 for (i = 0; i <= mask_g>>sh_g; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2321 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2322 lookup_g[i] = (tmp/65535)<<sh_g;
2323 }
2324 for (i = 0; i <= mask_b>>sh_b; i++)
2325 {
2326 RUINT32T tmp;
2327 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2328 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2329 lookup_b[i] = (tmp/65535)<<sh_b;
2330 }
2331
2332 /* apply table to input image (replacing colors by newly calculated ones) */
2333 switch (srcImage->bits_per_pixel)
2334 {
2335 case 15:
2336 {
2337 unsigned short *p1, *pf, *p, *pl;
2338 p1 = (unsigned short *) srcImage->data;
2339 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width;
2344 for (; p < pl; p++)
2345 {
2346 *p = lookup_r[(*p & 0x7c00)>>10] |
2347 lookup_g[(*p & 0x03e0)>> 5] |
2348 lookup_b[(*p & 0x001f)];
2349 }
2350 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2351 }
2352 break;
2353 }
2354 case 16:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0xf800)>>11] |
2366 lookup_g[(*p & 0x07e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 24:
2374 {
2375 unsigned char *p1, *pf, *p, *pl;
2376 p1 = (unsigned char *) srcImage->data;
2377 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width * 3;
2382 for (; p < pl; p += 3)
2383 {
2384 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2385 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2386 p[2] = lookup_r[(p[2] & 0x0000ff)];
2387 }
2388 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 32:
2393 {
2394 RUINT32T *p1, *pf, *p, *pl;
2395 p1 = (RUINT32T *) srcImage->data;
2396 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width;
2402 for (; p < pl; p++)
2403 {
2404 *p = lookup_r[(*p & 0xff0000)>>16] |
2405 lookup_g[(*p & 0x00ff00)>> 8] |
2406 lookup_b[(*p & 0x0000ff)] |
2407 (*p & ~0xffffff);
2408 }
2409 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 }
2414
2415 free (lookup);
2416}
2417#endif
2418
2419/*
2420 * Check our parents are still who we think they are.
2421 * Do transparency updates if required
2422 */
2423int
2424rxvt_term::check_our_parents ()
2425{
2426 int i, pchanged, aformat, have_pixmap, rootdepth;
2427 unsigned long nitems, bytes_after;
2428 Atom atype;
2429 unsigned char *prop = NULL;
2430 Window root, oldp, *list;
2431 Pixmap rootpixmap = None;
2432 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2434
2435 pchanged = 0;
2436
2437 if (!OPTION (Opt_transparent))
2438 return pchanged; /* Don't try any more */
2439
2440 XGetWindowAttributes (disp, display->root, &wrootattr);
2441 rootdepth = wrootattr.depth;
2442
2443 XGetWindowAttributes (disp, parent[0], &wattr);
2444
2445 if (rootdepth != wattr.depth)
2446 {
2447 if (am_transparent)
2448 {
2449 pchanged = 1;
2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2451 am_transparent = am_pixmap_trans = 0;
2452 }
2453
2454 return pchanged; /* Don't try any more */
2455 }
2456
2457 /* Get all X ops out of the queue so that our information is up-to-date. */
2458 XSync (disp, False);
2459
2460 /*
2461 * Make the frame window set by the window manager have
2462 * the root background. Some window managers put multiple nested frame
2463 * windows for each client, so we have to take care about that.
2464 */
2465 i = (xa[XA_XROOTPMAP_ID]
2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success);
2469
2470 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL
2477#if TINTING
2478 || !rs[Rs_color + Color_tint]
2479#endif
2480 )
2481 have_pixmap = 0;
2482 else
2483 {
2484 have_pixmap = 1;
2485 rootpixmap = *(Pixmap *)prop;
2486 XFree (prop);
2487 }
2488
2489 if (have_pixmap)
2490 {
2491 /*
2492 * Copy display->root pixmap transparency
2493 */
2494 int sx, sy, nx, ny;
2495 unsigned int nw, nh;
2496 Window cr;
2497 XImage *image;
2498 GC gc;
2499 XGCValues gcvalue;
2500
2501 XTranslateCoordinates (disp, parent[0], display->root,
2502 0, 0, &sx, &sy, &cr);
2503 nw = (unsigned int)szHint.width;
2504 nh = (unsigned int)szHint.height;
2505 nx = ny = 0;
2506
2507 if (sx < 0)
2508 {
2509 nw += sx;
2510 nx = -sx;
2511 sx = 0;
2512 }
2513
2514 if (sy < 0)
2515 {
2516 nh += sy;
2517 ny = -sy;
2518 sy = 0;
2519 }
2520
2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523
2524 XSync (disp, False);
2525 allowedxerror = -1;
2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2527
2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2529 /* XXX: may need a delay here? */
2530 allowedxerror = 0;
2531
2532 if (image == NULL)
2533 {
2534 if (am_transparent && am_pixmap_trans)
2535 {
2536 pchanged = 1;
2537 if (pixmap != None)
2538 {
2539 XFreePixmap (disp, pixmap);
2540 pixmap = None;
2541 }
2542 }
2543
2544 am_pixmap_trans = 0;
2545 }
2546 else
2547 {
2548 if (pixmap != None)
2549 XFreePixmap (disp, pixmap);
2550
2551#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint))
2553 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2558
2559 ShadeXImage (display, image, shade, rm, gm, bm);
2560 }
2561#endif
2562
2563 pixmap = XCreatePixmap (disp, vt,
2564 szHint.width, szHint.height, image->depth);
2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2566 XPutImage (disp, pixmap, gc, image, 0, 0,
2567 nx, ny, image->width, image->height);
2568 XFreeGC (disp, gc);
2569 XDestroyImage (image);
2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]);
2572
2573 if (!am_transparent || !am_pixmap_trans)
2574 pchanged = 1;
2575
2576 am_transparent = am_pixmap_trans = 1;
2577 }
2578 }
2579
2580 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2582 else
2583 {
2584 unsigned int n;
2585 /*
2586 * InheritPixmap transparency
2587 */
2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 {
2590 oldp = parent[i];
2591 XQueryTree (disp, parent[i - 1], &root,
2592 &parent[i], &list, &n);
2593 XFree (list);
2594
2595 if (parent[i] == display->root)
2596 {
2597 if (oldp != None)
2598 pchanged = 1;
2599
2600 break;
2601 }
2602
2603 if (oldp != parent[i])
2604 pchanged = 1;
2605 }
2606
2607 n = 0;
2608
2609 if (pchanged)
2610 {
2611 for (; n < (unsigned int)i; n++)
2612 {
2613 XGetWindowAttributes (disp, parent[n], &wattr);
2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2615 {
2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2617 break;
2618 }
2619 }
2620 }
2621
2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2623 {
2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2626 am_transparent = 0;
2627 /* XXX: also turn off Opt_transparent? */
2628 }
2629 else
2630 {
2631#if WAIT_FOR_WM
2632 /* wait (an arbitrary period) for the WM to do its thing
2633 * needed for fvwm2.2.2 (and before?) */
2634 sleep (1);
2635#endif
2636 for (n = 0; n < (unsigned int)i; n++)
2637 {
2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]);
2640 }
2641
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2643 am_transparent = 1;
2644 }
2645
2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 parent[i] = None;
2648 }
2649
2650 if (scrollBar.win)
2651 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle ();
2654 scrollbar_show (0);
2655 }
2656
2657 if (am_transparent)
2658 {
2659 want_refresh = want_full_refresh = 1;
2660 if (am_pixmap_trans)
2661 flush ();
2662 }
2663
2664 return pchanged;
2665}
2666#endif
2667 2207
2668/*}}} */ 2208/*}}} */
2669 2209
2670bool 2210bool
2671rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
2672{ 2212{
2673 bool flag = false; 2213 bool flag = false;
2674 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2676 2216
2677 for (;;) 2217 for (;;)
2678 { 2218 {
2679 if (ch == NOCHAR) 2219 if (ch == NOCHAR)
2680 { 2220 {
2681 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2222 ch = next_char ();
2683 }
2684 2223
2685 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
2686 break; 2225 break;
2226 }
2687 2227
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2229 {
2690 if (!seen_input) 2230 if (!seen_input)
2691 { 2231 {
… …
2700 if (seen_resize && cmd_pid) 2240 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2241 kill (-cmd_pid, SIGWINCH);
2702 } 2242 }
2703 2243
2704 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2246 bool refreshnow = false;
2707 int nlines = 0; 2247 int nlines = 0;
2708 unicode_t *str = buf; 2248 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2250
2711 for (;;) 2251 for (;;)
2712 { 2252 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2254 break;
… …
2720 if (ch == C0_LF) 2260 if (ch == C0_LF)
2721 nlines++; 2261 nlines++;
2722 2262
2723 refresh_count++; 2263 refresh_count++;
2724 2264
2725 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2727 { 2266 {
2728 refreshnow = true;
2729 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2271 refreshnow = true;
2730 ch = NOCHAR; 2272 ch = NOCHAR;
2731 break; 2273 break;
2274 }
2732 } 2275 }
2733 2276
2734 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2736 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2282 scr_add_lines (buf, str - buf, nlines);
2283
2738 nlines = 0; 2284 nlines = 0;
2739 str = buf; 2285 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2286 eol = str + min (ncol, UBUFSIZ);
2741 } 2287 }
2742 2288
… …
2755 2301
2756 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2303 ch = next_char ();
2758 } 2304 }
2759 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2761 2309
2762 /* 2310 /*
2763 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2766 * is incremented here because we must be doing flat-out scrolling.
2767 */ 2314 */
2768 if (refreshnow) 2315 if (refreshnow)
2769 { 2316 {
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++;
2772 else
2773 {
2774 flag = true; 2317 flag = true;
2775 scr_refresh (refresh_type); 2318 scr_refresh ();
2776 flush_ev.stop (); 2319 want_refresh = 1;
2777 }
2778 } 2320 }
2779 2321
2780 } 2322 }
2781 else 2323 else
2782 { 2324 {
… …
2796 } 2338 }
2797 2339
2798 return flag; 2340 return flag;
2799} 2341}
2800 2342
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2343// read the next character
2811unicode_t 2344wchar_t
2812rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2813{ 2346{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2348 {
2816 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2351 return *cmdbuf_ptr++;
2819 2352
2820 wchar_t wc; 2353 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2355
2823 if (len == (size_t)-2) 2356 if (len == (size_t)-2)
2824 { 2357 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2358 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2359 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2360 break;
2828 } 2361 }
2829 2362
2830 if (len == (size_t)-1) 2363 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2365
2833 // assume wchar == unicode 2366 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2368 return wc & UNICODE_MASK;
2836 } 2369 }
2837 2370
2838 return NOCHAR; 2371 return NOCHAR;
2839} 2372}
2373
2374// read the next octet
2375uint32_t
2376rxvt_term::next_octet () NOTHROW
2377{
2378 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR;
2381}
2382
2383static class out_of_input out_of_input;
2840 2384
2841/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2842/* 2386/*
2843 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2844 * to the command. 2388 * to the command.
2845 */ 2389 */
2846unicode_t 2390wchar_t
2847rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2392{
2849 unicode_t c = next_char (); 2393 wchar_t c = next_char ();
2850 2394
2851 if (c == NOCHAR) 2395 if (c == NOCHAR)
2852 throw out_of_input; 2396 throw out_of_input;
2853 2397
2854 return c; 2398 return c;
2855} 2399}
2856 2400
2857unicode_t 2401uint32_t
2858rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2403{
2860 unicode_t c = next_octet (); 2404 uint32_t c = next_octet ();
2861 2405
2862 if (c == NOCHAR) 2406 if (c == NOCHAR)
2863 throw out_of_input; 2407 throw out_of_input;
2864 2408
2865 return c; 2409 return c;
… …
2929 { 2473 {
2930 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2931 break; /* done = 1 */ 2475 break; /* done = 1 */
2932 } 2476 }
2933 } 2477 }
2934 2478
2935 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2936 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2937 { 2481 {
2938 done = 1; 2482 done = 1;
2939 break; 2483 break;
… …
2965 case C0_ESC: 2509 case C0_ESC:
2966 process_escape_seq (); 2510 process_escape_seq ();
2967 break; 2511 break;
2968 case C0_ENQ: /* terminal Status */ 2512 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2513 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2514 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2515 else
2973 tt_write ((unsigned char *)VT100_ANS, 2516 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2517 break;
2976 case C0_BEL: /* bell */ 2518 case C0_BEL: /* bell */
2977 scr_bell (); 2519 scr_bell ();
2978 break; 2520 break;
2979 case C0_BS: /* backspace */ 2521 case C0_BS: /* backspace */
… …
3003 process_dcs_seq (); 2545 process_dcs_seq ();
3004 break; 2546 break;
3005 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3006 process_csi_seq (); 2548 process_csi_seq ();
3007 break; 2549 break;
3008 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3009 process_osc_seq (); 2551 process_osc_seq ();
3010 break; 2552 break;
3011#endif 2553#endif
3012 } 2554 }
3013} 2555}
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 2646 break;
3105 case '+': 2647 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 2649 break;
3108#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3109 case '6': 2651 case '6':
3110 scr_backindex (); 2652 scr_backindex ();
3111 break; 2653 break;
3112#endif 2654#endif
3113 case '7': 2655 case '7':
3114 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3115 break; 2657 break;
3116 case '8': 2658 case '8':
3117 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3118 break; 2660 break;
3119#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3120 case '9': 2662 case '9':
3121 scr_forwardindex (); 2663 scr_forwardindex ();
3122 break; 2664 break;
3123#endif 2665#endif
3124 case '=': 2666 case '=':
… …
3134 break; 2676 break;
3135 2677
3136 /* 8.3.87: NEXT LINE */ 2678 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 2679 case C1_NEL: /* ESC E */
3138 { 2680 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 2681 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 2683 }
3142 break; 2684 break;
3143 2685
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 2686 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 2687 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 2709 process_dcs_seq ();
3168 break; 2710 break;
3169 2711
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 2713 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 2715 break; /* steal obsolete ESC [ c */
3175 2716
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 2718 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 2719 process_csi_seq ();
… …
3240rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3241{ 2782{
3242 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3243 unsigned int nargs, p; 2784 unsigned int nargs, p;
3244 int n, ndef; 2785 int n, ndef;
3245 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3246 2787
3247 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3248 arg[--nargs] = 0;
3249 2789
3250 priv = 0; 2790 priv = 0;
3251 ch = cmd_getc (); 2791 ch = cmd_getc ();
3252 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
3253 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 2829 if (arg[p] == -1)
3290 arg[p] = ndef; 2830 arg[p] = ndef;
3291 2831
3292#ifdef DEBUG_CMD
3293 fprintf (stderr, "CSI ");
3294 for (p = 0; p < nargs; p++)
3295 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3296 fprintf (stderr, "%c\n", ch);
3297#endif
3298
3299 /* 2832 /*
3300 * private mode handling 2833 * private mode handling
3301 */ 2834 */
3302 if (priv) 2835 if (priv)
3303 { 2836 {
3304 switch (priv) 2837 switch (priv)
3305 { 2838 {
3306 case '>': 2839 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2847 // that we do not support xterm mouse reporting (should be 95 when we do).
2848 //
2849 tt_printf ("\033[>%d;94;0c", 'U');
2850 }
3309 break; 2851 break;
3310 case '?': 2852 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 2854 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 2855 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2964 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2965 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 2966 break;
3425 2967
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2968 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 2970 break;
3430 2971
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2972 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 2973 process_sgr_mode (nargs, arg);
3433 break; 2974 break;
… …
3440 break; 2981 break;
3441 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3442 scr_report_position (); 2983 scr_report_position ();
3443 break; 2984 break;
3444 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3446 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3447 break; 2988 break;
3448 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3450 break; 2991 break;
… …
3517 break; 3058 break;
3518 case CSI_75: 3059 case CSI_75:
3519 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
3520 break; 3061 break;
3521 3062
3522#if ENABLE_FRILLS 3063#if !ENABLE_MINIMAL
3523 case CSI_74: 3064 case CSI_74:
3524 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
3525 break; 3066 break;
3526#endif 3067#endif
3527 3068
… …
3534 break; 3075 break;
3535 } 3076 }
3536} 3077}
3537/*}}} */ 3078/*}}} */
3538 3079
3539#if ENABLE_FRILLS 3080#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3081/* ARGSUSED */
3541void 3082void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3084{
3544 int x, y; 3085 int x, y;
3545 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3546 Window wdummy; 3087 Window wdummy;
3547 dDisp; 3088
3089 dLocal (Display *, dpy);
3548 3090
3549 if (nargs == 0) 3091 if (nargs == 0)
3550 return; 3092 return;
3551 3093
3552 switch (args[0]) 3094 switch (args[0])
3553 { 3095 {
3554 /* 3096 /*
3555 * commands 3097 * commands
3556 */ 3098 */
3557 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3100 XMapWindow (dpy, parent[0]);
3559 break; 3101 break;
3560 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3103 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3104 break;
3563 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3107 break;
3566 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3110 break;
3569 case 5: /* raise window */ 3111 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3571 break; 3113 break;
3572 case 6: /* lower window */ 3114 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3574 break; 3116 break;
3575 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3576 scr_touch (true); 3118 scr_touch (true);
3577 break; 3119 break;
3578 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3128 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3129 (unsigned int) (args[1] * fheight));
3588 break; 3130 break;
3589 3131
3590
3591 /* 3132 /*
3592 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3593 */ 3134 */
3594 case 11: /* report window state */ 3135 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3138 break;
3598 case 13: /* report window position */ 3139 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3145 break;
3605 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3149 break;
3609 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3152 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3155 break;
3615 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3616 { 3157 {
3617 char *s; 3158 char *s;
3618 XGetIconName (disp, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3161 XFree (s);
3621 } 3162 }
3622 break; 3163 break;
3623 case 21: /* report window title */ 3164 case 21: /* report window title */
3624 { 3165 {
3625 char *s; 3166 char *s;
3626 XFetchName (disp, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3169 XFree (s);
3629 } 3170 }
3630 break; 3171 break;
3631 } 3172 }
3632} 3173}
… …
3635/*----------------------------------------------------------------------*/ 3176/*----------------------------------------------------------------------*/
3636/* 3177/*
3637 * get input up until STRING TERMINATOR (or BEL) 3178 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3179 * ends_how is terminator used. returned input must be free()'d
3639 */ 3180 */
3640unsigned char * 3181char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3182rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3183{
3643 unicode_t ch; 3184 unicode_t ch;
3644 bool seen_esc = false; 3185 bool seen_esc = false;
3645 unsigned int n = 0; 3186 unsigned int n = 0;
… …
3659 seen_esc = true; 3200 seen_esc = true;
3660 continue; 3201 continue;
3661 } 3202 }
3662 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3663 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3664 else if (ch < 0x20) 3207 else if (ch < 0x20)
3665 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3666 3209
3667 seen_esc = false; 3210 seen_esc = false;
3668 3211
3669 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3670 // stop at some sane length 3213 // stop at some sane length
3671 return NULL; 3214 return NULL;
3672 3215
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3676 string[n++] = ch; 3216 string[n++] = ch;
3677 } 3217 }
3678 3218
3679 string[n++] = '\0'; 3219 string[n++] = '\0';
3680 3220
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3222
3683 return (unsigned char *)rxvt_wcstombs (string); 3223 return rxvt_wcstombs (string);
3684} 3224}
3685 3225
3686/*----------------------------------------------------------------------*/ 3226/*----------------------------------------------------------------------*/
3687/* 3227/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3229 */
3690void 3230void
3691rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3692{ 3232{
3693 unsigned char *s; 3233 char *s;
3694 unicode_t eh; 3234 unicode_t eh;
3695 3235
3696 /* 3236 /*
3697 * Not handled yet 3237 * Not handled yet
3698 */ 3238 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3257 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3258 arg = arg * 10 + (ch - '0');
3719 3259
3720 if (ch == ';') 3260 if (ch == ';')
3721 { 3261 {
3722 unsigned char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3723 3263
3724 if (s) 3264 if (s)
3725 { 3265 {
3726 process_xterm_seq (arg, (char *)s, eh); 3266 process_xterm_seq (arg, s, eh);
3727 free (s); 3267 free (s);
3728 } 3268 }
3729 } 3269 }
3730} 3270}
3731 3271
3732void 3272void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3274{
3735 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3736 { 3276 {
3737 unsigned short r, g, b; 3277 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3278 pix_colors_focused[color].get (c);
3279
3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3286 }
3741 else 3287 else
3742 set_window_color (color, str); 3288 set_window_color (color, str);
3743} 3289}
3744 3290
3745/* 3291/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3293 */
3748void 3294void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3295rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3296{
3751 int changed = 0;
3752 int color; 3297 int color;
3753 char *buf, *name; 3298 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3300 int saveop = op;
3756 dDisp; 3301
3302 dLocal (Display *, dpy);
3757 3303
3758 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3759 switch (op) 3309 switch (op)
3760 { 3310 {
3761 case XTerm_name: 3311 case XTerm_name:
3762 set_title (str); 3312 set_title (str);
3763 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3327 unsigned long bytes_after;
3778 unsigned char *value = 0; 3328 unsigned char *value = 0;
3779 const char *str = ""; 3329 const char *str = "";
3780 3330
3781 if (prop 3331 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3336 && actual_type != None
3787 && actual_format == 8) 3337 && actual_format == 8)
3788 str = (const char *)(value); 3338 str = (const char *)(value);
3789 3339
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3341
3792 XFree (value); 3342 XFree (value);
3793 } 3343 }
3794 else 3344 else
3795 { 3345 {
… …
3799 { 3349 {
3800 *eq = 0; 3350 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3802 } 3352 }
3803 else 3353 else
3804 XDeleteProperty (disp, parent[0], 3354 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3355 display->atom (str));
3806 } 3356 }
3807 break; 3357 break;
3808 3358
3809 case XTerm_Color: 3359 case XTerm_Color:
… …
3811 { 3361 {
3812 if ((name = strchr (buf, ';')) == NULL) 3362 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3363 break;
3814 3364
3815 *name++ = '\0'; 3365 *name++ = '\0';
3816 color = atoi (buf); 3366 color = atoi (buf) + minCOLOR;
3817 3367
3818 if (color < 0 || color >= TOTAL_COLORS) 3368 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3369 break;
3820 3370
3821 if ((buf = strchr (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3372 *buf++ = '\0';
3823 3373
3824 if (name[0] == '?' && !name[1]) 3374 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3375 }
3833 break; 3376 break;
3834 case XTerm_Color00: 3377 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3378 process_color_seq (op, Color_fg, str, resp);
3836 break; 3379 break;
3837 case XTerm_Color01: 3380 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3839 break; 3382 break;
3840#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3385 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3386 break;
3844#endif 3387#endif
3845 case XTerm_Color_pointer_fg: 3388 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3390 break;
3848 case XTerm_Color_pointer_bg: 3391 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3392 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3393 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp);
3401 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp);
3860 break; 3405 break;
3861 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3863 break; 3408 break;
3864#endif 3409#endif
3865#if TRANSPARENT && TINTING 3410#if ENABLE_TRANSPARENCY
3866 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3868 check_our_parents (); 3413 {
3869 if (am_transparent) 3414 bool changed = false;
3870 want_full_refresh = want_refresh = 1; 3415 if (ISSET_PIXCOLOR (Color_tint))
3871 break; 3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3872#endif 3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3873 3422
3423 break;
3424#endif
3425
3426#if XPM_BACKGROUND
3874 case XTerm_Pixmap: 3427 case Rxvt_Pixmap:
3875 if (*str != ';') 3428 if (!strcmp (str, "?"))
3876 { 3429 {
3877#if XPM_BACKGROUND 3430 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3431
3879 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880#endif 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881 scr_touch (true); 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3436 }
3883 while ((str = strchr (str, ';')) != NULL) 3437 else
3884 { 3438 {
3439 int changed = 0;
3440
3441 if (*str != ';')
3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3451 while (str)
3452 {
3885 str++; 3453 str++;
3886#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3455 changed++;
3888#endif 3456 str = strchr (str, ';');
3457 }
3458 if (changed)
3459 update_background ();
3889 } 3460 }
3890
3891 if (changed)
3892 {
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895#endif
3896 scr_touch (true);
3897 }
3898 break; 3461 break;
3462#endif
3899 3463
3900 case XTerm_restoreFG: 3464 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3902 break; 3466 break;
3903 case XTerm_restoreBG: 3467 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3468 set_window_color (Color_bg, str);
3905 break; 3469 break;
3906 3470
3907 case XTerm_logfile: 3471 case XTerm_logfile:
3908 // TODO, when secure mode? 3472 // TODO, when secure mode?
3909 break; 3473 break;
3910 3474
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3475#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3476 case Rxvt_dumpscreen: /* no error notices */
3919 { 3477 {
3920 int fd; 3478 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3480 {
3923 scr_dump (fd); 3481 scr_dump (fd);
… …
3934 case URxvt_italicFont: 3492 case URxvt_italicFont:
3935 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3936#endif 3494#endif
3937 if (query) 3495 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp); 3499 resp);
3942 else 3500 else
3943 { 3501 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
3948 set_fonts (); 3506 set_fonts ();
3949 } 3507 }
3950 break; 3508 break;
3951 3509
3952#if ENABLE_FRILLS 3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3519 case URxvt_locale:
3954 if (query) 3520 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3956 else 3522 else
3957 { 3523 {
3958 set_locale (str); 3524 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3526 init_xlocale ();
3961 } 3527 }
3962 break; 3528 break;
3963 3529
3964 case URxvt_view_up: 3530 case URxvt_view_up:
3965 case URxvt_view_down: 3531 case URxvt_view_down:
3532 {
3966 int lines = atoi (str); 3533 int lines = atoi (str);
3967 3534
3968 if (lines) 3535 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 3536 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 3537 else
3971 scr_erase_savelines (); 3538 scr_erase_savelines ();
3539 }
3972 3540
3973 break; 3541 break;
3974#endif 3542#endif
3975 3543
3976#if ENABLE_PERL 3544#if ENABLE_PERL
3977 case URxvt_perl: 3545 case URxvt_perl:
3978 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3979 ; // no responses yet 3547 ; // no responses yet
3980 break; 3548 break;
3981
3982#endif 3549#endif
3983
3984 } 3550 }
3985} 3551}
3986/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
3987 3553
3988/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3554/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
4017 return state; 3583 return state;
4018} 3584}
4019 3585
4020/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
4021void 3587void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 3589{
4024 unsigned int i, j; 3590 unsigned int i, j;
4025 int state; 3591 int state;
4026 3592
4027 static const struct 3593 static const struct
4028 { 3594 {
4029 const int argval; 3595 const int argval;
4030 const unsigned long bit; 3596 const unsigned long bit;
4031 }
4032
4033 argtopriv[] = { 3597 } argtopriv[] = {
4034 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
4035 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
4036 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
4037 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
4038 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 3605 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 3607 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 3611#endif
… …
4097 /* extra handling for values with state unkept */ 3658 /* extra handling for values with state unkept */
4098 switch (arg[i]) 3659 switch (arg[i])
4099 { 3660 {
4100#if ENABLE_STYLES 3661#if ENABLE_STYLES
4101 case 1021: 3662 case 1021:
4102 if (mode) 3663 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 3664
4107 scr_touch (true); 3665 scr_touch (true);
4108 break; 3666 break;
4109#endif 3667#endif
4110 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4111 case 1049: 3669 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3671 if (mode == 0)
4114 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4115 else if (mode == 1) 3673 else if (mode == 1)
4116 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4117 break; 3675 break;
… …
4132 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 3693 break;
4136 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
4137 if (!state) 3695 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 3696 break;
4142 case 5: /* reverse video */ 3697 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
4144 break; 3699 break;
4145 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~PrivMode_MouseX11;
4155 break; 3710 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
4164 case scrollBar_esc: 3712 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 3713 if (scrollbar_mapping (state))
4166 { 3714 {
4167 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
… …
4186#if 0 3734#if 0
4187 case 1001: 3735 case 1001:
4188 break; /* X11 mouse highlighting */ 3736 break; /* X11 mouse highlighting */
4189#endif 3737#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 3738 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 3739 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 3740 break;
4196 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
4197 if (state) 3742 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 3743 break;
4202 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 3745 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3747 scr_erase_screen (2);
4206 scr_change_screen (state); 3748 scr_change_screen (state);
4207 break; 3749 break;
4208 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state); 3751 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3754 scr_erase_screen (2);
4213 break; 3755 break;
4214 default: 3756 default:
4215 break; 3757 break;
… …
4343 scr_color (Color_bg, Color_bg); 3885 scr_color (Color_bg, Color_bg);
4344 break; 3886 break;
4345 3887
4346 //case 50: // not variable spacing 3888 //case 50: // not variable spacing
4347 3889
4348#ifndef NO_BRIGHTCOLOR 3890#if !ENABLE_MINIMAL
4349 case 90: 3891 case 90:
4350 case 91: /* set bright fg color */ 3892 case 91: /* set bright fg color */
4351 case 92: 3893 case 92:
4352 case 93: 3894 case 93:
4353 case 94: 3895 case 94:
… …
4398 */ 3940 */
4399void 3941void
4400rxvt_term::tt_printf (const char *fmt,...) 3942rxvt_term::tt_printf (const char *fmt,...)
4401{ 3943{
4402 va_list arg_ptr; 3944 va_list arg_ptr;
4403 unsigned char buf[256]; 3945 char buf[256];
4404 3946
4405 va_start (arg_ptr, fmt); 3947 va_start (arg_ptr, fmt);
4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4407 va_end (arg_ptr); 3949 va_end (arg_ptr);
4408 tt_write (buf, strlen (buf)); 3950 tt_write (buf, strlen (buf));
… …
4413 * or generated by us in response to a query ESC sequence. 3955 * or generated by us in response to a query ESC sequence.
4414 */ 3956 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 3958
4417void 3959void
4418rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3960rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 3961{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3963 return;
3964
3965 if (pty->pty < 0)
3966 return;
3967
4420 if (v_buflen == 0) 3968 if (v_buflen == 0)
4421 { 3969 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 3971
4424 if ((unsigned int)written == len) 3972 if ((unsigned int)written == len)
4425 return; 3973 return;
4426 3974
4427 data += written; 3975 data += written;
4428 len -= written; 3976 len -= written;
4429 } 3977 }
4430 3978
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 3980
4433 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 3982 v_buflen += len;
4435 3983
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 3985}
4438 3986
4439void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4440{ 3988{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 3990
4443 if (written > 0) 3991 if (written > 0)
4444 { 3992 {
4445 v_buflen -= written; 3993 v_buflen -= written;
4446 3994

Diff Legend

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