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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 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;
986 line_t *l; 1061 line_t *l;
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:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1503 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1504 { 1483 {
1505 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1506 ; 1485 ;
1507 1486
1508 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509 { 1488 {
1510 seen_resize = 1; 1489 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1491 }
1513 1492 else
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493 {
1494#ifdef ENABLE_TRANSPARENCY
1515 if (OPTION (Opt_transparent)) 1495 if (option (Opt_transparent))
1516 check_our_parents (); 1496 update_background ();
1517#endif 1497#endif
1498 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 } 1500 }
1519 break; 1501 break;
1520 1502
1521 case PropertyNotify: 1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1522 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1523 && ev.xproperty.state == PropertyNewValue) 1506 && ev.xproperty.state == PropertyNewValue)
1524 selection_property (ev.xproperty.window, ev.xproperty.atom); 1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1525 1508
1526 break; 1509 break;
1527 1510
1528 case SelectionClear: 1511 case SelectionClear:
1529 selection_clear (); 1512 selection_clear ();
… …
1552 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1553#endif 1536#endif
1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1555 break; 1538 break;
1556 1539
1557#ifdef TRANSPARENT 1540#ifdef ENABLE_TRANSPARENCY
1558 case ReparentNotify: 1541 case ReparentNotify:
1559 rootwin_cb (ev); 1542 rootwin_cb (ev);
1560 break; 1543 break;
1561#endif /* TRANSPARENT */ 1544#endif /* ENABLE_TRANSPARENCY */
1562 1545
1563 case GraphicsExpose: 1546 case GraphicsExpose:
1564 case Expose: 1547 case Expose:
1565 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1566 { 1549 {
1567 do 1550 do
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1571 1554
1572 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573 1556
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1558 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1559 ev.xexpose.width, ev.xexpose.height, False);
1577 1560
1578 want_refresh = 1; 1561 want_refresh = 1;
1579 } 1562 }
1580 else 1563 else
1581 { 1564 {
1582 XEvent unused_event; 1565 XEvent unused_event;
1583 1566
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1585 ; 1568 ;
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1587 ; 1570 ;
1588 1571
1589 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1590 { 1573 {
1591 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1592 scrollbar_show (0); 1575 scrollbar_show (0);
1593 } 1576 }
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 } 1577 }
1604 break; 1578 break;
1605 1579
1606 case MotionNotify: 1580 case MotionNotify:
1607#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1582 if (hidden_pointer)
1609 pointer_unblank (); 1583 pointer_unblank ();
1610#endif 1584#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) 1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1586 break;
1620 1587
1621 if (ev.xany.window == vt) 1588 if (ev.xany.window == vt)
1622 { 1589 {
1590 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1591 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1592 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1593 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1594 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1595 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1628 ; 1596 ;
1629 1597
1630 XQueryPointer (disp, vt, 1598 XQueryPointer (dpy, vt,
1631 &unused_root, &unused_child, 1599 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1600 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1601 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1602 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1603#ifdef MOUSE_THRESHOLD
… …
1699#endif 1667#endif
1700 } 1668 }
1701 } 1669 }
1702 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1703 { 1671 {
1704 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1705 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1706 ; 1674 ;
1707 1675
1708 XQueryPointer (disp, scrollBar.win, 1676 XQueryPointer (dpy, scrollBar.win,
1709 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1710 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1680 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1682 scrollbar_size ());
1715 want_refresh = 1; 1683 want_refresh = 1;
1716 refresh_limit = 0;
1717 scrollbar_show (1); 1684 scrollbar_show (1);
1718 } 1685 }
1719 break; 1686 break;
1720 } 1687 }
1721 1688
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1726 { 1691 {
1727 if (hidden_cursor) 1692 if (hidden_cursor)
1728 { 1693 {
1729 hidden_cursor = 0; 1694 hidden_cursor = 0;
1730 want_refresh = 1; 1695 want_refresh = 1;
1731 } 1696 }
1732 1697
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734 } 1699 }
1735#endif 1700#endif
1736 1701
1737#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 { 1704 {
1740 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1743 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1755 if (!focus) 1720 if (!focus)
1756 { 1721 {
1757 focus = 1; 1722 focus = 1;
1758 want_refresh = 1; 1723 want_refresh = 1;
1759 1724
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1761 1726
1762#if USE_XIM 1727#if USE_XIM
1763 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1764 { 1729 {
1765 IMSetStatusPosition (); 1730 IMSetPosition ();
1766 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1767 } 1732 }
1768#endif 1733#endif
1769#if CURSOR_BLINK 1734#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772#endif 1737#endif
1773#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1775 { 1740 {
1776 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1777 scr_recolour (); 1742 scr_recolour ();
1778 } 1743 }
1779#endif 1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1780 } 1758 }
1781} 1759}
1782 1760
1783void 1761void
1784rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1792 1770
1793#if ENABLE_FRILLS || ISO_14755 1771#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf) 1772 if (iso14755buf)
1795 { 1773 {
1796 iso14755buf = 0; 1774 iso14755buf = 0;
1797# if ENABLE_OVERLAY 1775# if ISO_14755
1798 scr_overlay_off (); 1776 scr_overlay_off ();
1799# endif 1777# endif
1800 } 1778 }
1801#endif 1779#endif
1802#if USE_XIM 1780#if USE_XIM
1803 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1804 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1805#endif 1783#endif
1806#if CURSOR_BLINK 1784#if CURSOR_BLINK
1807 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1808 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1809 hidden_cursor = 0; 1787 hidden_cursor = 0;
1810#endif 1788#endif
1811#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1816 } 1794 }
1817#endif 1795#endif
1818 } 1796 }
1819} 1797}
1820 1798
1821#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if ENABLE_TRANSPARENCY || ENABLE_PERL
1822void 1813void
1823rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1815{
1825 SET_R (this); 1816 make_current ();
1826 SET_LOCALE (locale);
1827 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if ENABLE_TRANSPARENCY
1828 switch (ev.type) 1823 switch (ev.type)
1829 { 1824 {
1830 case PropertyNotify: 1825 case PropertyNotify:
1831 /* 1826 /*
1832 * if user used some Esetroot compatible prog to set the root bg, 1827 * 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. 1828 * use the property to determine the pixmap. We use it later on.
1834 */ 1829 */
1835 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 return; 1832 {
1838 1833 bgPixmap.set_root_pixmap ();
1839 /* FALLTHROUGH */ 1834 update_background ();
1840 case ReparentNotify: 1835 }
1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1842 want_refresh = want_full_refresh = 1;
1843 break; 1836 break;
1844 } 1837 }
1838# endif
1845} 1839}
1846#endif 1840#endif
1847 1841
1848void 1842void
1849rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
… …
1858 /* 1852 /*
1859 * VT window processing of button press 1853 * VT window processing of button press
1860 */ 1854 */
1861 if (ev.window == vt) 1855 if (ev.window == vt)
1862 { 1856 {
1857 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 return;
1859
1863#if ISO_14755 1860#if ISO_14755
1864 // 5.4 1861 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 { 1863 {
1867 iso14755_54 (ev.x, ev.y); 1864 iso14755_54 (ev.x, ev.y);
… …
1909 else 1906 else
1910 { 1907 {
1911 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1912 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1913 1910
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915 switch (ev.button) 1911 switch (ev.button)
1916 { 1912 {
1917 case Button1: 1913 case Button1:
1918 /* allow meta + click to select rectangular areas */ 1914 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */ 1915 /* should be done in screen.C */
1920#if ENABLE_FRILLS 1916#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask); 1917 selection.rect = !!(ev.state & ModMetaMask);
1922#else 1918#else
1923 selection.rect = false; 1919 selection.rect = false;
1924#endif 1920#endif
1925 1921
1926 /* allow shift+left click to extend selection */ 1922 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1924 {
1929 if (MEvent.button == Button1 && clickintime) 1925 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1926 selection_rotate (ev.x, ev.y);
1931 else 1927 else
1932 selection_extend (ev.x, ev.y, 1); 1928 selection_extend (ev.x, ev.y, 1);
1933 } 1929 }
1934 else 1930 else
1935 { 1931 {
1936 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1937 MEvent.clicks++; 1933 MEvent.clicks++;
1938 else 1934 else
1939 MEvent.clicks = 1; 1935 MEvent.clicks = 1;
1940 1936
1941 selection_click (MEvent.clicks, ev.x, ev.y); 1937 selection_click (MEvent.clicks, ev.x, ev.y);
1942 } 1938 }
1943 1939
1944 MEvent.button = Button1; 1940 MEvent.button = Button1;
1945 break; 1941 break;
1946 1942
1947 case Button3: 1943 case Button3:
1948 if (MEvent.button == Button3 && clickintime) 1944 if (MEvent.button == Button3 && clickintime)
1949 selection_rotate (ev.x, ev.y); 1945 selection_rotate (ev.x, ev.y);
1950 else 1946 else
1951 selection_extend (ev.x, ev.y, 1); 1947 selection_extend (ev.x, ev.y, 1);
1952 1948
1953 MEvent.button = Button3; 1949 MEvent.button = Button3;
1954 break; 1950 break;
1955 } 1951 }
1956 } 1952 }
1957 1953
1958 MEvent.time = ev.time; 1954 MEvent.time = ev.time;
1959 return; 1955 return;
1960 } 1956 }
1961 1957
… …
2100 } 2096 }
2101 } 2097 }
2102 2098
2103 return; 2099 return;
2104 } 2100 }
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} 2101}
2114 2102
2115void 2103void
2116rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
2117{ 2105{
… …
2123 2111
2124 if (scrollbar_isUpDn ()) 2112 if (scrollbar_isUpDn ())
2125 { 2113 {
2126 scrollBar.setIdle (); 2114 scrollBar.setIdle ();
2127 scrollbar_show (0); 2115 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2116 }
2132 2117
2133#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2119 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2136#endif 2121#endif
2137 2122
2138 if (ev.window == vt) 2123 if (ev.window == vt)
2139 { 2124 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2126 return;
2127
2140#if ISO_14755 2128#if ISO_14755
2141 // 5.4 2129 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2130 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return; 2131 return;
2144#endif 2132#endif
2133
2145 if (reportmode) 2134 if (reportmode)
2146 { 2135 {
2147 /* mouse report from vt window */ 2136 /* mouse report from vt window */
2148 /* don't report release of wheel "buttons" */ 2137 /* don't report release of wheel "buttons" */
2149 if (ev.button >= 4) 2138 if (ev.button >= 4)
… …
2173 if (priv_modes & PrivMode_mouse_report 2162 if (priv_modes & PrivMode_mouse_report
2174 && bypass_keystate 2163 && bypass_keystate
2175 && ev.button == Button1 && MEvent.clicks <= 1) 2164 && ev.button == Button1 && MEvent.clicks <= 1)
2176 selection_extend (ev.x, ev.y, 0); 2165 selection_extend (ev.x, ev.y, 0);
2177 2166
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2181 switch (ev.button) 2167 switch (ev.button)
2182 { 2168 {
2183 case Button1: 2169 case Button1:
2184 case Button3: 2170 case Button3:
2185 selection_make (ev.time); 2171 selection_make (ev.time);
2186 break; 2172 break;
2173
2187 case Button2: 2174 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2189 break; 2177 break;
2178
2190#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2191 case Button4: 2180 case Button4:
2192 case Button5: 2181 case Button5:
2193 { 2182 {
2194 int i; 2183 int i;
… …
2196 2185
2197 v = ev.button == Button4 ? UP : DN; 2186 v = ev.button == Button4 ? UP : DN;
2198 2187
2199 if (ev.state & ShiftMask) 2188 if (ev.state & ShiftMask)
2200 i = 1; 2189 i = 1;
2201 else if (OPTION (Opt_mouseWheelScrollPage)) 2190 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2191 i = nrow - 1;
2203 else 2192 else
2204 i = 5; 2193 i = 5;
2205 2194
2206# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
… …
2226 } 2215 }
2227 break; 2216 break;
2228#endif 2217#endif
2229 } 2218 }
2230 } 2219 }
2231#ifdef MENUBAR
2232 else if (isMenuBarWindow (ev.window))
2233 menubar_control (ev);
2234#endif
2235} 2220}
2236
2237#ifdef TRANSPARENT
2238#if TINTING
2239/* taken from aterm-0.4.2 */
2240
2241typedef uint32_t RUINT32T;
2242
2243void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2244{
2245 int sh_r, sh_g, sh_b;
2246 RUINT32T mask_r, mask_g, mask_b;
2247 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2248 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2249 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2250 int i;
2251
2252 Visual *visual = display->visual;
2253
2254 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2255
2256 /* for convenience */
2257 mask_r = visual->red_mask;
2258 mask_g = visual->green_mask;
2259 mask_b = visual->blue_mask;
2260
2261 /* boring lookup table pre-initialization */
2262 switch (srcImage->bits_per_pixel) {
2263 case 15:
2264 if ((mask_r != 0x7c00) ||
2265 (mask_g != 0x03e0) ||
2266 (mask_b != 0x001f))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2269 lookup_r = lookup;
2270 lookup_g = lookup+32;
2271 lookup_b = lookup+32+32;
2272 sh_r = 10;
2273 sh_g = 5;
2274 sh_b = 0;
2275 break;
2276 case 16:
2277 if ((mask_r != 0xf800) ||
2278 (mask_g != 0x07e0) ||
2279 (mask_b != 0x001f))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2282 lookup_r = lookup;
2283 lookup_g = lookup+32;
2284 lookup_b = lookup+32+64;
2285 sh_r = 11;
2286 sh_g = 5;
2287 sh_b = 0;
2288 break;
2289 case 24:
2290 if ((mask_r != 0xff0000) ||
2291 (mask_g != 0x00ff00) ||
2292 (mask_b != 0x0000ff))
2293 return;
2294 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2295 lookup_r = lookup;
2296 lookup_g = lookup+256;
2297 lookup_b = lookup+256+256;
2298 sh_r = 16;
2299 sh_g = 8;
2300 sh_b = 0;
2301 break;
2302 case 32:
2303 if ((mask_r != 0xff0000) ||
2304 (mask_g != 0x00ff00) ||
2305 (mask_b != 0x0000ff))
2306 return;
2307 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2308 lookup_r = lookup;
2309 lookup_g = lookup+256;
2310 lookup_b = lookup+256+256;
2311 sh_r = 16;
2312 sh_g = 8;
2313 sh_b = 0;
2314 break;
2315 default:
2316 return; /* we do not support this color depth */
2317 }
2318
2319 /* prepare limits for color transformation (each channel is handled separately) */
2320 if (shade < 0) {
2321 shade = -shade;
2322 if (shade < 0) shade = 0;
2323 if (shade > 100) shade = 100;
2324
2325 lower_lim_r = 65535-rm;
2326 lower_lim_g = 65535-gm;
2327 lower_lim_b = 65535-bm;
2328
2329 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2330 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2331 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2332
2333 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2334 } else {
2335 if (shade < 0) shade = 0;
2336 if (shade > 100) shade = 100;
2337
2338 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2339
2340 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2341 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2342 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2343 }
2344
2345 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2346 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2347 {
2348 unsigned int tmp;
2349
2350 tmp = lower_lim_r;
2351 lower_lim_r = lower_lim_b;
2352 lower_lim_b = tmp;
2353
2354 tmp = upper_lim_r;
2355 upper_lim_r = upper_lim_b;
2356 upper_lim_b = tmp;
2357 }
2358
2359 /* fill our lookup tables */
2360 for (i = 0; i <= mask_r>>sh_r; i++)
2361 {
2362 RUINT32T tmp;
2363 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2364 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2365 lookup_r[i] = (tmp/65535)<<sh_r;
2366 }
2367 for (i = 0; i <= mask_g>>sh_g; i++)
2368 {
2369 RUINT32T tmp;
2370 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2371 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2372 lookup_g[i] = (tmp/65535)<<sh_g;
2373 }
2374 for (i = 0; i <= mask_b>>sh_b; i++)
2375 {
2376 RUINT32T tmp;
2377 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2378 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2379 lookup_b[i] = (tmp/65535)<<sh_b;
2380 }
2381
2382 /* apply table to input image (replacing colors by newly calculated ones) */
2383 switch (srcImage->bits_per_pixel)
2384 {
2385 case 15:
2386 {
2387 unsigned short *p1, *pf, *p, *pl;
2388 p1 = (unsigned short *) srcImage->data;
2389 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width;
2394 for (; p < pl; p++)
2395 {
2396 *p = lookup_r[(*p & 0x7c00)>>10] |
2397 lookup_g[(*p & 0x03e0)>> 5] |
2398 lookup_b[(*p & 0x001f)];
2399 }
2400 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 16:
2405 {
2406 unsigned short *p1, *pf, *p, *pl;
2407 p1 = (unsigned short *) srcImage->data;
2408 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409 while (p1 < pf)
2410 {
2411 p = p1;
2412 pl = p1 + srcImage->width;
2413 for (; p < pl; p++)
2414 {
2415 *p = lookup_r[(*p & 0xf800)>>11] |
2416 lookup_g[(*p & 0x07e0)>> 5] |
2417 lookup_b[(*p & 0x001f)];
2418 }
2419 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2420 }
2421 break;
2422 }
2423 case 24:
2424 {
2425 unsigned char *p1, *pf, *p, *pl;
2426 p1 = (unsigned char *) srcImage->data;
2427 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2428 while (p1 < pf)
2429 {
2430 p = p1;
2431 pl = p1 + srcImage->width * 3;
2432 for (; p < pl; p += 3)
2433 {
2434 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2435 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2436 p[2] = lookup_r[(p[2] & 0x0000ff)];
2437 }
2438 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2439 }
2440 break;
2441 }
2442 case 32:
2443 {
2444 RUINT32T *p1, *pf, *p, *pl;
2445 p1 = (RUINT32T *) srcImage->data;
2446 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2447
2448 while (p1 < pf)
2449 {
2450 p = p1;
2451 pl = p1 + srcImage->width;
2452 for (; p < pl; p++)
2453 {
2454 *p = lookup_r[(*p & 0xff0000)>>16] |
2455 lookup_g[(*p & 0x00ff00)>> 8] |
2456 lookup_b[(*p & 0x0000ff)] |
2457 (*p & ~0xffffff);
2458 }
2459 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2460 }
2461 break;
2462 }
2463 }
2464
2465 free (lookup);
2466}
2467#endif
2468
2469/*
2470 * Check our parents are still who we think they are.
2471 * Do transparency updates if required
2472 */
2473int
2474rxvt_term::check_our_parents ()
2475{
2476 int i, pchanged, aformat, have_pixmap, rootdepth;
2477 unsigned long nitems, bytes_after;
2478 Atom atype;
2479 unsigned char *prop = NULL;
2480 Window root, oldp, *list;
2481 Pixmap rootpixmap = None;
2482 XWindowAttributes wattr, wrootattr;
2483 dDisp;
2484
2485 pchanged = 0;
2486
2487 if (!OPTION (Opt_transparent))
2488 return pchanged; /* Don't try any more */
2489
2490 XGetWindowAttributes (disp, display->root, &wrootattr);
2491 rootdepth = wrootattr.depth;
2492
2493 XGetWindowAttributes (disp, parent[0], &wattr);
2494
2495 if (rootdepth != wattr.depth)
2496 {
2497 if (am_transparent)
2498 {
2499 pchanged = 1;
2500 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2501 am_transparent = am_pixmap_trans = 0;
2502 }
2503
2504 return pchanged; /* Don't try any more */
2505 }
2506
2507 /* Get all X ops out of the queue so that our information is up-to-date. */
2508 XSync (disp, False);
2509
2510 /*
2511 * Make the frame window set by the window manager have
2512 * the root background. Some window managers put multiple nested frame
2513 * windows for each client, so we have to take care about that.
2514 */
2515 i = (xa[XA_XROOTPMAP_ID]
2516 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success);
2519
2520 if (!i || prop == NULL)
2521 i = (xa[XA_ESETROOT_PMAP_ID]
2522 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2523 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2524 &nitems, &bytes_after, &prop) == Success);
2525
2526 if (!i || prop == NULL
2527#if TINTING
2528 || !rs[Rs_color + Color_tint]
2529#endif
2530 )
2531 have_pixmap = 0;
2532 else
2533 {
2534 have_pixmap = 1;
2535 rootpixmap = *(Pixmap *)prop;
2536 XFree (prop);
2537 }
2538
2539 if (have_pixmap)
2540 {
2541 /*
2542 * Copy display->root pixmap transparency
2543 */
2544 int sx, sy, nx, ny;
2545 unsigned int nw, nh;
2546 Window cr;
2547 XImage *image;
2548 GC gc;
2549 XGCValues gcvalue;
2550
2551 XTranslateCoordinates (disp, parent[0], display->root,
2552 0, 0, &sx, &sy, &cr);
2553 nw = (unsigned int)szHint.width;
2554 nh = (unsigned int)szHint.height;
2555 nx = ny = 0;
2556
2557 if (sx < 0)
2558 {
2559 nw += sx;
2560 nx = -sx;
2561 sx = 0;
2562 }
2563
2564 if (sy < 0)
2565 {
2566 nh += sy;
2567 ny = -sy;
2568 sy = 0;
2569 }
2570
2571 min_it (nw, (unsigned int) (wrootattr.width - sx));
2572 min_it (nh, (unsigned int) (wrootattr.height - sy));
2573
2574 XSync (disp, False);
2575 allowedxerror = -1;
2576 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2577
2578 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2579 /* XXX: may need a delay here? */
2580 allowedxerror = 0;
2581
2582 if (image == NULL)
2583 {
2584 if (am_transparent && am_pixmap_trans)
2585 {
2586 pchanged = 1;
2587 if (pixmap != None)
2588 {
2589 XFreePixmap (disp, pixmap);
2590 pixmap = None;
2591 }
2592 }
2593
2594 am_pixmap_trans = 0;
2595 }
2596 else
2597 {
2598 if (pixmap != None)
2599 XFreePixmap (disp, pixmap);
2600
2601#if TINTING
2602 if (ISSET_PIXCOLOR (Color_tint))
2603 {
2604 unsigned short rm, gm, bm;
2605 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2606
2607 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2608
2609 ShadeXImage (display, image, shade, rm, gm, bm);
2610 }
2611#endif
2612
2613 pixmap = XCreatePixmap (disp, vt,
2614 szHint.width, szHint.height, image->depth);
2615 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2616 XPutImage (disp, pixmap, gc, image, 0, 0,
2617 nx, ny, image->width, image->height);
2618 XFreeGC (disp, gc);
2619 XDestroyImage (image);
2620 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2621 XClearWindow (disp, parent[0]);
2622
2623 if (!am_transparent || !am_pixmap_trans)
2624 pchanged = 1;
2625
2626 am_transparent = am_pixmap_trans = 1;
2627 }
2628 }
2629
2630 if (am_pixmap_trans)
2631 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2632 else
2633 {
2634 unsigned int n;
2635 /*
2636 * InheritPixmap transparency
2637 */
2638 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2639 {
2640 oldp = parent[i];
2641 XQueryTree (disp, parent[i - 1], &root,
2642 &parent[i], &list, &n);
2643 XFree (list);
2644
2645 if (parent[i] == display->root)
2646 {
2647 if (oldp != None)
2648 pchanged = 1;
2649
2650 break;
2651 }
2652
2653 if (oldp != parent[i])
2654 pchanged = 1;
2655 }
2656
2657 n = 0;
2658
2659 if (pchanged)
2660 {
2661 for (; n < (unsigned int)i; n++)
2662 {
2663 XGetWindowAttributes (disp, parent[n], &wattr);
2664 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2665 {
2666 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2667 break;
2668 }
2669 }
2670 }
2671
2672 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2673 {
2674 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2675 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2676 am_transparent = 0;
2677 /* XXX: also turn off Opt_transparent? */
2678 }
2679 else
2680 {
2681#if WAIT_FOR_WM
2682 /* wait (an arbitrary period) for the WM to do its thing
2683 * needed for fvwm2.2.2 (and before?) */
2684 sleep (1);
2685#endif
2686 for (n = 0; n < (unsigned int)i; n++)
2687 {
2688 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2689 XClearWindow (disp, parent[n]);
2690 }
2691
2692 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2693 am_transparent = 1;
2694 }
2695
2696 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2697 parent[i] = None;
2698 }
2699
2700 if (scrollBar.win)
2701 {
2702 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2703 scrollBar.setIdle ();
2704 scrollbar_show (0);
2705 }
2706
2707 if (am_transparent)
2708 {
2709 want_refresh = want_full_refresh = 1;
2710 if (am_pixmap_trans)
2711 flush ();
2712 }
2713
2714 return pchanged;
2715}
2716#endif
2717 2221
2718/*}}} */ 2222/*}}} */
2719 2223
2720bool 2224bool
2721rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
… …
2770 if (ch == C0_LF) 2274 if (ch == C0_LF)
2771 nlines++; 2275 nlines++;
2772 2276
2773 refresh_count++; 2277 refresh_count++;
2774 2278
2775 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2776 || (refresh_count >= refresh_limit * (nrow - 1)))
2777 { 2280 {
2778 refreshnow = true;
2779 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2284 {
2285 refreshnow = true;
2780 ch = NOCHAR; 2286 ch = NOCHAR;
2781 break; 2287 break;
2288 }
2782 } 2289 }
2783 2290
2784 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2785 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2786 { 2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2788 scr_add_lines (buf, str - buf, nlines); 2296 scr_add_lines (buf, str - buf, nlines);
2789 2297
2790 nlines = 0; 2298 nlines = 0;
2791 str = buf; 2299 str = buf;
2792 eol = str + min (ncol, UBUFSIZ); 2300 eol = str + min (ncol, UBUFSIZ);
… …
2807 2315
2808 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2809 ch = next_char (); 2317 ch = next_char ();
2810 } 2318 }
2811 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2813 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2814 2323
2815 /* 2324 /*
2816 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2817 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2818 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2819 * is incremented here because we must be doing flat-out scrolling.
2820 */ 2328 */
2821 if (refreshnow) 2329 if (refreshnow)
2822 { 2330 {
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++;
2825 else
2826 {
2827 flag = true; 2331 flag = true;
2828 scr_refresh (refresh_type); 2332 scr_refresh ();
2829 want_refresh = 1; 2333 want_refresh = 1;
2830 }
2831 } 2334 }
2832 2335
2833 } 2336 }
2834 else 2337 else
2835 { 2338 {
… …
2851 return flag; 2354 return flag;
2852} 2355}
2853 2356
2854// read the next character 2357// read the next character
2855wchar_t 2358wchar_t
2856rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2857{ 2360{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2362 {
2860 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2882 return NOCHAR; 2385 return NOCHAR;
2883} 2386}
2884 2387
2885// read the next octet 2388// read the next octet
2886uint32_t 2389uint32_t
2887rxvt_term::next_octet () 2390rxvt_term::next_octet () NOTHROW
2888{ 2391{
2889 return cmdbuf_ptr < cmdbuf_endp 2392 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2393 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2394 : NOCHAR;
2892} 2395}
2396
2397static class out_of_input out_of_input;
2893 2398
2894/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2895/* 2400/*
2896 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2897 * to the command. 2402 * to the command.
2898 */ 2403 */
2899wchar_t 2404wchar_t
2900rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2406{
2902 wchar_t c = next_char (); 2407 wchar_t c = next_char ();
2903 2408
2904 if (c == NOCHAR) 2409 if (c == NOCHAR)
2905 throw out_of_input; 2410 throw out_of_input;
2906 2411
2907 return c; 2412 return c;
2908} 2413}
2909 2414
2910uint32_t 2415uint32_t
2911rxvt_term::cmd_get8 () 2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2417{
2913 uint32_t c = next_octet (); 2418 uint32_t c = next_octet ();
2914 2419
2915 if (c == NOCHAR) 2420 if (c == NOCHAR)
2916 throw out_of_input; 2421 throw out_of_input;
… …
2982 { 2487 {
2983 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2984 break; /* done = 1 */ 2489 break; /* done = 1 */
2985 } 2490 }
2986 } 2491 }
2987 2492
2988 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2989 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2990 { 2495 {
2991 done = 1; 2496 done = 1;
2992 break; 2497 break;
… …
3054 process_dcs_seq (); 2559 process_dcs_seq ();
3055 break; 2560 break;
3056 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3057 process_csi_seq (); 2562 process_csi_seq ();
3058 break; 2563 break;
3059 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3060 process_osc_seq (); 2565 process_osc_seq ();
3061 break; 2566 break;
3062#endif 2567#endif
3063 } 2568 }
3064} 2569}
… …
3154 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3155 break; 2660 break;
3156 case '+': 2661 case '+':
3157 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3158 break; 2663 break;
3159#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3160 case '6': 2665 case '6':
3161 scr_backindex (); 2666 scr_backindex ();
3162 break; 2667 break;
3163#endif 2668#endif
3164 case '7': 2669 case '7':
3165 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3166 break; 2671 break;
3167 case '8': 2672 case '8':
3168 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3169 break; 2674 break;
3170#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3171 case '9': 2676 case '9':
3172 scr_forwardindex (); 2677 scr_forwardindex ();
3173 break; 2678 break;
3174#endif 2679#endif
3175 case '=': 2680 case '=':
… …
3292 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3293 unsigned int nargs, p; 2798 unsigned int nargs, p;
3294 int n, ndef; 2799 int n, ndef;
3295 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS];
3296 2801
3297 for (nargs = ESC_ARGS; nargs > 0;) 2802 memset (arg, 0, sizeof (arg));
3298 arg[--nargs] = 0; 2803 nargs = 0;
3299 2804
3300 priv = 0; 2805 priv = 0;
3301 ch = cmd_getc (); 2806 ch = cmd_getc ();
3302 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3303 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
… …
3337 ndef = get_byte_array_bit (csi_defaults, i); 2842 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 2843 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 2844 if (arg[p] == -1)
3340 arg[p] = ndef; 2845 arg[p] = ndef;
3341 2846
3342#ifdef DEBUG_CMD
3343 fprintf (stderr, "CSI ");
3344 for (p = 0; p < nargs; p++)
3345 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346 fprintf (stderr, "%c\n", ch);
3347#endif
3348
3349 /* 2847 /*
3350 * private mode handling 2848 * private mode handling
3351 */ 2849 */
3352 if (priv) 2850 if (priv)
3353 { 2851 {
3354 switch (priv) 2852 switch (priv)
3355 { 2853 {
3356 case '>': 2854 case '>':
3357 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3358 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2856 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2862 // that we do not support xterm mouse reporting (should be 95 when we do).
2863 //
2864 tt_printf ("\033[>%d;94;0c", 'U');
2865 }
3359 break; 2866 break;
3360 case '?': 2867 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 2870 break;
… …
3489 break; 2996 break;
3490 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3491 scr_report_position (); 2998 scr_report_position ();
3492 break; 2999 break;
3493 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3494 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3495 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3496 break; 3003 break;
3497 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3499 break; 3006 break;
… …
3566 break; 3073 break;
3567 case CSI_75: 3074 case CSI_75:
3568 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3569 break; 3076 break;
3570 3077
3571#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3572 case CSI_74: 3079 case CSI_74:
3573 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3574 break; 3081 break;
3575#endif 3082#endif
3576 3083
… …
3583 break; 3090 break;
3584 } 3091 }
3585} 3092}
3586/*}}} */ 3093/*}}} */
3587 3094
3588#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3589/* ARGSUSED */ 3096/* ARGSUSED */
3590void 3097void
3591rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592{ 3099{
3593 int x, y; 3100 int x, y;
3594 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3595 Window wdummy; 3102 Window wdummy;
3596 dDisp; 3103
3104 dLocal (Display *, dpy);
3597 3105
3598 if (nargs == 0) 3106 if (nargs == 0)
3599 return; 3107 return;
3600 3108
3601 switch (args[0]) 3109 switch (args[0])
3602 { 3110 {
3603 /* 3111 /*
3604 * commands 3112 * commands
3605 */ 3113 */
3606 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3607 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3608 break; 3116 break;
3609 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3610 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3611 break; 3119 break;
3612 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3613 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3614 break; 3122 break;
3615 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617 break; 3125 break;
3618 case 5: /* raise window */ 3126 case 5: /* raise window */
3619 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3620 break; 3128 break;
3621 case 6: /* lower window */ 3129 case 6: /* lower window */
3622 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3623 break; 3131 break;
3624 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3625 scr_touch (true); 3133 scr_touch (true);
3626 break; 3134 break;
3627 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3634 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3635 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3636 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3637 break; 3145 break;
3638 3146
3639
3640 /* 3147 /*
3641 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3642 */ 3149 */
3643 case 11: /* report window state */ 3150 case 11: /* report window state */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646 break; 3153 break;
3647 case 13: /* report window position */ 3154 case 13: /* report window position */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3650 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3651 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3652 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3653 break; 3160 break;
3654 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657 break; 3164 break;
3658 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3659 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660 break; 3167 break;
… …
3662 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663 break; 3170 break;
3664 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3665 { 3172 {
3666 char *s; 3173 char *s;
3667 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3668 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669 XFree (s); 3176 XFree (s);
3670 } 3177 }
3671 break; 3178 break;
3672 case 21: /* report window title */ 3179 case 21: /* report window title */
3673 { 3180 {
3674 char *s; 3181 char *s;
3675 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3676 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s); 3184 XFree (s);
3678 } 3185 }
3679 break; 3186 break;
3680 } 3187 }
3681} 3188}
… …
3708 seen_esc = true; 3215 seen_esc = true;
3709 continue; 3216 continue;
3710 } 3217 }
3711 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3712 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3713 else if (ch < 0x20) 3222 else if (ch < 0x20)
3714 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3715 3224
3716 seen_esc = false; 3225 seen_esc = false;
3717 3226
3718 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3719 // stop at some sane length 3228 // stop at some sane length
3720 return NULL; 3229 return NULL;
3721 3230
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3725 string[n++] = ch; 3231 string[n++] = ch;
3726 } 3232 }
3727 3233
3728 string[n++] = '\0'; 3234 string[n++] = '\0';
3729 3235
3730 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3781void 3287void
3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783{ 3289{
3784 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3785 { 3291 {
3786 unsigned short r, g, b; 3292 rgba c;
3787 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3788 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789 } 3301 }
3790 else 3302 else
3791 set_window_color (color, str); 3303 set_window_color (color, str);
3792} 3304}
3793 3305
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3308 */
3797void 3309void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3310rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3311{
3800 int changed = 0;
3801 int color; 3312 int color;
3802 char *buf, *name; 3313 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3315 int saveop = op;
3805 dDisp; 3316
3317 dLocal (Display *, dpy);
3806 3318
3807 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3808 switch (op) 3324 switch (op)
3809 { 3325 {
3810 case XTerm_name: 3326 case XTerm_name:
3811 set_title (str); 3327 set_title (str);
3812 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
… …
3826 unsigned long bytes_after; 3342 unsigned long bytes_after;
3827 unsigned char *value = 0; 3343 unsigned char *value = 0;
3828 const char *str = ""; 3344 const char *str = "";
3829 3345
3830 if (prop 3346 if (prop
3831 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3832 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None 3351 && actual_type != None
3836 && actual_format == 8) 3352 && actual_format == 8)
3837 str = (const char *)(value); 3353 str = (const char *)(value);
3838 3354
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3840 3356
3841 XFree (value); 3357 XFree (value);
3842 } 3358 }
3843 else 3359 else
3844 { 3360 {
… …
3848 { 3364 {
3849 *eq = 0; 3365 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3851 } 3367 }
3852 else 3368 else
3853 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3854 display->atom (str)); 3370 display->atom (str));
3855 } 3371 }
3856 break; 3372 break;
3857 3373
3858 case XTerm_Color: 3374 case XTerm_Color:
… …
3860 { 3376 {
3861 if ((name = strchr (buf, ';')) == NULL) 3377 if ((name = strchr (buf, ';')) == NULL)
3862 break; 3378 break;
3863 3379
3864 *name++ = '\0'; 3380 *name++ = '\0';
3865 color = atoi (buf); 3381 color = atoi (buf) + minCOLOR;
3866 3382
3867 if (color < 0 || color >= TOTAL_COLORS) 3383 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3868 break; 3384 break;
3869 3385
3870 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3387 *buf++ = '\0';
3872 3388
3873 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3874 {
3875 unsigned short r, g, b;
3876 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 }
3879 else
3880 set_window_color (color + minCOLOR, name);
3881 } 3390 }
3882 break; 3391 break;
3883 case XTerm_Color00: 3392 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3885 break; 3394 break;
3886 case XTerm_Color01: 3395 case XTerm_Color01:
3887 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3888 break; 3397 break;
3889#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3892 break; 3401 break;
3893#endif 3402#endif
3894 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3896 break; 3405 break;
3897 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3899 break; 3408 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_BD:
3902 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3903 break;
3904 case XTerm_Color_UL:
3905 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3906 break;
3907 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3908 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3412 break;
3413 case Rxvt_Color_BD:
3414 case URxvt_Color_BD:
3415 process_color_seq (op, Color_BD, str, resp);
3416 break;
3417 case Rxvt_Color_UL:
3418 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp);
3909 break; 3420 break;
3910 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3912 break; 3423 break;
3913#endif 3424#endif
3914#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3915 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3917 check_our_parents (); 3428 {
3918 if (am_transparent) 3429 bool changed = false;
3919 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3920 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3921#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3922 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3923 case XTerm_Pixmap: 3442 case Rxvt_Pixmap:
3924 if (*str != ';') 3443 if (!strcmp (str, "?"))
3925 { 3444 {
3926#if XPM_BACKGROUND 3445 char str[256];
3927 scale_pixmap (""); /* reset to default scaling */ 3446
3928 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3929#endif 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3930 scr_touch (true); 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3931 } 3451 }
3932 while ((str = strchr (str, ';')) != NULL) 3452 else
3933 { 3453 {
3454 int changed = 0;
3455
3456 if (*str != ';')
3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3934 str++; 3468 str++;
3935#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3936 changed += scale_pixmap (str); 3470 changed++;
3937#endif 3471 str = strchr (str, ';');
3472 }
3473 if (changed)
3474 update_background ();
3938 } 3475 }
3939
3940 if (changed)
3941 {
3942#ifdef XPM_BACKGROUND
3943 resize_pixmap ();
3944#endif
3945 scr_touch (true);
3946 }
3947 break; 3476 break;
3477#endif
3948 3478
3949 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3950 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3951 break; 3481 break;
3952 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3953 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3954 break; 3484 break;
3955 3485
3956 case XTerm_logfile: 3486 case XTerm_logfile:
3957 // TODO, when secure mode? 3487 // TODO, when secure mode?
3958 break; 3488 break;
3959 3489
3960#ifdef MENUBAR
3961 case URxvt_Menu:
3962 if (OPTION (Opt_insecure))
3963 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3964 break;
3965#endif
3966#if 0 3490#if 0
3967 case XTerm_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3968 { 3492 {
3969 int fd; 3493 int fd;
3970 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3971 { 3495 {
3972 scr_dump (fd); 3496 scr_dump (fd);
… …
3983 case URxvt_italicFont: 3507 case URxvt_italicFont:
3984 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3985#endif 3509#endif
3986 if (query) 3510 if (query)
3987 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3988 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3989 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3990 resp); 3514 resp);
3991 else 3515 else
3992 { 3516 {
3993 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3996 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3997 set_fonts (); 3521 set_fonts ();
3998 } 3522 }
3999 break; 3523 break;
4000 3524
4001#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
4002 case URxvt_locale: 3534 case URxvt_locale:
4003 if (query) 3535 if (query)
4004 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4005 else 3537 else
4006 { 3538 {
4007 set_locale (str); 3539 set_locale (str);
4008 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
4009 init_xlocale (); 3541 init_xlocale ();
4010 } 3542 }
4011 break; 3543 break;
4012 3544
4013 case URxvt_view_up: 3545 case URxvt_view_up:
… …
4024 break; 3556 break;
4025#endif 3557#endif
4026 3558
4027#if ENABLE_PERL 3559#if ENABLE_PERL
4028 case URxvt_perl: 3560 case URxvt_perl:
4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4030 ; // no responses yet 3562 ; // no responses yet
4031 break; 3563 break;
4032#endif 3564#endif
4033 } 3565 }
4034} 3566}
… …
4066 return state; 3598 return state;
4067} 3599}
4068 3600
4069/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4070void 3602void
4071rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4072{ 3604{
4073 unsigned int i, j; 3605 unsigned int i, j;
4074 int state; 3606 int state;
4075 3607
4076 static const struct 3608 static const struct
4077 { 3609 {
4078 const int argval; 3610 const int argval;
4079 const unsigned long bit; 3611 const unsigned long bit;
4080 }
4081
4082 argtopriv[] = { 3612 } argtopriv[] = {
4083 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4084 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4085 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4086 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4087 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4088 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin },
4089 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap },
4090 // 8, bi-directional support mode 3620 // 8, bi-directional support mode
4091 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
4092#ifdef menuBar_esc
4093 { menuBar_esc, PrivMode_menuBar },
4094#endif
4095 // 18, 19 printing-related 3622 // 18, 19 printing-related
4096 { 25, PrivMode_VisibleCursor }, 3623 { 25, PrivMode_VisibleCursor },
4097#ifdef scrollBar_esc 3624#ifdef scrollBar_esc
4098 { scrollBar_esc, PrivMode_scrollBar }, 3625 { scrollBar_esc, PrivMode_scrollBar },
4099#endif 3626#endif
… …
4153 scr_touch (true); 3680 scr_touch (true);
4154 break; 3681 break;
4155#endif 3682#endif
4156 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4157 case 1049: 3684 case 1049:
4158 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4159 if (mode == 0) 3686 if (mode == 0)
4160 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4161 else if (mode == 1) 3688 else if (mode == 1)
4162 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4163 break; 3690 break;
… …
4194 /* case 8: - auto repeat, can't do on a per window basis */ 3721 /* case 8: - auto repeat, can't do on a per window basis */
4195 case 9: /* X10 mouse reporting */ 3722 case 9: /* X10 mouse reporting */
4196 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4197 priv_modes &= ~PrivMode_MouseX11; 3724 priv_modes &= ~PrivMode_MouseX11;
4198 break; 3725 break;
4199#ifdef menuBar_esc
4200 case menuBar_esc:
4201#ifdef MENUBAR
4202 map_menuBar (state);
4203#endif
4204 break;
4205#endif
4206#ifdef scrollBar_esc 3726#ifdef scrollBar_esc
4207 case scrollBar_esc: 3727 case scrollBar_esc:
4208 if (scrollbar_mapping (state)) 3728 if (scrollbar_mapping (state))
4209 { 3729 {
4210 resize_all_windows (0, 0, 0); 3730 resize_all_windows (0, 0, 0);
… …
4235 break; 3755 break;
4236 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4237 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4238 break; 3758 break;
4239 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4240 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4241 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4242 scr_erase_screen (2); 3762 scr_erase_screen (2);
4243 scr_change_screen (state); 3763 scr_change_screen (state);
4244 break; 3764 break;
4245 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4246 scr_change_screen (state); 3766 scr_change_screen (state);
4247 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4248 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4249 scr_erase_screen (2); 3769 scr_erase_screen (2);
4250 break; 3770 break;
4251 default: 3771 default:
4252 break; 3772 break;
… …
4380 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4381 break; 3901 break;
4382 3902
4383 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4384 3904
4385#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4386 case 90: 3906 case 90:
4387 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4388 case 92: 3908 case 92:
4389 case 93: 3909 case 93:
4390 case 94: 3910 case 94:
… …
4455rxvt_term::tt_write (const char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4456{ 3976{
4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return; 3978 return;
4459 3979
4460 if (pty.pty < 0) 3980 if (pty->pty < 0)
4461 return; 3981 return;
4462 3982
4463 if (v_buflen == 0) 3983 if (v_buflen == 0)
4464 { 3984 {
4465 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4466 3986
4467 if ((unsigned int)written == len) 3987 if ((unsigned int)written == len)
4468 return; 3988 return;
4469 3989
4470 data += written; 3990 data += written;
… …
4479 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (EVENT_READ | EVENT_WRITE);
4480} 4000}
4481 4001
4482void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4483{ 4003{
4484 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4485 4005
4486 if (written > 0) 4006 if (written > 0)
4487 { 4007 {
4488 v_buflen -= written; 4008 v_buflen -= written;
4489 4009

Diff Legend

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