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.247 by root, Sat Jan 7 20:23:52 2006 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 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>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 143 return;
149 144
150 for (;;) 145 for (;;)
151 { 146 {
152 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
153 148
154 text_t t = l.t[x]; 149 text_t t = l.t[x];
155 150
156 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
157 { 152 {
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 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// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * 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
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
443 scr_move_to (0, 1); 446 scr_move_to (0, 1);
444 return; 447 return;
445 } 448 }
446 else if (keysym == XK_End) 449 else if (keysym == XK_End)
447 { 450 {
448 scr_move_to (1, 0); 451 scr_move_to (1, 1);
449 return; 452 return;
450 } 453 }
451 } 454 }
452#endif 455#endif
453 } 456 }
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
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);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
716 727
717 case XK_Find: 728 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
719 break; 730 break;
720 731
721#ifdef XK_KP_End 732#ifdef XK_KP_Insert
722 case XK_KP_Insert: 733 case XK_KP_Insert:
723 /* allow shift to override */ 734 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 736 {
726 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
… …
867#endif 878#endif
868 /* nil */ ; 879 /* nil */ ;
869 } 880 }
870 } 881 }
871 882
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 883 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 884 return;
874 885
875 if (len <= 0) 886 if (len <= 0)
876 return; /* not mapped */ 887 return; /* not mapped */
877 888
878 if (OPTION (Opt_scrollTtyKeypress)) 889 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 890 if (view_start)
880 { 891 {
881 view_start = 0; 892 view_start = 0;
882 want_refresh = 1; 893 want_refresh = 1;
883 } 894 }
… …
905 { 916 {
906 const char ch = C0_ESC; 917 const char ch = C0_ESC;
907 tt_write (&ch, 1); 918 tt_write (&ch, 1);
908 } 919 }
909 920
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 921 tt_write (kbuf, (unsigned int)len);
921} 922}
922/*}}} */
923 923
924void
925rxvt_term::key_release (XKeyEvent &ev)
926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
1000
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1001#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1002unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1004{
930 unsigned int n, s; 1005 unsigned int n, s;
931 1006
… …
959void 1034void
960rxvt_term::flush () 1035rxvt_term::flush ()
961{ 1036{
962 flush_ev.stop (); 1037 flush_ev.stop ();
963 1038
964#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
965 if (want_full_refresh) 1040 if (want_full_refresh)
966 { 1041 {
967 want_full_refresh = 0; 1042 want_full_refresh = 0;
968 scr_clear (); 1043 scr_clear ();
969 scr_touch (false); 1044 scr_touch (false);
… …
972 1047
973 if (want_refresh) 1048 if (want_refresh)
974 { 1049 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1051 {
977 int row = -view_start; 1052 int row = view_start;
1053 int end_row = row + nrow;
978 1054
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1055 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1056 --row;
981 1057
982 while (row < -view_start + nrow) 1058 do
983 { 1059 {
984 int start_row = row; 1060 int start_row = row;
985 line_t *l; 1061 line_t *l;
986 1062
987 do 1063 do
988 { 1064 {
989 l = &ROW (row); 1065 l = &ROW (row++);
990 1066
991 if (!(l->f & LINE_FILTERED)) 1067 if (!(l->f & LINE_FILTERED))
992 { 1068 {
993 // line not filtered, mark it as filtered 1069 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1070 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1071 while (l->is_longer ())
996 { 1072 {
997 l = &ROW (++row); 1073 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1074 l->f |= LINE_FILTERED;
999 } 1075 }
1000 1076
1001 // and filter it 1077 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1079
1004 break; 1080 break;
1005 } 1081 }
1006 } 1082 }
1007 while (l->is_longer ()); 1083 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1084 }
1085 while (row < end_row);
1011 1086 }
1012 }
1013 1087
1014 scr_refresh (refresh_type); 1088 scr_refresh ();
1015 scrollbar_show (1); 1089 scrollbar_show (1);
1016#ifdef USE_XIM 1090#ifdef USE_XIM
1017 IMSendSpot (); 1091 IMSendSpot ();
1018#endif 1092#endif
1019 } 1093 }
… …
1022} 1096}
1023 1097
1024void 1098void
1025rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
1026{ 1100{
1027 SET_R (this); 1101 make_current ();
1028 SET_LOCALE (locale);
1029 1102
1030 display->flush (); 1103 display->flush ();
1031 1104
1032 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1107}
1035 1108
1036void 1109void
1037rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1038{ 1111{
1039 SET_R (this); 1112 make_current ();
1040 SET_LOCALE (locale);
1041 1113
1042 refresh_limit = 1;
1043 refresh_count = 0; 1114 refresh_count = 0;
1044 flush (); 1115 flush ();
1045} 1116}
1046 1117
1047#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1121{
1051 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1123 want_refresh = 1;
1053 1124
1054 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1126}
1056#endif 1127#endif
1057 1128
1058#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1059void 1130void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1145{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1148 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1149 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1151 }
1082} 1152}
1083#endif 1153#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1158{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1160 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1162 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1164 }
1096} 1165}
1097#endif 1166#endif
… …
1102{ 1171{
1103 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1175 {
1107 if (view_start == nsaved || 1176 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1177 mouse_slip_wheel_speed = 0;
1110 1178
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1179 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1181 }
1115} 1182}
1116#endif 1183#endif
1117 1184
1118#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1119static struct event_handler 1186static struct event_handler
1120{ 1187{
1121 check_watcher cw_yield; 1188 check_watcher yield_ev;
1122 1189
1123 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1124 { 1191 {
1125 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
1126 w.stop (); 1200 w.stop ();
1127 } 1201 }
1128 1202
1129 event_handler () 1203 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1131 { 1205 {
1132 } 1206 }
1133} event_handler; 1207} event_handler;
1134#endif 1208#endif
1135 1209
… …
1146 1220
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1150 1224
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1226
1153 if (r > 0) 1227 if (r > 0)
1154 { 1228 {
1155 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1156 return true; 1230 return true;
1157 } 1231 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1233 {
1160#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1161 if (display->is_local) 1235 if (display->is_local)
1162 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1163#endif 1237#endif
1164 } 1238 }
1165 else 1239 else
1166 { 1240 {
1167 pty_ev.stop (); 1241 pty_ev.stop ();
1168 1242
1169 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1170 destroy (); 1244 destroy ();
1171 } 1245 }
1172 1246
1173 return false; 1247 return false;
1174} 1248}
1175 1249
1176void 1250void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1252{
1179 SET_R (this); 1253 make_current ();
1180 SET_LOCALE (locale);
1181 1254
1182 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1257 while (pty_fill ())
1185 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1190} 1263}
1191 1264
1192void 1265void
1193rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1194{ 1267{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1269 recolour_cursor ();
1197 1270
1198#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1272 hidden_pointer = 0;
1200 1273
1201 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1276#endif
1204} 1277}
1205 1278
1206#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1207void 1280void
1208rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1209{ 1282{
1210 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1211 return; 1284 return;
1212 1285
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1287 XFlush (dpy);
1215 1288
1216 hidden_pointer = 1; 1289 hidden_pointer = 1;
1217} 1290}
1218 1291
1219void 1292void
1220rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1221{ 1294{
1222 SET_R (this); 1295 make_current ();
1223 SET_LOCALE (locale);
1224 1296
1225 pointer_blank (); 1297 pointer_blank ();
1226} 1298}
1227#endif 1299#endif
1228 1300
… …
1293 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1294 (32 + x + 1), 1366 (32 + x + 1),
1295 (32 + y + 1)); 1367 (32 + y + 1));
1296} 1368}
1297 1369
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1370/*{{{ process an X event */
1309void 1371void
1310rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1311{ 1373{
1312 dDisp; 1374 make_current ();
1313 1375
1314 SET_R (this); 1376 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1377
1317#if defined(CURSOR_BLINK) 1378 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1381 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1382
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1383 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1386 unsigned int unused_mask;
1347 1387
1348 switch (ev.type) 1388 switch (ev.type)
1349 { 1389 {
1350 case KeyPress: 1390 case KeyPress:
1351#if ISO_14755 1391 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1392 break;
1357 1393
1358 case KeyRelease: 1394 case KeyRelease:
1359 { 1395 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1396 break;
1431 }
1432 1397
1433 case ButtonPress: 1398 case ButtonPress:
1434 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1435 break; 1400 break;
1436 1401
… …
1438 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1439 break; 1404 break;
1440 1405
1441 case ClientMessage: 1406 case ClientMessage:
1442 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1417 destroy ();
1418 }
1447#if ENABLE_EWMH 1419#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1452#endif 1435#endif
1453 } 1436 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break;
1490
1491 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1437 break;
1494 1438
1495 /* 1439 /*
1496 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1516 break; 1460 break;
1517 } 1461 }
1518 break; 1462 break;
1519 1463
1520 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1468 focus_in ();
1522 break; 1469 break;
1523 1470
1524 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1475 focus_out ();
1526 break; 1476 break;
1527 1477
1528 case ConfigureNotify: 1478 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0]) 1479 if (ev.xconfigure.window == parent[0])
1530 { 1480 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1482 ;
1533 1483
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1485 {
1536 seen_resize = 1; 1486 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1488 }
1539 1489 else
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490 {
1491#ifdef ENABLE_TRANSPARENCY
1541 if (OPTION (Opt_transparent)) 1492 if (option (Opt_transparent))
1542 check_our_parents (); 1493 if (bgPixmap.render ())
1494 scr_touch (false);
1543#endif 1495#endif
1496 }
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 } 1498 }
1545 break; 1499 break;
1546 1500
1547 case PropertyNotify: 1501 case PropertyNotify:
1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1503 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1504 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1505 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1506
1552 break; 1507 break;
1553 1508
1554 case SelectionClear: 1509 case SelectionClear:
1555 selection_clear (); 1510 selection_clear ();
… …
1578 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1579#endif 1534#endif
1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1581 break; 1536 break;
1582 1537
1583#ifdef TRANSPARENT 1538#ifdef ENABLE_TRANSPARENCY
1584 case ReparentNotify: 1539 case ReparentNotify:
1585 rootwin_cb (ev); 1540 rootwin_cb (ev);
1586 break; 1541 break;
1587#endif /* TRANSPARENT */ 1542#endif /* ENABLE_TRANSPARENCY */
1588 1543
1589 case GraphicsExpose: 1544 case GraphicsExpose:
1590 case Expose: 1545 case Expose:
1591 if (ev.xany.window == vt) 1546 if (ev.xany.window == vt)
1592 { 1547 {
1593 do 1548 do
1594 scr_expose (ev.xexpose.x, ev.xexpose.y, 1549 scr_expose (ev.xexpose.x, ev.xexpose.y,
1595 ev.xexpose.width, ev.xexpose.height, False); 1550 ev.xexpose.width, ev.xexpose.height, False);
1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1597 1552
1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1599 1554
1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1601 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1602 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1603 1558
1604 scr_refresh (refresh_type); 1559 want_refresh = 1;
1605 } 1560 }
1606 else 1561 else
1607 { 1562 {
1608 XEvent unused_event; 1563 XEvent unused_event;
1609 1564
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1611 ; 1566 ;
1612 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1613 ; 1568 ;
1614 1569
1615 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1616 { 1571 {
1617 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1618 scrollbar_show (0); 1573 scrollbar_show (0);
1619 } 1574 }
1620#ifdef MENUBAR
1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1622 menubar_expose ();
1623#endif
1624
1625#ifdef TRANSPARENT
1626 if (am_transparent && ev.xany.window == parent[0])
1627 XClearWindow (disp, ev.xany.window);
1628#endif
1629 } 1575 }
1630 break; 1576 break;
1631 1577
1632 case MotionNotify: 1578 case MotionNotify:
1633#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1634 if (hidden_pointer) 1580 if (hidden_pointer)
1635 pointer_unblank (); 1581 pointer_unblank ();
1636#endif 1582#endif
1637#if MENUBAR
1638 if (isMenuBarWindow (ev.xany.window))
1639 {
1640 menubar_control (ev.xbutton);
1641 break;
1642 }
1643#endif
1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1645 break; 1584 break;
1646 1585
1647 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1648 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop 1590 ; // nop
1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1652 { 1592 {
1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1654 ; 1594 ;
1655 1595
1656 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1657 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1658 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1659 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1660 &ev.xbutton.state); 1600 &ev.xbutton.state);
1661#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1725#endif 1665#endif
1726 } 1666 }
1727 } 1667 }
1728 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1729 { 1669 {
1730 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1731 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1732 ; 1672 ;
1733 1673
1734 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1735 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1736 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1737 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1738 &unused_mask); 1678 &unused_mask);
1739 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1740 scrollbar_size ()); 1680 scrollbar_size ());
1741 scr_refresh (refresh_type);
1742 refresh_limit = 0; 1681 want_refresh = 1;
1743 scrollbar_show (1); 1682 scrollbar_show (1);
1744 } 1683 }
1745 break; 1684 break;
1746 } 1685 }
1686
1687#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1697 }
1698#endif
1699
1700#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 {
1703 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease)
1706 if (hidden_pointer)
1707 pointer_unblank ();
1708
1709 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank ();
1711 }
1712#endif
1747} 1713}
1748 1714
1749void 1715void
1750rxvt_term::focus_in () 1716rxvt_term::focus_in ()
1751{ 1717{
1752 if (!focus) 1718 if (!focus)
1753 { 1719 {
1754 focus = 1; 1720 focus = 1;
1755 want_refresh = 1; 1721 want_refresh = 1;
1756 1722
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1724
1759#if USE_XIM 1725#if USE_XIM
1760 if (Input_Context != NULL) 1726 if (Input_Context != NULL)
1761 { 1727 {
1762 IMSetStatusPosition (); 1728 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1729 XSetICFocus (Input_Context);
1764 } 1730 }
1765#endif 1731#endif
1766#if CURSOR_BLINK 1732#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1733 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1735#endif
1770#if OFF_FOCUS_FADING 1736#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1737 if (rs[Rs_fade])
1772 { 1738 {
1773 pix_colors = pix_colors_focused; 1739 pix_colors = pix_colors_focused;
1774 scr_recolour (); 1740 scr_recolour ();
1775 } 1741 }
1776#endif 1742#endif
1743#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell))
1745 {
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]);
1749 if (h != NULL)
1750 {
1751 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h);
1753 }
1754 }
1755#endif
1777 } 1756 }
1778} 1757}
1779 1758
1780void 1759void
1781rxvt_term::focus_out () 1760rxvt_term::focus_out ()
… …
1789 1768
1790#if ENABLE_FRILLS || ISO_14755 1769#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf) 1770 if (iso14755buf)
1792 { 1771 {
1793 iso14755buf = 0; 1772 iso14755buf = 0;
1794# if ENABLE_OVERLAY 1773# if ISO_14755
1795 scr_overlay_off (); 1774 scr_overlay_off ();
1796# endif 1775# endif
1797 } 1776 }
1798#endif 1777#endif
1799#if USE_XIM 1778#if USE_XIM
1800 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1780 XUnsetICFocus (Input_Context);
1802#endif 1781#endif
1803#if CURSOR_BLINK 1782#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1783 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1784 cursor_blink_ev.stop ();
1806 hidden_cursor = 0; 1785 hidden_cursor = 0;
1807#endif 1786#endif
1808#if OFF_FOCUS_FADING 1787#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1788 if (rs[Rs_fade])
… …
1813 } 1792 }
1814#endif 1793#endif
1815 } 1794 }
1816} 1795}
1817 1796
1818#if TRANSPARENT 1797void
1798rxvt_term::update_fade_color (unsigned int idx)
1799{
1800#if OFF_FOCUS_FADING
1801 if (rs[Rs_fade])
1802 {
1803 rgba c;
1804 pix_colors [Color_fade].get (c);
1805 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1806 }
1807#endif
1808}
1809
1810#if ENABLE_TRANSPARENCY || ENABLE_PERL
1819void 1811void
1820rxvt_term::rootwin_cb (XEvent &ev) 1812rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1813{
1822 SET_R (this); 1814 make_current ();
1823 SET_LOCALE (locale);
1824 1815
1816 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1817 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1820# if ENABLE_TRANSPARENCY
1825 switch (ev.type) 1821 switch (ev.type)
1826 { 1822 {
1827 case PropertyNotify: 1823 case PropertyNotify:
1828 /* 1824 /*
1829 * if user used some Esetroot compatible prog to set the root bg, 1825 * if user used some Esetroot compatible prog to set the root bg,
1830 * use the property to determine the pixmap. We use it later on. 1826 * use the property to determine the pixmap. We use it later on.
1831 */ 1827 */
1832 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1834 return; 1830 {
1835 1831 bgPixmap.set_root_pixmap ();
1836 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1837 case ReparentNotify: 1833 }
1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1839 want_refresh = want_full_refresh = 1;
1840 break; 1834 break;
1841 } 1835 }
1836# endif
1842} 1837}
1843#endif 1838#endif
1844 1839
1845void 1840void
1846rxvt_term::button_press (XButtonEvent &ev) 1841rxvt_term::button_press (XButtonEvent &ev)
… …
1855 /* 1850 /*
1856 * VT window processing of button press 1851 * VT window processing of button press
1857 */ 1852 */
1858 if (ev.window == vt) 1853 if (ev.window == vt)
1859 { 1854 {
1855 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1856 return;
1857
1860#if ISO_14755 1858#if ISO_14755
1861 // 5.4 1859 // 5.4
1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1863 { 1861 {
1864 iso14755_54 (ev.x, ev.y); 1862 iso14755_54 (ev.x, ev.y);
… …
1906 else 1904 else
1907 { 1905 {
1908 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1909 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1910 1908
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1912 switch (ev.button) 1909 switch (ev.button)
1913 { 1910 {
1914 case Button1: 1911 case Button1:
1915 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1916 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1917#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1918 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1919#else 1916#else
1920 selection.rect = false; 1917 selection.rect = false;
1921#endif 1918#endif
1922 1919
1923 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1925 { 1922 {
1926 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1927 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1928 else 1925 else
1929 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1930 } 1927 }
1931 else 1928 else
1932 { 1929 {
1933 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1934 MEvent.clicks++; 1931 MEvent.clicks++;
1935 else 1932 else
1936 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1937 1934
1938 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1939 } 1936 }
1940 1937
1941 MEvent.button = Button1; 1938 MEvent.button = Button1;
1942 break; 1939 break;
1943 1940
1944 case Button3: 1941 case Button3:
1945 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1946 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1947 else 1944 else
1948 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1949 1946
1950 MEvent.button = Button3; 1947 MEvent.button = Button3;
1951 break; 1948 break;
1952 } 1949 }
1953 } 1950 }
1954 1951
1955 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1956 return; 1953 return;
1957 } 1954 }
1958 1955
… …
2097 } 2094 }
2098 } 2095 }
2099 2096
2100 return; 2097 return;
2101 } 2098 }
2102
2103#if MENUBAR
2104 /*
2105 * Menubar window processing of button press
2106 */
2107 if (isMenuBarWindow (ev.window))
2108 menubar_control (ev);
2109#endif
2110} 2099}
2111 2100
2112void 2101void
2113rxvt_term::button_release (XButtonEvent &ev) 2102rxvt_term::button_release (XButtonEvent &ev)
2114{ 2103{
… …
2120 2109
2121 if (scrollbar_isUpDn ()) 2110 if (scrollbar_isUpDn ())
2122 { 2111 {
2123 scrollBar.setIdle (); 2112 scrollBar.setIdle ();
2124 scrollbar_show (0); 2113 scrollbar_show (0);
2125#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2126 refresh_type &= ~SMOOTH_REFRESH;
2127#endif
2128 } 2114 }
2129 2115
2130#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
2131 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
2132 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2133#endif 2119#endif
2134 2120
2135 if (ev.window == vt) 2121 if (ev.window == vt)
2136 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2137#if ISO_14755 2126#if ISO_14755
2138 // 5.4 2127 // 5.4
2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2140 return; 2129 return;
2141#endif 2130#endif
2131
2142 if (reportmode) 2132 if (reportmode)
2143 { 2133 {
2144 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2145 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2146 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2170 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2171 && bypass_keystate 2161 && bypass_keystate
2172 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2173 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2174 2164
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2178 switch (ev.button) 2165 switch (ev.button)
2179 { 2166 {
2180 case Button1: 2167 case Button1:
2181 case Button3: 2168 case Button3:
2182 selection_make (ev.time); 2169 selection_make (ev.time);
2183 break; 2170 break;
2171
2184 case Button2: 2172 case Button2:
2185 selection_request (ev.time, ev.x, ev.y); 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2186 break; 2175 break;
2176
2187#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2188 case Button4: 2178 case Button4:
2189 case Button5: 2179 case Button5:
2190 { 2180 {
2191 int i; 2181 int i;
… …
2193 2183
2194 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2195 2185
2196 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2197 i = 1; 2187 i = 1;
2198 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2199 i = nrow - 1; 2189 i = nrow - 1;
2200 else 2190 else
2201 i = 5; 2191 i = 5;
2202 2192
2203# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2213 slip_wheel_ev.start (); 2203 slip_wheel_ev.start ();
2214 } 2204 }
2215 else 2205 else
2216 { 2206 {
2217# endif 2207# endif
2218# ifdef JUMP_MOUSE_WHEEL
2219 scr_page (v, i); 2208 scr_page (v, i);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1); 2209 scrollbar_show (1);
2222# else
2223 while (i--)
2224 {
2225 scr_page (v, 1);
2226 scr_refresh (SMOOTH_REFRESH);
2227 scrollbar_show (1);
2228 }
2229# endif
2230# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2231 } 2211 }
2232#endif 2212# endif
2233 } 2213 }
2234 break; 2214 break;
2235#endif 2215#endif
2236 } 2216 }
2237 } 2217 }
2238#ifdef MENUBAR
2239 else if (isMenuBarWindow (ev.window))
2240 menubar_control (ev);
2241#endif
2242} 2218}
2243
2244#ifdef TRANSPARENT
2245#if TINTING
2246/* taken from aterm-0.4.2 */
2247
2248typedef uint32_t RUINT32T;
2249
2250void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2251{
2252 int sh_r, sh_g, sh_b;
2253 RUINT32T mask_r, mask_g, mask_b;
2254 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2255 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2256 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2257 int i;
2258
2259 Visual *visual = display->visual;
2260
2261 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2262
2263 /* for convenience */
2264 mask_r = visual->red_mask;
2265 mask_g = visual->green_mask;
2266 mask_b = visual->blue_mask;
2267
2268 /* boring lookup table pre-initialization */
2269 switch (srcImage->bits_per_pixel) {
2270 case 15:
2271 if ((mask_r != 0x7c00) ||
2272 (mask_g != 0x03e0) ||
2273 (mask_b != 0x001f))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2276 lookup_r = lookup;
2277 lookup_g = lookup+32;
2278 lookup_b = lookup+32+32;
2279 sh_r = 10;
2280 sh_g = 5;
2281 sh_b = 0;
2282 break;
2283 case 16:
2284 if ((mask_r != 0xf800) ||
2285 (mask_g != 0x07e0) ||
2286 (mask_b != 0x001f))
2287 return;
2288 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2289 lookup_r = lookup;
2290 lookup_g = lookup+32;
2291 lookup_b = lookup+32+64;
2292 sh_r = 11;
2293 sh_g = 5;
2294 sh_b = 0;
2295 break;
2296 case 24:
2297 if ((mask_r != 0xff0000) ||
2298 (mask_g != 0x00ff00) ||
2299 (mask_b != 0x0000ff))
2300 return;
2301 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2302 lookup_r = lookup;
2303 lookup_g = lookup+256;
2304 lookup_b = lookup+256+256;
2305 sh_r = 16;
2306 sh_g = 8;
2307 sh_b = 0;
2308 break;
2309 case 32:
2310 if ((mask_r != 0xff0000) ||
2311 (mask_g != 0x00ff00) ||
2312 (mask_b != 0x0000ff))
2313 return;
2314 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2315 lookup_r = lookup;
2316 lookup_g = lookup+256;
2317 lookup_b = lookup+256+256;
2318 sh_r = 16;
2319 sh_g = 8;
2320 sh_b = 0;
2321 break;
2322 default:
2323 return; /* we do not support this color depth */
2324 }
2325
2326 /* prepare limits for color transformation (each channel is handled separately) */
2327 if (shade < 0) {
2328 shade = -shade;
2329 if (shade < 0) shade = 0;
2330 if (shade > 100) shade = 100;
2331
2332 lower_lim_r = 65535-rm;
2333 lower_lim_g = 65535-gm;
2334 lower_lim_b = 65535-bm;
2335
2336 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2337 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2338 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2339
2340 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2341 } else {
2342 if (shade < 0) shade = 0;
2343 if (shade > 100) shade = 100;
2344
2345 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2346
2347 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2348 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2349 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2350 }
2351
2352 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2353 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2354 {
2355 unsigned int tmp;
2356
2357 tmp = lower_lim_r;
2358 lower_lim_r = lower_lim_b;
2359 lower_lim_b = tmp;
2360
2361 tmp = upper_lim_r;
2362 upper_lim_r = upper_lim_b;
2363 upper_lim_b = tmp;
2364 }
2365
2366 /* fill our lookup tables */
2367 for (i = 0; i <= mask_r>>sh_r; i++)
2368 {
2369 RUINT32T tmp;
2370 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2371 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2372 lookup_r[i] = (tmp/65535)<<sh_r;
2373 }
2374 for (i = 0; i <= mask_g>>sh_g; i++)
2375 {
2376 RUINT32T tmp;
2377 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2378 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2379 lookup_g[i] = (tmp/65535)<<sh_g;
2380 }
2381 for (i = 0; i <= mask_b>>sh_b; i++)
2382 {
2383 RUINT32T tmp;
2384 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2385 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2386 lookup_b[i] = (tmp/65535)<<sh_b;
2387 }
2388
2389 /* apply table to input image (replacing colors by newly calculated ones) */
2390 switch (srcImage->bits_per_pixel)
2391 {
2392 case 15:
2393 {
2394 unsigned short *p1, *pf, *p, *pl;
2395 p1 = (unsigned short *) srcImage->data;
2396 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0x7c00)>>10] |
2404 lookup_g[(*p & 0x03e0)>> 5] |
2405 lookup_b[(*p & 0x001f)];
2406 }
2407 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 16:
2412 {
2413 unsigned short *p1, *pf, *p, *pl;
2414 p1 = (unsigned short *) srcImage->data;
2415 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xf800)>>11] |
2423 lookup_g[(*p & 0x07e0)>> 5] |
2424 lookup_b[(*p & 0x001f)];
2425 }
2426 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 case 24:
2431 {
2432 unsigned char *p1, *pf, *p, *pl;
2433 p1 = (unsigned char *) srcImage->data;
2434 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2435 while (p1 < pf)
2436 {
2437 p = p1;
2438 pl = p1 + srcImage->width * 3;
2439 for (; p < pl; p += 3)
2440 {
2441 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2442 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2443 p[2] = lookup_r[(p[2] & 0x0000ff)];
2444 }
2445 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2446 }
2447 break;
2448 }
2449 case 32:
2450 {
2451 RUINT32T *p1, *pf, *p, *pl;
2452 p1 = (RUINT32T *) srcImage->data;
2453 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2454
2455 while (p1 < pf)
2456 {
2457 p = p1;
2458 pl = p1 + srcImage->width;
2459 for (; p < pl; p++)
2460 {
2461 *p = lookup_r[(*p & 0xff0000)>>16] |
2462 lookup_g[(*p & 0x00ff00)>> 8] |
2463 lookup_b[(*p & 0x0000ff)] |
2464 (*p & ~0xffffff);
2465 }
2466 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2467 }
2468 break;
2469 }
2470 }
2471
2472 free (lookup);
2473}
2474#endif
2475
2476/*
2477 * Check our parents are still who we think they are.
2478 * Do transparency updates if required
2479 */
2480int
2481rxvt_term::check_our_parents ()
2482{
2483 int i, pchanged, aformat, have_pixmap, rootdepth;
2484 unsigned long nitems, bytes_after;
2485 Atom atype;
2486 unsigned char *prop = NULL;
2487 Window root, oldp, *list;
2488 Pixmap rootpixmap = None;
2489 XWindowAttributes wattr, wrootattr;
2490 dDisp;
2491
2492 pchanged = 0;
2493
2494 if (!OPTION (Opt_transparent))
2495 return pchanged; /* Don't try any more */
2496
2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2498 rootdepth = wrootattr.depth;
2499
2500 XGetWindowAttributes (disp, parent[0], &wattr);
2501
2502 if (rootdepth != wattr.depth)
2503 {
2504 if (am_transparent)
2505 {
2506 pchanged = 1;
2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2508 am_transparent = am_pixmap_trans = 0;
2509 }
2510
2511 return pchanged; /* Don't try any more */
2512 }
2513
2514 /* Get all X ops out of the queue so that our information is up-to-date. */
2515 XSync (disp, False);
2516
2517 /*
2518 * Make the frame window set by the window manager have
2519 * the root background. Some window managers put multiple nested frame
2520 * windows for each client, so we have to take care about that.
2521 */
2522 i = (xa[XA_XROOTPMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success);
2526
2527 if (!i || prop == NULL)
2528 i = (xa[XA_ESETROOT_PMAP_ID]
2529 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2530 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2531 &nitems, &bytes_after, &prop) == Success);
2532
2533 if (!i || prop == NULL
2534#if TINTING
2535 || !rs[Rs_color + Color_tint]
2536#endif
2537 )
2538 have_pixmap = 0;
2539 else
2540 {
2541 have_pixmap = 1;
2542 rootpixmap = *(Pixmap *)prop;
2543 XFree (prop);
2544 }
2545
2546 if (have_pixmap)
2547 {
2548 /*
2549 * Copy display->root pixmap transparency
2550 */
2551 int sx, sy, nx, ny;
2552 unsigned int nw, nh;
2553 Window cr;
2554 XImage *image;
2555 GC gc;
2556 XGCValues gcvalue;
2557
2558 XTranslateCoordinates (disp, parent[0], display->root,
2559 0, 0, &sx, &sy, &cr);
2560 nw = (unsigned int)szHint.width;
2561 nh = (unsigned int)szHint.height;
2562 nx = ny = 0;
2563
2564 if (sx < 0)
2565 {
2566 nw += sx;
2567 nx = -sx;
2568 sx = 0;
2569 }
2570
2571 if (sy < 0)
2572 {
2573 nh += sy;
2574 ny = -sy;
2575 sy = 0;
2576 }
2577
2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2580
2581 XSync (disp, False);
2582 allowedxerror = -1;
2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2584
2585 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2586 /* XXX: may need a delay here? */
2587 allowedxerror = 0;
2588
2589 if (image == NULL)
2590 {
2591 if (am_transparent && am_pixmap_trans)
2592 {
2593 pchanged = 1;
2594 if (pixmap != None)
2595 {
2596 XFreePixmap (disp, pixmap);
2597 pixmap = None;
2598 }
2599 }
2600
2601 am_pixmap_trans = 0;
2602 }
2603 else
2604 {
2605 if (pixmap != None)
2606 XFreePixmap (disp, pixmap);
2607
2608#if TINTING
2609 if (ISSET_PIXCOLOR (Color_tint))
2610 {
2611 unsigned short rm, gm, bm;
2612 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2613
2614 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2615
2616 ShadeXImage (display, image, shade, rm, gm, bm);
2617 }
2618#endif
2619
2620 pixmap = XCreatePixmap (disp, vt,
2621 szHint.width, szHint.height, image->depth);
2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2624 nx, ny, image->width, image->height);
2625 XFreeGC (disp, gc);
2626 XDestroyImage (image);
2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2628 XClearWindow (disp, parent[0]);
2629
2630 if (!am_transparent || !am_pixmap_trans)
2631 pchanged = 1;
2632
2633 am_transparent = am_pixmap_trans = 1;
2634 }
2635 }
2636
2637 if (am_pixmap_trans)
2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2639 else
2640 {
2641 unsigned int n;
2642 /*
2643 * InheritPixmap transparency
2644 */
2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2646 {
2647 oldp = parent[i];
2648 XQueryTree (disp, parent[i - 1], &root,
2649 &parent[i], &list, &n);
2650 XFree (list);
2651
2652 if (parent[i] == display->root)
2653 {
2654 if (oldp != None)
2655 pchanged = 1;
2656
2657 break;
2658 }
2659
2660 if (oldp != parent[i])
2661 pchanged = 1;
2662 }
2663
2664 n = 0;
2665
2666 if (pchanged)
2667 {
2668 for (; n < (unsigned int)i; n++)
2669 {
2670 XGetWindowAttributes (disp, parent[n], &wattr);
2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2672 {
2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2674 break;
2675 }
2676 }
2677 }
2678
2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2680 {
2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2683 am_transparent = 0;
2684 /* XXX: also turn off Opt_transparent? */
2685 }
2686 else
2687 {
2688#if WAIT_FOR_WM
2689 /* wait (an arbitrary period) for the WM to do its thing
2690 * needed for fvwm2.2.2 (and before?) */
2691 sleep (1);
2692#endif
2693 for (n = 0; n < (unsigned int)i; n++)
2694 {
2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2696 XClearWindow (disp, parent[n]);
2697 }
2698
2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2700 am_transparent = 1;
2701 }
2702
2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2704 parent[i] = None;
2705 }
2706
2707 if (scrollBar.win)
2708 {
2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2710 scrollBar.setIdle ();
2711 scrollbar_show (0);
2712 }
2713
2714 if (am_transparent)
2715 {
2716 want_refresh = want_full_refresh = 1;
2717 if (am_pixmap_trans)
2718 flush ();
2719 }
2720
2721 return pchanged;
2722}
2723#endif
2724 2219
2725/*}}} */ 2220/*}}} */
2726 2221
2727bool 2222bool
2728rxvt_term::cmd_parse () 2223rxvt_term::cmd_parse ()
… …
2777 if (ch == C0_LF) 2272 if (ch == C0_LF)
2778 nlines++; 2273 nlines++;
2779 2274
2780 refresh_count++; 2275 refresh_count++;
2781 2276
2782 if (!OPTION (Opt_jumpScroll) 2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2784 { 2278 {
2785 refreshnow = true;
2786 refresh_count = 0; 2279 refresh_count = 0;
2280
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2282 {
2283 refreshnow = true;
2787 ch = NOCHAR; 2284 ch = NOCHAR;
2788 break; 2285 break;
2286 }
2789 } 2287 }
2790 2288
2791 // scr_add_lines only works for nlines <= nrow - 1. 2289 // scr_add_lines only works for nlines <= nrow - 1.
2792 if (nlines >= nrow - 1) 2290 if (nlines >= nrow - 1)
2793 { 2291 {
2292 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2293 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2795 scr_add_lines (buf, str - buf, nlines); 2294 scr_add_lines (buf, str - buf, nlines);
2796 2295
2797 nlines = 0; 2296 nlines = 0;
2798 str = buf; 2297 str = buf;
2799 eol = str + min (ncol, UBUFSIZ); 2298 eol = str + min (ncol, UBUFSIZ);
… …
2814 2313
2815 seq_begin = cmdbuf_ptr; 2314 seq_begin = cmdbuf_ptr;
2816 ch = next_char (); 2315 ch = next_char ();
2817 } 2316 }
2818 2317
2318 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2319 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2820 scr_add_lines (buf, str - buf, nlines); 2320 scr_add_lines (buf, str - buf, nlines);
2821 2321
2822 /* 2322 /*
2823 * If there have been a lot of new lines, then update the screen 2323 * If there have been a lot of new lines, then update the screen
2824 * What the heck I'll cheat and only refresh less than every page-full. 2324 * What the heck we'll cheat and only refresh less than every page-full.
2825 * the number of pages between refreshes is refresh_limit, which 2325 * if skipScroll is enabled.
2826 * is incremented here because we must be doing flat-out scrolling.
2827 */ 2326 */
2828 if (refreshnow) 2327 if (refreshnow)
2829 { 2328 {
2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2831 refresh_limit++;
2832 else
2833 {
2834 flag = true; 2329 flag = true;
2835 scr_refresh (refresh_type); 2330 scr_refresh ();
2836 flush_ev.stop (); 2331 want_refresh = 1;
2837 }
2838 } 2332 }
2839 2333
2840 } 2334 }
2841 else 2335 else
2842 { 2336 {
… …
2858 return flag; 2352 return flag;
2859} 2353}
2860 2354
2861// read the next character 2355// read the next character
2862wchar_t 2356wchar_t
2863rxvt_term::next_char () 2357rxvt_term::next_char () NOTHROW
2864{ 2358{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2360 {
2867 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS
2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2889 return NOCHAR; 2383 return NOCHAR;
2890} 2384}
2891 2385
2892// read the next octet 2386// read the next octet
2893uint32_t 2387uint32_t
2894rxvt_term::next_octet () 2388rxvt_term::next_octet () NOTHROW
2895{ 2389{
2896 return cmdbuf_ptr < cmdbuf_endp 2390 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++ 2391 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR; 2392 : NOCHAR;
2899} 2393}
2394
2395static class out_of_input out_of_input;
2900 2396
2901/* rxvt_cmd_getc () - Return next input character */ 2397/* rxvt_cmd_getc () - Return next input character */
2902/* 2398/*
2903 * Return the next input character after first passing any keyboard input 2399 * Return the next input character after first passing any keyboard input
2904 * to the command. 2400 * to the command.
2905 */ 2401 */
2906wchar_t 2402wchar_t
2907rxvt_term::cmd_getc () 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2908{ 2404{
2909 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2910 2406
2911 if (c == NOCHAR) 2407 if (c == NOCHAR)
2912 throw out_of_input; 2408 throw out_of_input;
2913 2409
2914 return c; 2410 return c;
2915} 2411}
2916 2412
2917uint32_t 2413uint32_t
2918rxvt_term::cmd_get8 () 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2919{ 2415{
2920 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2921 2417
2922 if (c == NOCHAR) 2418 if (c == NOCHAR)
2923 throw out_of_input; 2419 throw out_of_input;
… …
2989 { 2485 {
2990 if ((buf[len++] = cmd_getc ()) == 'i') 2486 if ((buf[len++] = cmd_getc ()) == 'i')
2991 break; /* done = 1 */ 2487 break; /* done = 1 */
2992 } 2488 }
2993 } 2489 }
2994 2490
2995 for (i = 0; i < len; i++) 2491 for (i = 0; i < len; i++)
2996 if (putc (buf[i], fd) == EOF) 2492 if (putc (buf[i], fd) == EOF)
2997 { 2493 {
2998 done = 1; 2494 done = 1;
2999 break; 2495 break;
… …
3061 process_dcs_seq (); 2557 process_dcs_seq ();
3062 break; 2558 break;
3063 case 0x9b: /* CSI */ 2559 case 0x9b: /* CSI */
3064 process_csi_seq (); 2560 process_csi_seq ();
3065 break; 2561 break;
3066 case 0x9d: /* CSI */ 2562 case 0x9d: /* OSC */
3067 process_osc_seq (); 2563 process_osc_seq ();
3068 break; 2564 break;
3069#endif 2565#endif
3070 } 2566 }
3071} 2567}
… …
3161 scr_charset_set (2, (unsigned int)cmd_getc ()); 2657 scr_charset_set (2, (unsigned int)cmd_getc ());
3162 break; 2658 break;
3163 case '+': 2659 case '+':
3164 scr_charset_set (3, (unsigned int)cmd_getc ()); 2660 scr_charset_set (3, (unsigned int)cmd_getc ());
3165 break; 2661 break;
3166#if ENABLE_FRILLS 2662#if !ENABLE_MINIMAL
3167 case '6': 2663 case '6':
3168 scr_backindex (); 2664 scr_backindex ();
3169 break; 2665 break;
3170#endif 2666#endif
3171 case '7': 2667 case '7':
3172 scr_cursor (SAVE); 2668 scr_cursor (SAVE);
3173 break; 2669 break;
3174 case '8': 2670 case '8':
3175 scr_cursor (RESTORE); 2671 scr_cursor (RESTORE);
3176 break; 2672 break;
3177#if ENABLE_FRILLS 2673#if !ENABLE_MINIMAL
3178 case '9': 2674 case '9':
3179 scr_forwardindex (); 2675 scr_forwardindex ();
3180 break; 2676 break;
3181#endif 2677#endif
3182 case '=': 2678 case '=':
… …
3299 unicode_t ch, priv, i; 2795 unicode_t ch, priv, i;
3300 unsigned int nargs, p; 2796 unsigned int nargs, p;
3301 int n, ndef; 2797 int n, ndef;
3302 int arg[ESC_ARGS]; 2798 int arg[ESC_ARGS];
3303 2799
3304 for (nargs = ESC_ARGS; nargs > 0;) 2800 memset (arg, 0, sizeof (arg));
3305 arg[--nargs] = 0; 2801 nargs = 0;
3306 2802
3307 priv = 0; 2803 priv = 0;
3308 ch = cmd_getc (); 2804 ch = cmd_getc ();
3309 if (ch >= '<' && ch <= '?') 2805 if (ch >= '<' && ch <= '?')
3310 { /* '<' '=' '>' '?' */ 2806 { /* '<' '=' '>' '?' */
… …
3344 ndef = get_byte_array_bit (csi_defaults, i); 2840 ndef = get_byte_array_bit (csi_defaults, i);
3345 for (p = 0; p < nargs; p++) 2841 for (p = 0; p < nargs; p++)
3346 if (arg[p] == -1) 2842 if (arg[p] == -1)
3347 arg[p] = ndef; 2843 arg[p] = ndef;
3348 2844
3349#ifdef DEBUG_CMD
3350 fprintf (stderr, "CSI ");
3351 for (p = 0; p < nargs; p++)
3352 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3353 fprintf (stderr, "%c\n", ch);
3354#endif
3355
3356 /* 2845 /*
3357 * private mode handling 2846 * private mode handling
3358 */ 2847 */
3359 if (priv) 2848 if (priv)
3360 { 2849 {
3361 switch (priv) 2850 switch (priv)
3362 { 2851 {
3363 case '>': 2852 case '>':
3364 if (ch == CSI_DA) /* secondary device attributes */ 2853 if (ch == CSI_DA) /* secondary device attributes */
3365 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2854 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2860 // that we do not support xterm mouse reporting (should be 95 when we do).
2861 //
2862 tt_printf ("\033[>%d;94;0c", 'U');
2863 }
3366 break; 2864 break;
3367 case '?': 2865 case '?':
3368 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3369 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
3370 break; 2868 break;
… …
3496 break; 2994 break;
3497 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
3498 scr_report_position (); 2996 scr_report_position ();
3499 break; 2997 break;
3500 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
3501 if (OPTION (Opt_insecure)) 2999 if (option (Opt_insecure))
3502 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3503 break; 3001 break;
3504 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3506 break; 3004 break;
… …
3573 break; 3071 break;
3574 case CSI_75: 3072 case CSI_75:
3575 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
3576 break; 3074 break;
3577 3075
3578#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3579 case CSI_74: 3077 case CSI_74:
3580 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
3581 break; 3079 break;
3582#endif 3080#endif
3583 3081
… …
3590 break; 3088 break;
3591 } 3089 }
3592} 3090}
3593/*}}} */ 3091/*}}} */
3594 3092
3595#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3596/* ARGSUSED */ 3094/* ARGSUSED */
3597void 3095void
3598rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3096rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3599{ 3097{
3600 int x, y; 3098 int x, y;
3601 XWindowAttributes wattr; 3099 XWindowAttributes wattr;
3602 Window wdummy; 3100 Window wdummy;
3603 dDisp; 3101
3102 dLocal (Display *, dpy);
3604 3103
3605 if (nargs == 0) 3104 if (nargs == 0)
3606 return; 3105 return;
3607 3106
3608 switch (args[0]) 3107 switch (args[0])
3609 { 3108 {
3610 /* 3109 /*
3611 * commands 3110 * commands
3612 */ 3111 */
3613 case 1: /* deiconify window */ 3112 case 1: /* deiconify window */
3614 XMapWindow (disp, parent[0]); 3113 XMapWindow (dpy, parent[0]);
3615 break; 3114 break;
3616 case 2: /* iconify window */ 3115 case 2: /* iconify window */
3617 XIconifyWindow (disp, parent[0], display->screen); 3116 XIconifyWindow (dpy, parent[0], display->screen);
3618 break; 3117 break;
3619 case 3: /* set position (pixels) */ 3118 case 3: /* set position (pixels) */
3620 XMoveWindow (disp, parent[0], args[1], args[2]); 3119 XMoveWindow (dpy, parent[0], args[1], args[2]);
3621 break; 3120 break;
3622 case 4: /* set size (pixels) */ 3121 case 4: /* set size (pixels) */
3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3122 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3624 break; 3123 break;
3625 case 5: /* raise window */ 3124 case 5: /* raise window */
3626 XRaiseWindow (disp, parent[0]); 3125 XRaiseWindow (dpy, parent[0]);
3627 break; 3126 break;
3628 case 6: /* lower window */ 3127 case 6: /* lower window */
3629 XLowerWindow (disp, parent[0]); 3128 XLowerWindow (dpy, parent[0]);
3630 break; 3129 break;
3631 case 7: /* refresh window */ 3130 case 7: /* refresh window */
3632 scr_touch (true); 3131 scr_touch (true);
3633 break; 3132 break;
3634 case 8: /* set size (chars) */ 3133 case 8: /* set size (chars) */
… …
3641 if (args[0] >= 24) /* set height (chars) */ 3140 if (args[0] >= 24) /* set height (chars) */
3642 set_widthheight ((unsigned int)width, 3141 set_widthheight ((unsigned int)width,
3643 (unsigned int) (args[1] * fheight)); 3142 (unsigned int) (args[1] * fheight));
3644 break; 3143 break;
3645 3144
3646
3647 /* 3145 /*
3648 * reports - some output format copied from XTerm 3146 * reports - some output format copied from XTerm
3649 */ 3147 */
3650 case 11: /* report window state */ 3148 case 11: /* report window state */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3150 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3653 break; 3151 break;
3654 case 13: /* report window position */ 3152 case 13: /* report window position */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3153 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 XTranslateCoordinates (disp, parent[0], wattr.root, 3154 XTranslateCoordinates (dpy, parent[0], wattr.root,
3657 -wattr.border_width, -wattr.border_width, 3155 -wattr.border_width, -wattr.border_width,
3658 &x, &y, &wdummy); 3156 &x, &y, &wdummy);
3659 tt_printf ("\033[3;%d;%dt", x, y); 3157 tt_printf ("\033[3;%d;%dt", x, y);
3660 break; 3158 break;
3661 case 14: /* report window size (pixels) */ 3159 case 14: /* report window size (pixels) */
3662 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3161 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3664 break; 3162 break;
3665 case 18: /* report text area size (chars) */ 3163 case 18: /* report text area size (chars) */
3666 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3667 break; 3165 break;
… …
3669 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3167 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3670 break; 3168 break;
3671 case 20: /* report icon label */ 3169 case 20: /* report icon label */
3672 { 3170 {
3673 char *s; 3171 char *s;
3674 XGetIconName (disp, parent[0], &s); 3172 XGetIconName (dpy, parent[0], &s);
3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3173 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3676 XFree (s); 3174 XFree (s);
3677 } 3175 }
3678 break; 3176 break;
3679 case 21: /* report window title */ 3177 case 21: /* report window title */
3680 { 3178 {
3681 char *s; 3179 char *s;
3682 XFetchName (disp, parent[0], &s); 3180 XFetchName (dpy, parent[0], &s);
3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3181 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3684 XFree (s); 3182 XFree (s);
3685 } 3183 }
3686 break; 3184 break;
3687 } 3185 }
3688} 3186}
… …
3715 seen_esc = true; 3213 seen_esc = true;
3716 continue; 3214 continue;
3717 } 3215 }
3718 else if (ch == C0_BEL || ch == CHAR_ST) 3216 else if (ch == C0_BEL || ch == CHAR_ST)
3719 break; 3217 break;
3218 else if (ch == C0_SYN)
3219 ch = cmd_get8 ();
3720 else if (ch < 0x20) 3220 else if (ch < 0x20)
3721 return NULL; /* other control character - exit */ 3221 return NULL; /* other control character - exit */
3722 3222
3723 seen_esc = false; 3223 seen_esc = false;
3724 3224
3725 if (n >= STRING_MAX - 1) 3225 if (n >= STRING_MAX - 1)
3726 // stop at some sane length 3226 // stop at some sane length
3727 return NULL; 3227 return NULL;
3728 3228
3729 if (ch == C0_SYN)
3730 string[n++] = cmd_get8 ();
3731 else
3732 string[n++] = ch; 3229 string[n++] = ch;
3733 } 3230 }
3734 3231
3735 string[n++] = '\0'; 3232 string[n++] = '\0';
3736 3233
3737 ends_how = (ch == 0x5c ? C0_ESC : ch); 3234 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3788void 3285void
3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3286rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3790{ 3287{
3791 if (str[0] == '?' && !str[1]) 3288 if (str[0] == '?' && !str[1])
3792 { 3289 {
3793 unsigned short r, g, b; 3290 rgba c;
3794 pix_colors_focused[color].get (display, r, g, b); 3291 pix_colors_focused[color].get (c);
3292
3293#if XFT
3294 if (c.a != rgba::MAX_CC)
3295 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3296 else
3297#endif
3795 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3298 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3796 } 3299 }
3797 else 3300 else
3798 set_window_color (color, str); 3301 set_window_color (color, str);
3799} 3302}
3800 3303
… …
3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3803 */ 3306 */
3804void 3307void
3805rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3308rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3806{ 3309{
3807 int changed = 0;
3808 int color; 3310 int color;
3809 char *buf, *name; 3311 char *buf, *name;
3810 bool query = str[0] == '?' && !str[1]; 3312 bool query = str[0] == '?' && !str[1];
3811 int saveop = op; 3313 int saveop = op;
3812 dDisp; 3314
3315 dLocal (Display *, dpy);
3813 3316
3814 assert (str != NULL); 3317 assert (str != NULL);
3318
3319 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3320 return;
3321
3815 switch (op) 3322 switch (op)
3816 { 3323 {
3817 case XTerm_name: 3324 case XTerm_name:
3818 set_title (str); 3325 set_title (str);
3819 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
… …
3833 unsigned long bytes_after; 3340 unsigned long bytes_after;
3834 unsigned char *value = 0; 3341 unsigned char *value = 0;
3835 const char *str = ""; 3342 const char *str = "";
3836 3343
3837 if (prop 3344 if (prop
3838 && XGetWindowProperty (disp, parent[0], 3345 && XGetWindowProperty (dpy, parent[0],
3839 prop, 0, 1<<16, 0, AnyPropertyType, 3346 prop, 0, 1<<16, 0, AnyPropertyType,
3840 &actual_type, &actual_format, 3347 &actual_type, &actual_format,
3841 &nitems, &bytes_after, &value) == Success 3348 &nitems, &bytes_after, &value) == Success
3842 && actual_type != None 3349 && actual_type != None
3843 && actual_format == 8) 3350 && actual_format == 8)
3844 str = (const char *)(value); 3351 str = (const char *)(value);
3845 3352
3846 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3353 tt_printf ("\033]%d;%s%c", op, str, resp);
3847 3354
3848 XFree (value); 3355 XFree (value);
3849 } 3356 }
3850 else 3357 else
3851 { 3358 {
… …
3855 { 3362 {
3856 *eq = 0; 3363 *eq = 0;
3857 set_utf8_property (display->atom (str), eq + 1); 3364 set_utf8_property (display->atom (str), eq + 1);
3858 } 3365 }
3859 else 3366 else
3860 XDeleteProperty (disp, parent[0], 3367 XDeleteProperty (dpy, parent[0],
3861 display->atom (str)); 3368 display->atom (str));
3862 } 3369 }
3863 break; 3370 break;
3864 3371
3865 case XTerm_Color: 3372 case XTerm_Color:
… …
3867 { 3374 {
3868 if ((name = strchr (buf, ';')) == NULL) 3375 if ((name = strchr (buf, ';')) == NULL)
3869 break; 3376 break;
3870 3377
3871 *name++ = '\0'; 3378 *name++ = '\0';
3872 color = atoi (buf); 3379 color = atoi (buf) + minCOLOR;
3873 3380
3874 if (color < 0 || color >= TOTAL_COLORS) 3381 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3875 break; 3382 break;
3876 3383
3877 if ((buf = strchr (name, ';')) != NULL) 3384 if ((buf = strchr (name, ';')) != NULL)
3878 *buf++ = '\0'; 3385 *buf++ = '\0';
3879 3386
3880 if (name[0] == '?' && !name[1]) 3387 process_color_seq (op, color, name, resp);
3881 {
3882 unsigned short r, g, b;
3883 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3884 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3885 }
3886 else
3887 set_window_color (color + minCOLOR, name);
3888 } 3388 }
3889 break; 3389 break;
3890 case XTerm_Color00: 3390 case XTerm_Color00:
3891 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3391 process_color_seq (op, Color_fg, str, resp);
3892 break; 3392 break;
3893 case XTerm_Color01: 3393 case XTerm_Color01:
3894 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3895 break; 3395 break;
3896#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3897 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
3898 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3398 process_color_seq (op, Color_cursor, str, resp);
3899 break; 3399 break;
3900#endif 3400#endif
3901 case XTerm_Color_pointer_fg: 3401 case XTerm_Color_pointer_fg:
3902 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3903 break; 3403 break;
3904 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3905 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3906 break; 3406 break;
3907#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3908 case XTerm_Color_BD:
3909 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3910 break;
3911 case XTerm_Color_UL:
3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3913 break;
3914 case XTerm_Color_RV: 3408 case XTerm_Color_RV:
3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3409 process_color_seq (op, Color_RV, str, resp);
3410 break;
3411 case Rxvt_Color_BD:
3412 case URxvt_Color_BD:
3413 process_color_seq (op, Color_BD, str, resp);
3414 break;
3415 case Rxvt_Color_UL:
3416 case URxvt_Color_UL:
3417 process_color_seq (op, Color_UL, str, resp);
3916 break; 3418 break;
3917 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3919 break; 3421 break;
3920#endif 3422#endif
3921#if TRANSPARENT && TINTING 3423#if ENABLE_TRANSPARENCY
3922 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3924 check_our_parents (); 3426 {
3925 if (am_transparent) 3427 bool changed = false;
3926 want_full_refresh = want_refresh = 1; 3428 if (ISSET_PIXCOLOR (Color_tint))
3927 break; 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3928#endif 3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3929 3435
3436 break;
3437#endif
3438
3439#if XPM_BACKGROUND
3930 case XTerm_Pixmap: 3440 case Rxvt_Pixmap:
3931 if (*str != ';') 3441 if (!strcmp (str, "?"))
3932 { 3442 {
3933#if XPM_BACKGROUND 3443 char str[256];
3934 scale_pixmap (""); /* reset to default scaling */ 3444
3935 set_bgPixmap (str); /* change pixmap */ 3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3936#endif 3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3937 scr_touch (true); 3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3938 } 3449 }
3939 while ((str = strchr (str, ';')) != NULL) 3450 else
3940 { 3451 {
3452 int changed = 0;
3453
3454 if (*str != ';')
3455 {
3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3458 if (bgPixmap.set_file (str)) /* change pixmap */
3459 changed++;
3460 str = strchr (str, ';');
3461 if (str == NULL)
3462 bgPixmap.set_defaultGeometry ();
3463 }
3464 while (str)
3465 {
3941 str++; 3466 str++;
3942#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3943 changed += scale_pixmap (str); 3468 changed++;
3944#endif 3469 str = strchr (str, ';');
3470 }
3471 if (changed)
3472 {
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3945 } 3476 }
3946
3947 if (changed)
3948 {
3949#ifdef XPM_BACKGROUND
3950 resize_pixmap ();
3951#endif
3952 scr_touch (true);
3953 }
3954 break; 3477 break;
3478#endif
3955 3479
3956 case XTerm_restoreFG: 3480 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3958 break; 3482 break;
3959 case XTerm_restoreBG: 3483 case Rxvt_restoreBG:
3960 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3961 break; 3485 break;
3962 3486
3963 case XTerm_logfile: 3487 case XTerm_logfile:
3964 // TODO, when secure mode? 3488 // TODO, when secure mode?
3965 break; 3489 break;
3966 3490
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3491#if 0
3974 case XTerm_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3975 { 3493 {
3976 int fd; 3494 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3495 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3978 { 3496 {
3979 scr_dump (fd); 3497 scr_dump (fd);
… …
3990 case URxvt_italicFont: 3508 case URxvt_italicFont:
3991 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3992#endif 3510#endif
3993 if (query) 3511 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3996 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3997 resp); 3515 resp);
3998 else 3516 else
3999 { 3517 {
4000 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4003 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
4004 set_fonts (); 3522 set_fonts ();
4005 } 3523 }
4006 break; 3524 break;
4007 3525
4008#if ENABLE_FRILLS 3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
4009 case URxvt_locale: 3535 case URxvt_locale:
4010 if (query) 3536 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4012 else 3538 else
4013 { 3539 {
4014 set_locale (str); 3540 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3542 init_xlocale ();
4017 } 3543 }
4018 break; 3544 break;
4019 3545
4020 case URxvt_view_up: 3546 case URxvt_view_up:
… …
4031 break; 3557 break;
4032#endif 3558#endif
4033 3559
4034#if ENABLE_PERL 3560#if ENABLE_PERL
4035 case URxvt_perl: 3561 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet 3563 ; // no responses yet
4038 break; 3564 break;
4039#endif 3565#endif
4040 } 3566 }
4041} 3567}
… …
4073 return state; 3599 return state;
4074} 3600}
4075 3601
4076/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
4077void 3603void
4078rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079{ 3605{
4080 unsigned int i, j; 3606 unsigned int i, j;
4081 int state; 3607 int state;
4082 3608
4083 static const struct 3609 static const struct
4084 { 3610 {
4085 const int argval; 3611 const int argval;
4086 const unsigned long bit; 3612 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3613 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
4091 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
4093 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
4094 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 3619 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 3620 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 3621 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 3623 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 3627#endif
… …
4153 /* extra handling for values with state unkept */ 3674 /* extra handling for values with state unkept */
4154 switch (arg[i]) 3675 switch (arg[i])
4155 { 3676 {
4156#if ENABLE_STYLES 3677#if ENABLE_STYLES
4157 case 1021: 3678 case 1021:
4158 if (mode) 3679 set_option (Opt_intensityStyles, mode);
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162 3680
4163 scr_touch (true); 3681 scr_touch (true);
4164 break; 3682 break;
4165#endif 3683#endif
4166 case 1048: /* alternative cursor save */ 3684 case 1048: /* alternative cursor save */
4167 case 1049: 3685 case 1049:
4168 if (OPTION (Opt_secondaryScreen)) 3686 if (option (Opt_secondaryScreen))
4169 if (mode == 0) 3687 if (mode == 0)
4170 scr_cursor (RESTORE); 3688 scr_cursor (RESTORE);
4171 else if (mode == 1) 3689 else if (mode == 1)
4172 scr_cursor (SAVE); 3690 scr_cursor (SAVE);
4173 break; 3691 break;
… …
4188 case 3: /* 80/132 */ 3706 case 3: /* 80/132 */
4189 if (priv_modes & PrivMode_132OK) 3707 if (priv_modes & PrivMode_132OK)
4190 set_widthheight (((state ? 132 : 80) * fwidth), height); 3708 set_widthheight (((state ? 132 : 80) * fwidth), height);
4191 break; 3709 break;
4192 case 4: /* smooth scrolling */ 3710 case 4: /* smooth scrolling */
4193 if (!state) 3711 set_option (Opt_jumpScroll, !state);
4194 SET_OPTION (Opt_jumpScroll);
4195 else
4196 CLR_OPTION (Opt_jumpScroll);
4197 break; 3712 break;
4198 case 5: /* reverse video */ 3713 case 5: /* reverse video */
4199 scr_rvideo_mode (state); 3714 scr_rvideo_mode (state);
4200 break; 3715 break;
4201 case 6: /* relative/absolute origins */ 3716 case 6: /* relative/absolute origins */
… …
4207 /* case 8: - auto repeat, can't do on a per window basis */ 3722 /* case 8: - auto repeat, can't do on a per window basis */
4208 case 9: /* X10 mouse reporting */ 3723 case 9: /* X10 mouse reporting */
4209 if (state) /* orthogonal */ 3724 if (state) /* orthogonal */
4210 priv_modes &= ~PrivMode_MouseX11; 3725 priv_modes &= ~PrivMode_MouseX11;
4211 break; 3726 break;
4212#ifdef menuBar_esc
4213 case menuBar_esc:
4214#ifdef MENUBAR
4215 map_menuBar (state);
4216#endif
4217 break;
4218#endif
4219#ifdef scrollBar_esc 3727#ifdef scrollBar_esc
4220 case scrollBar_esc: 3728 case scrollBar_esc:
4221 if (scrollbar_mapping (state)) 3729 if (scrollbar_mapping (state))
4222 { 3730 {
4223 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
… …
4242#if 0 3750#if 0
4243 case 1001: 3751 case 1001:
4244 break; /* X11 mouse highlighting */ 3752 break; /* X11 mouse highlighting */
4245#endif 3753#endif
4246 case 1010: /* scroll to bottom on TTY output inhibit */ 3754 case 1010: /* scroll to bottom on TTY output inhibit */
4247 if (!state) 3755 set_option (Opt_scrollTtyOutput, !state);
4248 SET_OPTION (Opt_scrollTtyOutput);
4249 else
4250 CLR_OPTION (Opt_scrollTtyOutput);
4251 break; 3756 break;
4252 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
4253 if (state) 3758 set_option (Opt_scrollTtyKeypress, state);
4254 SET_OPTION (Opt_scrollTtyKeypress);
4255 else
4256 CLR_OPTION (Opt_scrollTtyKeypress);
4257 break; 3759 break;
4258 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
4259 if (OPTION (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
4260 if (current_screen != PRIMARY) 3762 if (current_screen != PRIMARY)
4261 scr_erase_screen (2); 3763 scr_erase_screen (2);
4262 scr_change_screen (state); 3764 scr_change_screen (state);
4263 break; 3765 break;
4264 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
4265 scr_change_screen (state); 3767 scr_change_screen (state);
4266 if (OPTION (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
4267 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4268 scr_erase_screen (2); 3770 scr_erase_screen (2);
4269 break; 3771 break;
4270 default: 3772 default:
4271 break; 3773 break;
… …
4399 scr_color (Color_bg, Color_bg); 3901 scr_color (Color_bg, Color_bg);
4400 break; 3902 break;
4401 3903
4402 //case 50: // not variable spacing 3904 //case 50: // not variable spacing
4403 3905
4404#if ENABLE_FRILLS 3906#if !ENABLE_MINIMAL
4405 case 90: 3907 case 90:
4406 case 91: /* set bright fg color */ 3908 case 91: /* set bright fg color */
4407 case 92: 3909 case 92:
4408 case 93: 3910 case 93:
4409 case 94: 3911 case 94:
… …
4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3973const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472 3974
4473void 3975void
4474rxvt_term::tt_write (const char *data, unsigned int len) 3976rxvt_term::tt_write (const char *data, unsigned int len)
4475{ 3977{
4476 if (pty.pty < 0) 3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4477 return; 3979 return;
4478 3980
3981 if (pty->pty < 0)
3982 return;
3983
4479 if (v_buflen == 0) 3984 if (v_buflen == 0)
4480 { 3985 {
4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4482 3987
4483 if ((unsigned int)written == len) 3988 if ((unsigned int)written == len)
4484 return; 3989 return;
4485 3990
4486 data += written; 3991 data += written;
… …
4495 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (EVENT_READ | EVENT_WRITE);
4496} 4001}
4497 4002
4498void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4499{ 4004{
4500 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4501 4006
4502 if (written > 0) 4007 if (written > 0)
4503 { 4008 {
4504 v_buflen -= written; 4009 v_buflen -= written;
4505 4010

Diff Legend

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