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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

…		…
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS || ISO_14755	69	#if ENABLE_FRILLS || ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	144	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR || !x)	153	if (t != NOCHAR || !x)
157	{	154	{
…		…
230	# if !UNICODE3	227	# if !UNICODE3
231	if (ch >= 0x10000)	228	if (ch >= 0x10000)
232	ch = 0xfffd;	229	ch = 0xfffd;
233	# endif	230	# endif
234	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
236	}	235	}
237		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
238	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
240		244
241	free (fname);	245	free (fname);
242		246
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	307	{
304	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
305	unsigned int newlen;	309	unsigned int newlen;
306	KeySym keysym;	310	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	311	int valid_keysym;
311	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
312		313
313	/*	314	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	444	scr_move_to (0, 1);
444	return;	445	return;
445	}	446	}
446	else if (keysym == XK_End)	447	else if (keysym == XK_End)
447	{	448	{
448	scr_move_to (1, 0);	449	scr_move_to (1, 1);
449	return;	450	return;
450	}	451	}
451	}	452	}
452	#endif	453	#endif
453	}	454	}
…		…
464	{	465	{
465	switch (keysym)	466	switch (keysym)
466	{	467	{
467	/* normal XTerm key bindings */	468	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	469	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	470	selection_request (ev.time);
470	return;	471	return;
471	#if TODO	472	#if TODO
472	/* rxvt extras */	473	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	474	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	475	change_font (FONT_UP);
…		…
905	{	906	{
906	const char ch = C0_ESC;	907	const char ch = C0_ESC;
907	tt_write (&ch, 1);	908	tt_write (&ch, 1);
908	}	909	}
909		910
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);	911	tt_write (kbuf, (unsigned int)len);
921	}	912	}
922	/*}}} */	913	/*}}} */
923		914
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	916	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	917	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	918	{
930	unsigned int n, s;	919	unsigned int n, s;
931		920
…		…
972		961
973	if (want_refresh)	962	if (want_refresh)
974	{	963	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	964	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	965	{
977	int row = -view_start;	966	int row = view_start;
978	int end_row = row + nrow;	967	int end_row = row + nrow;
979		968
980	while (row > -nsaved && ROW (row - 1).is_longer ())	969	while (row > top_row && ROW (row - 1).is_longer ())
981	--row;	970	--row;
982		971
983	do	972	do
984	{	973	{
985	int start_row = row;	974	int start_row = row;
986	line_t *l;	975	line_t *l;
987		976
988	do	977	do
989	{	978	{
990	l = &ROW (row);	979	l = &ROW (row++);
991		980
992	if (l->f & LINE_FILTERED)	981	if (!(l->f & LINE_FILTERED))
993	row++;
994	else
995	{	982	{
996	// line not filtered, mark it as filtered	983	// line not filtered, mark it as filtered
997	l->f |= LINE_FILTERED;	984	l->f |= LINE_FILTERED;
998	while (l->is_longer ())	985	while (l->is_longer ())
999	{	986	{
1000	l = &ROW (++row);	987	l = &ROW (row++);
1001	l->f |= LINE_FILTERED;	988	l->f |= LINE_FILTERED;
1002	}	989	}
1003		990
1004	// and filter it	991	// and filter it
1005	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	992	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
…		…
1007	break;	994	break;
1008	}	995	}
1009	}	996	}
1010	while (l->is_longer () && row < end_row);	997	while (l->is_longer () && row < end_row);
1011	}	998	}
1012	while (++row < end_row);	999	while (row < end_row);
1013	}	1000	}
1014		1001
1015	scr_refresh (refresh_type);	1002	scr_refresh ();
1016	scrollbar_show (1);	1003	scrollbar_show (1);
1017	#ifdef USE_XIM	1004	#ifdef USE_XIM
1018	IMSendSpot ();	1005	IMSendSpot ();
1019	#endif	1006	#endif
1020	}	1007	}
…		…
1023	}	1010	}
1024		1011
1025	void	1012	void
1026	rxvt_term::check_cb (check_watcher &w)	1013	rxvt_term::check_cb (check_watcher &w)
1027	{	1014	{
1028	SET_R (this);	1015	make_current ();
1029	SET_LOCALE (locale);
1030		1016
1031	display->flush ();	1017	display->flush ();
1032		1018
1033	if (want_refresh && !flush_ev.active)	1019	if (want_refresh && !flush_ev.active)
1034	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1020	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035	}	1021	}
1036		1022
1037	void	1023	void
1038	rxvt_term::flush_cb (time_watcher &w)	1024	rxvt_term::flush_cb (time_watcher &w)
1039	{	1025	{
1040	SET_R (this);	1026	make_current ();
1041	SET_LOCALE (locale);
1042		1027
1043	refresh_limit = 1;	1028	refresh_limit = 1;
1044	refresh_count = 0;	1029	refresh_count = 0;
1045	flush ();	1030	flush ();
1046	}	1031	}
…		…
1050	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1051	{	1036	{
1052	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1053	want_refresh = 1;	1038	want_refresh = 1;
1054		1039
1055	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1056	}	1041	}
1057	#endif	1042	#endif
1058		1043
1059	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1060	void	1045	void
…		…
1074	rxvt_term::cont_scroll_cb (time_watcher &w)	1059	rxvt_term::cont_scroll_cb (time_watcher &w)
1075	{	1060	{
1076	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1061	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077	scr_page (scrollbar_isUp() ? UP : DN, 1))	1062	scr_page (scrollbar_isUp() ? UP : DN, 1))
1078	{	1063	{
1079	refresh_type |= SMOOTH_REFRESH;
1080	want_refresh = 1;	1064	want_refresh = 1;
1081	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082	}	1066	}
1083	}	1067	}
1084	#endif	1068	#endif
…		…
1088	rxvt_term::sel_scroll_cb (time_watcher &w)	1072	rxvt_term::sel_scroll_cb (time_watcher &w)
1089	{	1073	{
1090	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1074	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091	{	1075	{
1092	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1076	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093	refresh_type |= SMOOTH_REFRESH;
1094	want_refresh = 1;	1077	want_refresh = 1;
1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1078	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096	}	1079	}
1097	}	1080	}
1098	#endif	1081	#endif
…		…
1103	{	1086	{
1104	if (mouse_slip_wheel_speed == 0	1087	if (mouse_slip_wheel_speed == 0
1105	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1088	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106	: scr_page (UP, mouse_slip_wheel_speed))	1089	: scr_page (UP, mouse_slip_wheel_speed))
1107	{	1090	{
1108	if (view_start == nsaved ||	1091	if (view_start == top_row || view_start == 0)
1109	view_start == 0)
1110	mouse_slip_wheel_speed = 0;	1092	mouse_slip_wheel_speed = 0;
1111		1093
1112	refresh_type |= SMOOTH_REFRESH;
1113	want_refresh = 1;	1094	want_refresh = 1;
1114	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115	}	1096	}
1116	}	1097	}
1117	#endif	1098	#endif
…		…
1147		1128
1148	memmove (cmdbuf_base, cmdbuf_ptr, n);	1129	memmove (cmdbuf_base, cmdbuf_ptr, n);
1149	cmdbuf_ptr = cmdbuf_base;	1130	cmdbuf_ptr = cmdbuf_base;
1150	cmdbuf_endp = cmdbuf_ptr + n;	1131	cmdbuf_endp = cmdbuf_ptr + n;
1151		1132
1152	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1133	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153		1134
1154	if (r > 0)	1135	if (r > 0)
1155	{	1136	{
1156	cmdbuf_endp += r;	1137	cmdbuf_endp += r;
1157	return true;	1138	return true;
…		…
1175	}	1156	}
1176		1157
1177	void	1158	void
1178	rxvt_term::pty_cb (io_watcher &w, short revents)	1159	rxvt_term::pty_cb (io_watcher &w, short revents)
1179	{	1160	{
1180	SET_R (this);	1161	make_current ();
1181	SET_LOCALE (locale);
1182		1162
1183	if (revents & EVENT_READ)	1163	if (revents & EVENT_READ)
1184	// loop, but don't allow a single term to monopolize us	1164	// loop, but don't allow a single term to monopolize us
1185	while (pty_fill ())	1165	while (pty_fill ())
1186	if (cmd_parse ())	1166	if (cmd_parse ())
…		…
1191	}	1171	}
1192		1172
1193	void	1173	void
1194	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1195	{	1175	{
1196	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1197	recolour_cursor ();	1177	recolour_cursor ();
1198		1178
1199	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1200	hidden_pointer = 0;	1180	hidden_pointer = 0;
1201		1181
…		…
1209	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1210	{	1190	{
1211	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1212	return;	1192	return;
1213		1193
1214	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1215	XFlush (display->display);	1195	XFlush (xdisp);
1216		1196
1217	hidden_pointer = 1;	1197	hidden_pointer = 1;
1218	}	1198	}
1219		1199
1220	void	1200	void
1221	rxvt_term::pointer_cb (time_watcher &w)	1201	rxvt_term::pointer_cb (time_watcher &w)
1222	{	1202	{
1223	SET_R (this);	1203	make_current ();
1224	SET_LOCALE (locale);
1225		1204
1226	pointer_blank ();	1205	pointer_blank ();
1227	}	1206	}
1228	#endif	1207	#endif
1229		1208
…		…
1294	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1295	(32 + x + 1),	1274	(32 + x + 1),
1296	(32 + y + 1));	1275	(32 + y + 1));
1297	}	1276	}
1298		1277
1299	#ifdef USING_W11LIB
1300	void
1301	rxvt_W11_process_x_event (XEvent *ev)
1302	{
1303	rxvt_t *r = rxvt_get_r ();
1304
1305	x_cb (*ev);
1306	}
1307	#endif
1308
1309	/*{{{ process an X event */	1278	/*{{{ process an X event */
1310	void	1279	void
1311	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1312	{	1281	{
1313	dDisp;	1282	make_current ();
1314		1283
1315	SET_R (this);	1284	dLocal (Display *, xdisp);
1316	SET_LOCALE (locale);
1317		1285
		1286	if (ev.xany.window == vt
		1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1289	return;
		1290
		1291	// for XQueryPointer
1318	Window unused_root, unused_child;	1292	Window unused_root, unused_child;
1319	int unused_root_x, unused_root_y;	1293	int unused_root_x, unused_root_y;
1320	unsigned int unused_mask;	1294	unsigned int unused_mask;
1321		1295
1322	switch (ev.type)	1296	switch (ev.type)
…		…
1412	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1413	break;	1387	break;
1414		1388
1415	case ClientMessage:	1389	case ClientMessage:
1416	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1417	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1418	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1419	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1420	destroy ();	1400	destroy ();
		1401	}
1421	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1422	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1424	False, SubstructureRedirectMask | SubstructureNotifyMask,	1405	False, SubstructureRedirectMask | SubstructureNotifyMask,
1425	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1426	#endif	1418	#endif
1427	}	1419	}
1428	#if ENABLE_XEMBED
1429	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430	{
1431	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432	focus_in ();
1433	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434	focus_out ();
1435	}
1436	#endif
1437	#ifdef OFFIX_DND
1438	/* OffiX Dnd (drag 'n' drop) protocol */
1439	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1440	&& (ev.xclient.data.l[0] == DndFile
1441	|| ev.xclient.data.l[0] == DndDir
1442	|| ev.xclient.data.l[0] == DndLink))
1443	{
1444	/* Get Dnd data */
1445	Atom ActualType;
1446	int ActualFormat;
1447	unsigned char *data;
1448	unsigned long Size, RemainingBytes;
1449
1450	XGetWindowProperty (disp, display->root,
1451	xa[XA_DNDSELECTION],
1452	0L, 1000000L,
1453	False, AnyPropertyType,
1454	&ActualType, &ActualFormat,
1455	&Size, &RemainingBytes,
1456	&data);
1457	set_string_property (XA_CUT_BUFFER0, data);
1458	XFree (data);
1459	selection_paste (display->root, XA_CUT_BUFFER0, true);
1460	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1461	}
1462	#endif /* OFFIX_DND */
1463	break;	1420	break;
1464		1421
1465	case MappingNotify:	1422	case MappingNotify:
1466	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1467	break;	1424	break;
…		…
1500	break;	1457	break;
1501		1458
1502	case ConfigureNotify:	1459	case ConfigureNotify:
1503	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1504	{	1461	{
1505	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1506	;	1463	;
1507		1464
1508	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509	{	1466	{
1510	seen_resize = 1;	1467	seen_resize = 1;
1511	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512	}	1469	}
1513		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1514	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1516	check_our_parents ();	1475	check_our_parents ();
1517	#endif	1476	#endif
1518	}	1477	}
1519	break;	1478	break;
1520		1479
1521	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1522	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1523	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1524	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1525		1485
1526	break;	1486	break;
1527		1487
1528	case SelectionClear:	1488	case SelectionClear:
1529	selection_clear ();	1489	selection_clear ();
…		…
1565	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1566	{	1526	{
1567	do	1527	do
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1570	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1571		1531
1572	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573		1533
1574	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1575	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1576	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1577		1537
1578	want_refresh = 1;	1538	want_refresh = 1;
1579	}	1539	}
1580	else	1540	else
1581	{	1541	{
1582	XEvent unused_event;	1542	XEvent unused_event;
1583		1543
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1585	;	1545	;
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1587	;	1547	;
1588		1548
1589	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1590	{	1550	{
1591	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1592	scrollbar_show (0);	1552	scrollbar_show (0);
1593	}	1553	}
1594	#ifdef MENUBAR
1595	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596	menubar_expose ();
1597	#endif
1598		1554
1599	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1600	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1601	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1602	#endif	1558	#endif
1603	}	1559	}
1604	break;	1560	break;
1605		1561
1606	case MotionNotify:	1562	case MotionNotify:
1607	#ifdef POINTER_BLANK	1563	#ifdef POINTER_BLANK
1608	if (hidden_pointer)	1564	if (hidden_pointer)
1609	pointer_unblank ();	1565	pointer_unblank ();
1610	#endif	1566	#endif
1611	#if MENUBAR
1612	if (isMenuBarWindow (ev.xany.window))
1613	{
1614	menubar_control (ev.xbutton);
1615	break;
1616	}
1617	#endif
1618	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619	break;	1568	break;
1620		1569
1621	if (ev.xany.window == vt)	1570	if (ev.xany.window == vt)
1622	{	1571	{
		1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624	; // nop	1574	; // nop
1625	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626	{	1576	{
1627	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1628	;	1578	;
1629		1579
1630	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1631	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1632	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1633	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1634	&ev.xbutton.state);	1584	&ev.xbutton.state);
1635	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1699	#endif	1649	#endif
1700	}	1650	}
1701	}	1651	}
1702	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1703	{	1653	{
1704	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1705	MotionNotify, &ev))	1655	MotionNotify, &ev))
1706	;	1656	;
1707		1657
1708	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1709	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1710	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1711	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1712	&unused_mask);	1662	&unused_mask);
1713	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1728	{	1678	{
1729	hidden_cursor = 0;	1679	hidden_cursor = 0;
1730	want_refresh = 1;	1680	want_refresh = 1;
1731	}	1681	}
1732		1682
1733	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734	}	1684	}
1735	#endif	1685	#endif
1736		1686
1737	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1738	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1766	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1767	}	1717	}
1768	#endif	1718	#endif
1769	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1770	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1771	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772	#endif	1722	#endif
1773	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1774	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1775	{	1725	{
1776	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1820		1770
1821	#if TRANSPARENT	1771	#if TRANSPARENT
1822	void	1772	void
1823	rxvt_term::rootwin_cb (XEvent &ev)	1773	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1774	{
1825	SET_R (this);	1775	make_current ();
1826	SET_LOCALE (locale);
1827		1776
1828	switch (ev.type)	1777	switch (ev.type)
1829	{	1778	{
1830	case PropertyNotify:	1779	case PropertyNotify:
1831	/*	1780	/*
…		…
1858	/*	1807	/*
1859	* VT window processing of button press	1808	* VT window processing of button press
1860	*/	1809	*/
1861	if (ev.window == vt)	1810	if (ev.window == vt)
1862	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1863	#if ISO_14755	1815	#if ISO_14755
1864	// 5.4	1816	// 5.4
1865	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866	{	1818	{
1867	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1909	else	1861	else
1910	{	1862	{
1911	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1912	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1913		1865
1914	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915	switch (ev.button)	1866	switch (ev.button)
1916	{	1867	{
1917	case Button1:	1868	case Button1:
1918	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1919	/* should be done in screen.C */	1870	/* should be done in screen.C */
1920	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1921	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1922	#else	1873	#else
1923	selection.rect = false;	1874	selection.rect = false;
1924	#endif	1875	#endif
1925		1876
1926	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1927	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928	{	1879	{
1929	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1930	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1931	else	1882	else
1932	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1933	}	1884	}
1934	else	1885	else
1935	{	1886	{
1936	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1937	MEvent.clicks++;	1888	MEvent.clicks++;
1938	else	1889	else
1939	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1940		1891
1941	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1942	}	1893	}
1943		1894
1944	MEvent.button = Button1;	1895	MEvent.button = Button1;
1945	break;	1896	break;
1946		1897
1947	case Button3:	1898	case Button3:
1948	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1949	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1950	else	1901	else
1951	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1952		1903
1953	MEvent.button = Button3;	1904	MEvent.button = Button3;
1954	break;	1905	break;
1955	}	1906	}
1956	}	1907	}
1957		1908
1958	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1959	return;	1910	return;
1960	}	1911	}
1961		1912
…		…
2100	}	2051	}
2101	}	2052	}
2102		2053
2103	return;	2054	return;
2104	}	2055	}
2105
2106	#if MENUBAR
2107	/*
2108	* Menubar window processing of button press
2109	*/
2110	if (isMenuBarWindow (ev.window))
2111	menubar_control (ev);
2112	#endif
2113	}	2056	}
2114		2057
2115	void	2058	void
2116	rxvt_term::button_release (XButtonEvent &ev)	2059	rxvt_term::button_release (XButtonEvent &ev)
2117	{	2060	{
…		…
2123		2066
2124	if (scrollbar_isUpDn ())	2067	if (scrollbar_isUpDn ())
2125	{	2068	{
2126	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2127	scrollbar_show (0);	2070	scrollbar_show (0);
2128	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129	refresh_type &= ~SMOOTH_REFRESH;
2130	#endif
2131	}	2071	}
2132		2072
2133	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2134	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
2135	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2136	#endif	2076	#endif
2137		2077
2138	if (ev.window == vt)	2078	if (ev.window == vt)
2139	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2140	#if ISO_14755	2083	#if ISO_14755
2141	// 5.4	2084	// 5.4
2142	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143	return;	2086	return;
2144	#endif	2087	#endif
		2088
2145	if (reportmode)	2089	if (reportmode)
2146	{	2090	{
2147	/* mouse report from vt window */	2091	/* mouse report from vt window */
2148	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2149	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2173	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2174	&& bypass_keystate	2118	&& bypass_keystate
2175	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2176	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2177		2121
2178	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179	return;
2180
2181	switch (ev.button)	2122	switch (ev.button)
2182	{	2123	{
2183	case Button1:	2124	case Button1:
2184	case Button3:	2125	case Button3:
2185	selection_make (ev.time);	2126	selection_make (ev.time);
2186	break;	2127	break;
		2128
2187	case Button2:	2129	case Button2:
2188	selection_request (ev.time, ev.x, ev.y);	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2189	break;	2132	break;
		2133
2190	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2191	case Button4:	2135	case Button4:
2192	case Button5:	2136	case Button5:
2193	{	2137	{
2194	int i;	2138	int i;
…		…
2226	}	2170	}
2227	break;	2171	break;
2228	#endif	2172	#endif
2229	}	2173	}
2230	}	2174	}
2231	#ifdef MENUBAR
2232	else if (isMenuBarWindow (ev.window))
2233	menubar_control (ev);
2234	#endif
2235	}	2175	}
2236		2176
2237	#ifdef TRANSPARENT	2177	#ifdef TRANSPARENT
2238	#if TINTING	2178	#if TINTING
2239	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2240		2180
2241	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2242		2182
2243	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2244	{	2184	{
2245	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2246	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2247	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2187	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2248	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2249	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2250	int i;	2190	int i;
2251		2191
2252	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2253		2193
2254	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2255		2195
2256	/* for convenience */	2196	/* for convenience */
2257	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2478	Atom atype;	2418	Atom atype;
2479	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2480	Window root, oldp, *list;	2420	Window root, oldp, *list;
2481	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2482	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2483	dDisp;
2484		2423
2485	pchanged = 0;	2424	pchanged = 0;
2486		2425
2487	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2488	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2489		2428
2490	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2491	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2492		2431
2493	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2494		2433
2495	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2496	{	2435	{
2497	if (am_transparent)	2436	if (am_transparent)
2498	{	2437	{
2499	pchanged = 1;	2438	pchanged = 1;
2500	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2501	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2502	}	2441	}
2503		2442
2504	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2505	}	2444	}
2506		2445
2507	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2508	XSync (disp, False);	2447	XSync (xdisp, False);
2509		2448
2510	/*	2449	/*
2511	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2512	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2513	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2514	*/	2453	*/
2515	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2516	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2517	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2519		2458
2520	if (!i || prop == NULL)	2459	if (!i || prop == NULL)
2521	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2522	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2523	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2524	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2525		2464
2526	if (!i || prop == NULL	2465	if (!i || prop == NULL
2527	#if TINTING	2466	#if TINTING
2528	|| !rs[Rs_color + Color_tint]	2467	|| !ISSET_PIXCOLOR (Color_tint)
2529	#endif	2468	#endif
2530	)	2469	)
2531	have_pixmap = 0;	2470	have_pixmap = 0;
2532	else	2471	else
2533	{	2472	{
…		…
2546	Window cr;	2485	Window cr;
2547	XImage *image;	2486	XImage *image;
2548	GC gc;	2487	GC gc;
2549	XGCValues gcvalue;	2488	XGCValues gcvalue;
2550		2489
2551	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2552	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2553	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2554	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2555	nx = ny = 0;	2494	nx = ny = 0;
2556		2495
…		…
2569	}	2508	}
2570		2509
2571	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2572	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2573		2512
2574	XSync (disp, False);	2513	XSync (xdisp, False);
2575	allowedxerror = -1;	2514	allowedxerror = -1;
2576	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2577		2516
2578	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2579	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2580	allowedxerror = 0;	2519	allowedxerror = 0;
2581		2520
…		…
2584	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2585	{	2524	{
2586	pchanged = 1;	2525	pchanged = 1;
2587	if (pixmap != None)	2526	if (pixmap != None)
2588	{	2527	{
2589	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2590	pixmap = None;	2529	pixmap = None;
2591	}	2530	}
2592	}	2531	}
2593		2532
2594	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2595	}	2534	}
2596	else	2535	else
2597	{	2536	{
2598	if (pixmap != None)	2537	if (pixmap != None)
2599	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2600		2539
2601	#if TINTING	2540	#if TINTING
2602	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2603	{	2542	{
2604	unsigned short rm, gm, bm;
2605	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2543	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2606		2544
		2545	rgba c;
2607	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused [Color_tint].get (this, c);
2608		2547
2609	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2610	}	2549	}
2611	#endif	2550	#endif
2612		2551
2613	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2614	szHint.width, szHint.height, image->depth);
2615	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2616	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2617	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2618	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2619	XDestroyImage (image);	2557	XDestroyImage (image);
2620	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2621	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2622		2560
2623	if (!am_transparent || !am_pixmap_trans)	2561	if (!am_transparent || !am_pixmap_trans)
2624	pchanged = 1;	2562	pchanged = 1;
2625		2563
2626	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2627	}	2565	}
2628	}	2566	}
2629		2567
2630	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2631	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2632	else	2570	else
2633	{	2571	{
2634	unsigned int n;	2572	unsigned int n;
2635	/*	2573	/*
2636	* InheritPixmap transparency	2574	* InheritPixmap transparency
2637	*/	2575	*/
2638	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2639	{	2577	{
2640	oldp = parent[i];	2578	oldp = parent[i];
2641	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2642	&parent[i], &list, &n);
2643	XFree (list);	2580	XFree (list);
2644		2581
2645	if (parent[i] == display->root)	2582	if (parent[i] == display->root)
2646	{	2583	{
2647	if (oldp != None)	2584	if (oldp != None)
…		…
2655	}	2592	}
2656		2593
2657	n = 0;	2594	n = 0;
2658		2595
2659	if (pchanged)	2596	if (pchanged)
2660	{
2661	for (; n < (unsigned int)i; n++)	2597	for (; n < (unsigned int)i; n++)
2662	{	2598	{
2663	XGetWindowAttributes (disp, parent[n], &wattr);	2599	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2600
2664	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2601	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2665	{	2602	{
2666	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2603	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2667	break;	2604	break;
2668	}	2605	}
2669	}	2606	}
2670	}
2671		2607
2672	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2608	if (n > (sizeof (parent) / sizeof (parent[0])))
2673	{	2609	{
2674	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2610	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2675	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2611	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2676	am_transparent = 0;	2612	am_transparent = 0;
2677	/* XXX: also turn off Opt_transparent? */	2613	/* XXX: also turn off Opt_transparent? */
2678	}	2614	}
2679	else	2615	else
2680	{	2616	{
2681	#if WAIT_FOR_WM
2682	/* wait (an arbitrary period) for the WM to do its thing
2683	* needed for fvwm2.2.2 (and before?) */
2684	sleep (1);
2685	#endif
2686	for (n = 0; n < (unsigned int)i; n++)	2617	for (n = 0; n < (unsigned int)i; n++)
2687	{	2618	{
2688	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2619	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2689	XClearWindow (disp, parent[n]);	2620	XClearWindow (xdisp, parent[n]);
2690	}	2621	}
2691		2622
2692	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2623	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2693	am_transparent = 1;	2624	am_transparent = 1;
2694	}	2625	}
2695		2626
2696	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2627	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2697	parent[i] = None;	2628	parent[i] = None;
2698	}	2629	}
2699		2630
2700	if (scrollBar.win)	2631	if (scrollBar.win)
2701	{	2632	{
2702	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2633	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2703	scrollBar.setIdle ();	2634	scrollBar.setIdle ();
2704	scrollbar_show (0);	2635	scrollbar_show (0);
2705	}	2636	}
2706		2637
2707	if (am_transparent)	2638	if (am_transparent)
…		…
2782	}	2713	}
2783		2714
2784	// scr_add_lines only works for nlines <= nrow - 1.	2715	// scr_add_lines only works for nlines <= nrow - 1.
2785	if (nlines >= nrow - 1)	2716	if (nlines >= nrow - 1)
2786	{	2717	{
		2718	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2719	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2788	scr_add_lines (buf, str - buf, nlines);	2720	scr_add_lines (buf, str - buf, nlines);
2789		2721
2790	nlines = 0;	2722	nlines = 0;
2791	str = buf;	2723	str = buf;
2792	eol = str + min (ncol, UBUFSIZ);	2724	eol = str + min (ncol, UBUFSIZ);
…		…
2807		2739
2808	seq_begin = cmdbuf_ptr;	2740	seq_begin = cmdbuf_ptr;
2809	ch = next_char ();	2741	ch = next_char ();
2810	}	2742	}
2811		2743
		2744	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2745	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2813	scr_add_lines (buf, str - buf, nlines);	2746	scr_add_lines (buf, str - buf, nlines);
2814		2747
2815	/*	2748	/*
2816	* If there have been a lot of new lines, then update the screen	2749	* If there have been a lot of new lines, then update the screen
2817	* What the heck I'll cheat and only refresh less than every page-full.	2750	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2823	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2756	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824	refresh_limit++;	2757	refresh_limit++;
2825	else	2758	else
2826	{	2759	{
2827	flag = true;	2760	flag = true;
2828	scr_refresh (refresh_type);	2761	scr_refresh ();
2829	want_refresh = 1;	2762	want_refresh = 1;
2830	}	2763	}
2831	}	2764	}
2832		2765
2833	}	2766	}
…		…
2851	return flag;	2784	return flag;
2852	}	2785	}
2853		2786
2854	// read the next character	2787	// read the next character
2855	wchar_t	2788	wchar_t
2856	rxvt_term::next_char ()	2789	rxvt_term::next_char () NOTHROW
2857	{	2790	{
2858	while (cmdbuf_ptr < cmdbuf_endp)	2791	while (cmdbuf_ptr < cmdbuf_endp)
2859	{	2792	{
2860	// assume 7-bit to be ascii ALWAYS	2793	// assume 7-bit to be ascii ALWAYS
2861	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2794	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2882	return NOCHAR;	2815	return NOCHAR;
2883	}	2816	}
2884		2817
2885	// read the next octet	2818	// read the next octet
2886	uint32_t	2819	uint32_t
2887	rxvt_term::next_octet ()	2820	rxvt_term::next_octet () NOTHROW
2888	{	2821	{
2889	return cmdbuf_ptr < cmdbuf_endp	2822	return cmdbuf_ptr < cmdbuf_endp
2890	? (unsigned char)*cmdbuf_ptr++	2823	? (unsigned char)*cmdbuf_ptr++
2891	: NOCHAR;	2824	: NOCHAR;
2892	}	2825	}
		2826
		2827	static class out_of_input out_of_input;
2893		2828
2894	/* rxvt_cmd_getc () - Return next input character */	2829	/* rxvt_cmd_getc () - Return next input character */
2895	/*	2830	/*
2896	* Return the next input character after first passing any keyboard input	2831	* Return the next input character after first passing any keyboard input
2897	* to the command.	2832	* to the command.
2898	*/	2833	*/
2899	wchar_t	2834	wchar_t
2900	rxvt_term::cmd_getc ()	2835	rxvt_term::cmd_getc () THROW ((class out_of_input))
2901	{	2836	{
2902	wchar_t c = next_char ();	2837	wchar_t c = next_char ();
2903		2838
2904	if (c == NOCHAR)	2839	if (c == NOCHAR)
2905	throw out_of_input;	2840	throw out_of_input;
2906		2841
2907	return c;	2842	return c;
2908	}	2843	}
2909		2844
2910	uint32_t	2845	uint32_t
2911	rxvt_term::cmd_get8 ()	2846	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912	{	2847	{
2913	uint32_t c = next_octet ();	2848	uint32_t c = next_octet ();
2914		2849
2915	if (c == NOCHAR)	2850	if (c == NOCHAR)
2916	throw out_of_input;	2851	throw out_of_input;
…		…
3154	scr_charset_set (2, (unsigned int)cmd_getc ());	3089	scr_charset_set (2, (unsigned int)cmd_getc ());
3155	break;	3090	break;
3156	case '+':	3091	case '+':
3157	scr_charset_set (3, (unsigned int)cmd_getc ());	3092	scr_charset_set (3, (unsigned int)cmd_getc ());
3158	break;	3093	break;
3159	#if ENABLE_FRILLS	3094	#if !ENABLE_MINIMAL
3160	case '6':	3095	case '6':
3161	scr_backindex ();	3096	scr_backindex ();
3162	break;	3097	break;
3163	#endif	3098	#endif
3164	case '7':	3099	case '7':
3165	scr_cursor (SAVE);	3100	scr_cursor (SAVE);
3166	break;	3101	break;
3167	case '8':	3102	case '8':
3168	scr_cursor (RESTORE);	3103	scr_cursor (RESTORE);
3169	break;	3104	break;
3170	#if ENABLE_FRILLS	3105	#if !ENABLE_MINIMAL
3171	case '9':	3106	case '9':
3172	scr_forwardindex ();	3107	scr_forwardindex ();
3173	break;	3108	break;
3174	#endif	3109	#endif
3175	case '=':	3110	case '=':
…		…
3337	ndef = get_byte_array_bit (csi_defaults, i);	3272	ndef = get_byte_array_bit (csi_defaults, i);
3338	for (p = 0; p < nargs; p++)	3273	for (p = 0; p < nargs; p++)
3339	if (arg[p] == -1)	3274	if (arg[p] == -1)
3340	arg[p] = ndef;	3275	arg[p] = ndef;
3341		3276
3342	#ifdef DEBUG_CMD
3343	fprintf (stderr, "CSI ");
3344	for (p = 0; p < nargs; p++)
3345	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346	fprintf (stderr, "%c\n", ch);
3347	#endif
3348
3349	/*	3277	/*
3350	* private mode handling	3278	* private mode handling
3351	*/	3279	*/
3352	if (priv)	3280	if (priv)
3353	{	3281	{
3354	switch (priv)	3282	switch (priv)
3355	{	3283	{
3356	case '>':	3284	case '>':
3357	if (ch == CSI_DA) /* secondary device attributes */	3285	if (ch == CSI_DA) /* secondary device attributes */
3358	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3286	{
		3287	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3288	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3289	//
		3290	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3291	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3292	// that we do not support xterm mouse reporting (should be 95 when we do).
		3293	//
		3294	tt_printf ("\033[>%d;94;0c", 'U');
		3295	}
3359	break;	3296	break;
3360	case '?':	3297	case '?':
3361	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3298	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362	process_terminal_mode (ch, priv, nargs, arg);	3299	process_terminal_mode (ch, priv, nargs, arg);
3363	break;	3300	break;
…		…
3566	break;	3503	break;
3567	case CSI_75:	3504	case CSI_75:
3568	scr_cursor (RESTORE);	3505	scr_cursor (RESTORE);
3569	break;	3506	break;
3570		3507
3571	#if ENABLE_FRILLS	3508	#if !ENABLE_MINIMAL
3572	case CSI_74:	3509	case CSI_74:
3573	process_window_ops (arg, nargs);	3510	process_window_ops (arg, nargs);
3574	break;	3511	break;
3575	#endif	3512	#endif
3576		3513
…		…
3583	break;	3520	break;
3584	}	3521	}
3585	}	3522	}
3586	/*}}} */	3523	/*}}} */
3587		3524
3588	#if ENABLE_FRILLS	3525	#if !ENABLE_MINIMAL
3589	/* ARGSUSED */	3526	/* ARGSUSED */
3590	void	3527	void
3591	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3528	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592	{	3529	{
3593	int x, y;	3530	int x, y;
3594	XWindowAttributes wattr;	3531	XWindowAttributes wattr;
3595	Window wdummy;	3532	Window wdummy;
3596	dDisp;	3533
		3534	dLocal (Display *, xdisp);
3597		3535
3598	if (nargs == 0)	3536	if (nargs == 0)
3599	return;	3537	return;
3600		3538
3601	switch (args[0])	3539	switch (args[0])
3602	{	3540	{
3603	/*	3541	/*
3604	* commands	3542	* commands
3605	*/	3543	*/
3606	case 1: /* deiconify window */	3544	case 1: /* deiconify window */
3607	XMapWindow (disp, parent[0]);	3545	XMapWindow (xdisp, parent[0]);
3608	break;	3546	break;
3609	case 2: /* iconify window */	3547	case 2: /* iconify window */
3610	XIconifyWindow (disp, parent[0], display->screen);	3548	XIconifyWindow (xdisp, parent[0], display->screen);
3611	break;	3549	break;
3612	case 3: /* set position (pixels) */	3550	case 3: /* set position (pixels) */
3613	XMoveWindow (disp, parent[0], args[1], args[2]);	3551	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3614	break;	3552	break;
3615	case 4: /* set size (pixels) */	3553	case 4: /* set size (pixels) */
3616	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3554	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617	break;	3555	break;
3618	case 5: /* raise window */	3556	case 5: /* raise window */
3619	XRaiseWindow (disp, parent[0]);	3557	XRaiseWindow (xdisp, parent[0]);
3620	break;	3558	break;
3621	case 6: /* lower window */	3559	case 6: /* lower window */
3622	XLowerWindow (disp, parent[0]);	3560	XLowerWindow (xdisp, parent[0]);
3623	break;	3561	break;
3624	case 7: /* refresh window */	3562	case 7: /* refresh window */
3625	scr_touch (true);	3563	scr_touch (true);
3626	break;	3564	break;
3627	case 8: /* set size (chars) */	3565	case 8: /* set size (chars) */
…		…
3639		3577
3640	/*	3578	/*
3641	* reports - some output format copied from XTerm	3579	* reports - some output format copied from XTerm
3642	*/	3580	*/
3643	case 11: /* report window state */	3581	case 11: /* report window state */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3582	XGetWindowAttributes (xdisp, parent[0], &wattr);
3645	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3583	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646	break;	3584	break;
3647	case 13: /* report window position */	3585	case 13: /* report window position */
3648	XGetWindowAttributes (disp, parent[0], &wattr);	3586	XGetWindowAttributes (xdisp, parent[0], &wattr);
3649	XTranslateCoordinates (disp, parent[0], wattr.root,	3587	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3650	-wattr.border_width, -wattr.border_width,	3588	-wattr.border_width, -wattr.border_width,
3651	&x, &y, &wdummy);	3589	&x, &y, &wdummy);
3652	tt_printf ("\033[3;%d;%dt", x, y);	3590	tt_printf ("\033[3;%d;%dt", x, y);
3653	break;	3591	break;
3654	case 14: /* report window size (pixels) */	3592	case 14: /* report window size (pixels) */
3655	XGetWindowAttributes (disp, parent[0], &wattr);	3593	XGetWindowAttributes (xdisp, parent[0], &wattr);
3656	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3594	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657	break;	3595	break;
3658	case 18: /* report text area size (chars) */	3596	case 18: /* report text area size (chars) */
3659	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3597	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660	break;	3598	break;
…		…
3662	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3600	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663	break;	3601	break;
3664	case 20: /* report icon label */	3602	case 20: /* report icon label */
3665	{	3603	{
3666	char *s;	3604	char *s;
3667	XGetIconName (disp, parent[0], &s);	3605	XGetIconName (xdisp, parent[0], &s);
3668	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3606	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669	XFree (s);	3607	XFree (s);
3670	}	3608	}
3671	break;	3609	break;
3672	case 21: /* report window title */	3610	case 21: /* report window title */
3673	{	3611	{
3674	char *s;	3612	char *s;
3675	XFetchName (disp, parent[0], &s);	3613	XFetchName (xdisp, parent[0], &s);
3676	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3614	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677	XFree (s);	3615	XFree (s);
3678	}	3616	}
3679	break;	3617	break;
3680	}	3618	}
…		…
3781	void	3719	void
3782	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3720	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783	{	3721	{
3784	if (str[0] == '?' && !str[1])	3722	if (str[0] == '?' && !str[1])
3785	{	3723	{
3786	unsigned short r, g, b;	3724	rgba c;
3787	pix_colors_focused[color].get (display, r, g, b);	3725	pix_colors_focused[color].get (this, c);
		3726
		3727	#if XFT
		3728	if (c.a != rgba::MAX_CC)
		3729	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3730	else
		3731	#endif
3788	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3732	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789	}	3733	}
3790	else	3734	else
3791	set_window_color (color, str);	3735	set_window_color (color, str);
3792	}	3736	}
3793		3737
…		…
3795	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3739	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796	*/	3740	*/
3797	void	3741	void
3798	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3742	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799	{	3743	{
3800	int changed = 0;
3801	int color;	3744	int color;
3802	char *buf, *name;	3745	char *buf, *name;
3803	bool query = str[0] == '?' && !str[1];	3746	bool query = str[0] == '?' && !str[1];
3804	int saveop = op;	3747	int saveop = op;
3805	dDisp;	3748
		3749	dLocal (Display *, xdisp);
3806		3750
3807	assert (str != NULL);	3751	assert (str != NULL);
3808	switch (op)	3752	switch (op)
3809	{	3753	{
3810	case XTerm_name:	3754	case XTerm_name:
…		…
3826	unsigned long bytes_after;	3770	unsigned long bytes_after;
3827	unsigned char *value = 0;	3771	unsigned char *value = 0;
3828	const char *str = "";	3772	const char *str = "";
3829		3773
3830	if (prop	3774	if (prop
3831	&& XGetWindowProperty (disp, parent[0],	3775	&& XGetWindowProperty (xdisp, parent[0],
3832	prop, 0, 1<<16, 0, AnyPropertyType,	3776	prop, 0, 1<<16, 0, AnyPropertyType,
3833	&actual_type, &actual_format,	3777	&actual_type, &actual_format,
3834	&nitems, &bytes_after, &value) == Success	3778	&nitems, &bytes_after, &value) == Success
3835	&& actual_type != None	3779	&& actual_type != None
3836	&& actual_format == 8)	3780	&& actual_format == 8)
3837	str = (const char *)(value);	3781	str = (const char *)(value);
3838		3782
3839	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3783	tt_printf ("\033]%d;%s%c", op, str, resp);
3840		3784
3841	XFree (value);	3785	XFree (value);
3842	}	3786	}
3843	else	3787	else
3844	{	3788	{
…		…
3848	{	3792	{
3849	*eq = 0;	3793	*eq = 0;
3850	set_utf8_property (display->atom (str), eq + 1);	3794	set_utf8_property (display->atom (str), eq + 1);
3851	}	3795	}
3852	else	3796	else
3853	XDeleteProperty (disp, parent[0],	3797	XDeleteProperty (xdisp, parent[0],
3854	display->atom (str));	3798	display->atom (str));
3855	}	3799	}
3856	break;	3800	break;
3857		3801
3858	case XTerm_Color:	3802	case XTerm_Color:
…		…
3860	{	3804	{
3861	if ((name = strchr (buf, ';')) == NULL)	3805	if ((name = strchr (buf, ';')) == NULL)
3862	break;	3806	break;
3863		3807
3864	*name++ = '\0';	3808	*name++ = '\0';
3865	color = atoi (buf);	3809	color = atoi (buf) + minCOLOR;
3866		3810
3867	if (color < 0 || color >= TOTAL_COLORS)	3811	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3868	break;	3812	break;
3869		3813
3870	if ((buf = strchr (name, ';')) != NULL)	3814	if ((buf = strchr (name, ';')) != NULL)
3871	*buf++ = '\0';	3815	*buf++ = '\0';
3872		3816
3873	if (name[0] == '?' && !name[1])	3817	process_color_seq (op, color, name, resp);
3874	{
3875	unsigned short r, g, b;
3876	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3877	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878	}
3879	else
3880	set_window_color (color + minCOLOR, name);
3881	}	3818	}
3882	break;	3819	break;
3883	case XTerm_Color00:	3820	case XTerm_Color00:
3884	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3821	process_color_seq (op, Color_fg, str, resp);
3885	break;	3822	break;
3886	case XTerm_Color01:	3823	case XTerm_Color01:
3887	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3824	process_color_seq (op, Color_bg, str, resp);
3888	break;	3825	break;
3889	#ifndef NO_CURSORCOLOR	3826	#ifndef NO_CURSORCOLOR
3890	case XTerm_Color_cursor:	3827	case XTerm_Color_cursor:
3891	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3828	process_color_seq (op, Color_cursor, str, resp);
3892	break;	3829	break;
3893	#endif	3830	#endif
3894	case XTerm_Color_pointer_fg:	3831	case XTerm_Color_pointer_fg:
3895	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3832	process_color_seq (op, Color_pointer_fg, str, resp);
3896	break;	3833	break;
3897	case XTerm_Color_pointer_bg:	3834	case XTerm_Color_pointer_bg:
3898	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3835	process_color_seq (op, Color_pointer_bg, str, resp);
3899	break;	3836	break;
3900	#ifndef NO_BOLD_UNDERLINE_REVERSE	3837	#ifndef NO_BOLD_UNDERLINE_REVERSE
3901	case XTerm_Color_BD:
3902	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3903	break;
3904	case XTerm_Color_UL:
3905	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3906	break;
3907	case XTerm_Color_RV:	3838	case XTerm_Color_RV:
3908	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3839	process_color_seq (op, Color_RV, str, resp);
		3840	break;
		3841	case Rxvt_Color_BD:
		3842	case URxvt_Color_BD:
		3843	process_color_seq (op, Color_BD, str, resp);
		3844	break;
		3845	case Rxvt_Color_UL:
		3846	case URxvt_Color_UL:
		3847	process_color_seq (op, Color_UL, str, resp);
3909	break;	3848	break;
3910	case URxvt_Color_IT:	3849	case URxvt_Color_IT:
3911	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3850	process_color_seq (op, Color_IT, str, resp);
3912	break;	3851	break;
3913	#endif	3852	#endif
3914	#if TRANSPARENT && TINTING	3853	#if TRANSPARENT && TINTING
3915	case URxvt_Color_tint:	3854	case URxvt_Color_tint:
3916	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3855	process_color_seq (op, Color_tint, str, resp);
		3856
3917	check_our_parents ();	3857	check_our_parents ();
		3858
3918	if (am_transparent)	3859	if (am_transparent)
3919	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3920	break;
3921	#endif
3922		3861
		3862	break;
		3863	#endif
		3864
3923	case XTerm_Pixmap:	3865	case Rxvt_Pixmap:
		3866	{
3924	if (*str != ';')	3867	if (*str != ';')
3925	{	3868	{
3926	#if XPM_BACKGROUND	3869	#if XPM_BACKGROUND
3927	scale_pixmap (""); /* reset to default scaling */	3870	scale_pixmap (""); /* reset to default scaling */
3928	set_bgPixmap (str); /* change pixmap */	3871	set_bgPixmap (str); /* change pixmap */
3929	#endif
3930	scr_touch (true);	3872	scr_touch (true);
		3873	#endif
3931	}	3874	}
		3875
		3876	int changed = 0;
		3877
3932	while ((str = strchr (str, ';')) != NULL)	3878	while ((str = strchr (str, ';')) != NULL)
3933	{	3879	{
3934	str++;	3880	str++;
3935	#if XPM_BACKGROUND	3881	#if XPM_BACKGROUND
3936	changed += scale_pixmap (str);	3882	changed += scale_pixmap (str);
3937	#endif	3883	#endif
3938	}	3884	}
3939		3885
3940	if (changed)	3886	if (changed)
3941	{	3887	{
3942	#ifdef XPM_BACKGROUND	3888	#ifdef XPM_BACKGROUND
3943	resize_pixmap ();	3889	resize_pixmap ();
3944	#endif
3945	scr_touch (true);	3890	scr_touch (true);
		3891	#endif
3946	}	3892	}
		3893	}
3947	break;	3894	break;
3948		3895
3949	case XTerm_restoreFG:	3896	case Rxvt_restoreFG:
3950	set_window_color (Color_fg, str);	3897	set_window_color (Color_fg, str);
3951	break;	3898	break;
3952	case XTerm_restoreBG:	3899	case Rxvt_restoreBG:
3953	set_window_color (Color_bg, str);	3900	set_window_color (Color_bg, str);
3954	break;	3901	break;
3955		3902
3956	case XTerm_logfile:	3903	case XTerm_logfile:
3957	// TODO, when secure mode?	3904	// TODO, when secure mode?
3958	break;	3905	break;
3959		3906
3960	#ifdef MENUBAR
3961	case URxvt_Menu:
3962	if (OPTION (Opt_insecure))
3963	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3964	break;
3965	#endif
3966	#if 0	3907	#if 0
3967	case XTerm_dumpscreen: /* no error notices */	3908	case Rxvt_dumpscreen: /* no error notices */
3968	{	3909	{
3969	int fd;	3910	int fd;
3970	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3911	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3971	{	3912	{
3972	scr_dump (fd);	3913	scr_dump (fd);
…		…
3996	allocated.push_back ((void *)res);	3937	allocated.push_back ((void *)res);
3997	set_fonts ();	3938	set_fonts ();
3998	}	3939	}
3999	break;	3940	break;
4000		3941
4001	#if ENABLE_FRILLS	3942	case URxvt_version:
		3943	if (query)
		3944	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3945	op,
		3946	rs[Rs_name], VERSION[0], VERSION[2],
		3947	resp);
		3948	break;
		3949
		3950	#if !ENABLE_MINIMAL
4002	case URxvt_locale:	3951	case URxvt_locale:
4003	if (query)	3952	if (query)
4004	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3953	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4005	else	3954	else
4006	{	3955	{
4007	set_locale (str);	3956	set_locale (str);
4008	pty.set_utf8_mode (enc_utf8);	3957	pty->set_utf8_mode (enc_utf8);
4009	init_xlocale ();	3958	init_xlocale ();
4010	}	3959	}
4011	break;	3960	break;
4012		3961
4013	case URxvt_view_up:	3962	case URxvt_view_up:
…		…
4066	return state;	4015	return state;
4067	}	4016	}
4068		4017
4069	/* we're not using priv _yet_ */	4018	/* we're not using priv _yet_ */
4070	void	4019	void
4071	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4020	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4072	{	4021	{
4073	unsigned int i, j;	4022	unsigned int i, j;
4074	int state;	4023	int state;
4075		4024
4076	static const struct	4025	static const struct
…		…
4087	{ 5, PrivMode_rVideo },	4036	{ 5, PrivMode_rVideo },
4088	{ 6, PrivMode_relOrigin },	4037	{ 6, PrivMode_relOrigin },
4089	{ 7, PrivMode_Autowrap },	4038	{ 7, PrivMode_Autowrap },
4090	// 8, bi-directional support mode	4039	// 8, bi-directional support mode
4091	{ 9, PrivMode_MouseX10 },	4040	{ 9, PrivMode_MouseX10 },
4092	#ifdef menuBar_esc
4093	{ menuBar_esc, PrivMode_menuBar },
4094	#endif
4095	// 18, 19 printing-related	4041	// 18, 19 printing-related
4096	{ 25, PrivMode_VisibleCursor },	4042	{ 25, PrivMode_VisibleCursor },
4097	#ifdef scrollBar_esc	4043	#ifdef scrollBar_esc
4098	{ scrollBar_esc, PrivMode_scrollBar },	4044	{ scrollBar_esc, PrivMode_scrollBar },
4099	#endif	4045	#endif
…		…
4194	/* case 8: - auto repeat, can't do on a per window basis */	4140	/* case 8: - auto repeat, can't do on a per window basis */
4195	case 9: /* X10 mouse reporting */	4141	case 9: /* X10 mouse reporting */
4196	if (state) /* orthogonal */	4142	if (state) /* orthogonal */
4197	priv_modes &= ~PrivMode_MouseX11;	4143	priv_modes &= ~PrivMode_MouseX11;
4198	break;	4144	break;
4199	#ifdef menuBar_esc
4200	case menuBar_esc:
4201	#ifdef MENUBAR
4202	map_menuBar (state);
4203	#endif
4204	break;
4205	#endif
4206	#ifdef scrollBar_esc	4145	#ifdef scrollBar_esc
4207	case scrollBar_esc:	4146	case scrollBar_esc:
4208	if (scrollbar_mapping (state))	4147	if (scrollbar_mapping (state))
4209	{	4148	{
4210	resize_all_windows (0, 0, 0);	4149	resize_all_windows (0, 0, 0);
…		…
4380	scr_color (Color_bg, Color_bg);	4319	scr_color (Color_bg, Color_bg);
4381	break;	4320	break;
4382		4321
4383	//case 50: // not variable spacing	4322	//case 50: // not variable spacing
4384		4323
4385	#if ENABLE_FRILLS	4324	#if !ENABLE_MINIMAL
4386	case 90:	4325	case 90:
4387	case 91: /* set bright fg color */	4326	case 91: /* set bright fg color */
4388	case 92:	4327	case 92:
4389	case 93:	4328	case 93:
4390	case 94:	4329	case 94:
…		…
4455	rxvt_term::tt_write (const char *data, unsigned int len)	4394	rxvt_term::tt_write (const char *data, unsigned int len)
4456	{	4395	{
4457	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4396	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458	return;	4397	return;
4459		4398
4460	if (pty.pty < 0)	4399	if (pty->pty < 0)
4461	return;	4400	return;
4462		4401
4463	if (v_buflen == 0)	4402	if (v_buflen == 0)
4464	{	4403	{
4465	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4404	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4466		4405
4467	if ((unsigned int)written == len)	4406	if ((unsigned int)written == len)
4468	return;	4407	return;
4469		4408
4470	data += written;	4409	data += written;
…		…
4479	pty_ev.set (EVENT_READ | EVENT_WRITE);	4418	pty_ev.set (EVENT_READ | EVENT_WRITE);
4480	}	4419	}
4481		4420
4482	void rxvt_term::pty_write ()	4421	void rxvt_term::pty_write ()
4483	{	4422	{
4484	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4423	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4485		4424
4486	if (written > 0)	4425	if (written > 0)
4487	{	4426	{
4488	v_buflen -= written;	4427	v_buflen -= written;
4489		4428

Diff Legend

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