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.293 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.360 by ayin, Wed Oct 24 10:39:57 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,
… …
299 297
300 return -1; 298 return -1;
301} 299}
302#endif 300#endif
303 301
304/*{{{ Convert the keypress event into a string */
305void 302void
306rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
307{ 304{
308 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
309 unsigned int newlen; 306 unsigned int newlen;
310 KeySym keysym; 307 KeySym keysym;
311 int valid_keysym; 308 int valid_keysym;
312 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
313 315
314 /* 316 /*
315 * 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
316 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
317 * 319 *
… …
497# if ISO_14755 499# if ISO_14755
498 iso14755_51 (0); 500 iso14755_51 (0);
499# endif 501# endif
500 return; 502 return;
501 } 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 }
502 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
503 { 513 {
504 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
505 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
506# if ISO_14755 516# if ISO_14755
… …
508# endif 518# endif
509 return; 519 return;
510 } 520 }
511 else 521 else
512 { 522 {
513# if ENABLE_OVERLAY 523# if ISO_14755
514 scr_overlay_off (); 524 scr_overlay_off ();
515# endif 525# endif
516 iso14755buf = 0; 526 iso14755buf = 0;
517 } 527 }
518 } 528 }
519 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
520 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
521 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
522 { 532 {
523 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
524# if ENABLE_OVERLAY 534# if ISO_14755
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 537# endif
528 } 538 }
529#endif 539#endif
530 540
531#ifdef PRINTPIPE 541#ifdef PRINTPIPE
532 if (keysym == XK_Print) 542 if (keysym == XK_Print)
533 { 543 {
534 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
535 return; 545 return;
… …
537#endif 547#endif
538 548
539 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
540 { 550 {
541 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
542 newlen = 1; 553 newlen = 1;
543 switch (keysym) 554 switch (keysym)
544 { 555 {
545#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
546 case XK_BackSpace: 557 case XK_BackSpace:
… …
549 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
550 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
551 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
552 } 563 }
553 else 564 else
554 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
555 break; 566 break;
556#endif 567#endif
557#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
559 case XK_KP_Delete: 570 case XK_KP_Delete:
560 /* allow shift to override */ 571 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
562 { 573 {
563 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
564 break; 575 break;
565 } 576 }
566 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
567# endif 578# endif
568 case XK_Delete: 579 case XK_Delete:
569 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
570 break; 581 break;
571#endif 582#endif
572 case XK_Tab: 583 case XK_Tab:
573 if (shft) 584 if (shft)
574 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
589#ifdef XK_KP_Left 600#ifdef XK_KP_Left
590 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
591 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
592 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
593 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
595 { 606 {
596 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
597 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
598 break; 609 break;
599 } 610 }
… …
622 633
623#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
624# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
625 case XK_KP_Prior: 636 case XK_KP_Prior:
626 /* allow shift to override */ 637 /* allow shift to override */
627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
628 { 639 {
629 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
630 break; 641 break;
631 } 642 }
632 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
635 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
636 break; 647 break;
637# ifdef XK_KP_Next 648# ifdef XK_KP_Next
638 case XK_KP_Next: 649 case XK_KP_Next:
639 /* allow shift to override */ 650 /* allow shift to override */
640 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
641 { 652 {
642 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
643 break; 654 break;
644 } 655 }
645 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
648 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
649 break; 660 break;
650#endif 661#endif
651 case XK_KP_Enter: 662 case XK_KP_Enter:
652 /* allow shift to override */ 663 /* allow shift to override */
653 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
654 { 665 {
655 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
656 break; 667 break;
657 } 668 }
658 669
… …
701 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
702 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
703 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
704 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
705 /* allow shift to override */ 716 /* allow shift to override */
706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
707 { 718 {
708 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
709 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
710 } 721 }
711 else 722 else
… …
717 728
718 case XK_Find: 729 case XK_Find:
719 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
720 break; 731 break;
721 732
722#ifdef XK_KP_End 733#ifdef XK_KP_Insert
723 case XK_KP_Insert: 734 case XK_KP_Insert:
724 /* allow shift to override */ 735 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
726 { 737 {
727 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
728 break; 739 break;
729 } 740 }
730 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
743 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
744 break; 755 break;
745#ifdef XK_KP_End 756#ifdef XK_KP_End
746 case XK_KP_End: 757 case XK_KP_End:
747 /* allow shift to override */ 758 /* allow shift to override */
748 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
749 { 760 {
750 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
751 break; 762 break;
752 } 763 }
753 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
756 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
757 break; 768 break;
758#ifdef XK_KP_Home 769#ifdef XK_KP_Home
759 case XK_KP_Home: 770 case XK_KP_Home:
760 /* allow shift to override */ 771 /* allow shift to override */
761 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
762 { 773 {
763 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
764 break; 775 break;
765 } 776 }
766 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
874 return; 885 return;
875 886
876 if (len <= 0) 887 if (len <= 0)
877 return; /* not mapped */ 888 return; /* not mapped */
878 889
879 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 891 if (view_start)
881 { 892 {
882 view_start = 0; 893 view_start = 0;
883 want_refresh = 1; 894 want_refresh = 1;
884 } 895 }
… …
908 tt_write (&ch, 1); 919 tt_write (&ch, 1);
909 } 920 }
910 921
911 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
912} 923}
913/*}}} */ 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}
914 1001
915#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
916unsigned int 1003unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 1005{
… …
947 1034
948void 1035void
949rxvt_term::flush () 1036rxvt_term::flush ()
950{ 1037{
951 flush_ev.stop (); 1038 flush_ev.stop ();
952 1039
953#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
954 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
955 { 1042 {
956 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
957 scr_clear ();
958 scr_touch (false); 1044 scr_touch (false);
959 } 1045 }
960#endif 1046#endif
961 1047
962 if (want_refresh) 1048 if (want_refresh)
… …
1023void 1109void
1024rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1025{ 1111{
1026 make_current (); 1112 make_current ();
1027 1113
1028 refresh_limit = 1;
1029 refresh_count = 0; 1114 refresh_count = 0;
1030 flush (); 1115 flush ();
1031} 1116}
1032 1117
1033#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1181 }
1097} 1182}
1098#endif 1183#endif
1099 1184
1100#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1101static struct event_handler 1186static struct event_handler
1102{ 1187{
1103 check_watcher cw_yield; 1188 check_watcher yield_ev;
1104 1189
1105 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1106 { 1191 {
1107 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
1108 w.stop (); 1200 w.stop ();
1109 } 1201 }
1110 1202
1111 event_handler () 1203 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1113 { 1205 {
1114 } 1206 }
1115} event_handler; 1207} event_handler;
1116#endif 1208#endif
1117 1209
… …
1137 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1138 return true; 1230 return true;
1139 } 1231 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1233 {
1142#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1143 if (display->is_local) 1235 if (display->is_local)
1144 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1145#endif 1237#endif
1146 } 1238 }
1147 else 1239 else
1148 { 1240 {
1149 pty_ev.stop (); 1241 pty_ev.stop ();
1150 1242
1151 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1152 destroy (); 1244 destroy ();
1153 } 1245 }
1154 1246
1155 return false; 1247 return false;
1156} 1248}
1157 1249
1158void 1250void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1171} 1263}
1172 1264
1173void 1265void
1174rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1175{ 1267{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1269 recolour_cursor ();
1178 1270
1179#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1272 hidden_pointer = 0;
1181 1273
1182 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1184#endif 1276#endif
1185} 1277}
1186 1278
1187#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1188void 1280void
1189rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1190{ 1282{
1191 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1192 return; 1284 return;
1193 1285
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1287 XFlush (dpy);
1196 1288
1197 hidden_pointer = 1; 1289 hidden_pointer = 1;
1198} 1290}
1199 1291
1200void 1292void
… …
1209void 1301void
1210rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1211{ 1303{
1212 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1213 int x, y; 1305 int x, y;
1306 int code = 32;
1214 1307
1215 x = ev.x; 1308 x = Pixel2Col (ev.x);
1216 y = ev.y; 1309 y = Pixel2Row (ev.y);
1217 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 }
1218 1317
1219 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1220 button_number = 3; 1319 button_number = 3;
1221 else 1320 else
1222 { 1321 {
… …
1268 x + 1, 1367 x + 1,
1269 y + 1); 1368 y + 1);
1270#endif 1369#endif
1271 1370
1272 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1273 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1274 (32 + x + 1), 1373 (32 + x + 1),
1275 (32 + y + 1)); 1374 (32 + y + 1));
1276} 1375}
1277 1376
1278/*{{{ process an X event */ 1377/*{{{ process an X event */
1279void 1378void
1280rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1281{ 1380{
1282 make_current (); 1381 make_current ();
1283 1382
1284 dLocal (Display *, xdisp); 1383 dLocal (Display *, dpy);
1285 1384
1286 if (ev.xany.window == vt 1385 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1386 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1387 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1388 return;
… …
1294 unsigned int unused_mask; 1393 unsigned int unused_mask;
1295 1394
1296 switch (ev.type) 1395 switch (ev.type)
1297 { 1396 {
1298 case KeyPress: 1397 case KeyPress:
1299#if ISO_14755 1398 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1399 break;
1305 1400
1306 case KeyRelease: 1401 case KeyRelease:
1307 { 1402 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1403 break;
1379 }
1380 1404
1381 case ButtonPress: 1405 case ButtonPress:
1382 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1383 break; 1407 break;
1384 1408
… …
1399 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)))
1400 destroy (); 1424 destroy ();
1401 } 1425 }
1402#if ENABLE_EWMH 1426#if ENABLE_EWMH
1403 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])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1428 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1429 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1430 &ev);
1407#endif 1431#endif
1408 } 1432 }
1409 } 1433 }
… …
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out (); 1440 focus_out ();
1417 } 1441 }
1418#endif 1442#endif
1419 } 1443 }
1420 break;
1421
1422 case MappingNotify:
1423 XRefreshKeyboardMapping (&ev.xmapping);
1424 break; 1444 break;
1425 1445
1426 /* 1446 /*
1427 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1428 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1447 break; 1467 break;
1448 } 1468 }
1449 break; 1469 break;
1450 1470
1451 case FocusIn: 1471 case FocusIn:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1475 focus_in ();
1453 break; 1476 break;
1454 1477
1455 case FocusOut: 1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1482 focus_out ();
1457 break; 1483 break;
1458 1484
1459 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); */
1460 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1461 { 1490 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1492 ;
1464 1493
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1495 {
1467 seen_resize = 1; 1496 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1498 }
1470 1499 else
1500 {
1501#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1504#endif
1505 }
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1477 } 1507 }
1478 break; 1508 break;
1479 1509
1480 case PropertyNotify: 1510 case PropertyNotify:
1481 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)))
… …
1512 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1513#endif 1543#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1545 break;
1516 1546
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522
1523 case GraphicsExpose: 1547 case GraphicsExpose:
1524 case Expose: 1548 case Expose:
1525 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1526 { 1550 {
1527 do 1551 do
1552 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1557
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1559
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1537 1564 }
1538 want_refresh = 1; 1565 want_refresh = 1;
1539 } 1566 }
1540 else 1567 else
1541 { 1568 {
1542 XEvent unused_event; 1569 XEvent unused_event;
1543 1570
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1572 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1574 ;
1548 1575
1549 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1550 { 1577 {
1551 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1552 scrollbar_show (0); 1579 scrollbar_show (0);
1553 } 1580 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1581 }
1560 break; 1582 break;
1561 1583
1562 case MotionNotify: 1584 case MotionNotify:
1563#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1586 if (hidden_pointer)
1565 pointer_unblank (); 1587 pointer_unblank ();
1566#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);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1593 break;
1569 1594
1570 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1571 { 1596 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1599 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1601 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1603 ;
1579 1604
1580 XQueryPointer (xdisp, vt, 1605 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1609 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1649#endif 1674#endif
1650 } 1675 }
1651 } 1676 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1653 { 1678 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1656 ; 1681 ;
1657 1682
1658 XQueryPointer (xdisp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1687 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1689 scrollbar_size ());
1665 want_refresh = 1; 1690 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1691 scrollbar_show (1);
1668 } 1692 }
1669 break; 1693 break;
1670 } 1694 }
1671 1695
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1696#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1697 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1698 {
1677 if (hidden_cursor) 1699 if (hidden_cursor)
1678 { 1700 {
1679 hidden_cursor = 0; 1701 hidden_cursor = 0;
1680 want_refresh = 1; 1702 want_refresh = 1;
… …
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 } 1706 }
1685#endif 1707#endif
1686 1708
1687#if defined(POINTER_BLANK) 1709#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1711 {
1690 if (ev.type == MotionNotify 1712 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1713 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1714 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1715 if (hidden_pointer)
… …
1705 if (!focus) 1727 if (!focus)
1706 { 1728 {
1707 focus = 1; 1729 focus = 1;
1708 want_refresh = 1; 1730 want_refresh = 1;
1709 1731
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1733
1712#if USE_XIM 1734#if USE_XIM
1713 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1714 { 1736 {
1715 IMSetStatusPosition (); 1737 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1717 } 1739 }
1718#endif 1740#endif
1719#if CURSOR_BLINK 1741#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif 1744#endif
1723#if OFF_FOCUS_FADING 1745#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1746 if (rs[Rs_fade])
1725 { 1747 {
1726 pix_colors = pix_colors_focused; 1748 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1749 scr_recolour ();
1728 } 1750 }
1729#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
1730 } 1762 }
1731} 1763}
1732 1764
1733void 1765void
1734rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1742 1774
1743#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf) 1776 if (iso14755buf)
1745 { 1777 {
1746 iso14755buf = 0; 1778 iso14755buf = 0;
1747# if ENABLE_OVERLAY 1779# if ISO_14755
1748 scr_overlay_off (); 1780 scr_overlay_off ();
1749# endif 1781# endif
1750 } 1782 }
1751#endif 1783#endif
1752#if USE_XIM 1784#if USE_XIM
1753 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1755#endif 1787#endif
1756#if CURSOR_BLINK 1788#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1759 hidden_cursor = 0; 1791 hidden_cursor = 0;
1760#endif 1792#endif
1761#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
… …
1766 } 1798 }
1767#endif 1799#endif
1768 } 1800 }
1769} 1801}
1770 1802
1771#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
1772void 1817void
1773rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1819{
1775 make_current (); 1820 make_current ();
1776 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
1777 switch (ev.type) 1827 switch (ev.type)
1778 { 1828 {
1779 case PropertyNotify: 1829 case PropertyNotify:
1780 /* 1830 /*
1781 * 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,
1782 * 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.
1783 */ 1833 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1836 {
1787 1837 bgPixmap.set_root_pixmap ();
1788 /* FALLTHROUGH */ 1838 update_background ();
1789 case ReparentNotify: 1839 }
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1840 break;
1793 } 1841 }
1842# endif
1794} 1843}
1795#endif 1844#endif
1796 1845
1797void 1846void
1798rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
… …
2126 selection_make (ev.time); 2175 selection_make (ev.time);
2127 break; 2176 break;
2128 2177
2129 case Button2: 2178 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2181 break;
2133 2182
2134#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2135 case Button4: 2184 case Button4:
2136 case Button5: 2185 case Button5:
… …
2140 2189
2141 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2142 2191
2143 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2144 i = 1; 2193 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2194 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2195 i = nrow - 1;
2147 else 2196 else
2148 i = 5; 2197 i = 5;
2149 2198
2150# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
… …
2171 break; 2220 break;
2172#endif 2221#endif
2173 } 2222 }
2174 } 2223 }
2175} 2224}
2176
2177#ifdef TRANSPARENT
2178#if TINTING
2179/* taken from aterm-0.4.2 */
2180
2181typedef uint32_t RUINT32T;
2182
2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2184{
2185 int sh_r, sh_g, sh_b;
2186 RUINT32T mask_r, mask_g, mask_b;
2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2190 int i;
2191
2192 Visual *visual = term->visual;
2193
2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2195
2196 /* for convenience */
2197 mask_r = visual->red_mask;
2198 mask_g = visual->green_mask;
2199 mask_b = visual->blue_mask;
2200
2201 /* boring lookup table pre-initialization */
2202 switch (srcImage->bits_per_pixel) {
2203 case 15:
2204 if ((mask_r != 0x7c00) ||
2205 (mask_g != 0x03e0) ||
2206 (mask_b != 0x001f))
2207 return;
2208 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2209 lookup_r = lookup;
2210 lookup_g = lookup+32;
2211 lookup_b = lookup+32+32;
2212 sh_r = 10;
2213 sh_g = 5;
2214 sh_b = 0;
2215 break;
2216 case 16:
2217 if ((mask_r != 0xf800) ||
2218 (mask_g != 0x07e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+64;
2225 sh_r = 11;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 24:
2230 if ((mask_r != 0xff0000) ||
2231 (mask_g != 0x00ff00) ||
2232 (mask_b != 0x0000ff))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2235 lookup_r = lookup;
2236 lookup_g = lookup+256;
2237 lookup_b = lookup+256+256;
2238 sh_r = 16;
2239 sh_g = 8;
2240 sh_b = 0;
2241 break;
2242 case 32:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 default:
2256 return; /* we do not support this color depth */
2257 }
2258
2259 /* prepare limits for color transformation (each channel is handled separately) */
2260 if (shade < 0) {
2261 shade = -shade;
2262 if (shade < 0) shade = 0;
2263 if (shade > 100) shade = 100;
2264
2265 lower_lim_r = 65535-rm;
2266 lower_lim_g = 65535-gm;
2267 lower_lim_b = 65535-bm;
2268
2269 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2270 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2271 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2272
2273 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2274 } else {
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2279
2280 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2281 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2282 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2283 }
2284
2285 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2286 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2287 {
2288 unsigned int tmp;
2289
2290 tmp = lower_lim_r;
2291 lower_lim_r = lower_lim_b;
2292 lower_lim_b = tmp;
2293
2294 tmp = upper_lim_r;
2295 upper_lim_r = upper_lim_b;
2296 upper_lim_b = tmp;
2297 }
2298
2299 /* fill our lookup tables */
2300 for (i = 0; i <= mask_r>>sh_r; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2304 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2305 lookup_r[i] = (tmp/65535)<<sh_r;
2306 }
2307 for (i = 0; i <= mask_g>>sh_g; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2311 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2312 lookup_g[i] = (tmp/65535)<<sh_g;
2313 }
2314 for (i = 0; i <= mask_b>>sh_b; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2318 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2319 lookup_b[i] = (tmp/65535)<<sh_b;
2320 }
2321
2322 /* apply table to input image (replacing colors by newly calculated ones) */
2323 switch (srcImage->bits_per_pixel)
2324 {
2325 case 15:
2326 {
2327 unsigned short *p1, *pf, *p, *pl;
2328 p1 = (unsigned short *) srcImage->data;
2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2330 while (p1 < pf)
2331 {
2332 p = p1;
2333 pl = p1 + srcImage->width;
2334 for (; p < pl; p++)
2335 {
2336 *p = lookup_r[(*p & 0x7c00)>>10] |
2337 lookup_g[(*p & 0x03e0)>> 5] |
2338 lookup_b[(*p & 0x001f)];
2339 }
2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 16:
2345 {
2346 unsigned short *p1, *pf, *p, *pl;
2347 p1 = (unsigned short *) srcImage->data;
2348 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width;
2353 for (; p < pl; p++)
2354 {
2355 *p = lookup_r[(*p & 0xf800)>>11] |
2356 lookup_g[(*p & 0x07e0)>> 5] |
2357 lookup_b[(*p & 0x001f)];
2358 }
2359 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2360 }
2361 break;
2362 }
2363 case 24:
2364 {
2365 unsigned char *p1, *pf, *p, *pl;
2366 p1 = (unsigned char *) srcImage->data;
2367 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width * 3;
2372 for (; p < pl; p += 3)
2373 {
2374 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2375 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2376 p[2] = lookup_r[(p[2] & 0x0000ff)];
2377 }
2378 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 32:
2383 {
2384 RUINT32T *p1, *pf, *p, *pl;
2385 p1 = (RUINT32T *) srcImage->data;
2386 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0xff0000)>>16] |
2395 lookup_g[(*p & 0x00ff00)>> 8] |
2396 lookup_b[(*p & 0x0000ff)] |
2397 (*p & ~0xffffff);
2398 }
2399 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2400 }
2401 break;
2402 }
2403 }
2404
2405 free (lookup);
2406}
2407#endif
2408
2409/*
2410 * Check our parents are still who we think they are.
2411 * Do transparency updates if required
2412 */
2413int
2414rxvt_term::check_our_parents ()
2415{
2416 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after;
2418 Atom atype;
2419 unsigned char *prop = NULL;
2420 Window root, oldp, *list;
2421 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr;
2423
2424 pchanged = 0;
2425
2426 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */
2428
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth;
2431
2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2433
2434 if (rootdepth != wattr.depth)
2435 {
2436 if (am_transparent)
2437 {
2438 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0;
2441 }
2442
2443 return pchanged; /* Don't try any more */
2444 }
2445
2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False);
2448
2449 /*
2450 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that.
2453 */
2454 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL
2466#if TINTING
2467 || !rs[Rs_color + Color_tint]
2468#endif
2469 )
2470 have_pixmap = 0;
2471 else
2472 {
2473 have_pixmap = 1;
2474 rootpixmap = *(Pixmap *)prop;
2475 XFree (prop);
2476 }
2477
2478 if (have_pixmap)
2479 {
2480 /*
2481 * Copy display->root pixmap transparency
2482 */
2483 int sx, sy, nx, ny;
2484 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height;
2494 nx = ny = 0;
2495
2496 if (sx < 0)
2497 {
2498 nw += sx;
2499 nx = -sx;
2500 sx = 0;
2501 }
2502
2503 if (sy < 0)
2504 {
2505 nh += sy;
2506 ny = -sy;
2507 sy = 0;
2508 }
2509
2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2514 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */
2519 allowedxerror = 0;
2520
2521 if (image == NULL)
2522 {
2523 if (am_transparent && am_pixmap_trans)
2524 {
2525 pchanged = 1;
2526 if (pixmap != None)
2527 {
2528 XFreePixmap (xdisp, pixmap);
2529 pixmap = None;
2530 }
2531 }
2532
2533 am_pixmap_trans = 0;
2534 }
2535 else
2536 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545
2546 pix_colors_focused[Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]);
2560
2561 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1;
2563
2564 am_transparent = am_pixmap_trans = 1;
2565 }
2566 }
2567
2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2571 {
2572 unsigned int n;
2573 /*
2574 * InheritPixmap transparency
2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 {
2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root,
2580 &parent[i], &list, &n);
2581 XFree (list);
2582
2583 if (parent[i] == display->root)
2584 {
2585 if (oldp != None)
2586 pchanged = 1;
2587
2588 break;
2589 }
2590
2591 if (oldp != parent[i])
2592 pchanged = 1;
2593 }
2594
2595 n = 0;
2596
2597 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++)
2600 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break;
2606 }
2607 }
2608 }
2609
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2611 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */
2616 }
2617 else
2618 {
2619 for (n = 0; n < (unsigned int)i; n++)
2620 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]);
2623 }
2624
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2626 am_transparent = 1;
2627 }
2628
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None;
2631 }
2632
2633 if (scrollBar.win)
2634 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle ();
2637 scrollbar_show (0);
2638 }
2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2647 return pchanged;
2648}
2649#endif
2650 2225
2651/*}}} */ 2226/*}}} */
2652 2227
2653bool 2228bool
2654rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
… …
2703 if (ch == C0_LF) 2278 if (ch == C0_LF)
2704 nlines++; 2279 nlines++;
2705 2280
2706 refresh_count++; 2281 refresh_count++;
2707 2282
2708 if (!OPTION (Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2284 {
2711 refreshnow = true;
2712 refresh_count = 0; 2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2289 refreshnow = true;
2713 ch = NOCHAR; 2290 ch = NOCHAR;
2714 break; 2291 break;
2292 }
2715 } 2293 }
2716 2294
2717 // scr_add_lines only works for nlines <= nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2718 if (nlines >= nrow - 1) 2296 if (nlines >= nrow - 1)
2719 { 2297 {
… …
2747 && 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))))
2748 scr_add_lines (buf, str - buf, nlines); 2326 scr_add_lines (buf, str - buf, nlines);
2749 2327
2750 /* 2328 /*
2751 * 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
2752 * 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.
2753 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2754 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2332 */
2756 if (refreshnow) 2333 if (refreshnow)
2757 { 2334 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++;
2760 else
2761 {
2762 flag = true; 2335 flag = true;
2763 scr_refresh (); 2336 scr_refresh ();
2764 want_refresh = 1; 2337 want_refresh = 1;
2765 }
2766 } 2338 }
2767 2339
2768 } 2340 }
2769 else 2341 else
2770 { 2342 {
… …
2919 { 2491 {
2920 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2921 break; /* done = 1 */ 2493 break; /* done = 1 */
2922 } 2494 }
2923 } 2495 }
2924 2496
2925 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2926 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2927 { 2499 {
2928 done = 1; 2500 done = 1;
2929 break; 2501 break;
… …
2991 process_dcs_seq (); 2563 process_dcs_seq ();
2992 break; 2564 break;
2993 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
2994 process_csi_seq (); 2566 process_csi_seq ();
2995 break; 2567 break;
2996 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
2997 process_osc_seq (); 2569 process_osc_seq ();
2998 break; 2570 break;
2999#endif 2571#endif
3000 } 2572 }
3001} 2573}
… …
3091 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3092 break; 2664 break;
3093 case '+': 2665 case '+':
3094 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3095 break; 2667 break;
3096#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3097 case '6': 2669 case '6':
3098 scr_backindex (); 2670 scr_backindex ();
3099 break; 2671 break;
3100#endif 2672#endif
3101 case '7': 2673 case '7':
3102 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3103 break; 2675 break;
3104 case '8': 2676 case '8':
3105 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3106 break; 2678 break;
3107#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3108 case '9': 2680 case '9':
3109 scr_forwardindex (); 2681 scr_forwardindex ();
3110 break; 2682 break;
3111#endif 2683#endif
3112 case '=': 2684 case '=':
… …
3227rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3228{ 2800{
3229 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3230 unsigned int nargs, p; 2802 unsigned int nargs, p;
3231 int n, ndef; 2803 int n, ndef;
3232 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3233 2805
3234 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3235 arg[--nargs] = 0;
3236 2807
3237 priv = 0; 2808 priv = 0;
3238 ch = cmd_getc (); 2809 ch = cmd_getc ();
3239 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
3240 { /* '<' '=' '>' '?' */ 2811 { /* '<' '=' '>' '?' */
… …
3284 switch (priv) 2855 switch (priv)
3285 { 2856 {
3286 case '>': 2857 case '>':
3287 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3288 { 2859 {
3289 // 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,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 // 2862 //
3292 // 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
3293 // 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
3294 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
3295 // 2866 //
3296 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
3297 } 2868 }
3298 break; 2869 break;
3299 case '?': 2870 case '?':
3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3301 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
… …
3428 break; 2999 break;
3429 case 6: /* CPR requested */ 3000 case 6: /* CPR requested */
3430 scr_report_position (); 3001 scr_report_position ();
3431 break; 3002 break;
3432 case 7: /* unofficial extension */ 3003 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 3004 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3005 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 3006 break;
3436 case 8: /* unofficial extension */ 3007 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3008 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 3009 break;
… …
3505 break; 3076 break;
3506 case CSI_75: 3077 case CSI_75:
3507 scr_cursor (RESTORE); 3078 scr_cursor (RESTORE);
3508 break; 3079 break;
3509 3080
3510#if ENABLE_FRILLS 3081#if !ENABLE_MINIMAL
3511 case CSI_74: 3082 case CSI_74:
3512 process_window_ops (arg, nargs); 3083 process_window_ops (arg, nargs);
3513 break; 3084 break;
3514#endif 3085#endif
3515 3086
… …
3522 break; 3093 break;
3523 } 3094 }
3524} 3095}
3525/*}}} */ 3096/*}}} */
3526 3097
3527#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3528/* ARGSUSED */ 3099/* ARGSUSED */
3529void 3100void
3530rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3531{ 3102{
3532 int x, y; 3103 int x, y;
3533 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
3534 Window wdummy; 3105 Window wdummy;
3535 3106
3536 dLocal (Display *, xdisp); 3107 dLocal (Display *, dpy);
3537 3108
3538 if (nargs == 0) 3109 if (nargs == 0)
3539 return; 3110 return;
3540 3111
3541 switch (args[0]) 3112 switch (args[0])
3542 { 3113 {
3543 /* 3114 /*
3544 * commands 3115 * commands
3545 */ 3116 */
3546 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3118 XMapWindow (dpy, parent[0]);
3548 break; 3119 break;
3549 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3122 break;
3552 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3125 break;
3555 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3128 break;
3558 case 5: /* raise window */ 3129 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3130 XRaiseWindow (dpy, parent[0]);
3560 break; 3131 break;
3561 case 6: /* lower window */ 3132 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3133 XLowerWindow (dpy, parent[0]);
3563 break; 3134 break;
3564 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3565 scr_touch (true); 3136 scr_touch (true);
3566 break; 3137 break;
3567 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3577 break; 3148 break;
3578 3149
3579
3580 /* 3150 /*
3581 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3582 */ 3152 */
3583 case 11: /* report window state */ 3153 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3156 break;
3587 case 13: /* report window position */ 3157 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3163 break;
3594 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3167 break;
3598 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3170 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3173 break;
3604 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3605 { 3175 {
3606 char *s; 3176 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3177 XGetIconName (dpy, parent[0], &s);
3608 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 */
3609 XFree (s); 3179 XFree (s);
3610 } 3180 }
3611 break; 3181 break;
3612 case 21: /* report window title */ 3182 case 21: /* report window title */
3613 { 3183 {
3614 char *s; 3184 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3185 XFetchName (dpy, parent[0], &s);
3616 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 */
3617 XFree (s); 3187 XFree (s);
3618 } 3188 }
3619 break; 3189 break;
3620 } 3190 }
3621} 3191}
… …
3648 seen_esc = true; 3218 seen_esc = true;
3649 continue; 3219 continue;
3650 } 3220 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3221 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3222 break;
3223 else if (ch == C0_SYN)
3224 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3225 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3226 return NULL; /* other control character - exit */
3655 3227
3656 seen_esc = false; 3228 seen_esc = false;
3657 3229
3658 if (n >= STRING_MAX - 1) 3230 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3231 // stop at some sane length
3660 return NULL; 3232 return NULL;
3661 3233
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3234 string[n++] = ch;
3666 } 3235 }
3667 3236
3668 string[n++] = '\0'; 3237 string[n++] = '\0';
3669 3238
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3239 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3290void
3722rxvt_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)
3723{ 3292{
3724 if (str[0] == '?' && !str[1]) 3293 if (str[0] == '?' && !str[1])
3725 { 3294 {
3726 rxvt_rgba c; 3295 rgba c;
3727 pix_colors_focused[color].get (this, c); 3296 pix_colors_focused[color].get (c);
3728 3297
3729#if XFT 3298#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3299 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3300 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3301 else
3733#endif 3302#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3304 }
… …
3746 int color; 3315 int color;
3747 char *buf, *name; 3316 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3317 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3318 int saveop = op;
3750 3319
3751 dLocal (Display *, xdisp); 3320 dLocal (Display *, dpy);
3752 3321
3753 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
3754 switch (op) 3327 switch (op)
3755 { 3328 {
3756 case XTerm_name: 3329 case XTerm_name:
3757 set_title (str); 3330 set_title (str);
3758 /* FALLTHROUGH */ 3331 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3345 unsigned long bytes_after;
3773 unsigned char *value = 0; 3346 unsigned char *value = 0;
3774 const char *str = ""; 3347 const char *str = "";
3775 3348
3776 if (prop 3349 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3350 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3351 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3352 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3353 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3354 && actual_type != None
3782 && actual_format == 8) 3355 && actual_format == 8)
… …
3794 { 3367 {
3795 *eq = 0; 3368 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3369 set_utf8_property (display->atom (str), eq + 1);
3797 } 3370 }
3798 else 3371 else
3799 XDeleteProperty (xdisp, parent[0], 3372 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3373 display->atom (str));
3801 } 3374 }
3802 break; 3375 break;
3803 3376
3804 case XTerm_Color: 3377 case XTerm_Color:
… …
3850 break; 3423 break;
3851 case URxvt_Color_IT: 3424 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp); 3425 process_color_seq (op, Color_IT, str, resp);
3853 break; 3426 break;
3854#endif 3427#endif
3855#if TRANSPARENT && TINTING 3428#if ENABLE_TRANSPARENCY
3856 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3858 check_our_parents (); 3431 {
3859 if (am_transparent) 3432 bool changed = false;
3860 want_full_refresh = want_refresh = 1; 3433 if (ISSET_PIXCOLOR (Color_tint))
3861 break; 3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3862#endif 3435 else
3436 changed = bgPixmap.unset_tint ();
3437 if (changed)
3438 update_background ();
3439 }
3863 3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3864 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3865 { 3446 if (!strcmp (str, "?"))
3866 if (*str != ';')
3867 { 3447 {
3868#if XPM_BACKGROUND 3448 char str[256];
3869 scale_pixmap (""); /* reset to default scaling */ 3449
3870 set_bgPixmap (str); /* change pixmap */ 3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3871 scr_touch (true); 3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3872#endif 3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3873 } 3454 }
3874 3455 else
3456 {
3875 int changed = 0; 3457 int changed = 0;
3876 3458
3877 while ((str = strchr (str, ';')) != NULL) 3459 if (*str != ';')
3878 { 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 {
3879 str++; 3471 str++;
3880#if XPM_BACKGROUND 3472 if (bgPixmap.set_geometry (str))
3881 changed += scale_pixmap (str); 3473 changed++;
3882#endif 3474 str = strchr (str, ';');
3883 } 3475 }
3884
3885 if (changed) 3476 if (changed)
3886 { 3477 update_background ();
3887#ifdef XPM_BACKGROUND
3888 resize_pixmap ();
3889 scr_touch (true);
3890#endif
3891 } 3478 }
3892 }
3893 break; 3479 break;
3480#endif
3894 3481
3895 case Rxvt_restoreFG: 3482 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str); 3483 set_window_color (Color_fg, str);
3897 break; 3484 break;
3898 case Rxvt_restoreBG: 3485 case Rxvt_restoreBG:
… …
3923 case URxvt_italicFont: 3510 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3511 case URxvt_boldItalicFont:
3925#endif 3512#endif
3926 if (query) 3513 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3514 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3515 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3516 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3517 resp);
3931 else 3518 else
3932 { 3519 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3520 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3944 op, 3531 op,
3945 rs[Rs_name], VERSION[0], VERSION[2], 3532 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp); 3533 resp);
3947 break; 3534 break;
3948 3535
3949#if ENABLE_FRILLS 3536#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3537 case URxvt_locale:
3951 if (query) 3538 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3539 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3540 else
3954 { 3541 {
3955 set_locale (str); 3542 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3543 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3544 init_xlocale ();
… …
3972 break; 3559 break;
3973#endif 3560#endif
3974 3561
3975#if ENABLE_PERL 3562#if ENABLE_PERL
3976 case URxvt_perl: 3563 case URxvt_perl:
3977 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)))
3978 ; // no responses yet 3565 ; // no responses yet
3979 break; 3566 break;
3980#endif 3567#endif
3981 } 3568 }
3982} 3569}
… …
4020{ 3607{
4021 unsigned int i, j; 3608 unsigned int i, j;
4022 int state; 3609 int state;
4023 3610
4024 static const struct 3611 static const struct
4025 { 3612 {
4026 const int argval; 3613 const int argval;
4027 const unsigned long bit; 3614 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3615 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
4032 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
4034 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
4035 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
… …
4052#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
4053 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
4054#endif 3639#endif
4055 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
4056 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4057 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
4058 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
4059 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4060 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
4061 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
4062 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
4063 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
4098 scr_touch (true); 3683 scr_touch (true);
4099 break; 3684 break;
4100#endif 3685#endif
4101 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4102 case 1049: 3687 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3689 if (mode == 0)
4105 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4106 else if (mode == 1) 3691 else if (mode == 1)
4107 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4108 break; 3693 break;
… …
4137 scr_autowrap (state); 3722 scr_autowrap (state);
4138 break; 3723 break;
4139 /* 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 */
4140 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4141 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3728 break;
4144#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4145 case scrollBar_esc: 3730 case scrollBar_esc:
4146 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4147 { 3732 {
… …
4160 break; 3745 break;
4161 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
4162 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
4163 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
4164 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3751 break;
4167#if 0 3752#if 0
4168 case 1001: 3753 case 1001:
4169 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4170#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;
4171 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
4172 set_option (Opt_scrollTtyOutput, !state); 3767 set_option (Opt_scrollTtyOutput, !state);
4173 break; 3768 break;
4174 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3770 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3771 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3772 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 3775 scr_erase_screen (2);
4181 scr_change_screen (state); 3776 scr_change_screen (state);
4182 break; 3777 break;
4183 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 3779 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 3780 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3781 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3782 scr_erase_screen (2);
4188 break; 3783 break;
4189 default: 3784 default:
4190 break; 3785 break;
… …
4318 scr_color (Color_bg, Color_bg); 3913 scr_color (Color_bg, Color_bg);
4319 break; 3914 break;
4320 3915
4321 //case 50: // not variable spacing 3916 //case 50: // not variable spacing
4322 3917
4323#if ENABLE_FRILLS 3918#if !ENABLE_MINIMAL
4324 case 90: 3919 case 90:
4325 case 91: /* set bright fg color */ 3920 case 91: /* set bright fg color */
4326 case 92: 3921 case 92:
4327 case 93: 3922 case 93:
4328 case 94: 3923 case 94:
… …
4427 4022
4428 if (v_buflen == 0) 4023 if (v_buflen == 0)
4429 { 4024 {
4430 free (v_buffer); 4025 free (v_buffer);
4431 v_buffer = 0; 4026 v_buffer = 0;
4432 v_buflen = 0;
4433 4027
4434 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4435 return; 4029 return;
4436 } 4030 }
4437 4031

Diff Legend

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