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.229 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.352 by ayin, Sun Sep 9 10:35:00 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 1040#ifdef ENABLE_TRANSPARENCY
961 if (want_full_refresh) 1041 if (want_full_refresh)
962 { 1042 {
963 want_full_refresh = 0; 1043 want_full_refresh = 0;
964 scr_clear (); 1044 scr_clear ();
965 scr_touch (false); 1045 scr_touch (false);
966 } 1046 }
967#endif 1047#endif
968 1048
969 if (want_refresh) 1049 if (want_refresh)
970 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
971 scr_refresh (refresh_type); 1089 scr_refresh ();
972 scrollbar_show (1); 1090 scrollbar_show (1);
973#ifdef USE_XIM 1091#ifdef USE_XIM
974 IMSendSpot (); 1092 IMSendSpot ();
975#endif 1093#endif
976 } 1094 }
… …
979} 1097}
980 1098
981void 1099void
982rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
983{ 1101{
984 SET_R (this); 1102 make_current ();
985 SET_LOCALE (locale);
986 1103
987 display->flush (); 1104 display->flush ();
988 1105
989 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1108}
992 1109
993void 1110void
994rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
995{ 1112{
996 SET_R (this); 1113 make_current ();
997 SET_LOCALE (locale);
998 1114
999 refresh_limit = 1;
1000 refresh_count = 0; 1115 refresh_count = 0;
1001 flush (); 1116 flush ();
1002} 1117}
1003 1118
1004#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1122{
1008 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1124 want_refresh = 1;
1010 1125
1011 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1127}
1013#endif 1128#endif
1014 1129
1015#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1016void 1131void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1146{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1149 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1150 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1152 }
1039} 1153}
1040#endif 1154#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1159{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1161 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1163 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1165 }
1053} 1166}
1054#endif 1167#endif
… …
1059{ 1172{
1060 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1176 {
1064 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1067 1179
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1180 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1182 }
1072} 1183}
1073#endif 1184#endif
1074 1185
1075#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1076static struct event_handler 1187static struct event_handler
1077{ 1188{
1078 check_watcher cw_yield; 1189 check_watcher yield_ev;
1079 1190
1080 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1081 { 1192 {
1082 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1083 w.stop (); 1201 w.stop ();
1084 } 1202 }
1085 1203
1086 event_handler () 1204 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1088 { 1206 {
1089 } 1207 }
1090} event_handler; 1208} event_handler;
1091#endif 1209#endif
1092 1210
… …
1095{ 1213{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1215
1098 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1099 { 1217 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1219 n = 0;
1102 } 1220 }
1103 1221
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1107 1225
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1227
1110 if (r > 0) 1228 if (r > 0)
1111 { 1229 {
1112 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1113 return true; 1231 return true;
1114 } 1232 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1234 {
1117#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1118 if (display->is_local) 1236 if (display->is_local)
1119 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1120#endif 1238#endif
1121 } 1239 }
1122 else 1240 else
1123 { 1241 {
1124 pty_ev.stop (); 1242 pty_ev.stop ();
1125 1243
1126 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1127 destroy (); 1245 destroy ();
1128 } 1246 }
1129 1247
1130 return false; 1248 return false;
1131} 1249}
1132 1250
1133void 1251void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1253{
1136 SET_R (this); 1254 make_current ();
1137 SET_LOCALE (locale);
1138 1255
1139 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1258 while (pty_fill ())
1142 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1147} 1264}
1148 1265
1149void 1266void
1150rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1151{ 1268{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1270 recolour_cursor ();
1154 1271
1155#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1273 hidden_pointer = 0;
1157 1274
1158 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1160#endif 1277#endif
1161} 1278}
1162 1279
1163#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1164void 1281void
1165rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1166{ 1283{
1167 if (! OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1168 return; 1285 return;
1169 1286
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1288 XFlush (dpy);
1172 1289
1173 hidden_pointer = 1; 1290 hidden_pointer = 1;
1174} 1291}
1175 1292
1176void 1293void
1177rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1178{ 1295{
1179 SET_R (this); 1296 make_current ();
1180 SET_LOCALE (locale);
1181 1297
1182 pointer_blank (); 1298 pointer_blank ();
1183} 1299}
1184#endif 1300#endif
1185 1301
… …
1250 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1251 (32 + x + 1), 1367 (32 + x + 1),
1252 (32 + y + 1)); 1368 (32 + y + 1));
1253} 1369}
1254 1370
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 */ 1371/*{{{ process an X event */
1266void 1372void
1267rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1268{ 1374{
1269 dDisp; 1375 make_current ();
1270 1376
1271 SET_R (this); 1377 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1378
1274#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1382 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1383
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // 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; 1385 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1387 unsigned int unused_mask;
1304 1388
1305 switch (ev.type) 1389 switch (ev.type)
1306 { 1390 {
1307 case KeyPress: 1391 case KeyPress:
1308#if ISO_14755 1392 key_press (ev.xkey);
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1311 lookup_key (ev.xkey);
1312
1313 break; 1393 break;
1314 1394
1315 case KeyRelease: 1395 case KeyRelease:
1316 { 1396 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; 1397 break;
1384 }
1385 1398
1386 case ButtonPress: 1399 case ButtonPress:
1387 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1388 break; 1401 break;
1389 1402
… …
1391 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1392 break; 1405 break;
1393 1406
1394 case ClientMessage: 1407 case ClientMessage:
1395 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1418 destroy ();
1419 }
1400#if ENABLE_EWMH 1420#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1405#endif 1436#endif
1406 } 1437 }
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; 1438 break;
1447 1439
1448 /* 1440 /*
1449 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1450 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1469 break; 1461 break;
1470 } 1462 }
1471 break; 1463 break;
1472 1464
1473 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1474 focus_in (); 1469 focus_in ();
1475 break; 1470 break;
1476 1471
1477 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1478 focus_out (); 1476 focus_out ();
1479 break; 1477 break;
1480 1478
1481 case ConfigureNotify: 1479 case ConfigureNotify:
1480/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1481 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1483 if (ev.xconfigure.window == parent[0])
1483 { 1484 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1485 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1486 ;
1486 1487
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1489 {
1489 seen_resize = 1; 1490 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1492 }
1492 1493 else
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494 {
1495#ifdef ENABLE_TRANSPARENCY
1494 if (OPTION (Opt_transparent)) 1496 if (option (Opt_transparent))
1495 check_our_parents (); 1497 update_background ();
1496#endif 1498#endif
1499 }
1500 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 } 1501 }
1498 break; 1502 break;
1499 1503
1500 case PropertyNotify: 1504 case PropertyNotify:
1505 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1506 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1507 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1508 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1509
1505 break; 1510 break;
1506 1511
1507 case SelectionClear: 1512 case SelectionClear:
1508 selection_clear (); 1513 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1518 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1519 break;
1515 1520
1516 case SelectionRequest: 1521 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1522 selection_send (ev.xselectionrequest);
1523 break;
1524
1525 case MapNotify:
1526 mapped = 1;
1527#ifdef TEXT_BLINK
1528 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1529#endif
1530 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1531 break;
1519 1532
1520 case UnmapNotify: 1533 case UnmapNotify:
1521 mapped = 0; 1534 mapped = 0;
1522#ifdef TEXT_BLINK 1535#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1536 text_blink_ev.stop ();
1524#endif 1537#endif
1538 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break; 1539 break;
1526 1540
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 1541#ifdef ENABLE_TRANSPARENCY
1535 case ReparentNotify: 1542 case ReparentNotify:
1536 rootwin_cb (ev); 1543 rootwin_cb (ev);
1537 break; 1544 break;
1538#endif /* TRANSPARENT */ 1545#endif /* ENABLE_TRANSPARENCY */
1539 1546
1540 case GraphicsExpose: 1547 case GraphicsExpose:
1541 case Expose: 1548 case Expose:
1542 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1543 { 1550 {
1544 do 1551 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1555
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1557
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1554 1561
1555 scr_refresh (refresh_type); 1562 want_refresh = 1;
1556 } 1563 }
1557 else 1564 else
1558 { 1565 {
1559 XEvent unused_event; 1566 XEvent unused_event;
1560 1567
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1568 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1569 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1571 ;
1565 1572
1566 if (isScrollbarWindow (ev.xany.window)) 1573 if (isScrollbarWindow (ev.xany.window))
1567 { 1574 {
1568 scrollBar.setIdle (); 1575 scrollBar.setIdle ();
1569 scrollbar_show (0); 1576 scrollbar_show (0);
1570 } 1577 }
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 } 1578 }
1581 break; 1579 break;
1582 1580
1583 case MotionNotify: 1581 case MotionNotify:
1584#ifdef POINTER_BLANK 1582#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1583 if (hidden_pointer)
1586 pointer_unblank (); 1584 pointer_unblank ();
1587#endif 1585#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) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1587 break;
1597 1588
1598 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1599 { 1590 {
1591 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1592 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1593 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1594 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1595 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1597 ;
1604 1598
1605 XQueryPointer (disp, vt, 1599 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1600 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1601 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1602 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1603 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1604#ifdef MOUSE_THRESHOLD
… …
1674#endif 1668#endif
1675 } 1669 }
1676 } 1670 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1671 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1672 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1673 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1674 MotionNotify, &ev))
1681 ; 1675 ;
1682 1676
1683 XQueryPointer (disp, scrollBar.win, 1677 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1678 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1679 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1680 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1681 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1682 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1683 scrollbar_size ());
1690 scr_refresh (refresh_type);
1691 refresh_limit = 0; 1684 want_refresh = 1;
1692 scrollbar_show (1); 1685 scrollbar_show (1);
1693 } 1686 }
1694 break; 1687 break;
1695 } 1688 }
1689
1690#if defined(CURSOR_BLINK)
1691 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1696} 1716}
1697 1717
1698void 1718void
1699rxvt_term::focus_in () 1719rxvt_term::focus_in ()
1700{ 1720{
1701 if (!focus) 1721 if (!focus)
1702 { 1722 {
1703 focus = 1; 1723 focus = 1;
1704 want_refresh = 1; 1724 want_refresh = 1;
1705 1725
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1726 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 1727
1708#if USE_XIM 1728#if USE_XIM
1709 if (Input_Context != NULL) 1729 if (Input_Context != NULL)
1710 { 1730 {
1711 IMSetStatusPosition (); 1731 IMSetPosition ();
1712 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1713 } 1733 }
1714#endif 1734#endif
1715#if CURSOR_BLINK 1735#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1738#endif
1719#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1721 { 1741 {
1722 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
1723 scr_recolour (); 1743 scr_recolour ();
1724 } 1744 }
1725#endif 1745#endif
1746#if ENABLE_FRILLS
1747 if (option (Opt_urgentOnBell))
1748 {
1749 XWMHints *h;
1750
1751 h = XGetWMHints(dpy, parent[0]);
1752 if (h != NULL)
1753 {
1754 h->flags &= ~XUrgencyHint;
1755 XSetWMHints(dpy, parent[0], h);
1756 }
1757 }
1758#endif
1726 } 1759 }
1727} 1760}
1728 1761
1729void 1762void
1730rxvt_term::focus_out () 1763rxvt_term::focus_out ()
… …
1732 if (focus) 1765 if (focus)
1733 { 1766 {
1734 focus = 0; 1767 focus = 0;
1735 want_refresh = 1; 1768 want_refresh = 1;
1736 1769
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1771
1739#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1773 if (iso14755buf)
1741 { 1774 {
1742 iso14755buf = 0; 1775 iso14755buf = 0;
1743# if ENABLE_OVERLAY 1776# if ISO_14755
1744 scr_overlay_off (); 1777 scr_overlay_off ();
1745# endif 1778# endif
1746 } 1779 }
1747#endif 1780#endif
1748#if USE_XIM 1781#if USE_XIM
1749 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1751#endif 1784#endif
1752#if CURSOR_BLINK 1785#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1755 hidden_cursor = 0; 1788 hidden_cursor = 0;
1756#endif 1789#endif
1757#if OFF_FOCUS_FADING 1790#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1791 if (rs[Rs_fade])
… …
1762 } 1795 }
1763#endif 1796#endif
1764 } 1797 }
1765} 1798}
1766 1799
1767#if TRANSPARENT 1800void
1801rxvt_term::update_fade_color (unsigned int idx)
1802{
1803#if OFF_FOCUS_FADING
1804 if (rs[Rs_fade])
1805 {
1806 rgba c;
1807 pix_colors [Color_fade].get (c);
1808 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1809 }
1810#endif
1811}
1812
1813#if ENABLE_TRANSPARENCY || ENABLE_PERL
1768void 1814void
1769rxvt_term::rootwin_cb (XEvent &ev) 1815rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1816{
1771 SET_R (this); 1817 make_current ();
1772 SET_LOCALE (locale);
1773 1818
1819 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1820 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1821 return;
1822
1823# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1824 switch (ev.type)
1775 { 1825 {
1776 case PropertyNotify: 1826 case PropertyNotify:
1777 /* 1827 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1828 * 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. 1829 * use the property to determine the pixmap. We use it later on.
1780 */ 1830 */
1781 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1831 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1832 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 return; 1833 {
1784 1834 bgPixmap.set_root_pixmap ();
1785 /* FALLTHROUGH */ 1835 update_background ();
1786 case ReparentNotify: 1836 }
1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1788 want_refresh = want_full_refresh = 1;
1789 break; 1837 break;
1790 } 1838 }
1839# endif
1791} 1840}
1792#endif 1841#endif
1793 1842
1794void 1843void
1795rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
… …
1804 /* 1853 /*
1805 * VT window processing of button press 1854 * VT window processing of button press
1806 */ 1855 */
1807 if (ev.window == vt) 1856 if (ev.window == vt)
1808 { 1857 {
1858 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1859 return;
1860
1809#if ISO_14755 1861#if ISO_14755
1810 // 5.4 1862 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1864 {
1813 iso14755_54 (ev.x, ev.y); 1865 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1827 { 1879 {
1828 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1829 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1830 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1831 { 1884 {
1832 /* only report double clicks */ 1885 /* only report double clicks */
1833 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1834 mouse_report (ev); 1887 mouse_report (ev);
… …
1854 else 1907 else
1855 { 1908 {
1856 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1858 1911
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1912 switch (ev.button)
1861 { 1913 {
1862 case Button1: 1914 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1919#else
1868 selection.rect = false; 1920 selection.rect = false;
1869#endif 1921#endif
1870 1922
1871 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1925 {
1874 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1876 else 1928 else
1877 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1878 } 1930 }
1879 else 1931 else
1880 { 1932 {
1881 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1934 MEvent.clicks++;
1883 else 1935 else
1884 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1885 1937
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1939 }
1888 1940
1889 MEvent.button = Button1; 1941 MEvent.button = Button1;
1890 break; 1942 break;
1891 1943
1892 case Button3: 1944 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1895 else 1947 else
1896 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1897 1949
1898 MEvent.button = Button3; 1950 MEvent.button = Button3;
1899 break; 1951 break;
1900 } 1952 }
1901 } 1953 }
1902 1954
1903 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1904 return; 1956 return;
1905 } 1957 }
1906 1958
… …
2042 } 2094 }
2043 2095
2044 break; 2096 break;
2045 } 2097 }
2046 } 2098 }
2099
2047 return; 2100 return;
2048 } 2101 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2102}
2057 2103
2058void 2104void
2059rxvt_term::button_release (XButtonEvent &ev) 2105rxvt_term::button_release (XButtonEvent &ev)
2060{ 2106{
… …
2066 2112
2067 if (scrollbar_isUpDn ()) 2113 if (scrollbar_isUpDn ())
2068 { 2114 {
2069 scrollBar.setIdle (); 2115 scrollBar.setIdle ();
2070 scrollbar_show (0); 2116 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2117 }
2075 2118
2076#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2120 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2079#endif 2122#endif
2080 2123
2081 if (ev.window == vt) 2124 if (ev.window == vt)
2082 { 2125 {
2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2127 return;
2128
2083#if ISO_14755 2129#if ISO_14755
2084 // 5.4 2130 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2131 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2132 return;
2087#endif 2133#endif
2134
2088 if (reportmode) 2135 if (reportmode)
2089 { 2136 {
2090 /* mouse report from vt window */ 2137 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2138 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2139 if (ev.button >= 4)
… …
2122 { 2169 {
2123 case Button1: 2170 case Button1:
2124 case Button3: 2171 case Button3:
2125 selection_make (ev.time); 2172 selection_make (ev.time);
2126 break; 2173 break;
2174
2127 case Button2: 2175 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2178 break;
2179
2130#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2131 case Button4: 2181 case Button4:
2132 case Button5: 2182 case Button5:
2133 { 2183 {
2134 int i; 2184 int i;
… …
2136 2186
2137 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2138 2188
2139 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2140 i = 1; 2190 i = 1;
2141 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2142 i = nrow - 1; 2192 i = nrow - 1;
2143 else 2193 else
2144 i = 5; 2194 i = 5;
2145 2195
2146# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
… …
2156 slip_wheel_ev.start (); 2206 slip_wheel_ev.start ();
2157 } 2207 }
2158 else 2208 else
2159 { 2209 {
2160# endif 2210# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2211 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2212 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 2213# ifdef MOUSE_SLIP_WHEELING
2174 } 2214 }
2175#endif 2215# endif
2176 } 2216 }
2177 break; 2217 break;
2178#endif 2218#endif
2179 } 2219 }
2180 } 2220 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2221}
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 2222
2668/*}}} */ 2223/*}}} */
2669 2224
2670bool 2225bool
2671rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
2672{ 2227{
2673 bool flag = false; 2228 bool flag = false;
2674 unicode_t ch = NOCHAR; 2229 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2230 char *seq_begin; // remember start of esc-sequence here
2676 2231
2677 for (;;) 2232 for (;;)
2678 { 2233 {
2679 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2680 { 2235 {
2681 seq_begin = cmdbuf_ptr; 2236 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2237 ch = next_char ();
2683 }
2684 2238
2685 if (ch == NOCHAR) // TODO: improve 2239 if (ch == NOCHAR)
2686 break; 2240 break;
2241 }
2687 2242
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2243 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2244 {
2690 if (!seen_input) 2245 if (!seen_input)
2691 { 2246 {
… …
2700 if (seen_resize && cmd_pid) 2255 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2256 kill (-cmd_pid, SIGWINCH);
2702 } 2257 }
2703 2258
2704 /* Read a text string from the input buffer */ 2259 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2260 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2261 bool refreshnow = false;
2707 int nlines = 0; 2262 int nlines = 0;
2708 unicode_t *str = buf; 2263 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2264 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2265
2711 for (;;) 2266 for (;;)
2712 { 2267 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2268 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2269 break;
… …
2720 if (ch == C0_LF) 2275 if (ch == C0_LF)
2721 nlines++; 2276 nlines++;
2722 2277
2723 refresh_count++; 2278 refresh_count++;
2724 2279
2725 if (!OPTION (Opt_jumpScroll) 2280 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2727 { 2281 {
2728 refreshnow = true;
2729 refresh_count = 0; 2282 refresh_count = 0;
2283
2284 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2285 {
2286 refreshnow = true;
2730 ch = NOCHAR; 2287 ch = NOCHAR;
2731 break; 2288 break;
2289 }
2732 } 2290 }
2733 2291
2734 // scr_add_lines only works for nlines <= nrow - 1. 2292 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2293 if (nlines >= nrow - 1)
2736 { 2294 {
2295 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2297 scr_add_lines (buf, str - buf, nlines);
2298
2738 nlines = 0; 2299 nlines = 0;
2739 str = buf; 2300 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2301 eol = str + min (ncol, UBUFSIZ);
2741 } 2302 }
2742 2303
… …
2755 2316
2756 seq_begin = cmdbuf_ptr; 2317 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2318 ch = next_char ();
2758 } 2319 }
2759 2320
2321 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2322 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2323 scr_add_lines (buf, str - buf, nlines);
2761 2324
2762 /* 2325 /*
2763 * If there have been a lot of new lines, then update the screen 2326 * 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. 2327 * 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 2328 * if skipScroll is enabled.
2766 * is incremented here because we must be doing flat-out scrolling.
2767 */ 2329 */
2768 if (refreshnow) 2330 if (refreshnow)
2769 { 2331 {
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++;
2772 else
2773 {
2774 flag = true; 2332 flag = true;
2775 scr_refresh (refresh_type); 2333 scr_refresh ();
2776 flush_ev.stop (); 2334 want_refresh = 1;
2777 }
2778 } 2335 }
2779 2336
2780 } 2337 }
2781 else 2338 else
2782 { 2339 {
… …
2796 } 2353 }
2797 2354
2798 return flag; 2355 return flag;
2799} 2356}
2800 2357
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 2358// read the next character
2811unicode_t 2359wchar_t
2812rxvt_term::next_char () 2360rxvt_term::next_char () NOTHROW
2813{ 2361{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2363 {
2816 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2366 return *cmdbuf_ptr++;
2819 2367
2820 wchar_t wc; 2368 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2370
2823 if (len == (size_t)-2) 2371 if (len == (size_t)-2)
2824 { 2372 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2373 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2374 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2375 break;
2828 } 2376 }
2829 2377
2830 if (len == (size_t)-1) 2378 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2379 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2380
2833 // assume wchar == unicode 2381 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2382 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2383 return wc & UNICODE_MASK;
2836 } 2384 }
2837 2385
2838 return NOCHAR; 2386 return NOCHAR;
2839} 2387}
2388
2389// read the next octet
2390uint32_t
2391rxvt_term::next_octet () NOTHROW
2392{
2393 return cmdbuf_ptr < cmdbuf_endp
2394 ? (unsigned char)*cmdbuf_ptr++
2395 : NOCHAR;
2396}
2397
2398static class out_of_input out_of_input;
2840 2399
2841/* rxvt_cmd_getc () - Return next input character */ 2400/* rxvt_cmd_getc () - Return next input character */
2842/* 2401/*
2843 * Return the next input character after first passing any keyboard input 2402 * Return the next input character after first passing any keyboard input
2844 * to the command. 2403 * to the command.
2845 */ 2404 */
2846unicode_t 2405wchar_t
2847rxvt_term::cmd_getc () 2406rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2407{
2849 unicode_t c = next_char (); 2408 wchar_t c = next_char ();
2850 2409
2851 if (c == NOCHAR) 2410 if (c == NOCHAR)
2852 throw out_of_input; 2411 throw out_of_input;
2853 2412
2854 return c; 2413 return c;
2855} 2414}
2856 2415
2857unicode_t 2416uint32_t
2858rxvt_term::cmd_get8 () 2417rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2418{
2860 unicode_t c = next_octet (); 2419 uint32_t c = next_octet ();
2861 2420
2862 if (c == NOCHAR) 2421 if (c == NOCHAR)
2863 throw out_of_input; 2422 throw out_of_input;
2864 2423
2865 return c; 2424 return c;
… …
2929 { 2488 {
2930 if ((buf[len++] = cmd_getc ()) == 'i') 2489 if ((buf[len++] = cmd_getc ()) == 'i')
2931 break; /* done = 1 */ 2490 break; /* done = 1 */
2932 } 2491 }
2933 } 2492 }
2934 2493
2935 for (i = 0; i < len; i++) 2494 for (i = 0; i < len; i++)
2936 if (putc (buf[i], fd) == EOF) 2495 if (putc (buf[i], fd) == EOF)
2937 { 2496 {
2938 done = 1; 2497 done = 1;
2939 break; 2498 break;
… …
2965 case C0_ESC: 2524 case C0_ESC:
2966 process_escape_seq (); 2525 process_escape_seq ();
2967 break; 2526 break;
2968 case C0_ENQ: /* terminal Status */ 2527 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2528 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2529 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2530 else
2973 tt_write ((unsigned char *)VT100_ANS, 2531 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2532 break;
2976 case C0_BEL: /* bell */ 2533 case C0_BEL: /* bell */
2977 scr_bell (); 2534 scr_bell ();
2978 break; 2535 break;
2979 case C0_BS: /* backspace */ 2536 case C0_BS: /* backspace */
… …
3003 process_dcs_seq (); 2560 process_dcs_seq ();
3004 break; 2561 break;
3005 case 0x9b: /* CSI */ 2562 case 0x9b: /* CSI */
3006 process_csi_seq (); 2563 process_csi_seq ();
3007 break; 2564 break;
3008 case 0x9d: /* CSI */ 2565 case 0x9d: /* OSC */
3009 process_osc_seq (); 2566 process_osc_seq ();
3010 break; 2567 break;
3011#endif 2568#endif
3012 } 2569 }
3013} 2570}
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 2660 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 2661 break;
3105 case '+': 2662 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 2663 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 2664 break;
3108#if ENABLE_FRILLS 2665#if !ENABLE_MINIMAL
3109 case '6': 2666 case '6':
3110 scr_backindex (); 2667 scr_backindex ();
3111 break; 2668 break;
3112#endif 2669#endif
3113 case '7': 2670 case '7':
3114 scr_cursor (SAVE); 2671 scr_cursor (SAVE);
3115 break; 2672 break;
3116 case '8': 2673 case '8':
3117 scr_cursor (RESTORE); 2674 scr_cursor (RESTORE);
3118 break; 2675 break;
3119#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3120 case '9': 2677 case '9':
3121 scr_forwardindex (); 2678 scr_forwardindex ();
3122 break; 2679 break;
3123#endif 2680#endif
3124 case '=': 2681 case '=':
… …
3134 break; 2691 break;
3135 2692
3136 /* 8.3.87: NEXT LINE */ 2693 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 2694 case C1_NEL: /* ESC E */
3138 { 2695 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 2696 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 2697 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 2698 }
3142 break; 2699 break;
3143 2700
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 2701 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 2702 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 2724 process_dcs_seq ();
3168 break; 2725 break;
3169 2726
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2727 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 2728 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 2729 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 2730 break; /* steal obsolete ESC [ c */
3175 2731
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2732 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 2733 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 2734 process_csi_seq ();
… …
3240rxvt_term::process_csi_seq () 2796rxvt_term::process_csi_seq ()
3241{ 2797{
3242 unicode_t ch, priv, i; 2798 unicode_t ch, priv, i;
3243 unsigned int nargs, p; 2799 unsigned int nargs, p;
3244 int n, ndef; 2800 int n, ndef;
3245 int arg[ESC_ARGS]; 2801 int arg[ESC_ARGS] = { };
3246 2802
3247 for (nargs = ESC_ARGS; nargs > 0;) 2803 nargs = 0;
3248 arg[--nargs] = 0;
3249 2804
3250 priv = 0; 2805 priv = 0;
3251 ch = cmd_getc (); 2806 ch = cmd_getc ();
3252 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3253 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 2842 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 2843 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 2844 if (arg[p] == -1)
3290 arg[p] = ndef; 2845 arg[p] = ndef;
3291 2846
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 /* 2847 /*
3300 * private mode handling 2848 * private mode handling
3301 */ 2849 */
3302 if (priv) 2850 if (priv)
3303 { 2851 {
3304 switch (priv) 2852 switch (priv)
3305 { 2853 {
3306 case '>': 2854 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2856 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2862 // that we do not support xterm mouse reporting (should be 95 when we do).
2863 //
2864 tt_printf ("\033[>%d;94;0c", 'U');
2865 }
3309 break; 2866 break;
3310 case '?': 2867 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 2870 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2979 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2980 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 2981 break;
3425 2982
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2983 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 2984 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 2985 break;
3430 2986
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2987 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 2988 process_sgr_mode (nargs, arg);
3433 break; 2989 break;
… …
3440 break; 2996 break;
3441 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3442 scr_report_position (); 2998 scr_report_position ();
3443 break; 2999 break;
3444 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3446 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3447 break; 3003 break;
3448 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3450 break; 3006 break;
… …
3517 break; 3073 break;
3518 case CSI_75: 3074 case CSI_75:
3519 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3520 break; 3076 break;
3521 3077
3522#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3523 case CSI_74: 3079 case CSI_74:
3524 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3525 break; 3081 break;
3526#endif 3082#endif
3527 3083
… …
3534 break; 3090 break;
3535 } 3091 }
3536} 3092}
3537/*}}} */ 3093/*}}} */
3538 3094
3539#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3096/* ARGSUSED */
3541void 3097void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3099{
3544 int x, y; 3100 int x, y;
3545 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3546 Window wdummy; 3102 Window wdummy;
3547 dDisp; 3103
3104 dLocal (Display *, dpy);
3548 3105
3549 if (nargs == 0) 3106 if (nargs == 0)
3550 return; 3107 return;
3551 3108
3552 switch (args[0]) 3109 switch (args[0])
3553 { 3110 {
3554 /* 3111 /*
3555 * commands 3112 * commands
3556 */ 3113 */
3557 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3559 break; 3116 break;
3560 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3119 break;
3563 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3122 break;
3566 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3125 break;
3569 case 5: /* raise window */ 3126 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3571 break; 3128 break;
3572 case 6: /* lower window */ 3129 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3574 break; 3131 break;
3575 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3576 scr_touch (true); 3133 scr_touch (true);
3577 break; 3134 break;
3578 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3588 break; 3145 break;
3589 3146
3590
3591 /* 3147 /*
3592 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3593 */ 3149 */
3594 case 11: /* report window state */ 3150 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3153 break;
3598 case 13: /* report window position */ 3154 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3160 break;
3605 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3164 break;
3609 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3167 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3170 break;
3615 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3616 { 3172 {
3617 char *s; 3173 char *s;
3618 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3176 XFree (s);
3621 } 3177 }
3622 break; 3178 break;
3623 case 21: /* report window title */ 3179 case 21: /* report window title */
3624 { 3180 {
3625 char *s; 3181 char *s;
3626 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3184 XFree (s);
3629 } 3185 }
3630 break; 3186 break;
3631 } 3187 }
3632} 3188}
… …
3635/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3636/* 3192/*
3637 * get input up until STRING TERMINATOR (or BEL) 3193 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3194 * ends_how is terminator used. returned input must be free()'d
3639 */ 3195 */
3640unsigned char * 3196char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3197rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3198{
3643 unicode_t ch; 3199 unicode_t ch;
3644 bool seen_esc = false; 3200 bool seen_esc = false;
3645 unsigned int n = 0; 3201 unsigned int n = 0;
… …
3659 seen_esc = true; 3215 seen_esc = true;
3660 continue; 3216 continue;
3661 } 3217 }
3662 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3663 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3664 else if (ch < 0x20) 3222 else if (ch < 0x20)
3665 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3666 3224
3667 seen_esc = false; 3225 seen_esc = false;
3668 3226
3669 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3670 // stop at some sane length 3228 // stop at some sane length
3671 return NULL; 3229 return NULL;
3672 3230
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3676 string[n++] = ch; 3231 string[n++] = ch;
3677 } 3232 }
3678 3233
3679 string[n++] = '\0'; 3234 string[n++] = '\0';
3680 3235
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3237
3683 return (unsigned char *)rxvt_wcstombs (string); 3238 return rxvt_wcstombs (string);
3684} 3239}
3685 3240
3686/*----------------------------------------------------------------------*/ 3241/*----------------------------------------------------------------------*/
3687/* 3242/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3244 */
3690void 3245void
3691rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3692{ 3247{
3693 unsigned char *s; 3248 char *s;
3694 unicode_t eh; 3249 unicode_t eh;
3695 3250
3696 /* 3251 /*
3697 * Not handled yet 3252 * Not handled yet
3698 */ 3253 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3272 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3273 arg = arg * 10 + (ch - '0');
3719 3274
3720 if (ch == ';') 3275 if (ch == ';')
3721 { 3276 {
3722 unsigned char *s = get_to_st (eh); 3277 char *s = get_to_st (eh);
3723 3278
3724 if (s) 3279 if (s)
3725 { 3280 {
3726 process_xterm_seq (arg, (char *)s, eh); 3281 process_xterm_seq (arg, s, eh);
3727 free (s); 3282 free (s);
3728 } 3283 }
3729 } 3284 }
3730} 3285}
3731 3286
3732void 3287void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3289{
3735 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3736 { 3291 {
3737 unsigned short r, g, b; 3292 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3301 }
3741 else 3302 else
3742 set_window_color (color, str); 3303 set_window_color (color, str);
3743} 3304}
3744 3305
3745/* 3306/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3308 */
3748void 3309void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3310rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3311{
3751 int changed = 0;
3752 int color; 3312 int color;
3753 char *buf, *name; 3313 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3315 int saveop = op;
3756 dDisp; 3316
3317 dLocal (Display *, dpy);
3757 3318
3758 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3759 switch (op) 3324 switch (op)
3760 { 3325 {
3761 case XTerm_name: 3326 case XTerm_name:
3762 set_title (str); 3327 set_title (str);
3763 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3342 unsigned long bytes_after;
3778 unsigned char *value = 0; 3343 unsigned char *value = 0;
3779 const char *str = ""; 3344 const char *str = "";
3780 3345
3781 if (prop 3346 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3351 && actual_type != None
3787 && actual_format == 8) 3352 && actual_format == 8)
3788 str = (const char *)(value); 3353 str = (const char *)(value);
3789 3354
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3356
3792 XFree (value); 3357 XFree (value);
3793 } 3358 }
3794 else 3359 else
3795 { 3360 {
… …
3799 { 3364 {
3800 *eq = 0; 3365 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3802 } 3367 }
3803 else 3368 else
3804 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3370 display->atom (str));
3806 } 3371 }
3807 break; 3372 break;
3808 3373
3809 case XTerm_Color: 3374 case XTerm_Color:
… …
3811 { 3376 {
3812 if ((name = strchr (buf, ';')) == NULL) 3377 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3378 break;
3814 3379
3815 *name++ = '\0'; 3380 *name++ = '\0';
3816 color = atoi (buf); 3381 color = atoi (buf) + minCOLOR;
3817 3382
3818 if (color < 0 || color >= TOTAL_COLORS) 3383 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3384 break;
3820 3385
3821 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3387 *buf++ = '\0';
3823 3388
3824 if (name[0] == '?' && !name[1]) 3389 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 } 3390 }
3833 break; 3391 break;
3834 case XTerm_Color00: 3392 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3836 break; 3394 break;
3837 case XTerm_Color01: 3395 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3839 break; 3397 break;
3840#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3401 break;
3844#endif 3402#endif
3845 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3405 break;
3848 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3408 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#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: 3410 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3412 break;
3413 case Rxvt_Color_BD:
3414 case URxvt_Color_BD:
3415 process_color_seq (op, Color_BD, str, resp);
3416 break;
3417 case Rxvt_Color_UL:
3418 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp);
3860 break; 3420 break;
3861 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3863 break; 3423 break;
3864#endif 3424#endif
3865#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3866 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3868 check_our_parents (); 3428 {
3869 if (am_transparent) 3429 bool changed = false;
3870 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3871 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3872#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3873 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3874 case XTerm_Pixmap: 3442 case Rxvt_Pixmap:
3875 if (*str != ';') 3443 if (!strcmp (str, "?"))
3876 { 3444 {
3877#if XPM_BACKGROUND 3445 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3446
3879 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880#endif 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881 scr_touch (true); 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3451 }
3883 while ((str = strchr (str, ';')) != NULL) 3452 else
3884 { 3453 {
3454 int changed = 0;
3455
3456 if (*str != ';')
3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3885 str++; 3468 str++;
3886#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3470 changed++;
3888#endif 3471 str = strchr (str, ';');
3472 }
3473 if (changed)
3474 update_background ();
3889 } 3475 }
3890
3891 if (changed)
3892 {
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895#endif
3896 scr_touch (true);
3897 }
3898 break; 3476 break;
3477#endif
3899 3478
3900 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3902 break; 3481 break;
3903 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3905 break; 3484 break;
3906 3485
3907 case XTerm_logfile: 3486 case XTerm_logfile:
3908 // TODO, when secure mode? 3487 // TODO, when secure mode?
3909 break; 3488 break;
3910 3489
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 3490#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3919 { 3492 {
3920 int fd; 3493 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3495 {
3923 scr_dump (fd); 3496 scr_dump (fd);
… …
3934 case URxvt_italicFont: 3507 case URxvt_italicFont:
3935 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3936#endif 3509#endif
3937 if (query) 3510 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp); 3514 resp);
3942 else 3515 else
3943 { 3516 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3948 set_fonts (); 3521 set_fonts ();
3949 } 3522 }
3950 break; 3523 break;
3951 3524
3952#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3534 case URxvt_locale:
3954 if (query) 3535 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3956 else 3537 else
3957 { 3538 {
3958 set_locale (str); 3539 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3541 init_xlocale ();
3961 } 3542 }
3962 break; 3543 break;
3963 3544
3964 case URxvt_view_up: 3545 case URxvt_view_up:
3965 case URxvt_view_down: 3546 case URxvt_view_down:
3547 {
3966 int lines = atoi (str); 3548 int lines = atoi (str);
3967 3549
3968 if (lines) 3550 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 3551 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 3552 else
3971 {
3972 scr_erase_savelines (); 3553 scr_erase_savelines ();
3973 } 3554 }
3974 3555
3556 break;
3557#endif
3558
3559#if ENABLE_PERL
3560 case URxvt_perl:
3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3562 ; // no responses yet
3975 break; 3563 break;
3976#endif 3564#endif
3977 } 3565 }
3978} 3566}
3979/*----------------------------------------------------------------------*/ 3567/*----------------------------------------------------------------------*/
… …
4010 return state; 3598 return state;
4011} 3599}
4012 3600
4013/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4014void 3602void
4015rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4016{ 3604{
4017 unsigned int i, j; 3605 unsigned int i, j;
4018 int state; 3606 int state;
4019 3607
4020 static const struct 3608 static const struct
4021 { 3609 {
4022 const int argval; 3610 const int argval;
4023 const unsigned long bit; 3611 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3612 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4028 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4030 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4031 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4032 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin },
4033 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode 3620 // 8, bi-directional support mode
4035 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
4036#ifdef menuBar_esc
4037 { menuBar_esc, PrivMode_menuBar },
4038#endif
4039 // 18, 19 printing-related 3622 // 18, 19 printing-related
4040 { 25, PrivMode_VisibleCursor }, 3623 { 25, PrivMode_VisibleCursor },
4041#ifdef scrollBar_esc 3624#ifdef scrollBar_esc
4042 { scrollBar_esc, PrivMode_scrollBar }, 3625 { scrollBar_esc, PrivMode_scrollBar },
4043#endif 3626#endif
… …
4090 /* extra handling for values with state unkept */ 3673 /* extra handling for values with state unkept */
4091 switch (arg[i]) 3674 switch (arg[i])
4092 { 3675 {
4093#if ENABLE_STYLES 3676#if ENABLE_STYLES
4094 case 1021: 3677 case 1021:
4095 if (mode) 3678 set_option (Opt_intensityStyles, mode);
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099 3679
4100 scr_touch (true); 3680 scr_touch (true);
4101 break; 3681 break;
4102#endif 3682#endif
4103 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4104 case 1049: 3684 case 1049:
4105 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4106 if (mode == 0) 3686 if (mode == 0)
4107 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4108 else if (mode == 1) 3688 else if (mode == 1)
4109 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4110 break; 3690 break;
… …
4125 case 3: /* 80/132 */ 3705 case 3: /* 80/132 */
4126 if (priv_modes & PrivMode_132OK) 3706 if (priv_modes & PrivMode_132OK)
4127 set_widthheight (((state ? 132 : 80) * fwidth), height); 3707 set_widthheight (((state ? 132 : 80) * fwidth), height);
4128 break; 3708 break;
4129 case 4: /* smooth scrolling */ 3709 case 4: /* smooth scrolling */
4130 if (!state) 3710 set_option (Opt_jumpScroll, !state);
4131 SET_OPTION (Opt_jumpScroll);
4132 else
4133 CLR_OPTION (Opt_jumpScroll);
4134 break; 3711 break;
4135 case 5: /* reverse video */ 3712 case 5: /* reverse video */
4136 scr_rvideo_mode (state); 3713 scr_rvideo_mode (state);
4137 break; 3714 break;
4138 case 6: /* relative/absolute origins */ 3715 case 6: /* relative/absolute origins */
… …
4144 /* case 8: - auto repeat, can't do on a per window basis */ 3721 /* case 8: - auto repeat, can't do on a per window basis */
4145 case 9: /* X10 mouse reporting */ 3722 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 3724 priv_modes &= ~PrivMode_MouseX11;
4148 break; 3725 break;
4149#ifdef menuBar_esc
4150 case menuBar_esc:
4151#ifdef MENUBAR
4152 map_menuBar (state);
4153#endif
4154 break;
4155#endif
4156#ifdef scrollBar_esc 3726#ifdef scrollBar_esc
4157 case scrollBar_esc: 3727 case scrollBar_esc:
4158 if (scrollbar_mapping (state)) 3728 if (scrollbar_mapping (state))
4159 { 3729 {
4160 resize_all_windows (0, 0, 0); 3730 resize_all_windows (0, 0, 0);
… …
4179#if 0 3749#if 0
4180 case 1001: 3750 case 1001:
4181 break; /* X11 mouse highlighting */ 3751 break; /* X11 mouse highlighting */
4182#endif 3752#endif
4183 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4184 if (!state) 3754 set_option (Opt_scrollTtyOutput, !state);
4185 SET_OPTION (Opt_scrollTtyOutput);
4186 else
4187 CLR_OPTION (Opt_scrollTtyOutput);
4188 break; 3755 break;
4189 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4190 if (state) 3757 set_option (Opt_scrollTtyKeypress, state);
4191 SET_OPTION (Opt_scrollTtyKeypress);
4192 else
4193 CLR_OPTION (Opt_scrollTtyKeypress);
4194 break; 3758 break;
4195 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4198 scr_erase_screen (2); 3762 scr_erase_screen (2);
4199 scr_change_screen (state); 3763 scr_change_screen (state);
4200 break; 3764 break;
4201 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4202 scr_change_screen (state); 3766 scr_change_screen (state);
4203 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3769 scr_erase_screen (2);
4206 break; 3770 break;
4207 default: 3771 default:
4208 break; 3772 break;
… …
4336 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4337 break; 3901 break;
4338 3902
4339 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4340 3904
4341#ifndef NO_BRIGHTCOLOR 3905#if !ENABLE_MINIMAL
4342 case 90: 3906 case 90:
4343 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4344 case 92: 3908 case 92:
4345 case 93: 3909 case 93:
4346 case 94: 3910 case 94:
… …
4391 */ 3955 */
4392void 3956void
4393rxvt_term::tt_printf (const char *fmt,...) 3957rxvt_term::tt_printf (const char *fmt,...)
4394{ 3958{
4395 va_list arg_ptr; 3959 va_list arg_ptr;
4396 unsigned char buf[256]; 3960 char buf[256];
4397 3961
4398 va_start (arg_ptr, fmt); 3962 va_start (arg_ptr, fmt);
4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3963 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4400 va_end (arg_ptr); 3964 va_end (arg_ptr);
4401 tt_write (buf, strlen (buf)); 3965 tt_write (buf, strlen (buf));
… …
4406 * or generated by us in response to a query ESC sequence. 3970 * or generated by us in response to a query ESC sequence.
4407 */ 3971 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409 3973
4410void 3974void
4411rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 3976{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3978 return;
3979
3980 if (pty->pty < 0)
3981 return;
3982
4413 if (v_buflen == 0) 3983 if (v_buflen == 0)
4414 { 3984 {
4415 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4416 3986
4417 if ((unsigned int)written == len) 3987 if ((unsigned int)written == len)
4418 return; 3988 return;
4419 3989
4420 data += written; 3990 data += written;
4421 len -= written; 3991 len -= written;
4422 } 3992 }
4423 3993
4424 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4425 3995
4426 memcpy (v_buffer + v_buflen, data, len); 3996 memcpy (v_buffer + v_buflen, data, len);
4427 v_buflen += len; 3997 v_buflen += len;
4428 3998
4429 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (EVENT_READ | EVENT_WRITE);
4430} 4000}
4431 4001
4432void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4433{ 4003{
4434 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4435 4005
4436 if (written > 0) 4006 if (written > 0)
4437 { 4007 {
4438 v_buflen -= written; 4008 v_buflen -= written;
4439 4009

Diff Legend

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