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.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.358 by sasha, Tue Sep 18 22:27:41 2007 UTC

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

Diff Legend

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