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.264 by root, Mon Jan 16 06:37:51 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)
… …
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 {
… …
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
… …
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 }
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1123{
1048 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1125 want_refresh = 1;
1050 1126
1051 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1128}
1053#endif 1129#endif
1054 1130
1055#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1056void 1132void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1147{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1150 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1151 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1153 }
1079} 1154}
1080#endif 1155#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1160{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1162 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1164 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1166 }
1093} 1167}
1094#endif 1168#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1177 {
1104 if (view_start == top_row || view_start == 0) 1178 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1106 1180
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1181 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1183 }
1111} 1184}
1112#endif 1185#endif
1113 1186
1114#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1115static struct event_handler 1188static struct event_handler
1116{ 1189{
1117 check_watcher cw_yield; 1190 check_watcher yield_ev;
1118 1191
1119 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1120 { 1193 {
1121 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
1122 w.stop (); 1202 w.stop ();
1123 } 1203 }
1124 1204
1125 event_handler () 1205 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1127 { 1207 {
1128 } 1208 }
1129} event_handler; 1209} event_handler;
1130#endif 1210#endif
1131 1211
… …
1142 1222
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1146 1226
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1228
1149 if (r > 0) 1229 if (r > 0)
1150 { 1230 {
1151 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1152 return true; 1232 return true;
1153 } 1233 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1235 {
1156#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1157 if (display->is_local) 1237 if (display->is_local)
1158 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1159#endif 1239#endif
1160 } 1240 }
1161 else 1241 else
1162 { 1242 {
1163 pty_ev.stop (); 1243 pty_ev.stop ();
1164 1244
1165 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1166 destroy (); 1246 destroy ();
1167 } 1247 }
1168 1248
1169 return false; 1249 return false;
1170} 1250}
… …
1185} 1265}
1186 1266
1187void 1267void
1188rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1189{ 1269{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1271 recolour_cursor ();
1192 1272
1193#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1274 hidden_pointer = 0;
1195 1275
1196 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1198#endif 1278#endif
1199} 1279}
1200 1280
1201#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1202void 1282void
1203rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1204{ 1284{
1205 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1206 return; 1286 return;
1207 1287
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1289 XFlush (dpy);
1210 1290
1211 hidden_pointer = 1; 1291 hidden_pointer = 1;
1212} 1292}
1213 1293
1214void 1294void
… …
1287 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1288 (32 + x + 1), 1368 (32 + x + 1),
1289 (32 + y + 1)); 1369 (32 + y + 1));
1290} 1370}
1291 1371
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301
1302/*{{{ process an X event */ 1372/*{{{ process an X event */
1303void 1373void
1304rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1305{ 1375{
1306 make_current (); 1376 make_current ();
1307 1377
1308 dDisp; 1378 dLocal (Display *, dpy);
1309 1379
1310 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1383 return;
1313 1384
1314 // for XQueryPointer 1385 // for XQueryPointer
1315 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
… …
1317 unsigned int unused_mask; 1388 unsigned int unused_mask;
1318 1389
1319 switch (ev.type) 1390 switch (ev.type)
1320 { 1391 {
1321 case KeyPress: 1392 case KeyPress:
1322#if ISO_14755 1393 key_press (ev.xkey);
1323 if (!(iso14755buf & ISO_14755_52))
1324#endif
1325 lookup_key (ev.xkey);
1326
1327 break; 1394 break;
1328 1395
1329 case KeyRelease: 1396 case KeyRelease:
1330 { 1397 key_release (ev.xkey);
1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1332 KeySym keysym;
1333
1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1335#endif
1336
1337#if ENABLE_FRILLS || ISO_14755
1338 // ISO 14755 support
1339 if (iso14755buf)
1340 if (iso14755buf & ISO_14755_52)
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345# if ISO_14755
1346 // iso14755 part 5.2 handling: release time
1347 // first: controls
1348 if ((ev.xkey.state & ControlMask)
1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1351 {
1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1353 commit_iso14755 ();
1354 goto skip_switch;
1355 }
1356
1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1358 if (i[0] == keysym)
1359 {
1360 iso14755buf = ISO_14755_51 | i[1];
1361 commit_iso14755 ();
1362 goto skip_switch;
1363 }
1364
1365 scr_bell ();
1366# endif
1367 iso14755buf = 0;
1368 break;
1369 }
1370 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1371 {
1372# if ENABLE_OVERLAY
1373 scr_overlay_off ();
1374# endif
1375 if (iso14755buf & ISO_14755_51)
1376 commit_iso14755 ();
1377#if ISO_14755
1378 else if (iso14755buf & ISO_14755_STARTED)
1379 {
1380 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1381
1382 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1383 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1384 }
1385# endif
1386 else
1387 iso14755buf = 0;
1388 }
1389#endif
1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393 break;
1394
1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1396 if (!(ev.xkey.state & ControlMask))
1397 slip_wheel_ev.stop ();
1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1399 mouse_slip_wheel_speed = 0;
1400#endif
1401 break; 1398 break;
1402 }
1403 1399
1404 case ButtonPress: 1400 case ButtonPress:
1405 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1406 break; 1402 break;
1407 1403
… …
1409 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1410 break; 1406 break;
1411 1407
1412 case ClientMessage: 1408 case ClientMessage:
1413 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 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 {
1416 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)))
1417 destroy (); 1419 destroy ();
1420 }
1418#if ENABLE_EWMH 1421#if ENABLE_EWMH
1419 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])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &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 }
1423#endif 1437#endif
1424 } 1438 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1434#ifdef OFFIX_DND
1435 /* OffiX Dnd (drag 'n' drop) protocol */
1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1437 && (ev.xclient.data.l[0] == DndFile
1438 || ev.xclient.data.l[0] == DndDir
1439 || ev.xclient.data.l[0] == DndLink))
1440 {
1441 /* Get Dnd data */
1442 Atom ActualType;
1443 int ActualFormat;
1444 unsigned char *data;
1445 unsigned long Size, RemainingBytes;
1446
1447 XGetWindowProperty (disp, display->root,
1448 xa[XA_DNDSELECTION],
1449 0L, 1000000L,
1450 False, AnyPropertyType,
1451 &ActualType, &ActualFormat,
1452 &Size, &RemainingBytes,
1453 &data);
1454 set_string_property (XA_CUT_BUFFER0, data);
1455 XFree (data);
1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1458 }
1459#endif /* OFFIX_DND */
1460 break; 1439 break;
1461 1440
1462 case MappingNotify: 1441 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1443 break;
… …
1487 break; 1466 break;
1488 } 1467 }
1489 break; 1468 break;
1490 1469
1491 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1492 focus_in (); 1474 focus_in ();
1493 break; 1475 break;
1494 1476
1495 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1496 focus_out (); 1481 focus_out ();
1497 break; 1482 break;
1498 1483
1499 case ConfigureNotify: 1484 case ConfigureNotify:
1500 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1501 { 1486 {
1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1503 ; 1488 ;
1504 1489
1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506 { 1491 {
1507 seen_resize = 1; 1492 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1494 }
1510 1495
1511#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
1512 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1513 check_our_parents (); 1500 check_our_parents ();
1514#endif 1501#endif
1515 } 1502 }
1516 break; 1503 break;
1517 1504
1518 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1510
1523 break; 1511 break;
1524 1512
1525 case SelectionClear: 1513 case SelectionClear:
1526 selection_clear (); 1514 selection_clear ();
… …
1562 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1563 { 1551 {
1564 do 1552 do
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1568 1556
1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570 1558
1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1572 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1573 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1574 1562
1575 want_refresh = 1; 1563 want_refresh = 1;
1576 } 1564 }
1577 else 1565 else
1578 { 1566 {
1579 XEvent unused_event; 1567 XEvent unused_event;
1580 1568
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1582 ; 1570 ;
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1584 ; 1572 ;
1585 1573
1586 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1587 { 1575 {
1588 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1589 scrollbar_show (0); 1577 scrollbar_show (0);
1590 } 1578 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595 1579
1596#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1599#endif 1583#endif
1600 } 1584 }
1601 break; 1585 break;
1602 1586
1603 case MotionNotify: 1587 case MotionNotify:
1604#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1589 if (hidden_pointer)
1606 pointer_unblank (); 1590 pointer_unblank ();
1607#endif 1591#endif
1608#if MENUBAR
1609 if (isMenuBarWindow (ev.xany.window))
1610 {
1611 menubar_control (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1593 break;
1617 1594
1618 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1619 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1599 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1601 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1625 ; 1603 ;
1626 1604
1627 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1628 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1629 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1630 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1631 &ev.xbutton.state); 1609 &ev.xbutton.state);
1632#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1696#endif 1674#endif
1697 } 1675 }
1698 } 1676 }
1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1700 { 1678 {
1701 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1702 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1703 ; 1681 ;
1704 1682
1705 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1706 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1707 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1708 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1709 &unused_mask); 1687 &unused_mask);
1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1714 scrollbar_show (1); 1692 scrollbar_show (1);
1715 } 1693 }
1716 break; 1694 break;
1717 } 1695 }
1718 1696
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1723 { 1699 {
1724 if (hidden_cursor) 1700 if (hidden_cursor)
1725 { 1701 {
1726 hidden_cursor = 0; 1702 hidden_cursor = 0;
1727 want_refresh = 1; 1703 want_refresh = 1;
1728 } 1704 }
1729 1705
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731 } 1707 }
1732#endif 1708#endif
1733 1709
1734#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 { 1712 {
1737 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1740 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1752 if (!focus) 1728 if (!focus)
1753 { 1729 {
1754 focus = 1; 1730 focus = 1;
1755 want_refresh = 1; 1731 want_refresh = 1;
1756 1732
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1734
1759#if USE_XIM 1735#if USE_XIM
1760 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1761 { 1737 {
1762 IMSetStatusPosition (); 1738 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1764 } 1740 }
1765#endif 1741#endif
1766#if CURSOR_BLINK 1742#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1745#endif
1770#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1772 { 1748 {
1773 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1774 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 }
1775 } 1764 }
1776#endif 1765#endif
1777 } 1766 }
1778} 1767}
1779 1768
… …
1799#if USE_XIM 1788#if USE_XIM
1800 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1802#endif 1791#endif
1803#if CURSOR_BLINK 1792#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1806 hidden_cursor = 0; 1795 hidden_cursor = 0;
1807#endif 1796#endif
1808#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1813 } 1802 }
1814#endif 1803#endif
1815 } 1804 }
1816} 1805}
1817 1806
1818#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
1819void 1821void
1820rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1823{
1822 make_current (); 1824 make_current ();
1823 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
1824 switch (ev.type) 1831 switch (ev.type)
1825 { 1832 {
1826 case PropertyNotify: 1833 case PropertyNotify:
1827 /* 1834 /*
1828 * 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,
… …
1832 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1833 return; 1840 return;
1834 1841
1835 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1836 case ReparentNotify: 1843 case ReparentNotify:
1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1838 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1839 break; 1846 break;
1840 } 1847 }
1848# endif
1841} 1849}
1842#endif 1850#endif
1843 1851
1844void 1852void
1845rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
1854 /* 1862 /*
1855 * VT window processing of button press 1863 * VT window processing of button press
1856 */ 1864 */
1857 if (ev.window == vt) 1865 if (ev.window == vt)
1858 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1859#if ISO_14755 1870#if ISO_14755
1860 // 5.4 1871 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1873 {
1863 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1905 else 1916 else
1906 { 1917 {
1907 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1909 1920
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1921 switch (ev.button)
1912 { 1922 {
1913 case Button1: 1923 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1924 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1925 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1926#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1927 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1928#else
1919 selection.rect = false; 1929 selection.rect = false;
1920#endif 1930#endif
1921 1931
1922 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1934 {
1925 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1927 else 1937 else
1928 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
1929 } 1939 }
1930 else 1940 else
1931 { 1941 {
1932 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1943 MEvent.clicks++;
1934 else 1944 else
1935 MEvent.clicks = 1; 1945 MEvent.clicks = 1;
1936 1946
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1947 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1948 }
1939 1949
1940 MEvent.button = Button1; 1950 MEvent.button = Button1;
1941 break; 1951 break;
1942 1952
1943 case Button3: 1953 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1946 else 1956 else
1947 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1948 1958
1949 MEvent.button = Button3; 1959 MEvent.button = Button3;
1950 break; 1960 break;
1951 } 1961 }
1952 } 1962 }
1953 1963
1954 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1955 return; 1965 return;
1956 } 1966 }
1957 1967
… …
2096 } 2106 }
2097 } 2107 }
2098 2108
2099 return; 2109 return;
2100 } 2110 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2111}
2110 2112
2111void 2113void
2112rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
2113{ 2115{
… …
2119 2121
2120 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2121 { 2123 {
2122 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2123 scrollbar_show (0); 2125 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2126 }
2128 2127
2129#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2132#endif 2131#endif
2133 2132
2134 if (ev.window == vt) 2133 if (ev.window == vt)
2135 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2136#if ISO_14755 2138#if ISO_14755
2137 // 5.4 2139 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2141 return;
2140#endif 2142#endif
2143
2141 if (reportmode) 2144 if (reportmode)
2142 { 2145 {
2143 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2169 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2173 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2173 2176
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2177 switch (ev.button)
2178 { 2178 {
2179 case Button1: 2179 case Button1:
2180 case Button3: 2180 case Button3:
2181 selection_make (ev.time); 2181 selection_make (ev.time);
2182 break; 2182 break;
2183
2183 case Button2: 2184 case Button2:
2184 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);
2185 break; 2187 break;
2188
2186#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2187 case Button4: 2190 case Button4:
2188 case Button5: 2191 case Button5:
2189 { 2192 {
2190 int i; 2193 int i;
… …
2192 2195
2193 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2194 2197
2195 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2196 i = 1; 2199 i = 1;
2197 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2198 i = nrow - 1; 2201 i = nrow - 1;
2199 else 2202 else
2200 i = 5; 2203 i = 5;
2201 2204
2202# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2222 } 2225 }
2223 break; 2226 break;
2224#endif 2227#endif
2225 } 2228 }
2226 } 2229 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2230}
2232 2231
2233#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2234#if TINTING 2233#if TINTING
2235/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2236 2235
2237typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2238 2237
2239void 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)
2240{ 2239{
2241 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2242 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246 int i; 2245 int i;
2247 2246
2248 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2249 2248
2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251 2250
2252 /* for convenience */ 2251 /* for convenience */
2253 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2474 Atom atype; 2473 Atom atype;
2475 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2476 Window root, oldp, *list; 2475 Window root, oldp, *list;
2477 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2478 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2479 dDisp;
2480 2478
2481 pchanged = 0; 2479 pchanged = 0;
2482 2480
2483 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2484 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2485 2483
2486 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2487 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2488 2486
2489 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2490 2488
2491 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2492 { 2490 {
2493 if (am_transparent) 2491 if (am_transparent)
2494 { 2492 {
2495 pchanged = 1; 2493 pchanged = 1;
2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2497 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2498 } 2496 }
2499 2497
2500 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2501 } 2499 }
2502 2500
2503 /* 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. */
2504 XSync (disp, False); 2502 XSync (dpy, False);
2505 2503
2506 /* 2504 /*
2507 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2508 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2509 * 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.
2510 */ 2508 */
2511 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2515 2513
2516 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2517 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2521 2519
2522 if (!i || prop == NULL 2520 if (!i || prop == NULL
2523#if TINTING 2521#if TINTING
2524 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2525#endif 2523#endif
2526 ) 2524 )
2527 have_pixmap = 0; 2525 have_pixmap = 0;
2528 else 2526 else
2529 { 2527 {
… …
2542 Window cr; 2540 Window cr;
2543 XImage *image; 2541 XImage *image;
2544 GC gc; 2542 GC gc;
2545 XGCValues gcvalue; 2543 XGCValues gcvalue;
2546 2544
2547 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2548 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2549 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2550 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2551 nx = ny = 0; 2549 nx = ny = 0;
2552 2550
… …
2565 } 2563 }
2566 2564
2567 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2568 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2569 2567
2570 XSync (disp, False); 2568 XSync (dpy, False);
2571 allowedxerror = -1; 2569 allowedxerror = -1;
2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573 2571
2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2575 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2576 allowedxerror = 0; 2574 allowedxerror = 0;
2577 2575
… …
2580 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2581 { 2579 {
2582 pchanged = 1; 2580 pchanged = 1;
2583 if (pixmap != None) 2581 if (pixmap != None)
2584 { 2582 {
2585 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2586 pixmap = None; 2584 pixmap = None;
2587 } 2585 }
2588 } 2586 }
2589 2587
2590 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2591 } 2589 }
2592 else 2590 else
2593 { 2591 {
2594 if (pixmap != None) 2592 if (pixmap != None)
2595 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2596 2594
2597#if TINTING 2595#if TINTING
2598 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2599 { 2597 {
2600 unsigned short rm, gm, bm;
2601 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602 2599
2600 rgba c;
2603 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2604 2602
2605 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2606 } 2604 }
2607#endif 2605#endif
2608 2606
2609 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2610 szHint.width, szHint.height, image->depth);
2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2612 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2613 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2614 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2615 XDestroyImage (image); 2612 XDestroyImage (image);
2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2617 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2618 2615
2619 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2620 pchanged = 1; 2617 pchanged = 1;
2621 2618
2622 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2623 } 2620 }
2624 } 2621 }
2625 2622
2626 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2628 else 2625 else
2629 { 2626 {
2630 unsigned int n; 2627 unsigned int n;
2631 /* 2628 /*
2632 * InheritPixmap transparency 2629 * InheritPixmap transparency
2633 */ 2630 */
2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 { 2632 {
2636 oldp = parent[i]; 2633 oldp = parent[i];
2637 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2638 &parent[i], &list, &n);
2639 XFree (list); 2635 XFree (list);
2640 2636
2641 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2642 { 2638 {
2643 if (oldp != None) 2639 if (oldp != None)
… …
2651 } 2647 }
2652 2648
2653 n = 0; 2649 n = 0;
2654 2650
2655 if (pchanged) 2651 if (pchanged)
2656 {
2657 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2658 { 2653 {
2659 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2661 { 2657 {
2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663 break; 2659 break;
2664 } 2660 }
2665 } 2661 }
2666 }
2667 2662
2668 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2669 { 2664 {
2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2672 am_transparent = 0; 2667 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2674 } 2669 }
2675 else 2670 else
2676 { 2671 {
2677#if WAIT_FOR_WM
2678 /* wait (an arbitrary period) for the WM to do its thing
2679 * needed for fvwm2.2.2 (and before?) */
2680 sleep (1);
2681#endif
2682 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2683 { 2673 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2686 } 2676 }
2687 2677
2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2689 am_transparent = 1; 2679 am_transparent = 1;
2690 } 2680 }
2691 2681
2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693 parent[i] = None; 2683 parent[i] = None;
2694 } 2684 }
2695 2685
2696 if (scrollBar.win) 2686 if (scrollBar.win)
2697 { 2687 {
2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2699 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2700 scrollbar_show (0); 2690 scrollbar_show (0);
2701 } 2691 }
2702 2692
2703 if (am_transparent) 2693 if (am_transparent)
… …
2766 if (ch == C0_LF) 2756 if (ch == C0_LF)
2767 nlines++; 2757 nlines++;
2768 2758
2769 refresh_count++; 2759 refresh_count++;
2770 2760
2771 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2772 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2773 { 2763 {
2774 refreshnow = true; 2764 refreshnow = true;
2775 refresh_count = 0; 2765 refresh_count = 0;
2776 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2778 } 2768 }
2779 2769
2780 // scr_add_lines only works for nlines <= nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2771 if (nlines >= nrow - 1)
2782 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 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))))
2784 scr_add_lines (buf, str - buf, nlines); 2775 scr_add_lines (buf, str - buf, nlines);
2785 2776
2786 nlines = 0; 2777 nlines = 0;
2787 str = buf; 2778 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2779 eol = str + min (ncol, UBUFSIZ);
… …
2803 2794
2804 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2796 ch = next_char ();
2806 } 2797 }
2807 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 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))))
2809 scr_add_lines (buf, str - buf, nlines); 2801 scr_add_lines (buf, str - buf, nlines);
2810 2802
2811 /* 2803 /*
2812 * 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
2813 * 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.
2814 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2815 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2816 */ 2808 */
2817 if (refreshnow) 2809 if (refreshnow)
2818 { 2810 {
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++; 2812 refresh_limit++;
2821 else 2813 else
2822 { 2814 {
2823 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2824 scr_refresh (refresh_type); 2817 scr_refresh ();
2825 want_refresh = 1; 2818 want_refresh = 1;
2826 } 2819 }
2827 } 2820 }
2828 2821
2829 } 2822 }
… …
2847 return flag; 2840 return flag;
2848} 2841}
2849 2842
2850// read the next character 2843// read the next character
2851wchar_t 2844wchar_t
2852rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2853{ 2846{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2848 {
2856 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2878 return NOCHAR; 2871 return NOCHAR;
2879} 2872}
2880 2873
2881// read the next octet 2874// read the next octet
2882uint32_t 2875uint32_t
2883rxvt_term::next_octet () 2876rxvt_term::next_octet () NOTHROW
2884{ 2877{
2885 return cmdbuf_ptr < cmdbuf_endp 2878 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2879 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2880 : NOCHAR;
2888} 2881}
2882
2883static class out_of_input out_of_input;
2889 2884
2890/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2891/* 2886/*
2892 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2893 * to the command. 2888 * to the command.
2894 */ 2889 */
2895wchar_t 2890wchar_t
2896rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2892{
2898 wchar_t c = next_char (); 2893 wchar_t c = next_char ();
2899 2894
2900 if (c == NOCHAR) 2895 if (c == NOCHAR)
2901 throw out_of_input; 2896 throw out_of_input;
2902 2897
2903 return c; 2898 return c;
2904} 2899}
2905 2900
2906uint32_t 2901uint32_t
2907rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2903{
2909 uint32_t c = next_octet (); 2904 uint32_t c = next_octet ();
2910 2905
2911 if (c == NOCHAR) 2906 if (c == NOCHAR)
2912 throw out_of_input; 2907 throw out_of_input;
… …
3150 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3151 break; 3146 break;
3152 case '+': 3147 case '+':
3153 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3154 break; 3149 break;
3155#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3156 case '6': 3151 case '6':
3157 scr_backindex (); 3152 scr_backindex ();
3158 break; 3153 break;
3159#endif 3154#endif
3160 case '7': 3155 case '7':
3161 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3162 break; 3157 break;
3163 case '8': 3158 case '8':
3164 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3165 break; 3160 break;
3166#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3167 case '9': 3162 case '9':
3168 scr_forwardindex (); 3163 scr_forwardindex ();
3169 break; 3164 break;
3170#endif 3165#endif
3171 case '=': 3166 case '=':
… …
3333 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3334 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3335 if (arg[p] == -1) 3330 if (arg[p] == -1)
3336 arg[p] = ndef; 3331 arg[p] = ndef;
3337 3332
3338#ifdef DEBUG_CMD
3339 fprintf (stderr, "CSI ");
3340 for (p = 0; p < nargs; p++)
3341 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3342 fprintf (stderr, "%c\n", ch);
3343#endif
3344
3345 /* 3333 /*
3346 * private mode handling 3334 * private mode handling
3347 */ 3335 */
3348 if (priv) 3336 if (priv)
3349 { 3337 {
3350 switch (priv) 3338 switch (priv)
3351 { 3339 {
3352 case '>': 3340 case '>':
3353 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3354 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 }
3355 break; 3352 break;
3356 case '?': 3353 case '?':
3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3359 break; 3356 break;
… …
3485 break; 3482 break;
3486 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3487 scr_report_position (); 3484 scr_report_position ();
3488 break; 3485 break;
3489 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3490 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3491 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3492 break; 3489 break;
3493 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3494 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3495 break; 3492 break;
… …
3562 break; 3559 break;
3563 case CSI_75: 3560 case CSI_75:
3564 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3565 break; 3562 break;
3566 3563
3567#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3568 case CSI_74: 3565 case CSI_74:
3569 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3570 break; 3567 break;
3571#endif 3568#endif
3572 3569
… …
3579 break; 3576 break;
3580 } 3577 }
3581} 3578}
3582/*}}} */ 3579/*}}} */
3583 3580
3584#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3585/* ARGSUSED */ 3582/* ARGSUSED */
3586void 3583void
3587rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588{ 3585{
3589 int x, y; 3586 int x, y;
3590 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3591 Window wdummy; 3588 Window wdummy;
3592 dDisp; 3589
3590 dLocal (Display *, dpy);
3593 3591
3594 if (nargs == 0) 3592 if (nargs == 0)
3595 return; 3593 return;
3596 3594
3597 switch (args[0]) 3595 switch (args[0])
3598 { 3596 {
3599 /* 3597 /*
3600 * commands 3598 * commands
3601 */ 3599 */
3602 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3603 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3604 break; 3602 break;
3605 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3606 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3607 break; 3605 break;
3608 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3609 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3610 break; 3608 break;
3611 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613 break; 3611 break;
3614 case 5: /* raise window */ 3612 case 5: /* raise window */
3615 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3616 break; 3614 break;
3617 case 6: /* lower window */ 3615 case 6: /* lower window */
3618 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3619 break; 3617 break;
3620 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3621 scr_touch (true); 3619 scr_touch (true);
3622 break; 3620 break;
3623 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3630 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3631 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3632 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3633 break; 3631 break;
3634 3632
3635
3636 /* 3633 /*
3637 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3638 */ 3635 */
3639 case 11: /* report window state */ 3636 case 11: /* report window state */
3640 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642 break; 3639 break;
3643 case 13: /* report window position */ 3640 case 13: /* report window position */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3646 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3647 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3648 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3649 break; 3646 break;
3650 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653 break; 3650 break;
3654 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3655 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656 break; 3653 break;
… …
3658 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659 break; 3656 break;
3660 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3661 { 3658 {
3662 char *s; 3659 char *s;
3663 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3664 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 */
3665 XFree (s); 3662 XFree (s);
3666 } 3663 }
3667 break; 3664 break;
3668 case 21: /* report window title */ 3665 case 21: /* report window title */
3669 { 3666 {
3670 char *s; 3667 char *s;
3671 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3672 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 */
3673 XFree (s); 3670 XFree (s);
3674 } 3671 }
3675 break; 3672 break;
3676 } 3673 }
3677} 3674}
… …
3704 seen_esc = true; 3701 seen_esc = true;
3705 continue; 3702 continue;
3706 } 3703 }
3707 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3708 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3709 else if (ch < 0x20) 3708 else if (ch < 0x20)
3710 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3711 3710
3712 seen_esc = false; 3711 seen_esc = false;
3713 3712
3714 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3715 // stop at some sane length 3714 // stop at some sane length
3716 return NULL; 3715 return NULL;
3717 3716
3718 if (ch == C0_SYN)
3719 string[n++] = cmd_get8 ();
3720 else
3721 string[n++] = ch; 3717 string[n++] = ch;
3722 } 3718 }
3723 3719
3724 string[n++] = '\0'; 3720 string[n++] = '\0';
3725 3721
3726 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3777void 3773void
3778rxvt_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)
3779{ 3775{
3780 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3781 { 3777 {
3782 unsigned short r, g, b; 3778 rgba c;
3783 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
3784 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);
3785 } 3787 }
3786 else 3788 else
3787 set_window_color (color, str); 3789 set_window_color (color, str);
3788} 3790}
3789 3791
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3794 */
3793void 3795void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3797{
3796 int changed = 0;
3797 int color; 3798 int color;
3798 char *buf, *name; 3799 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3801 int saveop = op;
3801 dDisp; 3802
3803 dLocal (Display *, dpy);
3802 3804
3803 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
3804 switch (op) 3810 switch (op)
3805 { 3811 {
3806 case XTerm_name: 3812 case XTerm_name:
3807 set_title (str); 3813 set_title (str);
3808 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3822 unsigned long bytes_after; 3828 unsigned long bytes_after;
3823 unsigned char *value = 0; 3829 unsigned char *value = 0;
3824 const char *str = ""; 3830 const char *str = "";
3825 3831
3826 if (prop 3832 if (prop
3827 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3828 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3829 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3830 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3831 && actual_type != None 3837 && actual_type != None
3832 && actual_format == 8) 3838 && actual_format == 8)
3833 str = (const char *)(value); 3839 str = (const char *)(value);
3834 3840
3835 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3836 3842
3837 XFree (value); 3843 XFree (value);
3838 } 3844 }
3839 else 3845 else
3840 { 3846 {
… …
3844 { 3850 {
3845 *eq = 0; 3851 *eq = 0;
3846 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3847 } 3853 }
3848 else 3854 else
3849 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3850 display->atom (str)); 3856 display->atom (str));
3851 } 3857 }
3852 break; 3858 break;
3853 3859
3854 case XTerm_Color: 3860 case XTerm_Color:
… …
3864 break; 3870 break;
3865 3871
3866 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3867 *buf++ = '\0'; 3873 *buf++ = '\0';
3868 3874
3869 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3870 {
3871 unsigned short r, g, b;
3872 pix_colors_focused[color].get (display, r, g, b);
3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3874 }
3875 else
3876 set_window_color (color, name);
3877 } 3876 }
3878 break; 3877 break;
3879 case XTerm_Color00: 3878 case XTerm_Color00:
3880 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3881 break; 3880 break;
3882 case XTerm_Color01: 3881 case XTerm_Color01:
3883 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3884 break; 3883 break;
3885#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3886 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3888 break; 3887 break;
3889#endif 3888#endif
3890 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3891 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3892 break; 3891 break;
3893 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3895 break; 3894 break;
3896#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3897 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3899 break; 3898 break;
3900 case Rxvt_Color_BD: 3899 case Rxvt_Color_BD:
3901 case URxvt_Color_BD: 3900 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp); 3901 process_color_seq (op, Color_BD, str, resp);
3903 break; 3902 break;
3904 case Rxvt_Color_UL: 3903 case Rxvt_Color_UL:
3905 case URxvt_Color_UL: 3904 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp); 3905 process_color_seq (op, Color_UL, str, resp);
3907 break; 3906 break;
3908 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3910 break; 3909 break;
3911#endif 3910#endif
3912#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3913 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3915 check_our_parents (); 3915 check_our_parents ();
3916
3916 if (am_transparent) 3917 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3919
3918 break; 3920 break;
3919#endif 3921#endif
3920 3922
3921 case Rxvt_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3922 if (*str != ';') 3925 if (*str != ';')
3923 { 3926 {
3924#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3927 scr_touch (true); 3930 scr_touch (true);
3928#endif 3931#endif
3929 } 3932 }
3930 3933
3934 int changed = 0;
3935
3931 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3932 { 3937 {
3933 str++; 3938 str++;
3934#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3935 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3936#endif 3941#endif
3937 } 3942 }
3938 3943
3939 if (changed) 3944 if (changed)
3940 { 3945 {
3941#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3942 resize_pixmap (); 3947 resize_pixmap ();
3943 scr_touch (true); 3948 scr_touch (true);
3944#endif 3949#endif
3945 } 3950 }
3951 }
3946 break; 3952 break;
3947 3953
3948 case Rxvt_restoreFG: 3954 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3950 break; 3956 break;
… …
3954 3960
3955 case XTerm_logfile: 3961 case XTerm_logfile:
3956 // TODO, when secure mode? 3962 // TODO, when secure mode?
3957 break; 3963 break;
3958 3964
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3965#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3967 { 3967 {
3968 int fd; 3968 int fd;
3969 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)
… …
3982 case URxvt_italicFont: 3982 case URxvt_italicFont:
3983 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3984#endif 3984#endif
3985 if (query) 3985 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp); 3989 resp);
3990 else 3990 else
3991 { 3991 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3995 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3996 set_fonts (); 3996 set_fonts ();
3997 } 3997 }
3998 break; 3998 break;
3999 3999
4000#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
4001 case URxvt_locale: 4009 case URxvt_locale:
4002 if (query) 4010 if (query)
4003 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);
4004 else 4012 else
4005 { 4013 {
4006 set_locale (str); 4014 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 4016 init_xlocale ();
4009 } 4017 }
4010 break; 4018 break;
4011 4019
4012 case URxvt_view_up: 4020 case URxvt_view_up:
… …
4023 break; 4031 break;
4024#endif 4032#endif
4025 4033
4026#if ENABLE_PERL 4034#if ENABLE_PERL
4027 case URxvt_perl: 4035 case URxvt_perl:
4028 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)))
4029 ; // no responses yet 4037 ; // no responses yet
4030 break; 4038 break;
4031#endif 4039#endif
4032 } 4040 }
4033} 4041}
… …
4065 return state; 4073 return state;
4066} 4074}
4067 4075
4068/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
4069void 4077void
4070rxvt_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)
4071{ 4079{
4072 unsigned int i, j; 4080 unsigned int i, j;
4073 int state; 4081 int state;
4074 4082
4075 static const struct 4083 static const struct
… …
4086 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4099 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4103#endif
… …
4152 scr_touch (true); 4157 scr_touch (true);
4153 break; 4158 break;
4154#endif 4159#endif
4155 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4156 case 1049: 4161 case 1049:
4157 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4158 if (mode == 0) 4163 if (mode == 0)
4159 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4160 else if (mode == 1) 4165 else if (mode == 1)
4161 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4162 break; 4167 break;
… …
4193 /* 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 */
4194 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4202 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4206 case scrollBar_esc: 4204 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4208 { 4206 {
4209 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4234 break; 4232 break;
4235 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4236 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4237 break; 4235 break;
4238 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4239 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4240 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4241 scr_erase_screen (2); 4239 scr_erase_screen (2);
4242 scr_change_screen (state); 4240 scr_change_screen (state);
4243 break; 4241 break;
4244 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4245 scr_change_screen (state); 4243 scr_change_screen (state);
4246 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 4246 scr_erase_screen (2);
4249 break; 4247 break;
4250 default: 4248 default:
4251 break; 4249 break;
… …
4379 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4380 break; 4378 break;
4381 4379
4382 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4383 4381
4384#if ENABLE_FRILLS 4382#if !ENABLE_MINIMAL
4385 case 90: 4383 case 90:
4386 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4387 case 92: 4385 case 92:
4388 case 93: 4386 case 93:
4389 case 94: 4387 case 94:
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 4453{
4456 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)))
4457 return; 4455 return;
4458 4456
4459 if (pty.pty < 0) 4457 if (pty->pty < 0)
4460 return; 4458 return;
4461 4459
4462 if (v_buflen == 0) 4460 if (v_buflen == 0)
4463 { 4461 {
4464 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));
4465 4463
4466 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4467 return; 4465 return;
4468 4466
4469 data += written; 4467 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4477}
4480 4478
4481void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4482{ 4480{
4483 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));
4484 4482
4485 if (written > 0) 4483 if (written > 0)
4486 { 4484 {
4487 v_buflen -= written; 4485 v_buflen -= written;
4488 4486

Diff Legend

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