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.288 by root, Sat Jan 28 20:33:31 2006 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines