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

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.304 by root, Tue Jan 31 22:01:25 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.304 by root, Tue Jan 31 22:01:25 2006 UTC