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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 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);
… …
873 return; 877 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
878 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 883 if (view_start)
880 { 884 {
881 view_start = 0; 885 view_start = 0;
882 want_refresh = 1; 886 want_refresh = 1;
883 } 887 }
… …
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;
978 int end_row = row + nrow; 1046 int end_row = row + nrow;
979 1047
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1049 --row;
982 1050
983 do 1051 do
984 { 1052 {
985 int start_row = row; 1053 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1076 while (l->is_longer () && row < end_row);
1009 } 1077 }
1010 while (row < end_row); 1078 while (row < end_row);
1011 } 1079 }
1012 1080
1013 scr_refresh (refresh_type); 1081 scr_refresh ();
1014 scrollbar_show (1); 1082 scrollbar_show (1);
1015#ifdef USE_XIM 1083#ifdef USE_XIM
1016 IMSendSpot (); 1084 IMSendSpot ();
1017#endif 1085#endif
1018 } 1086 }
… …
1021} 1089}
1022 1090
1023void 1091void
1024rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1025{ 1093{
1026 SET_R (this); 1094 make_current ();
1027 SET_LOCALE (locale);
1028 1095
1029 display->flush (); 1096 display->flush ();
1030 1097
1031 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1032 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
1033} 1100}
1034 1101
1035void 1102void
1036rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1037{ 1104{
1038 SET_R (this); 1105 make_current ();
1039 SET_LOCALE (locale);
1040 1106
1041 refresh_limit = 1; 1107 refresh_limit = 1;
1042 refresh_count = 0; 1108 refresh_count = 0;
1043 flush (); 1109 flush ();
1044} 1110}
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1115{
1050 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1117 want_refresh = 1;
1052 1118
1053 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1120}
1055#endif 1121#endif
1056 1122
1057#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1058void 1124void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1139{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1142 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1143 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1145 }
1081} 1146}
1082#endif 1147#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1152{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1154 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1156 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1158 }
1095} 1159}
1096#endif 1160#endif
… …
1101{ 1165{
1102 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1103 || 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)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1169 {
1106 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1109 1172
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1173 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1175 }
1114} 1176}
1115#endif 1177#endif
1116 1178
1117#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1118static struct event_handler 1180static struct event_handler
1119{ 1181{
1120 check_watcher cw_yield; 1182 check_watcher yield_ev;
1121 1183
1122 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1123 { 1185 {
1124 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
1125 w.stop (); 1194 w.stop ();
1126 } 1195 }
1127 1196
1128 event_handler () 1197 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1130 { 1199 {
1131 } 1200 }
1132} event_handler; 1201} event_handler;
1133#endif 1202#endif
1134 1203
… …
1145 1214
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1149 1218
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1220
1152 if (r > 0) 1221 if (r > 0)
1153 { 1222 {
1154 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1155 return true; 1224 return true;
1156 } 1225 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1227 {
1159#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1160 if (display->is_local) 1229 if (display->is_local)
1161 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1162#endif 1231#endif
1163 } 1232 }
1164 else 1233 else
1165 { 1234 {
1166 pty_ev.stop (); 1235 pty_ev.stop ();
1167 1236
1168 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1169 destroy (); 1238 destroy ();
1170 } 1239 }
1171 1240
1172 return false; 1241 return false;
1173} 1242}
1174 1243
1175void 1244void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1246{
1178 SET_R (this); 1247 make_current ();
1179 SET_LOCALE (locale);
1180 1248
1181 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1251 while (pty_fill ())
1184 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1189} 1257}
1190 1258
1191void 1259void
1192rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1193{ 1261{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1263 recolour_cursor ();
1196 1264
1197#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1266 hidden_pointer = 0;
1199 1267
1200 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1202#endif 1270#endif
1203} 1271}
1204 1272
1205#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1206void 1274void
1207rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1208{ 1276{
1209 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1210 return; 1278 return;
1211 1279
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1281 XFlush (dpy);
1214 1282
1215 hidden_pointer = 1; 1283 hidden_pointer = 1;
1216} 1284}
1217 1285
1218void 1286void
1219rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1220{ 1288{
1221 SET_R (this); 1289 make_current ();
1222 SET_LOCALE (locale);
1223 1290
1224 pointer_blank (); 1291 pointer_blank ();
1225} 1292}
1226#endif 1293#endif
1227 1294
… …
1292 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1293 (32 + x + 1), 1360 (32 + x + 1),
1294 (32 + y + 1)); 1361 (32 + y + 1));
1295} 1362}
1296 1363
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1364/*{{{ process an X event */
1308void 1365void
1309rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1310{ 1367{
1311 dDisp; 1368 make_current ();
1312 1369
1313 SET_R (this); 1370 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1371
1316 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1375 return;
1319 1376
1377 // for XQueryPointer
1320 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1380 unsigned int unused_mask;
1323 1381
1324 switch (ev.type) 1382 switch (ev.type)
1325 { 1383 {
1326 case KeyPress: 1384 case KeyPress:
1327#if ISO_14755 1385 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1386 break;
1333 1387
1334 case KeyRelease: 1388 case KeyRelease:
1335 { 1389 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1390 break;
1407 }
1408 1391
1409 case ButtonPress: 1392 case ButtonPress:
1410 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1411 break; 1394 break;
1412 1395
… …
1414 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1415 break; 1398 break;
1416 1399
1417 case ClientMessage: 1400 case ClientMessage:
1418 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 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 {
1421 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)))
1422 destroy (); 1411 destroy ();
1412 }
1423#if ENABLE_EWMH 1413#if ENABLE_EWMH
1424 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])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &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 }
1428#endif 1429#endif
1429 } 1430 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break; 1431 break;
1466 1432
1467 case MappingNotify: 1433 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1435 break;
… …
1492 break; 1458 break;
1493 } 1459 }
1494 break; 1460 break;
1495 1461
1496 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1466 focus_in ();
1498 break; 1467 break;
1499 1468
1500 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1473 focus_out ();
1502 break; 1474 break;
1503 1475
1504 case ConfigureNotify: 1476 case ConfigureNotify:
1505 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1506 { 1478 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 1480 ;
1509 1481
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1483 {
1512 seen_resize = 1; 1484 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1486 }
1515 1487
1516#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
1517 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1518 check_our_parents (); 1492 check_our_parents ();
1519#endif 1493#endif
1520 } 1494 }
1521 break; 1495 break;
1522 1496
1523 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527 1502
1528 break; 1503 break;
1529 1504
1530 case SelectionClear: 1505 case SelectionClear:
1531 selection_clear (); 1506 selection_clear ();
… …
1567 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1568 { 1543 {
1569 do 1544 do
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1548
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1550
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1579 1554
1580 want_refresh = 1; 1555 want_refresh = 1;
1581 } 1556 }
1582 else 1557 else
1583 { 1558 {
1584 XEvent unused_event; 1559 XEvent unused_event;
1585 1560
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1562 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1564 ;
1590 1565
1591 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1592 { 1567 {
1593 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1594 scrollbar_show (0); 1569 scrollbar_show (0);
1595 } 1570 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600 1571
1601#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1604#endif 1575#endif
1605 } 1576 }
1606 break; 1577 break;
1607 1578
1608 case MotionNotify: 1579 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1581 if (hidden_pointer)
1612 pointer_unblank (); 1582 pointer_unblank ();
1613#endif 1583#endif
1614#if MENUBAR
1615 if (isMenuBarWindow (ev.xany.window))
1616 {
1617 menubar_control (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1585 break;
1623 1586
1624 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1625 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1591 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1593 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631 ; 1595 ;
1632 1596
1633 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1634 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1601 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1702#endif 1666#endif
1703 } 1667 }
1704 } 1668 }
1705 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1706 { 1670 {
1707 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1709 ; 1673 ;
1710 1674
1711 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1712 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1713 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1714 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1715 &unused_mask); 1679 &unused_mask);
1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1720 scrollbar_show (1); 1684 scrollbar_show (1);
1721 } 1685 }
1722 break; 1686 break;
1723 } 1687 }
1724 1688
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1729 { 1691 {
1730 if (hidden_cursor) 1692 if (hidden_cursor)
1731 { 1693 {
1732 hidden_cursor = 0; 1694 hidden_cursor = 0;
1733 want_refresh = 1; 1695 want_refresh = 1;
1734 } 1696 }
1735 1697
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737 } 1699 }
1738#endif 1700#endif
1739 1701
1740#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 { 1704 {
1743 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1746 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1758 if (!focus) 1720 if (!focus)
1759 { 1721 {
1760 focus = 1; 1722 focus = 1;
1761 want_refresh = 1; 1723 want_refresh = 1;
1762 1724
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764 1726
1765#if USE_XIM 1727#if USE_XIM
1766 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1767 { 1729 {
1768 IMSetStatusPosition (); 1730 IMSetPosition ();
1769 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1770 } 1732 }
1771#endif 1733#endif
1772#if CURSOR_BLINK 1734#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1775#endif 1737#endif
1776#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1778 { 1740 {
1779 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1780 scr_recolour (); 1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1781 } 1756 }
1782#endif 1757#endif
1783 } 1758 }
1784} 1759}
1785 1760
… …
1805#if USE_XIM 1780#if USE_XIM
1806 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1808#endif 1783#endif
1809#if CURSOR_BLINK 1784#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1812 hidden_cursor = 0; 1787 hidden_cursor = 0;
1813#endif 1788#endif
1814#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1819 } 1794 }
1820#endif 1795#endif
1821 } 1796 }
1822} 1797}
1823 1798
1824#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1825void 1813void
1826rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1815{
1828 SET_R (this); 1816 make_current ();
1829 SET_LOCALE (locale);
1830 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1831 switch (ev.type) 1823 switch (ev.type)
1832 { 1824 {
1833 case PropertyNotify: 1825 case PropertyNotify:
1834 /* 1826 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
… …
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1840 return; 1832 return;
1841 1833
1842 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1843 case ReparentNotify: 1835 case ReparentNotify:
1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1846 break; 1838 break;
1847 } 1839 }
1840# endif
1848} 1841}
1849#endif 1842#endif
1850 1843
1851void 1844void
1852rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
… …
1861 /* 1854 /*
1862 * VT window processing of button press 1855 * VT window processing of button press
1863 */ 1856 */
1864 if (ev.window == vt) 1857 if (ev.window == vt)
1865 { 1858 {
1859 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 return;
1861
1866#if ISO_14755 1862#if ISO_14755
1867 // 5.4 1863 // 5.4
1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869 { 1865 {
1870 iso14755_54 (ev.x, ev.y); 1866 iso14755_54 (ev.x, ev.y);
… …
1912 else 1908 else
1913 { 1909 {
1914 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1915 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1916 1912
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918 switch (ev.button) 1913 switch (ev.button)
1919 { 1914 {
1920 case Button1: 1915 case Button1:
1921 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1923#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1925#else 1920#else
1926 selection.rect = false; 1921 selection.rect = false;
1927#endif 1922#endif
1928 1923
1929 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931 { 1926 {
1932 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1934 else 1929 else
1935 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1936 } 1931 }
1937 else 1932 else
1938 { 1933 {
1939 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1940 MEvent.clicks++; 1935 MEvent.clicks++;
1941 else 1936 else
1942 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1943 1938
1944 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1945 } 1940 }
1946 1941
1947 MEvent.button = Button1; 1942 MEvent.button = Button1;
1948 break; 1943 break;
1949 1944
1950 case Button3: 1945 case Button3:
1951 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1952 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1953 else 1948 else
1954 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1955 1950
1956 MEvent.button = Button3; 1951 MEvent.button = Button3;
1957 break; 1952 break;
1958 } 1953 }
1959 } 1954 }
1960 1955
1961 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1962 return; 1957 return;
1963 } 1958 }
1964 1959
… …
2103 } 2098 }
2104 } 2099 }
2105 2100
2106 return; 2101 return;
2107 } 2102 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2103}
2117 2104
2118void 2105void
2119rxvt_term::button_release (XButtonEvent &ev) 2106rxvt_term::button_release (XButtonEvent &ev)
2120{ 2107{
… …
2126 2113
2127 if (scrollbar_isUpDn ()) 2114 if (scrollbar_isUpDn ())
2128 { 2115 {
2129 scrollBar.setIdle (); 2116 scrollBar.setIdle ();
2130 scrollbar_show (0); 2117 scrollbar_show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2118 }
2135 2119
2136#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active) 2121 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2122 sel_scroll_ev.stop();
2139#endif 2123#endif
2140 2124
2141 if (ev.window == vt) 2125 if (ev.window == vt)
2142 { 2126 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2143#if ISO_14755 2130#if ISO_14755
2144 // 5.4 2131 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2132 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return; 2133 return;
2147#endif 2134#endif
2135
2148 if (reportmode) 2136 if (reportmode)
2149 { 2137 {
2150 /* mouse report from vt window */ 2138 /* mouse report from vt window */
2151 /* don't report release of wheel "buttons" */ 2139 /* don't report release of wheel "buttons" */
2152 if (ev.button >= 4) 2140 if (ev.button >= 4)
… …
2176 if (priv_modes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
2177 && bypass_keystate 2165 && bypass_keystate
2178 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
2179 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
2180 2168
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2184 switch (ev.button) 2169 switch (ev.button)
2185 { 2170 {
2186 case Button1: 2171 case Button1:
2187 case Button3: 2172 case Button3:
2188 selection_make (ev.time); 2173 selection_make (ev.time);
2189 break; 2174 break;
2175
2190 case Button2: 2176 case Button2:
2191 selection_request (ev.time, ev.x, ev.y); 2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2179 break;
2180
2193#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2194 case Button4: 2182 case Button4:
2195 case Button5: 2183 case Button5:
2196 { 2184 {
2197 int i; 2185 int i;
… …
2199 2187
2200 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2201 2189
2202 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2203 i = 1; 2191 i = 1;
2204 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2193 i = nrow - 1;
2206 else 2194 else
2207 i = 5; 2195 i = 5;
2208 2196
2209# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
… …
2229 } 2217 }
2230 break; 2218 break;
2231#endif 2219#endif
2232 } 2220 }
2233 } 2221 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2222}
2239 2223
2240#ifdef TRANSPARENT 2224#ifdef TRANSPARENT
2241#if TINTING 2225#if TINTING
2242/* taken from aterm-0.4.2 */ 2226/* taken from aterm-0.4.2 */
2243 2227
2244typedef uint32_t RUINT32T; 2228typedef uint32_t RUINT32T;
2245 2229
2246void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2247{ 2231{
2248 int sh_r, sh_g, sh_b; 2232 int sh_r, sh_g, sh_b;
2249 RUINT32T mask_r, mask_g, mask_b; 2233 RUINT32T mask_r, mask_g, mask_b;
2250 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2251 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253 int i; 2237 int i;
2254 2238
2255 Visual *visual = display->visual; 2239 Visual *visual = term->visual;
2256 2240
2257 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2258 2242
2259 /* for convenience */ 2243 /* for convenience */
2260 mask_r = visual->red_mask; 2244 mask_r = visual->red_mask;
… …
2481 Atom atype; 2465 Atom atype;
2482 unsigned char *prop = NULL; 2466 unsigned char *prop = NULL;
2483 Window root, oldp, *list; 2467 Window root, oldp, *list;
2484 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2485 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2486 dDisp;
2487 2470
2488 pchanged = 0; 2471 pchanged = 0;
2489 2472
2490 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2491 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2492 2475
2493 XGetWindowAttributes (disp, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2494 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2495 2478
2496 XGetWindowAttributes (disp, parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2497 2480
2498 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2499 { 2482 {
2500 if (am_transparent) 2483 if (am_transparent)
2501 { 2484 {
2502 pchanged = 1; 2485 pchanged = 1;
2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2504 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2505 } 2488 }
2506 2489
2507 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2508 } 2491 }
2509 2492
2510 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2511 XSync (disp, False); 2494 XSync (dpy, False);
2512 2495
2513 /* 2496 /*
2514 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2515 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2516 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2517 */ 2500 */
2518 i = (xa[XA_XROOTPMAP_ID] 2501 i = (xa[XA_XROOTPMAP_ID]
2519 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2520 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2522 2505
2523 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2524 i = (xa[XA_ESETROOT_PMAP_ID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2528 2511
2529 if (!i || prop == NULL 2512 if (!i || prop == NULL
2530#if TINTING 2513#if TINTING
2531 || !rs[Rs_color + Color_tint] 2514 || !ISSET_PIXCOLOR (Color_tint)
2532#endif 2515#endif
2533 ) 2516 )
2534 have_pixmap = 0; 2517 have_pixmap = 0;
2535 else 2518 else
2536 { 2519 {
… …
2549 Window cr; 2532 Window cr;
2550 XImage *image; 2533 XImage *image;
2551 GC gc; 2534 GC gc;
2552 XGCValues gcvalue; 2535 XGCValues gcvalue;
2553 2536
2554 XTranslateCoordinates (disp, parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2555 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2556 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2557 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2558 nx = ny = 0; 2541 nx = ny = 0;
2559 2542
… …
2572 } 2555 }
2573 2556
2574 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2575 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2576 2559
2577 XSync (disp, False); 2560 XSync (dpy, False);
2578 allowedxerror = -1; 2561 allowedxerror = -1;
2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580 2563
2581 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2582 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2583 allowedxerror = 0; 2566 allowedxerror = 0;
2584 2567
… …
2587 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2588 { 2571 {
2589 pchanged = 1; 2572 pchanged = 1;
2590 if (pixmap != None) 2573 if (pixmap != None)
2591 { 2574 {
2592 XFreePixmap (disp, pixmap); 2575 XFreePixmap (dpy, pixmap);
2593 pixmap = None; 2576 pixmap = None;
2594 } 2577 }
2595 } 2578 }
2596 2579
2597 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2598 } 2581 }
2599 else 2582 else
2600 { 2583 {
2601 if (pixmap != None) 2584 if (pixmap != None)
2602 XFreePixmap (disp, pixmap); 2585 XFreePixmap (dpy, pixmap);
2603 2586
2604#if TINTING 2587#if TINTING
2605 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2606 { 2589 {
2607 unsigned short rm, gm, bm;
2608 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609 2591
2592 rgba c;
2610 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2593 pix_colors_focused [Color_tint].get (c);
2611 2594
2612 ShadeXImage (display, image, shade, rm, gm, bm); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2613 } 2596 }
2614#endif 2597#endif
2615 2598
2616 pixmap = XCreatePixmap (disp, vt, 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2617 szHint.width, szHint.height, image->depth);
2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2619 XPutImage (disp, pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2620 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2621 XFreeGC (disp, gc); 2603 XFreeGC (dpy, gc);
2622 XDestroyImage (image); 2604 XDestroyImage (image);
2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2624 XClearWindow (disp, parent[0]); 2606 XClearWindow (dpy, parent[0]);
2625 2607
2626 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2627 pchanged = 1; 2609 pchanged = 1;
2628 2610
2629 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2630 } 2612 }
2631 } 2613 }
2632 2614
2633 if (am_pixmap_trans) 2615 if (am_pixmap_trans)
2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2635 else 2617 else
2636 { 2618 {
2637 unsigned int n; 2619 unsigned int n;
2638 /* 2620 /*
2639 * InheritPixmap transparency 2621 * InheritPixmap transparency
2640 */ 2622 */
2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642 { 2624 {
2643 oldp = parent[i]; 2625 oldp = parent[i];
2644 XQueryTree (disp, parent[i - 1], &root, 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2645 &parent[i], &list, &n);
2646 XFree (list); 2627 XFree (list);
2647 2628
2648 if (parent[i] == display->root) 2629 if (parent[i] == display->root)
2649 { 2630 {
2650 if (oldp != None) 2631 if (oldp != None)
… …
2658 } 2639 }
2659 2640
2660 n = 0; 2641 n = 0;
2661 2642
2662 if (pchanged) 2643 if (pchanged)
2663 {
2664 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2665 { 2645 {
2666 XGetWindowAttributes (disp, parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2668 { 2649 {
2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670 break; 2651 break;
2671 } 2652 }
2672 } 2653 }
2673 }
2674 2654
2675 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2676 { 2656 {
2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2679 am_transparent = 0; 2659 am_transparent = 0;
2680 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2681 } 2661 }
2682 else 2662 else
2683 { 2663 {
2684#if WAIT_FOR_WM
2685 /* wait (an arbitrary period) for the WM to do its thing
2686 * needed for fvwm2.2.2 (and before?) */
2687 sleep (1);
2688#endif
2689 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2690 { 2665 {
2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2692 XClearWindow (disp, parent[n]); 2667 XClearWindow (dpy, parent[n]);
2693 } 2668 }
2694 2669
2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2696 am_transparent = 1; 2671 am_transparent = 1;
2697 } 2672 }
2698 2673
2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700 parent[i] = None; 2675 parent[i] = None;
2701 } 2676 }
2702 2677
2703 if (scrollBar.win) 2678 if (scrollBar.win)
2704 { 2679 {
2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2706 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2707 scrollbar_show (0); 2682 scrollbar_show (0);
2708 } 2683 }
2709 2684
2710 if (am_transparent) 2685 if (am_transparent)
… …
2773 if (ch == C0_LF) 2748 if (ch == C0_LF)
2774 nlines++; 2749 nlines++;
2775 2750
2776 refresh_count++; 2751 refresh_count++;
2777 2752
2778 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2779 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2780 { 2755 {
2781 refreshnow = true; 2756 refreshnow = true;
2782 refresh_count = 0; 2757 refresh_count = 0;
2783 ch = NOCHAR; 2758 ch = NOCHAR;
… …
2785 } 2760 }
2786 2761
2787 // scr_add_lines only works for nlines <= nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2763 if (nlines >= nrow - 1)
2789 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2767 scr_add_lines (buf, str - buf, nlines);
2792 2768
2793 nlines = 0; 2769 nlines = 0;
2794 str = buf; 2770 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2771 eol = str + min (ncol, UBUFSIZ);
… …
2810 2786
2811 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2788 ch = next_char ();
2813 } 2789 }
2814 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2793 scr_add_lines (buf, str - buf, nlines);
2817 2794
2818 /* 2795 /*
2819 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
2821 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2822 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2823 */ 2800 */
2824 if (refreshnow) 2801 if (refreshnow)
2825 { 2802 {
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++; 2804 refresh_limit++;
2828 else 2805 else
2829 { 2806 {
2830 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2831 scr_refresh (refresh_type); 2809 scr_refresh ();
2832 want_refresh = 1; 2810 want_refresh = 1;
2833 } 2811 }
2834 } 2812 }
2835 2813
2836 } 2814 }
… …
2854 return flag; 2832 return flag;
2855} 2833}
2856 2834
2857// read the next character 2835// read the next character
2858wchar_t 2836wchar_t
2859rxvt_term::next_char () 2837rxvt_term::next_char () NOTHROW
2860{ 2838{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2839 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2840 {
2863 // assume 7-bit to be ascii ALWAYS 2841 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2842 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2885 return NOCHAR; 2863 return NOCHAR;
2886} 2864}
2887 2865
2888// read the next octet 2866// read the next octet
2889uint32_t 2867uint32_t
2890rxvt_term::next_octet () 2868rxvt_term::next_octet () NOTHROW
2891{ 2869{
2892 return cmdbuf_ptr < cmdbuf_endp 2870 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2871 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2872 : NOCHAR;
2895} 2873}
2874
2875static class out_of_input out_of_input;
2896 2876
2897/* rxvt_cmd_getc () - Return next input character */ 2877/* rxvt_cmd_getc () - Return next input character */
2898/* 2878/*
2899 * Return the next input character after first passing any keyboard input 2879 * Return the next input character after first passing any keyboard input
2900 * to the command. 2880 * to the command.
2901 */ 2881 */
2902wchar_t 2882wchar_t
2903rxvt_term::cmd_getc () 2883rxvt_term::cmd_getc () THROW ((class out_of_input))
2904{ 2884{
2905 wchar_t c = next_char (); 2885 wchar_t c = next_char ();
2906 2886
2907 if (c == NOCHAR) 2887 if (c == NOCHAR)
2908 throw out_of_input; 2888 throw out_of_input;
2909 2889
2910 return c; 2890 return c;
2911} 2891}
2912 2892
2913uint32_t 2893uint32_t
2914rxvt_term::cmd_get8 () 2894rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2895{
2916 uint32_t c = next_octet (); 2896 uint32_t c = next_octet ();
2917 2897
2918 if (c == NOCHAR) 2898 if (c == NOCHAR)
2919 throw out_of_input; 2899 throw out_of_input;
… …
3157 scr_charset_set (2, (unsigned int)cmd_getc ()); 3137 scr_charset_set (2, (unsigned int)cmd_getc ());
3158 break; 3138 break;
3159 case '+': 3139 case '+':
3160 scr_charset_set (3, (unsigned int)cmd_getc ()); 3140 scr_charset_set (3, (unsigned int)cmd_getc ());
3161 break; 3141 break;
3162#if ENABLE_FRILLS 3142#if !ENABLE_MINIMAL
3163 case '6': 3143 case '6':
3164 scr_backindex (); 3144 scr_backindex ();
3165 break; 3145 break;
3166#endif 3146#endif
3167 case '7': 3147 case '7':
3168 scr_cursor (SAVE); 3148 scr_cursor (SAVE);
3169 break; 3149 break;
3170 case '8': 3150 case '8':
3171 scr_cursor (RESTORE); 3151 scr_cursor (RESTORE);
3172 break; 3152 break;
3173#if ENABLE_FRILLS 3153#if !ENABLE_MINIMAL
3174 case '9': 3154 case '9':
3175 scr_forwardindex (); 3155 scr_forwardindex ();
3176 break; 3156 break;
3177#endif 3157#endif
3178 case '=': 3158 case '=':
… …
3340 ndef = get_byte_array_bit (csi_defaults, i); 3320 ndef = get_byte_array_bit (csi_defaults, i);
3341 for (p = 0; p < nargs; p++) 3321 for (p = 0; p < nargs; p++)
3342 if (arg[p] == -1) 3322 if (arg[p] == -1)
3343 arg[p] = ndef; 3323 arg[p] = ndef;
3344 3324
3345#ifdef DEBUG_CMD
3346 fprintf (stderr, "CSI ");
3347 for (p = 0; p < nargs; p++)
3348 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349 fprintf (stderr, "%c\n", ch);
3350#endif
3351
3352 /* 3325 /*
3353 * private mode handling 3326 * private mode handling
3354 */ 3327 */
3355 if (priv) 3328 if (priv)
3356 { 3329 {
3357 switch (priv) 3330 switch (priv)
3358 { 3331 {
3359 case '>': 3332 case '>':
3360 if (ch == CSI_DA) /* secondary device attributes */ 3333 if (ch == CSI_DA) /* secondary device attributes */
3361 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3334 {
3335 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 //
3338 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3339 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3340 // that we do not support xterm mouse reporting (should be 95 when we do).
3341 //
3342 tt_printf ("\033[>%d;94;0c", 'U');
3343 }
3362 break; 3344 break;
3363 case '?': 3345 case '?':
3364 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365 process_terminal_mode (ch, priv, nargs, arg); 3347 process_terminal_mode (ch, priv, nargs, arg);
3366 break; 3348 break;
… …
3492 break; 3474 break;
3493 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3494 scr_report_position (); 3476 scr_report_position ();
3495 break; 3477 break;
3496 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3497 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3498 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3499 break; 3481 break;
3500 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3502 break; 3484 break;
… …
3569 break; 3551 break;
3570 case CSI_75: 3552 case CSI_75:
3571 scr_cursor (RESTORE); 3553 scr_cursor (RESTORE);
3572 break; 3554 break;
3573 3555
3574#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3575 case CSI_74: 3557 case CSI_74:
3576 process_window_ops (arg, nargs); 3558 process_window_ops (arg, nargs);
3577 break; 3559 break;
3578#endif 3560#endif
3579 3561
… …
3586 break; 3568 break;
3587 } 3569 }
3588} 3570}
3589/*}}} */ 3571/*}}} */
3590 3572
3591#if ENABLE_FRILLS 3573#if !ENABLE_MINIMAL
3592/* ARGSUSED */ 3574/* ARGSUSED */
3593void 3575void
3594rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3576rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595{ 3577{
3596 int x, y; 3578 int x, y;
3597 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3598 Window wdummy; 3580 Window wdummy;
3599 dDisp; 3581
3582 dLocal (Display *, dpy);
3600 3583
3601 if (nargs == 0) 3584 if (nargs == 0)
3602 return; 3585 return;
3603 3586
3604 switch (args[0]) 3587 switch (args[0])
3605 { 3588 {
3606 /* 3589 /*
3607 * commands 3590 * commands
3608 */ 3591 */
3609 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3610 XMapWindow (disp, parent[0]); 3593 XMapWindow (dpy, parent[0]);
3611 break; 3594 break;
3612 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3613 XIconifyWindow (disp, parent[0], display->screen); 3596 XIconifyWindow (dpy, parent[0], display->screen);
3614 break; 3597 break;
3615 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3616 XMoveWindow (disp, parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3617 break; 3600 break;
3618 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620 break; 3603 break;
3621 case 5: /* raise window */ 3604 case 5: /* raise window */
3622 XRaiseWindow (disp, parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3623 break; 3606 break;
3624 case 6: /* lower window */ 3607 case 6: /* lower window */
3625 XLowerWindow (disp, parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3626 break; 3609 break;
3627 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3628 scr_touch (true); 3611 scr_touch (true);
3629 break; 3612 break;
3630 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
… …
3637 if (args[0] >= 24) /* set height (chars) */ 3620 if (args[0] >= 24) /* set height (chars) */
3638 set_widthheight ((unsigned int)width, 3621 set_widthheight ((unsigned int)width,
3639 (unsigned int) (args[1] * fheight)); 3622 (unsigned int) (args[1] * fheight));
3640 break; 3623 break;
3641 3624
3642
3643 /* 3625 /*
3644 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3645 */ 3627 */
3646 case 11: /* report window state */ 3628 case 11: /* report window state */
3647 XGetWindowAttributes (disp, parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649 break; 3631 break;
3650 case 13: /* report window position */ 3632 case 13: /* report window position */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 XTranslateCoordinates (disp, parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3653 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3654 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3655 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3656 break; 3638 break;
3657 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660 break; 3642 break;
3661 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3662 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663 break; 3645 break;
… …
3665 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666 break; 3648 break;
3667 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3668 { 3650 {
3669 char *s; 3651 char *s;
3670 XGetIconName (disp, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672 XFree (s); 3654 XFree (s);
3673 } 3655 }
3674 break; 3656 break;
3675 case 21: /* report window title */ 3657 case 21: /* report window title */
3676 { 3658 {
3677 char *s; 3659 char *s;
3678 XFetchName (disp, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680 XFree (s); 3662 XFree (s);
3681 } 3663 }
3682 break; 3664 break;
3683 } 3665 }
3684} 3666}
… …
3711 seen_esc = true; 3693 seen_esc = true;
3712 continue; 3694 continue;
3713 } 3695 }
3714 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3715 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3716 else if (ch < 0x20) 3700 else if (ch < 0x20)
3717 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3718 3702
3719 seen_esc = false; 3703 seen_esc = false;
3720 3704
3721 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3722 // stop at some sane length 3706 // stop at some sane length
3723 return NULL; 3707 return NULL;
3724 3708
3725 if (ch == C0_SYN)
3726 string[n++] = cmd_get8 ();
3727 else
3728 string[n++] = ch; 3709 string[n++] = ch;
3729 } 3710 }
3730 3711
3731 string[n++] = '\0'; 3712 string[n++] = '\0';
3732 3713
3733 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3784void 3765void
3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3766rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786{ 3767{
3787 if (str[0] == '?' && !str[1]) 3768 if (str[0] == '?' && !str[1])
3788 { 3769 {
3789 unsigned short r, g, b; 3770 rgba c;
3790 pix_colors_focused[color].get (display, r, g, b); 3771 pix_colors_focused[color].get (c);
3772
3773#if XFT
3774 if (c.a != rgba::MAX_CC)
3775 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3776 else
3777#endif
3791 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792 } 3779 }
3793 else 3780 else
3794 set_window_color (color, str); 3781 set_window_color (color, str);
3795} 3782}
3796 3783
… …
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3786 */
3800void 3787void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802{ 3789{
3803 int changed = 0;
3804 int color; 3790 int color;
3805 char *buf, *name; 3791 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3793 int saveop = op;
3808 dDisp; 3794
3795 dLocal (Display *, dpy);
3809 3796
3810 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3811 switch (op) 3802 switch (op)
3812 { 3803 {
3813 case XTerm_name: 3804 case XTerm_name:
3814 set_title (str); 3805 set_title (str);
3815 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3829 unsigned long bytes_after; 3820 unsigned long bytes_after;
3830 unsigned char *value = 0; 3821 unsigned char *value = 0;
3831 const char *str = ""; 3822 const char *str = "";
3832 3823
3833 if (prop 3824 if (prop
3834 && XGetWindowProperty (disp, parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3835 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3836 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3837 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3838 && actual_type != None 3829 && actual_type != None
3839 && actual_format == 8) 3830 && actual_format == 8)
3840 str = (const char *)(value); 3831 str = (const char *)(value);
3841 3832
3842 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3833 tt_printf ("\033]%d;%s%c", op, str, resp);
3843 3834
3844 XFree (value); 3835 XFree (value);
3845 } 3836 }
3846 else 3837 else
3847 { 3838 {
… …
3851 { 3842 {
3852 *eq = 0; 3843 *eq = 0;
3853 set_utf8_property (display->atom (str), eq + 1); 3844 set_utf8_property (display->atom (str), eq + 1);
3854 } 3845 }
3855 else 3846 else
3856 XDeleteProperty (disp, parent[0], 3847 XDeleteProperty (dpy, parent[0],
3857 display->atom (str)); 3848 display->atom (str));
3858 } 3849 }
3859 break; 3850 break;
3860 3851
3861 case XTerm_Color: 3852 case XTerm_Color:
… …
3871 break; 3862 break;
3872 3863
3873 if ((buf = strchr (name, ';')) != NULL) 3864 if ((buf = strchr (name, ';')) != NULL)
3874 *buf++ = '\0'; 3865 *buf++ = '\0';
3875 3866
3876 if (name[0] == '?' && !name[1]) 3867 process_color_seq (op, color, name, resp);
3877 {
3878 unsigned short r, g, b;
3879 pix_colors_focused[color].get (display, r, g, b);
3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3881 }
3882 else
3883 set_window_color (color, name);
3884 } 3868 }
3885 break; 3869 break;
3886 case XTerm_Color00: 3870 case XTerm_Color00:
3887 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3871 process_color_seq (op, Color_fg, str, resp);
3888 break; 3872 break;
3889 case XTerm_Color01: 3873 case XTerm_Color01:
3890 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3874 process_color_seq (op, Color_bg, str, resp);
3891 break; 3875 break;
3892#ifndef NO_CURSORCOLOR 3876#ifndef NO_CURSORCOLOR
3893 case XTerm_Color_cursor: 3877 case XTerm_Color_cursor:
3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3878 process_color_seq (op, Color_cursor, str, resp);
3895 break; 3879 break;
3896#endif 3880#endif
3897 case XTerm_Color_pointer_fg: 3881 case XTerm_Color_pointer_fg:
3898 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3882 process_color_seq (op, Color_pointer_fg, str, resp);
3899 break; 3883 break;
3900 case XTerm_Color_pointer_bg: 3884 case XTerm_Color_pointer_bg:
3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3885 process_color_seq (op, Color_pointer_bg, str, resp);
3902 break; 3886 break;
3903#ifndef NO_BOLD_UNDERLINE_REVERSE 3887#ifndef NO_BOLD_UNDERLINE_REVERSE
3904 case XTerm_Color_RV: 3888 case XTerm_Color_RV:
3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3889 process_color_seq (op, Color_RV, str, resp);
3906 break; 3890 break;
3907 case Rxvt_Color_BD: 3891 case Rxvt_Color_BD:
3908 case URxvt_Color_BD: 3892 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp); 3893 process_color_seq (op, Color_BD, str, resp);
3910 break; 3894 break;
3911 case Rxvt_Color_UL: 3895 case Rxvt_Color_UL:
3912 case URxvt_Color_UL: 3896 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp); 3897 process_color_seq (op, Color_UL, str, resp);
3914 break; 3898 break;
3915 case URxvt_Color_IT: 3899 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3900 process_color_seq (op, Color_IT, str, resp);
3917 break; 3901 break;
3918#endif 3902#endif
3919#if TRANSPARENT && TINTING 3903#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint: 3904 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3905 process_color_seq (op, Color_tint, str, resp);
3906
3922 check_our_parents (); 3907 check_our_parents ();
3908
3923 if (am_transparent) 3909 if (am_transparent)
3924 want_full_refresh = want_refresh = 1; 3910 want_full_refresh = want_refresh = 1;
3911
3925 break; 3912 break;
3926#endif 3913#endif
3927 3914
3928 case Rxvt_Pixmap: 3915 case Rxvt_Pixmap:
3916 {
3929 if (*str != ';') 3917 if (*str != ';')
3930 { 3918 {
3931#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */ 3920 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */ 3921 set_bgPixmap (str); /* change pixmap */
3934 scr_touch (true); 3922 scr_touch (true);
3935#endif 3923#endif
3936 } 3924 }
3937 3925
3926 int changed = 0;
3927
3938 while ((str = strchr (str, ';')) != NULL) 3928 while ((str = strchr (str, ';')) != NULL)
3939 { 3929 {
3940 str++; 3930 str++;
3941#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3942 changed += scale_pixmap (str); 3932 changed += scale_pixmap (str);
3943#endif 3933#endif
3944 } 3934 }
3945 3935
3946 if (changed) 3936 if (changed)
3947 { 3937 {
3948#ifdef XPM_BACKGROUND 3938#ifdef XPM_BACKGROUND
3949 resize_pixmap (); 3939 resize_pixmap ();
3950 scr_touch (true); 3940 scr_touch (true);
3951#endif 3941#endif
3952 } 3942 }
3943 }
3953 break; 3944 break;
3954 3945
3955 case Rxvt_restoreFG: 3946 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str); 3947 set_window_color (Color_fg, str);
3957 break; 3948 break;
… …
3961 3952
3962 case XTerm_logfile: 3953 case XTerm_logfile:
3963 // TODO, when secure mode? 3954 // TODO, when secure mode?
3964 break; 3955 break;
3965 3956
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3957#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3958 case Rxvt_dumpscreen: /* no error notices */
3974 { 3959 {
3975 int fd; 3960 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3961 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3989 case URxvt_italicFont: 3974 case URxvt_italicFont:
3990 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3991#endif 3976#endif
3992 if (query) 3977 if (query)
3993 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3995 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3996 resp); 3981 resp);
3997 else 3982 else
3998 { 3983 {
3999 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4002 allocated.push_back ((void *)res); 3987 allocated.push_back ((void *)res);
4003 set_fonts (); 3988 set_fonts ();
4004 } 3989 }
4005 break; 3990 break;
4006 3991
4007#if ENABLE_FRILLS 3992 case URxvt_version:
3993 if (query)
3994 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3995 op,
3996 rs[Rs_name], VERSION[0], VERSION[2],
3997 resp);
3998 break;
3999
4000#if !ENABLE_MINIMAL
4008 case URxvt_locale: 4001 case URxvt_locale:
4009 if (query) 4002 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4011 else 4004 else
4012 { 4005 {
4013 set_locale (str); 4006 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 4008 init_xlocale ();
4016 } 4009 }
4017 break; 4010 break;
4018 4011
4019 case URxvt_view_up: 4012 case URxvt_view_up:
… …
4030 break; 4023 break;
4031#endif 4024#endif
4032 4025
4033#if ENABLE_PERL 4026#if ENABLE_PERL
4034 case URxvt_perl: 4027 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4036 ; // no responses yet 4029 ; // no responses yet
4037 break; 4030 break;
4038#endif 4031#endif
4039 } 4032 }
4040} 4033}
… …
4072 return state; 4065 return state;
4073} 4066}
4074 4067
4075/* we're not using priv _yet_ */ 4068/* we're not using priv _yet_ */
4076void 4069void
4077rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4070rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078{ 4071{
4079 unsigned int i, j; 4072 unsigned int i, j;
4080 int state; 4073 int state;
4081 4074
4082 static const struct 4075 static const struct
… …
4093 { 5, PrivMode_rVideo }, 4086 { 5, PrivMode_rVideo },
4094 { 6, PrivMode_relOrigin }, 4087 { 6, PrivMode_relOrigin },
4095 { 7, PrivMode_Autowrap }, 4088 { 7, PrivMode_Autowrap },
4096 // 8, bi-directional support mode 4089 // 8, bi-directional support mode
4097 { 9, PrivMode_MouseX10 }, 4090 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc
4099 { menuBar_esc, PrivMode_menuBar },
4100#endif
4101 // 18, 19 printing-related 4091 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 4092 { 25, PrivMode_VisibleCursor },
4103#ifdef scrollBar_esc 4093#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 4094 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 4095#endif
… …
4159 scr_touch (true); 4149 scr_touch (true);
4160 break; 4150 break;
4161#endif 4151#endif
4162 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4163 case 1049: 4153 case 1049:
4164 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4165 if (mode == 0) 4155 if (mode == 0)
4166 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4167 else if (mode == 1) 4157 else if (mode == 1)
4168 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4169 break; 4159 break;
… …
4200 /* case 8: - auto repeat, can't do on a per window basis */ 4190 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
4204 break; 4194 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 4195#ifdef scrollBar_esc
4213 case scrollBar_esc: 4196 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 4197 if (scrollbar_mapping (state))
4215 { 4198 {
4216 resize_all_windows (0, 0, 0); 4199 resize_all_windows (0, 0, 0);
… …
4241 break; 4224 break;
4242 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4243 set_option (Opt_scrollTtyKeypress, state); 4226 set_option (Opt_scrollTtyKeypress, state);
4244 break; 4227 break;
4245 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4246 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 4231 scr_erase_screen (2);
4249 scr_change_screen (state); 4232 scr_change_screen (state);
4250 break; 4233 break;
4251 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4252 scr_change_screen (state); 4235 scr_change_screen (state);
4253 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4238 scr_erase_screen (2);
4256 break; 4239 break;
4257 default: 4240 default:
4258 break; 4241 break;
… …
4386 scr_color (Color_bg, Color_bg); 4369 scr_color (Color_bg, Color_bg);
4387 break; 4370 break;
4388 4371
4389 //case 50: // not variable spacing 4372 //case 50: // not variable spacing
4390 4373
4391#if ENABLE_FRILLS 4374#if !ENABLE_MINIMAL
4392 case 90: 4375 case 90:
4393 case 91: /* set bright fg color */ 4376 case 91: /* set bright fg color */
4394 case 92: 4377 case 92:
4395 case 93: 4378 case 93:
4396 case 94: 4379 case 94:
… …
4461rxvt_term::tt_write (const char *data, unsigned int len) 4444rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 4445{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4446 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 4447 return;
4465 4448
4466 if (pty.pty < 0) 4449 if (pty->pty < 0)
4467 return; 4450 return;
4468 4451
4469 if (v_buflen == 0) 4452 if (v_buflen == 0)
4470 { 4453 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4454 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 4455
4473 if ((unsigned int)written == len) 4456 if ((unsigned int)written == len)
4474 return; 4457 return;
4475 4458
4476 data += written; 4459 data += written;
… …
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4468 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486} 4469}
4487 4470
4488void rxvt_term::pty_write () 4471void rxvt_term::pty_write ()
4489{ 4472{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4473 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 4474
4492 if (written > 0) 4475 if (written > 0)
4493 { 4476 {
4494 v_buflen -= written; 4477 v_buflen -= written;
4495 4478

Diff Legend

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