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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
227# if !UNICODE3 225# if !UNICODE3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
… …
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 308 int valid_keysym;
308 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
309 315
310 /* 316 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
313 * 319 *
… …
493# if ISO_14755 499# if ISO_14755
494 iso14755_51 (0); 500 iso14755_51 (0);
495# endif 501# endif
496 return; 502 return;
497 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
498 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
499 { 513 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
502# if ISO_14755 516# if ISO_14755
… …
504# endif 518# endif
505 return; 519 return;
506 } 520 }
507 else 521 else
508 { 522 {
509# if ENABLE_OVERLAY 523# if ISO_14755
510 scr_overlay_off (); 524 scr_overlay_off ();
511# endif 525# endif
512 iso14755buf = 0; 526 iso14755buf = 0;
513 } 527 }
514 } 528 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
518 { 532 {
519 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 534# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 537# endif
524 } 538 }
525#endif 539#endif
526 540
527#ifdef PRINTPIPE 541#ifdef PRINTPIPE
528 if (keysym == XK_Print) 542 if (keysym == XK_Print)
529 { 543 {
530 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
531 return; 545 return;
… …
533#endif 547#endif
534 548
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 550 {
537 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 newlen = 1; 553 newlen = 1;
539 switch (keysym) 554 switch (keysym)
540 { 555 {
541#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 557 case XK_BackSpace:
… …
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
548 } 563 }
549 else 564 else
550 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 566 break;
552#endif 567#endif
553#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
555 case XK_KP_Delete: 570 case XK_KP_Delete:
556 /* allow shift to override */ 571 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
558 { 573 {
559 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
560 break; 575 break;
561 } 576 }
562 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
563# endif 578# endif
564 case XK_Delete: 579 case XK_Delete:
565 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 581 break;
567#endif 582#endif
568 case XK_Tab: 583 case XK_Tab:
569 if (shft) 584 if (shft)
570 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
585#ifdef XK_KP_Left 600#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
591 { 606 {
592 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break; 609 break;
595 } 610 }
… …
618 633
619#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
621 case XK_KP_Prior: 636 case XK_KP_Prior:
622 /* allow shift to override */ 637 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
624 { 639 {
625 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
626 break; 641 break;
627 } 642 }
628 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
631 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
632 break; 647 break;
633# ifdef XK_KP_Next 648# ifdef XK_KP_Next
634 case XK_KP_Next: 649 case XK_KP_Next:
635 /* allow shift to override */ 650 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
637 { 652 {
638 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
639 break; 654 break;
640 } 655 }
641 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
644 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
645 break; 660 break;
646#endif 661#endif
647 case XK_KP_Enter: 662 case XK_KP_Enter:
648 /* allow shift to override */ 663 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
650 { 665 {
651 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
652 break; 667 break;
653 } 668 }
654 669
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 716 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
703 { 718 {
704 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 721 }
707 else 722 else
… …
713 728
714 case XK_Find: 729 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
716 break; 731 break;
717 732
718#ifdef XK_KP_End 733#ifdef XK_KP_Insert
719 case XK_KP_Insert: 734 case XK_KP_Insert:
720 /* allow shift to override */ 735 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
722 { 737 {
723 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
724 break; 739 break;
725 } 740 }
726 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
739 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
740 break; 755 break;
741#ifdef XK_KP_End 756#ifdef XK_KP_End
742 case XK_KP_End: 757 case XK_KP_End:
743 /* allow shift to override */ 758 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
745 { 760 {
746 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
747 break; 762 break;
748 } 763 }
749 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
752 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
753 break; 768 break;
754#ifdef XK_KP_Home 769#ifdef XK_KP_Home
755 case XK_KP_Home: 770 case XK_KP_Home:
756 /* allow shift to override */ 771 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
758 { 773 {
759 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
760 break; 775 break;
761 } 776 }
762 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
870 return; 885 return;
871 886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
920 1001
921#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922unsigned int 1003unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 1005{
… …
953 1034
954void 1035void
955rxvt_term::flush () 1036rxvt_term::flush ()
956{ 1037{
957 flush_ev.stop (); 1038 flush_ev.stop ();
958 1039
959#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
961 { 1042 {
962 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 1044 scr_touch (false);
965 } 1045 }
966#endif 1046#endif
967 1047
968 if (want_refresh) 1048 if (want_refresh)
… …
1029void 1109void
1030rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1031{ 1111{
1032 make_current (); 1112 make_current ();
1033 1113
1034 refresh_limit = 1;
1035 refresh_count = 0; 1114 refresh_count = 0;
1036 flush (); 1115 flush ();
1037} 1116}
1038 1117
1039#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1181 }
1103} 1182}
1104#endif 1183#endif
1105 1184
1106#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1107static struct event_handler 1186static struct event_handler
1108{ 1187{
1109 check_watcher cw_yield; 1188 check_watcher yield_ev;
1110 1189
1111 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1112 { 1191 {
1113 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
1114 w.stop (); 1200 w.stop ();
1115 } 1201 }
1116 1202
1117 event_handler () 1203 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1119 { 1205 {
1120 } 1206 }
1121} event_handler; 1207} event_handler;
1122#endif 1208#endif
1123 1209
… …
1143 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1144 return true; 1230 return true;
1145 } 1231 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1233 {
1148#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1149 if (display->is_local) 1235 if (display->is_local)
1150 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1151#endif 1237#endif
1152 } 1238 }
1153 else 1239 else
1154 { 1240 {
1155 pty_ev.stop (); 1241 pty_ev.stop ();
1156 1242
1157 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1158 destroy (); 1244 destroy ();
1159 } 1245 }
1160 1246
1161 return false; 1247 return false;
1162} 1248}
1163 1249
1164void 1250void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1177} 1263}
1178 1264
1179void 1265void
1180rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1181{ 1267{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1269 recolour_cursor ();
1184 1270
1185#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1272 hidden_pointer = 0;
1187 1273
1188 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1276#endif
1191} 1277}
1192 1278
1193#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1194void 1280void
1195rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1196{ 1282{
1197 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1198 return; 1284 return;
1199 1285
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1287 XFlush (dpy);
1202 1288
1203 hidden_pointer = 1; 1289 hidden_pointer = 1;
1204} 1290}
1205 1291
1206void 1292void
… …
1216rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1303{
1218 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1219 int x, y; 1305 int x, y;
1220 1306
1221 x = ev.x; 1307 x = Pixel2Col (ev.x);
1222 y = ev.y; 1308 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y);
1224 1309
1225 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1226 button_number = 3; 1311 button_number = 3;
1227 else 1312 else
1228 { 1313 {
… …
1279 (32 + button_number + key_state), 1364 (32 + button_number + key_state),
1280 (32 + x + 1), 1365 (32 + x + 1),
1281 (32 + y + 1)); 1366 (32 + y + 1));
1282} 1367}
1283 1368
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1369/*{{{ process an X event */
1295void 1370void
1296rxvt_term::x_cb (XEvent &ev) 1371rxvt_term::x_cb (XEvent &ev)
1297{ 1372{
1298 make_current (); 1373 make_current ();
1299 1374
1300 dDisp; 1375 dLocal (Display *, dpy);
1301 1376
1302 if (ev.xany.window == vt 1377 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1378 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1379 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1380 return;
… …
1310 unsigned int unused_mask; 1385 unsigned int unused_mask;
1311 1386
1312 switch (ev.type) 1387 switch (ev.type)
1313 { 1388 {
1314 case KeyPress: 1389 case KeyPress:
1315#if ISO_14755 1390 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1391 break;
1321 1392
1322 case KeyRelease: 1393 case KeyRelease:
1323 { 1394 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1395 break;
1395 }
1396 1396
1397 case ButtonPress: 1397 case ButtonPress:
1398 button_press (ev.xbutton); 1398 button_press (ev.xbutton);
1399 break; 1399 break;
1400 1400
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1416 destroy ();
1417 } 1417 }
1418#if ENABLE_EWMH 1418#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1422 &ev);
1423#endif 1423#endif
1424 } 1424 }
1425 } 1425 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1432 focus_out ();
1433 } 1433 }
1434#endif 1434#endif
1435 } 1435 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1436 break;
1441 1437
1442 /* 1438 /*
1443 * XXX: this is not the _current_ arrangement 1439 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1440 * Here's my conclusion:
… …
1463 break; 1459 break;
1464 } 1460 }
1465 break; 1461 break;
1466 1462
1467 case FocusIn: 1463 case FocusIn:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1467 focus_in ();
1469 break; 1468 break;
1470 1469
1471 case FocusOut: 1470 case FocusOut:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1474 focus_out ();
1473 break; 1475 break;
1474 1476
1475 case ConfigureNotify: 1477 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1476 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1477 { 1482 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1484 ;
1480 1485
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1487 {
1483 seen_resize = 1; 1488 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1490 }
1486 1491 else
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1496#endif
1497 }
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1499 }
1494 break; 1500 break;
1495 1501
1496 case PropertyNotify: 1502 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1528 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1529#endif 1535#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1537 break;
1532 1538
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538
1539 case GraphicsExpose: 1539 case GraphicsExpose:
1540 case Expose: 1540 case Expose:
1541 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1542 { 1542 {
1543 do 1543 do
1544 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1549
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1551
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1553 1556 }
1554 want_refresh = 1; 1557 want_refresh = 1;
1555 } 1558 }
1556 else 1559 else
1557 { 1560 {
1558 XEvent unused_event; 1561 XEvent unused_event;
1559 1562
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1564 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1566 ;
1564 1567
1565 if (isScrollbarWindow (ev.xany.window)) 1568 if (isScrollbarWindow (ev.xany.window))
1566 { 1569 {
1567 scrollBar.setIdle (); 1570 scrollBar.setIdle ();
1568 scrollbar_show (0); 1571 scrollbar_show (0);
1569 } 1572 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1573 }
1576 break; 1574 break;
1577 1575
1578 case MotionNotify: 1576 case MotionNotify:
1579#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1588 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1590 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1592 ;
1595 1593
1596 XQueryPointer (disp, vt, 1594 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1597 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1598 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
… …
1665#endif 1663#endif
1666 } 1664 }
1667 } 1665 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1667 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1669 MotionNotify, &ev))
1672 ; 1670 ;
1673 1671
1674 XQueryPointer (disp, scrollBar.win, 1672 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1673 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1674 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1675 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1676 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1678 scrollbar_size ());
1681 want_refresh = 1; 1679 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1680 scrollbar_show (1);
1684 } 1681 }
1685 break; 1682 break;
1686 } 1683 }
1687 1684
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1687 {
1693 if (hidden_cursor) 1688 if (hidden_cursor)
1694 { 1689 {
1695 hidden_cursor = 0; 1690 hidden_cursor = 0;
1696 want_refresh = 1; 1691 want_refresh = 1;
… …
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 } 1695 }
1701#endif 1696#endif
1702 1697
1703#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1700 {
1706 if (ev.type == MotionNotify 1701 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1702 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1703 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1704 if (hidden_pointer)
… …
1721 if (!focus) 1716 if (!focus)
1722 { 1717 {
1723 focus = 1; 1718 focus = 1;
1724 want_refresh = 1; 1719 want_refresh = 1;
1725 1720
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1722
1728#if USE_XIM 1723#if USE_XIM
1729 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1730 { 1725 {
1731 IMSetStatusPosition (); 1726 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1733 } 1728 }
1734#endif 1729#endif
1735#if CURSOR_BLINK 1730#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1731 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif 1733#endif
1739#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1741 { 1736 {
1742 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1738 scr_recolour ();
1744 } 1739 }
1745#endif 1740#endif
1741#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell))
1743 {
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif
1746 } 1751 }
1747} 1752}
1748 1753
1749void 1754void
1750rxvt_term::focus_out () 1755rxvt_term::focus_out ()
… …
1758 1763
1759#if ENABLE_FRILLS || ISO_14755 1764#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1765 if (iso14755buf)
1761 { 1766 {
1762 iso14755buf = 0; 1767 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1768# if ISO_14755
1764 scr_overlay_off (); 1769 scr_overlay_off ();
1765# endif 1770# endif
1766 } 1771 }
1767#endif 1772#endif
1768#if USE_XIM 1773#if USE_XIM
1769 if (Input_Context != NULL) 1774 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1775 XUnsetICFocus (Input_Context);
1771#endif 1776#endif
1772#if CURSOR_BLINK 1777#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1778 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1779 cursor_blink_ev.stop ();
1775 hidden_cursor = 0; 1780 hidden_cursor = 0;
1776#endif 1781#endif
1777#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
… …
1782 } 1787 }
1783#endif 1788#endif
1784 } 1789 }
1785} 1790}
1786 1791
1787#if TRANSPARENT 1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1803}
1804
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1806void
1789rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1808{
1791 make_current (); 1809 make_current ();
1792 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1816 switch (ev.type)
1794 { 1817 {
1795 case PropertyNotify: 1818 case PropertyNotify:
1796 /* 1819 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1799 */ 1822 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1825 {
1803 1826 bgPixmap.set_root_pixmap ();
1804 /* FALLTHROUGH */ 1827 update_background ();
1805 case ReparentNotify: 1828 }
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1829 break;
1809 } 1830 }
1831# endif
1810} 1832}
1811#endif 1833#endif
1812 1834
1813void 1835void
1814rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1845 /*
1824 * VT window processing of button press 1846 * VT window processing of button press
1825 */ 1847 */
1826 if (ev.window == vt) 1848 if (ev.window == vt)
1827 { 1849 {
1850 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1851 return;
1852
1828#if ISO_14755 1853#if ISO_14755
1829 // 5.4 1854 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1855 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1856 {
1832 iso14755_54 (ev.x, ev.y); 1857 iso14755_54 (ev.x, ev.y);
… …
1874 else 1899 else
1875 { 1900 {
1876 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1902 MEvent.clicks = 0;
1878 1903
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1904 switch (ev.button)
1881 { 1905 {
1882 case Button1: 1906 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1907 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1908 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1909#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1910 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1911#else
1888 selection.rect = false; 1912 selection.rect = false;
1889#endif 1913#endif
1890 1914
1891 /* allow shift+left click to extend selection */ 1915 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1916 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1917 {
1894 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1919 selection_rotate (ev.x, ev.y);
1896 else 1920 else
1897 selection_extend (ev.x, ev.y, 1); 1921 selection_extend (ev.x, ev.y, 1);
1898 } 1922 }
1899 else 1923 else
1900 { 1924 {
1901 if (MEvent.button == Button1 && clickintime) 1925 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1926 MEvent.clicks++;
1903 else 1927 else
1904 MEvent.clicks = 1; 1928 MEvent.clicks = 1;
1905 1929
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1930 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1931 }
1908 1932
1909 MEvent.button = Button1; 1933 MEvent.button = Button1;
1910 break; 1934 break;
1911 1935
1912 case Button3: 1936 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1937 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1915 else 1939 else
1916 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1917 1941
1918 MEvent.button = Button3; 1942 MEvent.button = Button3;
1919 break; 1943 break;
1920 } 1944 }
1921 } 1945 }
1922 1946
1923 MEvent.time = ev.time; 1947 MEvent.time = ev.time;
1924 return; 1948 return;
1925 } 1949 }
1926 1950
… …
2089 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
2090#endif 2114#endif
2091 2115
2092 if (ev.window == vt) 2116 if (ev.window == vt)
2093 { 2117 {
2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2119 return;
2120
2094#if ISO_14755 2121#if ISO_14755
2095 // 5.4 2122 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2123 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2124 return;
2098#endif 2125#endif
2126
2099 if (reportmode) 2127 if (reportmode)
2100 { 2128 {
2101 /* mouse report from vt window */ 2129 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2130 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2131 if (ev.button >= 4)
… …
2127 if (priv_modes & PrivMode_mouse_report 2155 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2156 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2157 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2158 selection_extend (ev.x, ev.y, 0);
2131 2159
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2160 switch (ev.button)
2136 { 2161 {
2137 case Button1: 2162 case Button1:
2138 case Button3: 2163 case Button3:
2139 selection_make (ev.time); 2164 selection_make (ev.time);
2140 break; 2165 break;
2141 2166
2142 case Button2: 2167 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2170 break;
2146 2171
2147#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2148 case Button4: 2173 case Button4:
2149 case Button5: 2174 case Button5:
… …
2153 2178
2154 v = ev.button == Button4 ? UP : DN; 2179 v = ev.button == Button4 ? UP : DN;
2155 2180
2156 if (ev.state & ShiftMask) 2181 if (ev.state & ShiftMask)
2157 i = 1; 2182 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2183 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2184 i = nrow - 1;
2160 else 2185 else
2161 i = 5; 2186 i = 5;
2162 2187
2163# ifdef MOUSE_SLIP_WHEELING 2188# ifdef MOUSE_SLIP_WHEELING
… …
2184 break; 2209 break;
2185#endif 2210#endif
2186 } 2211 }
2187 } 2212 }
2188} 2213}
2189
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
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 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2214
2666/*}}} */ 2215/*}}} */
2667 2216
2668bool 2217bool
2669rxvt_term::cmd_parse () 2218rxvt_term::cmd_parse ()
… …
2718 if (ch == C0_LF) 2267 if (ch == C0_LF)
2719 nlines++; 2268 nlines++;
2720 2269
2721 refresh_count++; 2270 refresh_count++;
2722 2271
2723 if (!OPTION (Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2273 {
2726 refreshnow = true;
2727 refresh_count = 0; 2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2277 {
2278 refreshnow = true;
2728 ch = NOCHAR; 2279 ch = NOCHAR;
2729 break; 2280 break;
2281 }
2730 } 2282 }
2731 2283
2732 // scr_add_lines only works for nlines <= nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2285 if (nlines >= nrow - 1)
2734 { 2286 {
… …
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2763 scr_add_lines (buf, str - buf, nlines); 2315 scr_add_lines (buf, str - buf, nlines);
2764 2316
2765 /* 2317 /*
2766 * If there have been a lot of new lines, then update the screen 2318 * If there have been a lot of new lines, then update the screen
2767 * What the heck I'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2768 * the number of pages between refreshes is refresh_limit, which 2320 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2321 */
2771 if (refreshnow) 2322 if (refreshnow)
2772 { 2323 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true; 2324 flag = true;
2778 scr_refresh (); 2325 scr_refresh ();
2779 want_refresh = 1; 2326 want_refresh = 1;
2780 }
2781 } 2327 }
2782 2328
2783 } 2329 }
2784 else 2330 else
2785 { 2331 {
… …
2934 { 2480 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2481 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2482 break; /* done = 1 */
2937 } 2483 }
2938 } 2484 }
2939 2485
2940 for (i = 0; i < len; i++) 2486 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2487 if (putc (buf[i], fd) == EOF)
2942 { 2488 {
2943 done = 1; 2489 done = 1;
2944 break; 2490 break;
… …
3006 process_dcs_seq (); 2552 process_dcs_seq ();
3007 break; 2553 break;
3008 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
3009 process_csi_seq (); 2555 process_csi_seq ();
3010 break; 2556 break;
3011 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
3012 process_osc_seq (); 2558 process_osc_seq ();
3013 break; 2559 break;
3014#endif 2560#endif
3015 } 2561 }
3016} 2562}
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2652 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2653 break;
3108 case '+': 2654 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2655 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2656 break;
3111#if ENABLE_FRILLS 2657#if !ENABLE_MINIMAL
3112 case '6': 2658 case '6':
3113 scr_backindex (); 2659 scr_backindex ();
3114 break; 2660 break;
3115#endif 2661#endif
3116 case '7': 2662 case '7':
3117 scr_cursor (SAVE); 2663 scr_cursor (SAVE);
3118 break; 2664 break;
3119 case '8': 2665 case '8':
3120 scr_cursor (RESTORE); 2666 scr_cursor (RESTORE);
3121 break; 2667 break;
3122#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3123 case '9': 2669 case '9':
3124 scr_forwardindex (); 2670 scr_forwardindex ();
3125 break; 2671 break;
3126#endif 2672#endif
3127 case '=': 2673 case '=':
… …
3242rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
3243{ 2789{
3244 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2791 unsigned int nargs, p;
3246 int n, ndef; 2792 int n, ndef;
3247 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
3248 2794
3249 for (nargs = ESC_ARGS; nargs > 0;) 2795 nargs = 0;
3250 arg[--nargs] = 0;
3251 2796
3252 priv = 0; 2797 priv = 0;
3253 ch = cmd_getc (); 2798 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2799 if (ch >= '<' && ch <= '?')
3255 { /* '<' '=' '>' '?' */ 2800 { /* '<' '=' '>' '?' */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2834 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2835 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2836 if (arg[p] == -1)
3292 arg[p] = ndef; 2837 arg[p] = ndef;
3293 2838
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2839 /*
3302 * private mode handling 2840 * private mode handling
3303 */ 2841 */
3304 if (priv) 2842 if (priv)
3305 { 2843 {
3306 switch (priv) 2844 switch (priv)
3307 { 2845 {
3308 case '>': 2846 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2847 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2848 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2854 // that we do not support xterm mouse reporting (should be 95 when we do).
2855 //
2856 tt_printf ("\033[>%d;94;0c", 'U');
2857 }
3311 break; 2858 break;
3312 case '?': 2859 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2862 break;
… …
3441 break; 2988 break;
3442 case 6: /* CPR requested */ 2989 case 6: /* CPR requested */
3443 scr_report_position (); 2990 scr_report_position ();
3444 break; 2991 break;
3445 case 7: /* unofficial extension */ 2992 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 2993 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2994 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 2995 break;
3449 case 8: /* unofficial extension */ 2996 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2997 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 2998 break;
… …
3518 break; 3065 break;
3519 case CSI_75: 3066 case CSI_75:
3520 scr_cursor (RESTORE); 3067 scr_cursor (RESTORE);
3521 break; 3068 break;
3522 3069
3523#if ENABLE_FRILLS 3070#if !ENABLE_MINIMAL
3524 case CSI_74: 3071 case CSI_74:
3525 process_window_ops (arg, nargs); 3072 process_window_ops (arg, nargs);
3526 break; 3073 break;
3527#endif 3074#endif
3528 3075
… …
3535 break; 3082 break;
3536 } 3083 }
3537} 3084}
3538/*}}} */ 3085/*}}} */
3539 3086
3540#if ENABLE_FRILLS 3087#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3088/* ARGSUSED */
3542void 3089void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3091{
3545 int x, y; 3092 int x, y;
3546 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
3547 Window wdummy; 3094 Window wdummy;
3548 dDisp; 3095
3096 dLocal (Display *, dpy);
3549 3097
3550 if (nargs == 0) 3098 if (nargs == 0)
3551 return; 3099 return;
3552 3100
3553 switch (args[0]) 3101 switch (args[0])
3554 { 3102 {
3555 /* 3103 /*
3556 * commands 3104 * commands
3557 */ 3105 */
3558 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3107 XMapWindow (dpy, parent[0]);
3560 break; 3108 break;
3561 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3111 break;
3564 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3114 break;
3567 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3117 break;
3570 case 5: /* raise window */ 3118 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3119 XRaiseWindow (dpy, parent[0]);
3572 break; 3120 break;
3573 case 6: /* lower window */ 3121 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3122 XLowerWindow (dpy, parent[0]);
3575 break; 3123 break;
3576 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3577 scr_touch (true); 3125 scr_touch (true);
3578 break; 3126 break;
3579 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3134 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3135 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3136 (unsigned int) (args[1] * fheight));
3589 break; 3137 break;
3590 3138
3591
3592 /* 3139 /*
3593 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3594 */ 3141 */
3595 case 11: /* report window state */ 3142 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3145 break;
3599 case 13: /* report window position */ 3146 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3152 break;
3606 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3156 break;
3610 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3159 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3162 break;
3616 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3617 { 3164 {
3618 char *s; 3165 char *s;
3619 XGetIconName (disp, parent[0], &s); 3166 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3168 XFree (s);
3622 } 3169 }
3623 break; 3170 break;
3624 case 21: /* report window title */ 3171 case 21: /* report window title */
3625 { 3172 {
3626 char *s; 3173 char *s;
3627 XFetchName (disp, parent[0], &s); 3174 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3176 XFree (s);
3630 } 3177 }
3631 break; 3178 break;
3632 } 3179 }
3633} 3180}
… …
3660 seen_esc = true; 3207 seen_esc = true;
3661 continue; 3208 continue;
3662 } 3209 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3210 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3211 break;
3212 else if (ch == C0_SYN)
3213 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3214 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3215 return NULL; /* other control character - exit */
3667 3216
3668 seen_esc = false; 3217 seen_esc = false;
3669 3218
3670 if (n >= STRING_MAX - 1) 3219 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3220 // stop at some sane length
3672 return NULL; 3221 return NULL;
3673 3222
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3223 string[n++] = ch;
3678 } 3224 }
3679 3225
3680 string[n++] = '\0'; 3226 string[n++] = '\0';
3681 3227
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3228 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3733void 3279void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3280rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3281{
3736 if (str[0] == '?' && !str[1]) 3282 if (str[0] == '?' && !str[1])
3737 { 3283 {
3738 unsigned short r, g, b; 3284 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3285 pix_colors_focused[color].get (c);
3286
3287#if XFT
3288 if (c.a != rgba::MAX_CC)
3289 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3290 else
3291#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3292 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3293 }
3742 else 3294 else
3743 set_window_color (color, str); 3295 set_window_color (color, str);
3744} 3296}
3745 3297
… …
3751{ 3303{
3752 int color; 3304 int color;
3753 char *buf, *name; 3305 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3306 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3307 int saveop = op;
3756 dDisp; 3308
3309 dLocal (Display *, dpy);
3757 3310
3758 assert (str != NULL); 3311 assert (str != NULL);
3312
3313 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3314 return;
3315
3759 switch (op) 3316 switch (op)
3760 { 3317 {
3761 case XTerm_name: 3318 case XTerm_name:
3762 set_title (str); 3319 set_title (str);
3763 /* FALLTHROUGH */ 3320 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3334 unsigned long bytes_after;
3778 unsigned char *value = 0; 3335 unsigned char *value = 0;
3779 const char *str = ""; 3336 const char *str = "";
3780 3337
3781 if (prop 3338 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3339 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3340 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3341 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3342 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3343 && actual_type != None
3787 && actual_format == 8) 3344 && actual_format == 8)
3788 str = (const char *)(value); 3345 str = (const char *)(value);
3789 3346
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3347 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3348
3792 XFree (value); 3349 XFree (value);
3793 } 3350 }
3794 else 3351 else
3795 { 3352 {
… …
3799 { 3356 {
3800 *eq = 0; 3357 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3358 set_utf8_property (display->atom (str), eq + 1);
3802 } 3359 }
3803 else 3360 else
3804 XDeleteProperty (disp, parent[0], 3361 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3362 display->atom (str));
3806 } 3363 }
3807 break; 3364 break;
3808 3365
3809 case XTerm_Color: 3366 case XTerm_Color:
… …
3819 break; 3376 break;
3820 3377
3821 if ((buf = strchr (name, ';')) != NULL) 3378 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3379 *buf++ = '\0';
3823 3380
3824 if (name[0] == '?' && !name[1]) 3381 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3382 }
3833 break; 3383 break;
3834 case XTerm_Color00: 3384 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3385 process_color_seq (op, Color_fg, str, resp);
3836 break; 3386 break;
3837 case XTerm_Color01: 3387 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3388 process_color_seq (op, Color_bg, str, resp);
3839 break; 3389 break;
3840#ifndef NO_CURSORCOLOR 3390#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3391 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3392 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3393 break;
3844#endif 3394#endif
3845 case XTerm_Color_pointer_fg: 3395 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3396 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3397 break;
3848 case XTerm_Color_pointer_bg: 3398 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3399 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3400 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3401#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3402 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3403 process_color_seq (op, Color_RV, str, resp);
3854 break; 3404 break;
3855 case Rxvt_Color_BD: 3405 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3406 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3407 process_color_seq (op, Color_BD, str, resp);
3858 break; 3408 break;
3859 case Rxvt_Color_UL: 3409 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3862 break; 3412 break;
3863 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3865 break; 3415 break;
3866#endif 3416#endif
3867#if TRANSPARENT && TINTING 3417#if ENABLE_TRANSPARENCY
3868 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3420 {
3871 if (am_transparent) 3421 bool changed = false;
3872 want_full_refresh = want_refresh = 1; 3422 if (ISSET_PIXCOLOR (Color_tint))
3873 break; 3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3874#endif 3424 else
3425 changed = bgPixmap.unset_tint ();
3426 if (changed)
3427 update_background ();
3428 }
3875 3429
3430 break;
3431#endif
3432
3433#if BG_IMAGE_FROM_FILE
3876 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3877 { 3435 if (!strcmp (str, "?"))
3878 if (*str != ';')
3879 { 3436 {
3880#if XPM_BACKGROUND 3437 char str[256];
3881 scale_pixmap (""); /* reset to default scaling */ 3438
3882 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3883 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3884#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3885 } 3443 }
3886 3444 else
3445 {
3887 int changed = 0; 3446 int changed = 0;
3888 3447
3889 while ((str = strchr (str, ';')) != NULL) 3448 if (*str != ';')
3890 { 3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458 while (str)
3459 {
3891 str++; 3460 str++;
3892#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3893 changed += scale_pixmap (str); 3462 changed++;
3894#endif 3463 str = strchr (str, ';');
3895 } 3464 }
3896
3897 if (changed) 3465 if (changed)
3898 { 3466 update_background ();
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 } 3467 }
3904 }
3905 break; 3468 break;
3469#endif
3906 3470
3907 case Rxvt_restoreFG: 3471 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str); 3472 set_window_color (Color_fg, str);
3909 break; 3473 break;
3910 case Rxvt_restoreBG: 3474 case Rxvt_restoreBG:
… …
3935 case URxvt_italicFont: 3499 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3500 case URxvt_boldItalicFont:
3937#endif 3501#endif
3938 if (query) 3502 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3505 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3506 resp);
3943 else 3507 else
3944 { 3508 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3512 allocated.push_back ((void *)res);
3949 set_fonts (); 3513 set_fonts ();
3950 } 3514 }
3951 break; 3515 break;
3952 3516
3953#if ENABLE_FRILLS 3517 case URxvt_version:
3518 if (query)
3519 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3520 op,
3521 rs[Rs_name], VERSION[0], VERSION[2],
3522 resp);
3523 break;
3524
3525#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3526 case URxvt_locale:
3955 if (query) 3527 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3529 else
3958 { 3530 {
3959 set_locale (str); 3531 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3532 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3533 init_xlocale ();
… …
3976 break; 3548 break;
3977#endif 3549#endif
3978 3550
3979#if ENABLE_PERL 3551#if ENABLE_PERL
3980 case URxvt_perl: 3552 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3553 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 3554 ; // no responses yet
3983 break; 3555 break;
3984#endif 3556#endif
3985 } 3557 }
3986} 3558}
… …
4024{ 3596{
4025 unsigned int i, j; 3597 unsigned int i, j;
4026 int state; 3598 int state;
4027 3599
4028 static const struct 3600 static const struct
4029 { 3601 {
4030 const int argval; 3602 const int argval;
4031 const unsigned long bit; 3603 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3604 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR },
4036 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
4037 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 },
4038 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll },
4039 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo },
… …
4102 scr_touch (true); 3672 scr_touch (true);
4103 break; 3673 break;
4104#endif 3674#endif
4105 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4106 case 1049: 3676 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3677 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3678 if (mode == 0)
4109 scr_cursor (RESTORE); 3679 scr_cursor (RESTORE);
4110 else if (mode == 1) 3680 else if (mode == 1)
4111 scr_cursor (SAVE); 3681 scr_cursor (SAVE);
4112 break; 3682 break;
… …
4177 break; 3747 break;
4178 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3750 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4184 scr_erase_screen (2); 3754 scr_erase_screen (2);
4185 scr_change_screen (state); 3755 scr_change_screen (state);
4186 break; 3756 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
4188 scr_change_screen (state); 3758 scr_change_screen (state);
4189 if (OPTION (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3760 if (current_screen != PRIMARY)
4191 scr_erase_screen (2); 3761 scr_erase_screen (2);
4192 break; 3762 break;
4193 default: 3763 default:
4194 break; 3764 break;
… …
4322 scr_color (Color_bg, Color_bg); 3892 scr_color (Color_bg, Color_bg);
4323 break; 3893 break;
4324 3894
4325 //case 50: // not variable spacing 3895 //case 50: // not variable spacing
4326 3896
4327#if ENABLE_FRILLS 3897#if !ENABLE_MINIMAL
4328 case 90: 3898 case 90:
4329 case 91: /* set bright fg color */ 3899 case 91: /* set bright fg color */
4330 case 92: 3900 case 92:
4331 case 93: 3901 case 93:
4332 case 94: 3902 case 94:
… …
4431 4001
4432 if (v_buflen == 0) 4002 if (v_buflen == 0)
4433 { 4003 {
4434 free (v_buffer); 4004 free (v_buffer);
4435 v_buffer = 0; 4005 v_buffer = 0;
4436 v_buflen = 0;
4437 4006
4438 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4439 return; 4008 return;
4440 } 4009 }
4441 4010

Diff Legend

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