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

Diff Legend

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