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.311 by root, Sat Mar 4 20:14:35 2006 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_STRING_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 && 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; 1390 break;
1430 }
1431 1391
1432 case ButtonPress: 1392 case ButtonPress:
1433 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1434 break; 1394 break;
1435 1395
… …
1437 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1438 break; 1398 break;
1439 1399
1440 case ClientMessage: 1400 case ClientMessage:
1441 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 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 {
1444 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)))
1445 destroy (); 1411 destroy ();
1412 }
1446#if ENABLE_EWMH 1413#if ENABLE_EWMH
1447 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])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &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 }
1451#endif 1429#endif
1452 } 1430 }
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; 1431 break;
1489 1432
1490 case MappingNotify: 1433 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1435 break;
… …
1525 break; 1468 break;
1526 1469
1527 case ConfigureNotify: 1470 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1529 { 1472 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1474 ;
1532 1475
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1477 {
1535 seen_resize = 1; 1478 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1480 }
1538 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1541 check_our_parents (); 1486 check_our_parents ();
1542#endif 1487#endif
1543 } 1488 }
1544 break; 1489 break;
1545 1490
1546 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1496
1551 break; 1497 break;
1552 1498
1553 case SelectionClear: 1499 case SelectionClear:
1554 selection_clear (); 1500 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1506 break;
1561 1507
1562 case SelectionRequest: 1508 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1510 break;
1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1518 break;
1565 1519
1566 case UnmapNotify: 1520 case UnmapNotify:
1567 mapped = 0; 1521 mapped = 0;
1568#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1570#endif 1524#endif
1571 break; 1525 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; 1526 break;
1579 1527
1580#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1581 case ReparentNotify: 1529 case ReparentNotify:
1582 rootwin_cb (ev); 1530 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1589 { 1537 {
1590 do 1538 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1594 1542
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1544
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1600 1548
1601 scr_refresh (refresh_type); 1549 want_refresh = 1;
1602 } 1550 }
1603 else 1551 else
1604 { 1552 {
1605 XEvent unused_event; 1553 XEvent unused_event;
1606 1554
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1608 ; 1556 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1558 ;
1611 1559
1612 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1613 { 1561 {
1614 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1615 scrollbar_show (0); 1563 scrollbar_show (0);
1616 } 1564 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1565
1622#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1625#endif 1569#endif
1626 } 1570 }
1627 break; 1571 break;
1628 1572
1629 case MotionNotify: 1573 case MotionNotify:
1630#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1575 if (hidden_pointer)
1632 pointer_unblank (); 1576 pointer_unblank ();
1633#endif 1577#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) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1579 break;
1643 1580
1644 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1645 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1585 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1587 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1651 ; 1589 ;
1652 1590
1653 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1654 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1595 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1722#endif 1660#endif
1723 } 1661 }
1724 } 1662 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1664 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1728 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1729 ; 1667 ;
1730 1668
1731 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1732 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1673 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1675 scrollbar_size ());
1738 scr_refresh (refresh_type); 1676 want_refresh = 1;
1739 refresh_limit = 0; 1677 refresh_limit = 0;
1740 scrollbar_show (1); 1678 scrollbar_show (1);
1741 } 1679 }
1742 break; 1680 break;
1743 } 1681 }
1682
1683#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1685 {
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif
1695
1696#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 {
1699 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease)
1702 if (hidden_pointer)
1703 pointer_unblank ();
1704
1705 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank ();
1707 }
1708#endif
1744} 1709}
1745 1710
1746void 1711void
1747rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1748{ 1713{
1749 if (!focus) 1714 if (!focus)
1750 { 1715 {
1751 focus = 1; 1716 focus = 1;
1752 want_refresh = 1; 1717 want_refresh = 1;
1753 1718
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1755 1720
1756#if USE_XIM 1721#if USE_XIM
1757 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1758 { 1723 {
1759 IMSetStatusPosition (); 1724 IMSetPosition ();
1760 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1761 } 1726 }
1762#endif 1727#endif
1763#if CURSOR_BLINK 1728#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1731#endif
1767#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1769 { 1734 {
1770 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
… …
1814 1779
1815#if TRANSPARENT 1780#if TRANSPARENT
1816void 1781void
1817rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1783{
1819 SET_R (this); 1784 make_current ();
1820 SET_LOCALE (locale);
1821 1785
1822 switch (ev.type) 1786 switch (ev.type)
1823 { 1787 {
1824 case PropertyNotify: 1788 case PropertyNotify:
1825 /* 1789 /*
… …
1852 /* 1816 /*
1853 * VT window processing of button press 1817 * VT window processing of button press
1854 */ 1818 */
1855 if (ev.window == vt) 1819 if (ev.window == vt)
1856 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1857#if ISO_14755 1824#if ISO_14755
1858 // 5.4 1825 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1827 {
1861 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1875 { 1842 {
1876 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1877 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1878 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1879 { 1847 {
1880 /* only report double clicks */ 1848 /* only report double clicks */
1881 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1882 mouse_report (ev); 1850 mouse_report (ev);
… …
1902 else 1870 else
1903 { 1871 {
1904 if (ev.button != MEvent.button) 1872 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1873 MEvent.clicks = 0;
1906 1874
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1875 switch (ev.button)
1909 { 1876 {
1910 case Button1: 1877 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1879 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1880#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1881 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1882#else
1916 selection.rect = false; 1883 selection.rect = false;
1917#endif 1884#endif
1918 1885
1919 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1888 {
1922 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1924 else 1891 else
1925 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
1926 } 1893 }
1927 else 1894 else
1928 { 1895 {
1929 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1897 MEvent.clicks++;
1931 else 1898 else
1932 MEvent.clicks = 1; 1899 MEvent.clicks = 1;
1933 1900
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1901 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1902 }
1936 1903
1937 MEvent.button = Button1; 1904 MEvent.button = Button1;
1938 break; 1905 break;
1939 1906
1940 case Button3: 1907 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1943 else 1910 else
1944 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1945 1912
1946 MEvent.button = Button3; 1913 MEvent.button = Button3;
1947 break; 1914 break;
1948 } 1915 }
1949 } 1916 }
1950 1917
1951 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1952 return; 1919 return;
1953 } 1920 }
1954 1921
… …
2090 } 2057 }
2091 2058
2092 break; 2059 break;
2093 } 2060 }
2094 } 2061 }
2062
2095 return; 2063 return;
2096 } 2064 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2065}
2105 2066
2106void 2067void
2107rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
2108{ 2069{
… …
2114 2075
2115 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2116 { 2077 {
2117 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2118 scrollbar_show (0); 2079 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2080 }
2123 2081
2124#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2127#endif 2085#endif
2128 2086
2129 if (ev.window == vt) 2087 if (ev.window == vt)
2130 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2131#if ISO_14755 2092#if ISO_14755
2132 // 5.4 2093 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2095 return;
2135#endif 2096#endif
2097
2136 if (reportmode) 2098 if (reportmode)
2137 { 2099 {
2138 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2164 if (priv_modes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2127 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2168 2130
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2131 switch (ev.button)
2173 { 2132 {
2174 case Button1: 2133 case Button1:
2175 case Button3: 2134 case Button3:
2176 selection_make (ev.time); 2135 selection_make (ev.time);
2177 break; 2136 break;
2137
2178 case Button2: 2138 case Button2:
2179 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2180 break; 2141 break;
2142
2181#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2182 case Button4: 2144 case Button4:
2183 case Button5: 2145 case Button5:
2184 { 2146 {
2185 int i; 2147 int i;
… …
2207 slip_wheel_ev.start (); 2169 slip_wheel_ev.start ();
2208 } 2170 }
2209 else 2171 else
2210 { 2172 {
2211# endif 2173# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2174 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2175 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 2176# ifdef MOUSE_SLIP_WHEELING
2225 } 2177 }
2226#endif 2178# endif
2227 } 2179 }
2228 break; 2180 break;
2229#endif 2181#endif
2230 } 2182 }
2231 } 2183 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2184}
2237 2185
2238#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2239#if TINTING 2187#if TINTING
2240/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2241 2189
2242typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2243 2191
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{ 2193{
2246 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i; 2199 int i;
2252 2200
2253 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2254 2202
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256 2204
2257 /* for convenience */ 2205 /* for convenience */
2258 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2479 Atom atype; 2427 Atom atype;
2480 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2481 Window root, oldp, *list; 2429 Window root, oldp, *list;
2482 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485 2432
2486 pchanged = 0; 2433 pchanged = 0;
2487 2434
2488 if (!OPTION (Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2490 2437
2491 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2493 2440
2494 XGetWindowAttributes (disp, parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2495 2442
2496 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2497 { 2444 {
2498 if (am_transparent) 2445 if (am_transparent)
2499 { 2446 {
2500 pchanged = 1; 2447 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2503 } 2450 }
2504 2451
2505 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2506 } 2453 }
2507 2454
2508 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False); 2456 XSync (dpy, False);
2510 2457
2511 /* 2458 /*
2512 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2515 */ 2462 */
2516 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2520 2467
2521 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2526 2473
2527 if (!i || prop == NULL 2474 if (!i || prop == NULL
2528#if TINTING 2475#if TINTING
2529 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2530#endif 2477#endif
2531 ) 2478 )
2532 have_pixmap = 0; 2479 have_pixmap = 0;
2533 else 2480 else
2534 { 2481 {
… …
2547 Window cr; 2494 Window cr;
2548 XImage *image; 2495 XImage *image;
2549 GC gc; 2496 GC gc;
2550 XGCValues gcvalue; 2497 XGCValues gcvalue;
2551 2498
2552 XTranslateCoordinates (disp, parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2556 nx = ny = 0; 2503 nx = ny = 0;
2557 2504
… …
2570 } 2517 }
2571 2518
2572 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574 2521
2575 XSync (disp, False); 2522 XSync (dpy, False);
2576 allowedxerror = -1; 2523 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578 2525
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2581 allowedxerror = 0; 2528 allowedxerror = 0;
2582 2529
… …
2585 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2586 { 2533 {
2587 pchanged = 1; 2534 pchanged = 1;
2588 if (pixmap != None) 2535 if (pixmap != None)
2589 { 2536 {
2590 XFreePixmap (disp, pixmap); 2537 XFreePixmap (dpy, pixmap);
2591 pixmap = None; 2538 pixmap = None;
2592 } 2539 }
2593 } 2540 }
2594 2541
2595 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2596 } 2543 }
2597 else 2544 else
2598 { 2545 {
2599 if (pixmap != None) 2546 if (pixmap != None)
2600 XFreePixmap (disp, pixmap); 2547 XFreePixmap (dpy, pixmap);
2601 2548
2602#if TINTING 2549#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2604 { 2551 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607 2553
2554 rgba c;
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2609 2556
2610 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2611 } 2558 }
2612#endif 2559#endif
2613 2560
2614 pixmap = XCreatePixmap (disp, vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2620 XDestroyImage (image); 2566 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]); 2568 XClearWindow (dpy, parent[0]);
2623 2569
2624 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1; 2571 pchanged = 1;
2626 2572
2627 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2628 } 2574 }
2629 } 2575 }
2630 2576
2631 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 else 2579 else
2634 { 2580 {
2635 unsigned int n; 2581 unsigned int n;
2636 /* 2582 /*
2637 * InheritPixmap transparency 2583 * InheritPixmap transparency
2638 */ 2584 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 { 2586 {
2641 oldp = parent[i]; 2587 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2643 &parent[i], &list, &n);
2644 XFree (list); 2589 XFree (list);
2645 2590
2646 if (parent[i] == display->root) 2591 if (parent[i] == display->root)
2647 { 2592 {
2648 if (oldp != None) 2593 if (oldp != None)
… …
2656 } 2601 }
2657 2602
2658 n = 0; 2603 n = 0;
2659 2604
2660 if (pchanged) 2605 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2663 { 2607 {
2664 XGetWindowAttributes (disp, parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 { 2611 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break; 2613 break;
2669 } 2614 }
2670 } 2615 }
2671 }
2672 2616
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2674 { 2618 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0; 2621 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2679 } 2623 }
2680 else 2624 else
2681 { 2625 {
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++) 2626 for (n = 0; n < (unsigned int)i; n++)
2688 { 2627 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2629 XClearWindow (dpy, parent[n]);
2691 } 2630 }
2692 2631
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2694 am_transparent = 1; 2633 am_transparent = 1;
2695 } 2634 }
2696 2635
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None; 2637 parent[i] = None;
2699 } 2638 }
2700 2639
2701 if (scrollBar.win) 2640 if (scrollBar.win)
2702 { 2641 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2705 scrollbar_show (0); 2644 scrollbar_show (0);
2706 } 2645 }
2707 2646
2708 if (am_transparent) 2647 if (am_transparent)
… …
2720 2659
2721bool 2660bool
2722rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2723{ 2662{
2724 bool flag = false; 2663 bool flag = false;
2725 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2727 2666
2728 for (;;) 2667 for (;;)
2729 { 2668 {
2730 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2690 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2691 kill (-cmd_pid, SIGWINCH);
2753 } 2692 }
2754 2693
2755 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2696 bool refreshnow = false;
2758 int nlines = 0; 2697 int nlines = 0;
2759 unicode_t *str = buf; 2698 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2700
2762 for (;;) 2701 for (;;)
2763 { 2702 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2704 break;
… …
2783 } 2722 }
2784 2723
2785 // scr_add_lines only works for nlines <= nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2725 if (nlines >= nrow - 1)
2787 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2790 2730
2791 nlines = 0; 2731 nlines = 0;
2792 str = buf; 2732 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2733 eol = str + min (ncol, UBUFSIZ);
2794 } 2734 }
… …
2808 2748
2809 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2750 ch = next_char ();
2811 } 2751 }
2812 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2815 2756
2816 /* 2757 /*
2817 * If there have been a lot of new lines, then update the screen 2758 * 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. 2759 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2760 * the number of pages between refreshes is refresh_limit, which
… …
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2766 refresh_limit++;
2826 else 2767 else
2827 { 2768 {
2828 flag = true; 2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2829 scr_refresh (refresh_type); 2771 scr_refresh ();
2830 flush_ev.stop (); 2772 want_refresh = 1;
2831 } 2773 }
2832 } 2774 }
2833 2775
2834 } 2776 }
2835 else 2777 else
… …
2850 } 2792 }
2851 2793
2852 return flag; 2794 return flag;
2853} 2795}
2854 2796
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 2797// read the next character
2865unicode_t 2798wchar_t
2866rxvt_term::next_char () 2799rxvt_term::next_char () NOTHROW
2867{ 2800{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2801 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2802 {
2870 // assume 7-bit to be ascii ALWAYS 2803 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2813 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2814 break;
2882 } 2815 }
2883 2816
2884 if (len == (size_t)-1) 2817 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2819
2887 // assume wchar == unicode 2820 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2821 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2822 return wc & UNICODE_MASK;
2890 } 2823 }
2891 2824
2892 return NOCHAR; 2825 return NOCHAR;
2893} 2826}
2827
2828// read the next octet
2829uint32_t
2830rxvt_term::next_octet () NOTHROW
2831{
2832 return cmdbuf_ptr < cmdbuf_endp
2833 ? (unsigned char)*cmdbuf_ptr++
2834 : NOCHAR;
2835}
2836
2837static class out_of_input out_of_input;
2894 2838
2895/* rxvt_cmd_getc () - Return next input character */ 2839/* rxvt_cmd_getc () - Return next input character */
2896/* 2840/*
2897 * Return the next input character after first passing any keyboard input 2841 * Return the next input character after first passing any keyboard input
2898 * to the command. 2842 * to the command.
2899 */ 2843 */
2900unicode_t 2844wchar_t
2901rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2846{
2903 unicode_t c = next_char (); 2847 wchar_t c = next_char ();
2904 2848
2905 if (c == NOCHAR) 2849 if (c == NOCHAR)
2906 throw out_of_input; 2850 throw out_of_input;
2907 2851
2908 return c; 2852 return c;
2909} 2853}
2910 2854
2911unicode_t 2855uint32_t
2912rxvt_term::cmd_get8 () 2856rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2857{
2914 unicode_t c = next_octet (); 2858 uint32_t c = next_octet ();
2915 2859
2916 if (c == NOCHAR) 2860 if (c == NOCHAR)
2917 throw out_of_input; 2861 throw out_of_input;
2918 2862
2919 return c; 2863 return c;
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 3099 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 3100 break;
3157 case '+': 3101 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 3102 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 3103 break;
3160#if ENABLE_FRILLS 3104#if !ENABLE_MINIMAL
3161 case '6': 3105 case '6':
3162 scr_backindex (); 3106 scr_backindex ();
3163 break; 3107 break;
3164#endif 3108#endif
3165 case '7': 3109 case '7':
3166 scr_cursor (SAVE); 3110 scr_cursor (SAVE);
3167 break; 3111 break;
3168 case '8': 3112 case '8':
3169 scr_cursor (RESTORE); 3113 scr_cursor (RESTORE);
3170 break; 3114 break;
3171#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3172 case '9': 3116 case '9':
3173 scr_forwardindex (); 3117 scr_forwardindex ();
3174 break; 3118 break;
3175#endif 3119#endif
3176 case '=': 3120 case '=':
… …
3186 break; 3130 break;
3187 3131
3188 /* 8.3.87: NEXT LINE */ 3132 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3133 case C1_NEL: /* ESC E */
3190 { 3134 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3135 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3137 }
3194 break; 3138 break;
3195 3139
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3140 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3141 case C1_ESA: /* ESC G */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 3282 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3283 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3284 if (arg[p] == -1)
3341 arg[p] = ndef; 3285 arg[p] = ndef;
3342 3286
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 /* 3287 /*
3351 * private mode handling 3288 * private mode handling
3352 */ 3289 */
3353 if (priv) 3290 if (priv)
3354 { 3291 {
3355 switch (priv) 3292 switch (priv)
3356 { 3293 {
3357 case '>': 3294 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3295 if (ch == CSI_DA) /* secondary device attributes */
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3296 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3302 // that we do not support xterm mouse reporting (should be 95 when we do).
3303 //
3304 tt_printf ("\033[>%d;94;0c", 'U');
3305 }
3360 break; 3306 break;
3361 case '?': 3307 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3310 break;
… …
3567 break; 3513 break;
3568 case CSI_75: 3514 case CSI_75:
3569 scr_cursor (RESTORE); 3515 scr_cursor (RESTORE);
3570 break; 3516 break;
3571 3517
3572#if ENABLE_FRILLS 3518#if !ENABLE_MINIMAL
3573 case CSI_74: 3519 case CSI_74:
3574 process_window_ops (arg, nargs); 3520 process_window_ops (arg, nargs);
3575 break; 3521 break;
3576#endif 3522#endif
3577 3523
… …
3584 break; 3530 break;
3585 } 3531 }
3586} 3532}
3587/*}}} */ 3533/*}}} */
3588 3534
3589#if ENABLE_FRILLS 3535#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3536/* ARGSUSED */
3591void 3537void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3538rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3539{
3594 int x, y; 3540 int x, y;
3595 XWindowAttributes wattr; 3541 XWindowAttributes wattr;
3596 Window wdummy; 3542 Window wdummy;
3597 dDisp; 3543
3544 dLocal (Display *, dpy);
3598 3545
3599 if (nargs == 0) 3546 if (nargs == 0)
3600 return; 3547 return;
3601 3548
3602 switch (args[0]) 3549 switch (args[0])
3603 { 3550 {
3604 /* 3551 /*
3605 * commands 3552 * commands
3606 */ 3553 */
3607 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3555 XMapWindow (dpy, parent[0]);
3609 break; 3556 break;
3610 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3558 XIconifyWindow (dpy, parent[0], display->screen);
3612 break; 3559 break;
3613 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3561 XMoveWindow (dpy, parent[0], args[1], args[2]);
3615 break; 3562 break;
3616 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3565 break;
3619 case 5: /* raise window */ 3566 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3567 XRaiseWindow (dpy, parent[0]);
3621 break; 3568 break;
3622 case 6: /* lower window */ 3569 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3570 XLowerWindow (dpy, parent[0]);
3624 break; 3571 break;
3625 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3626 scr_touch (true); 3573 scr_touch (true);
3627 break; 3574 break;
3628 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3583 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3584 (unsigned int) (args[1] * fheight));
3638 break; 3585 break;
3639 3586
3640
3641 /* 3587 /*
3642 * reports - some output format copied from XTerm 3588 * reports - some output format copied from XTerm
3643 */ 3589 */
3644 case 11: /* report window state */ 3590 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3593 break;
3648 case 13: /* report window position */ 3594 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3596 XTranslateCoordinates (dpy, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3597 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3598 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3599 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3600 break;
3655 case 14: /* report window size (pixels) */ 3601 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3602 XGetWindowAttributes (dpy, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3604 break;
3659 case 18: /* report text area size (chars) */ 3605 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3606 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3607 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3609 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3610 break;
3665 case 20: /* report icon label */ 3611 case 20: /* report icon label */
3666 { 3612 {
3667 char *s; 3613 char *s;
3668 XGetIconName (disp, parent[0], &s); 3614 XGetIconName (dpy, parent[0], &s);
3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s); 3616 XFree (s);
3671 } 3617 }
3672 break; 3618 break;
3673 case 21: /* report window title */ 3619 case 21: /* report window title */
3674 { 3620 {
3675 char *s; 3621 char *s;
3676 XFetchName (disp, parent[0], &s); 3622 XFetchName (dpy, parent[0], &s);
3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3624 XFree (s);
3679 } 3625 }
3680 break; 3626 break;
3681 } 3627 }
… …
3782void 3728void
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3729rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{ 3730{
3785 if (str[0] == '?' && !str[1]) 3731 if (str[0] == '?' && !str[1])
3786 { 3732 {
3787 unsigned short r, g, b; 3733 rgba c;
3788 pix_colors_focused[color].get (display, r, g, b); 3734 pix_colors_focused[color].get (c);
3735
3736#if XFT
3737 if (c.a != rgba::MAX_CC)
3738 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3739 else
3740#endif
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3741 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3790 } 3742 }
3791 else 3743 else
3792 set_window_color (color, str); 3744 set_window_color (color, str);
3793} 3745}
3794 3746
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3749 */
3798void 3750void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3751rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3752{
3801 int changed = 0;
3802 int color; 3753 int color;
3803 char *buf, *name; 3754 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3756 int saveop = op;
3806 dDisp; 3757
3758 dLocal (Display *, dpy);
3807 3759
3808 assert (str != NULL); 3760 assert (str != NULL);
3761
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 ; // no responses yet
3764
3809 switch (op) 3765 switch (op)
3810 { 3766 {
3811 case XTerm_name: 3767 case XTerm_name:
3812 set_title (str); 3768 set_title (str);
3813 /* FALLTHROUGH */ 3769 /* FALLTHROUGH */
… …
3827 unsigned long bytes_after; 3783 unsigned long bytes_after;
3828 unsigned char *value = 0; 3784 unsigned char *value = 0;
3829 const char *str = ""; 3785 const char *str = "";
3830 3786
3831 if (prop 3787 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3788 && XGetWindowProperty (dpy, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3789 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3790 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3791 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3792 && actual_type != None
3837 && actual_format == 8) 3793 && actual_format == 8)
3838 str = (const char *)(value); 3794 str = (const char *)(value);
3839 3795
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3796 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3797
3842 XFree (value); 3798 XFree (value);
3843 } 3799 }
3844 else 3800 else
3845 { 3801 {
… …
3849 { 3805 {
3850 *eq = 0; 3806 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3807 set_utf8_property (display->atom (str), eq + 1);
3852 } 3808 }
3853 else 3809 else
3854 XDeleteProperty (disp, parent[0], 3810 XDeleteProperty (dpy, parent[0],
3855 display->atom (str)); 3811 display->atom (str));
3856 } 3812 }
3857 break; 3813 break;
3858 3814
3859 case XTerm_Color: 3815 case XTerm_Color:
… …
3861 { 3817 {
3862 if ((name = strchr (buf, ';')) == NULL) 3818 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3819 break;
3864 3820
3865 *name++ = '\0'; 3821 *name++ = '\0';
3866 color = atoi (buf); 3822 color = atoi (buf) + minCOLOR;
3867 3823
3868 if (color < 0 || color >= TOTAL_COLORS) 3824 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3825 break;
3870 3826
3871 if ((buf = strchr (name, ';')) != NULL) 3827 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3828 *buf++ = '\0';
3873 3829
3874 if (name[0] == '?' && !name[1]) 3830 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 } 3831 }
3883 break; 3832 break;
3884 case XTerm_Color00: 3833 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3834 process_color_seq (op, Color_fg, str, resp);
3886 break; 3835 break;
3887 case XTerm_Color01: 3836 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3837 process_color_seq (op, Color_bg, str, resp);
3889 break; 3838 break;
3890#ifndef NO_CURSORCOLOR 3839#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3840 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3841 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3842 break;
3894#endif 3843#endif
3895 case XTerm_Color_pointer_fg: 3844 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3845 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3846 break;
3898 case XTerm_Color_pointer_bg: 3847 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3848 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3849 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3850#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: 3851 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3852 process_color_seq (op, Color_RV, str, resp);
3853 break;
3854 case Rxvt_Color_BD:
3855 case URxvt_Color_BD:
3856 process_color_seq (op, Color_BD, str, resp);
3857 break;
3858 case Rxvt_Color_UL:
3859 case URxvt_Color_UL:
3860 process_color_seq (op, Color_UL, str, resp);
3910 break; 3861 break;
3911 case URxvt_Color_IT: 3862 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3863 process_color_seq (op, Color_IT, str, resp);
3913 break; 3864 break;
3914#endif 3865#endif
3915#if TRANSPARENT && TINTING 3866#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint: 3867 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3868 process_color_seq (op, Color_tint, str, resp);
3869
3918 check_our_parents (); 3870 check_our_parents ();
3871
3919 if (am_transparent) 3872 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3873 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 3874
3875 break;
3876#endif
3877
3924 case XTerm_Pixmap: 3878 case Rxvt_Pixmap:
3879 {
3925 if (*str != ';') 3880 if (*str != ';')
3926 { 3881 {
3927#if XPM_BACKGROUND 3882#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3883 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3884 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3885 scr_touch (true);
3886#endif
3932 } 3887 }
3888
3889 int changed = 0;
3890
3933 while ((str = strchr (str, ';')) != NULL) 3891 while ((str = strchr (str, ';')) != NULL)
3934 { 3892 {
3935 str++; 3893 str++;
3936#if XPM_BACKGROUND 3894#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3895 changed += scale_pixmap (str);
3938#endif 3896#endif
3939 } 3897 }
3940 3898
3941 if (changed) 3899 if (changed)
3942 { 3900 {
3943#ifdef XPM_BACKGROUND 3901#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3902 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3903 scr_touch (true);
3904#endif
3947 } 3905 }
3906 }
3948 break; 3907 break;
3949 3908
3950 case XTerm_restoreFG: 3909 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3910 set_window_color (Color_fg, str);
3952 break; 3911 break;
3953 case XTerm_restoreBG: 3912 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3913 set_window_color (Color_bg, str);
3955 break; 3914 break;
3956 3915
3957 case XTerm_logfile: 3916 case XTerm_logfile:
3958 // TODO, when secure mode? 3917 // TODO, when secure mode?
3959 break; 3918 break;
3960 3919
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 3920#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3921 case Rxvt_dumpscreen: /* no error notices */
3969 { 3922 {
3970 int fd; 3923 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3924 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3925 {
3973 scr_dump (fd); 3926 scr_dump (fd);
… …
3997 allocated.push_back ((void *)res); 3950 allocated.push_back ((void *)res);
3998 set_fonts (); 3951 set_fonts ();
3999 } 3952 }
4000 break; 3953 break;
4001 3954
4002#if ENABLE_FRILLS 3955 case URxvt_version:
3956 if (query)
3957 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3958 op,
3959 rs[Rs_name], VERSION[0], VERSION[2],
3960 resp);
3961 break;
3962
3963#if !ENABLE_MINIMAL
4003 case URxvt_locale: 3964 case URxvt_locale:
4004 if (query) 3965 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4006 else 3967 else
4007 { 3968 {
4008 set_locale (str); 3969 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3970 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3971 init_xlocale ();
4011 } 3972 }
4012 break; 3973 break;
4013 3974
4014 case URxvt_view_up: 3975 case URxvt_view_up:
… …
4025 break; 3986 break;
4026#endif 3987#endif
4027 3988
4028#if ENABLE_PERL 3989#if ENABLE_PERL
4029 case URxvt_perl: 3990 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3991 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4031 ; // no responses yet 3992 ; // no responses yet
4032 break; 3993 break;
4033#endif 3994#endif
4034 } 3995 }
4035} 3996}
… …
4067 return state; 4028 return state;
4068} 4029}
4069 4030
4070/* we're not using priv _yet_ */ 4031/* we're not using priv _yet_ */
4071void 4032void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4033rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4034{
4074 unsigned int i, j; 4035 unsigned int i, j;
4075 int state; 4036 int state;
4076 4037
4077 static const struct 4038 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4049 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4050 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4051 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4052 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4053 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4054 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4055 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4056#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4057 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4058#endif
… …
4147 /* extra handling for values with state unkept */ 4105 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4106 switch (arg[i])
4149 { 4107 {
4150#if ENABLE_STYLES 4108#if ENABLE_STYLES
4151 case 1021: 4109 case 1021:
4152 if (mode) 4110 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4111
4157 scr_touch (true); 4112 scr_touch (true);
4158 break; 4113 break;
4159#endif 4114#endif
4160 case 1048: /* alternative cursor save */ 4115 case 1048: /* alternative cursor save */
… …
4182 case 3: /* 80/132 */ 4137 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4138 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4139 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4140 break;
4186 case 4: /* smooth scrolling */ 4141 case 4: /* smooth scrolling */
4187 if (!state) 4142 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4143 break;
4192 case 5: /* reverse video */ 4144 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4145 scr_rvideo_mode (state);
4194 break; 4146 break;
4195 case 6: /* relative/absolute origins */ 4147 case 6: /* relative/absolute origins */
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4153 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4154 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4155 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4156 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4157 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 4158#ifdef scrollBar_esc
4214 case scrollBar_esc: 4159 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4160 if (scrollbar_mapping (state))
4216 { 4161 {
4217 resize_all_windows (0, 0, 0); 4162 resize_all_windows (0, 0, 0);
… …
4236#if 0 4181#if 0
4237 case 1001: 4182 case 1001:
4238 break; /* X11 mouse highlighting */ 4183 break; /* X11 mouse highlighting */
4239#endif 4184#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4185 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4186 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4187 break;
4246 case 1011: /* scroll to bottom on key press */ 4188 case 1011: /* scroll to bottom on key press */
4247 if (state) 4189 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4190 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4191 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4192 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4193 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4194 scr_erase_screen (2);
… …
4393 scr_color (Color_bg, Color_bg); 4332 scr_color (Color_bg, Color_bg);
4394 break; 4333 break;
4395 4334
4396 //case 50: // not variable spacing 4335 //case 50: // not variable spacing
4397 4336
4398#if ENABLE_FRILLS 4337#if !ENABLE_MINIMAL
4399 case 90: 4338 case 90:
4400 case 91: /* set bright fg color */ 4339 case 91: /* set bright fg color */
4401 case 92: 4340 case 92:
4402 case 93: 4341 case 93:
4403 case 94: 4342 case 94:
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4404const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4405
4467void 4406void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4407rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4408{
4470 if (pty.pty < 0) 4409 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4410 return;
4472 4411
4412 if (pty->pty < 0)
4413 return;
4414
4473 if (v_buflen == 0) 4415 if (v_buflen == 0)
4474 { 4416 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4417 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4418
4477 if ((unsigned int)written == len) 4419 if ((unsigned int)written == len)
4478 return; 4420 return;
4479 4421
4480 data += written; 4422 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4431 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4432}
4491 4433
4492void rxvt_term::pty_write () 4434void rxvt_term::pty_write ()
4493{ 4435{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4437
4496 if (written > 0) 4438 if (written > 0)
4497 { 4439 {
4498 v_buflen -= written; 4440 v_buflen -= written;
4499 4441

Diff Legend

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