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

Diff Legend

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