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.275 by root, Fri Jan 20 10:35:25 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#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 308 int valid_keysym;
308 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
309 315
310 /* 316 /*
311 * 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
312 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
313 * 319 *
… …
493# if ISO_14755 499# if ISO_14755
494 iso14755_51 (0); 500 iso14755_51 (0);
495# endif 501# endif
496 return; 502 return;
497 } 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 }
498 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
499 { 513 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
502# if ISO_14755 516# if ISO_14755
… …
504# endif 518# endif
505 return; 519 return;
506 } 520 }
507 else 521 else
508 { 522 {
509# if ENABLE_OVERLAY 523# if ISO_14755
510 scr_overlay_off (); 524 scr_overlay_off ();
511# endif 525# endif
512 iso14755buf = 0; 526 iso14755buf = 0;
513 } 527 }
514 } 528 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
518 { 532 {
519 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 534# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 537# endif
524 } 538 }
525#endif 539#endif
526 540
527#ifdef PRINTPIPE 541#ifdef PRINTPIPE
528 if (keysym == XK_Print) 542 if (keysym == XK_Print)
529 { 543 {
530 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
531 return; 545 return;
… …
533#endif 547#endif
534 548
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 550 {
537 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 newlen = 1; 553 newlen = 1;
539 switch (keysym) 554 switch (keysym)
540 { 555 {
541#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 557 case XK_BackSpace:
… …
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
548 } 563 }
549 else 564 else
550 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 566 break;
552#endif 567#endif
553#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
555 case XK_KP_Delete: 570 case XK_KP_Delete:
556 /* allow shift to override */ 571 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
558 { 573 {
559 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
560 break; 575 break;
561 } 576 }
562 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
563# endif 578# endif
564 case XK_Delete: 579 case XK_Delete:
565 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 581 break;
567#endif 582#endif
568 case XK_Tab: 583 case XK_Tab:
569 if (shft) 584 if (shft)
570 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
581 newlen = 0; 596 newlen = 0;
582 } 597 }
583 break; 598 break;
584 599
585#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
586 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
587 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 { 606 {
592 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break; 609 break;
595 } 610 }
… …
618 633
619#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
621 case XK_KP_Prior: 636 case XK_KP_Prior:
622 /* allow shift to override */ 637 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
624 { 639 {
625 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
626 break; 641 break;
627 } 642 }
628 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
631 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
632 break; 647 break;
633# ifdef XK_KP_Next 648# ifdef XK_KP_Next
634 case XK_KP_Next: 649 case XK_KP_Next:
635 /* allow shift to override */ 650 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
637 { 652 {
638 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
639 break; 654 break;
640 } 655 }
641 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
644 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
645 break; 660 break;
646#endif 661#endif
647 case XK_KP_Enter: 662 case XK_KP_Enter:
648 /* allow shift to override */ 663 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
650 { 665 {
651 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
652 break; 667 break;
653 } 668 }
654 669
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 716 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
703 { 718 {
704 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 721 }
707 else 722 else
… …
713 728
714 case XK_Find: 729 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
716 break; 731 break;
717 732
718#ifdef XK_KP_End 733#ifdef XK_KP_Insert
719 case XK_KP_Insert: 734 case XK_KP_Insert:
720 /* allow shift to override */ 735 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
722 { 737 {
723 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
724 break; 739 break;
725 } 740 }
726 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
739 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
740 break; 755 break;
741#ifdef XK_KP_End 756#ifdef XK_KP_End
742 case XK_KP_End: 757 case XK_KP_End:
743 /* allow shift to override */ 758 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
745 { 760 {
746 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
747 break; 762 break;
748 } 763 }
749 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
752 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
753 break; 768 break;
754#ifdef XK_KP_Home 769#ifdef XK_KP_Home
755 case XK_KP_Home: 770 case XK_KP_Home:
756 /* allow shift to override */ 771 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
758 { 773 {
759 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
760 break; 775 break;
761 } 776 }
762 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
870 return; 885 return;
871 886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
920 1001
921#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922unsigned int 1003unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 1005{
… …
954void 1035void
955rxvt_term::flush () 1036rxvt_term::flush ()
956{ 1037{
957 flush_ev.stop (); 1038 flush_ev.stop ();
958 1039
959#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
961 { 1042 {
962 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 1044 scr_touch (false);
965 } 1045 }
966#endif 1046#endif
967 1047
968 if (want_refresh) 1048 if (want_refresh)
… …
1014 1094
1015 display->flush (); 1095 display->flush ();
1016} 1096}
1017 1097
1018void 1098void
1019rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1020{ 1100{
1021 make_current (); 1101 make_current ();
1022 1102
1023 display->flush (); 1103 display->flush ();
1024 1104
1025 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1027} 1107}
1028 1108
1029void 1109void
1030rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1031{ 1111{
1032 make_current (); 1112 make_current ();
1033 1113
1034 refresh_limit = 1;
1035 refresh_count = 0; 1114 refresh_count = 0;
1036 flush (); 1115 flush ();
1037} 1116}
1038 1117
1039#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1040void 1119void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1121{
1043 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1123 want_refresh = 1;
1045
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1124}
1048#endif 1125#endif
1049 1126
1050#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1051void 1128void
1052rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1130{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1132 {
1056 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1057 want_refresh = 1; 1134 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL);
1059 } 1135 }
1060} 1136}
1061#endif 1137#endif
1062 1138
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1140void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1142{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1069 {
1070 want_refresh = 1; 1145 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1072 } 1147 w.stop ();
1073} 1148}
1074#endif 1149#endif
1075 1150
1076#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1077void 1152void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1154{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1156 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1158 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1085 } 1159 }
1160 else
1161 w.stop ();
1086} 1162}
1087#endif 1163#endif
1088 1164
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1166void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1168{
1093 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1094 || 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)
1095 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1172 {
1097 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1099 1175
1100 want_refresh = 1; 1176 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1177 }
1178 else
1179 w.stop ();
1103} 1180}
1104#endif 1181#endif
1105 1182
1106#if HAVE_SCHED_YIELD 1183#if LINUX_YIELD_HACK
1107static struct event_handler 1184static struct event_handler
1108{ 1185{
1109 check_watcher cw_yield; 1186 ev::prepare yield_ev;
1110 1187
1111 void yield (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1112 { 1189 {
1113 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
1114 w.stop (); 1198 w.stop ();
1115 } 1199 }
1116 1200
1117 event_handler () 1201 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1202 : yield_ev (this, &event_handler::yield_cb)
1119 { 1203 {
1120 } 1204 }
1121} event_handler; 1205} event_handler;
1122#endif 1206#endif
1123 1207
… …
1143 cmdbuf_endp += r; 1227 cmdbuf_endp += r;
1144 return true; 1228 return true;
1145 } 1229 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1231 {
1148#if HAVE_SCHED_YIELD 1232#if LINUX_YIELD_HACK
1149 if (display->is_local) 1233 if (display->is_local)
1150 event_handler.cw_yield.start (); 1234 event_handler.yield_ev.start ();
1151#endif 1235#endif
1152 } 1236 }
1153 else 1237 else
1154 { 1238 {
1155 pty_ev.stop (); 1239 pty_ev.stop ();
1156 1240
1157 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1158 destroy (); 1242 destroy ();
1159 } 1243 }
1160 1244
1161 return false; 1245 return false;
1162} 1246}
1163 1247
1164void 1248void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1250{
1167 make_current (); 1251 make_current ();
1168 1252
1169 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1255 while (pty_fill ())
1172 if (cmd_parse ()) 1256 if (cmd_parse ())
1173 break; 1257 break;
1174 1258
1175 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1176 pty_write (); 1260 pty_write ();
1177} 1261}
1178 1262
1179void 1263void
1180rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
1181{ 1265{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1266 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1267 recolour_cursor ();
1184 1268
1185#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1270 hidden_pointer = 0;
1187 1271
1188 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1190#endif 1274#endif
1191} 1275}
1192 1276
1193#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1194void 1278void
1195rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1196{ 1280{
1197 if (!OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1198 return; 1282 return;
1199 1283
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1285 XFlush (dpy);
1202 1286
1203 hidden_pointer = 1; 1287 hidden_pointer = 1;
1204} 1288}
1205 1289
1206void 1290void
1207rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1292{
1209 make_current (); 1293 make_current ();
1210 1294
1211 pointer_blank (); 1295 pointer_blank ();
1212} 1296}
… …
1215void 1299void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1301{
1218 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1219 int x, y; 1303 int x, y;
1304 int code = 32;
1220 1305
1221 x = ev.x; 1306 x = Pixel2Col (ev.x);
1222 y = ev.y; 1307 y = Pixel2Row (ev.y);
1223 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 }
1224 1315
1225 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1226 button_number = 3; 1317 button_number = 3;
1227 else 1318 else
1228 { 1319 {
… …
1274 x + 1, 1365 x + 1,
1275 y + 1); 1366 y + 1);
1276#endif 1367#endif
1277 1368
1278 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1280 (32 + x + 1), 1371 (32 + x + 1),
1281 (32 + y + 1)); 1372 (32 + y + 1));
1282} 1373}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1374
1294/*{{{ process an X event */ 1375/*{{{ process an X event */
1295void 1376void
1296rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
1297{ 1378{
1298 make_current (); 1379 make_current ();
1299 1380
1300 dDisp; 1381 dLocal (Display *, dpy);
1301 1382
1302 if (ev.xany.window == vt 1383 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1386 return;
… …
1310 unsigned int unused_mask; 1391 unsigned int unused_mask;
1311 1392
1312 switch (ev.type) 1393 switch (ev.type)
1313 { 1394 {
1314 case KeyPress: 1395 case KeyPress:
1315#if ISO_14755 1396 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1397 break;
1321 1398
1322 case KeyRelease: 1399 case KeyRelease:
1323 { 1400 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1401 break;
1395 }
1396 1402
1397 case ButtonPress: 1403 case ButtonPress:
1398 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
1399 break; 1405 break;
1400 1406
… …
1402 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
1403 break; 1409 break;
1404 1410
1405 case ClientMessage: 1411 case ClientMessage:
1406 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1413 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 1414 {
1415 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1418 {
1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1420 {
1421 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410 destroy (); 1422 destroy ();
1423 }
1411#if ENABLE_EWMH 1424#if ENABLE_EWMH
1412 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])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev); 1428 &ev);
1429#endif
1430 }
1431 }
1432#if ENABLE_XEMBED
1433 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1434 {
1435 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1436 focus_in ();
1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1438 focus_out ();
1439 }
1416#endif 1440#endif
1417 } 1441 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break;
1454
1455 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1442 break;
1458 1443
1459 /* 1444 /*
1460 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1461 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1480 break; 1465 break;
1481 } 1466 }
1482 break; 1467 break;
1483 1468
1484 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1485 focus_in (); 1473 focus_in ();
1486 break; 1474 break;
1487 1475
1488 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1489 focus_out (); 1480 focus_out ();
1490 break; 1481 break;
1491 1482
1492 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); */
1493 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1494 { 1488 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1490 ;
1497 1491
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1493 {
1500 seen_resize = 1; 1494 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1502 } 1496 }
1503 1497 else
1498 {
1499#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1502#endif
1503 }
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1507 if (OPTION (Opt_transparent))
1508 check_our_parents ();
1509#endif
1510 } 1505 }
1511 break; 1506 break;
1512 1507
1513 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1513
1518 break; 1514 break;
1519 1515
1520 case SelectionClear: 1516 case SelectionClear:
1521 selection_clear (); 1517 selection_clear ();
… …
1531 break; 1527 break;
1532 1528
1533 case MapNotify: 1529 case MapNotify:
1534 mapped = 1; 1530 mapped = 1;
1535#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1537#endif 1533#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1535 break;
1540 1536
1541 case UnmapNotify: 1537 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1545#endif 1541#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1543 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1544
1555 case GraphicsExpose: 1545 case GraphicsExpose:
1556 case Expose: 1546 case Expose:
1557 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1558 { 1548 {
1559 do 1549 do
1550 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1555
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1557
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1569 1562 }
1570 want_refresh = 1; 1563 want_refresh = 1;
1571 } 1564 }
1572 else 1565 else
1573 { 1566 {
1574 XEvent unused_event; 1567 XEvent unused_event;
1575 1568
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1570 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1572 ;
1580 1573
1581 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1582 { 1575 {
1583 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1584 scrollbar_show (0); 1577 scrollbar_show (0);
1585 } 1578 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window);
1590#endif
1591 } 1579 }
1592 break; 1580 break;
1593 1581
1594 case MotionNotify: 1582 case MotionNotify:
1595#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1584 if (hidden_pointer)
1597 pointer_unblank (); 1585 pointer_unblank ();
1598#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);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1591 break;
1601 1592
1602 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1603 { 1594 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1597 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1599 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1601 ;
1611 1602
1612 XQueryPointer (disp, vt, 1603 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1607 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1638 1629
1639 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1641 */ 1632 */
1642 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1635
1645 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1647 */ 1638 */
1648 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1681#endif 1672#endif
1682 } 1673 }
1683 } 1674 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685 { 1676 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1688 ; 1679 ;
1689 1680
1690 XQueryPointer (disp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1685 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1687 scrollbar_size ());
1697 want_refresh = 1; 1688 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1689 scrollbar_show (1);
1700 } 1690 }
1701 break; 1691 break;
1702 } 1692 }
1703 1693
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1694#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1696 {
1709 if (hidden_cursor) 1697 if (hidden_cursor)
1710 { 1698 {
1711 hidden_cursor = 0; 1699 hidden_cursor = 0;
1712 want_refresh = 1; 1700 want_refresh = 1;
1713 } 1701 }
1714 1702
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1716 } 1704 }
1717#endif 1705#endif
1718 1706
1719#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 { 1709 {
1722 if (ev.type == MotionNotify 1710 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress 1711 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease) 1712 || ev.type == ButtonRelease)
1725 if (hidden_pointer) 1713 if (hidden_pointer)
… …
1737 if (!focus) 1725 if (!focus)
1738 { 1726 {
1739 focus = 1; 1727 focus = 1;
1740 want_refresh = 1; 1728 want_refresh = 1;
1741 1729
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 1731
1744#if USE_XIM 1732#if USE_XIM
1745 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1746 { 1734 {
1747 IMSetStatusPosition (); 1735 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1749 } 1737 }
1750#endif 1738#endif
1751#if CURSOR_BLINK 1739#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1754#endif 1742#endif
1755#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1757 { 1745 {
1758 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1759 scr_recolour (); 1747 scr_recolour ();
1760 } 1748 }
1761#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
1762 } 1760 }
1763} 1761}
1764 1762
1765void 1763void
1766rxvt_term::focus_out () 1764rxvt_term::focus_out ()
… …
1774 1772
1775#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1774 if (iso14755buf)
1777 { 1775 {
1778 iso14755buf = 0; 1776 iso14755buf = 0;
1779# if ENABLE_OVERLAY 1777# if ISO_14755
1780 scr_overlay_off (); 1778 scr_overlay_off ();
1781# endif 1779# endif
1782 } 1780 }
1783#endif 1781#endif
1784#if USE_XIM 1782#if USE_XIM
1785 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1787#endif 1785#endif
1788#if CURSOR_BLINK 1786#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1791 hidden_cursor = 0; 1790 hidden_cursor = 0;
1792#endif 1791#endif
1793#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1795 { 1794 {
… …
1798 } 1797 }
1799#endif 1798#endif
1800 } 1799 }
1801} 1800}
1802 1801
1803#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
1804void 1816void
1805rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1806{ 1818{
1807 make_current (); 1819 make_current ();
1808 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
1809 switch (ev.type) 1826 switch (ev.type)
1810 { 1827 {
1811 case PropertyNotify: 1828 case PropertyNotify:
1812 /* 1829 /*
1813 * 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,
1814 * 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.
1815 */ 1832 */
1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 return; 1835 {
1819 1836 bgPixmap.set_root_pixmap ();
1820 /* FALLTHROUGH */ 1837 update_background ();
1821 case ReparentNotify: 1838 }
1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1823 want_refresh = want_full_refresh = 1;
1824 break; 1839 break;
1825 } 1840 }
1841# endif
1826} 1842}
1827#endif 1843#endif
1828 1844
1829void 1845void
1830rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
… …
1839 /* 1855 /*
1840 * VT window processing of button press 1856 * VT window processing of button press
1841 */ 1857 */
1842 if (ev.window == vt) 1858 if (ev.window == vt)
1843 { 1859 {
1860 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 return;
1862
1844#if ISO_14755 1863#if ISO_14755
1845 // 5.4 1864 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1866 {
1848 iso14755_54 (ev.x, ev.y); 1867 iso14755_54 (ev.x, ev.y);
… …
1890 else 1909 else
1891 { 1910 {
1892 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1894 1913
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1914 switch (ev.button)
1897 { 1915 {
1898 case Button1: 1916 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1921#else
1904 selection.rect = false; 1922 selection.rect = false;
1905#endif 1923#endif
1906 1924
1907 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1927 {
1910 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1912 else 1930 else
1913 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1914 } 1932 }
1915 else 1933 else
1916 { 1934 {
1917 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1936 MEvent.clicks++;
1919 else 1937 else
1920 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1921 1939
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1941 }
1924 1942
1925 MEvent.button = Button1; 1943 MEvent.button = Button1;
1926 break; 1944 break;
1927 1945
1928 case Button3: 1946 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1931 else 1949 else
1932 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1933 1951
1934 MEvent.button = Button3; 1952 MEvent.button = Button3;
1935 break; 1953 break;
1936 } 1954 }
1937 } 1955 }
1938 1956
1939 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1940 return; 1958 return;
1941 } 1959 }
1942 1960
… …
2009 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2010 } 2028 }
2011 if (upordown) 2029 if (upordown)
2012 { 2030 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 2033#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2017 { 2035 {
2018 if (upordown < 0) 2036 if (upordown < 0)
2019 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2105 sel_scroll_ev.stop(); 2123 sel_scroll_ev.stop();
2106#endif 2124#endif
2107 2125
2108 if (ev.window == vt) 2126 if (ev.window == vt)
2109 { 2127 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2129 return;
2130
2110#if ISO_14755 2131#if ISO_14755
2111 // 5.4 2132 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2134 return;
2114#endif 2135#endif
2136
2115 if (reportmode) 2137 if (reportmode)
2116 { 2138 {
2117 /* mouse report from vt window */ 2139 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2140 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2141 if (ev.button >= 4)
… …
2143 if (priv_modes & PrivMode_mouse_report 2165 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2166 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2167 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2168 selection_extend (ev.x, ev.y, 0);
2147 2169
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2170 switch (ev.button)
2152 { 2171 {
2153 case Button1: 2172 case Button1:
2154 case Button3: 2173 case Button3:
2155 selection_make (ev.time); 2174 selection_make (ev.time);
2156 break; 2175 break;
2157 2176
2158 case Button2: 2177 case Button2:
2159 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?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2161 break; 2180 break;
2162 2181
2163#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2164 case Button4: 2183 case Button4:
2165 case Button5: 2184 case Button5:
… …
2169 2188
2170 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2171 2190
2172 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2173 i = 1; 2192 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2194 i = nrow - 1;
2176 else 2195 else
2177 i = 5; 2196 i = 5;
2178 2197
2179# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
… …
2181 { 2200 {
2182 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185 2204
2186 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2188
2189 slip_wheel_ev.start ();
2190 } 2206 }
2191 else 2207 else
2192 { 2208 {
2193# endif 2209# endif
2194 scr_page (v, i); 2210 scr_page (v, i);
… …
2200 break; 2216 break;
2201#endif 2217#endif
2202 } 2218 }
2203 } 2219 }
2204} 2220}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2221
2687/*}}} */ 2222/*}}} */
2688 2223
2689bool 2224bool
2690rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
… …
2739 if (ch == C0_LF) 2274 if (ch == C0_LF)
2740 nlines++; 2275 nlines++;
2741 2276
2742 refresh_count++; 2277 refresh_count++;
2743 2278
2744 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2280 {
2747 refreshnow = true;
2748 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2749 ch = NOCHAR; 2286 ch = NOCHAR;
2750 break; 2287 break;
2288 }
2751 } 2289 }
2752 2290
2753 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2755 { 2293 {
… …
2783 && 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))))
2784 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2785 2323
2786 /* 2324 /*
2787 * 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
2788 * 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.
2789 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2328 */
2792 if (refreshnow) 2329 if (refreshnow)
2793 { 2330 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2331 flag = true;
2799 scr_refresh (); 2332 scr_refresh ();
2800 want_refresh = 1; 2333 want_refresh = 1;
2801 }
2802 } 2334 }
2803 2335
2804 } 2336 }
2805 else 2337 else
2806 { 2338 {
… …
2955 { 2487 {
2956 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2957 break; /* done = 1 */ 2489 break; /* done = 1 */
2958 } 2490 }
2959 } 2491 }
2960 2492
2961 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2962 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2963 { 2495 {
2964 done = 1; 2496 done = 1;
2965 break; 2497 break;
… …
3027 process_dcs_seq (); 2559 process_dcs_seq ();
3028 break; 2560 break;
3029 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3030 process_csi_seq (); 2562 process_csi_seq ();
3031 break; 2563 break;
3032 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3033 process_osc_seq (); 2565 process_osc_seq ();
3034 break; 2566 break;
3035#endif 2567#endif
3036 } 2568 }
3037} 2569}
… …
3127 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3128 break; 2660 break;
3129 case '+': 2661 case '+':
3130 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3131 break; 2663 break;
3132#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3133 case '6': 2665 case '6':
3134 scr_backindex (); 2666 scr_backindex ();
3135 break; 2667 break;
3136#endif 2668#endif
3137 case '7': 2669 case '7':
3138 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3139 break; 2671 break;
3140 case '8': 2672 case '8':
3141 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3142 break; 2674 break;
3143#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3144 case '9': 2676 case '9':
3145 scr_forwardindex (); 2677 scr_forwardindex ();
3146 break; 2678 break;
3147#endif 2679#endif
3148 case '=': 2680 case '=':
… …
3263rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3264{ 2796{
3265 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3266 unsigned int nargs, p; 2798 unsigned int nargs, p;
3267 int n, ndef; 2799 int n, ndef;
3268 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3269 2801
3270 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3271 arg[--nargs] = 0;
3272 2803
3273 priv = 0; 2804 priv = 0;
3274 ch = cmd_getc (); 2805 ch = cmd_getc ();
3275 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3276 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3310 ndef = get_byte_array_bit (csi_defaults, i); 2841 ndef = get_byte_array_bit (csi_defaults, i);
3311 for (p = 0; p < nargs; p++) 2842 for (p = 0; p < nargs; p++)
3312 if (arg[p] == -1) 2843 if (arg[p] == -1)
3313 arg[p] = ndef; 2844 arg[p] = ndef;
3314 2845
3315#ifdef DEBUG_CMD
3316 fprintf (stderr, "CSI ");
3317 for (p = 0; p < nargs; p++)
3318 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3319 fprintf (stderr, "%c\n", ch);
3320#endif
3321
3322 /* 2846 /*
3323 * private mode handling 2847 * private mode handling
3324 */ 2848 */
3325 if (priv) 2849 if (priv)
3326 { 2850 {
3327 switch (priv) 2851 switch (priv)
3328 { 2852 {
3329 case '>': 2853 case '>':
3330 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2855 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // versions.
2862 //
2863 tt_printf ("\033[>%d;95;0c", 'U');
2864 }
3332 break; 2865 break;
3333 case '?': 2866 case '?':
3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3335 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
3336 break; 2869 break;
… …
3462 break; 2995 break;
3463 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3464 scr_report_position (); 2997 scr_report_position ();
3465 break; 2998 break;
3466 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3467 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3468 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3469 break; 3002 break;
3470 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3472 break; 3005 break;
… …
3539 break; 3072 break;
3540 case CSI_75: 3073 case CSI_75:
3541 scr_cursor (RESTORE); 3074 scr_cursor (RESTORE);
3542 break; 3075 break;
3543 3076
3544#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3545 case CSI_74: 3078 case CSI_74:
3546 process_window_ops (arg, nargs); 3079 process_window_ops (arg, nargs);
3547 break; 3080 break;
3548#endif 3081#endif
3549 3082
… …
3556 break; 3089 break;
3557 } 3090 }
3558} 3091}
3559/*}}} */ 3092/*}}} */
3560 3093
3561#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3562/* ARGSUSED */ 3095/* ARGSUSED */
3563void 3096void
3564rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3097rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3565{ 3098{
3566 int x, y; 3099 int x, y;
3567 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
3568 Window wdummy; 3101 Window wdummy;
3569 dDisp; 3102
3103 dLocal (Display *, dpy);
3570 3104
3571 if (nargs == 0) 3105 if (nargs == 0)
3572 return; 3106 return;
3573 3107
3574 switch (args[0]) 3108 switch (args[0])
3575 { 3109 {
3576 /* 3110 /*
3577 * commands 3111 * commands
3578 */ 3112 */
3579 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3580 XMapWindow (disp, parent[0]); 3114 XMapWindow (dpy, parent[0]);
3581 break; 3115 break;
3582 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3583 XIconifyWindow (disp, parent[0], display->screen); 3117 XIconifyWindow (dpy, parent[0], display->screen);
3584 break; 3118 break;
3585 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3586 XMoveWindow (disp, parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3587 break; 3121 break;
3588 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3590 break; 3124 break;
3591 case 5: /* raise window */ 3125 case 5: /* raise window */
3592 XRaiseWindow (disp, parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3593 break; 3127 break;
3594 case 6: /* lower window */ 3128 case 6: /* lower window */
3595 XLowerWindow (disp, parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3596 break; 3130 break;
3597 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3598 scr_touch (true); 3132 scr_touch (true);
3599 break; 3133 break;
3600 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
… …
3607 if (args[0] >= 24) /* set height (chars) */ 3141 if (args[0] >= 24) /* set height (chars) */
3608 set_widthheight ((unsigned int)width, 3142 set_widthheight ((unsigned int)width,
3609 (unsigned int) (args[1] * fheight)); 3143 (unsigned int) (args[1] * fheight));
3610 break; 3144 break;
3611 3145
3612
3613 /* 3146 /*
3614 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3615 */ 3148 */
3616 case 11: /* report window state */ 3149 case 11: /* report window state */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3619 break; 3152 break;
3620 case 13: /* report window position */ 3153 case 13: /* report window position */
3621 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3622 XTranslateCoordinates (disp, parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3623 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3624 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3625 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3626 break; 3159 break;
3627 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3630 break; 3163 break;
3631 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3632 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3633 break; 3166 break;
… …
3635 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3636 break; 3169 break;
3637 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3638 { 3171 {
3639 char *s; 3172 char *s;
3640 XGetIconName (disp, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3641 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 */
3642 XFree (s); 3175 XFree (s);
3643 } 3176 }
3644 break; 3177 break;
3645 case 21: /* report window title */ 3178 case 21: /* report window title */
3646 { 3179 {
3647 char *s; 3180 char *s;
3648 XFetchName (disp, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3649 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 */
3650 XFree (s); 3183 XFree (s);
3651 } 3184 }
3652 break; 3185 break;
3653 } 3186 }
3654} 3187}
… …
3681 seen_esc = true; 3214 seen_esc = true;
3682 continue; 3215 continue;
3683 } 3216 }
3684 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3685 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3686 else if (ch < 0x20) 3221 else if (ch < 0x20)
3687 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3688 3223
3689 seen_esc = false; 3224 seen_esc = false;
3690 3225
3691 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3692 // stop at some sane length 3227 // stop at some sane length
3693 return NULL; 3228 return NULL;
3694 3229
3695 if (ch == C0_SYN)
3696 string[n++] = cmd_get8 ();
3697 else
3698 string[n++] = ch; 3230 string[n++] = ch;
3699 } 3231 }
3700 3232
3701 string[n++] = '\0'; 3233 string[n++] = '\0';
3702 3234
3703 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3754void 3286void
3755rxvt_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)
3756{ 3288{
3757 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3758 { 3290 {
3759 unsigned short r, g, b; 3291 rgba c;
3760 pix_colors_focused[color].get (display, 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
3761 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);
3762 } 3300 }
3763 else 3301 else
3764 set_window_color (color, str); 3302 set_window_color (color, str);
3765} 3303}
3766 3304
… …
3772{ 3310{
3773 int color; 3311 int color;
3774 char *buf, *name; 3312 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3314 int saveop = op;
3777 dDisp; 3315
3316 dLocal (Display *, dpy);
3778 3317
3779 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
3780 switch (op) 3323 switch (op)
3781 { 3324 {
3782 case XTerm_name: 3325 case XTerm_name:
3783 set_title (str); 3326 set_title (str);
3784 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3798 unsigned long bytes_after; 3341 unsigned long bytes_after;
3799 unsigned char *value = 0; 3342 unsigned char *value = 0;
3800 const char *str = ""; 3343 const char *str = "";
3801 3344
3802 if (prop 3345 if (prop
3803 && XGetWindowProperty (disp, parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3804 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3805 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3806 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3807 && actual_type != None 3350 && actual_type != None
3808 && actual_format == 8) 3351 && actual_format == 8)
3809 str = (const char *)(value); 3352 str = (const char *)(value);
3810 3353
3811 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3812 3355
3813 XFree (value); 3356 XFree (value);
3814 } 3357 }
3815 else 3358 else
3816 { 3359 {
… …
3820 { 3363 {
3821 *eq = 0; 3364 *eq = 0;
3822 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3823 } 3366 }
3824 else 3367 else
3825 XDeleteProperty (disp, parent[0], 3368 XDeleteProperty (dpy, parent[0],
3826 display->atom (str)); 3369 display->atom (str));
3827 } 3370 }
3828 break; 3371 break;
3829 3372
3830 case XTerm_Color: 3373 case XTerm_Color:
… …
3840 break; 3383 break;
3841 3384
3842 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3843 *buf++ = '\0'; 3386 *buf++ = '\0';
3844 3387
3845 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3846 {
3847 unsigned short r, g, b;
3848 pix_colors_focused[color].get (display, r, g, b);
3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3850 }
3851 else
3852 set_window_color (color, name);
3853 } 3389 }
3854 break; 3390 break;
3855 case XTerm_Color00: 3391 case XTerm_Color00:
3856 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3392 process_color_seq (op, Color_fg, str, resp);
3857 break; 3393 break;
3858 case XTerm_Color01: 3394 case XTerm_Color01:
3859 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3395 process_color_seq (op, Color_bg, str, resp);
3860 break; 3396 break;
3861#ifndef NO_CURSORCOLOR 3397#ifndef NO_CURSORCOLOR
3862 case XTerm_Color_cursor: 3398 case XTerm_Color_cursor:
3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3399 process_color_seq (op, Color_cursor, str, resp);
3864 break; 3400 break;
3865#endif 3401#endif
3866 case XTerm_Color_pointer_fg: 3402 case XTerm_Color_pointer_fg:
3867 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3403 process_color_seq (op, Color_pointer_fg, str, resp);
3868 break; 3404 break;
3869 case XTerm_Color_pointer_bg: 3405 case XTerm_Color_pointer_bg:
3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3406 process_color_seq (op, Color_pointer_bg, str, resp);
3871 break; 3407 break;
3872#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3873 case XTerm_Color_RV: 3409 case XTerm_Color_RV:
3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3410 process_color_seq (op, Color_RV, str, resp);
3875 break; 3411 break;
3876 case Rxvt_Color_BD: 3412 case Rxvt_Color_BD:
3877 case URxvt_Color_BD: 3413 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3879 break; 3415 break;
3880 case Rxvt_Color_UL: 3416 case Rxvt_Color_UL:
3881 case URxvt_Color_UL: 3417 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp); 3418 process_color_seq (op, Color_UL, str, resp);
3883 break; 3419 break;
3884 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3886 break; 3422 break;
3887#endif 3423#endif
3888#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3889 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3891 check_our_parents (); 3427 {
3892 if (am_transparent) 3428 bool changed = false;
3893 want_full_refresh = want_refresh = 1; 3429 if (ISSET_PIXCOLOR (Color_tint))
3894 break; 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3895#endif 3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3896 3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3897 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3898 { 3442 if (!strcmp (str, "?"))
3899 if (*str != ';')
3900 { 3443 {
3901#if XPM_BACKGROUND 3444 char str[256];
3902 scale_pixmap (""); /* reset to default scaling */ 3445
3903 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3904 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3905#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3906 } 3450 }
3907 3451 else
3452 {
3908 int changed = 0; 3453 int changed = 0;
3909 3454
3910 while ((str = strchr (str, ';')) != NULL) 3455 if (*str != ';')
3911 { 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 {
3912 str++; 3467 str++;
3913#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3914 changed += scale_pixmap (str); 3469 changed++;
3915#endif 3470 str = strchr (str, ';');
3916 } 3471 }
3917
3918 if (changed) 3472 if (changed)
3919 { 3473 update_background ();
3920#ifdef XPM_BACKGROUND
3921 resize_pixmap ();
3922 scr_touch (true);
3923#endif
3924 } 3474 }
3925 }
3926 break; 3475 break;
3476#endif
3927 3477
3928 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3930 break; 3480 break;
3931 case Rxvt_restoreBG: 3481 case Rxvt_restoreBG:
… …
3956 case URxvt_italicFont: 3506 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3958#endif 3508#endif
3959 if (query) 3509 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3513 resp);
3964 else 3514 else
3965 { 3515 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3969 allocated.push_back ((void *)res); 3519 allocated.push_back ((void *)res);
3970 set_fonts (); 3520 set_fonts ();
3971 } 3521 }
3972 break; 3522 break;
3973 3523
3974#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
3975 case URxvt_locale: 3533 case URxvt_locale:
3976 if (query) 3534 if (query)
3977 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);
3978 else 3536 else
3979 { 3537 {
3980 set_locale (str); 3538 set_locale (str);
3981 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3982 init_xlocale (); 3540 init_xlocale ();
… …
3997 break; 3555 break;
3998#endif 3556#endif
3999 3557
4000#if ENABLE_PERL 3558#if ENABLE_PERL
4001 case URxvt_perl: 3559 case URxvt_perl:
4002 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)))
4003 ; // no responses yet 3561 ; // no responses yet
4004 break; 3562 break;
4005#endif 3563#endif
4006 } 3564 }
4007} 3565}
… …
4045{ 3603{
4046 unsigned int i, j; 3604 unsigned int i, j;
4047 int state; 3605 int state;
4048 3606
4049 static const struct 3607 static const struct
4050 { 3608 {
4051 const int argval; 3609 const int argval;
4052 const unsigned long bit; 3610 const unsigned long bit;
4053 }
4054
4055 argtopriv[] = { 3611 } argtopriv[] = {
4056 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4057 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4058 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4059 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4060 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
… …
4077#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4078 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4079#endif 3635#endif
4080 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4081 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4082 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4083 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4084 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4085 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4086 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4087 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4088 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
4123 scr_touch (true); 3679 scr_touch (true);
4124 break; 3680 break;
4125#endif 3681#endif
4126 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4127 case 1049: 3683 case 1049:
4128 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4129 if (mode == 0) 3685 if (mode == 0)
4130 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4131 else if (mode == 1) 3687 else if (mode == 1)
4132 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4133 break; 3689 break;
… …
4162 scr_autowrap (state); 3718 scr_autowrap (state);
4163 break; 3719 break;
4164 /* 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 */
4165 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4166 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4167 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4168 break; 3724 break;
4169#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4170 case scrollBar_esc: 3726 case scrollBar_esc:
4171 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4172 { 3728 {
… …
4185 break; 3741 break;
4186 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4187 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4188 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4189 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4190 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4191 break; 3747 break;
4192#if 0 3748#if 0
4193 case 1001: 3749 case 1001:
4194 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4195#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;
4196 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4197 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
4198 break; 3764 break;
4199 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4200 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
4201 break; 3767 break;
4202 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3771 scr_erase_screen (2);
4206 scr_change_screen (state); 3772 scr_change_screen (state);
4207 break; 3773 break;
4208 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state); 3775 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3778 scr_erase_screen (2);
4213 break; 3779 break;
4214 default: 3780 default:
4215 break; 3781 break;
… …
4343 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
4344 break; 3910 break;
4345 3911
4346 //case 50: // not variable spacing 3912 //case 50: // not variable spacing
4347 3913
4348#if ENABLE_FRILLS 3914#if !ENABLE_MINIMAL
4349 case 90: 3915 case 90:
4350 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
4351 case 92: 3917 case 92:
4352 case 93: 3918 case 93:
4353 case 94: 3919 case 94:
… …
4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4438 4004
4439 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4440 v_buflen += len; 4006 v_buflen += len;
4441 4007
4442 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4443} 4009}
4444 4010
4445void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4446{ 4012{
4447 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));
… …
4452 4018
4453 if (v_buflen == 0) 4019 if (v_buflen == 0)
4454 { 4020 {
4455 free (v_buffer); 4021 free (v_buffer);
4456 v_buffer = 0; 4022 v_buffer = 0;
4457 v_buflen = 0;
4458 4023
4459 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4460 return; 4025 return;
4461 } 4026 }
4462 4027
4463 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4464 } 4029 }
4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4466 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4467} 4032}
4468 4033
4469/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4470 4035

Diff Legend

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