ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.263 by root, Sun Jan 15 16:48:17 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	}
…		…
1021	}	1009	}
1022		1010
1023	void	1011	void
1024	rxvt_term::check_cb (check_watcher &w)	1012	rxvt_term::check_cb (check_watcher &w)
1025	{	1013	{
1026	SET_R (this);	1014	make_current ();
1027	SET_LOCALE (locale);
1028		1015
1029	display->flush ();	1016	display->flush ();
1030		1017
1031	if (want_refresh && !flush_ev.active)	1018	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1019	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1020	}
1034		1021
1035	void	1022	void
1036	rxvt_term::flush_cb (time_watcher &w)	1023	rxvt_term::flush_cb (time_watcher &w)
1037	{	1024	{
1038	SET_R (this);	1025	make_current ();
1039	SET_LOCALE (locale);
1040		1026
1041	refresh_limit = 1;	1027	refresh_limit = 1;
1042	refresh_count = 0;	1028	refresh_count = 0;
1043	flush ();	1029	flush ();
1044	}	1030	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1034	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1035	{
1050	hidden_cursor = !hidden_cursor;	1036	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1037	want_refresh = 1;
1052		1038
1053	w.start (w.at + BLINK_INTERVAL);	1039	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1040	}
1055	#endif	1041	#endif
1056		1042
1057	#ifdef TEXT_BLINK	1043	#ifdef TEXT_BLINK
1058	void	1044	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1058	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1059	{
1074	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1060	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1061	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1062	{
1077	refresh_type |= SMOOTH_REFRESH;
1078	want_refresh = 1;	1063	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1064	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1065	}
1081	}	1066	}
1082	#endif	1067	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1071	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1072	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1073	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1074	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1075	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type |= SMOOTH_REFRESH;
1092	want_refresh = 1;	1076	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1078	}
1095	}	1079	}
1096	#endif	1080	#endif
…		…
1104	: scr_page (UP, mouse_slip_wheel_speed))	1088	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1089	{
1106	if (view_start == top_row || view_start == 0)	1090	if (view_start == top_row || view_start == 0)
1107	mouse_slip_wheel_speed = 0;	1091	mouse_slip_wheel_speed = 0;
1108		1092
1109	refresh_type |= SMOOTH_REFRESH;
1110	want_refresh = 1;	1093	want_refresh = 1;
1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112	}	1095	}
1113	}	1096	}
1114	#endif	1097	#endif
1115		1098
1116	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1117	static struct event_handler	1100	static struct event_handler
1118	{	1101	{
1119	check_watcher cw_yield;	1102	check_watcher yield_ev;
1120		1103
1121	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1122	{	1105	{
1123	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
1124	w.stop ();	1114	w.stop ();
1125	}	1115	}
1126		1116
1127	event_handler ()	1117	event_handler ()
1128	: cw_yield (this, &event_handler::yield)	1118	: yield_ev (this, &event_handler::yield_cb)
1129	{	1119	{
1130	}	1120	}
1131	} event_handler;	1121	} event_handler;
1132	#endif	1122	#endif
1133		1123
…		…
1144		1134
1145	memmove (cmdbuf_base, cmdbuf_ptr, n);	1135	memmove (cmdbuf_base, cmdbuf_ptr, n);
1146	cmdbuf_ptr = cmdbuf_base;	1136	cmdbuf_ptr = cmdbuf_base;
1147	cmdbuf_endp = cmdbuf_ptr + n;	1137	cmdbuf_endp = cmdbuf_ptr + n;
1148		1138
1149	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1139	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150		1140
1151	if (r > 0)	1141	if (r > 0)
1152	{	1142	{
1153	cmdbuf_endp += r;	1143	cmdbuf_endp += r;
1154	return true;	1144	return true;
1155	}	1145	}
1156	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1146	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157	{	1147	{
1158	#if HAVE_SCHED_YIELD	1148	#if LINUX_YIELD_HACK
1159	if (display->is_local)	1149	if (display->is_local)
1160	event_handler.cw_yield.start ();	1150	event_handler.yield_ev.start ();
1161	#endif	1151	#endif
1162	}	1152	}
1163	else	1153	else
1164	{	1154	{
1165	pty_ev.stop ();	1155	pty_ev.stop ();
…		…
1172	}	1162	}
1173		1163
1174	void	1164	void
1175	rxvt_term::pty_cb (io_watcher &w, short revents)	1165	rxvt_term::pty_cb (io_watcher &w, short revents)
1176	{	1166	{
1177	SET_R (this);	1167	make_current ();
1178	SET_LOCALE (locale);
1179		1168
1180	if (revents & EVENT_READ)	1169	if (revents & EVENT_READ)
1181	// loop, but don't allow a single term to monopolize us	1170	// loop, but don't allow a single term to monopolize us
1182	while (pty_fill ())	1171	while (pty_fill ())
1183	if (cmd_parse ())	1172	if (cmd_parse ())
…		…
1188	}	1177	}
1189		1178
1190	void	1179	void
1191	rxvt_term::pointer_unblank ()	1180	rxvt_term::pointer_unblank ()
1192	{	1181	{
1193	XDefineCursor (display->display, vt, TermWin_cursor);	1182	XDefineCursor (xdisp, vt, TermWin_cursor);
1194	recolour_cursor ();	1183	recolour_cursor ();
1195		1184
1196	#ifdef POINTER_BLANK	1185	#ifdef POINTER_BLANK
1197	hidden_pointer = 0;	1186	hidden_pointer = 0;
1198		1187
…		…
1206	rxvt_term::pointer_blank ()	1195	rxvt_term::pointer_blank ()
1207	{	1196	{
1208	if (!OPTION (Opt_pointerBlank))	1197	if (!OPTION (Opt_pointerBlank))
1209	return;	1198	return;
1210		1199
1211	XDefineCursor (display->display, vt, display->blank_cursor);	1200	XDefineCursor (xdisp, vt, display->blank_cursor);
1212	XFlush (display->display);	1201	XFlush (xdisp);
1213		1202
1214	hidden_pointer = 1;	1203	hidden_pointer = 1;
1215	}	1204	}
1216		1205
1217	void	1206	void
1218	rxvt_term::pointer_cb (time_watcher &w)	1207	rxvt_term::pointer_cb (time_watcher &w)
1219	{	1208	{
1220	SET_R (this);	1209	make_current ();
1221	SET_LOCALE (locale);
1222		1210
1223	pointer_blank ();	1211	pointer_blank ();
1224	}	1212	}
1225	#endif	1213	#endif
1226		1214
…		…
1291	(32 + button_number + key_state),	1279	(32 + button_number + key_state),
1292	(32 + x + 1),	1280	(32 + x + 1),
1293	(32 + y + 1));	1281	(32 + y + 1));
1294	}	1282	}
1295		1283
1296	#ifdef USING_W11LIB
1297	void
1298	rxvt_W11_process_x_event (XEvent *ev)
1299	{
1300	rxvt_t *r = rxvt_get_r ();
1301
1302	x_cb (*ev);
1303	}
1304	#endif
1305
1306	/*{{{ process an X event */	1284	/*{{{ process an X event */
1307	void	1285	void
1308	rxvt_term::x_cb (XEvent &ev)	1286	rxvt_term::x_cb (XEvent &ev)
1309	{	1287	{
1310	dDisp;	1288	make_current ();
1311		1289
1312	SET_R (this);	1290	dLocal (Display *, xdisp);
1313	SET_LOCALE (locale);
1314		1291
1315	if (ev.xany.window == vt	1292	if (ev.xany.window == vt
		1293	&& SHOULD_INVOKE (HOOK_X_EVENT)
1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1294	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317	return;	1295	return;
1318		1296
1319	// for XQueryPointer	1297	// for XQueryPointer
1320	Window unused_root, unused_child;	1298	Window unused_root, unused_child;
…		…
1414	button_release (ev.xbutton);	1392	button_release (ev.xbutton);
1415	break;	1393	break;
1416		1394
1417	case ClientMessage:	1395	case ClientMessage:
1418	if (ev.xclient.format == 32	1396	if (ev.xclient.format == 32
1419	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1397	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420	{	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	{
1421	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)))
1422	destroy ();	1406	destroy ();
		1407	}
1423	#if ENABLE_EWMH	1408	#if ENABLE_EWMH
1424	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])
1425	XSendEvent (disp, ev.xclient.window = display->root,	1410	XSendEvent (xdisp, ev.xclient.window = display->root,
1426	False, SubstructureRedirectMask | SubstructureNotifyMask,	1411	False, SubstructureRedirectMask | SubstructureNotifyMask,
1427	&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	}
1428	#endif	1424	#endif
1429	}	1425	}
1430	#if ENABLE_XEMBED
1431	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432	{
1433	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434	focus_in ();
1435	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436	focus_out ();
1437	}
1438	#endif
1439	#ifdef OFFIX_DND
1440	/* OffiX Dnd (drag 'n' drop) protocol */
1441	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442	&& (ev.xclient.data.l[0] == DndFile
1443	|| ev.xclient.data.l[0] == DndDir
1444	|| ev.xclient.data.l[0] == DndLink))
1445	{
1446	/* Get Dnd data */
1447	Atom ActualType;
1448	int ActualFormat;
1449	unsigned char *data;
1450	unsigned long Size, RemainingBytes;
1451
1452	XGetWindowProperty (disp, display->root,
1453	xa[XA_DNDSELECTION],
1454	0L, 1000000L,
1455	False, AnyPropertyType,
1456	&ActualType, &ActualFormat,
1457	&Size, &RemainingBytes,
1458	&data);
1459	set_string_property (XA_CUT_BUFFER0, data);
1460	XFree (data);
1461	selection_paste (display->root, XA_CUT_BUFFER0, true);
1462	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463	}
1464	#endif /* OFFIX_DND */
1465	break;	1426	break;
1466		1427
1467	case MappingNotify:	1428	case MappingNotify:
1468	XRefreshKeyboardMapping (&ev.xmapping);	1429	XRefreshKeyboardMapping (&ev.xmapping);
1469	break;	1430	break;
…		…
1502	break;	1463	break;
1503		1464
1504	case ConfigureNotify:	1465	case ConfigureNotify:
1505	if (ev.xconfigure.window == parent[0])	1466	if (ev.xconfigure.window == parent[0])
1506	{	1467	{
1507	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1468	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1508	;	1469	;
1509		1470
1510	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1471	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511	{	1472	{
1512	seen_resize = 1;	1473	seen_resize = 1;
1513	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514	}	1475	}
1515		1476
		1477	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1478
1516	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1479	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517	if (OPTION (Opt_transparent))	1480	if (OPTION (Opt_transparent))
1518	check_our_parents ();	1481	check_our_parents ();
1519	#endif	1482	#endif
1520	}	1483	}
1521	break;	1484	break;
1522		1485
1523	case PropertyNotify:	1486	case PropertyNotify:
		1487	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1488	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525	&& ev.xproperty.state == PropertyNewValue)	1489	&& ev.xproperty.state == PropertyNewValue)
1526	selection_property (ev.xproperty.window, ev.xproperty.atom);	1490	selection_property (ev.xproperty.window, ev.xproperty.atom);
1527		1491
1528	break;	1492	break;
1529		1493
1530	case SelectionClear:	1494	case SelectionClear:
1531	selection_clear ();	1495	selection_clear ();
…		…
1567	if (ev.xany.window == vt)	1531	if (ev.xany.window == vt)
1568	{	1532	{
1569	do	1533	do
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1534	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1535	ev.xexpose.width, ev.xexpose.height, False);
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1536	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1573		1537
1574	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1538	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575		1539
1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1540	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1577	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1578	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
1579		1543
1580	want_refresh = 1;	1544	want_refresh = 1;
1581	}	1545	}
1582	else	1546	else
1583	{	1547	{
1584	XEvent unused_event;	1548	XEvent unused_event;
1585		1549
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1550	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1587	;	1551	;
1588	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1552	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1589	;	1553	;
1590		1554
1591	if (isScrollbarWindow (ev.xany.window))	1555	if (isScrollbarWindow (ev.xany.window))
1592	{	1556	{
1593	scrollBar.setIdle ();	1557	scrollBar.setIdle ();
1594	scrollbar_show (0);	1558	scrollbar_show (0);
1595	}	1559	}
1596	#ifdef MENUBAR
1597	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598	menubar_expose ();
1599	#endif
1600		1560
1601	#ifdef TRANSPARENT	1561	#ifdef TRANSPARENT
1602	if (am_transparent && ev.xany.window == parent[0])	1562	if (am_transparent && ev.xany.window == parent[0])
1603	XClearWindow (disp, ev.xany.window);	1563	XClearWindow (xdisp, ev.xany.window);
1604	#endif	1564	#endif
1605	}	1565	}
1606	break;	1566	break;
1607		1567
1608	case MotionNotify:	1568	case MotionNotify:
1609	#ifdef POINTER_BLANK	1569	#ifdef POINTER_BLANK
1610	if (hidden_pointer)	1570	if (hidden_pointer)
1611	pointer_unblank ();	1571	pointer_unblank ();
1612	#endif	1572	#endif
1613	#if MENUBAR
1614	if (isMenuBarWindow (ev.xany.window))
1615	{
1616	menubar_control (ev.xbutton);
1617	break;
1618	}
1619	#endif
1620	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1573	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621	break;	1574	break;
1622		1575
1623	if (ev.xany.window == vt)	1576	if (ev.xany.window == vt)
1624	{	1577	{
		1578	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1579	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626	; // nop	1580	; // nop
1627	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1581	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628	{	1582	{
1629	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1583	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1630	;	1584	;
1631		1585
1632	XQueryPointer (disp, vt,	1586	XQueryPointer (xdisp, vt,
1633	&unused_root, &unused_child,	1587	&unused_root, &unused_child,
1634	&unused_root_x, &unused_root_y,	1588	&unused_root_x, &unused_root_y,
1635	&ev.xbutton.x, &ev.xbutton.y,	1589	&ev.xbutton.x, &ev.xbutton.y,
1636	&ev.xbutton.state);	1590	&ev.xbutton.state);
1637	#ifdef MOUSE_THRESHOLD	1591	#ifdef MOUSE_THRESHOLD
…		…
1701	#endif	1655	#endif
1702	}	1656	}
1703	}	1657	}
1704	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1658	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1705	{	1659	{
1706	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1660	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1707	MotionNotify, &ev))	1661	MotionNotify, &ev))
1708	;	1662	;
1709		1663
1710	XQueryPointer (disp, scrollBar.win,	1664	XQueryPointer (xdisp, scrollBar.win,
1711	&unused_root, &unused_child,	1665	&unused_root, &unused_child,
1712	&unused_root_x, &unused_root_y,	1666	&unused_root_x, &unused_root_y,
1713	&ev.xbutton.x, &ev.xbutton.y,	1667	&ev.xbutton.x, &ev.xbutton.y,
1714	&unused_mask);	1668	&unused_mask);
1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1669	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1730	{	1684	{
1731	hidden_cursor = 0;	1685	hidden_cursor = 0;
1732	want_refresh = 1;	1686	want_refresh = 1;
1733	}	1687	}
1734		1688
1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1689	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736	}	1690	}
1737	#endif	1691	#endif
1738		1692
1739	#if defined(POINTER_BLANK)	1693	#if defined(POINTER_BLANK)
1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1694	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1768	XSetICFocus (Input_Context);	1722	XSetICFocus (Input_Context);
1769	}	1723	}
1770	#endif	1724	#endif
1771	#if CURSOR_BLINK	1725	#if CURSOR_BLINK
1772	if (OPTION (Opt_cursorBlink))	1726	if (OPTION (Opt_cursorBlink))
1773	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1727	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774	#endif	1728	#endif
1775	#if OFF_FOCUS_FADING	1729	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1730	if (rs[Rs_fade])
1777	{	1731	{
1778	pix_colors = pix_colors_focused;	1732	pix_colors = pix_colors_focused;
…		…
1822		1776
1823	#if TRANSPARENT	1777	#if TRANSPARENT
1824	void	1778	void
1825	rxvt_term::rootwin_cb (XEvent &ev)	1779	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1780	{
1827	SET_R (this);	1781	make_current ();
1828	SET_LOCALE (locale);
1829		1782
1830	switch (ev.type)	1783	switch (ev.type)
1831	{	1784	{
1832	case PropertyNotify:	1785	case PropertyNotify:
1833	/*	1786	/*
…		…
1860	/*	1813	/*
1861	* VT window processing of button press	1814	* VT window processing of button press
1862	*/	1815	*/
1863	if (ev.window == vt)	1816	if (ev.window == vt)
1864	{	1817	{
		1818	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1819	return;
		1820
1865	#if ISO_14755	1821	#if ISO_14755
1866	// 5.4	1822	// 5.4
1867	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1823	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1868	{	1824	{
1869	iso14755_54 (ev.x, ev.y);	1825	iso14755_54 (ev.x, ev.y);
…		…
1911	else	1867	else
1912	{	1868	{
1913	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
1914	MEvent.clicks = 0;	1870	MEvent.clicks = 0;
1915		1871
1916	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917	switch (ev.button)	1872	switch (ev.button)
1918	{	1873	{
1919	case Button1:	1874	case Button1:
1920	/* allow meta + click to select rectangular areas */	1875	/* allow meta + click to select rectangular areas */
1921	/* should be done in screen.C */	1876	/* should be done in screen.C */
1922	#if ENABLE_FRILLS	1877	#if ENABLE_FRILLS
1923	selection.rect = !!(ev.state & ModMetaMask);	1878	selection.rect = !!(ev.state & ModMetaMask);
1924	#else	1879	#else
1925	selection.rect = false;	1880	selection.rect = false;
1926	#endif	1881	#endif
1927		1882
1928	/* allow shift+left click to extend selection */	1883	/* allow shift+left click to extend selection */
1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1884	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930	{	1885	{
1931	if (MEvent.button == Button1 && clickintime)	1886	if (MEvent.button == Button1 && clickintime)
1932	selection_rotate (ev.x, ev.y);	1887	selection_rotate (ev.x, ev.y);
1933	else	1888	else
1934	selection_extend (ev.x, ev.y, 1);	1889	selection_extend (ev.x, ev.y, 1);
1935	}	1890	}
1936	else	1891	else
1937	{	1892	{
1938	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1939	MEvent.clicks++;	1894	MEvent.clicks++;
1940	else	1895	else
1941	MEvent.clicks = 1;	1896	MEvent.clicks = 1;
1942		1897
1943	selection_click (MEvent.clicks, ev.x, ev.y);	1898	selection_click (MEvent.clicks, ev.x, ev.y);
1944	}	1899	}
1945		1900
1946	MEvent.button = Button1;	1901	MEvent.button = Button1;
1947	break;	1902	break;
1948		1903
1949	case Button3:	1904	case Button3:
1950	if (MEvent.button == Button3 && clickintime)	1905	if (MEvent.button == Button3 && clickintime)
1951	selection_rotate (ev.x, ev.y);	1906	selection_rotate (ev.x, ev.y);
1952	else	1907	else
1953	selection_extend (ev.x, ev.y, 1);	1908	selection_extend (ev.x, ev.y, 1);
1954		1909
1955	MEvent.button = Button3;	1910	MEvent.button = Button3;
1956	break;	1911	break;
1957	}	1912	}
1958	}	1913	}
1959		1914
1960	MEvent.time = ev.time;	1915	MEvent.time = ev.time;
1961	return;	1916	return;
1962	}	1917	}
1963		1918
…		…
2102	}	2057	}
2103	}	2058	}
2104		2059
2105	return;	2060	return;
2106	}	2061	}
2107
2108	#if MENUBAR
2109	/*
2110	* Menubar window processing of button press
2111	*/
2112	if (isMenuBarWindow (ev.window))
2113	menubar_control (ev);
2114	#endif
2115	}	2062	}
2116		2063
2117	void	2064	void
2118	rxvt_term::button_release (XButtonEvent &ev)	2065	rxvt_term::button_release (XButtonEvent &ev)
2119	{	2066	{
…		…
2125		2072
2126	if (scrollbar_isUpDn ())	2073	if (scrollbar_isUpDn ())
2127	{	2074	{
2128	scrollBar.setIdle ();	2075	scrollBar.setIdle ();
2129	scrollbar_show (0);	2076	scrollbar_show (0);
2130	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131	refresh_type &= ~SMOOTH_REFRESH;
2132	#endif
2133	}	2077	}
2134		2078
2135	#ifdef SELECTION_SCROLLING	2079	#ifdef SELECTION_SCROLLING
2136	if (sel_scroll_ev.active)	2080	if (sel_scroll_ev.active)
2137	sel_scroll_ev.stop();	2081	sel_scroll_ev.stop();
2138	#endif	2082	#endif
2139		2083
2140	if (ev.window == vt)	2084	if (ev.window == vt)
2141	{	2085	{
		2086	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2087	return;
		2088
2142	#if ISO_14755	2089	#if ISO_14755
2143	// 5.4	2090	// 5.4
2144	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2091	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2145	return;	2092	return;
2146	#endif	2093	#endif
		2094
2147	if (reportmode)	2095	if (reportmode)
2148	{	2096	{
2149	/* mouse report from vt window */	2097	/* mouse report from vt window */
2150	/* don't report release of wheel "buttons" */	2098	/* don't report release of wheel "buttons" */
2151	if (ev.button >= 4)	2099	if (ev.button >= 4)
…		…
2175	if (priv_modes & PrivMode_mouse_report	2123	if (priv_modes & PrivMode_mouse_report
2176	&& bypass_keystate	2124	&& bypass_keystate
2177	&& ev.button == Button1 && MEvent.clicks <= 1)	2125	&& ev.button == Button1 && MEvent.clicks <= 1)
2178	selection_extend (ev.x, ev.y, 0);	2126	selection_extend (ev.x, ev.y, 0);
2179		2127
2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181	return;
2182
2183	switch (ev.button)	2128	switch (ev.button)
2184	{	2129	{
2185	case Button1:	2130	case Button1:
2186	case Button3:	2131	case Button3:
2187	selection_make (ev.time);	2132	selection_make (ev.time);
2188	break;	2133	break;
		2134
2189	case Button2:	2135	case Button2:
2190	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);
2191	break;	2138	break;
		2139
2192	#ifdef MOUSE_WHEEL	2140	#ifdef MOUSE_WHEEL
2193	case Button4:	2141	case Button4:
2194	case Button5:	2142	case Button5:
2195	{	2143	{
2196	int i;	2144	int i;
…		…
2228	}	2176	}
2229	break;	2177	break;
2230	#endif	2178	#endif
2231	}	2179	}
2232	}	2180	}
2233	#ifdef MENUBAR
2234	else if (isMenuBarWindow (ev.window))
2235	menubar_control (ev);
2236	#endif
2237	}	2181	}
2238		2182
2239	#ifdef TRANSPARENT	2183	#ifdef TRANSPARENT
2240	#if TINTING	2184	#if TINTING
2241	/* taken from aterm-0.4.2 */	2185	/* taken from aterm-0.4.2 */
2242		2186
2243	typedef uint32_t RUINT32T;	2187	typedef uint32_t RUINT32T;
2244		2188
2245	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)
2246	{	2190	{
2247	int sh_r, sh_g, sh_b;	2191	int sh_r, sh_g, sh_b;
2248	RUINT32T mask_r, mask_g, mask_b;	2192	RUINT32T mask_r, mask_g, mask_b;
2249	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2193	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2194	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2195	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252	int i;	2196	int i;
2253		2197
2254	Visual *visual = display->visual;	2198	Visual *visual = term->visual;
2255		2199
2256	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2200	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257		2201
2258	/* for convenience */	2202	/* for convenience */
2259	mask_r = visual->red_mask;	2203	mask_r = visual->red_mask;
…		…
2480	Atom atype;	2424	Atom atype;
2481	unsigned char *prop = NULL;	2425	unsigned char *prop = NULL;
2482	Window root, oldp, *list;	2426	Window root, oldp, *list;
2483	Pixmap rootpixmap = None;	2427	Pixmap rootpixmap = None;
2484	XWindowAttributes wattr, wrootattr;	2428	XWindowAttributes wattr, wrootattr;
2485	dDisp;
2486		2429
2487	pchanged = 0;	2430	pchanged = 0;
2488		2431
2489	if (!OPTION (Opt_transparent))	2432	if (!OPTION (Opt_transparent))
2490	return pchanged; /* Don't try any more */	2433	return pchanged; /* Don't try any more */
2491		2434
2492	XGetWindowAttributes (disp, display->root, &wrootattr);	2435	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2493	rootdepth = wrootattr.depth;	2436	rootdepth = wrootattr.depth;
2494		2437
2495	XGetWindowAttributes (disp, parent[0], &wattr);	2438	XGetWindowAttributes (xdisp, parent[0], &wattr);
2496		2439
2497	if (rootdepth != wattr.depth)	2440	if (rootdepth != wattr.depth)
2498	{	2441	{
2499	if (am_transparent)	2442	if (am_transparent)
2500	{	2443	{
2501	pchanged = 1;	2444	pchanged = 1;
2502	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2445	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2503	am_transparent = am_pixmap_trans = 0;	2446	am_transparent = am_pixmap_trans = 0;
2504	}	2447	}
2505		2448
2506	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2507	}	2450	}
2508		2451
2509	/* 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. */
2510	XSync (disp, False);	2453	XSync (xdisp, False);
2511		2454
2512	/*	2455	/*
2513	* Make the frame window set by the window manager have	2456	* Make the frame window set by the window manager have
2514	* the root background. Some window managers put multiple nested frame	2457	* the root background. Some window managers put multiple nested frame
2515	* 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.
2516	*/	2459	*/
2517	i = (xa[XA_XROOTPMAP_ID]	2460	i = (xa[XA_XROOTPMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2521		2464
2522	if (!i || prop == NULL)	2465	if (!i || prop == NULL)
2523	i = (xa[XA_ESETROOT_PMAP_ID]	2466	i = (xa[XA_ESETROOT_PMAP_ID]
2524	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2467	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2527		2470
2528	if (!i || prop == NULL	2471	if (!i || prop == NULL
2529	#if TINTING	2472	#if TINTING
2530	|| !rs[Rs_color + Color_tint]	2473	|| !ISSET_PIXCOLOR (Color_tint)
2531	#endif	2474	#endif
2532	)	2475	)
2533	have_pixmap = 0;	2476	have_pixmap = 0;
2534	else	2477	else
2535	{	2478	{
…		…
2548	Window cr;	2491	Window cr;
2549	XImage *image;	2492	XImage *image;
2550	GC gc;	2493	GC gc;
2551	XGCValues gcvalue;	2494	XGCValues gcvalue;
2552		2495
2553	XTranslateCoordinates (disp, parent[0], display->root,	2496	XTranslateCoordinates (xdisp, parent[0], display->root,
2554	0, 0, &sx, &sy, &cr);	2497	0, 0, &sx, &sy, &cr);
2555	nw = (unsigned int)szHint.width;	2498	nw = (unsigned int)szHint.width;
2556	nh = (unsigned int)szHint.height;	2499	nh = (unsigned int)szHint.height;
2557	nx = ny = 0;	2500	nx = ny = 0;
2558		2501
…		…
2571	}	2514	}
2572		2515
2573	min_it (nw, (unsigned int) (wrootattr.width - sx));	2516	min_it (nw, (unsigned int) (wrootattr.width - sx));
2574	min_it (nh, (unsigned int) (wrootattr.height - sy));	2517	min_it (nh, (unsigned int) (wrootattr.height - sy));
2575		2518
2576	XSync (disp, False);	2519	XSync (xdisp, False);
2577	allowedxerror = -1;	2520	allowedxerror = -1;
2578	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2521	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579		2522
2580	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2581	/* XXX: may need a delay here? */	2524	/* XXX: may need a delay here? */
2582	allowedxerror = 0;	2525	allowedxerror = 0;
2583		2526
…		…
2586	if (am_transparent && am_pixmap_trans)	2529	if (am_transparent && am_pixmap_trans)
2587	{	2530	{
2588	pchanged = 1;	2531	pchanged = 1;
2589	if (pixmap != None)	2532	if (pixmap != None)
2590	{	2533	{
2591	XFreePixmap (disp, pixmap);	2534	XFreePixmap (xdisp, pixmap);
2592	pixmap = None;	2535	pixmap = None;
2593	}	2536	}
2594	}	2537	}
2595		2538
2596	am_pixmap_trans = 0;	2539	am_pixmap_trans = 0;
2597	}	2540	}
2598	else	2541	else
2599	{	2542	{
2600	if (pixmap != None)	2543	if (pixmap != None)
2601	XFreePixmap (disp, pixmap);	2544	XFreePixmap (xdisp, pixmap);
2602		2545
2603	#if TINTING	2546	#if TINTING
2604	if (ISSET_PIXCOLOR (Color_tint))	2547	if (ISSET_PIXCOLOR (Color_tint))
2605	{	2548	{
2606	unsigned short rm, gm, bm;
2607	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608		2550
		2551	rgba c;
2609	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2552	pix_colors_focused [Color_tint].get (c);
2610		2553
2611	ShadeXImage (display, image, shade, rm, gm, bm);	2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2612	}	2555	}
2613	#endif	2556	#endif
2614		2557
2615	pixmap = XCreatePixmap (disp, vt,	2558	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2616	szHint.width, szHint.height, image->depth);
2617	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2559	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2618	XPutImage (disp, pixmap, gc, image, 0, 0,	2560	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2619	nx, ny, image->width, image->height);	2561	nx, ny, image->width, image->height);
2620	XFreeGC (disp, gc);	2562	XFreeGC (xdisp, gc);
2621	XDestroyImage (image);	2563	XDestroyImage (image);
2622	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2564	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2623	XClearWindow (disp, parent[0]);	2565	XClearWindow (xdisp, parent[0]);
2624		2566
2625	if (!am_transparent || !am_pixmap_trans)	2567	if (!am_transparent || !am_pixmap_trans)
2626	pchanged = 1;	2568	pchanged = 1;
2627		2569
2628	am_transparent = am_pixmap_trans = 1;	2570	am_transparent = am_pixmap_trans = 1;
2629	}	2571	}
2630	}	2572	}
2631		2573
2632	if (am_pixmap_trans)	2574	if (am_pixmap_trans)
2633	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2575	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2634	else	2576	else
2635	{	2577	{
2636	unsigned int n;	2578	unsigned int n;
2637	/*	2579	/*
2638	* InheritPixmap transparency	2580	* InheritPixmap transparency
2639	*/	2581	*/
2640	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641	{	2583	{
2642	oldp = parent[i];	2584	oldp = parent[i];
2643	XQueryTree (disp, parent[i - 1], &root,	2585	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2644	&parent[i], &list, &n);
2645	XFree (list);	2586	XFree (list);
2646		2587
2647	if (parent[i] == display->root)	2588	if (parent[i] == display->root)
2648	{	2589	{
2649	if (oldp != None)	2590	if (oldp != None)
…		…
2657	}	2598	}
2658		2599
2659	n = 0;	2600	n = 0;
2660		2601
2661	if (pchanged)	2602	if (pchanged)
2662	{
2663	for (; n < (unsigned int)i; n++)	2603	for (; n < (unsigned int)i; n++)
2664	{	2604	{
2665	XGetWindowAttributes (disp, parent[n], &wattr);	2605	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2606
2666	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2607	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2667	{	2608	{
2668	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669	break;	2610	break;
2670	}	2611	}
2671	}	2612	}
2672	}
2673		2613
2674	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2614	if (n > (sizeof (parent) / sizeof (parent[0])))
2675	{	2615	{
2676	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2616	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2677	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2617	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2678	am_transparent = 0;	2618	am_transparent = 0;
2679	/* XXX: also turn off Opt_transparent? */	2619	/* XXX: also turn off Opt_transparent? */
2680	}	2620	}
2681	else	2621	else
2682	{	2622	{
2683	#if WAIT_FOR_WM
2684	/* wait (an arbitrary period) for the WM to do its thing
2685	* needed for fvwm2.2.2 (and before?) */
2686	sleep (1);
2687	#endif
2688	for (n = 0; n < (unsigned int)i; n++)	2623	for (n = 0; n < (unsigned int)i; n++)
2689	{	2624	{
2690	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2691	XClearWindow (disp, parent[n]);	2626	XClearWindow (xdisp, parent[n]);
2692	}	2627	}
2693		2628
2694	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2629	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2695	am_transparent = 1;	2630	am_transparent = 1;
2696	}	2631	}
2697		2632
2698	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699	parent[i] = None;	2634	parent[i] = None;
2700	}	2635	}
2701		2636
2702	if (scrollBar.win)	2637	if (scrollBar.win)
2703	{	2638	{
2704	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2639	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2705	scrollBar.setIdle ();	2640	scrollBar.setIdle ();
2706	scrollbar_show (0);	2641	scrollbar_show (0);
2707	}	2642	}
2708		2643
2709	if (am_transparent)	2644	if (am_transparent)
…		…
2784	}	2719	}
2785		2720
2786	// scr_add_lines only works for nlines <= nrow - 1.	2721	// scr_add_lines only works for nlines <= nrow - 1.
2787	if (nlines >= nrow - 1)	2722	if (nlines >= nrow - 1)
2788	{	2723	{
		2724	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789	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))))
2790	scr_add_lines (buf, str - buf, nlines);	2726	scr_add_lines (buf, str - buf, nlines);
2791		2727
2792	nlines = 0;	2728	nlines = 0;
2793	str = buf;	2729	str = buf;
2794	eol = str + min (ncol, UBUFSIZ);	2730	eol = str + min (ncol, UBUFSIZ);
…		…
2809		2745
2810	seq_begin = cmdbuf_ptr;	2746	seq_begin = cmdbuf_ptr;
2811	ch = next_char ();	2747	ch = next_char ();
2812	}	2748	}
2813		2749
		2750	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814	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))))
2815	scr_add_lines (buf, str - buf, nlines);	2752	scr_add_lines (buf, str - buf, nlines);
2816		2753
2817	/*	2754	/*
2818	* 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
2819	* 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.
…		…
2825	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2762	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826	refresh_limit++;	2763	refresh_limit++;
2827	else	2764	else
2828	{	2765	{
2829	flag = true;	2766	flag = true;
2830	scr_refresh (refresh_type);	2767	scr_refresh ();
2831	want_refresh = 1;	2768	want_refresh = 1;
2832	}	2769	}
2833	}	2770	}
2834		2771
2835	}	2772	}
…		…
2853	return flag;	2790	return flag;
2854	}	2791	}
2855		2792
2856	// read the next character	2793	// read the next character
2857	wchar_t	2794	wchar_t
2858	rxvt_term::next_char ()	2795	rxvt_term::next_char () NOTHROW
2859	{	2796	{
2860	while (cmdbuf_ptr < cmdbuf_endp)	2797	while (cmdbuf_ptr < cmdbuf_endp)
2861	{	2798	{
2862	// assume 7-bit to be ascii ALWAYS	2799	// assume 7-bit to be ascii ALWAYS
2863	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2800	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2884	return NOCHAR;	2821	return NOCHAR;
2885	}	2822	}
2886		2823
2887	// read the next octet	2824	// read the next octet
2888	uint32_t	2825	uint32_t
2889	rxvt_term::next_octet ()	2826	rxvt_term::next_octet () NOTHROW
2890	{	2827	{
2891	return cmdbuf_ptr < cmdbuf_endp	2828	return cmdbuf_ptr < cmdbuf_endp
2892	? (unsigned char)*cmdbuf_ptr++	2829	? (unsigned char)*cmdbuf_ptr++
2893	: NOCHAR;	2830	: NOCHAR;
2894	}	2831	}
		2832
		2833	static class out_of_input out_of_input;
2895		2834
2896	/* rxvt_cmd_getc () - Return next input character */	2835	/* rxvt_cmd_getc () - Return next input character */
2897	/*	2836	/*
2898	* Return the next input character after first passing any keyboard input	2837	* Return the next input character after first passing any keyboard input
2899	* to the command.	2838	* to the command.
2900	*/	2839	*/
2901	wchar_t	2840	wchar_t
2902	rxvt_term::cmd_getc ()	2841	rxvt_term::cmd_getc () THROW ((class out_of_input))
2903	{	2842	{
2904	wchar_t c = next_char ();	2843	wchar_t c = next_char ();
2905		2844
2906	if (c == NOCHAR)	2845	if (c == NOCHAR)
2907	throw out_of_input;	2846	throw out_of_input;
2908		2847
2909	return c;	2848	return c;
2910	}	2849	}
2911		2850
2912	uint32_t	2851	uint32_t
2913	rxvt_term::cmd_get8 ()	2852	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914	{	2853	{
2915	uint32_t c = next_octet ();	2854	uint32_t c = next_octet ();
2916		2855
2917	if (c == NOCHAR)	2856	if (c == NOCHAR)
2918	throw out_of_input;	2857	throw out_of_input;
…		…
3156	scr_charset_set (2, (unsigned int)cmd_getc ());	3095	scr_charset_set (2, (unsigned int)cmd_getc ());
3157	break;	3096	break;
3158	case '+':	3097	case '+':
3159	scr_charset_set (3, (unsigned int)cmd_getc ());	3098	scr_charset_set (3, (unsigned int)cmd_getc ());
3160	break;	3099	break;
3161	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3162	case '6':	3101	case '6':
3163	scr_backindex ();	3102	scr_backindex ();
3164	break;	3103	break;
3165	#endif	3104	#endif
3166	case '7':	3105	case '7':
3167	scr_cursor (SAVE);	3106	scr_cursor (SAVE);
3168	break;	3107	break;
3169	case '8':	3108	case '8':
3170	scr_cursor (RESTORE);	3109	scr_cursor (RESTORE);
3171	break;	3110	break;
3172	#if ENABLE_FRILLS	3111	#if !ENABLE_MINIMAL
3173	case '9':	3112	case '9':
3174	scr_forwardindex ();	3113	scr_forwardindex ();
3175	break;	3114	break;
3176	#endif	3115	#endif
3177	case '=':	3116	case '=':
…		…
3339	ndef = get_byte_array_bit (csi_defaults, i);	3278	ndef = get_byte_array_bit (csi_defaults, i);
3340	for (p = 0; p < nargs; p++)	3279	for (p = 0; p < nargs; p++)
3341	if (arg[p] == -1)	3280	if (arg[p] == -1)
3342	arg[p] = ndef;	3281	arg[p] = ndef;
3343		3282
3344	#ifdef DEBUG_CMD
3345	fprintf (stderr, "CSI ");
3346	for (p = 0; p < nargs; p++)
3347	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348	fprintf (stderr, "%c\n", ch);
3349	#endif
3350
3351	/*	3283	/*
3352	* private mode handling	3284	* private mode handling
3353	*/	3285	*/
3354	if (priv)	3286	if (priv)
3355	{	3287	{
3356	switch (priv)	3288	switch (priv)
3357	{	3289	{
3358	case '>':	3290	case '>':
3359	if (ch == CSI_DA) /* secondary device attributes */	3291	if (ch == CSI_DA) /* secondary device attributes */
3360	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	}
3361	break;	3302	break;
3362	case '?':	3303	case '?':
3363	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3304	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3364	process_terminal_mode (ch, priv, nargs, arg);	3305	process_terminal_mode (ch, priv, nargs, arg);
3365	break;	3306	break;
…		…
3568	break;	3509	break;
3569	case CSI_75:	3510	case CSI_75:
3570	scr_cursor (RESTORE);	3511	scr_cursor (RESTORE);
3571	break;	3512	break;
3572		3513
3573	#if ENABLE_FRILLS	3514	#if !ENABLE_MINIMAL
3574	case CSI_74:	3515	case CSI_74:
3575	process_window_ops (arg, nargs);	3516	process_window_ops (arg, nargs);
3576	break;	3517	break;
3577	#endif	3518	#endif
3578		3519
…		…
3585	break;	3526	break;
3586	}	3527	}
3587	}	3528	}
3588	/*}}} */	3529	/*}}} */
3589		3530
3590	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3591	/* ARGSUSED */	3532	/* ARGSUSED */
3592	void	3533	void
3593	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3534	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594	{	3535	{
3595	int x, y;	3536	int x, y;
3596	XWindowAttributes wattr;	3537	XWindowAttributes wattr;
3597	Window wdummy;	3538	Window wdummy;
3598	dDisp;	3539
		3540	dLocal (Display *, xdisp);
3599		3541
3600	if (nargs == 0)	3542	if (nargs == 0)
3601	return;	3543	return;
3602		3544
3603	switch (args[0])	3545	switch (args[0])
3604	{	3546	{
3605	/*	3547	/*
3606	* commands	3548	* commands
3607	*/	3549	*/
3608	case 1: /* deiconify window */	3550	case 1: /* deiconify window */
3609	XMapWindow (disp, parent[0]);	3551	XMapWindow (xdisp, parent[0]);
3610	break;	3552	break;
3611	case 2: /* iconify window */	3553	case 2: /* iconify window */
3612	XIconifyWindow (disp, parent[0], display->screen);	3554	XIconifyWindow (xdisp, parent[0], display->screen);
3613	break;	3555	break;
3614	case 3: /* set position (pixels) */	3556	case 3: /* set position (pixels) */
3615	XMoveWindow (disp, parent[0], args[1], args[2]);	3557	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3616	break;	3558	break;
3617	case 4: /* set size (pixels) */	3559	case 4: /* set size (pixels) */
3618	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619	break;	3561	break;
3620	case 5: /* raise window */	3562	case 5: /* raise window */
3621	XRaiseWindow (disp, parent[0]);	3563	XRaiseWindow (xdisp, parent[0]);
3622	break;	3564	break;
3623	case 6: /* lower window */	3565	case 6: /* lower window */
3624	XLowerWindow (disp, parent[0]);	3566	XLowerWindow (xdisp, parent[0]);
3625	break;	3567	break;
3626	case 7: /* refresh window */	3568	case 7: /* refresh window */
3627	scr_touch (true);	3569	scr_touch (true);
3628	break;	3570	break;
3629	case 8: /* set size (chars) */	3571	case 8: /* set size (chars) */
…		…
3636	if (args[0] >= 24) /* set height (chars) */	3578	if (args[0] >= 24) /* set height (chars) */
3637	set_widthheight ((unsigned int)width,	3579	set_widthheight ((unsigned int)width,
3638	(unsigned int) (args[1] * fheight));	3580	(unsigned int) (args[1] * fheight));
3639	break;	3581	break;
3640		3582
3641
3642	/*	3583	/*
3643	* reports - some output format copied from XTerm	3584	* reports - some output format copied from XTerm
3644	*/	3585	*/
3645	case 11: /* report window state */	3586	case 11: /* report window state */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648	break;	3589	break;
3649	case 13: /* report window position */	3590	case 13: /* report window position */
3650	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (xdisp, parent[0], &wattr);
3651	XTranslateCoordinates (disp, parent[0], wattr.root,	3592	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3652	-wattr.border_width, -wattr.border_width,	3593	-wattr.border_width, -wattr.border_width,
3653	&x, &y, &wdummy);	3594	&x, &y, &wdummy);
3654	tt_printf ("\033[3;%d;%dt", x, y);	3595	tt_printf ("\033[3;%d;%dt", x, y);
3655	break;	3596	break;
3656	case 14: /* report window size (pixels) */	3597	case 14: /* report window size (pixels) */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3598	XGetWindowAttributes (xdisp, parent[0], &wattr);
3658	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659	break;	3600	break;
3660	case 18: /* report text area size (chars) */	3601	case 18: /* report text area size (chars) */
3661	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662	break;	3603	break;
…		…
3664	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665	break;	3606	break;
3666	case 20: /* report icon label */	3607	case 20: /* report icon label */
3667	{	3608	{
3668	char *s;	3609	char *s;
3669	XGetIconName (disp, parent[0], &s);	3610	XGetIconName (xdisp, parent[0], &s);
3670	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 */
3671	XFree (s);	3612	XFree (s);
3672	}	3613	}
3673	break;	3614	break;
3674	case 21: /* report window title */	3615	case 21: /* report window title */
3675	{	3616	{
3676	char *s;	3617	char *s;
3677	XFetchName (disp, parent[0], &s);	3618	XFetchName (xdisp, parent[0], &s);
3678	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 */
3679	XFree (s);	3620	XFree (s);
3680	}	3621	}
3681	break;	3622	break;
3682	}	3623	}
…		…
3783	void	3724	void
3784	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)
3785	{	3726	{
3786	if (str[0] == '?' && !str[1])	3727	if (str[0] == '?' && !str[1])
3787	{	3728	{
3788	unsigned short r, g, b;	3729	rgba c;
3789	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
3790	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);
3791	}	3738	}
3792	else	3739	else
3793	set_window_color (color, str);	3740	set_window_color (color, str);
3794	}	3741	}
3795		3742
…		…
3797	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3744	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798	*/	3745	*/
3799	void	3746	void
3800	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)
3801	{	3748	{
3802	int changed = 0;
3803	int color;	3749	int color;
3804	char *buf, *name;	3750	char *buf, *name;
3805	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3806	int saveop = op;	3752	int saveop = op;
3807	dDisp;	3753
		3754	dLocal (Display *, xdisp);
3808		3755
3809	assert (str != NULL);	3756	assert (str != NULL);
3810	switch (op)	3757	switch (op)
3811	{	3758	{
3812	case XTerm_name:	3759	case XTerm_name:
…		…
3828	unsigned long bytes_after;	3775	unsigned long bytes_after;
3829	unsigned char *value = 0;	3776	unsigned char *value = 0;
3830	const char *str = "";	3777	const char *str = "";
3831		3778
3832	if (prop	3779	if (prop
3833	&& XGetWindowProperty (disp, parent[0],	3780	&& XGetWindowProperty (xdisp, parent[0],
3834	prop, 0, 1<<16, 0, AnyPropertyType,	3781	prop, 0, 1<<16, 0, AnyPropertyType,
3835	&actual_type, &actual_format,	3782	&actual_type, &actual_format,
3836	&nitems, &bytes_after, &value) == Success	3783	&nitems, &bytes_after, &value) == Success
3837	&& actual_type != None	3784	&& actual_type != None
3838	&& actual_format == 8)	3785	&& actual_format == 8)
3839	str = (const char *)(value);	3786	str = (const char *)(value);
3840		3787
3841	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3788	tt_printf ("\033]%d;%s%c", op, str, resp);
3842		3789
3843	XFree (value);	3790	XFree (value);
3844	}	3791	}
3845	else	3792	else
3846	{	3793	{
…		…
3850	{	3797	{
3851	*eq = 0;	3798	*eq = 0;
3852	set_utf8_property (display->atom (str), eq + 1);	3799	set_utf8_property (display->atom (str), eq + 1);
3853	}	3800	}
3854	else	3801	else
3855	XDeleteProperty (disp, parent[0],	3802	XDeleteProperty (xdisp, parent[0],
3856	display->atom (str));	3803	display->atom (str));
3857	}	3804	}
3858	break;	3805	break;
3859		3806
3860	case XTerm_Color:	3807	case XTerm_Color:
…		…
3870	break;	3817	break;
3871		3818
3872	if ((buf = strchr (name, ';')) != NULL)	3819	if ((buf = strchr (name, ';')) != NULL)
3873	*buf++ = '\0';	3820	*buf++ = '\0';
3874		3821
3875	if (name[0] == '?' && !name[1])	3822	process_color_seq (op, color, name, resp);
3876	{
3877	unsigned short r, g, b;
3878	pix_colors_focused[color].get (display, r, g, b);
3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880	}
3881	else
3882	set_window_color (color, name);
3883	}	3823	}
3884	break;	3824	break;
3885	case XTerm_Color00:	3825	case XTerm_Color00:
3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3826	process_color_seq (op, Color_fg, str, resp);
3887	break;	3827	break;
3888	case XTerm_Color01:	3828	case XTerm_Color01:
3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3829	process_color_seq (op, Color_bg, str, resp);
3890	break;	3830	break;
3891	#ifndef NO_CURSORCOLOR	3831	#ifndef NO_CURSORCOLOR
3892	case XTerm_Color_cursor:	3832	case XTerm_Color_cursor:
3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3833	process_color_seq (op, Color_cursor, str, resp);
3894	break;	3834	break;
3895	#endif	3835	#endif
3896	case XTerm_Color_pointer_fg:	3836	case XTerm_Color_pointer_fg:
3897	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3837	process_color_seq (op, Color_pointer_fg, str, resp);
3898	break;	3838	break;
3899	case XTerm_Color_pointer_bg:	3839	case XTerm_Color_pointer_bg:
3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3840	process_color_seq (op, Color_pointer_bg, str, resp);
3901	break;	3841	break;
3902	#ifndef NO_BOLD_UNDERLINE_REVERSE	3842	#ifndef NO_BOLD_UNDERLINE_REVERSE
3903	case XTerm_Color_RV:	3843	case XTerm_Color_RV:
3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3844	process_color_seq (op, Color_RV, str, resp);
3905	break;	3845	break;
3906	case Rxvt_Color_BD:	3846	case Rxvt_Color_BD:
3907	case URxvt_Color_BD:	3847	case URxvt_Color_BD:
3908	process_color_seq (op, Color_BD, str, resp);	3848	process_color_seq (op, Color_BD, str, resp);
3909	break;	3849	break;
3910	case Rxvt_Color_UL:	3850	case Rxvt_Color_UL:
3911	case URxvt_Color_UL:	3851	case URxvt_Color_UL:
3912	process_color_seq (op, Color_UL, str, resp);	3852	process_color_seq (op, Color_UL, str, resp);
3913	break;	3853	break;
3914	case URxvt_Color_IT:	3854	case URxvt_Color_IT:
3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3855	process_color_seq (op, Color_IT, str, resp);
3916	break;	3856	break;
3917	#endif	3857	#endif
3918	#if TRANSPARENT && TINTING	3858	#if TRANSPARENT && TINTING
3919	case URxvt_Color_tint:	3859	case URxvt_Color_tint:
3920	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3860	process_color_seq (op, Color_tint, str, resp);
		3861
3921	check_our_parents ();	3862	check_our_parents ();
		3863
3922	if (am_transparent)	3864	if (am_transparent)
3923	want_full_refresh = want_refresh = 1;	3865	want_full_refresh = want_refresh = 1;
		3866
3924	break;	3867	break;
3925	#endif	3868	#endif
3926		3869
3927	case Rxvt_Pixmap:	3870	case Rxvt_Pixmap:
		3871	{
3928	if (*str != ';')	3872	if (*str != ';')
3929	{	3873	{
3930	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3931	scale_pixmap (""); /* reset to default scaling */	3875	scale_pixmap (""); /* reset to default scaling */
3932	set_bgPixmap (str); /* change pixmap */	3876	set_bgPixmap (str); /* change pixmap */
3933	scr_touch (true);	3877	scr_touch (true);
3934	#endif	3878	#endif
3935	}	3879	}
3936		3880
		3881	int changed = 0;
		3882
3937	while ((str = strchr (str, ';')) != NULL)	3883	while ((str = strchr (str, ';')) != NULL)
3938	{	3884	{
3939	str++;	3885	str++;
3940	#if XPM_BACKGROUND	3886	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3887	changed += scale_pixmap (str);
3942	#endif	3888	#endif
3943	}	3889	}
3944		3890
3945	if (changed)	3891	if (changed)
3946	{	3892	{
3947	#ifdef XPM_BACKGROUND	3893	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3894	resize_pixmap ();
3949	scr_touch (true);	3895	scr_touch (true);
3950	#endif	3896	#endif
3951	}	3897	}
		3898	}
3952	break;	3899	break;
3953		3900
3954	case Rxvt_restoreFG:	3901	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3902	set_window_color (Color_fg, str);
3956	break;	3903	break;
…		…
3960		3907
3961	case XTerm_logfile:	3908	case XTerm_logfile:
3962	// TODO, when secure mode?	3909	// TODO, when secure mode?
3963	break;	3910	break;
3964		3911
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3912	#if 0
3972	case Rxvt_dumpscreen: /* no error notices */	3913	case Rxvt_dumpscreen: /* no error notices */
3973	{	3914	{
3974	int fd;	3915	int fd;
3975	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)
…		…
4001	allocated.push_back ((void *)res);	3942	allocated.push_back ((void *)res);
4002	set_fonts ();	3943	set_fonts ();
4003	}	3944	}
4004	break;	3945	break;
4005		3946
4006	#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
4007	case URxvt_locale:	3956	case URxvt_locale:
4008	if (query)	3957	if (query)
4009	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);
4010	else	3959	else
4011	{	3960	{
4012	set_locale (str);	3961	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3962	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3963	init_xlocale ();
4015	}	3964	}
4016	break;	3965	break;
4017		3966
4018	case URxvt_view_up:	3967	case URxvt_view_up:
…		…
4071	return state;	4020	return state;
4072	}	4021	}
4073		4022
4074	/* we're not using priv _yet_ */	4023	/* we're not using priv _yet_ */
4075	void	4024	void
4076	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)
4077	{	4026	{
4078	unsigned int i, j;	4027	unsigned int i, j;
4079	int state;	4028	int state;
4080		4029
4081	static const struct	4030	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4041	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4042	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4043	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4044	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4045	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4046	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4047	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4048	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4049	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4050	#endif
…		…
4199	/* 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 */
4200	case 9: /* X10 mouse reporting */	4146	case 9: /* X10 mouse reporting */
4201	if (state) /* orthogonal */	4147	if (state) /* orthogonal */
4202	priv_modes &= ~PrivMode_MouseX11;	4148	priv_modes &= ~PrivMode_MouseX11;
4203	break;	4149	break;
4204	#ifdef menuBar_esc
4205	case menuBar_esc:
4206	#ifdef MENUBAR
4207	map_menuBar (state);
4208	#endif
4209	break;
4210	#endif
4211	#ifdef scrollBar_esc	4150	#ifdef scrollBar_esc
4212	case scrollBar_esc:	4151	case scrollBar_esc:
4213	if (scrollbar_mapping (state))	4152	if (scrollbar_mapping (state))
4214	{	4153	{
4215	resize_all_windows (0, 0, 0);	4154	resize_all_windows (0, 0, 0);
…		…
4385	scr_color (Color_bg, Color_bg);	4324	scr_color (Color_bg, Color_bg);
4386	break;	4325	break;
4387		4326
4388	//case 50: // not variable spacing	4327	//case 50: // not variable spacing
4389		4328
4390	#if ENABLE_FRILLS	4329	#if !ENABLE_MINIMAL
4391	case 90:	4330	case 90:
4392	case 91: /* set bright fg color */	4331	case 91: /* set bright fg color */
4393	case 92:	4332	case 92:
4394	case 93:	4333	case 93:
4395	case 94:	4334	case 94:
…		…
4460	rxvt_term::tt_write (const char *data, unsigned int len)	4399	rxvt_term::tt_write (const char *data, unsigned int len)
4461	{	4400	{
4462	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)))
4463	return;	4402	return;
4464		4403
4465	if (pty.pty < 0)	4404	if (pty->pty < 0)
4466	return;	4405	return;
4467		4406
4468	if (v_buflen == 0)	4407	if (v_buflen == 0)
4469	{	4408	{
4470	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));
4471		4410
4472	if ((unsigned int)written == len)	4411	if ((unsigned int)written == len)
4473	return;	4412	return;
4474		4413
4475	data += written;	4414	data += written;
…		…
4484	pty_ev.set (EVENT_READ | EVENT_WRITE);	4423	pty_ev.set (EVENT_READ | EVENT_WRITE);
4485	}	4424	}
4486		4425
4487	void rxvt_term::pty_write ()	4426	void rxvt_term::pty_write ()
4488	{	4427	{
4489	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));
4490		4429
4491	if (written > 0)	4430	if (written > 0)
4492	{	4431	{
4493	v_buflen -= written;	4432	v_buflen -= written;
4494		4433

Diff Legend

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