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

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC vs. Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC