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.316 by root, Thu Dec 7 20:59:59 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
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);
905 { 909 {
906 const char ch = C0_ESC; 910 const char ch = C0_ESC;
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
921} 915}
922/*}}} */
923 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 995unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 997{
930 unsigned int n, s; 998 unsigned int n, s;
931 999
1008 while (l->is_longer () && row < end_row); 1076 while (l->is_longer () && row < end_row);
1009 } 1077 }
1010 while (row < end_row); 1078 while (row < end_row);
1011 } 1079 }
1012 1080
1013 scr_refresh (refresh_type); 1081 scr_refresh ();
1014 scrollbar_show (1); 1082 scrollbar_show (1);
1015#ifdef USE_XIM 1083#ifdef USE_XIM
1016 IMSendSpot (); 1084 IMSendSpot ();
1017#endif 1085#endif
1018 } 1086 }
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1115{
1048 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1117 want_refresh = 1;
1050 1118
1051 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1120}
1053#endif 1121#endif
1054 1122
1055#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1056void 1124void
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1139{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1142 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1143 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1145 }
1079} 1146}
1080#endif 1147#endif
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1152{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1154 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1156 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1158 }
1093} 1159}
1094#endif 1160#endif
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1169 {
1104 if (view_start == top_row || view_start == 0) 1170 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1106 1172
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1173 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1175 }
1111} 1176}
1112#endif 1177#endif
1113 1178
1114#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1115static struct event_handler 1180static struct event_handler
1116{ 1181{
1117 check_watcher cw_yield; 1182 check_watcher yield_ev;
1118 1183
1119 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1120 { 1185 {
1121 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1122 w.stop (); 1194 w.stop ();
1123 } 1195 }
1124 1196
1125 event_handler () 1197 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1127 { 1199 {
1128 } 1200 }
1129} event_handler; 1201} event_handler;
1130#endif 1202#endif
1131 1203
1142 1214
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1146 1218
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1220
1149 if (r > 0) 1221 if (r > 0)
1150 { 1222 {
1151 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1152 return true; 1224 return true;
1153 } 1225 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1227 {
1156#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1157 if (display->is_local) 1229 if (display->is_local)
1158 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1159#endif 1231#endif
1160 } 1232 }
1161 else 1233 else
1162 { 1234 {
1163 pty_ev.stop (); 1235 pty_ev.stop ();
1185} 1257}
1186 1258
1187void 1259void
1188rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1189{ 1261{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1263 recolour_cursor ();
1192 1264
1193#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1266 hidden_pointer = 0;
1195 1267
1203rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1204{ 1276{
1205 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1206 return; 1278 return;
1207 1279
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1281 XFlush (dpy);
1210 1282
1211 hidden_pointer = 1; 1283 hidden_pointer = 1;
1212} 1284}
1213 1285
1214void 1286void
1287 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1288 (32 + x + 1), 1360 (32 + x + 1),
1289 (32 + y + 1)); 1361 (32 + y + 1));
1290} 1362}
1291 1363
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 */ 1364/*{{{ process an X event */
1303void 1365void
1304rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1305{ 1367{
1306 make_current (); 1368 make_current ();
1307 1369
1308 dDisp; 1370 dLocal (Display *, dpy);
1309 1371
1310 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1375 return;
1313 1376
1314 // for XQueryPointer 1377 // for XQueryPointer
1315 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1317 unsigned int unused_mask; 1380 unsigned int unused_mask;
1318 1381
1319 switch (ev.type) 1382 switch (ev.type)
1320 { 1383 {
1321 case KeyPress: 1384 case KeyPress:
1322#if ISO_14755 1385 key_press (ev.xkey);
1323 if (!(iso14755buf & ISO_14755_52))
1324#endif
1325 lookup_key (ev.xkey);
1326
1327 break; 1386 break;
1328 1387
1329 case KeyRelease: 1388 case KeyRelease:
1330 { 1389 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; 1390 break;
1402 }
1403 1391
1404 case ButtonPress: 1392 case ButtonPress:
1405 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1406 break; 1394 break;
1407 1395
1409 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1410 break; 1398 break;
1411 1399
1412 case ClientMessage: 1400 case ClientMessage:
1413 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1417 destroy (); 1411 destroy ();
1412 }
1418#if ENABLE_EWMH 1413#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1423#endif 1429#endif
1424 } 1430 }
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; 1431 break;
1461 1432
1462 case MappingNotify: 1433 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1435 break;
1487 break; 1458 break;
1488 } 1459 }
1489 break; 1460 break;
1490 1461
1491 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1492 focus_in (); 1464 focus_in ();
1493 break; 1465 break;
1494 1466
1495 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1496 focus_out (); 1469 focus_out ();
1497 break; 1470 break;
1498 1471
1499 case ConfigureNotify: 1472 case ConfigureNotify:
1500 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1501 { 1474 {
1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1503 ; 1476 ;
1504 1477
1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506 { 1479 {
1507 seen_resize = 1; 1480 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1482 }
1510 1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512 if (OPTION (Opt_transparent)) 1487 if (OPTION (Opt_transparent))
1513 check_our_parents (); 1488 check_our_parents ();
1514#endif 1489#endif
1515 } 1490 }
1516 break; 1491 break;
1517 1492
1518 case PropertyNotify: 1493 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1496 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1498
1523 break; 1499 break;
1524 1500
1525 case SelectionClear: 1501 case SelectionClear:
1526 selection_clear (); 1502 selection_clear ();
1562 if (ev.xany.window == vt) 1538 if (ev.xany.window == vt)
1563 { 1539 {
1564 do 1540 do
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1568 1544
1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570 1546
1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1572 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1573 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1574 1550
1575 want_refresh = 1; 1551 want_refresh = 1;
1576 } 1552 }
1577 else 1553 else
1578 { 1554 {
1579 XEvent unused_event; 1555 XEvent unused_event;
1580 1556
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1582 ; 1558 ;
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1584 ; 1560 ;
1585 1561
1586 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1587 { 1563 {
1588 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1589 scrollbar_show (0); 1565 scrollbar_show (0);
1590 } 1566 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595 1567
1596#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1599#endif 1571#endif
1600 } 1572 }
1601 break; 1573 break;
1602 1574
1603 case MotionNotify: 1575 case MotionNotify:
1604#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1577 if (hidden_pointer)
1606 pointer_unblank (); 1578 pointer_unblank ();
1607#endif 1579#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) 1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1581 break;
1617 1582
1618 if (ev.xany.window == vt) 1583 if (ev.xany.window == vt)
1619 { 1584 {
1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1587 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1589 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1625 ; 1591 ;
1626 1592
1627 XQueryPointer (disp, vt, 1593 XQueryPointer (dpy, vt,
1628 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1629 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1630 &ev.xbutton.x, &ev.xbutton.y, 1596 &ev.xbutton.x, &ev.xbutton.y,
1631 &ev.xbutton.state); 1597 &ev.xbutton.state);
1632#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
1696#endif 1662#endif
1697 } 1663 }
1698 } 1664 }
1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1700 { 1666 {
1701 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1702 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1703 ; 1669 ;
1704 1670
1705 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1706 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1707 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1708 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1709 &unused_mask); 1675 &unused_mask);
1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_show (1); 1680 scrollbar_show (1);
1715 } 1681 }
1716 break; 1682 break;
1717 } 1683 }
1718 1684
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1723 { 1687 {
1724 if (hidden_cursor) 1688 if (hidden_cursor)
1725 { 1689 {
1726 hidden_cursor = 0; 1690 hidden_cursor = 0;
1727 want_refresh = 1; 1691 want_refresh = 1;
1728 } 1692 }
1729 1693
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731 } 1695 }
1732#endif 1696#endif
1733 1697
1734#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1752 if (!focus) 1716 if (!focus)
1753 { 1717 {
1754 focus = 1; 1718 focus = 1;
1755 want_refresh = 1; 1719 want_refresh = 1;
1756 1720
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1722
1759#if USE_XIM 1723#if USE_XIM
1760 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1761 { 1725 {
1762 IMSetStatusPosition (); 1726 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1764 } 1728 }
1765#endif 1729#endif
1766#if CURSOR_BLINK 1730#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1733#endif
1770#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1772 { 1736 {
1773 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1813 } 1777 }
1814#endif 1778#endif
1815 } 1779 }
1816} 1780}
1817 1781
1818#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1819void 1796void
1820rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1798{
1822 make_current (); 1799 make_current ();
1823 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1824 switch (ev.type) 1806 switch (ev.type)
1825 { 1807 {
1826 case PropertyNotify: 1808 case PropertyNotify:
1827 /* 1809 /*
1828 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1836 case ReparentNotify: 1818 case ReparentNotify:
1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1838 want_refresh = want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1839 break; 1821 break;
1840 } 1822 }
1823# endif
1841} 1824}
1842#endif 1825#endif
1843 1826
1844void 1827void
1845rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1854 /* 1837 /*
1855 * VT window processing of button press 1838 * VT window processing of button press
1856 */ 1839 */
1857 if (ev.window == vt) 1840 if (ev.window == vt)
1858 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1859#if ISO_14755 1845#if ISO_14755
1860 // 5.4 1846 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1848 {
1863 iso14755_54 (ev.x, ev.y); 1849 iso14755_54 (ev.x, ev.y);
1905 else 1891 else
1906 { 1892 {
1907 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1909 1895
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1896 switch (ev.button)
1912 { 1897 {
1913 case Button1: 1898 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1903#else
1919 selection.rect = false; 1904 selection.rect = false;
1920#endif 1905#endif
1921 1906
1922 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1909 {
1925 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1927 else 1912 else
1928 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1929 } 1914 }
1930 else 1915 else
1931 { 1916 {
1932 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1918 MEvent.clicks++;
1934 else 1919 else
1935 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1936 1921
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1923 }
1939 1924
1940 MEvent.button = Button1; 1925 MEvent.button = Button1;
1941 break; 1926 break;
1942 1927
1943 case Button3: 1928 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1946 else 1931 else
1947 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1948 1933
1949 MEvent.button = Button3; 1934 MEvent.button = Button3;
1950 break; 1935 break;
1951 } 1936 }
1952 } 1937 }
1953 1938
1954 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1955 return; 1940 return;
1956 } 1941 }
1957 1942
2096 } 2081 }
2097 } 2082 }
2098 2083
2099 return; 2084 return;
2100 } 2085 }
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} 2086}
2110 2087
2111void 2088void
2112rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2113{ 2090{
2119 2096
2120 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2121 { 2098 {
2122 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2123 scrollbar_show (0); 2100 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2101 }
2128 2102
2129#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
2132#endif 2106#endif
2133 2107
2134 if (ev.window == vt) 2108 if (ev.window == vt)
2135 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2136#if ISO_14755 2113#if ISO_14755
2137 // 5.4 2114 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2116 return;
2140#endif 2117#endif
2118
2141 if (reportmode) 2119 if (reportmode)
2142 { 2120 {
2143 /* mouse report from vt window */ 2121 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2123 if (ev.button >= 4)
2169 if (priv_modes & PrivMode_mouse_report 2147 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2148 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2149 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2150 selection_extend (ev.x, ev.y, 0);
2173 2151
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2152 switch (ev.button)
2178 { 2153 {
2179 case Button1: 2154 case Button1:
2180 case Button3: 2155 case Button3:
2181 selection_make (ev.time); 2156 selection_make (ev.time);
2182 break; 2157 break;
2158
2183 case Button2: 2159 case Button2:
2184 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2185 break; 2162 break;
2163
2186#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
2187 case Button4: 2165 case Button4:
2188 case Button5: 2166 case Button5:
2189 { 2167 {
2190 int i; 2168 int i;
2222 } 2200 }
2223 break; 2201 break;
2224#endif 2202#endif
2225 } 2203 }
2226 } 2204 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2205}
2232 2206
2233#ifdef TRANSPARENT 2207#ifdef TRANSPARENT
2234#if TINTING 2208#if TINTING
2235/* taken from aterm-0.4.2 */ 2209/* taken from aterm-0.4.2 */
2236 2210
2237typedef uint32_t RUINT32T; 2211typedef uint32_t RUINT32T;
2238 2212
2239void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2240{ 2214{
2241 int sh_r, sh_g, sh_b; 2215 int sh_r, sh_g, sh_b;
2242 RUINT32T mask_r, mask_g, mask_b; 2216 RUINT32T mask_r, mask_g, mask_b;
2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246 int i; 2220 int i;
2247 2221
2248 Visual *visual = display->visual; 2222 Visual *visual = term->visual;
2249 2223
2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251 2225
2252 /* for convenience */ 2226 /* for convenience */
2253 mask_r = visual->red_mask; 2227 mask_r = visual->red_mask;
2474 Atom atype; 2448 Atom atype;
2475 unsigned char *prop = NULL; 2449 unsigned char *prop = NULL;
2476 Window root, oldp, *list; 2450 Window root, oldp, *list;
2477 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
2478 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
2479 dDisp;
2480 2453
2481 pchanged = 0; 2454 pchanged = 0;
2482 2455
2483 if (!OPTION (Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2484 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2485 2458
2486 XGetWindowAttributes (disp, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2487 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2488 2461
2489 XGetWindowAttributes (disp, parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2490 2463
2491 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2492 { 2465 {
2493 if (am_transparent) 2466 if (am_transparent)
2494 { 2467 {
2495 pchanged = 1; 2468 pchanged = 1;
2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2497 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2498 } 2471 }
2499 2472
2500 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2501 } 2474 }
2502 2475
2503 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2504 XSync (disp, False); 2477 XSync (dpy, False);
2505 2478
2506 /* 2479 /*
2507 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2508 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2509 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2510 */ 2483 */
2511 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2515 2488
2516 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2517 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2521 2494
2522 if (!i || prop == NULL 2495 if (!i || prop == NULL
2523#if TINTING 2496#if TINTING
2524 || !rs[Rs_color + Color_tint] 2497 || !ISSET_PIXCOLOR (Color_tint)
2525#endif 2498#endif
2526 ) 2499 )
2527 have_pixmap = 0; 2500 have_pixmap = 0;
2528 else 2501 else
2529 { 2502 {
2542 Window cr; 2515 Window cr;
2543 XImage *image; 2516 XImage *image;
2544 GC gc; 2517 GC gc;
2545 XGCValues gcvalue; 2518 XGCValues gcvalue;
2546 2519
2547 XTranslateCoordinates (disp, parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2548 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2549 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2550 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2551 nx = ny = 0; 2524 nx = ny = 0;
2552 2525
2565 } 2538 }
2566 2539
2567 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2568 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2569 2542
2570 XSync (disp, False); 2543 XSync (dpy, False);
2571 allowedxerror = -1; 2544 allowedxerror = -1;
2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573 2546
2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2575 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2576 allowedxerror = 0; 2549 allowedxerror = 0;
2577 2550
2580 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2581 { 2554 {
2582 pchanged = 1; 2555 pchanged = 1;
2583 if (pixmap != None) 2556 if (pixmap != None)
2584 { 2557 {
2585 XFreePixmap (disp, pixmap); 2558 XFreePixmap (dpy, pixmap);
2586 pixmap = None; 2559 pixmap = None;
2587 } 2560 }
2588 } 2561 }
2589 2562
2590 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2591 } 2564 }
2592 else 2565 else
2593 { 2566 {
2594 if (pixmap != None) 2567 if (pixmap != None)
2595 XFreePixmap (disp, pixmap); 2568 XFreePixmap (dpy, pixmap);
2596 2569
2597#if TINTING 2570#if TINTING
2598 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2599 { 2572 {
2600 unsigned short rm, gm, bm;
2601 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602 2574
2575 rgba c;
2603 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused [Color_tint].get (c);
2604 2577
2605 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2606 } 2579 }
2607#endif 2580#endif
2608 2581
2609 pixmap = XCreatePixmap (disp, vt, 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2610 szHint.width, szHint.height, image->depth);
2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2612 XPutImage (disp, pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2613 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2614 XFreeGC (disp, gc); 2586 XFreeGC (dpy, gc);
2615 XDestroyImage (image); 2587 XDestroyImage (image);
2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2617 XClearWindow (disp, parent[0]); 2589 XClearWindow (dpy, parent[0]);
2618 2590
2619 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2620 pchanged = 1; 2592 pchanged = 1;
2621 2593
2622 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2623 } 2595 }
2624 } 2596 }
2625 2597
2626 if (am_pixmap_trans) 2598 if (am_pixmap_trans)
2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2628 else 2600 else
2629 { 2601 {
2630 unsigned int n; 2602 unsigned int n;
2631 /* 2603 /*
2632 * InheritPixmap transparency 2604 * InheritPixmap transparency
2633 */ 2605 */
2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 { 2607 {
2636 oldp = parent[i]; 2608 oldp = parent[i];
2637 XQueryTree (disp, parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2638 &parent[i], &list, &n);
2639 XFree (list); 2610 XFree (list);
2640 2611
2641 if (parent[i] == display->root) 2612 if (parent[i] == display->root)
2642 { 2613 {
2643 if (oldp != None) 2614 if (oldp != None)
2651 } 2622 }
2652 2623
2653 n = 0; 2624 n = 0;
2654 2625
2655 if (pchanged) 2626 if (pchanged)
2656 {
2657 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2658 { 2628 {
2659 XGetWindowAttributes (disp, parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2661 { 2632 {
2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663 break; 2634 break;
2664 } 2635 }
2665 } 2636 }
2666 }
2667 2637
2668 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2669 { 2639 {
2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2672 am_transparent = 0; 2642 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2674 } 2644 }
2675 else 2645 else
2676 { 2646 {
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++) 2647 for (n = 0; n < (unsigned int)i; n++)
2683 { 2648 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]); 2650 XClearWindow (dpy, parent[n]);
2686 } 2651 }
2687 2652
2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2689 am_transparent = 1; 2654 am_transparent = 1;
2690 } 2655 }
2691 2656
2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693 parent[i] = None; 2658 parent[i] = None;
2694 } 2659 }
2695 2660
2696 if (scrollBar.win) 2661 if (scrollBar.win)
2697 { 2662 {
2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2699 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2700 scrollbar_show (0); 2665 scrollbar_show (0);
2701 } 2666 }
2702 2667
2703 if (am_transparent) 2668 if (am_transparent)
2778 } 2743 }
2779 2744
2780 // scr_add_lines only works for nlines <= nrow - 1. 2745 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2746 if (nlines >= nrow - 1)
2782 { 2747 {
2748 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2749 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2750 scr_add_lines (buf, str - buf, nlines);
2785 2751
2786 nlines = 0; 2752 nlines = 0;
2787 str = buf; 2753 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2754 eol = str + min (ncol, UBUFSIZ);
2803 2769
2804 seq_begin = cmdbuf_ptr; 2770 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2771 ch = next_char ();
2806 } 2772 }
2807 2773
2774 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809 scr_add_lines (buf, str - buf, nlines); 2776 scr_add_lines (buf, str - buf, nlines);
2810 2777
2811 /* 2778 /*
2812 * If there have been a lot of new lines, then update the screen 2779 * 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. 2780 * What the heck I'll cheat and only refresh less than every page-full.
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++; 2787 refresh_limit++;
2821 else 2788 else
2822 { 2789 {
2823 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2824 scr_refresh (refresh_type); 2792 scr_refresh ();
2825 want_refresh = 1; 2793 want_refresh = 1;
2826 } 2794 }
2827 } 2795 }
2828 2796
2829 } 2797 }
2847 return flag; 2815 return flag;
2848} 2816}
2849 2817
2850// read the next character 2818// read the next character
2851wchar_t 2819wchar_t
2852rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2853{ 2821{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2823 {
2856 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2878 return NOCHAR; 2846 return NOCHAR;
2879} 2847}
2880 2848
2881// read the next octet 2849// read the next octet
2882uint32_t 2850uint32_t
2883rxvt_term::next_octet () 2851rxvt_term::next_octet () NOTHROW
2884{ 2852{
2885 return cmdbuf_ptr < cmdbuf_endp 2853 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2854 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2855 : NOCHAR;
2888} 2856}
2857
2858static class out_of_input out_of_input;
2889 2859
2890/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2891/* 2861/*
2892 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2893 * to the command. 2863 * to the command.
2894 */ 2864 */
2895wchar_t 2865wchar_t
2896rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2867{
2898 wchar_t c = next_char (); 2868 wchar_t c = next_char ();
2899 2869
2900 if (c == NOCHAR) 2870 if (c == NOCHAR)
2901 throw out_of_input; 2871 throw out_of_input;
2902 2872
2903 return c; 2873 return c;
2904} 2874}
2905 2875
2906uint32_t 2876uint32_t
2907rxvt_term::cmd_get8 () 2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2878{
2909 uint32_t c = next_octet (); 2879 uint32_t c = next_octet ();
2910 2880
2911 if (c == NOCHAR) 2881 if (c == NOCHAR)
2912 throw out_of_input; 2882 throw out_of_input;
3150 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
3151 break; 3121 break;
3152 case '+': 3122 case '+':
3153 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
3154 break; 3124 break;
3155#if ENABLE_FRILLS 3125#if !ENABLE_MINIMAL
3156 case '6': 3126 case '6':
3157 scr_backindex (); 3127 scr_backindex ();
3158 break; 3128 break;
3159#endif 3129#endif
3160 case '7': 3130 case '7':
3161 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
3162 break; 3132 break;
3163 case '8': 3133 case '8':
3164 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
3165 break; 3135 break;
3166#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3167 case '9': 3137 case '9':
3168 scr_forwardindex (); 3138 scr_forwardindex ();
3169 break; 3139 break;
3170#endif 3140#endif
3171 case '=': 3141 case '=':
3333 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
3334 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
3335 if (arg[p] == -1) 3305 if (arg[p] == -1)
3336 arg[p] = ndef; 3306 arg[p] = ndef;
3337 3307
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 /* 3308 /*
3346 * private mode handling 3309 * private mode handling
3347 */ 3310 */
3348 if (priv) 3311 if (priv)
3349 { 3312 {
3350 switch (priv) 3313 switch (priv)
3351 { 3314 {
3352 case '>': 3315 case '>':
3353 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3354 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
3355 break; 3327 break;
3356 case '?': 3328 case '?':
3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
3359 break; 3331 break;
3562 break; 3534 break;
3563 case CSI_75: 3535 case CSI_75:
3564 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3565 break; 3537 break;
3566 3538
3567#if ENABLE_FRILLS 3539#if !ENABLE_MINIMAL
3568 case CSI_74: 3540 case CSI_74:
3569 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3570 break; 3542 break;
3571#endif 3543#endif
3572 3544
3579 break; 3551 break;
3580 } 3552 }
3581} 3553}
3582/*}}} */ 3554/*}}} */
3583 3555
3584#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3585/* ARGSUSED */ 3557/* ARGSUSED */
3586void 3558void
3587rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588{ 3560{
3589 int x, y; 3561 int x, y;
3590 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3591 Window wdummy; 3563 Window wdummy;
3592 dDisp; 3564
3565 dLocal (Display *, dpy);
3593 3566
3594 if (nargs == 0) 3567 if (nargs == 0)
3595 return; 3568 return;
3596 3569
3597 switch (args[0]) 3570 switch (args[0])
3598 { 3571 {
3599 /* 3572 /*
3600 * commands 3573 * commands
3601 */ 3574 */
3602 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3603 XMapWindow (disp, parent[0]); 3576 XMapWindow (dpy, parent[0]);
3604 break; 3577 break;
3605 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3606 XIconifyWindow (disp, parent[0], display->screen); 3579 XIconifyWindow (dpy, parent[0], display->screen);
3607 break; 3580 break;
3608 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3609 XMoveWindow (disp, parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3610 break; 3583 break;
3611 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613 break; 3586 break;
3614 case 5: /* raise window */ 3587 case 5: /* raise window */
3615 XRaiseWindow (disp, parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3616 break; 3589 break;
3617 case 6: /* lower window */ 3590 case 6: /* lower window */
3618 XLowerWindow (disp, parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3619 break; 3592 break;
3620 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3621 scr_touch (true); 3594 scr_touch (true);
3622 break; 3595 break;
3623 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3630 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3631 set_widthheight ((unsigned int)width, 3604 set_widthheight ((unsigned int)width,
3632 (unsigned int) (args[1] * fheight)); 3605 (unsigned int) (args[1] * fheight));
3633 break; 3606 break;
3634 3607
3635
3636 /* 3608 /*
3637 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3638 */ 3610 */
3639 case 11: /* report window state */ 3611 case 11: /* report window state */
3640 XGetWindowAttributes (disp, parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642 break; 3614 break;
3643 case 13: /* report window position */ 3615 case 13: /* report window position */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 XTranslateCoordinates (disp, parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3646 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3647 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3648 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3649 break; 3621 break;
3650 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653 break; 3625 break;
3654 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3655 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656 break; 3628 break;
3658 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659 break; 3631 break;
3660 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3661 { 3633 {
3662 char *s; 3634 char *s;
3663 XGetIconName (disp, parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3664 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3665 XFree (s); 3637 XFree (s);
3666 } 3638 }
3667 break; 3639 break;
3668 case 21: /* report window title */ 3640 case 21: /* report window title */
3669 { 3641 {
3670 char *s; 3642 char *s;
3671 XFetchName (disp, parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3672 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3645 XFree (s);
3674 } 3646 }
3675 break; 3647 break;
3676 } 3648 }
3704 seen_esc = true; 3676 seen_esc = true;
3705 continue; 3677 continue;
3706 } 3678 }
3707 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3708 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3709 else if (ch < 0x20) 3683 else if (ch < 0x20)
3710 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3711 3685
3712 seen_esc = false; 3686 seen_esc = false;
3713 3687
3714 if (n >= STRING_MAX - 1) 3688 if (n >= STRING_MAX - 1)
3715 // stop at some sane length 3689 // stop at some sane length
3716 return NULL; 3690 return NULL;
3717 3691
3718 if (ch == C0_SYN)
3719 string[n++] = cmd_get8 ();
3720 else
3721 string[n++] = ch; 3692 string[n++] = ch;
3722 } 3693 }
3723 3694
3724 string[n++] = '\0'; 3695 string[n++] = '\0';
3725 3696
3726 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
3777void 3748void
3778rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3779{ 3750{
3780 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3781 { 3752 {
3782 unsigned short r, g, b; 3753 rgba c;
3783 pix_colors_focused[color].get (display, r, g, b); 3754 pix_colors_focused[color].get (c);
3755
3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3784 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3785 } 3762 }
3786 else 3763 else
3787 set_window_color (color, str); 3764 set_window_color (color, str);
3788} 3765}
3789 3766
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3769 */
3793void 3770void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3772{
3796 int changed = 0;
3797 int color; 3773 int color;
3798 char *buf, *name; 3774 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3776 int saveop = op;
3801 dDisp; 3777
3778 dLocal (Display *, dpy);
3802 3779
3803 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3804 switch (op) 3785 switch (op)
3805 { 3786 {
3806 case XTerm_name: 3787 case XTerm_name:
3807 set_title (str); 3788 set_title (str);
3808 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
3822 unsigned long bytes_after; 3803 unsigned long bytes_after;
3823 unsigned char *value = 0; 3804 unsigned char *value = 0;
3824 const char *str = ""; 3805 const char *str = "";
3825 3806
3826 if (prop 3807 if (prop
3827 && XGetWindowProperty (disp, parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3828 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3829 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3830 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3831 && actual_type != None 3812 && actual_type != None
3832 && actual_format == 8) 3813 && actual_format == 8)
3833 str = (const char *)(value); 3814 str = (const char *)(value);
3834 3815
3835 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3836 3817
3837 XFree (value); 3818 XFree (value);
3838 } 3819 }
3839 else 3820 else
3840 { 3821 {
3844 { 3825 {
3845 *eq = 0; 3826 *eq = 0;
3846 set_utf8_property (display->atom (str), eq + 1); 3827 set_utf8_property (display->atom (str), eq + 1);
3847 } 3828 }
3848 else 3829 else
3849 XDeleteProperty (disp, parent[0], 3830 XDeleteProperty (dpy, parent[0],
3850 display->atom (str)); 3831 display->atom (str));
3851 } 3832 }
3852 break; 3833 break;
3853 3834
3854 case XTerm_Color: 3835 case XTerm_Color:
3864 break; 3845 break;
3865 3846
3866 if ((buf = strchr (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
3867 *buf++ = '\0'; 3848 *buf++ = '\0';
3868 3849
3869 if (name[0] == '?' && !name[1]) 3850 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 } 3851 }
3878 break; 3852 break;
3879 case XTerm_Color00: 3853 case XTerm_Color00:
3880 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (op, Color_fg, str, resp);
3881 break; 3855 break;
3882 case XTerm_Color01: 3856 case XTerm_Color01:
3883 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3857 process_color_seq (op, Color_bg, str, resp);
3884 break; 3858 break;
3885#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3886 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (op, Color_cursor, str, resp);
3888 break; 3862 break;
3889#endif 3863#endif
3890 case XTerm_Color_pointer_fg: 3864 case XTerm_Color_pointer_fg:
3891 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3892 break; 3866 break;
3893 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (op, Color_pointer_bg, str, resp);
3895 break; 3869 break;
3896#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3897 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (op, Color_RV, str, resp);
3899 break; 3873 break;
3900 case Rxvt_Color_BD: 3874 case Rxvt_Color_BD:
3901 case URxvt_Color_BD: 3875 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp); 3876 process_color_seq (op, Color_BD, str, resp);
3903 break; 3877 break;
3904 case Rxvt_Color_UL: 3878 case Rxvt_Color_UL:
3905 case URxvt_Color_UL: 3879 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp); 3880 process_color_seq (op, Color_UL, str, resp);
3907 break; 3881 break;
3908 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (op, Color_IT, str, resp);
3910 break; 3884 break;
3911#endif 3885#endif
3912#if TRANSPARENT && TINTING 3886#if TRANSPARENT && TINTING
3913 case URxvt_Color_tint: 3887 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3888 process_color_seq (op, Color_tint, str, resp);
3889
3915 check_our_parents (); 3890 check_our_parents ();
3891
3916 if (am_transparent) 3892 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3894
3918 break; 3895 break;
3919#endif 3896#endif
3920 3897
3921 case Rxvt_Pixmap: 3898 case Rxvt_Pixmap:
3899 {
3922 if (*str != ';') 3900 if (*str != ';')
3923 { 3901 {
3924#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3927 scr_touch (true); 3905 scr_touch (true);
3928#endif 3906#endif
3929 } 3907 }
3930 3908
3909 int changed = 0;
3910
3931 while ((str = strchr (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3932 { 3912 {
3933 str++; 3913 str++;
3934#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3935 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3936#endif 3916#endif
3937 } 3917 }
3938 3918
3939 if (changed) 3919 if (changed)
3940 { 3920 {
3941#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3942 resize_pixmap (); 3922 resize_pixmap ();
3943 scr_touch (true); 3923 scr_touch (true);
3944#endif 3924#endif
3945 } 3925 }
3926 }
3946 break; 3927 break;
3947 3928
3948 case Rxvt_restoreFG: 3929 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3950 break; 3931 break;
3954 3935
3955 case XTerm_logfile: 3936 case XTerm_logfile:
3956 // TODO, when secure mode? 3937 // TODO, when secure mode?
3957 break; 3938 break;
3958 3939
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 3940#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3941 case Rxvt_dumpscreen: /* no error notices */
3967 { 3942 {
3968 int fd; 3943 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3944 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3995 allocated.push_back ((void *)res); 3970 allocated.push_back ((void *)res);
3996 set_fonts (); 3971 set_fonts ();
3997 } 3972 }
3998 break; 3973 break;
3999 3974
4000#if ENABLE_FRILLS 3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
4001 case URxvt_locale: 3984 case URxvt_locale:
4002 if (query) 3985 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4004 else 3987 else
4005 { 3988 {
4006 set_locale (str); 3989 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3990 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3991 init_xlocale ();
4009 } 3992 }
4010 break; 3993 break;
4011 3994
4012 case URxvt_view_up: 3995 case URxvt_view_up:
4023 break; 4006 break;
4024#endif 4007#endif
4025 4008
4026#if ENABLE_PERL 4009#if ENABLE_PERL
4027 case URxvt_perl: 4010 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4029 ; // no responses yet 4012 ; // no responses yet
4030 break; 4013 break;
4031#endif 4014#endif
4032 } 4015 }
4033} 4016}
4065 return state; 4048 return state;
4066} 4049}
4067 4050
4068/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
4069void 4052void
4070rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4071{ 4054{
4072 unsigned int i, j; 4055 unsigned int i, j;
4073 int state; 4056 int state;
4074 4057
4075 static const struct 4058 static const struct
4086 { 5, PrivMode_rVideo }, 4069 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4070 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4071 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4072 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4073 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4074 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4075 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4076#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4077 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4078#endif
4193 /* case 8: - auto repeat, can't do on a per window basis */ 4173 /* case 8: - auto repeat, can't do on a per window basis */
4194 case 9: /* X10 mouse reporting */ 4174 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4175 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4176 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4177 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 4178#ifdef scrollBar_esc
4206 case scrollBar_esc: 4179 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4180 if (scrollbar_mapping (state))
4208 { 4181 {
4209 resize_all_windows (0, 0, 0); 4182 resize_all_windows (0, 0, 0);
4379 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
4380 break; 4353 break;
4381 4354
4382 //case 50: // not variable spacing 4355 //case 50: // not variable spacing
4383 4356
4384#if ENABLE_FRILLS 4357#if !ENABLE_MINIMAL
4385 case 90: 4358 case 90:
4386 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
4387 case 92: 4360 case 92:
4388 case 93: 4361 case 93:
4389 case 94: 4362 case 94:
4454rxvt_term::tt_write (const char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 4428{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return; 4430 return;
4458 4431
4459 if (pty.pty < 0) 4432 if (pty->pty < 0)
4460 return; 4433 return;
4461 4434
4462 if (v_buflen == 0) 4435 if (v_buflen == 0)
4463 { 4436 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465 4438
4466 if ((unsigned int)written == len) 4439 if ((unsigned int)written == len)
4467 return; 4440 return;
4468 4441
4469 data += written; 4442 data += written;
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4452}
4480 4453
4481void rxvt_term::pty_write () 4454void rxvt_term::pty_write ()
4482{ 4455{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484 4457
4485 if (written > 0) 4458 if (written > 0)
4486 { 4459 {
4487 v_buflen -= written; 4460 v_buflen -= written;
4488 4461

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines