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.285 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
227# if !UNICODE3 225# if !UNICODE3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 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// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
… …
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 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);
509# endif
510 return;
511 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
… …
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 550 {
534 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 newlen = 1; 553 newlen = 1;
536 switch (keysym) 554 switch (keysym)
537 { 555 {
538#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 557 case XK_BackSpace:
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
545 } 563 }
546 else 564 else
547 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 566 break;
549#endif 567#endif
550#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
552 case XK_KP_Delete: 570 case XK_KP_Delete:
553 /* allow shift to override */ 571 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
555 { 573 {
556 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
557 break; 575 break;
558 } 576 }
559 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
560# endif 578# endif
561 case XK_Delete: 579 case XK_Delete:
562 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 581 break;
564#endif 582#endif
565 case XK_Tab: 583 case XK_Tab:
566 if (shft) 584 if (shft)
567 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
578 newlen = 0; 596 newlen = 0;
579 } 597 }
580 break; 598 break;
581 599
582#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
583 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
584 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 { 606 {
589 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break; 609 break;
592 } 610 }
… …
615 633
616#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
618 case XK_KP_Prior: 636 case XK_KP_Prior:
619 /* allow shift to override */ 637 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
621 { 639 {
622 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
623 break; 641 break;
624 } 642 }
625 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
628 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
629 break; 647 break;
630# ifdef XK_KP_Next 648# ifdef XK_KP_Next
631 case XK_KP_Next: 649 case XK_KP_Next:
632 /* allow shift to override */ 650 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
634 { 652 {
635 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
636 break; 654 break;
637 } 655 }
638 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
641 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
642 break; 660 break;
643#endif 661#endif
644 case XK_KP_Enter: 662 case XK_KP_Enter:
645 /* allow shift to override */ 663 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
647 { 665 {
648 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
649 break; 667 break;
650 } 668 }
651 669
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 716 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
700 { 718 {
701 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 721 }
704 else 722 else
… …
710 728
711 case XK_Find: 729 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
713 break; 731 break;
714 732
715#ifdef XK_KP_End 733#ifdef XK_KP_Insert
716 case XK_KP_Insert: 734 case XK_KP_Insert:
717 /* allow shift to override */ 735 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
719 { 737 {
720 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
721 break; 739 break;
722 } 740 }
723 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
736 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
737 break; 755 break;
738#ifdef XK_KP_End 756#ifdef XK_KP_End
739 case XK_KP_End: 757 case XK_KP_End:
740 /* allow shift to override */ 758 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
742 { 760 {
743 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
744 break; 762 break;
745 } 763 }
746 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
749 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
750 break; 768 break;
751#ifdef XK_KP_Home 769#ifdef XK_KP_Home
752 case XK_KP_Home: 770 case XK_KP_Home:
753 /* allow shift to override */ 771 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
755 { 773 {
756 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
757 break; 775 break;
758 } 776 }
759 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
… …
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 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}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
… …
941void 1035void
942rxvt_term::flush () 1036rxvt_term::flush ()
943{ 1037{
944 flush_ev.stop (); 1038 flush_ev.stop ();
945 1039
946#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
948 { 1042 {
949 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 1044 scr_touch (false);
952 } 1045 }
953#endif 1046#endif
954 1047
955 if (want_refresh) 1048 if (want_refresh)
… …
1001 1094
1002 display->flush (); 1095 display->flush ();
1003} 1096}
1004 1097
1005void 1098void
1006rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1007{ 1100{
1008 make_current (); 1101 make_current ();
1009 1102
1010 display->flush (); 1103 display->flush ();
1011 1104
1012 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1014} 1107}
1015 1108
1016void 1109void
1017rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1018{ 1111{
1019 make_current (); 1112 make_current ();
1020 1113
1021 refresh_limit = 1;
1022 refresh_count = 0; 1114 refresh_count = 0;
1023 flush (); 1115 flush ();
1024} 1116}
1025 1117
1026#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1027void 1119void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1121{
1030 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1123 want_refresh = 1;
1032
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1124}
1035#endif 1125#endif
1036 1126
1037#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1038void 1128void
1039rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1130{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1132 {
1043 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1044 want_refresh = 1; 1134 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL);
1046 } 1135 }
1047} 1136}
1048#endif 1137#endif
1049 1138
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1140void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1142{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1056 {
1057 want_refresh = 1; 1145 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1059 } 1147 w.stop ();
1060} 1148}
1061#endif 1149#endif
1062 1150
1063#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1064void 1152void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1154{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1156 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1158 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1159 }
1160 else
1161 w.stop ();
1073} 1162}
1074#endif 1163#endif
1075 1164
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1166void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1168{
1080 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1082 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1083 { 1172 {
1084 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1086 1175
1087 want_refresh = 1; 1176 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1177 }
1178 else
1179 w.stop ();
1090} 1180}
1091#endif 1181#endif
1092 1182
1093#if HAVE_SCHED_YIELD 1183#if LINUX_YIELD_HACK
1094static struct event_handler 1184static struct event_handler
1095{ 1185{
1096 check_watcher cw_yield; 1186 ev::prepare yield_ev;
1097 1187
1098 void yield (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1099 { 1189 {
1100 sched_yield (); 1190 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS.
1194
1195 struct timespec ts = { 0, 0 };
1196 nanosleep (&ts, 0);
1197
1101 w.stop (); 1198 w.stop ();
1102 } 1199 }
1103 1200
1104 event_handler () 1201 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1202 : yield_ev (this, &event_handler::yield_cb)
1106 { 1203 {
1107 } 1204 }
1108} event_handler; 1205} event_handler;
1109#endif 1206#endif
1110 1207
… …
1130 cmdbuf_endp += r; 1227 cmdbuf_endp += r;
1131 return true; 1228 return true;
1132 } 1229 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1231 {
1135#if HAVE_SCHED_YIELD 1232#if LINUX_YIELD_HACK
1136 if (display->is_local) 1233 if (display->is_local)
1137 event_handler.cw_yield.start (); 1234 event_handler.yield_ev.start ();
1138#endif 1235#endif
1139 } 1236 }
1140 else 1237 else
1141 { 1238 {
1142 pty_ev.stop (); 1239 pty_ev.stop ();
1143 1240
1144 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1145 destroy (); 1242 destroy ();
1146 } 1243 }
1147 1244
1148 return false; 1245 return false;
1149} 1246}
1150 1247
1151void 1248void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1250{
1154 make_current (); 1251 make_current ();
1155 1252
1156 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1255 while (pty_fill ())
1159 if (cmd_parse ()) 1256 if (cmd_parse ())
1160 break; 1257 break;
1161 1258
1162 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1163 pty_write (); 1260 pty_write ();
1164} 1261}
1165 1262
1166void 1263void
1167rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
1168{ 1265{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1266 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1267 recolour_cursor ();
1171 1268
1172#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1270 hidden_pointer = 0;
1174 1271
1175 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1177#endif 1274#endif
1178} 1275}
1179 1276
1180#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1181void 1278void
1182rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1183{ 1280{
1184 if (!OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1185 return; 1282 return;
1186 1283
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1285 XFlush (dpy);
1189 1286
1190 hidden_pointer = 1; 1287 hidden_pointer = 1;
1191} 1288}
1192 1289
1193void 1290void
1194rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1292{
1196 make_current (); 1293 make_current ();
1197 1294
1198 pointer_blank (); 1295 pointer_blank ();
1199} 1296}
… …
1202void 1299void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1301{
1205 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1206 int x, y; 1303 int x, y;
1304 int code = 32;
1207 1305
1208 x = ev.x; 1306 x = Pixel2Col (ev.x);
1209 y = ev.y; 1307 y = Pixel2Row (ev.y);
1210 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1211 1315
1212 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1213 button_number = 3; 1317 button_number = 3;
1214 else 1318 else
1215 { 1319 {
… …
1261 x + 1, 1365 x + 1,
1262 y + 1); 1366 y + 1);
1263#endif 1367#endif
1264 1368
1265 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1267 (32 + x + 1), 1371 (32 + x + 1),
1268 (32 + y + 1)); 1372 (32 + y + 1));
1269} 1373}
1270 1374
1271/*{{{ process an X event */ 1375/*{{{ process an X event */
1272void 1376void
1273rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
1274{ 1378{
1275 make_current (); 1379 make_current ();
1276 1380
1277 dLocal (Display *, xdisp); 1381 dLocal (Display *, dpy);
1278 1382
1279 if (ev.xany.window == vt 1383 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1386 return;
… …
1287 unsigned int unused_mask; 1391 unsigned int unused_mask;
1288 1392
1289 switch (ev.type) 1393 switch (ev.type)
1290 { 1394 {
1291 case KeyPress: 1395 case KeyPress:
1292#if ISO_14755 1396 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1397 break;
1298 1398
1299 case KeyRelease: 1399 case KeyRelease:
1300 { 1400 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1401 break;
1372 }
1373 1402
1374 case ButtonPress: 1403 case ButtonPress:
1375 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
1376 break; 1405 break;
1377 1406
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1421 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1422 destroy ();
1394 } 1423 }
1395#if ENABLE_EWMH 1424#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1428 &ev);
1400#endif 1429#endif
1401 } 1430 }
1402 } 1431 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1438 focus_out ();
1410 } 1439 }
1411#endif 1440#endif
1412 } 1441 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1442 break;
1418 1443
1419 /* 1444 /*
1420 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1440 break; 1465 break;
1441 } 1466 }
1442 break; 1467 break;
1443 1468
1444 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1473 focus_in ();
1446 break; 1474 break;
1447 1475
1448 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1480 focus_out ();
1450 break; 1481 break;
1451 1482
1452 case ConfigureNotify: 1483 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1453 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1454 { 1488 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1490 ;
1457 1491
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1493 {
1460 seen_resize = 1; 1494 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1496 }
1463 1497 else
1498 {
1499#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1502#endif
1503 }
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1470 } 1505 }
1471 break; 1506 break;
1472 1507
1473 case PropertyNotify: 1508 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1492 break; 1527 break;
1493 1528
1494 case MapNotify: 1529 case MapNotify:
1495 mapped = 1; 1530 mapped = 1;
1496#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1498#endif 1533#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1535 break;
1501 1536
1502 case UnmapNotify: 1537 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1506#endif 1541#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1543 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1544
1516 case GraphicsExpose: 1545 case GraphicsExpose:
1517 case Expose: 1546 case Expose:
1518 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1519 { 1548 {
1520 do 1549 do
1550 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1555
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1557
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1530 1562 }
1531 want_refresh = 1; 1563 want_refresh = 1;
1532 } 1564 }
1533 else 1565 else
1534 { 1566 {
1535 XEvent unused_event; 1567 XEvent unused_event;
1536 1568
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1570 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1572 ;
1541 1573
1542 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1543 { 1575 {
1544 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1545 scrollbar_show (0); 1577 scrollbar_show (0);
1546 } 1578 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1579 }
1553 break; 1580 break;
1554 1581
1555 case MotionNotify: 1582 case MotionNotify:
1556#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1584 if (hidden_pointer)
1558 pointer_unblank (); 1585 pointer_unblank ();
1559#endif 1586#endif
1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1591 break;
1562 1592
1563 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1564 { 1594 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1597 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1599 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1601 ;
1572 1602
1573 XQueryPointer (xdisp, vt, 1603 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1607 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1599 1629
1600 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1602 */ 1632 */
1603 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1635
1606 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1608 */ 1638 */
1609 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1642#endif 1672#endif
1643 } 1673 }
1644 } 1674 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1676 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1649 ; 1679 ;
1650 1680
1651 XQueryPointer (xdisp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1685 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1687 scrollbar_size ());
1658 want_refresh = 1; 1688 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1689 scrollbar_show (1);
1661 } 1690 }
1662 break; 1691 break;
1663 } 1692 }
1664 1693
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1694#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1696 {
1670 if (hidden_cursor) 1697 if (hidden_cursor)
1671 { 1698 {
1672 hidden_cursor = 0; 1699 hidden_cursor = 0;
1673 want_refresh = 1; 1700 want_refresh = 1;
1674 } 1701 }
1675 1702
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1677 } 1704 }
1678#endif 1705#endif
1679 1706
1680#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1709 {
1683 if (ev.type == MotionNotify 1710 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1711 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1712 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1713 if (hidden_pointer)
… …
1698 if (!focus) 1725 if (!focus)
1699 { 1726 {
1700 focus = 1; 1727 focus = 1;
1701 want_refresh = 1; 1728 want_refresh = 1;
1702 1729
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1731
1705#if USE_XIM 1732#if USE_XIM
1706 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1707 { 1734 {
1708 IMSetStatusPosition (); 1735 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1710 } 1737 }
1711#endif 1738#endif
1712#if CURSOR_BLINK 1739#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1715#endif 1742#endif
1716#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1718 { 1745 {
1719 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1747 scr_recolour ();
1721 } 1748 }
1722#endif 1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif
1723 } 1760 }
1724} 1761}
1725 1762
1726void 1763void
1727rxvt_term::focus_out () 1764rxvt_term::focus_out ()
… …
1735 1772
1736#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1774 if (iso14755buf)
1738 { 1775 {
1739 iso14755buf = 0; 1776 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1777# if ISO_14755
1741 scr_overlay_off (); 1778 scr_overlay_off ();
1742# endif 1779# endif
1743 } 1780 }
1744#endif 1781#endif
1745#if USE_XIM 1782#if USE_XIM
1746 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1748#endif 1785#endif
1749#if CURSOR_BLINK 1786#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1752 hidden_cursor = 0; 1790 hidden_cursor = 0;
1753#endif 1791#endif
1754#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1756 { 1794 {
… …
1759 } 1797 }
1760#endif 1798#endif
1761 } 1799 }
1762} 1800}
1763 1801
1764#if TRANSPARENT 1802void
1803rxvt_term::update_fade_color (unsigned int idx)
1804{
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 rgba c;
1809 pix_colors [Color_fade].get (c);
1810 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1811 }
1812#endif
1813}
1814
1815#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1816void
1766rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1818{
1768 make_current (); 1819 make_current ();
1769 1820
1821 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1822 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1825# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1826 switch (ev.type)
1771 { 1827 {
1772 case PropertyNotify: 1828 case PropertyNotify:
1773 /* 1829 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1830 * if user used some Esetroot compatible prog to set the root bg,
1775 * use the property to determine the pixmap. We use it later on. 1831 * use the property to determine the pixmap. We use it later on.
1776 */ 1832 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1835 {
1780 1836 bgPixmap.set_root_pixmap ();
1781 /* FALLTHROUGH */ 1837 update_background ();
1782 case ReparentNotify: 1838 }
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1839 break;
1786 } 1840 }
1841# endif
1787} 1842}
1788#endif 1843#endif
1789 1844
1790void 1845void
1791rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
… …
1972 upordown = 1; /* down */ 2027 upordown = 1; /* down */
1973 } 2028 }
1974 if (upordown) 2029 if (upordown)
1975 { 2030 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 2033#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
1980 { 2035 {
1981 if (upordown < 0) 2036 if (upordown < 0)
1982 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2119 selection_make (ev.time); 2174 selection_make (ev.time);
2120 break; 2175 break;
2121 2176
2122 case Button2: 2177 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2180 break;
2126 2181
2127#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2128 case Button4: 2183 case Button4:
2129 case Button5: 2184 case Button5:
… …
2133 2188
2134 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2135 2190
2136 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2137 i = 1; 2192 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2194 i = nrow - 1;
2140 else 2195 else
2141 i = 5; 2196 i = 5;
2142 2197
2143# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2200 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2204
2150 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2152
2153 slip_wheel_ev.start ();
2154 } 2206 }
2155 else 2207 else
2156 { 2208 {
2157# endif 2209# endif
2158 scr_page (v, i); 2210 scr_page (v, i);
… …
2164 break; 2216 break;
2165#endif 2217#endif
2166 } 2218 }
2167 } 2219 }
2168} 2220}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2221
2644/*}}} */ 2222/*}}} */
2645 2223
2646bool 2224bool
2647rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2274 if (ch == C0_LF)
2697 nlines++; 2275 nlines++;
2698 2276
2699 refresh_count++; 2277 refresh_count++;
2700 2278
2701 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2280 {
2704 refreshnow = true;
2705 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2706 ch = NOCHAR; 2286 ch = NOCHAR;
2707 break; 2287 break;
2288 }
2708 } 2289 }
2709 2290
2710 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2712 { 2293 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2742 2323
2743 /* 2324 /*
2744 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2328 */
2749 if (refreshnow) 2329 if (refreshnow)
2750 { 2330 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2331 flag = true;
2756 scr_refresh (); 2332 scr_refresh ();
2757 want_refresh = 1; 2333 want_refresh = 1;
2758 }
2759 } 2334 }
2760 2335
2761 } 2336 }
2762 else 2337 else
2763 { 2338 {
… …
2912 { 2487 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2489 break; /* done = 1 */
2915 } 2490 }
2916 } 2491 }
2917 2492
2918 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2920 { 2495 {
2921 done = 1; 2496 done = 1;
2922 break; 2497 break;
… …
2984 process_dcs_seq (); 2559 process_dcs_seq ();
2985 break; 2560 break;
2986 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
2987 process_csi_seq (); 2562 process_csi_seq ();
2988 break; 2563 break;
2989 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
2990 process_osc_seq (); 2565 process_osc_seq ();
2991 break; 2566 break;
2992#endif 2567#endif
2993 } 2568 }
2994} 2569}
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2660 break;
3086 case '+': 2661 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2663 break;
3089#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3090 case '6': 2665 case '6':
3091 scr_backindex (); 2666 scr_backindex ();
3092 break; 2667 break;
3093#endif 2668#endif
3094 case '7': 2669 case '7':
3095 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3096 break; 2671 break;
3097 case '8': 2672 case '8':
3098 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3099 break; 2674 break;
3100#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3101 case '9': 2676 case '9':
3102 scr_forwardindex (); 2677 scr_forwardindex ();
3103 break; 2678 break;
3104#endif 2679#endif
3105 case '=': 2680 case '=':
… …
3220rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3221{ 2796{
3222 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2798 unsigned int nargs, p;
3224 int n, ndef; 2799 int n, ndef;
3225 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3226 2801
3227 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3228 arg[--nargs] = 0;
3229 2803
3230 priv = 0; 2804 priv = 0;
3231 ch = cmd_getc (); 2805 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3233 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3277 switch (priv) 2851 switch (priv)
3278 { 2852 {
3279 case '>': 2853 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2855 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2858 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // versions.
3288 // 2862 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2863 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2864 }
3291 break; 2865 break;
3292 case '?': 2866 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
… …
3421 break; 2995 break;
3422 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3423 scr_report_position (); 2997 scr_report_position ();
3424 break; 2998 break;
3425 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3002 break;
3429 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3005 break;
… …
3498 break; 3072 break;
3499 case CSI_75: 3073 case CSI_75:
3500 scr_cursor (RESTORE); 3074 scr_cursor (RESTORE);
3501 break; 3075 break;
3502 3076
3503#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3504 case CSI_74: 3078 case CSI_74:
3505 process_window_ops (arg, nargs); 3079 process_window_ops (arg, nargs);
3506 break; 3080 break;
3507#endif 3081#endif
3508 3082
… …
3515 break; 3089 break;
3516 } 3090 }
3517} 3091}
3518/*}}} */ 3092/*}}} */
3519 3093
3520#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3095/* ARGSUSED */
3522void 3096void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3097rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3098{
3525 int x, y; 3099 int x, y;
3526 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
3527 Window wdummy; 3101 Window wdummy;
3528 3102
3529 dLocal (Display *, xdisp); 3103 dLocal (Display *, dpy);
3530 3104
3531 if (nargs == 0) 3105 if (nargs == 0)
3532 return; 3106 return;
3533 3107
3534 switch (args[0]) 3108 switch (args[0])
3535 { 3109 {
3536 /* 3110 /*
3537 * commands 3111 * commands
3538 */ 3112 */
3539 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3114 XMapWindow (dpy, parent[0]);
3541 break; 3115 break;
3542 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3117 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3118 break;
3545 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3121 break;
3548 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3124 break;
3551 case 5: /* raise window */ 3125 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3553 break; 3127 break;
3554 case 6: /* lower window */ 3128 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3556 break; 3130 break;
3557 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3558 scr_touch (true); 3132 scr_touch (true);
3559 break; 3133 break;
3560 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3141 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3142 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3143 (unsigned int) (args[1] * fheight));
3570 break; 3144 break;
3571 3145
3572
3573 /* 3146 /*
3574 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3575 */ 3148 */
3576 case 11: /* report window state */ 3149 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3152 break;
3580 case 13: /* report window position */ 3153 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3159 break;
3587 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3163 break;
3591 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3166 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3169 break;
3597 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3598 { 3171 {
3599 char *s; 3172 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3175 XFree (s);
3603 } 3176 }
3604 break; 3177 break;
3605 case 21: /* report window title */ 3178 case 21: /* report window title */
3606 { 3179 {
3607 char *s; 3180 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3183 XFree (s);
3611 } 3184 }
3612 break; 3185 break;
3613 } 3186 }
3614} 3187}
… …
3641 seen_esc = true; 3214 seen_esc = true;
3642 continue; 3215 continue;
3643 } 3216 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3221 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3648 3223
3649 seen_esc = false; 3224 seen_esc = false;
3650 3225
3651 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3227 // stop at some sane length
3653 return NULL; 3228 return NULL;
3654 3229
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3230 string[n++] = ch;
3659 } 3231 }
3660 3232
3661 string[n++] = '\0'; 3233 string[n++] = '\0';
3662 3234
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3286void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3288{
3717 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3718 { 3290 {
3719 unsigned short r, g, b; 3291 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3292 pix_colors_focused[color].get (c);
3293
3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3300 }
3723 else 3301 else
3724 set_window_color (color, str); 3302 set_window_color (color, str);
3725} 3303}
3726 3304
… …
3733 int color; 3311 int color;
3734 char *buf, *name; 3312 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3314 int saveop = op;
3737 3315
3738 dLocal (Display *, xdisp); 3316 dLocal (Display *, dpy);
3739 3317
3740 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3741 switch (op) 3323 switch (op)
3742 { 3324 {
3743 case XTerm_name: 3325 case XTerm_name:
3744 set_title (str); 3326 set_title (str);
3745 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3341 unsigned long bytes_after;
3760 unsigned char *value = 0; 3342 unsigned char *value = 0;
3761 const char *str = ""; 3343 const char *str = "";
3762 3344
3763 if (prop 3345 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3350 && actual_type != None
3769 && actual_format == 8) 3351 && actual_format == 8)
3770 str = (const char *)(value); 3352 str = (const char *)(value);
3771 3353
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3355
3774 XFree (value); 3356 XFree (value);
3775 } 3357 }
3776 else 3358 else
3777 { 3359 {
… …
3781 { 3363 {
3782 *eq = 0; 3364 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3784 } 3366 }
3785 else 3367 else
3786 XDeleteProperty (xdisp, parent[0], 3368 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3369 display->atom (str));
3788 } 3370 }
3789 break; 3371 break;
3790 3372
3791 case XTerm_Color: 3373 case XTerm_Color:
… …
3801 break; 3383 break;
3802 3384
3803 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3386 *buf++ = '\0';
3805 3387
3806 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3389 }
3815 break; 3390 break;
3816 case XTerm_Color00: 3391 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3392 process_color_seq (op, Color_fg, str, resp);
3818 break; 3393 break;
3819 case XTerm_Color01: 3394 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3395 process_color_seq (op, Color_bg, str, resp);
3821 break; 3396 break;
3822#ifndef NO_CURSORCOLOR 3397#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3398 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3399 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3400 break;
3826#endif 3401#endif
3827 case XTerm_Color_pointer_fg: 3402 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3403 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3404 break;
3830 case XTerm_Color_pointer_bg: 3405 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3406 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3407 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3409 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3410 process_color_seq (op, Color_RV, str, resp);
3836 break; 3411 break;
3837 case Rxvt_Color_BD: 3412 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3413 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3840 break; 3415 break;
3841 case Rxvt_Color_UL: 3416 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3417 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3418 process_color_seq (op, Color_UL, str, resp);
3844 break; 3419 break;
3845 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3847 break; 3422 break;
3848#endif 3423#endif
3849#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3427 {
3853 if (am_transparent) 3428 bool changed = false;
3854 want_full_refresh = want_refresh = 1; 3429 if (ISSET_PIXCOLOR (Color_tint))
3855 break; 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3856#endif 3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3857 3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3858 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3859 { 3442 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3443 {
3862#if XPM_BACKGROUND 3444 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3445
3864 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3450 }
3868 3451 else
3452 {
3869 int changed = 0; 3453 int changed = 0;
3870 3454
3871 while ((str = strchr (str, ';')) != NULL) 3455 if (*str != ';')
3872 { 3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3465 while (str)
3466 {
3873 str++; 3467 str++;
3874#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3469 changed++;
3876#endif 3470 str = strchr (str, ';');
3877 } 3471 }
3878
3879 if (changed) 3472 if (changed)
3880 { 3473 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3474 }
3886 }
3887 break; 3475 break;
3476#endif
3888 3477
3889 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3891 break; 3480 break;
3892 case Rxvt_restoreBG: 3481 case Rxvt_restoreBG:
… …
3917 case URxvt_italicFont: 3506 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3919#endif 3508#endif
3920 if (query) 3509 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3513 resp);
3925 else 3514 else
3926 { 3515 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3930 allocated.push_back ((void *)res); 3519 allocated.push_back ((void *)res);
3931 set_fonts (); 3520 set_fonts ();
3932 } 3521 }
3933 break; 3522 break;
3934 3523
3935#if ENABLE_FRILLS 3524 case URxvt_version:
3525 if (query)
3526 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3527 op,
3528 rs[Rs_name], VERSION[0], VERSION[2],
3529 resp);
3530 break;
3531
3532#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3533 case URxvt_locale:
3937 if (query) 3534 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3939 else 3536 else
3940 { 3537 {
3941 set_locale (str); 3538 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3540 init_xlocale ();
… …
3958 break; 3555 break;
3959#endif 3556#endif
3960 3557
3961#if ENABLE_PERL 3558#if ENABLE_PERL
3962 case URxvt_perl: 3559 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3964 ; // no responses yet 3561 ; // no responses yet
3965 break; 3562 break;
3966#endif 3563#endif
3967 } 3564 }
3968} 3565}
… …
4006{ 3603{
4007 unsigned int i, j; 3604 unsigned int i, j;
4008 int state; 3605 int state;
4009 3606
4010 static const struct 3607 static const struct
4011 { 3608 {
4012 const int argval; 3609 const int argval;
4013 const unsigned long bit; 3610 const unsigned long bit;
4014 }
4015
4016 argtopriv[] = { 3611 } argtopriv[] = {
4017 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4018 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4019 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4020 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4021 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
… …
4038#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4039 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4040#endif 3635#endif
4041 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4042 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4043 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4044 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4045 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4046 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4047 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4048 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4049 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
4084 scr_touch (true); 3679 scr_touch (true);
4085 break; 3680 break;
4086#endif 3681#endif
4087 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4088 case 1049: 3683 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 3685 if (mode == 0)
4091 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4092 else if (mode == 1) 3687 else if (mode == 1)
4093 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4094 break; 3689 break;
… …
4123 scr_autowrap (state); 3718 scr_autowrap (state);
4124 break; 3719 break;
4125 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
4126 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4127 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4128 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4129 break; 3724 break;
4130#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4131 case scrollBar_esc: 3726 case scrollBar_esc:
4132 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4133 { 3728 {
… …
4146 break; 3741 break;
4147 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4148 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4149 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4150 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3747 break;
4153#if 0 3748#if 0
4154 case 1001: 3749 case 1001:
4155 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4156#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
4157 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4158 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
4159 break; 3764 break;
4160 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
4162 break; 3767 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4166 scr_erase_screen (2); 3771 scr_erase_screen (2);
4167 scr_change_screen (state); 3772 scr_change_screen (state);
4168 break; 3773 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4170 scr_change_screen (state); 3775 scr_change_screen (state);
4171 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 3778 scr_erase_screen (2);
4174 break; 3779 break;
4175 default: 3780 default:
4176 break; 3781 break;
… …
4304 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
4305 break; 3910 break;
4306 3911
4307 //case 50: // not variable spacing 3912 //case 50: // not variable spacing
4308 3913
4309#if ENABLE_FRILLS 3914#if !ENABLE_MINIMAL
4310 case 90: 3915 case 90:
4311 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
4312 case 92: 3917 case 92:
4313 case 93: 3918 case 93:
4314 case 94: 3919 case 94:
… …
4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4399 4004
4400 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4401 v_buflen += len; 4006 v_buflen += len;
4402 4007
4403 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4404} 4009}
4405 4010
4406void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4407{ 4012{
4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4413 4018
4414 if (v_buflen == 0) 4019 if (v_buflen == 0)
4415 { 4020 {
4416 free (v_buffer); 4021 free (v_buffer);
4417 v_buffer = 0; 4022 v_buffer = 0;
4418 v_buflen = 0;
4419 4023
4420 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4421 return; 4025 return;
4422 } 4026 }
4423 4027
4424 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4425 } 4029 }
4426 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4427 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4428} 4032}
4429 4033
4430/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4431 4035

Diff Legend

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