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.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.356 by root, Mon Sep 17 08:31:54 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>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 143 return;
149 144
150 for (;;) 145 for (;;)
151 { 146 {
152 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
153 148
154 text_t t = l.t[x]; 149 text_t t = l.t[x];
155 150
156 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
157 { 152 {
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 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// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * 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
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
443 scr_move_to (0, 1); 446 scr_move_to (0, 1);
444 return; 447 return;
445 } 448 }
446 else if (keysym == XK_End) 449 else if (keysym == XK_End)
447 { 450 {
448 scr_move_to (1, 0); 451 scr_move_to (1, 1);
449 return; 452 return;
450 } 453 }
451 } 454 }
452#endif 455#endif
453 } 456 }
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 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);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
542 switch (keysym) 554 switch (keysym)
543 { 555 {
544#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 557 case XK_BackSpace:
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
551 } 563 }
552 else 564 else
553 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 566 break;
555#endif 567#endif
556#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
558 case XK_KP_Delete: 570 case XK_KP_Delete:
559 /* allow shift to override */ 571 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
561 { 573 {
562 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
563 break; 575 break;
564 } 576 }
565 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
566# endif 578# endif
567 case XK_Delete: 579 case XK_Delete:
568 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 581 break;
570#endif 582#endif
571 case XK_Tab: 583 case XK_Tab:
572 if (shft) 584 if (shft)
573 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
588#ifdef XK_KP_Left 600#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
594 { 606 {
595 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break; 609 break;
598 } 610 }
… …
621 633
622#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
624 case XK_KP_Prior: 636 case XK_KP_Prior:
625 /* allow shift to override */ 637 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
627 { 639 {
628 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
629 break; 641 break;
630 } 642 }
631 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
634 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
635 break; 647 break;
636# ifdef XK_KP_Next 648# ifdef XK_KP_Next
637 case XK_KP_Next: 649 case XK_KP_Next:
638 /* allow shift to override */ 650 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
640 { 652 {
641 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
642 break; 654 break;
643 } 655 }
644 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
647 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
648 break; 660 break;
649#endif 661#endif
650 case XK_KP_Enter: 662 case XK_KP_Enter:
651 /* allow shift to override */ 663 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
653 { 665 {
654 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
655 break; 667 break;
656 } 668 }
657 669
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 716 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
706 { 718 {
707 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 721 }
710 else 722 else
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
727 break; 739 break;
728 } 740 }
729 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
742 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
743 break; 755 break;
744#ifdef XK_KP_End 756#ifdef XK_KP_End
745 case XK_KP_End: 757 case XK_KP_End:
746 /* allow shift to override */ 758 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
748 { 760 {
749 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
750 break; 762 break;
751 } 763 }
752 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
755 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
756 break; 768 break;
757#ifdef XK_KP_Home 769#ifdef XK_KP_Home
758 case XK_KP_Home: 770 case XK_KP_Home:
759 /* allow shift to override */ 771 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
761 { 773 {
762 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
763 break; 775 break;
764 } 776 }
765 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 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
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
959void 1035void
960rxvt_term::flush () 1036rxvt_term::flush ()
961{ 1037{
962 flush_ev.stop (); 1038 flush_ev.stop ();
963 1039
964#ifdef TRANSPARENT
965 if (want_full_refresh)
966 {
967 want_full_refresh = 0;
968 scr_clear ();
969 scr_touch (false);
970 }
971#endif
972
973 if (want_refresh) 1040 if (want_refresh)
974 { 1041 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1043 {
977 int row = -view_start; 1044 int row = view_start;
1045 int end_row = row + nrow;
978 1046
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1047 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1048 --row;
981 1049
982 while (row < -view_start + nrow) 1050 do
983 { 1051 {
984 int start_row = row; 1052 int start_row = row;
985 line_t *l; 1053 line_t *l;
986 1054
987 do 1055 do
988 { 1056 {
989 l = &ROW (row); 1057 l = &ROW (row++);
990 1058
991 if (!(l->f & LINE_FILTERED)) 1059 if (!(l->f & LINE_FILTERED))
992 { 1060 {
993 // line not filtered, mark it as filtered 1061 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1062 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1063 while (l->is_longer ())
996 { 1064 {
997 l = &ROW (++row); 1065 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1066 l->f |= LINE_FILTERED;
999 } 1067 }
1000 1068
1001 // and filter it 1069 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1071
1004 break; 1072 break;
1005 } 1073 }
1006 } 1074 }
1007 while (l->is_longer ()); 1075 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1076 }
1077 while (row < end_row);
1011 1078 }
1012 }
1013 1079
1014 scr_refresh (refresh_type); 1080 scr_refresh ();
1015 scrollbar_show (1); 1081 scrollbar_show (1);
1016#ifdef USE_XIM 1082#ifdef USE_XIM
1017 IMSendSpot (); 1083 IMSendSpot ();
1018#endif 1084#endif
1019 } 1085 }
… …
1022} 1088}
1023 1089
1024void 1090void
1025rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
1026{ 1092{
1027 SET_R (this); 1093 make_current ();
1028 SET_LOCALE (locale);
1029 1094
1030 display->flush (); 1095 display->flush ();
1031 1096
1032 if (want_refresh && !flush_ev.active) 1097 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1099}
1035 1100
1036void 1101void
1037rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
1038{ 1103{
1039 SET_R (this); 1104 make_current ();
1040 SET_LOCALE (locale);
1041 1105
1042 refresh_limit = 1;
1043 refresh_count = 0; 1106 refresh_count = 0;
1044 flush (); 1107 flush ();
1045} 1108}
1046 1109
1047#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1113{
1051 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1115 want_refresh = 1;
1053 1116
1054 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1118}
1056#endif 1119#endif
1057 1120
1058#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
1059void 1122void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1136rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1137{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1140 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1141 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1143 }
1082} 1144}
1083#endif 1145#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1149rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1150{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1152 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1154 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1156 }
1096} 1157}
1097#endif 1158#endif
… …
1102{ 1163{
1103 if (mouse_slip_wheel_speed == 0 1164 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1166 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1167 {
1107 if (view_start == nsaved || 1168 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1169 mouse_slip_wheel_speed = 0;
1110 1170
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1171 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1173 }
1115} 1174}
1116#endif 1175#endif
1117 1176
1118#if HAVE_SCHED_YIELD 1177#if LINUX_YIELD_HACK
1119static struct event_handler 1178static struct event_handler
1120{ 1179{
1121 check_watcher cw_yield; 1180 check_watcher yield_ev;
1122 1181
1123 void yield (check_watcher &w) 1182 void yield_cb (check_watcher &w)
1124 { 1183 {
1125 sched_yield (); 1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1126 w.stop (); 1192 w.stop ();
1127 } 1193 }
1128 1194
1129 event_handler () 1195 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1196 : yield_ev (this, &event_handler::yield_cb)
1131 { 1197 {
1132 } 1198 }
1133} event_handler; 1199} event_handler;
1134#endif 1200#endif
1135 1201
… …
1146 1212
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
1150 1216
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1218
1153 if (r > 0) 1219 if (r > 0)
1154 { 1220 {
1155 cmdbuf_endp += r; 1221 cmdbuf_endp += r;
1156 return true; 1222 return true;
1157 } 1223 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1225 {
1160#if HAVE_SCHED_YIELD 1226#if LINUX_YIELD_HACK
1161 if (display->is_local) 1227 if (display->is_local)
1162 event_handler.cw_yield.start (); 1228 event_handler.yield_ev.start ();
1163#endif 1229#endif
1164 } 1230 }
1165 else 1231 else
1166 { 1232 {
1167 pty_ev.stop (); 1233 pty_ev.stop ();
1168 1234
1169 if (!OPTION (Opt_hold)) 1235 if (!option (Opt_hold))
1170 destroy (); 1236 destroy ();
1171 } 1237 }
1172 1238
1173 return false; 1239 return false;
1174} 1240}
1175 1241
1176void 1242void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1244{
1179 SET_R (this); 1245 make_current ();
1180 SET_LOCALE (locale);
1181 1246
1182 if (revents & EVENT_READ) 1247 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1248 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1249 while (pty_fill ())
1185 if (cmd_parse ()) 1250 if (cmd_parse ())
… …
1190} 1255}
1191 1256
1192void 1257void
1193rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1194{ 1259{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1261 recolour_cursor ();
1197 1262
1198#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1264 hidden_pointer = 0;
1200 1265
1201 if (OPTION (Opt_pointerBlank)) 1266 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1268#endif
1204} 1269}
1205 1270
1206#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1207void 1272void
1208rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1209{ 1274{
1210 if (!OPTION (Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1211 return; 1276 return;
1212 1277
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1279 XFlush (dpy);
1215 1280
1216 hidden_pointer = 1; 1281 hidden_pointer = 1;
1217} 1282}
1218 1283
1219void 1284void
1220rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
1221{ 1286{
1222 SET_R (this); 1287 make_current ();
1223 SET_LOCALE (locale);
1224 1288
1225 pointer_blank (); 1289 pointer_blank ();
1226} 1290}
1227#endif 1291#endif
1228 1292
… …
1293 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1294 (32 + x + 1), 1358 (32 + x + 1),
1295 (32 + y + 1)); 1359 (32 + y + 1));
1296} 1360}
1297 1361
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1362/*{{{ process an X event */
1309void 1363void
1310rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1311{ 1365{
1312 dDisp; 1366 make_current ();
1313 1367
1314 SET_R (this); 1368 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1369
1317#if defined(CURSOR_BLINK) 1370 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1373 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1374
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1375 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1378 unsigned int unused_mask;
1347 1379
1348 switch (ev.type) 1380 switch (ev.type)
1349 { 1381 {
1350 case KeyPress: 1382 case KeyPress:
1351#if ISO_14755 1383 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1384 break;
1357 1385
1358 case KeyRelease: 1386 case KeyRelease:
1359 { 1387 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1388 break;
1431 }
1432 1389
1433 case ButtonPress: 1390 case ButtonPress:
1434 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1435 break; 1392 break;
1436 1393
… …
1438 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1439 break; 1396 break;
1440 1397
1441 case ClientMessage: 1398 case ClientMessage:
1442 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1401 {
1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1405 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1407 {
1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1409 destroy ();
1410 }
1447#if ENABLE_EWMH 1411#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1415 &ev);
1416#endif
1417 }
1418 }
1419#if ENABLE_XEMBED
1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1452#endif 1427#endif
1453 } 1428 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break;
1490
1491 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1429 break;
1494 1430
1495 /* 1431 /*
1496 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1516 break; 1452 break;
1517 } 1453 }
1518 break; 1454 break;
1519 1455
1520 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1460 focus_in ();
1522 break; 1461 break;
1523 1462
1524 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1467 focus_out ();
1526 break; 1468 break;
1527 1469
1528 case ConfigureNotify: 1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1529 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1530 { 1475 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1477 ;
1533 1478
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1480 {
1536 seen_resize = 1; 1481 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1483 }
1539 1484 else
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485 {
1541 if (OPTION (Opt_transparent)) 1486#ifdef HAVE_BG_PIXMAP
1542 check_our_parents (); 1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1543#endif 1489#endif
1490 }
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 } 1492 }
1545 break; 1493 break;
1546 1494
1547 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1500
1552 break; 1501 break;
1553 1502
1554 case SelectionClear: 1503 case SelectionClear:
1555 selection_clear (); 1504 selection_clear ();
… …
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1510 break;
1562 1511
1563 case SelectionRequest: 1512 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1514 break;
1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1522 break;
1566 1523
1567 case UnmapNotify: 1524 case UnmapNotify:
1568 mapped = 0; 1525 mapped = 0;
1569#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1571#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572 break; 1530 break;
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break;
1580
1581#ifdef TRANSPARENT
1582 case ReparentNotify:
1583 rootwin_cb (ev);
1584 break;
1585#endif /* TRANSPARENT */
1586 1531
1587 case GraphicsExpose: 1532 case GraphicsExpose:
1588 case Expose: 1533 case Expose:
1589 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1590 { 1535 {
1591 do 1536 do
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595 1540
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1542
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1601 1546
1602 scr_refresh (refresh_type); 1547 want_refresh = 1;
1603 } 1548 }
1604 else 1549 else
1605 { 1550 {
1606 XEvent unused_event; 1551 XEvent unused_event;
1607 1552
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609 ; 1554 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1556 ;
1612 1557
1613 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1614 { 1559 {
1615 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1616 scrollbar_show (0); 1561 scrollbar_show (0);
1617 } 1562 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622
1623#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window);
1626#endif
1627 } 1563 }
1628 break; 1564 break;
1629 1565
1630 case MotionNotify: 1566 case MotionNotify:
1631#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1568 if (hidden_pointer)
1633 pointer_unblank (); 1569 pointer_unblank ();
1634#endif 1570#endif
1635#if MENUBAR
1636 if (isMenuBarWindow (ev.xany.window))
1637 {
1638 menubar_control (ev.xbutton);
1639 break;
1640 }
1641#endif
1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1572 break;
1644 1573
1645 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1646 { 1575 {
1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1578 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1580 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652 ; 1582 ;
1653 1583
1654 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1655 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1588 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1723#endif 1653#endif
1724 } 1654 }
1725 } 1655 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727 { 1657 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1730 ; 1660 ;
1731 1661
1732 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1733 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1666 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1668 scrollbar_size ());
1739 scr_refresh (refresh_type);
1740 refresh_limit = 0; 1669 want_refresh = 1;
1741 scrollbar_show (1); 1670 scrollbar_show (1);
1742 } 1671 }
1743 break; 1672 break;
1744 } 1673 }
1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1745} 1701}
1746 1702
1747void 1703void
1748rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1749{ 1705{
1750 if (!focus) 1706 if (!focus)
1751 { 1707 {
1752 focus = 1; 1708 focus = 1;
1753 want_refresh = 1; 1709 want_refresh = 1;
1754 1710
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 1712
1757#if USE_XIM 1713#if USE_XIM
1758 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1759 { 1715 {
1760 IMSetStatusPosition (); 1716 IMSetPosition ();
1761 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1762 } 1718 }
1763#endif 1719#endif
1764#if CURSOR_BLINK 1720#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767#endif 1723#endif
1768#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1770 { 1726 {
1771 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1772 scr_recolour (); 1728 scr_recolour ();
1773 } 1729 }
1774#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif
1775 } 1741 }
1776} 1742}
1777 1743
1778void 1744void
1779rxvt_term::focus_out () 1745rxvt_term::focus_out ()
… …
1787 1753
1788#if ENABLE_FRILLS || ISO_14755 1754#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf) 1755 if (iso14755buf)
1790 { 1756 {
1791 iso14755buf = 0; 1757 iso14755buf = 0;
1792# if ENABLE_OVERLAY 1758# if ISO_14755
1793 scr_overlay_off (); 1759 scr_overlay_off ();
1794# endif 1760# endif
1795 } 1761 }
1796#endif 1762#endif
1797#if USE_XIM 1763#if USE_XIM
1798 if (Input_Context != NULL) 1764 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context); 1765 XUnsetICFocus (Input_Context);
1800#endif 1766#endif
1801#if CURSOR_BLINK 1767#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
1803 cursor_blink_ev.stop (); 1769 cursor_blink_ev.stop ();
1804 hidden_cursor = 0; 1770 hidden_cursor = 0;
1805#endif 1771#endif
1806#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
… …
1811 } 1777 }
1812#endif 1778#endif
1813 } 1779 }
1814} 1780}
1815 1781
1816#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1817void 1796void
1818rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1798{
1820 SET_R (this); 1799 make_current ();
1821 SET_LOCALE (locale);
1822 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1823 switch (ev.type) 1806 switch (ev.type)
1824 { 1807 {
1825 case PropertyNotify: 1808 case PropertyNotify:
1826 /* 1809 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1829 */ 1812 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1815 {
1833 1816 bgPixmap.set_root_pixmap ();
1834 /* FALLTHROUGH */ 1817 update_background ();
1835 case ReparentNotify: 1818 }
1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1819 break;
1839 } 1820 }
1821# endif
1840} 1822}
1841#endif 1823#endif
1842 1824
1843void 1825void
1844rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
… …
1853 /* 1835 /*
1854 * VT window processing of button press 1836 * VT window processing of button press
1855 */ 1837 */
1856 if (ev.window == vt) 1838 if (ev.window == vt)
1857 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1858#if ISO_14755 1843#if ISO_14755
1859 // 5.4 1844 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1846 {
1862 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
… …
1904 else 1889 else
1905 { 1890 {
1906 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1908 1893
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1894 switch (ev.button)
1911 { 1895 {
1912 case Button1: 1896 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1901#else
1918 selection.rect = false; 1902 selection.rect = false;
1919#endif 1903#endif
1920 1904
1921 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1907 {
1924 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1926 else 1910 else
1927 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1928 } 1912 }
1929 else 1913 else
1930 { 1914 {
1931 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1916 MEvent.clicks++;
1933 else 1917 else
1934 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1935 1919
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1921 }
1938 1922
1939 MEvent.button = Button1; 1923 MEvent.button = Button1;
1940 break; 1924 break;
1941 1925
1942 case Button3: 1926 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1945 else 1929 else
1946 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1947 1931
1948 MEvent.button = Button3; 1932 MEvent.button = Button3;
1949 break; 1933 break;
1950 } 1934 }
1951 } 1935 }
1952 1936
1953 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1954 return; 1938 return;
1955 } 1939 }
1956 1940
… …
2095 } 2079 }
2096 } 2080 }
2097 2081
2098 return; 2082 return;
2099 } 2083 }
2100
2101#if MENUBAR
2102 /*
2103 * Menubar window processing of button press
2104 */
2105 if (isMenuBarWindow (ev.window))
2106 menubar_control (ev);
2107#endif
2108} 2084}
2109 2085
2110void 2086void
2111rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2112{ 2088{
… …
2118 2094
2119 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2120 { 2096 {
2121 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2122 scrollbar_show (0); 2098 scrollbar_show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2099 }
2127 2100
2128#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2131#endif 2104#endif
2132 2105
2133 if (ev.window == vt) 2106 if (ev.window == vt)
2134 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2135#if ISO_14755 2111#if ISO_14755
2136 // 5.4 2112 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2114 return;
2139#endif 2115#endif
2116
2140 if (reportmode) 2117 if (reportmode)
2141 { 2118 {
2142 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2121 if (ev.button >= 4)
… …
2168 if (priv_modes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2146 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
2172 2149
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2150 switch (ev.button)
2177 { 2151 {
2178 case Button1: 2152 case Button1:
2179 case Button3: 2153 case Button3:
2180 selection_make (ev.time); 2154 selection_make (ev.time);
2181 break; 2155 break;
2156
2182 case Button2: 2157 case Button2:
2183 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2184 break; 2160 break;
2161
2185#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2186 case Button4: 2163 case Button4:
2187 case Button5: 2164 case Button5:
2188 { 2165 {
2189 int i; 2166 int i;
… …
2191 2168
2192 v = ev.button == Button4 ? UP : DN; 2169 v = ev.button == Button4 ? UP : DN;
2193 2170
2194 if (ev.state & ShiftMask) 2171 if (ev.state & ShiftMask)
2195 i = 1; 2172 i = 1;
2196 else if (OPTION (Opt_mouseWheelScrollPage)) 2173 else if (option (Opt_mouseWheelScrollPage))
2197 i = nrow - 1; 2174 i = nrow - 1;
2198 else 2175 else
2199 i = 5; 2176 i = 5;
2200 2177
2201# ifdef MOUSE_SLIP_WHEELING 2178# ifdef MOUSE_SLIP_WHEELING
… …
2211 slip_wheel_ev.start (); 2188 slip_wheel_ev.start ();
2212 } 2189 }
2213 else 2190 else
2214 { 2191 {
2215# endif 2192# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2193 scr_page (v, i);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2194 scrollbar_show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
2229 } 2196 }
2230#endif 2197# endif
2231 } 2198 }
2232 break; 2199 break;
2233#endif 2200#endif
2234 } 2201 }
2235 } 2202 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2203}
2241
2242#ifdef TRANSPARENT
2243#if TINTING
2244/* taken from aterm-0.4.2 */
2245
2246typedef uint32_t RUINT32T;
2247
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{
2250 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i;
2256
2257 Visual *visual = display->visual;
2258
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260
2261 /* for convenience */
2262 mask_r = visual->red_mask;
2263 mask_g = visual->green_mask;
2264 mask_b = visual->blue_mask;
2265
2266 /* boring lookup table pre-initialization */
2267 switch (srcImage->bits_per_pixel) {
2268 case 15:
2269 if ((mask_r != 0x7c00) ||
2270 (mask_g != 0x03e0) ||
2271 (mask_b != 0x001f))
2272 return;
2273 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2274 lookup_r = lookup;
2275 lookup_g = lookup+32;
2276 lookup_b = lookup+32+32;
2277 sh_r = 10;
2278 sh_g = 5;
2279 sh_b = 0;
2280 break;
2281 case 16:
2282 if ((mask_r != 0xf800) ||
2283 (mask_g != 0x07e0) ||
2284 (mask_b != 0x001f))
2285 return;
2286 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2287 lookup_r = lookup;
2288 lookup_g = lookup+32;
2289 lookup_b = lookup+32+64;
2290 sh_r = 11;
2291 sh_g = 5;
2292 sh_b = 0;
2293 break;
2294 case 24:
2295 if ((mask_r != 0xff0000) ||
2296 (mask_g != 0x00ff00) ||
2297 (mask_b != 0x0000ff))
2298 return;
2299 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2300 lookup_r = lookup;
2301 lookup_g = lookup+256;
2302 lookup_b = lookup+256+256;
2303 sh_r = 16;
2304 sh_g = 8;
2305 sh_b = 0;
2306 break;
2307 case 32:
2308 if ((mask_r != 0xff0000) ||
2309 (mask_g != 0x00ff00) ||
2310 (mask_b != 0x0000ff))
2311 return;
2312 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2313 lookup_r = lookup;
2314 lookup_g = lookup+256;
2315 lookup_b = lookup+256+256;
2316 sh_r = 16;
2317 sh_g = 8;
2318 sh_b = 0;
2319 break;
2320 default:
2321 return; /* we do not support this color depth */
2322 }
2323
2324 /* prepare limits for color transformation (each channel is handled separately) */
2325 if (shade < 0) {
2326 shade = -shade;
2327 if (shade < 0) shade = 0;
2328 if (shade > 100) shade = 100;
2329
2330 lower_lim_r = 65535-rm;
2331 lower_lim_g = 65535-gm;
2332 lower_lim_b = 65535-bm;
2333
2334 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2335 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2336 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2337
2338 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2339 } else {
2340 if (shade < 0) shade = 0;
2341 if (shade > 100) shade = 100;
2342
2343 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2344
2345 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2346 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2347 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2348 }
2349
2350 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2351 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2352 {
2353 unsigned int tmp;
2354
2355 tmp = lower_lim_r;
2356 lower_lim_r = lower_lim_b;
2357 lower_lim_b = tmp;
2358
2359 tmp = upper_lim_r;
2360 upper_lim_r = upper_lim_b;
2361 upper_lim_b = tmp;
2362 }
2363
2364 /* fill our lookup tables */
2365 for (i = 0; i <= mask_r>>sh_r; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2369 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2370 lookup_r[i] = (tmp/65535)<<sh_r;
2371 }
2372 for (i = 0; i <= mask_g>>sh_g; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2376 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2377 lookup_g[i] = (tmp/65535)<<sh_g;
2378 }
2379 for (i = 0; i <= mask_b>>sh_b; i++)
2380 {
2381 RUINT32T tmp;
2382 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2383 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2384 lookup_b[i] = (tmp/65535)<<sh_b;
2385 }
2386
2387 /* apply table to input image (replacing colors by newly calculated ones) */
2388 switch (srcImage->bits_per_pixel)
2389 {
2390 case 15:
2391 {
2392 unsigned short *p1, *pf, *p, *pl;
2393 p1 = (unsigned short *) srcImage->data;
2394 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0x7c00)>>10] |
2402 lookup_g[(*p & 0x03e0)>> 5] |
2403 lookup_b[(*p & 0x001f)];
2404 }
2405 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 16:
2410 {
2411 unsigned short *p1, *pf, *p, *pl;
2412 p1 = (unsigned short *) srcImage->data;
2413 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414 while (p1 < pf)
2415 {
2416 p = p1;
2417 pl = p1 + srcImage->width;
2418 for (; p < pl; p++)
2419 {
2420 *p = lookup_r[(*p & 0xf800)>>11] |
2421 lookup_g[(*p & 0x07e0)>> 5] |
2422 lookup_b[(*p & 0x001f)];
2423 }
2424 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2425 }
2426 break;
2427 }
2428 case 24:
2429 {
2430 unsigned char *p1, *pf, *p, *pl;
2431 p1 = (unsigned char *) srcImage->data;
2432 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2433 while (p1 < pf)
2434 {
2435 p = p1;
2436 pl = p1 + srcImage->width * 3;
2437 for (; p < pl; p += 3)
2438 {
2439 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2440 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2441 p[2] = lookup_r[(p[2] & 0x0000ff)];
2442 }
2443 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2444 }
2445 break;
2446 }
2447 case 32:
2448 {
2449 RUINT32T *p1, *pf, *p, *pl;
2450 p1 = (RUINT32T *) srcImage->data;
2451 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2452
2453 while (p1 < pf)
2454 {
2455 p = p1;
2456 pl = p1 + srcImage->width;
2457 for (; p < pl; p++)
2458 {
2459 *p = lookup_r[(*p & 0xff0000)>>16] |
2460 lookup_g[(*p & 0x00ff00)>> 8] |
2461 lookup_b[(*p & 0x0000ff)] |
2462 (*p & ~0xffffff);
2463 }
2464 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2465 }
2466 break;
2467 }
2468 }
2469
2470 free (lookup);
2471}
2472#endif
2473
2474/*
2475 * Check our parents are still who we think they are.
2476 * Do transparency updates if required
2477 */
2478int
2479rxvt_term::check_our_parents ()
2480{
2481 int i, pchanged, aformat, have_pixmap, rootdepth;
2482 unsigned long nitems, bytes_after;
2483 Atom atype;
2484 unsigned char *prop = NULL;
2485 Window root, oldp, *list;
2486 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2489
2490 pchanged = 0;
2491
2492 if (!OPTION (Opt_transparent))
2493 return pchanged; /* Don't try any more */
2494
2495 XGetWindowAttributes (disp, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth;
2497
2498 XGetWindowAttributes (disp, parent[0], &wattr);
2499
2500 if (rootdepth != wattr.depth)
2501 {
2502 if (am_transparent)
2503 {
2504 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0;
2507 }
2508
2509 return pchanged; /* Don't try any more */
2510 }
2511
2512 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False);
2514
2515 /*
2516 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that.
2519 */
2520 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success);
2524
2525 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success);
2530
2531 if (!i || prop == NULL
2532#if TINTING
2533 || !rs[Rs_color + Color_tint]
2534#endif
2535 )
2536 have_pixmap = 0;
2537 else
2538 {
2539 have_pixmap = 1;
2540 rootpixmap = *(Pixmap *)prop;
2541 XFree (prop);
2542 }
2543
2544 if (have_pixmap)
2545 {
2546 /*
2547 * Copy display->root pixmap transparency
2548 */
2549 int sx, sy, nx, ny;
2550 unsigned int nw, nh;
2551 Window cr;
2552 XImage *image;
2553 GC gc;
2554 XGCValues gcvalue;
2555
2556 XTranslateCoordinates (disp, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height;
2560 nx = ny = 0;
2561
2562 if (sx < 0)
2563 {
2564 nw += sx;
2565 nx = -sx;
2566 sx = 0;
2567 }
2568
2569 if (sy < 0)
2570 {
2571 nh += sy;
2572 ny = -sy;
2573 sy = 0;
2574 }
2575
2576 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578
2579 XSync (disp, False);
2580 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */
2585 allowedxerror = 0;
2586
2587 if (image == NULL)
2588 {
2589 if (am_transparent && am_pixmap_trans)
2590 {
2591 pchanged = 1;
2592 if (pixmap != None)
2593 {
2594 XFreePixmap (disp, pixmap);
2595 pixmap = None;
2596 }
2597 }
2598
2599 am_pixmap_trans = 0;
2600 }
2601 else
2602 {
2603 if (pixmap != None)
2604 XFreePixmap (disp, pixmap);
2605
2606#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint))
2608 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2613
2614 ShadeXImage (display, image, shade, rm, gm, bm);
2615 }
2616#endif
2617
2618 pixmap = XCreatePixmap (disp, vt,
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc);
2624 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]);
2627
2628 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1;
2630
2631 am_transparent = am_pixmap_trans = 1;
2632 }
2633 }
2634
2635 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2637 else
2638 {
2639 unsigned int n;
2640 /*
2641 * InheritPixmap transparency
2642 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 {
2645 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root,
2647 &parent[i], &list, &n);
2648 XFree (list);
2649
2650 if (parent[i] == display->root)
2651 {
2652 if (oldp != None)
2653 pchanged = 1;
2654
2655 break;
2656 }
2657
2658 if (oldp != parent[i])
2659 pchanged = 1;
2660 }
2661
2662 n = 0;
2663
2664 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++)
2667 {
2668 XGetWindowAttributes (disp, parent[n], &wattr);
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break;
2673 }
2674 }
2675 }
2676
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2678 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */
2683 }
2684 else
2685 {
2686#if WAIT_FOR_WM
2687 /* wait (an arbitrary period) for the WM to do its thing
2688 * needed for fvwm2.2.2 (and before?) */
2689 sleep (1);
2690#endif
2691 for (n = 0; n < (unsigned int)i; n++)
2692 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]);
2695 }
2696
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2698 am_transparent = 1;
2699 }
2700
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None;
2703 }
2704
2705 if (scrollBar.win)
2706 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle ();
2709 scrollbar_show (0);
2710 }
2711
2712 if (am_transparent)
2713 {
2714 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans)
2716 flush ();
2717 }
2718
2719 return pchanged;
2720}
2721#endif
2722 2204
2723/*}}} */ 2205/*}}} */
2724 2206
2725bool 2207bool
2726rxvt_term::cmd_parse () 2208rxvt_term::cmd_parse ()
2727{ 2209{
2728 bool flag = false; 2210 bool flag = false;
2729 unicode_t ch = NOCHAR; 2211 wchar_t ch = NOCHAR;
2730 char *seq_begin; // remember start of esc-sequence here 2212 char *seq_begin; // remember start of esc-sequence here
2731 2213
2732 for (;;) 2214 for (;;)
2733 { 2215 {
2734 if (ch == NOCHAR) 2216 if (ch == NOCHAR)
… …
2755 if (seen_resize && cmd_pid) 2237 if (seen_resize && cmd_pid)
2756 kill (-cmd_pid, SIGWINCH); 2238 kill (-cmd_pid, SIGWINCH);
2757 } 2239 }
2758 2240
2759 /* Read a text string from the input buffer */ 2241 /* Read a text string from the input buffer */
2760 unicode_t buf[UBUFSIZ]; 2242 wchar_t buf[UBUFSIZ];
2761 bool refreshnow = false; 2243 bool refreshnow = false;
2762 int nlines = 0; 2244 int nlines = 0;
2763 unicode_t *str = buf; 2245 wchar_t *str = buf;
2764 unicode_t *eol = str + min (ncol, UBUFSIZ); 2246 wchar_t *eol = str + min (ncol, UBUFSIZ);
2765 2247
2766 for (;;) 2248 for (;;)
2767 { 2249 {
2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2769 break; 2251 break;
… …
2775 if (ch == C0_LF) 2257 if (ch == C0_LF)
2776 nlines++; 2258 nlines++;
2777 2259
2778 refresh_count++; 2260 refresh_count++;
2779 2261
2780 if (!OPTION (Opt_jumpScroll) 2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2781 || (refresh_count >= refresh_limit * (nrow - 1)))
2782 { 2263 {
2783 refreshnow = true;
2784 refresh_count = 0; 2264 refresh_count = 0;
2265
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2267 {
2268 refreshnow = true;
2785 ch = NOCHAR; 2269 ch = NOCHAR;
2786 break; 2270 break;
2271 }
2787 } 2272 }
2788 2273
2789 // scr_add_lines only works for nlines <= nrow - 1. 2274 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2275 if (nlines >= nrow - 1)
2791 { 2276 {
2277 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2278 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, nlines, str - buf); 2279 scr_add_lines (buf, str - buf, nlines);
2794 2280
2795 nlines = 0; 2281 nlines = 0;
2796 str = buf; 2282 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2283 eol = str + min (ncol, UBUFSIZ);
2798 } 2284 }
… …
2812 2298
2813 seq_begin = cmdbuf_ptr; 2299 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2300 ch = next_char ();
2815 } 2301 }
2816 2302
2303 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2304 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818 scr_add_lines (buf, nlines, str - buf); 2305 scr_add_lines (buf, str - buf, nlines);
2819 2306
2820 /* 2307 /*
2821 * If there have been a lot of new lines, then update the screen 2308 * If there have been a lot of new lines, then update the screen
2822 * What the heck I'll cheat and only refresh less than every page-full. 2309 * What the heck we'll cheat and only refresh less than every page-full.
2823 * the number of pages between refreshes is refresh_limit, which 2310 * if skipScroll is enabled.
2824 * is incremented here because we must be doing flat-out scrolling.
2825 */ 2311 */
2826 if (refreshnow) 2312 if (refreshnow)
2827 { 2313 {
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++;
2830 else
2831 {
2832 flag = true; 2314 flag = true;
2833 scr_refresh (refresh_type); 2315 scr_refresh ();
2834 flush_ev.stop (); 2316 want_refresh = 1;
2835 }
2836 } 2317 }
2837 2318
2838 } 2319 }
2839 else 2320 else
2840 { 2321 {
… …
2854 } 2335 }
2855 2336
2856 return flag; 2337 return flag;
2857} 2338}
2858 2339
2859// read the next octet
2860unicode_t
2861rxvt_term::next_octet ()
2862{
2863 return cmdbuf_ptr < cmdbuf_endp
2864 ? *cmdbuf_ptr++
2865 : NOCHAR;
2866}
2867
2868// read the next character 2340// read the next character
2869unicode_t 2341wchar_t
2870rxvt_term::next_char () 2342rxvt_term::next_char () NOTHROW
2871{ 2343{
2872 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2873 { 2345 {
2874 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2875 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2884 cmdbuf_ptr = cmdbuf_endp; 2356 cmdbuf_ptr = cmdbuf_endp;
2885 break; 2357 break;
2886 } 2358 }
2887 2359
2888 if (len == (size_t)-1) 2360 if (len == (size_t)-1)
2889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2890 2362
2891 // assume wchar == unicode 2363 // assume wchar == unicode
2892 cmdbuf_ptr += len; 2364 cmdbuf_ptr += len;
2893 return wc & UNICODE_MASK; 2365 return wc & UNICODE_MASK;
2894 } 2366 }
2895 2367
2896 return NOCHAR; 2368 return NOCHAR;
2897} 2369}
2370
2371// read the next octet
2372uint32_t
2373rxvt_term::next_octet () NOTHROW
2374{
2375 return cmdbuf_ptr < cmdbuf_endp
2376 ? (unsigned char)*cmdbuf_ptr++
2377 : NOCHAR;
2378}
2379
2380static class out_of_input out_of_input;
2898 2381
2899/* rxvt_cmd_getc () - Return next input character */ 2382/* rxvt_cmd_getc () - Return next input character */
2900/* 2383/*
2901 * Return the next input character after first passing any keyboard input 2384 * Return the next input character after first passing any keyboard input
2902 * to the command. 2385 * to the command.
2903 */ 2386 */
2904unicode_t 2387wchar_t
2905rxvt_term::cmd_getc () 2388rxvt_term::cmd_getc () THROW ((class out_of_input))
2906{ 2389{
2907 unicode_t c = next_char (); 2390 wchar_t c = next_char ();
2908 2391
2909 if (c == NOCHAR) 2392 if (c == NOCHAR)
2910 throw out_of_input; 2393 throw out_of_input;
2911 2394
2912 return c; 2395 return c;
2913} 2396}
2914 2397
2915unicode_t 2398uint32_t
2916rxvt_term::cmd_get8 () 2399rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 2400{
2918 unicode_t c = next_octet (); 2401 uint32_t c = next_octet ();
2919 2402
2920 if (c == NOCHAR) 2403 if (c == NOCHAR)
2921 throw out_of_input; 2404 throw out_of_input;
2922 2405
2923 return c; 2406 return c;
… …
2987 { 2470 {
2988 if ((buf[len++] = cmd_getc ()) == 'i') 2471 if ((buf[len++] = cmd_getc ()) == 'i')
2989 break; /* done = 1 */ 2472 break; /* done = 1 */
2990 } 2473 }
2991 } 2474 }
2992 2475
2993 for (i = 0; i < len; i++) 2476 for (i = 0; i < len; i++)
2994 if (putc (buf[i], fd) == EOF) 2477 if (putc (buf[i], fd) == EOF)
2995 { 2478 {
2996 done = 1; 2479 done = 1;
2997 break; 2480 break;
… …
3059 process_dcs_seq (); 2542 process_dcs_seq ();
3060 break; 2543 break;
3061 case 0x9b: /* CSI */ 2544 case 0x9b: /* CSI */
3062 process_csi_seq (); 2545 process_csi_seq ();
3063 break; 2546 break;
3064 case 0x9d: /* CSI */ 2547 case 0x9d: /* OSC */
3065 process_osc_seq (); 2548 process_osc_seq ();
3066 break; 2549 break;
3067#endif 2550#endif
3068 } 2551 }
3069} 2552}
… …
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 2642 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 2643 break;
3161 case '+': 2644 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 2645 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 2646 break;
3164#if ENABLE_FRILLS 2647#if !ENABLE_MINIMAL
3165 case '6': 2648 case '6':
3166 scr_backindex (); 2649 scr_backindex ();
3167 break; 2650 break;
3168#endif 2651#endif
3169 case '7': 2652 case '7':
3170 scr_cursor (SAVE); 2653 scr_cursor (SAVE);
3171 break; 2654 break;
3172 case '8': 2655 case '8':
3173 scr_cursor (RESTORE); 2656 scr_cursor (RESTORE);
3174 break; 2657 break;
3175#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3176 case '9': 2659 case '9':
3177 scr_forwardindex (); 2660 scr_forwardindex ();
3178 break; 2661 break;
3179#endif 2662#endif
3180 case '=': 2663 case '=':
… …
3190 break; 2673 break;
3191 2674
3192 /* 8.3.87: NEXT LINE */ 2675 /* 8.3.87: NEXT LINE */
3193 case C1_NEL: /* ESC E */ 2676 case C1_NEL: /* ESC E */
3194 { 2677 {
3195 unicode_t nlcr[] = { C0_LF, C0_CR }; 2678 wchar_t nlcr[] = { C0_LF, C0_CR };
3196 scr_add_lines (nlcr, 1, 2); 2679 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3197 } 2680 }
3198 break; 2681 break;
3199 2682
3200 /* kidnapped escape sequence: Should be 8.3.48 */ 2683 /* kidnapped escape sequence: Should be 8.3.48 */
3201 case C1_ESA: /* ESC G */ 2684 case C1_ESA: /* ESC G */
… …
3295rxvt_term::process_csi_seq () 2778rxvt_term::process_csi_seq ()
3296{ 2779{
3297 unicode_t ch, priv, i; 2780 unicode_t ch, priv, i;
3298 unsigned int nargs, p; 2781 unsigned int nargs, p;
3299 int n, ndef; 2782 int n, ndef;
3300 int arg[ESC_ARGS]; 2783 int arg[ESC_ARGS] = { };
3301 2784
3302 for (nargs = ESC_ARGS; nargs > 0;) 2785 nargs = 0;
3303 arg[--nargs] = 0;
3304 2786
3305 priv = 0; 2787 priv = 0;
3306 ch = cmd_getc (); 2788 ch = cmd_getc ();
3307 if (ch >= '<' && ch <= '?') 2789 if (ch >= '<' && ch <= '?')
3308 { /* '<' '=' '>' '?' */ 2790 { /* '<' '=' '>' '?' */
… …
3342 ndef = get_byte_array_bit (csi_defaults, i); 2824 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 2825 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 2826 if (arg[p] == -1)
3345 arg[p] = ndef; 2827 arg[p] = ndef;
3346 2828
3347#ifdef DEBUG_CMD
3348 fprintf (stderr, "CSI ");
3349 for (p = 0; p < nargs; p++)
3350 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351 fprintf (stderr, "%c\n", ch);
3352#endif
3353
3354 /* 2829 /*
3355 * private mode handling 2830 * private mode handling
3356 */ 2831 */
3357 if (priv) 2832 if (priv)
3358 { 2833 {
3359 switch (priv) 2834 switch (priv)
3360 { 2835 {
3361 case '>': 2836 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 2837 if (ch == CSI_DA) /* secondary device attributes */
3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2838 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2844 // that we do not support xterm mouse reporting (should be 95 when we do).
2845 //
2846 tt_printf ("\033[>%d;94;0c", 'U');
2847 }
3364 break; 2848 break;
3365 case '?': 2849 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 2852 break;
… …
3494 break; 2978 break;
3495 case 6: /* CPR requested */ 2979 case 6: /* CPR requested */
3496 scr_report_position (); 2980 scr_report_position ();
3497 break; 2981 break;
3498 case 7: /* unofficial extension */ 2982 case 7: /* unofficial extension */
3499 if (OPTION (Opt_insecure)) 2983 if (option (Opt_insecure))
3500 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2984 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3501 break; 2985 break;
3502 case 8: /* unofficial extension */ 2986 case 8: /* unofficial extension */
3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2987 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3504 break; 2988 break;
… …
3571 break; 3055 break;
3572 case CSI_75: 3056 case CSI_75:
3573 scr_cursor (RESTORE); 3057 scr_cursor (RESTORE);
3574 break; 3058 break;
3575 3059
3576#if ENABLE_FRILLS 3060#if !ENABLE_MINIMAL
3577 case CSI_74: 3061 case CSI_74:
3578 process_window_ops (arg, nargs); 3062 process_window_ops (arg, nargs);
3579 break; 3063 break;
3580#endif 3064#endif
3581 3065
… …
3588 break; 3072 break;
3589 } 3073 }
3590} 3074}
3591/*}}} */ 3075/*}}} */
3592 3076
3593#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3594/* ARGSUSED */ 3078/* ARGSUSED */
3595void 3079void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3080rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3081{
3598 int x, y; 3082 int x, y;
3599 XWindowAttributes wattr; 3083 XWindowAttributes wattr;
3600 Window wdummy; 3084 Window wdummy;
3601 dDisp; 3085
3086 dLocal (Display *, dpy);
3602 3087
3603 if (nargs == 0) 3088 if (nargs == 0)
3604 return; 3089 return;
3605 3090
3606 switch (args[0]) 3091 switch (args[0])
3607 { 3092 {
3608 /* 3093 /*
3609 * commands 3094 * commands
3610 */ 3095 */
3611 case 1: /* deiconify window */ 3096 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3097 XMapWindow (dpy, parent[0]);
3613 break; 3098 break;
3614 case 2: /* iconify window */ 3099 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3100 XIconifyWindow (dpy, parent[0], display->screen);
3616 break; 3101 break;
3617 case 3: /* set position (pixels) */ 3102 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3103 XMoveWindow (dpy, parent[0], args[1], args[2]);
3619 break; 3104 break;
3620 case 4: /* set size (pixels) */ 3105 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3106 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3107 break;
3623 case 5: /* raise window */ 3108 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3109 XRaiseWindow (dpy, parent[0]);
3625 break; 3110 break;
3626 case 6: /* lower window */ 3111 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3112 XLowerWindow (dpy, parent[0]);
3628 break; 3113 break;
3629 case 7: /* refresh window */ 3114 case 7: /* refresh window */
3630 scr_touch (true); 3115 scr_touch (true);
3631 break; 3116 break;
3632 case 8: /* set size (chars) */ 3117 case 8: /* set size (chars) */
… …
3639 if (args[0] >= 24) /* set height (chars) */ 3124 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3125 set_widthheight ((unsigned int)width,
3641 (unsigned int) (args[1] * fheight)); 3126 (unsigned int) (args[1] * fheight));
3642 break; 3127 break;
3643 3128
3644
3645 /* 3129 /*
3646 * reports - some output format copied from XTerm 3130 * reports - some output format copied from XTerm
3647 */ 3131 */
3648 case 11: /* report window state */ 3132 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3133 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3134 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3135 break;
3652 case 13: /* report window position */ 3136 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3138 XTranslateCoordinates (dpy, parent[0], wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3139 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3140 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3141 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3142 break;
3659 case 14: /* report window size (pixels) */ 3143 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3145 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3146 break;
3663 case 18: /* report text area size (chars) */ 3147 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3148 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3149 break;
… …
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3152 break;
3669 case 20: /* report icon label */ 3153 case 20: /* report icon label */
3670 { 3154 {
3671 char *s; 3155 char *s;
3672 XGetIconName (disp, parent[0], &s); 3156 XGetIconName (dpy, parent[0], &s);
3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s); 3158 XFree (s);
3675 } 3159 }
3676 break; 3160 break;
3677 case 21: /* report window title */ 3161 case 21: /* report window title */
3678 { 3162 {
3679 char *s; 3163 char *s;
3680 XFetchName (disp, parent[0], &s); 3164 XFetchName (dpy, parent[0], &s);
3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3165 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s); 3166 XFree (s);
3683 } 3167 }
3684 break; 3168 break;
3685 } 3169 }
3686} 3170}
… …
3713 seen_esc = true; 3197 seen_esc = true;
3714 continue; 3198 continue;
3715 } 3199 }
3716 else if (ch == C0_BEL || ch == CHAR_ST) 3200 else if (ch == C0_BEL || ch == CHAR_ST)
3717 break; 3201 break;
3202 else if (ch == C0_SYN)
3203 ch = cmd_get8 ();
3718 else if (ch < 0x20) 3204 else if (ch < 0x20)
3719 return NULL; /* other control character - exit */ 3205 return NULL; /* other control character - exit */
3720 3206
3721 seen_esc = false; 3207 seen_esc = false;
3722 3208
3723 if (n >= STRING_MAX - 1) 3209 if (n >= STRING_MAX - 1)
3724 // stop at some sane length 3210 // stop at some sane length
3725 return NULL; 3211 return NULL;
3726 3212
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
3730 string[n++] = ch; 3213 string[n++] = ch;
3731 } 3214 }
3732 3215
3733 string[n++] = '\0'; 3216 string[n++] = '\0';
3734 3217
3735 ends_how = (ch == 0x5c ? C0_ESC : ch); 3218 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3786void 3269void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3270rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{ 3271{
3789 if (str[0] == '?' && !str[1]) 3272 if (str[0] == '?' && !str[1])
3790 { 3273 {
3791 unsigned short r, g, b; 3274 rgba c;
3792 pix_colors_focused[color].get (display, r, g, b); 3275 pix_colors_focused[color].get (c);
3276
3277#if XFT
3278 if (c.a != rgba::MAX_CC)
3279 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3280 else
3281#endif
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3282 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794 } 3283 }
3795 else 3284 else
3796 set_window_color (color, str); 3285 set_window_color (color, str);
3797} 3286}
3798 3287
… …
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3290 */
3802void 3291void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3292rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804{ 3293{
3805 int changed = 0;
3806 int color; 3294 int color;
3807 char *buf, *name; 3295 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3296 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3297 int saveop = op;
3810 dDisp; 3298
3299 dLocal (Display *, dpy);
3811 3300
3812 assert (str != NULL); 3301 assert (str != NULL);
3302
3303 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3304 return;
3305
3813 switch (op) 3306 switch (op)
3814 { 3307 {
3815 case XTerm_name: 3308 case XTerm_name:
3816 set_title (str); 3309 set_title (str);
3817 /* FALLTHROUGH */ 3310 /* FALLTHROUGH */
… …
3831 unsigned long bytes_after; 3324 unsigned long bytes_after;
3832 unsigned char *value = 0; 3325 unsigned char *value = 0;
3833 const char *str = ""; 3326 const char *str = "";
3834 3327
3835 if (prop 3328 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3329 && XGetWindowProperty (dpy, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3330 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3331 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3332 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3333 && actual_type != None
3841 && actual_format == 8) 3334 && actual_format == 8)
3842 str = (const char *)(value); 3335 str = (const char *)(value);
3843 3336
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3337 tt_printf ("\033]%d;%s%c", op, str, resp);
3845 3338
3846 XFree (value); 3339 XFree (value);
3847 } 3340 }
3848 else 3341 else
3849 { 3342 {
… …
3853 { 3346 {
3854 *eq = 0; 3347 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 3348 set_utf8_property (display->atom (str), eq + 1);
3856 } 3349 }
3857 else 3350 else
3858 XDeleteProperty (disp, parent[0], 3351 XDeleteProperty (dpy, parent[0],
3859 display->atom (str)); 3352 display->atom (str));
3860 } 3353 }
3861 break; 3354 break;
3862 3355
3863 case XTerm_Color: 3356 case XTerm_Color:
… …
3865 { 3358 {
3866 if ((name = strchr (buf, ';')) == NULL) 3359 if ((name = strchr (buf, ';')) == NULL)
3867 break; 3360 break;
3868 3361
3869 *name++ = '\0'; 3362 *name++ = '\0';
3870 color = atoi (buf); 3363 color = atoi (buf) + minCOLOR;
3871 3364
3872 if (color < 0 || color >= TOTAL_COLORS) 3365 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 3366 break;
3874 3367
3875 if ((buf = strchr (name, ';')) != NULL) 3368 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 3369 *buf++ = '\0';
3877 3370
3878 if (name[0] == '?' && !name[1]) 3371 process_color_seq (op, color, name, resp);
3879 {
3880 unsigned short r, g, b;
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883 }
3884 else
3885 set_window_color (color + minCOLOR, name);
3886 } 3372 }
3887 break; 3373 break;
3888 case XTerm_Color00: 3374 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3890 break; 3376 break;
3891 case XTerm_Color01: 3377 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3378 process_color_seq (op, Color_bg, str, resp);
3893 break; 3379 break;
3894#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3382 process_color_seq (op, Color_cursor, str, resp);
3897 break; 3383 break;
3898#endif 3384#endif
3899 case XTerm_Color_pointer_fg: 3385 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3386 process_color_seq (op, Color_pointer_fg, str, resp);
3901 break; 3387 break;
3902 case XTerm_Color_pointer_bg: 3388 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3389 process_color_seq (op, Color_pointer_bg, str, resp);
3904 break; 3390 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE 3391#ifndef NO_BOLD_UNDERLINE_REVERSE
3906 case XTerm_Color_BD:
3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908 break;
3909 case XTerm_Color_UL:
3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911 break;
3912 case XTerm_Color_RV: 3392 case XTerm_Color_RV:
3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp);
3398 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp);
3914 break; 3402 break;
3915 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3917 break; 3405 break;
3918#endif 3406#endif
3919#if TRANSPARENT && TINTING 3407#if ENABLE_TRANSPARENCY
3920 case URxvt_Color_tint: 3408 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3409 process_color_seq (op, Color_tint, str, resp);
3922 check_our_parents (); 3410 {
3923 if (am_transparent) 3411 bool changed = false;
3924 want_full_refresh = want_refresh = 1; 3412 if (ISSET_PIXCOLOR (Color_tint))
3925 break; 3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3926#endif 3414 else
3415 changed = bgPixmap.unset_tint ();
3416 if (changed)
3417 update_background ();
3418 }
3927 3419
3420 break;
3421#endif
3422
3423#if BG_IMAGE_FROM_FILE
3928 case XTerm_Pixmap: 3424 case Rxvt_Pixmap:
3929 if (*str != ';') 3425 if (!strcmp (str, "?"))
3930 { 3426 {
3931#if XPM_BACKGROUND 3427 char str[256];
3932 scale_pixmap (""); /* reset to default scaling */ 3428
3933 set_bgPixmap (str); /* change pixmap */ 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3934#endif 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3935 scr_touch (true); 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3936 } 3433 }
3937 while ((str = strchr (str, ';')) != NULL) 3434 else
3938 { 3435 {
3436 int changed = 0;
3437
3438 if (*str != ';')
3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3448 while (str)
3449 {
3939 str++; 3450 str++;
3940#if XPM_BACKGROUND 3451 if (bgPixmap.set_geometry (str))
3941 changed += scale_pixmap (str); 3452 changed++;
3942#endif 3453 str = strchr (str, ';');
3454 }
3455 if (changed)
3456 update_background ();
3943 } 3457 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949#endif
3950 scr_touch (true);
3951 }
3952 break; 3458 break;
3459#endif
3953 3460
3954 case XTerm_restoreFG: 3461 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3462 set_window_color (Color_fg, str);
3956 break; 3463 break;
3957 case XTerm_restoreBG: 3464 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str); 3465 set_window_color (Color_bg, str);
3959 break; 3466 break;
3960 3467
3961 case XTerm_logfile: 3468 case XTerm_logfile:
3962 // TODO, when secure mode? 3469 // TODO, when secure mode?
3963 break; 3470 break;
3964 3471
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3472#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 3473 case Rxvt_dumpscreen: /* no error notices */
3973 { 3474 {
3974 int fd; 3475 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3476 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 { 3477 {
3977 scr_dump (fd); 3478 scr_dump (fd);
… …
3988 case URxvt_italicFont: 3489 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3490 case URxvt_boldItalicFont:
3990#endif 3491#endif
3991 if (query) 3492 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3493 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3494 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3495 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3496 resp);
3996 else 3497 else
3997 { 3498 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3499 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3502 allocated.push_back ((void *)res);
4002 set_fonts (); 3503 set_fonts ();
4003 } 3504 }
4004 break; 3505 break;
4005 3506
4006#if ENABLE_FRILLS 3507 case URxvt_version:
3508 if (query)
3509 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3510 op,
3511 rs[Rs_name], VERSION[0], VERSION[2],
3512 resp);
3513 break;
3514
3515#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3516 case URxvt_locale:
4008 if (query) 3517 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3518 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 3519 else
4011 { 3520 {
4012 set_locale (str); 3521 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3522 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3523 init_xlocale ();
4015 } 3524 }
4016 break; 3525 break;
4017 3526
4018 case URxvt_view_up: 3527 case URxvt_view_up:
… …
4029 break; 3538 break;
4030#endif 3539#endif
4031 3540
4032#if ENABLE_PERL 3541#if ENABLE_PERL
4033 case URxvt_perl: 3542 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 3544 ; // no responses yet
4036 break; 3545 break;
4037#endif 3546#endif
4038 } 3547 }
4039} 3548}
… …
4071 return state; 3580 return state;
4072} 3581}
4073 3582
4074/* we're not using priv _yet_ */ 3583/* we're not using priv _yet_ */
4075void 3584void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 3586{
4078 unsigned int i, j; 3587 unsigned int i, j;
4079 int state; 3588 int state;
4080 3589
4081 static const struct 3590 static const struct
4082 { 3591 {
4083 const int argval; 3592 const int argval;
4084 const unsigned long bit; 3593 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3594 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR },
4089 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
4090 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 },
4091 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll },
4092 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 3602 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 3604 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3608#endif
… …
4151 /* extra handling for values with state unkept */ 3655 /* extra handling for values with state unkept */
4152 switch (arg[i]) 3656 switch (arg[i])
4153 { 3657 {
4154#if ENABLE_STYLES 3658#if ENABLE_STYLES
4155 case 1021: 3659 case 1021:
4156 if (mode) 3660 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 3661
4161 scr_touch (true); 3662 scr_touch (true);
4162 break; 3663 break;
4163#endif 3664#endif
4164 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
4165 case 1049: 3666 case 1049:
4166 if (OPTION (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
4167 if (mode == 0) 3668 if (mode == 0)
4168 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
4169 else if (mode == 1) 3670 else if (mode == 1)
4170 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
4171 break; 3672 break;
… …
4186 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 3689 set_widthheight (((state ? 132 : 80) * fwidth), height);
4189 break; 3690 break;
4190 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
4191 if (!state) 3692 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 3693 break;
4196 case 5: /* reverse video */ 3694 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 3695 scr_rvideo_mode (state);
4198 break; 3696 break;
4199 case 6: /* relative/absolute origins */ 3697 case 6: /* relative/absolute origins */
… …
4205 /* case 8: - auto repeat, can't do on a per window basis */ 3703 /* case 8: - auto repeat, can't do on a per window basis */
4206 case 9: /* X10 mouse reporting */ 3704 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 3706 priv_modes &= ~PrivMode_MouseX11;
4209 break; 3707 break;
4210#ifdef menuBar_esc
4211 case menuBar_esc:
4212#ifdef MENUBAR
4213 map_menuBar (state);
4214#endif
4215 break;
4216#endif
4217#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
4218 case scrollBar_esc: 3709 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 3710 if (scrollbar_mapping (state))
4220 { 3711 {
4221 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
… …
4240#if 0 3731#if 0
4241 case 1001: 3732 case 1001:
4242 break; /* X11 mouse highlighting */ 3733 break; /* X11 mouse highlighting */
4243#endif 3734#endif
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 3735 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 3736 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 3737 break;
4250 case 1011: /* scroll to bottom on key press */ 3738 case 1011: /* scroll to bottom on key press */
4251 if (state) 3739 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 3740 break;
4256 case 1047: /* secondary screen w/ clearing last */ 3741 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 3744 scr_erase_screen (2);
4260 scr_change_screen (state); 3745 scr_change_screen (state);
4261 break; 3746 break;
4262 case 1049: /* secondary screen w/ clearing first */ 3747 case 1049: /* secondary screen w/ clearing first */
4263 scr_change_screen (state); 3748 scr_change_screen (state);
4264 if (OPTION (Opt_secondaryScreen)) 3749 if (option (Opt_secondaryScreen))
4265 if (current_screen != PRIMARY) 3750 if (current_screen != PRIMARY)
4266 scr_erase_screen (2); 3751 scr_erase_screen (2);
4267 break; 3752 break;
4268 default: 3753 default:
4269 break; 3754 break;
… …
4397 scr_color (Color_bg, Color_bg); 3882 scr_color (Color_bg, Color_bg);
4398 break; 3883 break;
4399 3884
4400 //case 50: // not variable spacing 3885 //case 50: // not variable spacing
4401 3886
4402#if ENABLE_FRILLS 3887#if !ENABLE_MINIMAL
4403 case 90: 3888 case 90:
4404 case 91: /* set bright fg color */ 3889 case 91: /* set bright fg color */
4405 case 92: 3890 case 92:
4406 case 93: 3891 case 93:
4407 case 94: 3892 case 94:
… …
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470 3955
4471void 3956void
4472rxvt_term::tt_write (const char *data, unsigned int len) 3957rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 3958{
4474 if (pty.pty < 0) 3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 3960 return;
4476 3961
3962 if (pty->pty < 0)
3963 return;
3964
4477 if (v_buflen == 0) 3965 if (v_buflen == 0)
4478 { 3966 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480 3968
4481 if ((unsigned int)written == len) 3969 if ((unsigned int)written == len)
4482 return; 3970 return;
4483 3971
4484 data += written; 3972 data += written;
… …
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 3981 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494} 3982}
4495 3983
4496void rxvt_term::pty_write () 3984void rxvt_term::pty_write ()
4497{ 3985{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499 3987
4500 if (written > 0) 3988 if (written > 0)
4501 { 3989 {
4502 v_buflen -= written; 3990 v_buflen -= written;
4503 3991
4504 if (v_buflen == 0) 3992 if (v_buflen == 0)
4505 { 3993 {
4506 free (v_buffer); 3994 free (v_buffer);
4507 v_buffer = 0; 3995 v_buffer = 0;
4508 v_buflen = 0;
4509 3996
4510 pty_ev.set (EVENT_READ); 3997 pty_ev.set (EVENT_READ);
4511 return; 3998 return;
4512 } 3999 }
4513 4000

Diff Legend

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