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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

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

Diff Legend

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