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

Diff Legend

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