[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

…		…
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
70	class 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
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	305	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	306	{
304	int ctrl, meta, shft, len;	307	int ctrl, meta, shft, len;
305	unsigned int newlen;	308	unsigned int newlen;
306	KeySym keysym;	309	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	310	int valid_keysym;
311	char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
312		312
313	/*	313	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	464	{
465	switch (keysym)	465	switch (keysym)
466	{	466	{
467	/* normal XTerm key bindings */	467	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	468	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	469	selection_request (ev.time);
470	return;	470	return;
471	#if TODO	471	#if TODO
472	/* rxvt extras */	472	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	473	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	474	change_font (FONT_UP);
…		…
905	{	905	{
906	const char ch = C0_ESC;	906	const char ch = C0_ESC;
907	tt_write (&ch, 1);	907	tt_write (&ch, 1);
908	}	908	}
909		909
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);	910	tt_write (kbuf, (unsigned int)len);
921	}	911	}
922	/}}} /	912	/}}} /
923		913
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	914	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	915	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	916	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	917	{
930	unsigned int n, s;	918	unsigned int n, s;
931		919
…		…
1008	while (l->is_longer () && row < end_row);	996	while (l->is_longer () && row < end_row);
1009	}	997	}
1010	while (row < end_row);	998	while (row < end_row);
1011	}	999	}
1012		1000
1013	scr_refresh (refresh_type);	1001	scr_refresh ();
1014	scrollbar_show (1);	1002	scrollbar_show (1);
1015	#ifdef USE_XIM	1003	#ifdef USE_XIM
1016	IMSendSpot ();	1004	IMSendSpot ();
1017	#endif	1005	#endif
1018	}	1006	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1034	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1035	{
1048	hidden_cursor = !hidden_cursor;	1036	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1037	want_refresh = 1;
1050		1038
1051	w.start (w.at + BLINK_INTERVAL);	1039	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1040	}
1053	#endif	1041	#endif
1054		1042
1055	#ifdef TEXT_BLINK	1043	#ifdef TEXT_BLINK
1056	void	1044	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1058	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1059	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1060	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1061	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1062	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1063	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1064	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1065	}
1079	}	1066	}
1080	#endif	1067	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1071	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1072	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1073	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1074	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1075	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1076	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1078	}
1093	}	1079	}
1094	#endif	1080	#endif
…		…
1102	: scr_page (UP, mouse_slip_wheel_speed))	1088	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1089	{
1104	if (view_start == top_row \|\| view_start == 0)	1090	if (view_start == top_row \|\| view_start == 0)
1105	mouse_slip_wheel_speed = 0;	1091	mouse_slip_wheel_speed = 0;
1106		1092
1107	refresh_type \|= SMOOTH_REFRESH;
1108	want_refresh = 1;	1093	want_refresh = 1;
1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110	}	1095	}
1111	}	1096	}
1112	#endif	1097	#endif
1113		1098
1114	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1115	static struct event_handler	1100	static struct event_handler
1116	{	1101	{
1117	check_watcher cw_yield;	1102	check_watcher yield_ev;
1118		1103
1119	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1120	{	1105	{
1121	sched_yield ();	1106	// this should really be sched_yield(), but the linux guys thought
		1107	// that giving a process calling sched_yield () less cpu time than
		1108	// ones with high nice levels.
		1109
		1110	struct timespec ts = { 0, 0 };
		1111	nanosleep (&ts, 0);
		1112
1122	w.stop ();	1113	w.stop ();
1123	}	1114	}
1124		1115
1125	event_handler ()	1116	event_handler ()
1126	: cw_yield (this, &event_handler::yield)	1117	: yield_ev (this, &event_handler::yield_cb)
1127	{	1118	{
1128	}	1119	}
1129	} event_handler;	1120	} event_handler;
1130	#endif	1121	#endif
1131		1122
…		…
1142		1133
1143	memmove (cmdbuf_base, cmdbuf_ptr, n);	1134	memmove (cmdbuf_base, cmdbuf_ptr, n);
1144	cmdbuf_ptr = cmdbuf_base;	1135	cmdbuf_ptr = cmdbuf_base;
1145	cmdbuf_endp = cmdbuf_ptr + n;	1136	cmdbuf_endp = cmdbuf_ptr + n;
1146		1137
1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1138	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148		1139
1149	if (r > 0)	1140	if (r > 0)
1150	{	1141	{
1151	cmdbuf_endp += r;	1142	cmdbuf_endp += r;
1152	return true;	1143	return true;
1153	}	1144	}
1154	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1145	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1155	{	1146	{
1156	#if HAVE_SCHED_YIELD	1147	#if LINUX_YIELD_HACK
1157	if (display->is_local)	1148	if (display->is_local)
1158	event_handler.cw_yield.start ();	1149	event_handler.yield_ev.start ();
1159	#endif	1150	#endif
1160	}	1151	}
1161	else	1152	else
1162	{	1153	{
1163	pty_ev.stop ();	1154	pty_ev.stop ();
…		…
1185	}	1176	}
1186		1177
1187	void	1178	void
1188	rxvt_term::pointer_unblank ()	1179	rxvt_term::pointer_unblank ()
1189	{	1180	{
1190	XDefineCursor (display->display, vt, TermWin_cursor);	1181	XDefineCursor (xdisp, vt, TermWin_cursor);
1191	recolour_cursor ();	1182	recolour_cursor ();
1192		1183
1193	#ifdef POINTER_BLANK	1184	#ifdef POINTER_BLANK
1194	hidden_pointer = 0;	1185	hidden_pointer = 0;
1195		1186
…		…
1203	rxvt_term::pointer_blank ()	1194	rxvt_term::pointer_blank ()
1204	{	1195	{
1205	if (!OPTION (Opt_pointerBlank))	1196	if (!OPTION (Opt_pointerBlank))
1206	return;	1197	return;
1207		1198
1208	XDefineCursor (display->display, vt, display->blank_cursor);	1199	XDefineCursor (xdisp, vt, display->blank_cursor);
1209	XFlush (display->display);	1200	XFlush (xdisp);
1210		1201
1211	hidden_pointer = 1;	1202	hidden_pointer = 1;
1212	}	1203	}
1213		1204
1214	void	1205	void
…		…
1287	(32 + button_number + key_state),	1278	(32 + button_number + key_state),
1288	(32 + x + 1),	1279	(32 + x + 1),
1289	(32 + y + 1));	1280	(32 + y + 1));
1290	}	1281	}
1291		1282
1292	#ifdef USING_W11LIB
1293	void
1294	rxvt_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 /	1283	/{{{ process an X event /
1303	void	1284	void
1304	rxvt_term::x_cb (XEvent &ev)	1285	rxvt_term::x_cb (XEvent &ev)
1305	{	1286	{
1306	make_current ();	1287	make_current ();
1307		1288
1308	dDisp;	1289	dLocal (Display *, xdisp);
1309		1290
1310	if (ev.xany.window == vt	1291	if (ev.xany.window == vt
		1292	&& SHOULD_INVOKE (HOOK_X_EVENT)
1311	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1293	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312	return;	1294	return;
1313		1295
1314	// for XQueryPointer	1296	// for XQueryPointer
1315	Window unused_root, unused_child;	1297	Window unused_root, unused_child;
…		…
1409	button_release (ev.xbutton);	1391	button_release (ev.xbutton);
1410	break;	1392	break;
1411		1393
1412	case ClientMessage:	1394	case ClientMessage:
1413	if (ev.xclient.format == 32	1395	if (ev.xclient.format == 32
1414	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1396	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415	{	1397	{
		1398	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1399	{
		1400	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1401	{
1416	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1402	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1403	{
		1404	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1417	destroy ();	1405	destroy ();
		1406	}
1418	#if ENABLE_EWMH	1407	#if ENABLE_EWMH
1419	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1408	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1409	XSendEvent (xdisp, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1410	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1422	&ev);	1411	&ev);
		1412	#endif
		1413	}
		1414	}
		1415	#if ENABLE_XEMBED
		1416	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1417	{
		1418	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1419	focus_in ();
		1420	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1421	focus_out ();
		1422	}
1423	#endif	1423	#endif
1424	}	1424	}
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;	1425	break;
1461		1426
1462	case MappingNotify:	1427	case MappingNotify:
1463	XRefreshKeyboardMapping (&ev.xmapping);	1428	XRefreshKeyboardMapping (&ev.xmapping);
1464	break;	1429	break;
…		…
1497	break;	1462	break;
1498		1463
1499	case ConfigureNotify:	1464	case ConfigureNotify:
1500	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent[0])
1501	{	1466	{
1502	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1503	;	1468	;
1504		1469
1505	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1470	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1506	{	1471	{
1507	seen_resize = 1;	1472	seen_resize = 1;
1508	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509	}	1474	}
1510		1475
		1476	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1477
1511	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1478	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512	if (OPTION (Opt_transparent))	1479	if (OPTION (Opt_transparent))
1513	check_our_parents ();	1480	check_our_parents ();
1514	#endif	1481	#endif
1515	}	1482	}
1516	break;	1483	break;
1517		1484
1518	case PropertyNotify:	1485	case PropertyNotify:
		1486	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1487	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520	&& ev.xproperty.state == PropertyNewValue)	1488	&& ev.xproperty.state == PropertyNewValue)
1521	selection_property (ev.xproperty.window, ev.xproperty.atom);	1489	selection_property (ev.xproperty.window, ev.xproperty.atom);
1522		1490
1523	break;	1491	break;
1524		1492
1525	case SelectionClear:	1493	case SelectionClear:
1526	selection_clear ();	1494	selection_clear ();
…		…
1562	if (ev.xany.window == vt)	1530	if (ev.xany.window == vt)
1563	{	1531	{
1564	do	1532	do
1565	scr_expose (ev.xexpose.x, ev.xexpose.y,	1533	scr_expose (ev.xexpose.x, ev.xexpose.y,
1566	ev.xexpose.width, ev.xexpose.height, False);	1534	ev.xexpose.width, ev.xexpose.height, False);
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1535	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1568		1536
1569	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570		1538
1571	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1539	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1572	scr_expose (ev.xexpose.x, ev.xexpose.y,	1540	scr_expose (ev.xexpose.x, ev.xexpose.y,
1573	ev.xexpose.width, ev.xexpose.height, False);	1541	ev.xexpose.width, ev.xexpose.height, False);
1574		1542
1575	want_refresh = 1;	1543	want_refresh = 1;
1576	}	1544	}
1577	else	1545	else
1578	{	1546	{
1579	XEvent unused_event;	1547	XEvent unused_event;
1580		1548
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1549	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1582	;	1550	;
1583	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1551	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1584	;	1552	;
1585		1553
1586	if (isScrollbarWindow (ev.xany.window))	1554	if (isScrollbarWindow (ev.xany.window))
1587	{	1555	{
1588	scrollBar.setIdle ();	1556	scrollBar.setIdle ();
1589	scrollbar_show (0);	1557	scrollbar_show (0);
1590	}	1558	}
1591	#ifdef MENUBAR
1592	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593	menubar_expose ();
1594	#endif
1595		1559
1596	#ifdef TRANSPARENT	1560	#ifdef TRANSPARENT
1597	if (am_transparent && ev.xany.window == parent[0])	1561	if (am_transparent && ev.xany.window == parent[0])
1598	XClearWindow (disp, ev.xany.window);	1562	XClearWindow (xdisp, ev.xany.window);
1599	#endif	1563	#endif
1600	}	1564	}
1601	break;	1565	break;
1602		1566
1603	case MotionNotify:	1567	case MotionNotify:
1604	#ifdef POINTER_BLANK	1568	#ifdef POINTER_BLANK
1605	if (hidden_pointer)	1569	if (hidden_pointer)
1606	pointer_unblank ();	1570	pointer_unblank ();
1607	#endif	1571	#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)	1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616	break;	1573	break;
1617		1574
1618	if (ev.xany.window == vt)	1575	if (ev.xany.window == vt)
1619	{	1576	{
		1577	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1578	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621	; // nop	1579	; // nop
1622	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1580	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1623	{	1581	{
1624	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1582	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1625	;	1583	;
1626		1584
1627	XQueryPointer (disp, vt,	1585	XQueryPointer (xdisp, vt,
1628	&unused_root, &unused_child,	1586	&unused_root, &unused_child,
1629	&unused_root_x, &unused_root_y,	1587	&unused_root_x, &unused_root_y,
1630	&ev.xbutton.x, &ev.xbutton.y,	1588	&ev.xbutton.x, &ev.xbutton.y,
1631	&ev.xbutton.state);	1589	&ev.xbutton.state);
1632	#ifdef MOUSE_THRESHOLD	1590	#ifdef MOUSE_THRESHOLD
…		…
1696	#endif	1654	#endif
1697	}	1655	}
1698	}	1656	}
1699	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1700	{	1658	{
1701	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1659	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1702	MotionNotify, &ev))	1660	MotionNotify, &ev))
1703	;	1661	;
1704		1662
1705	XQueryPointer (disp, scrollBar.win,	1663	XQueryPointer (xdisp, scrollBar.win,
1706	&unused_root, &unused_child,	1664	&unused_root, &unused_child,
1707	&unused_root_x, &unused_root_y,	1665	&unused_root_x, &unused_root_y,
1708	&ev.xbutton.x, &ev.xbutton.y,	1666	&ev.xbutton.x, &ev.xbutton.y,
1709	&unused_mask);	1667	&unused_mask);
1710	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1725	{	1683	{
1726	hidden_cursor = 0;	1684	hidden_cursor = 0;
1727	want_refresh = 1;	1685	want_refresh = 1;
1728	}	1686	}
1729		1687
1730	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1688	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731	}	1689	}
1732	#endif	1690	#endif
1733		1691
1734	#if defined(POINTER_BLANK)	1692	#if defined(POINTER_BLANK)
1735	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1693	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1763	XSetICFocus (Input_Context);	1721	XSetICFocus (Input_Context);
1764	}	1722	}
1765	#endif	1723	#endif
1766	#if CURSOR_BLINK	1724	#if CURSOR_BLINK
1767	if (OPTION (Opt_cursorBlink))	1725	if (OPTION (Opt_cursorBlink))
1768	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1726	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769	#endif	1727	#endif
1770	#if OFF_FOCUS_FADING	1728	#if OFF_FOCUS_FADING
1771	if (rs[Rs_fade])	1729	if (rs[Rs_fade])
1772	{	1730	{
1773	pix_colors = pix_colors_focused;	1731	pix_colors = pix_colors_focused;
…		…
1854	/*	1812	/*
1855	* VT window processing of button press	1813	* VT window processing of button press
1856	*/	1814	*/
1857	if (ev.window == vt)	1815	if (ev.window == vt)
1858	{	1816	{
		1817	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1818	return;
		1819
1859	#if ISO_14755	1820	#if ISO_14755
1860	// 5.4	1821	// 5.4
1861	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1822	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1862	{	1823	{
1863	iso14755_54 (ev.x, ev.y);	1824	iso14755_54 (ev.x, ev.y);
…		…
1905	else	1866	else
1906	{	1867	{
1907	if (ev.button != MEvent.button)	1868	if (ev.button != MEvent.button)
1908	MEvent.clicks = 0;	1869	MEvent.clicks = 0;
1909		1870
1910	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911	switch (ev.button)	1871	switch (ev.button)
1912	{	1872	{
1913	case Button1:	1873	case Button1:
1914	/* allow meta + click to select rectangular areas */	1874	/* allow meta + click to select rectangular areas */
1915	/* should be done in screen.C */	1875	/* should be done in screen.C */
1916	#if ENABLE_FRILLS	1876	#if ENABLE_FRILLS
1917	selection.rect = !!(ev.state & ModMetaMask);	1877	selection.rect = !!(ev.state & ModMetaMask);
1918	#else	1878	#else
1919	selection.rect = false;	1879	selection.rect = false;
1920	#endif	1880	#endif
1921		1881
1922	/* allow shift+left click to extend selection */	1882	/* allow shift+left click to extend selection */
1923	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1883	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924	{	1884	{
1925	if (MEvent.button == Button1 && clickintime)	1885	if (MEvent.button == Button1 && clickintime)
1926	selection_rotate (ev.x, ev.y);	1886	selection_rotate (ev.x, ev.y);
1927	else	1887	else
1928	selection_extend (ev.x, ev.y, 1);	1888	selection_extend (ev.x, ev.y, 1);
1929	}	1889	}
1930	else	1890	else
1931	{	1891	{
1932	if (MEvent.button == Button1 && clickintime)	1892	if (MEvent.button == Button1 && clickintime)
1933	MEvent.clicks++;	1893	MEvent.clicks++;
1934	else	1894	else
1935	MEvent.clicks = 1;	1895	MEvent.clicks = 1;
1936		1896
1937	selection_click (MEvent.clicks, ev.x, ev.y);	1897	selection_click (MEvent.clicks, ev.x, ev.y);
1938	}	1898	}
1939		1899
1940	MEvent.button = Button1;	1900	MEvent.button = Button1;
1941	break;	1901	break;
1942		1902
1943	case Button3:	1903	case Button3:
1944	if (MEvent.button == Button3 && clickintime)	1904	if (MEvent.button == Button3 && clickintime)
1945	selection_rotate (ev.x, ev.y);	1905	selection_rotate (ev.x, ev.y);
1946	else	1906	else
1947	selection_extend (ev.x, ev.y, 1);	1907	selection_extend (ev.x, ev.y, 1);
1948		1908
1949	MEvent.button = Button3;	1909	MEvent.button = Button3;
1950	break;	1910	break;
1951	}	1911	}
1952	}	1912	}
1953		1913
1954	MEvent.time = ev.time;	1914	MEvent.time = ev.time;
1955	return;	1915	return;
1956	}	1916	}
1957		1917
…		…
2096	}	2056	}
2097	}	2057	}
2098		2058
2099	return;	2059	return;
2100	}	2060	}
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	}	2061	}
2110		2062
2111	void	2063	void
2112	rxvt_term::button_release (XButtonEvent &ev)	2064	rxvt_term::button_release (XButtonEvent &ev)
2113	{	2065	{
…		…
2119		2071
2120	if (scrollbar_isUpDn ())	2072	if (scrollbar_isUpDn ())
2121	{	2073	{
2122	scrollBar.setIdle ();	2074	scrollBar.setIdle ();
2123	scrollbar_show (0);	2075	scrollbar_show (0);
2124	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125	refresh_type &= ~SMOOTH_REFRESH;
2126	#endif
2127	}	2076	}
2128		2077
2129	#ifdef SELECTION_SCROLLING	2078	#ifdef SELECTION_SCROLLING
2130	if (sel_scroll_ev.active)	2079	if (sel_scroll_ev.active)
2131	sel_scroll_ev.stop();	2080	sel_scroll_ev.stop();
2132	#endif	2081	#endif
2133		2082
2134	if (ev.window == vt)	2083	if (ev.window == vt)
2135	{	2084	{
		2085	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2086	return;
		2087
2136	#if ISO_14755	2088	#if ISO_14755
2137	// 5.4	2089	// 5.4
2138	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2090	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2139	return;	2091	return;
2140	#endif	2092	#endif
		2093
2141	if (reportmode)	2094	if (reportmode)
2142	{	2095	{
2143	/* mouse report from vt window */	2096	/* mouse report from vt window */
2144	/* don't report release of wheel "buttons" */	2097	/* don't report release of wheel "buttons" */
2145	if (ev.button >= 4)	2098	if (ev.button >= 4)
…		…
2169	if (priv_modes & PrivMode_mouse_report	2122	if (priv_modes & PrivMode_mouse_report
2170	&& bypass_keystate	2123	&& bypass_keystate
2171	&& ev.button == Button1 && MEvent.clicks <= 1)	2124	&& ev.button == Button1 && MEvent.clicks <= 1)
2172	selection_extend (ev.x, ev.y, 0);	2125	selection_extend (ev.x, ev.y, 0);
2173		2126
2174	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175	return;
2176
2177	switch (ev.button)	2127	switch (ev.button)
2178	{	2128	{
2179	case Button1:	2129	case Button1:
2180	case Button3:	2130	case Button3:
2181	selection_make (ev.time);	2131	selection_make (ev.time);
2182	break;	2132	break;
		2133
2183	case Button2:	2134	case Button2:
2184	selection_request (ev.time, ev.x, ev.y);	2135	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2136	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2185	break;	2137	break;
		2138
2186	#ifdef MOUSE_WHEEL	2139	#ifdef MOUSE_WHEEL
2187	case Button4:	2140	case Button4:
2188	case Button5:	2141	case Button5:
2189	{	2142	{
2190	int i;	2143	int i;
…		…
2222	}	2175	}
2223	break;	2176	break;
2224	#endif	2177	#endif
2225	}	2178	}
2226	}	2179	}
2227	#ifdef MENUBAR
2228	else if (isMenuBarWindow (ev.window))
2229	menubar_control (ev);
2230	#endif
2231	}	2180	}
2232		2181
2233	#ifdef TRANSPARENT	2182	#ifdef TRANSPARENT
2234	#if TINTING	2183	#if TINTING
2235	/* taken from aterm-0.4.2 */	2184	/* taken from aterm-0.4.2 */
2236		2185
2237	typedef uint32_t RUINT32T;	2186	typedef uint32_t RUINT32T;
2238		2187
2239	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2188	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2240	{	2189	{
2241	int sh_r, sh_g, sh_b;	2190	int sh_r, sh_g, sh_b;
2242	RUINT32T mask_r, mask_g, mask_b;	2191	RUINT32T mask_r, mask_g, mask_b;
2243	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2192	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2244	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2193	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2194	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246	int i;	2195	int i;
2247		2196
2248	Visual *visual = display->visual;	2197	Visual *visual = term->visual;
2249		2198
2250	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2199	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2251		2200
2252	/* for convenience */	2201	/* for convenience */
2253	mask_r = visual->red_mask;	2202	mask_r = visual->red_mask;
…		…
2474	Atom atype;	2423	Atom atype;
2475	unsigned char *prop = NULL;	2424	unsigned char *prop = NULL;
2476	Window root, oldp, *list;	2425	Window root, oldp, *list;
2477	Pixmap rootpixmap = None;	2426	Pixmap rootpixmap = None;
2478	XWindowAttributes wattr, wrootattr;	2427	XWindowAttributes wattr, wrootattr;
2479	dDisp;
2480		2428
2481	pchanged = 0;	2429	pchanged = 0;
2482		2430
2483	if (!OPTION (Opt_transparent))	2431	if (!OPTION (Opt_transparent))
2484	return pchanged; /* Don't try any more */	2432	return pchanged; /* Don't try any more */
2485		2433
2486	XGetWindowAttributes (disp, display->root, &wrootattr);	2434	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2487	rootdepth = wrootattr.depth;	2435	rootdepth = wrootattr.depth;
2488		2436
2489	XGetWindowAttributes (disp, parent[0], &wattr);	2437	XGetWindowAttributes (xdisp, parent[0], &wattr);
2490		2438
2491	if (rootdepth != wattr.depth)	2439	if (rootdepth != wattr.depth)
2492	{	2440	{
2493	if (am_transparent)	2441	if (am_transparent)
2494	{	2442	{
2495	pchanged = 1;	2443	pchanged = 1;
2496	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2444	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2497	am_transparent = am_pixmap_trans = 0;	2445	am_transparent = am_pixmap_trans = 0;
2498	}	2446	}
2499		2447
2500	return pchanged; /* Don't try any more */	2448	return pchanged; /* Don't try any more */
2501	}	2449	}
2502		2450
2503	/* Get all X ops out of the queue so that our information is up-to-date. */	2451	/* Get all X ops out of the queue so that our information is up-to-date. */
2504	XSync (disp, False);	2452	XSync (xdisp, False);
2505		2453
2506	/*	2454	/*
2507	* Make the frame window set by the window manager have	2455	* Make the frame window set by the window manager have
2508	* the root background. Some window managers put multiple nested frame	2456	* the root background. Some window managers put multiple nested frame
2509	* windows for each client, so we have to take care about that.	2457	* windows for each client, so we have to take care about that.
2510	*/	2458	*/
2511	i = (xa[XA_XROOTPMAP_ID]	2459	i = (xa[XA_XROOTPMAP_ID]
2512	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2460	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2513	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2461	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514	&nitems, &bytes_after, &prop) == Success);	2462	&nitems, &bytes_after, &prop) == Success);
2515		2463
2516	if (!i \|\| prop == NULL)	2464	if (!i \|\| prop == NULL)
2517	i = (xa[XA_ESETROOT_PMAP_ID]	2465	i = (xa[XA_ESETROOT_PMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2466	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2468	&nitems, &bytes_after, &prop) == Success);
2521		2469
2522	if (!i \|\| prop == NULL	2470	if (!i \|\| prop == NULL
2523	#if TINTING	2471	#if TINTING
2524	\|\| !rs[Rs_color + Color_tint]	2472	\|\| !ISSET_PIXCOLOR (Color_tint)
2525	#endif	2473	#endif
2526	)	2474	)
2527	have_pixmap = 0;	2475	have_pixmap = 0;
2528	else	2476	else
2529	{	2477	{
…		…
2542	Window cr;	2490	Window cr;
2543	XImage *image;	2491	XImage *image;
2544	GC gc;	2492	GC gc;
2545	XGCValues gcvalue;	2493	XGCValues gcvalue;
2546		2494
2547	XTranslateCoordinates (disp, parent[0], display->root,	2495	XTranslateCoordinates (xdisp, parent[0], display->root,
2548	0, 0, &sx, &sy, &cr);	2496	0, 0, &sx, &sy, &cr);
2549	nw = (unsigned int)szHint.width;	2497	nw = (unsigned int)szHint.width;
2550	nh = (unsigned int)szHint.height;	2498	nh = (unsigned int)szHint.height;
2551	nx = ny = 0;	2499	nx = ny = 0;
2552		2500
…		…
2565	}	2513	}
2566		2514
2567	min_it (nw, (unsigned int) (wrootattr.width - sx));	2515	min_it (nw, (unsigned int) (wrootattr.width - sx));
2568	min_it (nh, (unsigned int) (wrootattr.height - sy));	2516	min_it (nh, (unsigned int) (wrootattr.height - sy));
2569		2517
2570	XSync (disp, False);	2518	XSync (xdisp, False);
2571	allowedxerror = -1;	2519	allowedxerror = -1;
2572	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2520	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573		2521
2574	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2522	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2575	/* XXX: may need a delay here? */	2523	/* XXX: may need a delay here? */
2576	allowedxerror = 0;	2524	allowedxerror = 0;
2577		2525
…		…
2580	if (am_transparent && am_pixmap_trans)	2528	if (am_transparent && am_pixmap_trans)
2581	{	2529	{
2582	pchanged = 1;	2530	pchanged = 1;
2583	if (pixmap != None)	2531	if (pixmap != None)
2584	{	2532	{
2585	XFreePixmap (disp, pixmap);	2533	XFreePixmap (xdisp, pixmap);
2586	pixmap = None;	2534	pixmap = None;
2587	}	2535	}
2588	}	2536	}
2589		2537
2590	am_pixmap_trans = 0;	2538	am_pixmap_trans = 0;
2591	}	2539	}
2592	else	2540	else
2593	{	2541	{
2594	if (pixmap != None)	2542	if (pixmap != None)
2595	XFreePixmap (disp, pixmap);	2543	XFreePixmap (xdisp, pixmap);
2596		2544
2597	#if TINTING	2545	#if TINTING
2598	if (ISSET_PIXCOLOR (Color_tint))	2546	if (ISSET_PIXCOLOR (Color_tint))
2599	{	2547	{
2600	unsigned short rm, gm, bm;
2601	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602		2549
		2550	rgba c;
2603	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2551	pix_colors_focused [Color_tint].get (c);
2604		2552
2605	ShadeXImage (display, image, shade, rm, gm, bm);	2553	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2606	}	2554	}
2607	#endif	2555	#endif
2608		2556
2609	pixmap = XCreatePixmap (disp, vt,	2557	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2610	szHint.width, szHint.height, image->depth);
2611	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2558	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2612	XPutImage (disp, pixmap, gc, image, 0, 0,	2559	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2613	nx, ny, image->width, image->height);	2560	nx, ny, image->width, image->height);
2614	XFreeGC (disp, gc);	2561	XFreeGC (xdisp, gc);
2615	XDestroyImage (image);	2562	XDestroyImage (image);
2616	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2563	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2617	XClearWindow (disp, parent[0]);	2564	XClearWindow (xdisp, parent[0]);
2618		2565
2619	if (!am_transparent \|\| !am_pixmap_trans)	2566	if (!am_transparent \|\| !am_pixmap_trans)
2620	pchanged = 1;	2567	pchanged = 1;
2621		2568
2622	am_transparent = am_pixmap_trans = 1;	2569	am_transparent = am_pixmap_trans = 1;
2623	}	2570	}
2624	}	2571	}
2625		2572
2626	if (am_pixmap_trans)	2573	if (am_pixmap_trans)
2627	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2574	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2628	else	2575	else
2629	{	2576	{
2630	unsigned int n;	2577	unsigned int n;
2631	/*	2578	/*
2632	* InheritPixmap transparency	2579	* InheritPixmap transparency
2633	*/	2580	*/
2634	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635	{	2582	{
2636	oldp = parent[i];	2583	oldp = parent[i];
2637	XQueryTree (disp, parent[i - 1], &root,	2584	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2638	&parent[i], &list, &n);
2639	XFree (list);	2585	XFree (list);
2640		2586
2641	if (parent[i] == display->root)	2587	if (parent[i] == display->root)
2642	{	2588	{
2643	if (oldp != None)	2589	if (oldp != None)
…		…
2651	}	2597	}
2652		2598
2653	n = 0;	2599	n = 0;
2654		2600
2655	if (pchanged)	2601	if (pchanged)
2656	{
2657	for (; n < (unsigned int)i; n++)	2602	for (; n < (unsigned int)i; n++)
2658	{	2603	{
2659	XGetWindowAttributes (disp, parent[n], &wattr);	2604	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2605
2660	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2606	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2661	{	2607	{
2662	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2608	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663	break;	2609	break;
2664	}	2610	}
2665	}	2611	}
2666	}
2667		2612
2668	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2613	if (n > (sizeof (parent) / sizeof (parent[0])))
2669	{	2614	{
2670	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2615	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2671	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2616	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2672	am_transparent = 0;	2617	am_transparent = 0;
2673	/* XXX: also turn off Opt_transparent? */	2618	/* XXX: also turn off Opt_transparent? */
2674	}	2619	}
2675	else	2620	else
2676	{	2621	{
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++)	2622	for (n = 0; n < (unsigned int)i; n++)
2683	{	2623	{
2684	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2624	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2685	XClearWindow (disp, parent[n]);	2625	XClearWindow (xdisp, parent[n]);
2686	}	2626	}
2687		2627
2688	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2689	am_transparent = 1;	2629	am_transparent = 1;
2690	}	2630	}
2691		2631
2692	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2632	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693	parent[i] = None;	2633	parent[i] = None;
2694	}	2634	}
2695		2635
2696	if (scrollBar.win)	2636	if (scrollBar.win)
2697	{	2637	{
2698	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2638	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2699	scrollBar.setIdle ();	2639	scrollBar.setIdle ();
2700	scrollbar_show (0);	2640	scrollbar_show (0);
2701	}	2641	}
2702		2642
2703	if (am_transparent)	2643	if (am_transparent)
…		…
2778	}	2718	}
2779		2719
2780	// scr_add_lines only works for nlines <= nrow - 1.	2720	// scr_add_lines only works for nlines <= nrow - 1.
2781	if (nlines >= nrow - 1)	2721	if (nlines >= nrow - 1)
2782	{	2722	{
		2723	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2724	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784	scr_add_lines (buf, str - buf, nlines);	2725	scr_add_lines (buf, str - buf, nlines);
2785		2726
2786	nlines = 0;	2727	nlines = 0;
2787	str = buf;	2728	str = buf;
2788	eol = str + min (ncol, UBUFSIZ);	2729	eol = str + min (ncol, UBUFSIZ);
…		…
2803		2744
2804	seq_begin = cmdbuf_ptr;	2745	seq_begin = cmdbuf_ptr;
2805	ch = next_char ();	2746	ch = next_char ();
2806	}	2747	}
2807		2748
		2749	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2750	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809	scr_add_lines (buf, str - buf, nlines);	2751	scr_add_lines (buf, str - buf, nlines);
2810		2752
2811	/*	2753	/*
2812	* If there have been a lot of new lines, then update the screen	2754	* 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.	2755	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2819	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2761	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820	refresh_limit++;	2762	refresh_limit++;
2821	else	2763	else
2822	{	2764	{
2823	flag = true;	2765	flag = true;
2824	scr_refresh (refresh_type);	2766	scr_refresh ();
2825	want_refresh = 1;	2767	want_refresh = 1;
2826	}	2768	}
2827	}	2769	}
2828		2770
2829	}	2771	}
…		…
2847	return flag;	2789	return flag;
2848	}	2790	}
2849		2791
2850	// read the next character	2792	// read the next character
2851	wchar_t	2793	wchar_t
2852	rxvt_term::next_char ()	2794	rxvt_term::next_char () NOTHROW
2853	{	2795	{
2854	while (cmdbuf_ptr < cmdbuf_endp)	2796	while (cmdbuf_ptr < cmdbuf_endp)
2855	{	2797	{
2856	// assume 7-bit to be ascii ALWAYS	2798	// assume 7-bit to be ascii ALWAYS
2857	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2799	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2878	return NOCHAR;	2820	return NOCHAR;
2879	}	2821	}
2880		2822
2881	// read the next octet	2823	// read the next octet
2882	uint32_t	2824	uint32_t
2883	rxvt_term::next_octet ()	2825	rxvt_term::next_octet () NOTHROW
2884	{	2826	{
2885	return cmdbuf_ptr < cmdbuf_endp	2827	return cmdbuf_ptr < cmdbuf_endp
2886	? (unsigned char)*cmdbuf_ptr++	2828	? (unsigned char)*cmdbuf_ptr++
2887	: NOCHAR;	2829	: NOCHAR;
2888	}	2830	}
		2831
		2832	static class out_of_input out_of_input;
2889		2833
2890	/* rxvt_cmd_getc () - Return next input character */	2834	/* rxvt_cmd_getc () - Return next input character */
2891	/*	2835	/*
2892	* Return the next input character after first passing any keyboard input	2836	* Return the next input character after first passing any keyboard input
2893	* to the command.	2837	* to the command.
2894	*/	2838	*/
2895	wchar_t	2839	wchar_t
2896	rxvt_term::cmd_getc ()	2840	rxvt_term::cmd_getc () THROW ((class out_of_input))
2897	{	2841	{
2898	wchar_t c = next_char ();	2842	wchar_t c = next_char ();
2899		2843
2900	if (c == NOCHAR)	2844	if (c == NOCHAR)
2901	throw out_of_input;	2845	throw out_of_input;
2902		2846
2903	return c;	2847	return c;
2904	}	2848	}
2905		2849
2906	uint32_t	2850	uint32_t
2907	rxvt_term::cmd_get8 ()	2851	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908	{	2852	{
2909	uint32_t c = next_octet ();	2853	uint32_t c = next_octet ();
2910		2854
2911	if (c == NOCHAR)	2855	if (c == NOCHAR)
2912	throw out_of_input;	2856	throw out_of_input;
…		…
3150	scr_charset_set (2, (unsigned int)cmd_getc ());	3094	scr_charset_set (2, (unsigned int)cmd_getc ());
3151	break;	3095	break;
3152	case '+':	3096	case '+':
3153	scr_charset_set (3, (unsigned int)cmd_getc ());	3097	scr_charset_set (3, (unsigned int)cmd_getc ());
3154	break;	3098	break;
3155	#if ENABLE_FRILLS	3099	#if !ENABLE_MINIMAL
3156	case '6':	3100	case '6':
3157	scr_backindex ();	3101	scr_backindex ();
3158	break;	3102	break;
3159	#endif	3103	#endif
3160	case '7':	3104	case '7':
3161	scr_cursor (SAVE);	3105	scr_cursor (SAVE);
3162	break;	3106	break;
3163	case '8':	3107	case '8':
3164	scr_cursor (RESTORE);	3108	scr_cursor (RESTORE);
3165	break;	3109	break;
3166	#if ENABLE_FRILLS	3110	#if !ENABLE_MINIMAL
3167	case '9':	3111	case '9':
3168	scr_forwardindex ();	3112	scr_forwardindex ();
3169	break;	3113	break;
3170	#endif	3114	#endif
3171	case '=':	3115	case '=':
…		…
3333	ndef = get_byte_array_bit (csi_defaults, i);	3277	ndef = get_byte_array_bit (csi_defaults, i);
3334	for (p = 0; p < nargs; p++)	3278	for (p = 0; p < nargs; p++)
3335	if (arg[p] == -1)	3279	if (arg[p] == -1)
3336	arg[p] = ndef;	3280	arg[p] = ndef;
3337		3281
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	/*	3282	/*
3346	* private mode handling	3283	* private mode handling
3347	*/	3284	*/
3348	if (priv)	3285	if (priv)
3349	{	3286	{
3350	switch (priv)	3287	switch (priv)
3351	{	3288	{
3352	case '>':	3289	case '>':
3353	if (ch == CSI_DA) /* secondary device attributes */	3290	if (ch == CSI_DA) /* secondary device attributes */
3354	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3291	{
		3292	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3293	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3294	//
		3295	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3296	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3297	// that we do not support xterm mouse reporting (should be 95 when we do).
		3298	//
		3299	tt_printf ("\033[>%d;94;0c", 'U');
		3300	}
3355	break;	3301	break;
3356	case '?':	3302	case '?':
3357	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3303	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3358	process_terminal_mode (ch, priv, nargs, arg);	3304	process_terminal_mode (ch, priv, nargs, arg);
3359	break;	3305	break;
…		…
3562	break;	3508	break;
3563	case CSI_75:	3509	case CSI_75:
3564	scr_cursor (RESTORE);	3510	scr_cursor (RESTORE);
3565	break;	3511	break;
3566		3512
3567	#if ENABLE_FRILLS	3513	#if !ENABLE_MINIMAL
3568	case CSI_74:	3514	case CSI_74:
3569	process_window_ops (arg, nargs);	3515	process_window_ops (arg, nargs);
3570	break;	3516	break;
3571	#endif	3517	#endif
3572		3518
…		…
3579	break;	3525	break;
3580	}	3526	}
3581	}	3527	}
3582	/}}} /	3528	/}}} /
3583		3529
3584	#if ENABLE_FRILLS	3530	#if !ENABLE_MINIMAL
3585	/* ARGSUSED */	3531	/* ARGSUSED */
3586	void	3532	void
3587	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3533	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588	{	3534	{
3589	int x, y;	3535	int x, y;
3590	XWindowAttributes wattr;	3536	XWindowAttributes wattr;
3591	Window wdummy;	3537	Window wdummy;
3592	dDisp;	3538
		3539	dLocal (Display *, xdisp);
3593		3540
3594	if (nargs == 0)	3541	if (nargs == 0)
3595	return;	3542	return;
3596		3543
3597	switch (args[0])	3544	switch (args[0])
3598	{	3545	{
3599	/*	3546	/*
3600	* commands	3547	* commands
3601	*/	3548	*/
3602	case 1: /* deiconify window */	3549	case 1: /* deiconify window */
3603	XMapWindow (disp, parent[0]);	3550	XMapWindow (xdisp, parent[0]);
3604	break;	3551	break;
3605	case 2: /* iconify window */	3552	case 2: /* iconify window */
3606	XIconifyWindow (disp, parent[0], display->screen);	3553	XIconifyWindow (xdisp, parent[0], display->screen);
3607	break;	3554	break;
3608	case 3: /* set position (pixels) */	3555	case 3: /* set position (pixels) */
3609	XMoveWindow (disp, parent[0], args[1], args[2]);	3556	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3610	break;	3557	break;
3611	case 4: /* set size (pixels) */	3558	case 4: /* set size (pixels) */
3612	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3559	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613	break;	3560	break;
3614	case 5: /* raise window */	3561	case 5: /* raise window */
3615	XRaiseWindow (disp, parent[0]);	3562	XRaiseWindow (xdisp, parent[0]);
3616	break;	3563	break;
3617	case 6: /* lower window */	3564	case 6: /* lower window */
3618	XLowerWindow (disp, parent[0]);	3565	XLowerWindow (xdisp, parent[0]);
3619	break;	3566	break;
3620	case 7: /* refresh window */	3567	case 7: /* refresh window */
3621	scr_touch (true);	3568	scr_touch (true);
3622	break;	3569	break;
3623	case 8: /* set size (chars) */	3570	case 8: /* set size (chars) */
…		…
3630	if (args[0] >= 24) /* set height (chars) */	3577	if (args[0] >= 24) /* set height (chars) */
3631	set_widthheight ((unsigned int)width,	3578	set_widthheight ((unsigned int)width,
3632	(unsigned int) (args[1] * fheight));	3579	(unsigned int) (args[1] * fheight));
3633	break;	3580	break;
3634		3581
3635
3636	/*	3582	/*
3637	* reports - some output format copied from XTerm	3583	* reports - some output format copied from XTerm
3638	*/	3584	*/
3639	case 11: /* report window state */	3585	case 11: /* report window state */
3640	XGetWindowAttributes (disp, parent[0], &wattr);	3586	XGetWindowAttributes (xdisp, parent[0], &wattr);
3641	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3587	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642	break;	3588	break;
3643	case 13: /* report window position */	3589	case 13: /* report window position */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (xdisp, parent[0], &wattr);
3645	XTranslateCoordinates (disp, parent[0], wattr.root,	3591	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3646	-wattr.border_width, -wattr.border_width,	3592	-wattr.border_width, -wattr.border_width,
3647	&x, &y, &wdummy);	3593	&x, &y, &wdummy);
3648	tt_printf ("\033[3;%d;%dt", x, y);	3594	tt_printf ("\033[3;%d;%dt", x, y);
3649	break;	3595	break;
3650	case 14: /* report window size (pixels) */	3596	case 14: /* report window size (pixels) */
3651	XGetWindowAttributes (disp, parent[0], &wattr);	3597	XGetWindowAttributes (xdisp, parent[0], &wattr);
3652	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3598	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653	break;	3599	break;
3654	case 18: /* report text area size (chars) */	3600	case 18: /* report text area size (chars) */
3655	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3601	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656	break;	3602	break;
…		…
3658	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3604	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659	break;	3605	break;
3660	case 20: /* report icon label */	3606	case 20: /* report icon label */
3661	{	3607	{
3662	char *s;	3608	char *s;
3663	XGetIconName (disp, parent[0], &s);	3609	XGetIconName (xdisp, parent[0], &s);
3664	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3610	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3665	XFree (s);	3611	XFree (s);
3666	}	3612	}
3667	break;	3613	break;
3668	case 21: /* report window title */	3614	case 21: /* report window title */
3669	{	3615	{
3670	char *s;	3616	char *s;
3671	XFetchName (disp, parent[0], &s);	3617	XFetchName (xdisp, parent[0], &s);
3672	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3618	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673	XFree (s);	3619	XFree (s);
3674	}	3620	}
3675	break;	3621	break;
3676	}	3622	}
…		…
3777	void	3723	void
3778	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3724	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3779	{	3725	{
3780	if (str[0] == '?' && !str[1])	3726	if (str[0] == '?' && !str[1])
3781	{	3727	{
3782	unsigned short r, g, b;	3728	rgba c;
3783	pix_colors_focused[color].get (display, r, g, b);	3729	pix_colors_focused[color].get (c);
		3730
		3731	#if XFT
		3732	if (c.a != rgba::MAX_CC)
		3733	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3734	else
		3735	#endif
3784	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3736	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3785	}	3737	}
3786	else	3738	else
3787	set_window_color (color, str);	3739	set_window_color (color, str);
3788	}	3740	}
3789		3741
…		…
3791	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3743	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3792	*/	3744	*/
3793	void	3745	void
3794	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3746	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795	{	3747	{
3796	int changed = 0;
3797	int color;	3748	int color;
3798	char buf, name;	3749	char buf, name;
3799	bool query = str[0] == '?' && !str[1];	3750	bool query = str[0] == '?' && !str[1];
3800	int saveop = op;	3751	int saveop = op;
3801	dDisp;	3752
		3753	dLocal (Display *, xdisp);
3802		3754
3803	assert (str != NULL);	3755	assert (str != NULL);
3804	switch (op)	3756	switch (op)
3805	{	3757	{
3806	case XTerm_name:	3758	case XTerm_name:
…		…
3822	unsigned long bytes_after;	3774	unsigned long bytes_after;
3823	unsigned char *value = 0;	3775	unsigned char *value = 0;
3824	const char *str = "";	3776	const char *str = "";
3825		3777
3826	if (prop	3778	if (prop
3827	&& XGetWindowProperty (disp, parent[0],	3779	&& XGetWindowProperty (xdisp, parent[0],
3828	prop, 0, 1<<16, 0, AnyPropertyType,	3780	prop, 0, 1<<16, 0, AnyPropertyType,
3829	&actual_type, &actual_format,	3781	&actual_type, &actual_format,
3830	&nitems, &bytes_after, &value) == Success	3782	&nitems, &bytes_after, &value) == Success
3831	&& actual_type != None	3783	&& actual_type != None
3832	&& actual_format == 8)	3784	&& actual_format == 8)
3833	str = (const char *)(value);	3785	str = (const char *)(value);
3834		3786
3835	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3787	tt_printf ("\033]%d;%s%c", op, str, resp);
3836		3788
3837	XFree (value);	3789	XFree (value);
3838	}	3790	}
3839	else	3791	else
3840	{	3792	{
…		…
3844	{	3796	{
3845	*eq = 0;	3797	*eq = 0;
3846	set_utf8_property (display->atom (str), eq + 1);	3798	set_utf8_property (display->atom (str), eq + 1);
3847	}	3799	}
3848	else	3800	else
3849	XDeleteProperty (disp, parent[0],	3801	XDeleteProperty (xdisp, parent[0],
3850	display->atom (str));	3802	display->atom (str));
3851	}	3803	}
3852	break;	3804	break;
3853		3805
3854	case XTerm_Color:	3806	case XTerm_Color:
…		…
3864	break;	3816	break;
3865		3817
3866	if ((buf = strchr (name, ';')) != NULL)	3818	if ((buf = strchr (name, ';')) != NULL)
3867	*buf++ = '\0';	3819	*buf++ = '\0';
3868		3820
3869	if (name[0] == '?' && !name[1])	3821	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	}	3822	}
3878	break;	3823	break;
3879	case XTerm_Color00:	3824	case XTerm_Color00:
3880	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3825	process_color_seq (op, Color_fg, str, resp);
3881	break;	3826	break;
3882	case XTerm_Color01:	3827	case XTerm_Color01:
3883	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3828	process_color_seq (op, Color_bg, str, resp);
3884	break;	3829	break;
3885	#ifndef NO_CURSORCOLOR	3830	#ifndef NO_CURSORCOLOR
3886	case XTerm_Color_cursor:	3831	case XTerm_Color_cursor:
3887	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3832	process_color_seq (op, Color_cursor, str, resp);
3888	break;	3833	break;
3889	#endif	3834	#endif
3890	case XTerm_Color_pointer_fg:	3835	case XTerm_Color_pointer_fg:
3891	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3836	process_color_seq (op, Color_pointer_fg, str, resp);
3892	break;	3837	break;
3893	case XTerm_Color_pointer_bg:	3838	case XTerm_Color_pointer_bg:
3894	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3839	process_color_seq (op, Color_pointer_bg, str, resp);
3895	break;	3840	break;
3896	#ifndef NO_BOLD_UNDERLINE_REVERSE	3841	#ifndef NO_BOLD_UNDERLINE_REVERSE
3897	case XTerm_Color_RV:	3842	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3843	process_color_seq (op, Color_RV, str, resp);
3899	break;	3844	break;
3900	case Rxvt_Color_BD:	3845	case Rxvt_Color_BD:
3901	case URxvt_Color_BD:	3846	case URxvt_Color_BD:
3902	process_color_seq (op, Color_BD, str, resp);	3847	process_color_seq (op, Color_BD, str, resp);
3903	break;	3848	break;
3904	case Rxvt_Color_UL:	3849	case Rxvt_Color_UL:
3905	case URxvt_Color_UL:	3850	case URxvt_Color_UL:
3906	process_color_seq (op, Color_UL, str, resp);	3851	process_color_seq (op, Color_UL, str, resp);
3907	break;	3852	break;
3908	case URxvt_Color_IT:	3853	case URxvt_Color_IT:
3909	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3854	process_color_seq (op, Color_IT, str, resp);
3910	break;	3855	break;
3911	#endif	3856	#endif
3912	#if TRANSPARENT && TINTING	3857	#if TRANSPARENT && TINTING
3913	case URxvt_Color_tint:	3858	case URxvt_Color_tint:
3914	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3859	process_color_seq (op, Color_tint, str, resp);
		3860
3915	check_our_parents ();	3861	check_our_parents ();
		3862
3916	if (am_transparent)	3863	if (am_transparent)
3917	want_full_refresh = want_refresh = 1;	3864	want_full_refresh = want_refresh = 1;
		3865
3918	break;	3866	break;
3919	#endif	3867	#endif
3920		3868
3921	case Rxvt_Pixmap:	3869	case Rxvt_Pixmap:
		3870	{
3922	if (*str != ';')	3871	if (*str != ';')
3923	{	3872	{
3924	#if XPM_BACKGROUND	3873	#if XPM_BACKGROUND
3925	scale_pixmap (""); /* reset to default scaling */	3874	scale_pixmap (""); /* reset to default scaling */
3926	set_bgPixmap (str); /* change pixmap */	3875	set_bgPixmap (str); /* change pixmap */
3927	scr_touch (true);	3876	scr_touch (true);
3928	#endif	3877	#endif
3929	}	3878	}
3930		3879
		3880	int changed = 0;
		3881
3931	while ((str = strchr (str, ';')) != NULL)	3882	while ((str = strchr (str, ';')) != NULL)
3932	{	3883	{
3933	str++;	3884	str++;
3934	#if XPM_BACKGROUND	3885	#if XPM_BACKGROUND
3935	changed += scale_pixmap (str);	3886	changed += scale_pixmap (str);
3936	#endif	3887	#endif
3937	}	3888	}
3938		3889
3939	if (changed)	3890	if (changed)
3940	{	3891	{
3941	#ifdef XPM_BACKGROUND	3892	#ifdef XPM_BACKGROUND
3942	resize_pixmap ();	3893	resize_pixmap ();
3943	scr_touch (true);	3894	scr_touch (true);
3944	#endif	3895	#endif
3945	}	3896	}
		3897	}
3946	break;	3898	break;
3947		3899
3948	case Rxvt_restoreFG:	3900	case Rxvt_restoreFG:
3949	set_window_color (Color_fg, str);	3901	set_window_color (Color_fg, str);
3950	break;	3902	break;
…		…
3954		3906
3955	case XTerm_logfile:	3907	case XTerm_logfile:
3956	// TODO, when secure mode?	3908	// TODO, when secure mode?
3957	break;	3909	break;
3958		3910
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	3911	#if 0
3966	case Rxvt_dumpscreen: /* no error notices */	3912	case Rxvt_dumpscreen: /* no error notices */
3967	{	3913	{
3968	int fd;	3914	int fd;
3969	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3915	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
3995	allocated.push_back ((void *)res);	3941	allocated.push_back ((void *)res);
3996	set_fonts ();	3942	set_fonts ();
3997	}	3943	}
3998	break;	3944	break;
3999		3945
4000	#if ENABLE_FRILLS	3946	case URxvt_version:
		3947	if (query)
		3948	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3949	op,
		3950	rs[Rs_name], VERSION[0], VERSION[2],
		3951	resp);
		3952	break;
		3953
		3954	#if !ENABLE_MINIMAL
4001	case URxvt_locale:	3955	case URxvt_locale:
4002	if (query)	3956	if (query)
4003	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3957	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4004	else	3958	else
4005	{	3959	{
4006	set_locale (str);	3960	set_locale (str);
4007	pty.set_utf8_mode (enc_utf8);	3961	pty->set_utf8_mode (enc_utf8);
4008	init_xlocale ();	3962	init_xlocale ();
4009	}	3963	}
4010	break;	3964	break;
4011		3965
4012	case URxvt_view_up:	3966	case URxvt_view_up:
…		…
4065	return state;	4019	return state;
4066	}	4020	}
4067		4021
4068	/* we're not using priv _yet_ */	4022	/* we're not using priv _yet_ */
4069	void	4023	void
4070	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4024	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4071	{	4025	{
4072	unsigned int i, j;	4026	unsigned int i, j;
4073	int state;	4027	int state;
4074		4028
4075	static const struct	4029	static const struct
…		…
4086	{ 5, PrivMode_rVideo },	4040	{ 5, PrivMode_rVideo },
4087	{ 6, PrivMode_relOrigin },	4041	{ 6, PrivMode_relOrigin },
4088	{ 7, PrivMode_Autowrap },	4042	{ 7, PrivMode_Autowrap },
4089	// 8, bi-directional support mode	4043	// 8, bi-directional support mode
4090	{ 9, PrivMode_MouseX10 },	4044	{ 9, PrivMode_MouseX10 },
4091	#ifdef menuBar_esc
4092	{ menuBar_esc, PrivMode_menuBar },
4093	#endif
4094	// 18, 19 printing-related	4045	// 18, 19 printing-related
4095	{ 25, PrivMode_VisibleCursor },	4046	{ 25, PrivMode_VisibleCursor },
4096	#ifdef scrollBar_esc	4047	#ifdef scrollBar_esc
4097	{ scrollBar_esc, PrivMode_scrollBar },	4048	{ scrollBar_esc, PrivMode_scrollBar },
4098	#endif	4049	#endif
…		…
4193	/* case 8: - auto repeat, can't do on a per window basis */	4144	/* case 8: - auto repeat, can't do on a per window basis */
4194	case 9: /* X10 mouse reporting */	4145	case 9: /* X10 mouse reporting */
4195	if (state) /* orthogonal */	4146	if (state) /* orthogonal */
4196	priv_modes &= ~PrivMode_MouseX11;	4147	priv_modes &= ~PrivMode_MouseX11;
4197	break;	4148	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	4149	#ifdef scrollBar_esc
4206	case scrollBar_esc:	4150	case scrollBar_esc:
4207	if (scrollbar_mapping (state))	4151	if (scrollbar_mapping (state))
4208	{	4152	{
4209	resize_all_windows (0, 0, 0);	4153	resize_all_windows (0, 0, 0);
…		…
4379	scr_color (Color_bg, Color_bg);	4323	scr_color (Color_bg, Color_bg);
4380	break;	4324	break;
4381		4325
4382	//case 50: // not variable spacing	4326	//case 50: // not variable spacing
4383		4327
4384	#if ENABLE_FRILLS	4328	#if !ENABLE_MINIMAL
4385	case 90:	4329	case 90:
4386	case 91: /* set bright fg color */	4330	case 91: /* set bright fg color */
4387	case 92:	4331	case 92:
4388	case 93:	4332	case 93:
4389	case 94:	4333	case 94:
…		…
4454	rxvt_term::tt_write (const char *data, unsigned int len)	4398	rxvt_term::tt_write (const char *data, unsigned int len)
4455	{	4399	{
4456	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4400	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457	return;	4401	return;
4458		4402
4459	if (pty.pty < 0)	4403	if (pty->pty < 0)
4460	return;	4404	return;
4461		4405
4462	if (v_buflen == 0)	4406	if (v_buflen == 0)
4463	{	4407	{
4464	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4408	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465		4409
4466	if ((unsigned int)written == len)	4410	if ((unsigned int)written == len)
4467	return;	4411	return;
4468		4412
4469	data += written;	4413	data += written;
…		…
4478	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4422	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4479	}	4423	}
4480		4424
4481	void rxvt_term::pty_write ()	4425	void rxvt_term::pty_write ()
4482	{	4426	{
4483	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4427	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484		4428
4485	if (written > 0)	4429	if (written > 0)
4486	{	4430	{
4487	v_buflen -= written;	4431	v_buflen -= written;
4488		4432

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC vs. Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC