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.253 by root, Mon Jan 9 23:30:01 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");
… …
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;
978 int end_row = row + nrow; 1053 int end_row = row + nrow;
979 1054
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1055 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1056 --row;
982 1057
983 do 1058 do
984 { 1059 {
985 int start_row = row; 1060 int start_row = row;
… …
987 1062
988 do 1063 do
989 { 1064 {
990 l = &ROW (row++); 1065 l = &ROW (row++);
991 1066
992 if (l->f & LINE_FILTERED) 1067 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 1068 {
996 // line not filtered, mark it as filtered 1069 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 1070 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 1071 while (l->is_longer ())
999 { 1072 {
1000 l = &ROW (++row); 1073 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 1074 l->f |= LINE_FILTERED;
1002 } 1075 }
1003 1076
1004 // and filter it 1077 // and filter it
1005 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));
… …
1007 break; 1080 break;
1008 } 1081 }
1009 } 1082 }
1010 while (l->is_longer () && row < end_row); 1083 while (l->is_longer () && row < end_row);
1011 } 1084 }
1012 while (++row < end_row); 1085 while (row < end_row);
1013 } 1086 }
1014 1087
1015 scr_refresh (refresh_type); 1088 scr_refresh ();
1016 scrollbar_show (1); 1089 scrollbar_show (1);
1017#ifdef USE_XIM 1090#ifdef USE_XIM
1018 IMSendSpot (); 1091 IMSendSpot ();
1019#endif 1092#endif
1020 } 1093 }
… …
1023} 1096}
1024 1097
1025void 1098void
1026rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
1027{ 1100{
1028 SET_R (this); 1101 make_current ();
1029 SET_LOCALE (locale);
1030 1102
1031 display->flush (); 1103 display->flush ();
1032 1104
1033 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1034 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
1035} 1107}
1036 1108
1037void 1109void
1038rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1039{ 1111{
1040 SET_R (this); 1112 make_current ();
1041 SET_LOCALE (locale);
1042 1113
1043 refresh_limit = 1;
1044 refresh_count = 0; 1114 refresh_count = 0;
1045 flush (); 1115 flush ();
1046} 1116}
1047 1117
1048#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1050rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1051{ 1121{
1052 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1123 want_refresh = 1;
1054 1124
1055 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1056} 1126}
1057#endif 1127#endif
1058 1128
1059#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1060void 1130void
… …
1074rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1075{ 1145{
1076 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1078 { 1148 {
1079 refresh_type |= SMOOTH_REFRESH;
1080 want_refresh = 1; 1149 want_refresh = 1;
1081 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082 } 1151 }
1083} 1152}
1084#endif 1153#endif
… …
1088rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1089{ 1158{
1090 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091 { 1160 {
1092 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093 refresh_type |= SMOOTH_REFRESH;
1094 want_refresh = 1; 1162 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1164 }
1097} 1165}
1098#endif 1166#endif
… …
1103{ 1171{
1104 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1105 || 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)
1106 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1107 { 1175 {
1108 if (view_start == nsaved || 1176 if (view_start == top_row || view_start == 0)
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0; 1177 mouse_slip_wheel_speed = 0;
1111 1178
1112 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1; 1179 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115 } 1181 }
1116} 1182}
1117#endif 1183#endif
1118 1184
1119#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1120static struct event_handler 1186static struct event_handler
1121{ 1187{
1122 check_watcher cw_yield; 1188 check_watcher yield_ev;
1123 1189
1124 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1125 { 1191 {
1126 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
1127 w.stop (); 1200 w.stop ();
1128 } 1201 }
1129 1202
1130 event_handler () 1203 event_handler ()
1131 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1132 { 1205 {
1133 } 1206 }
1134} event_handler; 1207} event_handler;
1135#endif 1208#endif
1136 1209
… …
1147 1220
1148 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1149 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1151 1224
1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153 1226
1154 if (r > 0) 1227 if (r > 0)
1155 { 1228 {
1156 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1157 return true; 1230 return true;
1158 } 1231 }
1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1160 { 1233 {
1161#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1162 if (display->is_local) 1235 if (display->is_local)
1163 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1164#endif 1237#endif
1165 } 1238 }
1166 else 1239 else
1167 { 1240 {
1168 pty_ev.stop (); 1241 pty_ev.stop ();
1169 1242
1170 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1171 destroy (); 1244 destroy ();
1172 } 1245 }
1173 1246
1174 return false; 1247 return false;
1175} 1248}
1176 1249
1177void 1250void
1178rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1179{ 1252{
1180 SET_R (this); 1253 make_current ();
1181 SET_LOCALE (locale);
1182 1254
1183 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1184 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ()) 1257 while (pty_fill ())
1186 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1191} 1263}
1192 1264
1193void 1265void
1194rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1195{ 1267{
1196 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1197 recolour_cursor (); 1269 recolour_cursor ();
1198 1270
1199#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1200 hidden_pointer = 0; 1272 hidden_pointer = 0;
1201 1273
1202 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1203 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1204#endif 1276#endif
1205} 1277}
1206 1278
1207#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1208void 1280void
1209rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1210{ 1282{
1211 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1212 return; 1284 return;
1213 1285
1214 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1215 XFlush (display->display); 1287 XFlush (dpy);
1216 1288
1217 hidden_pointer = 1; 1289 hidden_pointer = 1;
1218} 1290}
1219 1291
1220void 1292void
1221rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1222{ 1294{
1223 SET_R (this); 1295 make_current ();
1224 SET_LOCALE (locale);
1225 1296
1226 pointer_blank (); 1297 pointer_blank ();
1227} 1298}
1228#endif 1299#endif
1229 1300
… …
1294 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1295 (32 + x + 1), 1366 (32 + x + 1),
1296 (32 + y + 1)); 1367 (32 + y + 1));
1297} 1368}
1298 1369
1299#ifdef USING_W11LIB
1300void
1301rxvt_W11_process_x_event (XEvent *ev)
1302{
1303 rxvt_t *r = rxvt_get_r ();
1304
1305 x_cb (*ev);
1306}
1307#endif
1308
1309/*{{{ process an X event */ 1370/*{{{ process an X event */
1310void 1371void
1311rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1312{ 1373{
1313 dDisp; 1374 make_current ();
1314 1375
1315 SET_R (this); 1376 dLocal (Display *, dpy);
1316 SET_LOCALE (locale);
1317 1377
1378 if (ev.xany.window == vt
1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1381 return;
1382
1383 // for XQueryPointer
1318 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1386 unsigned int unused_mask;
1321 1387
1322 switch (ev.type) 1388 switch (ev.type)
1323 { 1389 {
1324 case KeyPress: 1390 case KeyPress:
1325#if ISO_14755 1391 key_press (ev.xkey);
1326 if (!(iso14755buf & ISO_14755_52))
1327#endif
1328 lookup_key (ev.xkey);
1329
1330 break; 1392 break;
1331 1393
1332 case KeyRelease: 1394 case KeyRelease:
1333 { 1395 key_release (ev.xkey);
1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335 KeySym keysym;
1336
1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338#endif
1339
1340#if ENABLE_FRILLS || ISO_14755
1341 // ISO 14755 support
1342 if (iso14755buf)
1343 if (iso14755buf & ISO_14755_52)
1344 {
1345# if ENABLE_OVERLAY
1346 scr_overlay_off ();
1347# endif
1348# if ISO_14755
1349 // iso14755 part 5.2 handling: release time
1350 // first: controls
1351 if ((ev.xkey.state & ControlMask)
1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1354 {
1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356 commit_iso14755 ();
1357 goto skip_switch;
1358 }
1359
1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361 if (i[0] == keysym)
1362 {
1363 iso14755buf = ISO_14755_51 | i[1];
1364 commit_iso14755 ();
1365 goto skip_switch;
1366 }
1367
1368 scr_bell ();
1369# endif
1370 iso14755buf = 0;
1371 break;
1372 }
1373 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1374 {
1375# if ENABLE_OVERLAY
1376 scr_overlay_off ();
1377# endif
1378 if (iso14755buf & ISO_14755_51)
1379 commit_iso14755 ();
1380#if ISO_14755
1381 else if (iso14755buf & ISO_14755_STARTED)
1382 {
1383 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1384
1385 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1386 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1387 }
1388# endif
1389 else
1390 iso14755buf = 0;
1391 }
1392#endif
1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break;
1397
1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399 if (!(ev.xkey.state & ControlMask))
1400 slip_wheel_ev.stop ();
1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402 mouse_slip_wheel_speed = 0;
1403#endif
1404 break; 1396 break;
1405 }
1406 1397
1407 case ButtonPress: 1398 case ButtonPress:
1408 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1409 break; 1400 break;
1410 1401
… …
1412 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1413 break; 1404 break;
1414 1405
1415 case ClientMessage: 1406 case ClientMessage:
1416 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1417 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1418 { 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 {
1419 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)))
1420 destroy (); 1417 destroy ();
1418 }
1421#if ENABLE_EWMH 1419#if ENABLE_EWMH
1422 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])
1423 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1425 &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 }
1426#endif 1435#endif
1427 } 1436 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1437#ifdef OFFIX_DND
1438 /* OffiX Dnd (drag 'n' drop) protocol */
1439 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1440 && (ev.xclient.data.l[0] == DndFile
1441 || ev.xclient.data.l[0] == DndDir
1442 || ev.xclient.data.l[0] == DndLink))
1443 {
1444 /* Get Dnd data */
1445 Atom ActualType;
1446 int ActualFormat;
1447 unsigned char *data;
1448 unsigned long Size, RemainingBytes;
1449
1450 XGetWindowProperty (disp, display->root,
1451 xa[XA_DNDSELECTION],
1452 0L, 1000000L,
1453 False, AnyPropertyType,
1454 &ActualType, &ActualFormat,
1455 &Size, &RemainingBytes,
1456 &data);
1457 set_string_property (XA_CUT_BUFFER0, data);
1458 XFree (data);
1459 selection_paste (display->root, XA_CUT_BUFFER0, true);
1460 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1461 }
1462#endif /* OFFIX_DND */
1463 break;
1464
1465 case MappingNotify:
1466 XRefreshKeyboardMapping (&ev.xmapping);
1467 break; 1437 break;
1468 1438
1469 /* 1439 /*
1470 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1471 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1490 break; 1460 break;
1491 } 1461 }
1492 break; 1462 break;
1493 1463
1494 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1495 focus_in (); 1468 focus_in ();
1496 break; 1469 break;
1497 1470
1498 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1499 focus_out (); 1475 focus_out ();
1500 break; 1476 break;
1501 1477
1502 case ConfigureNotify: 1478 case ConfigureNotify:
1503 if (ev.xconfigure.window == parent[0]) 1479 if (ev.xconfigure.window == parent[0])
1504 { 1480 {
1505 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1506 ; 1482 ;
1507 1483
1508 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509 { 1485 {
1510 seen_resize = 1; 1486 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1488 }
1513 1489 else
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490 {
1491#ifdef ENABLE_TRANSPARENCY
1515 if (OPTION (Opt_transparent)) 1492 if (option (Opt_transparent))
1516 check_our_parents (); 1493 if (bgPixmap.render ())
1494 scr_touch (false);
1517#endif 1495#endif
1496 }
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 } 1498 }
1519 break; 1499 break;
1520 1500
1521 case PropertyNotify: 1501 case PropertyNotify:
1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1522 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1503 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1523 && ev.xproperty.state == PropertyNewValue) 1504 && ev.xproperty.state == PropertyNewValue)
1524 selection_property (ev.xproperty.window, ev.xproperty.atom); 1505 selection_property (ev.xproperty.window, ev.xproperty.atom);
1525 1506
1526 break; 1507 break;
1527 1508
1528 case SelectionClear: 1509 case SelectionClear:
1529 selection_clear (); 1510 selection_clear ();
… …
1552 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1553#endif 1534#endif
1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1555 break; 1536 break;
1556 1537
1557#ifdef TRANSPARENT 1538#ifdef ENABLE_TRANSPARENCY
1558 case ReparentNotify: 1539 case ReparentNotify:
1559 rootwin_cb (ev); 1540 rootwin_cb (ev);
1560 break; 1541 break;
1561#endif /* TRANSPARENT */ 1542#endif /* ENABLE_TRANSPARENCY */
1562 1543
1563 case GraphicsExpose: 1544 case GraphicsExpose:
1564 case Expose: 1545 case Expose:
1565 if (ev.xany.window == vt) 1546 if (ev.xany.window == vt)
1566 { 1547 {
1567 do 1548 do
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1549 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1550 ev.xexpose.width, ev.xexpose.height, False);
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1571 1552
1572 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573 1554
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1577 1558
1578 scr_refresh (refresh_type); 1559 want_refresh = 1;
1579 } 1560 }
1580 else 1561 else
1581 { 1562 {
1582 XEvent unused_event; 1563 XEvent unused_event;
1583 1564
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1585 ; 1566 ;
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1587 ; 1568 ;
1588 1569
1589 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1590 { 1571 {
1591 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1592 scrollbar_show (0); 1573 scrollbar_show (0);
1593 } 1574 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598
1599#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window);
1602#endif
1603 } 1575 }
1604 break; 1576 break;
1605 1577
1606 case MotionNotify: 1578 case MotionNotify:
1607#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1580 if (hidden_pointer)
1609 pointer_unblank (); 1581 pointer_unblank ();
1610#endif 1582#endif
1611#if MENUBAR
1612 if (isMenuBarWindow (ev.xany.window))
1613 {
1614 menubar_control (ev.xbutton);
1615 break;
1616 }
1617#endif
1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1584 break;
1620 1585
1621 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1622 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1590 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1592 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1628 ; 1594 ;
1629 1595
1630 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1631 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1600 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1699#endif 1665#endif
1700 } 1666 }
1701 } 1667 }
1702 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1703 { 1669 {
1704 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1705 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1706 ; 1672 ;
1707 1673
1708 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1709 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1710 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1678 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1680 scrollbar_size ());
1715 scr_refresh (refresh_type);
1716 refresh_limit = 0; 1681 want_refresh = 1;
1717 scrollbar_show (1); 1682 scrollbar_show (1);
1718 } 1683 }
1719 break; 1684 break;
1720 } 1685 }
1721 1686
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1726 { 1689 {
1727 if (hidden_cursor) 1690 if (hidden_cursor)
1728 { 1691 {
1729 hidden_cursor = 0; 1692 hidden_cursor = 0;
1730 want_refresh = 1; 1693 want_refresh = 1;
1731 } 1694 }
1732 1695
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734 } 1697 }
1735#endif 1698#endif
1736 1699
1737#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 { 1702 {
1740 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1743 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1755 if (!focus) 1718 if (!focus)
1756 { 1719 {
1757 focus = 1; 1720 focus = 1;
1758 want_refresh = 1; 1721 want_refresh = 1;
1759 1722
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1761 1724
1762#if USE_XIM 1725#if USE_XIM
1763 if (Input_Context != NULL) 1726 if (Input_Context != NULL)
1764 { 1727 {
1765 IMSetStatusPosition (); 1728 IMSetPosition ();
1766 XSetICFocus (Input_Context); 1729 XSetICFocus (Input_Context);
1767 } 1730 }
1768#endif 1731#endif
1769#if CURSOR_BLINK 1732#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1733 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772#endif 1735#endif
1773#if OFF_FOCUS_FADING 1736#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1737 if (rs[Rs_fade])
1775 { 1738 {
1776 pix_colors = pix_colors_focused; 1739 pix_colors = pix_colors_focused;
1777 scr_recolour (); 1740 scr_recolour ();
1778 } 1741 }
1779#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
1780 } 1756 }
1781} 1757}
1782 1758
1783void 1759void
1784rxvt_term::focus_out () 1760rxvt_term::focus_out ()
… …
1792 1768
1793#if ENABLE_FRILLS || ISO_14755 1769#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf) 1770 if (iso14755buf)
1795 { 1771 {
1796 iso14755buf = 0; 1772 iso14755buf = 0;
1797# if ENABLE_OVERLAY 1773# if ISO_14755
1798 scr_overlay_off (); 1774 scr_overlay_off ();
1799# endif 1775# endif
1800 } 1776 }
1801#endif 1777#endif
1802#if USE_XIM 1778#if USE_XIM
1803 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1804 XUnsetICFocus (Input_Context); 1780 XUnsetICFocus (Input_Context);
1805#endif 1781#endif
1806#if CURSOR_BLINK 1782#if CURSOR_BLINK
1807 if (OPTION (Opt_cursorBlink)) 1783 if (option (Opt_cursorBlink))
1808 cursor_blink_ev.stop (); 1784 cursor_blink_ev.stop ();
1809 hidden_cursor = 0; 1785 hidden_cursor = 0;
1810#endif 1786#endif
1811#if OFF_FOCUS_FADING 1787#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1788 if (rs[Rs_fade])
… …
1816 } 1792 }
1817#endif 1793#endif
1818 } 1794 }
1819} 1795}
1820 1796
1821#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
1822void 1811void
1823rxvt_term::rootwin_cb (XEvent &ev) 1812rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1813{
1825 SET_R (this); 1814 make_current ();
1826 SET_LOCALE (locale);
1827 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
1828 switch (ev.type) 1821 switch (ev.type)
1829 { 1822 {
1830 case PropertyNotify: 1823 case PropertyNotify:
1831 /* 1824 /*
1832 * 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,
1833 * 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.
1834 */ 1827 */
1835 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 return; 1830 {
1838 1831 bgPixmap.set_root_pixmap ();
1839 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1840 case ReparentNotify: 1833 }
1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1842 want_refresh = want_full_refresh = 1;
1843 break; 1834 break;
1844 } 1835 }
1836# endif
1845} 1837}
1846#endif 1838#endif
1847 1839
1848void 1840void
1849rxvt_term::button_press (XButtonEvent &ev) 1841rxvt_term::button_press (XButtonEvent &ev)
… …
1858 /* 1850 /*
1859 * VT window processing of button press 1851 * VT window processing of button press
1860 */ 1852 */
1861 if (ev.window == vt) 1853 if (ev.window == vt)
1862 { 1854 {
1855 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1856 return;
1857
1863#if ISO_14755 1858#if ISO_14755
1864 // 5.4 1859 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 { 1861 {
1867 iso14755_54 (ev.x, ev.y); 1862 iso14755_54 (ev.x, ev.y);
… …
1909 else 1904 else
1910 { 1905 {
1911 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1912 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1913 1908
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915 switch (ev.button) 1909 switch (ev.button)
1916 { 1910 {
1917 case Button1: 1911 case Button1:
1918 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1920#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1922#else 1916#else
1923 selection.rect = false; 1917 selection.rect = false;
1924#endif 1918#endif
1925 1919
1926 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1922 {
1929 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1931 else 1925 else
1932 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1933 } 1927 }
1934 else 1928 else
1935 { 1929 {
1936 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1937 MEvent.clicks++; 1931 MEvent.clicks++;
1938 else 1932 else
1939 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1940 1934
1941 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1942 } 1936 }
1943 1937
1944 MEvent.button = Button1; 1938 MEvent.button = Button1;
1945 break; 1939 break;
1946 1940
1947 case Button3: 1941 case Button3:
1948 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1949 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1950 else 1944 else
1951 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1952 1946
1953 MEvent.button = Button3; 1947 MEvent.button = Button3;
1954 break; 1948 break;
1955 } 1949 }
1956 } 1950 }
1957 1951
1958 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1959 return; 1953 return;
1960 } 1954 }
1961 1955
… …
2100 } 2094 }
2101 } 2095 }
2102 2096
2103 return; 2097 return;
2104 } 2098 }
2105
2106#if MENUBAR
2107 /*
2108 * Menubar window processing of button press
2109 */
2110 if (isMenuBarWindow (ev.window))
2111 menubar_control (ev);
2112#endif
2113} 2099}
2114 2100
2115void 2101void
2116rxvt_term::button_release (XButtonEvent &ev) 2102rxvt_term::button_release (XButtonEvent &ev)
2117{ 2103{
… …
2123 2109
2124 if (scrollbar_isUpDn ()) 2110 if (scrollbar_isUpDn ())
2125 { 2111 {
2126 scrollBar.setIdle (); 2112 scrollBar.setIdle ();
2127 scrollbar_show (0); 2113 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2114 }
2132 2115
2133#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2136#endif 2119#endif
2137 2120
2138 if (ev.window == vt) 2121 if (ev.window == vt)
2139 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2140#if ISO_14755 2126#if ISO_14755
2141 // 5.4 2127 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return; 2129 return;
2144#endif 2130#endif
2131
2145 if (reportmode) 2132 if (reportmode)
2146 { 2133 {
2147 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2148 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2149 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2173 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2174 && bypass_keystate 2161 && bypass_keystate
2175 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2176 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2177 2164
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2181 switch (ev.button) 2165 switch (ev.button)
2182 { 2166 {
2183 case Button1: 2167 case Button1:
2184 case Button3: 2168 case Button3:
2185 selection_make (ev.time); 2169 selection_make (ev.time);
2186 break; 2170 break;
2171
2187 case Button2: 2172 case Button2:
2188 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);
2189 break; 2175 break;
2176
2190#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2191 case Button4: 2178 case Button4:
2192 case Button5: 2179 case Button5:
2193 { 2180 {
2194 int i; 2181 int i;
… …
2196 2183
2197 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2198 2185
2199 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2200 i = 1; 2187 i = 1;
2201 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2189 i = nrow - 1;
2203 else 2190 else
2204 i = 5; 2191 i = 5;
2205 2192
2206# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2216 slip_wheel_ev.start (); 2203 slip_wheel_ev.start ();
2217 } 2204 }
2218 else 2205 else
2219 { 2206 {
2220# endif 2207# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2208 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2209 scrollbar_show (1);
2225# else
2226 while (i--)
2227 {
2228 scr_page (v, 1);
2229 scr_refresh (SMOOTH_REFRESH);
2230 scrollbar_show (1);
2231 }
2232# endif
2233# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2234 } 2211 }
2235#endif 2212# endif
2236 } 2213 }
2237 break; 2214 break;
2238#endif 2215#endif
2239 } 2216 }
2240 } 2217 }
2241#ifdef MENUBAR
2242 else if (isMenuBarWindow (ev.window))
2243 menubar_control (ev);
2244#endif
2245} 2218}
2246
2247#ifdef TRANSPARENT
2248#if TINTING
2249/* taken from aterm-0.4.2 */
2250
2251typedef uint32_t RUINT32T;
2252
2253void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2254{
2255 int sh_r, sh_g, sh_b;
2256 RUINT32T mask_r, mask_g, mask_b;
2257 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2258 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2259 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2260 int i;
2261
2262 Visual *visual = display->visual;
2263
2264 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2265
2266 /* for convenience */
2267 mask_r = visual->red_mask;
2268 mask_g = visual->green_mask;
2269 mask_b = visual->blue_mask;
2270
2271 /* boring lookup table pre-initialization */
2272 switch (srcImage->bits_per_pixel) {
2273 case 15:
2274 if ((mask_r != 0x7c00) ||
2275 (mask_g != 0x03e0) ||
2276 (mask_b != 0x001f))
2277 return;
2278 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2279 lookup_r = lookup;
2280 lookup_g = lookup+32;
2281 lookup_b = lookup+32+32;
2282 sh_r = 10;
2283 sh_g = 5;
2284 sh_b = 0;
2285 break;
2286 case 16:
2287 if ((mask_r != 0xf800) ||
2288 (mask_g != 0x07e0) ||
2289 (mask_b != 0x001f))
2290 return;
2291 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2292 lookup_r = lookup;
2293 lookup_g = lookup+32;
2294 lookup_b = lookup+32+64;
2295 sh_r = 11;
2296 sh_g = 5;
2297 sh_b = 0;
2298 break;
2299 case 24:
2300 if ((mask_r != 0xff0000) ||
2301 (mask_g != 0x00ff00) ||
2302 (mask_b != 0x0000ff))
2303 return;
2304 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2305 lookup_r = lookup;
2306 lookup_g = lookup+256;
2307 lookup_b = lookup+256+256;
2308 sh_r = 16;
2309 sh_g = 8;
2310 sh_b = 0;
2311 break;
2312 case 32:
2313 if ((mask_r != 0xff0000) ||
2314 (mask_g != 0x00ff00) ||
2315 (mask_b != 0x0000ff))
2316 return;
2317 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2318 lookup_r = lookup;
2319 lookup_g = lookup+256;
2320 lookup_b = lookup+256+256;
2321 sh_r = 16;
2322 sh_g = 8;
2323 sh_b = 0;
2324 break;
2325 default:
2326 return; /* we do not support this color depth */
2327 }
2328
2329 /* prepare limits for color transformation (each channel is handled separately) */
2330 if (shade < 0) {
2331 shade = -shade;
2332 if (shade < 0) shade = 0;
2333 if (shade > 100) shade = 100;
2334
2335 lower_lim_r = 65535-rm;
2336 lower_lim_g = 65535-gm;
2337 lower_lim_b = 65535-bm;
2338
2339 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2340 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2341 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2342
2343 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2344 } else {
2345 if (shade < 0) shade = 0;
2346 if (shade > 100) shade = 100;
2347
2348 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2349
2350 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2351 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2352 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2353 }
2354
2355 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2356 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2357 {
2358 unsigned int tmp;
2359
2360 tmp = lower_lim_r;
2361 lower_lim_r = lower_lim_b;
2362 lower_lim_b = tmp;
2363
2364 tmp = upper_lim_r;
2365 upper_lim_r = upper_lim_b;
2366 upper_lim_b = tmp;
2367 }
2368
2369 /* fill our lookup tables */
2370 for (i = 0; i <= mask_r>>sh_r; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2374 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2375 lookup_r[i] = (tmp/65535)<<sh_r;
2376 }
2377 for (i = 0; i <= mask_g>>sh_g; i++)
2378 {
2379 RUINT32T tmp;
2380 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2381 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2382 lookup_g[i] = (tmp/65535)<<sh_g;
2383 }
2384 for (i = 0; i <= mask_b>>sh_b; i++)
2385 {
2386 RUINT32T tmp;
2387 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2388 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2389 lookup_b[i] = (tmp/65535)<<sh_b;
2390 }
2391
2392 /* apply table to input image (replacing colors by newly calculated ones) */
2393 switch (srcImage->bits_per_pixel)
2394 {
2395 case 15:
2396 {
2397 unsigned short *p1, *pf, *p, *pl;
2398 p1 = (unsigned short *) srcImage->data;
2399 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0x7c00)>>10] |
2407 lookup_g[(*p & 0x03e0)>> 5] |
2408 lookup_b[(*p & 0x001f)];
2409 }
2410 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 16:
2415 {
2416 unsigned short *p1, *pf, *p, *pl;
2417 p1 = (unsigned short *) srcImage->data;
2418 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419 while (p1 < pf)
2420 {
2421 p = p1;
2422 pl = p1 + srcImage->width;
2423 for (; p < pl; p++)
2424 {
2425 *p = lookup_r[(*p & 0xf800)>>11] |
2426 lookup_g[(*p & 0x07e0)>> 5] |
2427 lookup_b[(*p & 0x001f)];
2428 }
2429 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 case 24:
2434 {
2435 unsigned char *p1, *pf, *p, *pl;
2436 p1 = (unsigned char *) srcImage->data;
2437 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2438 while (p1 < pf)
2439 {
2440 p = p1;
2441 pl = p1 + srcImage->width * 3;
2442 for (; p < pl; p += 3)
2443 {
2444 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2445 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2446 p[2] = lookup_r[(p[2] & 0x0000ff)];
2447 }
2448 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2449 }
2450 break;
2451 }
2452 case 32:
2453 {
2454 RUINT32T *p1, *pf, *p, *pl;
2455 p1 = (RUINT32T *) srcImage->data;
2456 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2457
2458 while (p1 < pf)
2459 {
2460 p = p1;
2461 pl = p1 + srcImage->width;
2462 for (; p < pl; p++)
2463 {
2464 *p = lookup_r[(*p & 0xff0000)>>16] |
2465 lookup_g[(*p & 0x00ff00)>> 8] |
2466 lookup_b[(*p & 0x0000ff)] |
2467 (*p & ~0xffffff);
2468 }
2469 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2470 }
2471 break;
2472 }
2473 }
2474
2475 free (lookup);
2476}
2477#endif
2478
2479/*
2480 * Check our parents are still who we think they are.
2481 * Do transparency updates if required
2482 */
2483int
2484rxvt_term::check_our_parents ()
2485{
2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2487 unsigned long nitems, bytes_after;
2488 Atom atype;
2489 unsigned char *prop = NULL;
2490 Window root, oldp, *list;
2491 Pixmap rootpixmap = None;
2492 XWindowAttributes wattr, wrootattr;
2493 dDisp;
2494
2495 pchanged = 0;
2496
2497 if (!OPTION (Opt_transparent))
2498 return pchanged; /* Don't try any more */
2499
2500 XGetWindowAttributes (disp, display->root, &wrootattr);
2501 rootdepth = wrootattr.depth;
2502
2503 XGetWindowAttributes (disp, parent[0], &wattr);
2504
2505 if (rootdepth != wattr.depth)
2506 {
2507 if (am_transparent)
2508 {
2509 pchanged = 1;
2510 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = am_pixmap_trans = 0;
2512 }
2513
2514 return pchanged; /* Don't try any more */
2515 }
2516
2517 /* Get all X ops out of the queue so that our information is up-to-date. */
2518 XSync (disp, False);
2519
2520 /*
2521 * Make the frame window set by the window manager have
2522 * the root background. Some window managers put multiple nested frame
2523 * windows for each client, so we have to take care about that.
2524 */
2525 i = (xa[XA_XROOTPMAP_ID]
2526 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2527 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528 &nitems, &bytes_after, &prop) == Success);
2529
2530 if (!i || prop == NULL)
2531 i = (xa[XA_ESETROOT_PMAP_ID]
2532 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2533 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2534 &nitems, &bytes_after, &prop) == Success);
2535
2536 if (!i || prop == NULL
2537#if TINTING
2538 || !rs[Rs_color + Color_tint]
2539#endif
2540 )
2541 have_pixmap = 0;
2542 else
2543 {
2544 have_pixmap = 1;
2545 rootpixmap = *(Pixmap *)prop;
2546 XFree (prop);
2547 }
2548
2549 if (have_pixmap)
2550 {
2551 /*
2552 * Copy display->root pixmap transparency
2553 */
2554 int sx, sy, nx, ny;
2555 unsigned int nw, nh;
2556 Window cr;
2557 XImage *image;
2558 GC gc;
2559 XGCValues gcvalue;
2560
2561 XTranslateCoordinates (disp, parent[0], display->root,
2562 0, 0, &sx, &sy, &cr);
2563 nw = (unsigned int)szHint.width;
2564 nh = (unsigned int)szHint.height;
2565 nx = ny = 0;
2566
2567 if (sx < 0)
2568 {
2569 nw += sx;
2570 nx = -sx;
2571 sx = 0;
2572 }
2573
2574 if (sy < 0)
2575 {
2576 nh += sy;
2577 ny = -sy;
2578 sy = 0;
2579 }
2580
2581 min_it (nw, (unsigned int) (wrootattr.width - sx));
2582 min_it (nh, (unsigned int) (wrootattr.height - sy));
2583
2584 XSync (disp, False);
2585 allowedxerror = -1;
2586 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2587
2588 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2589 /* XXX: may need a delay here? */
2590 allowedxerror = 0;
2591
2592 if (image == NULL)
2593 {
2594 if (am_transparent && am_pixmap_trans)
2595 {
2596 pchanged = 1;
2597 if (pixmap != None)
2598 {
2599 XFreePixmap (disp, pixmap);
2600 pixmap = None;
2601 }
2602 }
2603
2604 am_pixmap_trans = 0;
2605 }
2606 else
2607 {
2608 if (pixmap != None)
2609 XFreePixmap (disp, pixmap);
2610
2611#if TINTING
2612 if (ISSET_PIXCOLOR (Color_tint))
2613 {
2614 unsigned short rm, gm, bm;
2615 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2616
2617 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2618
2619 ShadeXImage (display, image, shade, rm, gm, bm);
2620 }
2621#endif
2622
2623 pixmap = XCreatePixmap (disp, vt,
2624 szHint.width, szHint.height, image->depth);
2625 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2626 XPutImage (disp, pixmap, gc, image, 0, 0,
2627 nx, ny, image->width, image->height);
2628 XFreeGC (disp, gc);
2629 XDestroyImage (image);
2630 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2631 XClearWindow (disp, parent[0]);
2632
2633 if (!am_transparent || !am_pixmap_trans)
2634 pchanged = 1;
2635
2636 am_transparent = am_pixmap_trans = 1;
2637 }
2638 }
2639
2640 if (am_pixmap_trans)
2641 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2642 else
2643 {
2644 unsigned int n;
2645 /*
2646 * InheritPixmap transparency
2647 */
2648 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649 {
2650 oldp = parent[i];
2651 XQueryTree (disp, parent[i - 1], &root,
2652 &parent[i], &list, &n);
2653 XFree (list);
2654
2655 if (parent[i] == display->root)
2656 {
2657 if (oldp != None)
2658 pchanged = 1;
2659
2660 break;
2661 }
2662
2663 if (oldp != parent[i])
2664 pchanged = 1;
2665 }
2666
2667 n = 0;
2668
2669 if (pchanged)
2670 {
2671 for (; n < (unsigned int)i; n++)
2672 {
2673 XGetWindowAttributes (disp, parent[n], &wattr);
2674 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2675 {
2676 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2677 break;
2678 }
2679 }
2680 }
2681
2682 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2683 {
2684 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2685 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2686 am_transparent = 0;
2687 /* XXX: also turn off Opt_transparent? */
2688 }
2689 else
2690 {
2691#if WAIT_FOR_WM
2692 /* wait (an arbitrary period) for the WM to do its thing
2693 * needed for fvwm2.2.2 (and before?) */
2694 sleep (1);
2695#endif
2696 for (n = 0; n < (unsigned int)i; n++)
2697 {
2698 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2699 XClearWindow (disp, parent[n]);
2700 }
2701
2702 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2703 am_transparent = 1;
2704 }
2705
2706 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2707 parent[i] = None;
2708 }
2709
2710 if (scrollBar.win)
2711 {
2712 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2713 scrollBar.setIdle ();
2714 scrollbar_show (0);
2715 }
2716
2717 if (am_transparent)
2718 {
2719 want_refresh = want_full_refresh = 1;
2720 if (am_pixmap_trans)
2721 flush ();
2722 }
2723
2724 return pchanged;
2725}
2726#endif
2727 2219
2728/*}}} */ 2220/*}}} */
2729 2221
2730bool 2222bool
2731rxvt_term::cmd_parse () 2223rxvt_term::cmd_parse ()
… …
2780 if (ch == C0_LF) 2272 if (ch == C0_LF)
2781 nlines++; 2273 nlines++;
2782 2274
2783 refresh_count++; 2275 refresh_count++;
2784 2276
2785 if (!OPTION (Opt_jumpScroll) 2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2786 || (refresh_count >= refresh_limit * (nrow - 1)))
2787 { 2278 {
2788 refreshnow = true;
2789 refresh_count = 0; 2279 refresh_count = 0;
2280
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2282 {
2283 refreshnow = true;
2790 ch = NOCHAR; 2284 ch = NOCHAR;
2791 break; 2285 break;
2286 }
2792 } 2287 }
2793 2288
2794 // scr_add_lines only works for nlines <= nrow - 1. 2289 // scr_add_lines only works for nlines <= nrow - 1.
2795 if (nlines >= nrow - 1) 2290 if (nlines >= nrow - 1)
2796 { 2291 {
2292 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797 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))))
2798 scr_add_lines (buf, str - buf, nlines); 2294 scr_add_lines (buf, str - buf, nlines);
2799 2295
2800 nlines = 0; 2296 nlines = 0;
2801 str = buf; 2297 str = buf;
2802 eol = str + min (ncol, UBUFSIZ); 2298 eol = str + min (ncol, UBUFSIZ);
… …
2817 2313
2818 seq_begin = cmdbuf_ptr; 2314 seq_begin = cmdbuf_ptr;
2819 ch = next_char (); 2315 ch = next_char ();
2820 } 2316 }
2821 2317
2318 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822 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))))
2823 scr_add_lines (buf, str - buf, nlines); 2320 scr_add_lines (buf, str - buf, nlines);
2824 2321
2825 /* 2322 /*
2826 * 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
2827 * 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.
2828 * the number of pages between refreshes is refresh_limit, which 2325 * if skipScroll is enabled.
2829 * is incremented here because we must be doing flat-out scrolling.
2830 */ 2326 */
2831 if (refreshnow) 2327 if (refreshnow)
2832 { 2328 {
2833 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834 refresh_limit++;
2835 else
2836 {
2837 flag = true; 2329 flag = true;
2838 scr_refresh (refresh_type); 2330 scr_refresh ();
2839 flush_ev.stop (); 2331 want_refresh = 1;
2840 }
2841 } 2332 }
2842 2333
2843 } 2334 }
2844 else 2335 else
2845 { 2336 {
… …
2861 return flag; 2352 return flag;
2862} 2353}
2863 2354
2864// read the next character 2355// read the next character
2865wchar_t 2356wchar_t
2866rxvt_term::next_char () 2357rxvt_term::next_char () NOTHROW
2867{ 2358{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2360 {
2870 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2892 return NOCHAR; 2383 return NOCHAR;
2893} 2384}
2894 2385
2895// read the next octet 2386// read the next octet
2896uint32_t 2387uint32_t
2897rxvt_term::next_octet () 2388rxvt_term::next_octet () NOTHROW
2898{ 2389{
2899 return cmdbuf_ptr < cmdbuf_endp 2390 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++ 2391 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR; 2392 : NOCHAR;
2902} 2393}
2394
2395static class out_of_input out_of_input;
2903 2396
2904/* rxvt_cmd_getc () - Return next input character */ 2397/* rxvt_cmd_getc () - Return next input character */
2905/* 2398/*
2906 * Return the next input character after first passing any keyboard input 2399 * Return the next input character after first passing any keyboard input
2907 * to the command. 2400 * to the command.
2908 */ 2401 */
2909wchar_t 2402wchar_t
2910rxvt_term::cmd_getc () 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2911{ 2404{
2912 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2913 2406
2914 if (c == NOCHAR) 2407 if (c == NOCHAR)
2915 throw out_of_input; 2408 throw out_of_input;
2916 2409
2917 return c; 2410 return c;
2918} 2411}
2919 2412
2920uint32_t 2413uint32_t
2921rxvt_term::cmd_get8 () 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922{ 2415{
2923 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2924 2417
2925 if (c == NOCHAR) 2418 if (c == NOCHAR)
2926 throw out_of_input; 2419 throw out_of_input;
… …
2992 { 2485 {
2993 if ((buf[len++] = cmd_getc ()) == 'i') 2486 if ((buf[len++] = cmd_getc ()) == 'i')
2994 break; /* done = 1 */ 2487 break; /* done = 1 */
2995 } 2488 }
2996 } 2489 }
2997 2490
2998 for (i = 0; i < len; i++) 2491 for (i = 0; i < len; i++)
2999 if (putc (buf[i], fd) == EOF) 2492 if (putc (buf[i], fd) == EOF)
3000 { 2493 {
3001 done = 1; 2494 done = 1;
3002 break; 2495 break;
… …
3064 process_dcs_seq (); 2557 process_dcs_seq ();
3065 break; 2558 break;
3066 case 0x9b: /* CSI */ 2559 case 0x9b: /* CSI */
3067 process_csi_seq (); 2560 process_csi_seq ();
3068 break; 2561 break;
3069 case 0x9d: /* CSI */ 2562 case 0x9d: /* OSC */
3070 process_osc_seq (); 2563 process_osc_seq ();
3071 break; 2564 break;
3072#endif 2565#endif
3073 } 2566 }
3074} 2567}
… …
3164 scr_charset_set (2, (unsigned int)cmd_getc ()); 2657 scr_charset_set (2, (unsigned int)cmd_getc ());
3165 break; 2658 break;
3166 case '+': 2659 case '+':
3167 scr_charset_set (3, (unsigned int)cmd_getc ()); 2660 scr_charset_set (3, (unsigned int)cmd_getc ());
3168 break; 2661 break;
3169#if ENABLE_FRILLS 2662#if !ENABLE_MINIMAL
3170 case '6': 2663 case '6':
3171 scr_backindex (); 2664 scr_backindex ();
3172 break; 2665 break;
3173#endif 2666#endif
3174 case '7': 2667 case '7':
3175 scr_cursor (SAVE); 2668 scr_cursor (SAVE);
3176 break; 2669 break;
3177 case '8': 2670 case '8':
3178 scr_cursor (RESTORE); 2671 scr_cursor (RESTORE);
3179 break; 2672 break;
3180#if ENABLE_FRILLS 2673#if !ENABLE_MINIMAL
3181 case '9': 2674 case '9':
3182 scr_forwardindex (); 2675 scr_forwardindex ();
3183 break; 2676 break;
3184#endif 2677#endif
3185 case '=': 2678 case '=':
… …
3302 unicode_t ch, priv, i; 2795 unicode_t ch, priv, i;
3303 unsigned int nargs, p; 2796 unsigned int nargs, p;
3304 int n, ndef; 2797 int n, ndef;
3305 int arg[ESC_ARGS]; 2798 int arg[ESC_ARGS];
3306 2799
3307 for (nargs = ESC_ARGS; nargs > 0;) 2800 memset (arg, 0, sizeof (arg));
3308 arg[--nargs] = 0; 2801 nargs = 0;
3309 2802
3310 priv = 0; 2803 priv = 0;
3311 ch = cmd_getc (); 2804 ch = cmd_getc ();
3312 if (ch >= '<' && ch <= '?') 2805 if (ch >= '<' && ch <= '?')
3313 { /* '<' '=' '>' '?' */ 2806 { /* '<' '=' '>' '?' */
… …
3347 ndef = get_byte_array_bit (csi_defaults, i); 2840 ndef = get_byte_array_bit (csi_defaults, i);
3348 for (p = 0; p < nargs; p++) 2841 for (p = 0; p < nargs; p++)
3349 if (arg[p] == -1) 2842 if (arg[p] == -1)
3350 arg[p] = ndef; 2843 arg[p] = ndef;
3351 2844
3352#ifdef DEBUG_CMD
3353 fprintf (stderr, "CSI ");
3354 for (p = 0; p < nargs; p++)
3355 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3356 fprintf (stderr, "%c\n", ch);
3357#endif
3358
3359 /* 2845 /*
3360 * private mode handling 2846 * private mode handling
3361 */ 2847 */
3362 if (priv) 2848 if (priv)
3363 { 2849 {
3364 switch (priv) 2850 switch (priv)
3365 { 2851 {
3366 case '>': 2852 case '>':
3367 if (ch == CSI_DA) /* secondary device attributes */ 2853 if (ch == CSI_DA) /* secondary device attributes */
3368 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 }
3369 break; 2864 break;
3370 case '?': 2865 case '?':
3371 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3372 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
3373 break; 2868 break;
… …
3499 break; 2994 break;
3500 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
3501 scr_report_position (); 2996 scr_report_position ();
3502 break; 2997 break;
3503 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
3504 if (OPTION (Opt_insecure)) 2999 if (option (Opt_insecure))
3505 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3506 break; 3001 break;
3507 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
3508 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3509 break; 3004 break;
… …
3576 break; 3071 break;
3577 case CSI_75: 3072 case CSI_75:
3578 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
3579 break; 3074 break;
3580 3075
3581#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3582 case CSI_74: 3077 case CSI_74:
3583 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
3584 break; 3079 break;
3585#endif 3080#endif
3586 3081
… …
3593 break; 3088 break;
3594 } 3089 }
3595} 3090}
3596/*}}} */ 3091/*}}} */
3597 3092
3598#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3599/* ARGSUSED */ 3094/* ARGSUSED */
3600void 3095void
3601rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3096rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3602{ 3097{
3603 int x, y; 3098 int x, y;
3604 XWindowAttributes wattr; 3099 XWindowAttributes wattr;
3605 Window wdummy; 3100 Window wdummy;
3606 dDisp; 3101
3102 dLocal (Display *, dpy);
3607 3103
3608 if (nargs == 0) 3104 if (nargs == 0)
3609 return; 3105 return;
3610 3106
3611 switch (args[0]) 3107 switch (args[0])
3612 { 3108 {
3613 /* 3109 /*
3614 * commands 3110 * commands
3615 */ 3111 */
3616 case 1: /* deiconify window */ 3112 case 1: /* deiconify window */
3617 XMapWindow (disp, parent[0]); 3113 XMapWindow (dpy, parent[0]);
3618 break; 3114 break;
3619 case 2: /* iconify window */ 3115 case 2: /* iconify window */
3620 XIconifyWindow (disp, parent[0], display->screen); 3116 XIconifyWindow (dpy, parent[0], display->screen);
3621 break; 3117 break;
3622 case 3: /* set position (pixels) */ 3118 case 3: /* set position (pixels) */
3623 XMoveWindow (disp, parent[0], args[1], args[2]); 3119 XMoveWindow (dpy, parent[0], args[1], args[2]);
3624 break; 3120 break;
3625 case 4: /* set size (pixels) */ 3121 case 4: /* set size (pixels) */
3626 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3122 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3627 break; 3123 break;
3628 case 5: /* raise window */ 3124 case 5: /* raise window */
3629 XRaiseWindow (disp, parent[0]); 3125 XRaiseWindow (dpy, parent[0]);
3630 break; 3126 break;
3631 case 6: /* lower window */ 3127 case 6: /* lower window */
3632 XLowerWindow (disp, parent[0]); 3128 XLowerWindow (dpy, parent[0]);
3633 break; 3129 break;
3634 case 7: /* refresh window */ 3130 case 7: /* refresh window */
3635 scr_touch (true); 3131 scr_touch (true);
3636 break; 3132 break;
3637 case 8: /* set size (chars) */ 3133 case 8: /* set size (chars) */
… …
3644 if (args[0] >= 24) /* set height (chars) */ 3140 if (args[0] >= 24) /* set height (chars) */
3645 set_widthheight ((unsigned int)width, 3141 set_widthheight ((unsigned int)width,
3646 (unsigned int) (args[1] * fheight)); 3142 (unsigned int) (args[1] * fheight));
3647 break; 3143 break;
3648 3144
3649
3650 /* 3145 /*
3651 * reports - some output format copied from XTerm 3146 * reports - some output format copied from XTerm
3652 */ 3147 */
3653 case 11: /* report window state */ 3148 case 11: /* report window state */
3654 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3655 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3150 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3656 break; 3151 break;
3657 case 13: /* report window position */ 3152 case 13: /* report window position */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3153 XGetWindowAttributes (dpy, parent[0], &wattr);
3659 XTranslateCoordinates (disp, parent[0], wattr.root, 3154 XTranslateCoordinates (dpy, parent[0], wattr.root,
3660 -wattr.border_width, -wattr.border_width, 3155 -wattr.border_width, -wattr.border_width,
3661 &x, &y, &wdummy); 3156 &x, &y, &wdummy);
3662 tt_printf ("\033[3;%d;%dt", x, y); 3157 tt_printf ("\033[3;%d;%dt", x, y);
3663 break; 3158 break;
3664 case 14: /* report window size (pixels) */ 3159 case 14: /* report window size (pixels) */
3665 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3666 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3161 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3667 break; 3162 break;
3668 case 18: /* report text area size (chars) */ 3163 case 18: /* report text area size (chars) */
3669 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3670 break; 3165 break;
… …
3672 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3167 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3673 break; 3168 break;
3674 case 20: /* report icon label */ 3169 case 20: /* report icon label */
3675 { 3170 {
3676 char *s; 3171 char *s;
3677 XGetIconName (disp, parent[0], &s); 3172 XGetIconName (dpy, parent[0], &s);
3678 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 */
3679 XFree (s); 3174 XFree (s);
3680 } 3175 }
3681 break; 3176 break;
3682 case 21: /* report window title */ 3177 case 21: /* report window title */
3683 { 3178 {
3684 char *s; 3179 char *s;
3685 XFetchName (disp, parent[0], &s); 3180 XFetchName (dpy, parent[0], &s);
3686 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 */
3687 XFree (s); 3182 XFree (s);
3688 } 3183 }
3689 break; 3184 break;
3690 } 3185 }
3691} 3186}
… …
3718 seen_esc = true; 3213 seen_esc = true;
3719 continue; 3214 continue;
3720 } 3215 }
3721 else if (ch == C0_BEL || ch == CHAR_ST) 3216 else if (ch == C0_BEL || ch == CHAR_ST)
3722 break; 3217 break;
3218 else if (ch == C0_SYN)
3219 ch = cmd_get8 ();
3723 else if (ch < 0x20) 3220 else if (ch < 0x20)
3724 return NULL; /* other control character - exit */ 3221 return NULL; /* other control character - exit */
3725 3222
3726 seen_esc = false; 3223 seen_esc = false;
3727 3224
3728 if (n >= STRING_MAX - 1) 3225 if (n >= STRING_MAX - 1)
3729 // stop at some sane length 3226 // stop at some sane length
3730 return NULL; 3227 return NULL;
3731 3228
3732 if (ch == C0_SYN)
3733 string[n++] = cmd_get8 ();
3734 else
3735 string[n++] = ch; 3229 string[n++] = ch;
3736 } 3230 }
3737 3231
3738 string[n++] = '\0'; 3232 string[n++] = '\0';
3739 3233
3740 ends_how = (ch == 0x5c ? C0_ESC : ch); 3234 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3791void 3285void
3792rxvt_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)
3793{ 3287{
3794 if (str[0] == '?' && !str[1]) 3288 if (str[0] == '?' && !str[1])
3795 { 3289 {
3796 unsigned short r, g, b; 3290 rgba c;
3797 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
3798 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);
3799 } 3299 }
3800 else 3300 else
3801 set_window_color (color, str); 3301 set_window_color (color, str);
3802} 3302}
3803 3303
… …
3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806 */ 3306 */
3807void 3307void
3808rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3308rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3809{ 3309{
3810 int changed = 0;
3811 int color; 3310 int color;
3812 char *buf, *name; 3311 char *buf, *name;
3813 bool query = str[0] == '?' && !str[1]; 3312 bool query = str[0] == '?' && !str[1];
3814 int saveop = op; 3313 int saveop = op;
3815 dDisp; 3314
3315 dLocal (Display *, dpy);
3816 3316
3817 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
3818 switch (op) 3322 switch (op)
3819 { 3323 {
3820 case XTerm_name: 3324 case XTerm_name:
3821 set_title (str); 3325 set_title (str);
3822 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
… …
3836 unsigned long bytes_after; 3340 unsigned long bytes_after;
3837 unsigned char *value = 0; 3341 unsigned char *value = 0;
3838 const char *str = ""; 3342 const char *str = "";
3839 3343
3840 if (prop 3344 if (prop
3841 && XGetWindowProperty (disp, parent[0], 3345 && XGetWindowProperty (dpy, parent[0],
3842 prop, 0, 1<<16, 0, AnyPropertyType, 3346 prop, 0, 1<<16, 0, AnyPropertyType,
3843 &actual_type, &actual_format, 3347 &actual_type, &actual_format,
3844 &nitems, &bytes_after, &value) == Success 3348 &nitems, &bytes_after, &value) == Success
3845 && actual_type != None 3349 && actual_type != None
3846 && actual_format == 8) 3350 && actual_format == 8)
3847 str = (const char *)(value); 3351 str = (const char *)(value);
3848 3352
3849 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3353 tt_printf ("\033]%d;%s%c", op, str, resp);
3850 3354
3851 XFree (value); 3355 XFree (value);
3852 } 3356 }
3853 else 3357 else
3854 { 3358 {
… …
3858 { 3362 {
3859 *eq = 0; 3363 *eq = 0;
3860 set_utf8_property (display->atom (str), eq + 1); 3364 set_utf8_property (display->atom (str), eq + 1);
3861 } 3365 }
3862 else 3366 else
3863 XDeleteProperty (disp, parent[0], 3367 XDeleteProperty (dpy, parent[0],
3864 display->atom (str)); 3368 display->atom (str));
3865 } 3369 }
3866 break; 3370 break;
3867 3371
3868 case XTerm_Color: 3372 case XTerm_Color:
… …
3870 { 3374 {
3871 if ((name = strchr (buf, ';')) == NULL) 3375 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3376 break;
3873 3377
3874 *name++ = '\0'; 3378 *name++ = '\0';
3875 color = atoi (buf); 3379 color = atoi (buf) + minCOLOR;
3876 3380
3877 if (color < 0 || color >= TOTAL_COLORS) 3381 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3382 break;
3879 3383
3880 if ((buf = strchr (name, ';')) != NULL) 3384 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3385 *buf++ = '\0';
3882 3386
3883 if (name[0] == '?' && !name[1]) 3387 process_color_seq (op, color, name, resp);
3884 {
3885 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3887 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888 }
3889 else
3890 set_window_color (color + minCOLOR, name);
3891 } 3388 }
3892 break; 3389 break;
3893 case XTerm_Color00: 3390 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3391 process_color_seq (op, Color_fg, str, resp);
3895 break; 3392 break;
3896 case XTerm_Color01: 3393 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3898 break; 3395 break;
3899#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3398 process_color_seq (op, Color_cursor, str, resp);
3902 break; 3399 break;
3903#endif 3400#endif
3904 case XTerm_Color_pointer_fg: 3401 case XTerm_Color_pointer_fg:
3905 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3906 break; 3403 break;
3907 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3908 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3909 break; 3406 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3911 case XTerm_Color_BD:
3912 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913 break;
3914 case XTerm_Color_UL:
3915 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916 break;
3917 case XTerm_Color_RV: 3408 case XTerm_Color_RV:
3918 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);
3919 break; 3418 break;
3920 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3922 break; 3421 break;
3923#endif 3422#endif
3924#if TRANSPARENT && TINTING 3423#if ENABLE_TRANSPARENCY
3925 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3926 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3927 check_our_parents (); 3426 {
3928 if (am_transparent) 3427 bool changed = false;
3929 want_full_refresh = want_refresh = 1; 3428 if (ISSET_PIXCOLOR (Color_tint))
3930 break; 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3931#endif 3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3932 3435
3436 break;
3437#endif
3438
3439#if XPM_BACKGROUND
3933 case XTerm_Pixmap: 3440 case Rxvt_Pixmap:
3934 if (*str != ';') 3441 if (!strcmp (str, "?"))
3935 { 3442 {
3936#if XPM_BACKGROUND 3443 char str[256];
3937 scale_pixmap (""); /* reset to default scaling */ 3444
3938 set_bgPixmap (str); /* change pixmap */ 3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3939#endif 3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3940 scr_touch (true); 3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3941 } 3449 }
3942 while ((str = strchr (str, ';')) != NULL) 3450 else
3943 { 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 {
3944 str++; 3466 str++;
3945#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3946 changed += scale_pixmap (str); 3468 changed++;
3947#endif 3469 str = strchr (str, ';');
3470 }
3471 if (changed)
3472 {
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3948 } 3476 }
3949
3950 if (changed)
3951 {
3952#ifdef XPM_BACKGROUND
3953 resize_pixmap ();
3954#endif
3955 scr_touch (true);
3956 }
3957 break; 3477 break;
3478#endif
3958 3479
3959 case XTerm_restoreFG: 3480 case Rxvt_restoreFG:
3960 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3961 break; 3482 break;
3962 case XTerm_restoreBG: 3483 case Rxvt_restoreBG:
3963 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3964 break; 3485 break;
3965 3486
3966 case XTerm_logfile: 3487 case XTerm_logfile:
3967 // TODO, when secure mode? 3488 // TODO, when secure mode?
3968 break; 3489 break;
3969 3490
3970#ifdef MENUBAR
3971 case URxvt_Menu:
3972 if (OPTION (Opt_insecure))
3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974 break;
3975#endif
3976#if 0 3491#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3978 { 3493 {
3979 int fd; 3494 int fd;
3980 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)
3981 { 3496 {
3982 scr_dump (fd); 3497 scr_dump (fd);
… …
3993 case URxvt_italicFont: 3508 case URxvt_italicFont:
3994 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3995#endif 3510#endif
3996 if (query) 3511 if (query)
3997 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3998 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3999 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
4000 resp); 3515 resp);
4001 else 3516 else
4002 { 3517 {
4003 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4006 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
4007 set_fonts (); 3522 set_fonts ();
4008 } 3523 }
4009 break; 3524 break;
4010 3525
4011#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
4012 case URxvt_locale: 3535 case URxvt_locale:
4013 if (query) 3536 if (query)
4014 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);
4015 else 3538 else
4016 { 3539 {
4017 set_locale (str); 3540 set_locale (str);
4018 pty.set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
4019 init_xlocale (); 3542 init_xlocale ();
4020 } 3543 }
4021 break; 3544 break;
4022 3545
4023 case URxvt_view_up: 3546 case URxvt_view_up:
… …
4034 break; 3557 break;
4035#endif 3558#endif
4036 3559
4037#if ENABLE_PERL 3560#if ENABLE_PERL
4038 case URxvt_perl: 3561 case URxvt_perl:
4039 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)))
4040 ; // no responses yet 3563 ; // no responses yet
4041 break; 3564 break;
4042#endif 3565#endif
4043 } 3566 }
4044} 3567}
… …
4076 return state; 3599 return state;
4077} 3600}
4078 3601
4079/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
4080void 3603void
4081rxvt_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)
4082{ 3605{
4083 unsigned int i, j; 3606 unsigned int i, j;
4084 int state; 3607 int state;
4085 3608
4086 static const struct 3609 static const struct
4087 { 3610 {
4088 const int argval; 3611 const int argval;
4089 const unsigned long bit; 3612 const unsigned long bit;
4090 }
4091
4092 argtopriv[] = { 3613 } argtopriv[] = {
4093 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
4094 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
4095 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
4096 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
4097 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },
4098 { 6, PrivMode_relOrigin }, 3619 { 6, PrivMode_relOrigin },
4099 { 7, PrivMode_Autowrap }, 3620 { 7, PrivMode_Autowrap },
4100 // 8, bi-directional support mode 3621 // 8, bi-directional support mode
4101 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
4102#ifdef menuBar_esc
4103 { menuBar_esc, PrivMode_menuBar },
4104#endif
4105 // 18, 19 printing-related 3623 // 18, 19 printing-related
4106 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor },
4107#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
4108 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
4109#endif 3627#endif
… …
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;
… …
4204 /* 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 */
4205 case 9: /* X10 mouse reporting */ 3723 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 3724 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 3725 priv_modes &= ~PrivMode_MouseX11;
4208 break; 3726 break;
4209#ifdef menuBar_esc
4210 case menuBar_esc:
4211#ifdef MENUBAR
4212 map_menuBar (state);
4213#endif
4214 break;
4215#endif
4216#ifdef scrollBar_esc 3727#ifdef scrollBar_esc
4217 case scrollBar_esc: 3728 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 3729 if (scrollbar_mapping (state))
4219 { 3730 {
4220 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
… …
4245 break; 3756 break;
4246 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
4247 set_option (Opt_scrollTtyKeypress, state); 3758 set_option (Opt_scrollTtyKeypress, state);
4248 break; 3759 break;
4249 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
4250 if (OPTION (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 3762 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 3763 scr_erase_screen (2);
4253 scr_change_screen (state); 3764 scr_change_screen (state);
4254 break; 3765 break;
4255 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
4256 scr_change_screen (state); 3767 scr_change_screen (state);
4257 if (OPTION (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 3770 scr_erase_screen (2);
4260 break; 3771 break;
4261 default: 3772 default:
4262 break; 3773 break;
… …
4390 scr_color (Color_bg, Color_bg); 3901 scr_color (Color_bg, Color_bg);
4391 break; 3902 break;
4392 3903
4393 //case 50: // not variable spacing 3904 //case 50: // not variable spacing
4394 3905
4395#if ENABLE_FRILLS 3906#if !ENABLE_MINIMAL
4396 case 90: 3907 case 90:
4397 case 91: /* set bright fg color */ 3908 case 91: /* set bright fg color */
4398 case 92: 3909 case 92:
4399 case 93: 3910 case 93:
4400 case 94: 3911 case 94:
… …
4465rxvt_term::tt_write (const char *data, unsigned int len) 3976rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 3977{
4467 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468 return; 3979 return;
4469 3980
4470 if (pty.pty < 0) 3981 if (pty->pty < 0)
4471 return; 3982 return;
4472 3983
4473 if (v_buflen == 0) 3984 if (v_buflen == 0)
4474 { 3985 {
4475 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));
4476 3987
4477 if ((unsigned int)written == len) 3988 if ((unsigned int)written == len)
4478 return; 3989 return;
4479 3990
4480 data += written; 3991 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4001}
4491 4002
4492void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4493{ 4004{
4494 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));
4495 4006
4496 if (written > 0) 4007 if (written > 0)
4497 { 4008 {
4498 v_buflen -= written; 4009 v_buflen -= written;
4499 4010

Diff Legend

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