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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.291 by root, Sun Jan 29 20:51:27 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)
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
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);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/}}} /	906	/}}} /
923		907
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	909	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	911	{
930	unsigned int n, s;	912	unsigned int n, s;
931		913
…		…
1008	while (l->is_longer () && row < end_row);	990	while (l->is_longer () && row < end_row);
1009	}	991	}
1010	while (row < end_row);	992	while (row < end_row);
1011	}	993	}
1012		994
1013	scr_refresh (refresh_type);	995	scr_refresh ();
1014	scrollbar_show (1);	996	scrollbar_show (1);
1015	#ifdef USE_XIM	997	#ifdef USE_XIM
1016	IMSendSpot ();	998	IMSendSpot ();
1017	#endif	999	#endif
1018	}	1000	}
…		…
1021	}	1003	}
1022		1004
1023	void	1005	void
1024	rxvt_term::check_cb (check_watcher &w)	1006	rxvt_term::check_cb (check_watcher &w)
1025	{	1007	{
1026	SET_R (this);	1008	make_current ();
1027	SET_LOCALE (locale);
1028		1009
1029	display->flush ();	1010	display->flush ();
1030		1011
1031	if (want_refresh && !flush_ev.active)	1012	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1013	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1014	}
1034		1015
1035	void	1016	void
1036	rxvt_term::flush_cb (time_watcher &w)	1017	rxvt_term::flush_cb (time_watcher &w)
1037	{	1018	{
1038	SET_R (this);	1019	make_current ();
1039	SET_LOCALE (locale);
1040		1020
1041	refresh_limit = 1;	1021	refresh_limit = 1;
1042	refresh_count = 0;	1022	refresh_count = 0;
1043	flush ();	1023	flush ();
1044	}	1024	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1029	{
1050	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1031	want_refresh = 1;
1052		1032
1053	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1034	}
1055	#endif	1035	#endif
1056		1036
1057	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1058	void	1038	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1053	{
1074	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1056	{
1077	refresh_type \|= SMOOTH_REFRESH;
1078	want_refresh = 1;	1057	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1059	}
1081	}	1060	}
1082	#endif	1061	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1066	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1068	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type \|= SMOOTH_REFRESH;
1092	want_refresh = 1;	1070	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1072	}
1095	}	1073	}
1096	#endif	1074	#endif
…		…
1104	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1083	{
1106	if (view_start == top_row \|\| view_start == 0)	1084	if (view_start == top_row \|\| view_start == 0)
1107	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1108		1086
1109	refresh_type \|= SMOOTH_REFRESH;
1110	want_refresh = 1;	1087	want_refresh = 1;
1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112	}	1089	}
1113	}	1090	}
1114	#endif	1091	#endif
…		…
1144		1121
1145	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1146	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1147	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1148		1125
1149	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150		1127
1151	if (r > 0)	1128	if (r > 0)
1152	{	1129	{
1153	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1154	return true;	1131	return true;
…		…
1172	}	1149	}
1173		1150
1174	void	1151	void
1175	rxvt_term::pty_cb (io_watcher &w, short revents)	1152	rxvt_term::pty_cb (io_watcher &w, short revents)
1176	{	1153	{
1177	SET_R (this);	1154	make_current ();
1178	SET_LOCALE (locale);
1179		1155
1180	if (revents & EVENT_READ)	1156	if (revents & EVENT_READ)
1181	// loop, but don't allow a single term to monopolize us	1157	// loop, but don't allow a single term to monopolize us
1182	while (pty_fill ())	1158	while (pty_fill ())
1183	if (cmd_parse ())	1159	if (cmd_parse ())
…		…
1188	}	1164	}
1189		1165
1190	void	1166	void
1191	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1192	{	1168	{
1193	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1194	recolour_cursor ();	1170	recolour_cursor ();
1195		1171
1196	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1197	hidden_pointer = 0;	1173	hidden_pointer = 0;
1198		1174
…		…
1206	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1207	{	1183	{
1208	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1209	return;	1185	return;
1210		1186
1211	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1212	XFlush (display->display);	1188	XFlush (xdisp);
1213		1189
1214	hidden_pointer = 1;	1190	hidden_pointer = 1;
1215	}	1191	}
1216		1192
1217	void	1193	void
1218	rxvt_term::pointer_cb (time_watcher &w)	1194	rxvt_term::pointer_cb (time_watcher &w)
1219	{	1195	{
1220	SET_R (this);	1196	make_current ();
1221	SET_LOCALE (locale);
1222		1197
1223	pointer_blank ();	1198	pointer_blank ();
1224	}	1199	}
1225	#endif	1200	#endif
1226		1201
…		…
1291	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1292	(32 + x + 1),	1267	(32 + x + 1),
1293	(32 + y + 1));	1268	(32 + y + 1));
1294	}	1269	}
1295		1270
1296	#ifdef USING_W11LIB
1297	void
1298	rxvt_W11_process_x_event (XEvent *ev)
1299	{
1300	rxvt_t *r = rxvt_get_r ();
1301
1302	x_cb (*ev);
1303	}
1304	#endif
1305
1306	/{{{ process an X event /	1271	/{{{ process an X event /
1307	void	1272	void
1308	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1309	{	1274	{
1310	dDisp;	1275	make_current ();
1311		1276
1312	SET_R (this);	1277	dLocal (Display *, xdisp);
1313	SET_LOCALE (locale);
1314		1278
1315	if (ev.xany.window == vt	1279	if (ev.xany.window == vt
		1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317	return;	1282	return;
1318		1283
1319	// for XQueryPointer	1284	// for XQueryPointer
1320	Window unused_root, unused_child;	1285	Window unused_root, unused_child;
…		…
1414	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1415	break;	1380	break;
1416		1381
1417	case ClientMessage:	1382	case ClientMessage:
1418	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1419	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420	{	1385	{
		1386	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1387	{
		1388	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1389	{
1421	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1390	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1391	{
		1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422	destroy ();	1393	destroy ();
		1394	}
1423	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1424	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1426	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1427	&ev);	1399	&ev);
		1400	#endif
		1401	}
		1402	}
		1403	#if ENABLE_XEMBED
		1404	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1405	{
		1406	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1407	focus_in ();
		1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1409	focus_out ();
		1410	}
1428	#endif	1411	#endif
1429	}	1412	}
1430	#if ENABLE_XEMBED
1431	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432	{
1433	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434	focus_in ();
1435	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436	focus_out ();
1437	}
1438	#endif
1439	#ifdef OFFIX_DND
1440	/* OffiX Dnd (drag 'n' drop) protocol */
1441	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442	&& (ev.xclient.data.l[0] == DndFile
1443	\|\| ev.xclient.data.l[0] == DndDir
1444	\|\| ev.xclient.data.l[0] == DndLink))
1445	{
1446	/* Get Dnd data */
1447	Atom ActualType;
1448	int ActualFormat;
1449	unsigned char *data;
1450	unsigned long Size, RemainingBytes;
1451
1452	XGetWindowProperty (disp, display->root,
1453	xa[XA_DNDSELECTION],
1454	0L, 1000000L,
1455	False, AnyPropertyType,
1456	&ActualType, &ActualFormat,
1457	&Size, &RemainingBytes,
1458	&data);
1459	set_string_property (XA_CUT_BUFFER0, data);
1460	XFree (data);
1461	selection_paste (display->root, XA_CUT_BUFFER0, true);
1462	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463	}
1464	#endif /* OFFIX_DND */
1465	break;	1413	break;
1466		1414
1467	case MappingNotify:	1415	case MappingNotify:
1468	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1469	break;	1417	break;
…		…
1502	break;	1450	break;
1503		1451
1504	case ConfigureNotify:	1452	case ConfigureNotify:
1505	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1506	{	1454	{
1507	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1508	;	1456	;
1509		1457
1510	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1511	{	1459	{
1512	seen_resize = 1;	1460	seen_resize = 1;
1513	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1461	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514	}	1462	}
1515		1463
		1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1465
1516	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1466	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517	if (OPTION (Opt_transparent))	1467	if (OPTION (Opt_transparent))
1518	check_our_parents ();	1468	check_our_parents ();
1519	#endif	1469	#endif
1520	}	1470	}
1521	break;	1471	break;
1522		1472
1523	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1526	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1527		1478
1528	break;	1479	break;
1529		1480
1530	case SelectionClear:	1481	case SelectionClear:
1531	selection_clear ();	1482	selection_clear ();
…		…
1567	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1568	{	1519	{
1569	do	1520	do
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1573		1524
1574	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575		1526
1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1577	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1578	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1579		1530
1580	want_refresh = 1;	1531	want_refresh = 1;
1581	}	1532	}
1582	else	1533	else
1583	{	1534	{
1584	XEvent unused_event;	1535	XEvent unused_event;
1585		1536
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1587	;	1538	;
1588	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1589	;	1540	;
1590		1541
1591	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1592	{	1543	{
1593	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1594	scrollbar_show (0);	1545	scrollbar_show (0);
1595	}	1546	}
1596	#ifdef MENUBAR
1597	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598	menubar_expose ();
1599	#endif
1600		1547
1601	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1602	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1603	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1604	#endif	1551	#endif
1605	}	1552	}
1606	break;	1553	break;
1607		1554
1608	case MotionNotify:	1555	case MotionNotify:
1609	#ifdef POINTER_BLANK	1556	#ifdef POINTER_BLANK
1610	if (hidden_pointer)	1557	if (hidden_pointer)
1611	pointer_unblank ();	1558	pointer_unblank ();
1612	#endif	1559	#endif
1613	#if MENUBAR
1614	if (isMenuBarWindow (ev.xany.window))
1615	{
1616	menubar_control (ev.xbutton);
1617	break;
1618	}
1619	#endif
1620	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1560	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621	break;	1561	break;
1622		1562
1623	if (ev.xany.window == vt)	1563	if (ev.xany.window == vt)
1624	{	1564	{
		1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626	; // nop	1567	; // nop
1627	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1628	{	1569	{
1629	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1630	;	1571	;
1631		1572
1632	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1633	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1634	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1635	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1636	&ev.xbutton.state);	1577	&ev.xbutton.state);
1637	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1701	#endif	1642	#endif
1702	}	1643	}
1703	}	1644	}
1704	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1705	{	1646	{
1706	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1707	MotionNotify, &ev))	1648	MotionNotify, &ev))
1708	;	1649	;
1709		1650
1710	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1711	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1712	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1713	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1714	&unused_mask);	1655	&unused_mask);
1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1730	{	1671	{
1731	hidden_cursor = 0;	1672	hidden_cursor = 0;
1732	want_refresh = 1;	1673	want_refresh = 1;
1733	}	1674	}
1734		1675
1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736	}	1677	}
1737	#endif	1678	#endif
1738		1679
1739	#if defined(POINTER_BLANK)	1680	#if defined(POINTER_BLANK)
1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1768	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1769	}	1710	}
1770	#endif	1711	#endif
1771	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1772	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1773	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774	#endif	1715	#endif
1775	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1777	{	1718	{
1778	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1822		1763
1823	#if TRANSPARENT	1764	#if TRANSPARENT
1824	void	1765	void
1825	rxvt_term::rootwin_cb (XEvent &ev)	1766	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1767	{
1827	SET_R (this);	1768	make_current ();
1828	SET_LOCALE (locale);
1829		1769
1830	switch (ev.type)	1770	switch (ev.type)
1831	{	1771	{
1832	case PropertyNotify:	1772	case PropertyNotify:
1833	/*	1773	/*
…		…
1860	/*	1800	/*
1861	* VT window processing of button press	1801	* VT window processing of button press
1862	*/	1802	*/
1863	if (ev.window == vt)	1803	if (ev.window == vt)
1864	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1865	#if ISO_14755	1808	#if ISO_14755
1866	// 5.4	1809	// 5.4
1867	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1868	{	1811	{
1869	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1911	else	1854	else
1912	{	1855	{
1913	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1914	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1915		1858
1916	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917	switch (ev.button)	1859	switch (ev.button)
1918	{	1860	{
1919	case Button1:	1861	case Button1:
1920	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1921	/* should be done in screen.C */	1863	/* should be done in screen.C */
1922	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1923	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1924	#else	1866	#else
1925	selection.rect = false;	1867	selection.rect = false;
1926	#endif	1868	#endif
1927		1869
1928	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930	{	1872	{
1931	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1932	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1933	else	1875	else
1934	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1935	}	1877	}
1936	else	1878	else
1937	{	1879	{
1938	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1939	MEvent.clicks++;	1881	MEvent.clicks++;
1940	else	1882	else
1941	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1942		1884
1943	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1944	}	1886	}
1945		1887
1946	MEvent.button = Button1;	1888	MEvent.button = Button1;
1947	break;	1889	break;
1948		1890
1949	case Button3:	1891	case Button3:
1950	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1951	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1952	else	1894	else
1953	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1954		1896
1955	MEvent.button = Button3;	1897	MEvent.button = Button3;
1956	break;	1898	break;
1957	}	1899	}
1958	}	1900	}
1959		1901
1960	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1961	return;	1903	return;
1962	}	1904	}
1963		1905
…		…
2102	}	2044	}
2103	}	2045	}
2104		2046
2105	return;	2047	return;
2106	}	2048	}
2107
2108	#if MENUBAR
2109	/*
2110	* Menubar window processing of button press
2111	*/
2112	if (isMenuBarWindow (ev.window))
2113	menubar_control (ev);
2114	#endif
2115	}	2049	}
2116		2050
2117	void	2051	void
2118	rxvt_term::button_release (XButtonEvent &ev)	2052	rxvt_term::button_release (XButtonEvent &ev)
2119	{	2053	{
…		…
2125		2059
2126	if (scrollbar_isUpDn ())	2060	if (scrollbar_isUpDn ())
2127	{	2061	{
2128	scrollBar.setIdle ();	2062	scrollBar.setIdle ();
2129	scrollbar_show (0);	2063	scrollbar_show (0);
2130	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131	refresh_type &= ~SMOOTH_REFRESH;
2132	#endif
2133	}	2064	}
2134		2065
2135	#ifdef SELECTION_SCROLLING	2066	#ifdef SELECTION_SCROLLING
2136	if (sel_scroll_ev.active)	2067	if (sel_scroll_ev.active)
2137	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2138	#endif	2069	#endif
2139		2070
2140	if (ev.window == vt)	2071	if (ev.window == vt)
2141	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2142	#if ISO_14755	2076	#if ISO_14755
2143	// 5.4	2077	// 5.4
2144	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2145	return;	2079	return;
2146	#endif	2080	#endif
		2081
2147	if (reportmode)	2082	if (reportmode)
2148	{	2083	{
2149	/* mouse report from vt window */	2084	/* mouse report from vt window */
2150	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2151	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2175	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2176	&& bypass_keystate	2111	&& bypass_keystate
2177	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2178	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2179		2114
2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181	return;
2182
2183	switch (ev.button)	2115	switch (ev.button)
2184	{	2116	{
2185	case Button1:	2117	case Button1:
2186	case Button3:	2118	case Button3:
2187	selection_make (ev.time);	2119	selection_make (ev.time);
2188	break;	2120	break;
		2121
2189	case Button2:	2122	case Button2:
2190	selection_request (ev.time, ev.x, ev.y);	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2191	break;	2125	break;
		2126
2192	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2193	case Button4:	2128	case Button4:
2194	case Button5:	2129	case Button5:
2195	{	2130	{
2196	int i;	2131	int i;
…		…
2228	}	2163	}
2229	break;	2164	break;
2230	#endif	2165	#endif
2231	}	2166	}
2232	}	2167	}
2233	#ifdef MENUBAR
2234	else if (isMenuBarWindow (ev.window))
2235	menubar_control (ev);
2236	#endif
2237	}	2168	}
2238		2169
2239	#ifdef TRANSPARENT	2170	#ifdef TRANSPARENT
2240	#if TINTING	2171	#if TINTING
2241	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2242		2173
2243	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2244		2175
2245	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2246	{	2177	{
2247	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2248	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2249	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2250	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252	int i;	2183	int i;
2253		2184
2254	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2255		2186
2256	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2257		2188
2258	/* for convenience */	2189	/* for convenience */
2259	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2480	Atom atype;	2411	Atom atype;
2481	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2482	Window root, oldp, *list;	2413	Window root, oldp, *list;
2483	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2484	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2485	dDisp;
2486		2416
2487	pchanged = 0;	2417	pchanged = 0;
2488		2418
2489	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2490	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2491		2421
2492	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2493	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2494		2424
2495	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2496		2426
2497	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2498	{	2428	{
2499	if (am_transparent)	2429	if (am_transparent)
2500	{	2430	{
2501	pchanged = 1;	2431	pchanged = 1;
2502	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2503	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2504	}	2434	}
2505		2435
2506	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2507	}	2437	}
2508		2438
2509	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2510	XSync (disp, False);	2440	XSync (xdisp, False);
2511		2441
2512	/*	2442	/*
2513	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2514	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2515	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2516	*/	2446	*/
2517	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2521		2451
2522	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2523	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2524	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2527		2457
2528	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2529	#if TINTING	2459	#if TINTING
…		…
2548	Window cr;	2478	Window cr;
2549	XImage *image;	2479	XImage *image;
2550	GC gc;	2480	GC gc;
2551	XGCValues gcvalue;	2481	XGCValues gcvalue;
2552		2482
2553	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2554	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2555	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2556	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2557	nx = ny = 0;	2487	nx = ny = 0;
2558		2488
…		…
2571	}	2501	}
2572		2502
2573	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2574	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2575		2505
2576	XSync (disp, False);	2506	XSync (xdisp, False);
2577	allowedxerror = -1;	2507	allowedxerror = -1;
2578	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579		2509
2580	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2581	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2582	allowedxerror = 0;	2512	allowedxerror = 0;
2583		2513
…		…
2586	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2587	{	2517	{
2588	pchanged = 1;	2518	pchanged = 1;
2589	if (pixmap != None)	2519	if (pixmap != None)
2590	{	2520	{
2591	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2592	pixmap = None;	2522	pixmap = None;
2593	}	2523	}
2594	}	2524	}
2595		2525
2596	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2597	}	2527	}
2598	else	2528	else
2599	{	2529	{
2600	if (pixmap != None)	2530	if (pixmap != None)
2601	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2602		2532
2603	#if TINTING	2533	#if TINTING
2604	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2605	{	2535	{
2606	unsigned short rm, gm, bm;	2536	rxvt_rgba c;
2607	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608		2538
2609	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, c);
2610		2540
2611	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2612	}	2542	}
2613	#endif	2543	#endif
2614		2544
2615	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2616	szHint.width, szHint.height, image->depth);
2617	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2618	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2619	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2620	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2621	XDestroyImage (image);	2550	XDestroyImage (image);
2622	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2623	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2624		2553
2625	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2626	pchanged = 1;	2555	pchanged = 1;
2627		2556
2628	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2629	}	2558	}
2630	}	2559	}
2631		2560
2632	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2633	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2634	else	2563	else
2635	{	2564	{
2636	unsigned int n;	2565	unsigned int n;
2637	/*	2566	/*
2638	* InheritPixmap transparency	2567	* InheritPixmap transparency
2639	*/	2568	*/
2640	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641	{	2570	{
2642	oldp = parent[i];	2571	oldp = parent[i];
2643	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2644	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2645	XFree (list);	2574	XFree (list);
2646		2575
2647	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2648	{	2577	{
…		…
2660		2589
2661	if (pchanged)	2590	if (pchanged)
2662	{	2591	{
2663	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2664	{	2593	{
2665	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2666	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2667	{	2596	{
2668	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669	break;	2598	break;
2670	}	2599	}
2671	}	2600	}
2672	}	2601	}
2673		2602
2674	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2675	{	2604	{
2676	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2677	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2678	am_transparent = 0;	2607	am_transparent = 0;
2679	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2680	}	2609	}
2681	else	2610	else
2682	{	2611	{
2683	#if WAIT_FOR_WM
2684	/* wait (an arbitrary period) for the WM to do its thing
2685	* needed for fvwm2.2.2 (and before?) */
2686	sleep (1);
2687	#endif
2688	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2689	{	2613	{
2690	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2691	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2692	}	2616	}
2693		2617
2694	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2695	am_transparent = 1;	2619	am_transparent = 1;
2696	}	2620	}
2697		2621
2698	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699	parent[i] = None;	2623	parent[i] = None;
2700	}	2624	}
2701		2625
2702	if (scrollBar.win)	2626	if (scrollBar.win)
2703	{	2627	{
2704	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2705	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2706	scrollbar_show (0);	2630	scrollbar_show (0);
2707	}	2631	}
2708		2632
2709	if (am_transparent)	2633	if (am_transparent)
…		…
2784	}	2708	}
2785		2709
2786	// scr_add_lines only works for nlines <= nrow - 1.	2710	// scr_add_lines only works for nlines <= nrow - 1.
2787	if (nlines >= nrow - 1)	2711	if (nlines >= nrow - 1)
2788	{	2712	{
		2713	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2714	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790	scr_add_lines (buf, str - buf, nlines);	2715	scr_add_lines (buf, str - buf, nlines);
2791		2716
2792	nlines = 0;	2717	nlines = 0;
2793	str = buf;	2718	str = buf;
2794	eol = str + min (ncol, UBUFSIZ);	2719	eol = str + min (ncol, UBUFSIZ);
…		…
2809		2734
2810	seq_begin = cmdbuf_ptr;	2735	seq_begin = cmdbuf_ptr;
2811	ch = next_char ();	2736	ch = next_char ();
2812	}	2737	}
2813		2738
		2739	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2740	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815	scr_add_lines (buf, str - buf, nlines);	2741	scr_add_lines (buf, str - buf, nlines);
2816		2742
2817	/*	2743	/*
2818	* If there have been a lot of new lines, then update the screen	2744	* If there have been a lot of new lines, then update the screen
2819	* What the heck I'll cheat and only refresh less than every page-full.	2745	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2825	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826	refresh_limit++;	2752	refresh_limit++;
2827	else	2753	else
2828	{	2754	{
2829	flag = true;	2755	flag = true;
2830	scr_refresh (refresh_type);	2756	scr_refresh ();
2831	want_refresh = 1;	2757	want_refresh = 1;
2832	}	2758	}
2833	}	2759	}
2834		2760
2835	}	2761	}
…		…
2853	return flag;	2779	return flag;
2854	}	2780	}
2855		2781
2856	// read the next character	2782	// read the next character
2857	wchar_t	2783	wchar_t
2858	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2859	{	2785	{
2860	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2861	{	2787	{
2862	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2863	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2884	return NOCHAR;	2810	return NOCHAR;
2885	}	2811	}
2886		2812
2887	// read the next octet	2813	// read the next octet
2888	uint32_t	2814	uint32_t
2889	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2890	{	2816	{
2891	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2892	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2893	: NOCHAR;	2819	: NOCHAR;
2894	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2895		2823
2896	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2897	/*	2825	/*
2898	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2899	* to the command.	2827	* to the command.
2900	*/	2828	*/
2901	wchar_t	2829	wchar_t
2902	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2903	{	2831	{
2904	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2905		2833
2906	if (c == NOCHAR)	2834	if (c == NOCHAR)
2907	throw out_of_input;	2835	throw out_of_input;
2908		2836
2909	return c;	2837	return c;
2910	}	2838	}
2911		2839
2912	uint32_t	2840	uint32_t
2913	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914	{	2842	{
2915	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2916		2844
2917	if (c == NOCHAR)	2845	if (c == NOCHAR)
2918	throw out_of_input;	2846	throw out_of_input;
…		…
3339	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3340	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3341	if (arg[p] == -1)	3269	if (arg[p] == -1)
3342	arg[p] = ndef;	3270	arg[p] = ndef;
3343		3271
3344	#ifdef DEBUG_CMD
3345	fprintf (stderr, "CSI ");
3346	for (p = 0; p < nargs; p++)
3347	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348	fprintf (stderr, "%c\n", ch);
3349	#endif
3350
3351	/*	3272	/*
3352	* private mode handling	3273	* private mode handling
3353	*/	3274	*/
3354	if (priv)	3275	if (priv)
3355	{	3276	{
3356	switch (priv)	3277	switch (priv)
3357	{	3278	{
3358	case '>':	3279	case '>':
3359	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3360	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3361	break;	3291	break;
3362	case '?':	3292	case '?':
3363	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3364	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3365	break;	3295	break;
…		…
3593	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594	{	3524	{
3595	int x, y;	3525	int x, y;
3596	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3597	Window wdummy;	3527	Window wdummy;
3598	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3599		3530
3600	if (nargs == 0)	3531	if (nargs == 0)
3601	return;	3532	return;
3602		3533
3603	switch (args[0])	3534	switch (args[0])
3604	{	3535	{
3605	/*	3536	/*
3606	* commands	3537	* commands
3607	*/	3538	*/
3608	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3609	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3610	break;	3541	break;
3611	case 2: /* iconify window */	3542	case 2: /* iconify window */
3612	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3613	break;	3544	break;
3614	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3615	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3616	break;	3547	break;
3617	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3618	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619	break;	3550	break;
3620	case 5: /* raise window */	3551	case 5: /* raise window */
3621	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3622	break;	3553	break;
3623	case 6: /* lower window */	3554	case 6: /* lower window */
3624	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3625	break;	3556	break;
3626	case 7: /* refresh window */	3557	case 7: /* refresh window */
3627	scr_touch (true);	3558	scr_touch (true);
3628	break;	3559	break;
3629	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3641		3572
3642	/*	3573	/*
3643	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3644	*/	3575	*/
3645	case 11: /* report window state */	3576	case 11: /* report window state */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648	break;	3579	break;
3649	case 13: /* report window position */	3580	case 13: /* report window position */
3650	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3651	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3652	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3653	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3654	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3655	break;	3586	break;
3656	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3658	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659	break;	3590	break;
3660	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3661	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662	break;	3593	break;
…		…
3664	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665	break;	3596	break;
3666	case 20: /* report icon label */	3597	case 20: /* report icon label */
3667	{	3598	{
3668	char *s;	3599	char *s;
3669	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3670	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671	XFree (s);	3602	XFree (s);
3672	}	3603	}
3673	break;	3604	break;
3674	case 21: /* report window title */	3605	case 21: /* report window title */
3675	{	3606	{
3676	char *s;	3607	char *s;
3677	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3678	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679	XFree (s);	3610	XFree (s);
3680	}	3611	}
3681	break;	3612	break;
3682	}	3613	}
…		…
3783	void	3714	void
3784	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785	{	3716	{
3786	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3787	{	3718	{
3788	unsigned short r, g, b;	3719	rxvt_rgba c;
3789	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, c);
		3721
		3722	#if XFT
		3723	if (c.a != rxvt_rgba::MAX_CC)
		3724	tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3725	else
		3726	#endif
3790	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3727	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791	}	3728	}
3792	else	3729	else
3793	set_window_color (color, str);	3730	set_window_color (color, str);
3794	}	3731	}
3795		3732
…		…
3797	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3734	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3798	*/	3735	*/
3799	void	3736	void
3800	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3737	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801	{	3738	{
3802	int changed = 0;
3803	int color;	3739	int color;
3804	char buf, name;	3740	char buf, name;
3805	bool query = str[0] == '?' && !str[1];	3741	bool query = str[0] == '?' && !str[1];
3806	int saveop = op;	3742	int saveop = op;
3807	dDisp;	3743
		3744	dLocal (Display *, xdisp);
3808		3745
3809	assert (str != NULL);	3746	assert (str != NULL);
3810	switch (op)	3747	switch (op)
3811	{	3748	{
3812	case XTerm_name:	3749	case XTerm_name:
…		…
3828	unsigned long bytes_after;	3765	unsigned long bytes_after;
3829	unsigned char *value = 0;	3766	unsigned char *value = 0;
3830	const char *str = "";	3767	const char *str = "";
3831		3768
3832	if (prop	3769	if (prop
3833	&& XGetWindowProperty (disp, parent[0],	3770	&& XGetWindowProperty (xdisp, parent[0],
3834	prop, 0, 1<<16, 0, AnyPropertyType,	3771	prop, 0, 1<<16, 0, AnyPropertyType,
3835	&actual_type, &actual_format,	3772	&actual_type, &actual_format,
3836	&nitems, &bytes_after, &value) == Success	3773	&nitems, &bytes_after, &value) == Success
3837	&& actual_type != None	3774	&& actual_type != None
3838	&& actual_format == 8)	3775	&& actual_format == 8)
3839	str = (const char *)(value);	3776	str = (const char *)(value);
3840		3777
3841	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3778	tt_printf ("\033]%d;%s%c", op, str, resp);
3842		3779
3843	XFree (value);	3780	XFree (value);
3844	}	3781	}
3845	else	3782	else
3846	{	3783	{
…		…
3850	{	3787	{
3851	*eq = 0;	3788	*eq = 0;
3852	set_utf8_property (display->atom (str), eq + 1);	3789	set_utf8_property (display->atom (str), eq + 1);
3853	}	3790	}
3854	else	3791	else
3855	XDeleteProperty (disp, parent[0],	3792	XDeleteProperty (xdisp, parent[0],
3856	display->atom (str));	3793	display->atom (str));
3857	}	3794	}
3858	break;	3795	break;
3859		3796
3860	case XTerm_Color:	3797	case XTerm_Color:
…		…
3870	break;	3807	break;
3871		3808
3872	if ((buf = strchr (name, ';')) != NULL)	3809	if ((buf = strchr (name, ';')) != NULL)
3873	*buf++ = '\0';	3810	*buf++ = '\0';
3874		3811
3875	if (name[0] == '?' && !name[1])	3812	process_color_seq (op, color, name, resp);
3876	{
3877	unsigned short r, g, b;
3878	pix_colors_focused[color].get (display, r, g, b);
3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880	}
3881	else
3882	set_window_color (color, name);
3883	}	3813	}
3884	break;	3814	break;
3885	case XTerm_Color00:	3815	case XTerm_Color00:
3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3816	process_color_seq (op, Color_fg, str, resp);
3887	break;	3817	break;
3888	case XTerm_Color01:	3818	case XTerm_Color01:
3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3819	process_color_seq (op, Color_bg, str, resp);
3890	break;	3820	break;
3891	#ifndef NO_CURSORCOLOR	3821	#ifndef NO_CURSORCOLOR
3892	case XTerm_Color_cursor:	3822	case XTerm_Color_cursor:
3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3823	process_color_seq (op, Color_cursor, str, resp);
3894	break;	3824	break;
3895	#endif	3825	#endif
3896	case XTerm_Color_pointer_fg:	3826	case XTerm_Color_pointer_fg:
3897	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3827	process_color_seq (op, Color_pointer_fg, str, resp);
3898	break;	3828	break;
3899	case XTerm_Color_pointer_bg:	3829	case XTerm_Color_pointer_bg:
3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3830	process_color_seq (op, Color_pointer_bg, str, resp);
3901	break;	3831	break;
3902	#ifndef NO_BOLD_UNDERLINE_REVERSE	3832	#ifndef NO_BOLD_UNDERLINE_REVERSE
3903	case XTerm_Color_RV:	3833	case XTerm_Color_RV:
3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3834	process_color_seq (op, Color_RV, str, resp);
3905	break;	3835	break;
3906	case Rxvt_Color_BD:	3836	case Rxvt_Color_BD:
3907	case URxvt_Color_BD:	3837	case URxvt_Color_BD:
3908	process_color_seq (op, Color_BD, str, resp);	3838	process_color_seq (op, Color_BD, str, resp);
3909	break;	3839	break;
3910	case Rxvt_Color_UL:	3840	case Rxvt_Color_UL:
3911	case URxvt_Color_UL:	3841	case URxvt_Color_UL:
3912	process_color_seq (op, Color_UL, str, resp);	3842	process_color_seq (op, Color_UL, str, resp);
3913	break;	3843	break;
3914	case URxvt_Color_IT:	3844	case URxvt_Color_IT:
3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3845	process_color_seq (op, Color_IT, str, resp);
3916	break;	3846	break;
3917	#endif	3847	#endif
3918	#if TRANSPARENT && TINTING	3848	#if TRANSPARENT && TINTING
3919	case URxvt_Color_tint:	3849	case URxvt_Color_tint:
3920	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3850	process_color_seq (op, Color_tint, str, resp);
3921	check_our_parents ();	3851	check_our_parents ();
3922	if (am_transparent)	3852	if (am_transparent)
3923	want_full_refresh = want_refresh = 1;	3853	want_full_refresh = want_refresh = 1;
3924	break;	3854	break;
3925	#endif	3855	#endif
3926		3856
3927	case Rxvt_Pixmap:	3857	case Rxvt_Pixmap:
		3858	{
3928	if (*str != ';')	3859	if (*str != ';')
3929	{	3860	{
3930	#if XPM_BACKGROUND	3861	#if XPM_BACKGROUND
3931	scale_pixmap (""); /* reset to default scaling */	3862	scale_pixmap (""); /* reset to default scaling */
3932	set_bgPixmap (str); /* change pixmap */	3863	set_bgPixmap (str); /* change pixmap */
3933	scr_touch (true);	3864	scr_touch (true);
3934	#endif	3865	#endif
3935	}	3866	}
3936		3867
		3868	int changed = 0;
		3869
3937	while ((str = strchr (str, ';')) != NULL)	3870	while ((str = strchr (str, ';')) != NULL)
3938	{	3871	{
3939	str++;	3872	str++;
3940	#if XPM_BACKGROUND	3873	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3874	changed += scale_pixmap (str);
3942	#endif	3875	#endif
3943	}	3876	}
3944		3877
3945	if (changed)	3878	if (changed)
3946	{	3879	{
3947	#ifdef XPM_BACKGROUND	3880	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3881	resize_pixmap ();
3949	scr_touch (true);	3882	scr_touch (true);
3950	#endif	3883	#endif
3951	}	3884	}
		3885	}
3952	break;	3886	break;
3953		3887
3954	case Rxvt_restoreFG:	3888	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3889	set_window_color (Color_fg, str);
3956	break;	3890	break;
…		…
3960		3894
3961	case XTerm_logfile:	3895	case XTerm_logfile:
3962	// TODO, when secure mode?	3896	// TODO, when secure mode?
3963	break;	3897	break;
3964		3898
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3899	#if 0
3972	case Rxvt_dumpscreen: /* no error notices */	3900	case Rxvt_dumpscreen: /* no error notices */
3973	{	3901	{
3974	int fd;	3902	int fd;
3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3903	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
4001	allocated.push_back ((void *)res);	3929	allocated.push_back ((void *)res);
4002	set_fonts ();	3930	set_fonts ();
4003	}	3931	}
4004	break;	3932	break;
4005		3933
		3934	case URxvt_version:
		3935	if (query)
		3936	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3937	op,
		3938	rs[Rs_name], VERSION[0], VERSION[2],
		3939	resp);
		3940	break;
		3941
4006	#if ENABLE_FRILLS	3942	#if ENABLE_FRILLS
4007	case URxvt_locale:	3943	case URxvt_locale:
4008	if (query)	3944	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3945	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3946	else
4011	{	3947	{
4012	set_locale (str);	3948	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3949	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3950	init_xlocale ();
4015	}	3951	}
4016	break;	3952	break;
4017		3953
4018	case URxvt_view_up:	3954	case URxvt_view_up:
…		…
4071	return state;	4007	return state;
4072	}	4008	}
4073		4009
4074	/* we're not using priv _yet_ */	4010	/* we're not using priv _yet_ */
4075	void	4011	void
4076	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4012	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077	{	4013	{
4078	unsigned int i, j;	4014	unsigned int i, j;
4079	int state;	4015	int state;
4080		4016
4081	static const struct	4017	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4028	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4029	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4030	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4031	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4032	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4033	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4034	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4035	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4036	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4037	#endif
…		…
4199	/* case 8: - auto repeat, can't do on a per window basis */	4132	/* case 8: - auto repeat, can't do on a per window basis */
4200	case 9: /* X10 mouse reporting */	4133	case 9: /* X10 mouse reporting */
4201	if (state) /* orthogonal */	4134	if (state) /* orthogonal */
4202	priv_modes &= ~PrivMode_MouseX11;	4135	priv_modes &= ~PrivMode_MouseX11;
4203	break;	4136	break;
4204	#ifdef menuBar_esc
4205	case menuBar_esc:
4206	#ifdef MENUBAR
4207	map_menuBar (state);
4208	#endif
4209	break;
4210	#endif
4211	#ifdef scrollBar_esc	4137	#ifdef scrollBar_esc
4212	case scrollBar_esc:	4138	case scrollBar_esc:
4213	if (scrollbar_mapping (state))	4139	if (scrollbar_mapping (state))
4214	{	4140	{
4215	resize_all_windows (0, 0, 0);	4141	resize_all_windows (0, 0, 0);
…		…
4460	rxvt_term::tt_write (const char *data, unsigned int len)	4386	rxvt_term::tt_write (const char *data, unsigned int len)
4461	{	4387	{
4462	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4388	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463	return;	4389	return;
4464		4390
4465	if (pty.pty < 0)	4391	if (pty->pty < 0)
4466	return;	4392	return;
4467		4393
4468	if (v_buflen == 0)	4394	if (v_buflen == 0)
4469	{	4395	{
4470	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4396	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471		4397
4472	if ((unsigned int)written == len)	4398	if ((unsigned int)written == len)
4473	return;	4399	return;
4474		4400
4475	data += written;	4401	data += written;
…		…
4484	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4410	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4485	}	4411	}
4486		4412
4487	void rxvt_term::pty_write ()	4413	void rxvt_term::pty_write ()
4488	{	4414	{
4489	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4415	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490		4416
4491	if (written > 0)	4417	if (written > 0)
4492	{	4418	{
4493	v_buflen -= written;	4419	v_buflen -= written;
4494		4420

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC vs. Revision 1.291 by root, Sun Jan 29 20:51:27 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.291 by root, Sun Jan 29 20:51:27 2006 UTC