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.245 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 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);
… …
867#endif 871#endif
868 /* nil */ ; 872 /* nil */ ;
869 } 873 }
870 } 874 }
871 875
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 877 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
… …
905 { 909 {
906 const char ch = C0_ESC; 910 const char ch = C0_ESC;
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
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); 914 tt_write (kbuf, (unsigned int)len);
921} 915}
922/*}}} */
923 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 995unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 997{
930 unsigned int n, s; 998 unsigned int n, s;
931 999
… …
972 1040
973 if (want_refresh) 1041 if (want_refresh)
974 { 1042 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1044 {
977 int row = -view_start; 1045 int row = view_start;
1046 int end_row = row + nrow;
978 1047
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1049 --row;
981 1050
982 while (row < -view_start + nrow) 1051 do
983 { 1052 {
984 int start_row = row; 1053 int start_row = row;
985 line_t *l; 1054 line_t *l;
986 1055
987 do 1056 do
988 { 1057 {
989 l = &ROW (row); 1058 l = &ROW (row++);
990 1059
991 if (!(l->f & LINE_FILTERED)) 1060 if (!(l->f & LINE_FILTERED))
992 { 1061 {
993 // line not filtered, mark it as filtered 1062 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1063 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1064 while (l->is_longer ())
996 { 1065 {
997 l = &ROW (++row); 1066 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1067 l->f |= LINE_FILTERED;
999 } 1068 }
1000 1069
1001 // and filter it 1070 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1072
1004 break; 1073 break;
1005 } 1074 }
1006 } 1075 }
1007 while (l->is_longer ()); 1076 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1077 }
1078 while (row < end_row);
1011 1079 }
1012 }
1013 1080
1014 scr_refresh (refresh_type); 1081 scr_refresh ();
1015 scrollbar_show (1); 1082 scrollbar_show (1);
1016#ifdef USE_XIM 1083#ifdef USE_XIM
1017 IMSendSpot (); 1084 IMSendSpot ();
1018#endif 1085#endif
1019 } 1086 }
… …
1022} 1089}
1023 1090
1024void 1091void
1025rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1026{ 1093{
1027 SET_R (this); 1094 make_current ();
1028 SET_LOCALE (locale);
1029 1095
1030 display->flush (); 1096 display->flush ();
1031 1097
1032 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1100}
1035 1101
1036void 1102void
1037rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1038{ 1104{
1039 SET_R (this); 1105 make_current ();
1040 SET_LOCALE (locale);
1041 1106
1042 refresh_limit = 1; 1107 refresh_limit = 1;
1043 refresh_count = 0; 1108 refresh_count = 0;
1044 flush (); 1109 flush ();
1045} 1110}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1115{
1051 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1117 want_refresh = 1;
1053 1118
1054 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1120}
1056#endif 1121#endif
1057 1122
1058#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1059void 1124void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1139{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1142 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1143 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1145 }
1082} 1146}
1083#endif 1147#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1152{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1154 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1156 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1158 }
1096} 1159}
1097#endif 1160#endif
… …
1102{ 1165{
1103 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1169 {
1107 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1110 1172
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1173 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1175 }
1115} 1176}
1116#endif 1177#endif
1117 1178
1118#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1119static struct event_handler 1180static struct event_handler
1120{ 1181{
1121 check_watcher cw_yield; 1182 check_watcher yield_ev;
1122 1183
1123 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1124 { 1185 {
1125 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1126 w.stop (); 1194 w.stop ();
1127 } 1195 }
1128 1196
1129 event_handler () 1197 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1131 { 1199 {
1132 } 1200 }
1133} event_handler; 1201} event_handler;
1134#endif 1202#endif
1135 1203
… …
1146 1214
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1150 1218
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1220
1153 if (r > 0) 1221 if (r > 0)
1154 { 1222 {
1155 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1156 return true; 1224 return true;
1157 } 1225 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1227 {
1160#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1161 if (display->is_local) 1229 if (display->is_local)
1162 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1163#endif 1231#endif
1164 } 1232 }
1165 else 1233 else
1166 { 1234 {
1167 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1174} 1242}
1175 1243
1176void 1244void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1246{
1179 SET_R (this); 1247 make_current ();
1180 SET_LOCALE (locale);
1181 1248
1182 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1251 while (pty_fill ())
1185 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1190} 1257}
1191 1258
1192void 1259void
1193rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1194{ 1261{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1263 recolour_cursor ();
1197 1264
1198#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1266 hidden_pointer = 0;
1200 1267
… …
1208rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1209{ 1276{
1210 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1211 return; 1278 return;
1212 1279
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1281 XFlush (dpy);
1215 1282
1216 hidden_pointer = 1; 1283 hidden_pointer = 1;
1217} 1284}
1218 1285
1219void 1286void
1220rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1221{ 1288{
1222 SET_R (this); 1289 make_current ();
1223 SET_LOCALE (locale);
1224 1290
1225 pointer_blank (); 1291 pointer_blank ();
1226} 1292}
1227#endif 1293#endif
1228 1294
… …
1293 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1294 (32 + x + 1), 1360 (32 + x + 1),
1295 (32 + y + 1)); 1361 (32 + y + 1));
1296} 1362}
1297 1363
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 */ 1364/*{{{ process an X event */
1309void 1365void
1310rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1311{ 1367{
1312 dDisp; 1368 make_current ();
1313 1369
1314 SET_R (this); 1370 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1371
1317#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1375 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1376
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // 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; 1378 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1380 unsigned int unused_mask;
1347 1381
1348 switch (ev.type) 1382 switch (ev.type)
1349 { 1383 {
1350 case KeyPress: 1384 case KeyPress:
1351#if ISO_14755 1385 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1386 break;
1357 1387
1358 case KeyRelease: 1388 case KeyRelease:
1359 { 1389 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1390 break;
1431 }
1432 1391
1433 case ButtonPress: 1392 case ButtonPress:
1434 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1435 break; 1394 break;
1436 1395
… …
1438 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1439 break; 1398 break;
1440 1399
1441 case ClientMessage: 1400 case ClientMessage:
1442 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1411 destroy ();
1412 }
1447#if ENABLE_EWMH 1413#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1452#endif 1429#endif
1453 } 1430 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break; 1431 break;
1490 1432
1491 case MappingNotify: 1433 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1435 break;
… …
1516 break; 1458 break;
1517 } 1459 }
1518 break; 1460 break;
1519 1461
1520 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1466 focus_in ();
1522 break; 1467 break;
1523 1468
1524 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1473 focus_out ();
1526 break; 1474 break;
1527 1475
1528 case ConfigureNotify: 1476 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1530 { 1478 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1480 ;
1533 1481
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1483 {
1536 seen_resize = 1; 1484 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1486 }
1539 1487
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1541 if (OPTION (Opt_transparent)) 1491 if (OPTION (Opt_transparent))
1542 check_our_parents (); 1492 check_our_parents ();
1543#endif 1493#endif
1544 } 1494 }
1545 break; 1495 break;
1546 1496
1547 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1502
1552 break; 1503 break;
1553 1504
1554 case SelectionClear: 1505 case SelectionClear:
1555 selection_clear (); 1506 selection_clear ();
… …
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1512 break;
1562 1513
1563 case SelectionRequest: 1514 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1516 break;
1517
1518 case MapNotify:
1519 mapped = 1;
1520#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1522#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1524 break;
1566 1525
1567 case UnmapNotify: 1526 case UnmapNotify:
1568 mapped = 0; 1527 mapped = 0;
1569#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1571#endif 1530#endif
1572 break; 1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break; 1532 break;
1580 1533
1581#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1582 case ReparentNotify: 1535 case ReparentNotify:
1583 rootwin_cb (ev); 1536 rootwin_cb (ev);
… …
1589 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1590 { 1543 {
1591 do 1544 do
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595 1548
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1550
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1601 1554
1602 scr_refresh (refresh_type); 1555 want_refresh = 1;
1603 } 1556 }
1604 else 1557 else
1605 { 1558 {
1606 XEvent unused_event; 1559 XEvent unused_event;
1607 1560
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609 ; 1562 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1564 ;
1612 1565
1613 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1614 { 1567 {
1615 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1616 scrollbar_show (0); 1569 scrollbar_show (0);
1617 } 1570 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622 1571
1623#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1626#endif 1575#endif
1627 } 1576 }
1628 break; 1577 break;
1629 1578
1630 case MotionNotify: 1579 case MotionNotify:
1631#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1581 if (hidden_pointer)
1633 pointer_unblank (); 1582 pointer_unblank ();
1634#endif 1583#endif
1635#if MENUBAR
1636 if (isMenuBarWindow (ev.xany.window))
1637 {
1638 menubar_control (ev.xbutton);
1639 break;
1640 }
1641#endif
1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1585 break;
1644 1586
1645 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1646 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1591 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1593 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652 ; 1595 ;
1653 1596
1654 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1655 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1601 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1723#endif 1666#endif
1724 } 1667 }
1725 } 1668 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727 { 1670 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1730 ; 1673 ;
1731 1674
1732 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1733 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1679 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1681 scrollbar_size ());
1739 scr_refresh (refresh_type); 1682 want_refresh = 1;
1740 refresh_limit = 0; 1683 refresh_limit = 0;
1741 scrollbar_show (1); 1684 scrollbar_show (1);
1742 } 1685 }
1743 break; 1686 break;
1744 } 1687 }
1688
1689#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1745} 1715}
1746 1716
1747void 1717void
1748rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1749{ 1719{
1750 if (!focus) 1720 if (!focus)
1751 { 1721 {
1752 focus = 1; 1722 focus = 1;
1753 want_refresh = 1; 1723 want_refresh = 1;
1754 1724
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 1726
1757#if USE_XIM 1727#if USE_XIM
1758 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1759 { 1729 {
1760 IMSetStatusPosition (); 1730 IMSetPosition ();
1761 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1762 } 1732 }
1763#endif 1733#endif
1764#if CURSOR_BLINK 1734#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767#endif 1737#endif
1768#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1770 { 1740 {
1771 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
1811 } 1781 }
1812#endif 1782#endif
1813 } 1783 }
1814} 1784}
1815 1785
1816#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1817void 1800void
1818rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1802{
1820 SET_R (this); 1803 make_current ();
1821 SET_LOCALE (locale);
1822 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1823 switch (ev.type) 1810 switch (ev.type)
1824 { 1811 {
1825 case PropertyNotify: 1812 case PropertyNotify:
1826 /* 1813 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1835 case ReparentNotify: 1822 case ReparentNotify:
1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1838 break; 1825 break;
1839 } 1826 }
1827# endif
1840} 1828}
1841#endif 1829#endif
1842 1830
1843void 1831void
1844rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1853 /* 1841 /*
1854 * VT window processing of button press 1842 * VT window processing of button press
1855 */ 1843 */
1856 if (ev.window == vt) 1844 if (ev.window == vt)
1857 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1858#if ISO_14755 1849#if ISO_14755
1859 // 5.4 1850 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1852 {
1862 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1904 else 1895 else
1905 { 1896 {
1906 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1908 1899
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1900 switch (ev.button)
1911 { 1901 {
1912 case Button1: 1902 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1907#else
1918 selection.rect = false; 1908 selection.rect = false;
1919#endif 1909#endif
1920 1910
1921 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1913 {
1924 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1926 else 1916 else
1927 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1928 } 1918 }
1929 else 1919 else
1930 { 1920 {
1931 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1922 MEvent.clicks++;
1933 else 1923 else
1934 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1935 1925
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1927 }
1938 1928
1939 MEvent.button = Button1; 1929 MEvent.button = Button1;
1940 break; 1930 break;
1941 1931
1942 case Button3: 1932 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1945 else 1935 else
1946 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1947 1937
1948 MEvent.button = Button3; 1938 MEvent.button = Button3;
1949 break; 1939 break;
1950 } 1940 }
1951 } 1941 }
1952 1942
1953 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1954 return; 1944 return;
1955 } 1945 }
1956 1946
… …
2095 } 2085 }
2096 } 2086 }
2097 2087
2098 return; 2088 return;
2099 } 2089 }
2100
2101#if MENUBAR
2102 /*
2103 * Menubar window processing of button press
2104 */
2105 if (isMenuBarWindow (ev.window))
2106 menubar_control (ev);
2107#endif
2108} 2090}
2109 2091
2110void 2092void
2111rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2112{ 2094{
… …
2118 2100
2119 if (scrollbar_isUpDn ()) 2101 if (scrollbar_isUpDn ())
2120 { 2102 {
2121 scrollBar.setIdle (); 2103 scrollBar.setIdle ();
2122 scrollbar_show (0); 2104 scrollbar_show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2105 }
2127 2106
2128#ifdef SELECTION_SCROLLING 2107#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active) 2108 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2131#endif 2110#endif
2132 2111
2133 if (ev.window == vt) 2112 if (ev.window == vt)
2134 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2135#if ISO_14755 2117#if ISO_14755
2136 // 5.4 2118 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2120 return;
2139#endif 2121#endif
2122
2140 if (reportmode) 2123 if (reportmode)
2141 { 2124 {
2142 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2127 if (ev.button >= 4)
… …
2168 if (priv_modes & PrivMode_mouse_report 2151 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2152 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2153 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2154 selection_extend (ev.x, ev.y, 0);
2172 2155
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2156 switch (ev.button)
2177 { 2157 {
2178 case Button1: 2158 case Button1:
2179 case Button3: 2159 case Button3:
2180 selection_make (ev.time); 2160 selection_make (ev.time);
2181 break; 2161 break;
2162
2182 case Button2: 2163 case Button2:
2183 selection_request (ev.time, ev.x, ev.y); 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2184 break; 2166 break;
2167
2185#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2186 case Button4: 2169 case Button4:
2187 case Button5: 2170 case Button5:
2188 { 2171 {
2189 int i; 2172 int i;
… …
2211 slip_wheel_ev.start (); 2194 slip_wheel_ev.start ();
2212 } 2195 }
2213 else 2196 else
2214 { 2197 {
2215# endif 2198# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2199 scr_page (v, i);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2200 scrollbar_show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2229 } 2202 }
2230#endif 2203# endif
2231 } 2204 }
2232 break; 2205 break;
2233#endif 2206#endif
2234 } 2207 }
2235 } 2208 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2209}
2241 2210
2242#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2243#if TINTING 2212#if TINTING
2244/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2245 2214
2246typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2247 2216
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{ 2218{
2250 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i; 2224 int i;
2256 2225
2257 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2258 2227
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260 2229
2261 /* for convenience */ 2230 /* for convenience */
2262 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2483 Atom atype; 2452 Atom atype;
2484 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2485 Window root, oldp, *list; 2454 Window root, oldp, *list;
2486 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2489 2457
2490 pchanged = 0; 2458 pchanged = 0;
2491 2459
2492 if (!OPTION (Opt_transparent)) 2460 if (!OPTION (Opt_transparent))
2493 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2494 2462
2495 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2497 2465
2498 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2499 2467
2500 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2501 { 2469 {
2502 if (am_transparent) 2470 if (am_transparent)
2503 { 2471 {
2504 pchanged = 1; 2472 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2507 } 2475 }
2508 2476
2509 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2510 } 2478 }
2511 2479
2512 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False); 2481 XSync (dpy, False);
2514 2482
2515 /* 2483 /*
2516 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2519 */ 2487 */
2520 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2524 2492
2525 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2530 2498
2531 if (!i || prop == NULL 2499 if (!i || prop == NULL
2532#if TINTING 2500#if TINTING
2533 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2534#endif 2502#endif
2535 ) 2503 )
2536 have_pixmap = 0; 2504 have_pixmap = 0;
2537 else 2505 else
2538 { 2506 {
… …
2551 Window cr; 2519 Window cr;
2552 XImage *image; 2520 XImage *image;
2553 GC gc; 2521 GC gc;
2554 XGCValues gcvalue; 2522 XGCValues gcvalue;
2555 2523
2556 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2560 nx = ny = 0; 2528 nx = ny = 0;
2561 2529
… …
2574 } 2542 }
2575 2543
2576 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578 2546
2579 XSync (disp, False); 2547 XSync (dpy, False);
2580 allowedxerror = -1; 2548 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582 2550
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2585 allowedxerror = 0; 2553 allowedxerror = 0;
2586 2554
… …
2589 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2590 { 2558 {
2591 pchanged = 1; 2559 pchanged = 1;
2592 if (pixmap != None) 2560 if (pixmap != None)
2593 { 2561 {
2594 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2595 pixmap = None; 2563 pixmap = None;
2596 } 2564 }
2597 } 2565 }
2598 2566
2599 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2600 } 2568 }
2601 else 2569 else
2602 { 2570 {
2603 if (pixmap != None) 2571 if (pixmap != None)
2604 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2605 2573
2606#if TINTING 2574#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2608 { 2576 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611 2578
2579 rgba c;
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2613 2581
2614 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2615 } 2583 }
2616#endif 2584#endif
2617 2585
2618 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2624 XDestroyImage (image); 2591 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2627 2594
2628 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1; 2596 pchanged = 1;
2630 2597
2631 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2632 } 2599 }
2633 } 2600 }
2634 2601
2635 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2637 else 2604 else
2638 { 2605 {
2639 unsigned int n; 2606 unsigned int n;
2640 /* 2607 /*
2641 * InheritPixmap transparency 2608 * InheritPixmap transparency
2642 */ 2609 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 { 2611 {
2645 oldp = parent[i]; 2612 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2647 &parent[i], &list, &n);
2648 XFree (list); 2614 XFree (list);
2649 2615
2650 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2651 { 2617 {
2652 if (oldp != None) 2618 if (oldp != None)
… …
2660 } 2626 }
2661 2627
2662 n = 0; 2628 n = 0;
2663 2629
2664 if (pchanged) 2630 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2667 { 2632 {
2668 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 { 2636 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break; 2638 break;
2673 } 2639 }
2674 } 2640 }
2675 }
2676 2641
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2678 { 2643 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0; 2646 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2683 } 2648 }
2684 else 2649 else
2685 { 2650 {
2686#if WAIT_FOR_WM
2687 /* wait (an arbitrary period) for the WM to do its thing
2688 * needed for fvwm2.2.2 (and before?) */
2689 sleep (1);
2690#endif
2691 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2692 { 2652 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2695 } 2655 }
2696 2656
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2698 am_transparent = 1; 2658 am_transparent = 1;
2699 } 2659 }
2700 2660
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None; 2662 parent[i] = None;
2703 } 2663 }
2704 2664
2705 if (scrollBar.win) 2665 if (scrollBar.win)
2706 { 2666 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2709 scrollbar_show (0); 2669 scrollbar_show (0);
2710 } 2670 }
2711 2671
2712 if (am_transparent) 2672 if (am_transparent)
… …
2787 } 2747 }
2788 2748
2789 // scr_add_lines only works for nlines <= nrow - 1. 2749 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2750 if (nlines >= nrow - 1)
2791 { 2751 {
2752 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2753 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2754 scr_add_lines (buf, str - buf, nlines);
2794 2755
2795 nlines = 0; 2756 nlines = 0;
2796 str = buf; 2757 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2758 eol = str + min (ncol, UBUFSIZ);
… …
2812 2773
2813 seq_begin = cmdbuf_ptr; 2774 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2775 ch = next_char ();
2815 } 2776 }
2816 2777
2778 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818 scr_add_lines (buf, str - buf, nlines); 2780 scr_add_lines (buf, str - buf, nlines);
2819 2781
2820 /* 2782 /*
2821 * If there have been a lot of new lines, then update the screen 2783 * If there have been a lot of new lines, then update the screen
2822 * What the heck I'll cheat and only refresh less than every page-full. 2784 * What the heck I'll cheat and only refresh less than every page-full.
… …
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++; 2791 refresh_limit++;
2830 else 2792 else
2831 { 2793 {
2832 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2833 scr_refresh (refresh_type); 2796 scr_refresh ();
2834 flush_ev.stop (); 2797 want_refresh = 1;
2835 } 2798 }
2836 } 2799 }
2837 2800
2838 } 2801 }
2839 else 2802 else
… …
2856 return flag; 2819 return flag;
2857} 2820}
2858 2821
2859// read the next character 2822// read the next character
2860wchar_t 2823wchar_t
2861rxvt_term::next_char () 2824rxvt_term::next_char () NOTHROW
2862{ 2825{
2863 while (cmdbuf_ptr < cmdbuf_endp) 2826 while (cmdbuf_ptr < cmdbuf_endp)
2864 { 2827 {
2865 // assume 7-bit to be ascii ALWAYS 2828 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2887 return NOCHAR; 2850 return NOCHAR;
2888} 2851}
2889 2852
2890// read the next octet 2853// read the next octet
2891uint32_t 2854uint32_t
2892rxvt_term::next_octet () 2855rxvt_term::next_octet () NOTHROW
2893{ 2856{
2894 return cmdbuf_ptr < cmdbuf_endp 2857 return cmdbuf_ptr < cmdbuf_endp
2895 ? *cmdbuf_ptr++ 2858 ? (unsigned char)*cmdbuf_ptr++
2896 : NOCHAR; 2859 : NOCHAR;
2897} 2860}
2861
2862static class out_of_input out_of_input;
2898 2863
2899/* rxvt_cmd_getc () - Return next input character */ 2864/* rxvt_cmd_getc () - Return next input character */
2900/* 2865/*
2901 * Return the next input character after first passing any keyboard input 2866 * Return the next input character after first passing any keyboard input
2902 * to the command. 2867 * to the command.
2903 */ 2868 */
2904wchar_t 2869wchar_t
2905rxvt_term::cmd_getc () 2870rxvt_term::cmd_getc () THROW ((class out_of_input))
2906{ 2871{
2907 wchar_t c = next_char (); 2872 wchar_t c = next_char ();
2908 2873
2909 if (c == NOCHAR) 2874 if (c == NOCHAR)
2910 throw out_of_input; 2875 throw out_of_input;
2911 2876
2912 return c; 2877 return c;
2913} 2878}
2914 2879
2915uint32_t 2880uint32_t
2916rxvt_term::cmd_get8 () 2881rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 2882{
2918 uint32_t c = next_octet (); 2883 uint32_t c = next_octet ();
2919 2884
2920 if (c == NOCHAR) 2885 if (c == NOCHAR)
2921 throw out_of_input; 2886 throw out_of_input;
… …
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 3125 break;
3161 case '+': 3126 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 3128 break;
3164#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3165 case '6': 3130 case '6':
3166 scr_backindex (); 3131 scr_backindex ();
3167 break; 3132 break;
3168#endif 3133#endif
3169 case '7': 3134 case '7':
3170 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3171 break; 3136 break;
3172 case '8': 3137 case '8':
3173 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3174 break; 3139 break;
3175#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3176 case '9': 3141 case '9':
3177 scr_forwardindex (); 3142 scr_forwardindex ();
3178 break; 3143 break;
3179#endif 3144#endif
3180 case '=': 3145 case '=':
… …
3342 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 3309 if (arg[p] == -1)
3345 arg[p] = ndef; 3310 arg[p] = ndef;
3346 3311
3347#ifdef DEBUG_CMD
3348 fprintf (stderr, "CSI ");
3349 for (p = 0; p < nargs; p++)
3350 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351 fprintf (stderr, "%c\n", ch);
3352#endif
3353
3354 /* 3312 /*
3355 * private mode handling 3313 * private mode handling
3356 */ 3314 */
3357 if (priv) 3315 if (priv)
3358 { 3316 {
3359 switch (priv) 3317 switch (priv)
3360 { 3318 {
3361 case '>': 3319 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3364 break; 3331 break;
3365 case '?': 3332 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 3335 break;
… …
3571 break; 3538 break;
3572 case CSI_75: 3539 case CSI_75:
3573 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3574 break; 3541 break;
3575 3542
3576#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3577 case CSI_74: 3544 case CSI_74:
3578 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3579 break; 3546 break;
3580#endif 3547#endif
3581 3548
… …
3588 break; 3555 break;
3589 } 3556 }
3590} 3557}
3591/*}}} */ 3558/*}}} */
3592 3559
3593#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3594/* ARGSUSED */ 3561/* ARGSUSED */
3595void 3562void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3564{
3598 int x, y; 3565 int x, y;
3599 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3600 Window wdummy; 3567 Window wdummy;
3601 dDisp; 3568
3569 dLocal (Display *, dpy);
3602 3570
3603 if (nargs == 0) 3571 if (nargs == 0)
3604 return; 3572 return;
3605 3573
3606 switch (args[0]) 3574 switch (args[0])
3607 { 3575 {
3608 /* 3576 /*
3609 * commands 3577 * commands
3610 */ 3578 */
3611 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3613 break; 3581 break;
3614 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3616 break; 3584 break;
3617 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3619 break; 3587 break;
3620 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3590 break;
3623 case 5: /* raise window */ 3591 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3625 break; 3593 break;
3626 case 6: /* lower window */ 3594 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3628 break; 3596 break;
3629 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3630 scr_touch (true); 3598 scr_touch (true);
3631 break; 3599 break;
3632 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3639 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3641 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3642 break; 3610 break;
3643 3611
3644
3645 /* 3612 /*
3646 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3647 */ 3614 */
3648 case 11: /* report window state */ 3615 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3618 break;
3652 case 13: /* report window position */ 3619 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3625 break;
3659 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3629 break;
3663 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3632 break;
… …
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3635 break;
3669 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3670 { 3637 {
3671 char *s; 3638 char *s;
3672 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s); 3641 XFree (s);
3675 } 3642 }
3676 break; 3643 break;
3677 case 21: /* report window title */ 3644 case 21: /* report window title */
3678 { 3645 {
3679 char *s; 3646 char *s;
3680 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s); 3649 XFree (s);
3683 } 3650 }
3684 break; 3651 break;
3685 } 3652 }
… …
3713 seen_esc = true; 3680 seen_esc = true;
3714 continue; 3681 continue;
3715 } 3682 }
3716 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3717 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3718 else if (ch < 0x20) 3687 else if (ch < 0x20)
3719 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3720 3689
3721 seen_esc = false; 3690 seen_esc = false;
3722 3691
3723 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3724 // stop at some sane length 3693 // stop at some sane length
3725 return NULL; 3694 return NULL;
3726 3695
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
3730 string[n++] = ch; 3696 string[n++] = ch;
3731 } 3697 }
3732 3698
3733 string[n++] = '\0'; 3699 string[n++] = '\0';
3734 3700
3735 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3786void 3752void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{ 3754{
3789 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3790 { 3756 {
3791 unsigned short r, g, b; 3757 rgba c;
3792 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794 } 3766 }
3795 else 3767 else
3796 set_window_color (color, str); 3768 set_window_color (color, str);
3797} 3769}
3798 3770
… …
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3773 */
3802void 3774void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3775rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804{ 3776{
3805 int changed = 0;
3806 int color; 3777 int color;
3807 char *buf, *name; 3778 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3780 int saveop = op;
3810 dDisp; 3781
3782 dLocal (Display *, dpy);
3811 3783
3812 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3813 switch (op) 3789 switch (op)
3814 { 3790 {
3815 case XTerm_name: 3791 case XTerm_name:
3816 set_title (str); 3792 set_title (str);
3817 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3831 unsigned long bytes_after; 3807 unsigned long bytes_after;
3832 unsigned char *value = 0; 3808 unsigned char *value = 0;
3833 const char *str = ""; 3809 const char *str = "";
3834 3810
3835 if (prop 3811 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3816 && actual_type != None
3841 && actual_format == 8) 3817 && actual_format == 8)
3842 str = (const char *)(value); 3818 str = (const char *)(value);
3843 3819
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3845 3821
3846 XFree (value); 3822 XFree (value);
3847 } 3823 }
3848 else 3824 else
3849 { 3825 {
… …
3853 { 3829 {
3854 *eq = 0; 3830 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3856 } 3832 }
3857 else 3833 else
3858 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3859 display->atom (str)); 3835 display->atom (str));
3860 } 3836 }
3861 break; 3837 break;
3862 3838
3863 case XTerm_Color: 3839 case XTerm_Color:
… …
3865 { 3841 {
3866 if ((name = strchr (buf, ';')) == NULL) 3842 if ((name = strchr (buf, ';')) == NULL)
3867 break; 3843 break;
3868 3844
3869 *name++ = '\0'; 3845 *name++ = '\0';
3870 color = atoi (buf); 3846 color = atoi (buf) + minCOLOR;
3871 3847
3872 if (color < 0 || color >= TOTAL_COLORS) 3848 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 3849 break;
3874 3850
3875 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 3852 *buf++ = '\0';
3877 3853
3878 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3879 {
3880 unsigned short r, g, b;
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883 }
3884 else
3885 set_window_color (color + minCOLOR, name);
3886 } 3855 }
3887 break; 3856 break;
3888 case XTerm_Color00: 3857 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3890 break; 3859 break;
3891 case XTerm_Color01: 3860 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3893 break; 3862 break;
3894#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3897 break; 3866 break;
3898#endif 3867#endif
3899 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3901 break; 3870 break;
3902 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3904 break; 3873 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3906 case XTerm_Color_BD:
3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908 break;
3909 case XTerm_Color_UL:
3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911 break;
3912 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3877 break;
3878 case Rxvt_Color_BD:
3879 case URxvt_Color_BD:
3880 process_color_seq (op, Color_BD, str, resp);
3881 break;
3882 case Rxvt_Color_UL:
3883 case URxvt_Color_UL:
3884 process_color_seq (op, Color_UL, str, resp);
3914 break; 3885 break;
3915 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3917 break; 3888 break;
3918#endif 3889#endif
3919#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3922 check_our_parents (); 3894 check_our_parents ();
3895
3923 if (am_transparent) 3896 if (am_transparent)
3924 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927 3898
3899 break;
3900#endif
3901
3928 case XTerm_Pixmap: 3902 case Rxvt_Pixmap:
3903 {
3929 if (*str != ';') 3904 if (*str != ';')
3930 { 3905 {
3931#if XPM_BACKGROUND 3906#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */ 3907 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */ 3908 set_bgPixmap (str); /* change pixmap */
3934#endif
3935 scr_touch (true); 3909 scr_touch (true);
3910#endif
3936 } 3911 }
3912
3913 int changed = 0;
3914
3937 while ((str = strchr (str, ';')) != NULL) 3915 while ((str = strchr (str, ';')) != NULL)
3938 { 3916 {
3939 str++; 3917 str++;
3940#if XPM_BACKGROUND 3918#if XPM_BACKGROUND
3941 changed += scale_pixmap (str); 3919 changed += scale_pixmap (str);
3942#endif 3920#endif
3943 } 3921 }
3944 3922
3945 if (changed) 3923 if (changed)
3946 { 3924 {
3947#ifdef XPM_BACKGROUND 3925#ifdef XPM_BACKGROUND
3948 resize_pixmap (); 3926 resize_pixmap ();
3949#endif
3950 scr_touch (true); 3927 scr_touch (true);
3928#endif
3951 } 3929 }
3930 }
3952 break; 3931 break;
3953 3932
3954 case XTerm_restoreFG: 3933 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3934 set_window_color (Color_fg, str);
3956 break; 3935 break;
3957 case XTerm_restoreBG: 3936 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str); 3937 set_window_color (Color_bg, str);
3959 break; 3938 break;
3960 3939
3961 case XTerm_logfile: 3940 case XTerm_logfile:
3962 // TODO, when secure mode? 3941 // TODO, when secure mode?
3963 break; 3942 break;
3964 3943
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3944#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 3945 case Rxvt_dumpscreen: /* no error notices */
3973 { 3946 {
3974 int fd; 3947 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3948 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 { 3949 {
3977 scr_dump (fd); 3950 scr_dump (fd);
… …
4001 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
4002 set_fonts (); 3975 set_fonts ();
4003 } 3976 }
4004 break; 3977 break;
4005 3978
4006#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3988 case URxvt_locale:
4008 if (query) 3989 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010 else 3991 else
4011 { 3992 {
4012 set_locale (str); 3993 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3995 init_xlocale ();
4015 } 3996 }
4016 break; 3997 break;
4017 3998
4018 case URxvt_view_up: 3999 case URxvt_view_up:
… …
4029 break; 4010 break;
4030#endif 4011#endif
4031 4012
4032#if ENABLE_PERL 4013#if ENABLE_PERL
4033 case URxvt_perl: 4014 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 4016 ; // no responses yet
4036 break; 4017 break;
4037#endif 4018#endif
4038 } 4019 }
4039} 4020}
… …
4071 return state; 4052 return state;
4072} 4053}
4073 4054
4074/* we're not using priv _yet_ */ 4055/* we're not using priv _yet_ */
4075void 4056void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4057rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 4058{
4078 unsigned int i, j; 4059 unsigned int i, j;
4079 int state; 4060 int state;
4080 4061
4081 static const struct 4062 static const struct
… …
4092 { 5, PrivMode_rVideo }, 4073 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 4074 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 4075 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 4076 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 4077 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 4078 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 4079 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 4080#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 4081 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 4082#endif
… …
4151 /* extra handling for values with state unkept */ 4129 /* extra handling for values with state unkept */
4152 switch (arg[i]) 4130 switch (arg[i])
4153 { 4131 {
4154#if ENABLE_STYLES 4132#if ENABLE_STYLES
4155 case 1021: 4133 case 1021:
4156 if (mode) 4134 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 4135
4161 scr_touch (true); 4136 scr_touch (true);
4162 break; 4137 break;
4163#endif 4138#endif
4164 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
… …
4186 case 3: /* 80/132 */ 4161 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 4162 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 4163 set_widthheight (((state ? 132 : 80) * fwidth), height);
4189 break; 4164 break;
4190 case 4: /* smooth scrolling */ 4165 case 4: /* smooth scrolling */
4191 if (!state) 4166 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 4167 break;
4196 case 5: /* reverse video */ 4168 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 4169 scr_rvideo_mode (state);
4198 break; 4170 break;
4199 case 6: /* relative/absolute origins */ 4171 case 6: /* relative/absolute origins */
… …
4205 /* case 8: - auto repeat, can't do on a per window basis */ 4177 /* case 8: - auto repeat, can't do on a per window basis */
4206 case 9: /* X10 mouse reporting */ 4178 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 4179 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 4180 priv_modes &= ~PrivMode_MouseX11;
4209 break; 4181 break;
4210#ifdef menuBar_esc
4211 case menuBar_esc:
4212#ifdef MENUBAR
4213 map_menuBar (state);
4214#endif
4215 break;
4216#endif
4217#ifdef scrollBar_esc 4182#ifdef scrollBar_esc
4218 case scrollBar_esc: 4183 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 4184 if (scrollbar_mapping (state))
4220 { 4185 {
4221 resize_all_windows (0, 0, 0); 4186 resize_all_windows (0, 0, 0);
… …
4240#if 0 4205#if 0
4241 case 1001: 4206 case 1001:
4242 break; /* X11 mouse highlighting */ 4207 break; /* X11 mouse highlighting */
4243#endif 4208#endif
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 4209 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 4210 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 4211 break;
4250 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4251 if (state) 4213 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 4214 break;
4256 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 4216 if (OPTION (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 4218 scr_erase_screen (2);
… …
4397 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4398 break; 4357 break;
4399 4358
4400 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4401 4360
4402#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4403 case 90: 4362 case 90:
4404 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4405 case 92: 4364 case 92:
4406 case 93: 4365 case 93:
4407 case 94: 4366 case 94:
… …
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4428const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470 4429
4471void 4430void
4472rxvt_term::tt_write (const char *data, unsigned int len) 4431rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 4432{
4474 if (pty.pty < 0) 4433 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 4434 return;
4476 4435
4436 if (pty->pty < 0)
4437 return;
4438
4477 if (v_buflen == 0) 4439 if (v_buflen == 0)
4478 { 4440 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4441 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480 4442
4481 if ((unsigned int)written == len) 4443 if ((unsigned int)written == len)
4482 return; 4444 return;
4483 4445
4484 data += written; 4446 data += written;
… …
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 4455 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494} 4456}
4495 4457
4496void rxvt_term::pty_write () 4458void rxvt_term::pty_write ()
4497{ 4459{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499 4461
4500 if (written > 0) 4462 if (written > 0)
4501 { 4463 {
4502 v_buflen -= written; 4464 v_buflen -= written;
4503 4465

Diff Legend

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