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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.288 by root, Sat Jan 28 20:33:31 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 defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1029	{
1046	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1031	want_refresh = 1;
1048		1032
1049	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1034	}
1051	#endif	1035	#endif
1052		1036
1053	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1054	void	1038	void
…		…
1180	}	1164	}
1181		1165
1182	void	1166	void
1183	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1184	{	1168	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1186	recolour_cursor ();	1170	recolour_cursor ();
1187		1171
1188	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1173	hidden_pointer = 0;
1190		1174
…		…
1198	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1199	{	1183	{
1200	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1201	return;	1185	return;
1202		1186
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1204	XFlush (display->display);	1188	XFlush (xdisp);
1205		1189
1206	hidden_pointer = 1;	1190	hidden_pointer = 1;
1207	}	1191	}
1208		1192
1209	void	1193	void
…		…
1282	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1283	(32 + x + 1),	1267	(32 + x + 1),
1284	(32 + y + 1));	1268	(32 + y + 1));
1285	}	1269	}
1286		1270
1287	#ifdef USING_W11LIB
1288	void
1289	rxvt_W11_process_x_event (XEvent *ev)
1290	{
1291	rxvt_t *r = rxvt_get_r ();
1292
1293	x_cb (*ev);
1294	}
1295	#endif
1296
1297	/{{{ process an X event /	1271	/{{{ process an X event /
1298	void	1272	void
1299	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1300	{	1274	{
1301	make_current ();	1275	make_current ();
1302		1276
1303	dDisp;	1277	dLocal (Display *, xdisp);
1304		1278
1305	if (ev.xany.window == vt	1279	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1282	return;
…		…
1405	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1406	break;	1380	break;
1407		1381
1408	case ClientMessage:	1382	case ClientMessage:
1409	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	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	{
1412	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)))
1413	destroy ();	1393	destroy ();
		1394	}
1414	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1415	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])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1418	&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	}
1419	#endif	1411	#endif
1420	}	1412	}
1421	#if ENABLE_XEMBED
1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423	{
1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425	focus_in ();
1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427	focus_out ();
1428	}
1429	#endif
1430	#ifdef OFFIX_DND
1431	/* OffiX Dnd (drag 'n' drop) protocol */
1432	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433	&& (ev.xclient.data.l[0] == DndFile
1434	\|\| ev.xclient.data.l[0] == DndDir
1435	\|\| ev.xclient.data.l[0] == DndLink))
1436	{
1437	/* Get Dnd data */
1438	Atom ActualType;
1439	int ActualFormat;
1440	unsigned char *data;
1441	unsigned long Size, RemainingBytes;
1442
1443	XGetWindowProperty (disp, display->root,
1444	xa[XA_DNDSELECTION],
1445	0L, 1000000L,
1446	False, AnyPropertyType,
1447	&ActualType, &ActualFormat,
1448	&Size, &RemainingBytes,
1449	&data);
1450	set_string_property (XA_CUT_BUFFER0, data);
1451	XFree (data);
1452	selection_paste (display->root, XA_CUT_BUFFER0, true);
1453	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454	}
1455	#endif /* OFFIX_DND */
1456	break;	1413	break;
1457		1414
1458	case MappingNotify:	1415	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1417	break;
…		…
1493	break;	1450	break;
1494		1451
1495	case ConfigureNotify:	1452	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1497	{	1454	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1456	;
1500		1457
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1459	{
1503	seen_resize = 1;	1460	seen_resize = 1;
…		…
1512	#endif	1469	#endif
1513	}	1470	}
1514	break;	1471	break;
1515		1472
1516	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1478
1521	break;	1479	break;
1522		1480
1523	case SelectionClear:	1481	case SelectionClear:
1524	selection_clear ();	1482	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1561	{	1519	{
1562	do	1520	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1566		1524
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1526
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1572		1530
1573	want_refresh = 1;	1531	want_refresh = 1;
1574	}	1532	}
1575	else	1533	else
1576	{	1534	{
1577	XEvent unused_event;	1535	XEvent unused_event;
1578		1536
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1580	;	1538	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1540	;
1583		1541
1584	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1585	{	1543	{
1586	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1587	scrollbar_show (0);	1545	scrollbar_show (0);
1588	}	1546	}
1589		1547
1590	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1593	#endif	1551	#endif
1594	}	1552	}
1595	break;	1553	break;
1596		1554
1597	case MotionNotify:	1555	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1567	; // nop
1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1611	{	1569	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1613	;	1571	;
1614		1572
1615	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1616	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1577	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1642	#endif
1685	}	1643	}
1686	}	1644	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1646	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1690	MotionNotify, &ev))	1648	MotionNotify, &ev))
1691	;	1649	;
1692		1650
1693	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1694	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1655	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1713	{	1671	{
1714	hidden_cursor = 0;	1672	hidden_cursor = 0;
1715	want_refresh = 1;	1673	want_refresh = 1;
1716	}	1674	}
1717		1675
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1677	}
1720	#endif	1678	#endif
1721		1679
1722	#if defined(POINTER_BLANK)	1680	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1751	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1752	}	1710	}
1753	#endif	1711	#endif
1754	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1715	#endif
1758	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1760	{	1718	{
1761	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1842	/*	1800	/*
1843	* VT window processing of button press	1801	* VT window processing of button press
1844	*/	1802	*/
1845	if (ev.window == vt)	1803	if (ev.window == vt)
1846	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1847	#if ISO_14755	1808	#if ISO_14755
1848	// 5.4	1809	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1850	{	1811	{
1851	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1854	else
1894	{	1855	{
1895	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1897		1858
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1859	switch (ev.button)
1900	{	1860	{
1901	case Button1:	1861	case Button1:
1902	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1863	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1866	#else
1907	selection.rect = false;	1867	selection.rect = false;
1908	#endif	1868	#endif
1909		1869
1910	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1872	{
1913	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1915	else	1875	else
1916	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1917	}	1877	}
1918	else	1878	else
1919	{	1879	{
1920	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1881	MEvent.clicks++;
1922	else	1882	else
1923	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1924		1884
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1886	}
1927		1887
1928	MEvent.button = Button1;	1888	MEvent.button = Button1;
1929	break;	1889	break;
1930		1890
1931	case Button3:	1891	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1934	else	1894	else
1935	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1936		1896
1937	MEvent.button = Button3;	1897	MEvent.button = Button3;
1938	break;	1898	break;
1939	}	1899	}
1940	}	1900	}
1941		1901
1942	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1943	return;	1903	return;
1944	}	1904	}
1945		1905
…		…
2108	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2109	#endif	2069	#endif
2110		2070
2111	if (ev.window == vt)	2071	if (ev.window == vt)
2112	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2113	#if ISO_14755	2076	#if ISO_14755
2114	// 5.4	2077	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2116	return;	2079	return;
2117	#endif	2080	#endif
		2081
2118	if (reportmode)	2082	if (reportmode)
2119	{	2083	{
2120	/* mouse report from vt window */	2084	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2111	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2150		2114
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2115	switch (ev.button)
2155	{	2116	{
2156	case Button1:	2117	case Button1:
2157	case Button3:	2118	case Button3:
2158	selection_make (ev.time);	2119	selection_make (ev.time);
2159	break;	2120	break;
		2121
2160	case Button2:	2122	case Button2:
2161	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);
2162	break;	2125	break;
		2126
2163	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2164	case Button4:	2128	case Button4:
2165	case Button5:	2129	case Button5:
2166	{	2130	{
2167	int i;	2131	int i;
…		…
2207	#if TINTING	2171	#if TINTING
2208	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2209		2173
2210	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2211		2175
2212	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)
2213	{	2177	{
2214	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2215	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2216	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2217	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219	int i;	2183	int i;
2220		2184
2221	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2222		2186
2223	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2224		2188
2225	/* for convenience */	2189	/* for convenience */
2226	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2447	Atom atype;	2411	Atom atype;
2448	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2449	Window root, oldp, *list;	2413	Window root, oldp, *list;
2450	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2451	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2452	dDisp;
2453		2416
2454	pchanged = 0;	2417	pchanged = 0;
2455		2418
2456	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2457	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2458		2421
2459	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2460	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2461		2424
2462	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2463		2426
2464	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2465	{	2428	{
2466	if (am_transparent)	2429	if (am_transparent)
2467	{	2430	{
2468	pchanged = 1;	2431	pchanged = 1;
2469	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2470	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2471	}	2434	}
2472		2435
2473	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2474	}	2437	}
2475		2438
2476	/* 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. */
2477	XSync (disp, False);	2440	XSync (xdisp, False);
2478		2441
2479	/*	2442	/*
2480	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2481	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2482	* 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.
2483	*/	2446	*/
2484	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2485	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2488		2451
2489	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2490	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2491	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2494		2457
2495	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2496	#if TINTING	2459	#if TINTING
…		…
2515	Window cr;	2478	Window cr;
2516	XImage *image;	2479	XImage *image;
2517	GC gc;	2480	GC gc;
2518	XGCValues gcvalue;	2481	XGCValues gcvalue;
2519		2482
2520	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2521	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2522	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2523	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2524	nx = ny = 0;	2487	nx = ny = 0;
2525		2488
…		…
2538	}	2501	}
2539		2502
2540	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2541	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2542		2505
2543	XSync (disp, False);	2506	XSync (xdisp, False);
2544	allowedxerror = -1;	2507	allowedxerror = -1;
2545	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546		2509
2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2548	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2549	allowedxerror = 0;	2512	allowedxerror = 0;
2550		2513
…		…
2553	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2554	{	2517	{
2555	pchanged = 1;	2518	pchanged = 1;
2556	if (pixmap != None)	2519	if (pixmap != None)
2557	{	2520	{
2558	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2559	pixmap = None;	2522	pixmap = None;
2560	}	2523	}
2561	}	2524	}
2562		2525
2563	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2564	}	2527	}
2565	else	2528	else
2566	{	2529	{
2567	if (pixmap != None)	2530	if (pixmap != None)
2568	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2569		2532
2570	#if TINTING	2533	#if TINTING
2571	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2572	{	2535	{
2573	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2574	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575		2538
2576	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2577		2540
2578	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2579	}	2542	}
2580	#endif	2543	#endif
2581		2544
2582	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2583	szHint.width, szHint.height, image->depth);
2584	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2585	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2586	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2587	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2588	XDestroyImage (image);	2550	XDestroyImage (image);
2589	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2590	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2591		2553
2592	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2593	pchanged = 1;	2555	pchanged = 1;
2594		2556
2595	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2596	}	2558	}
2597	}	2559	}
2598		2560
2599	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2600	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601	else	2563	else
2602	{	2564	{
2603	unsigned int n;	2565	unsigned int n;
2604	/*	2566	/*
2605	* InheritPixmap transparency	2567	* InheritPixmap transparency
2606	*/	2568	*/
2607	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608	{	2570	{
2609	oldp = parent[i];	2571	oldp = parent[i];
2610	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2611	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2612	XFree (list);	2574	XFree (list);
2613		2575
2614	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2615	{	2577	{
…		…
2627		2589
2628	if (pchanged)	2590	if (pchanged)
2629	{	2591	{
2630	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2631	{	2593	{
2632	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2634	{	2596	{
2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636	break;	2598	break;
2637	}	2599	}
2638	}	2600	}
2639	}	2601	}
2640		2602
2641	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642	{	2604	{
2643	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2644	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2645	am_transparent = 0;	2607	am_transparent = 0;
2646	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2647	}	2609	}
2648	else	2610	else
2649	{	2611	{
2650	#if WAIT_FOR_WM
2651	/* wait (an arbitrary period) for the WM to do its thing
2652	* needed for fvwm2.2.2 (and before?) */
2653	sleep (1);
2654	#endif
2655	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2656	{	2613	{
2657	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2658	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2659	}	2616	}
2660		2617
2661	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2662	am_transparent = 1;	2619	am_transparent = 1;
2663	}	2620	}
2664		2621
2665	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666	parent[i] = None;	2623	parent[i] = None;
2667	}	2624	}
2668		2625
2669	if (scrollBar.win)	2626	if (scrollBar.win)
2670	{	2627	{
2671	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2672	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2673	scrollbar_show (0);	2630	scrollbar_show (0);
2674	}	2631	}
2675		2632
2676	if (am_transparent)	2633	if (am_transparent)
…		…
2822	return flag;	2779	return flag;
2823	}	2780	}
2824		2781
2825	// read the next character	2782	// read the next character
2826	wchar_t	2783	wchar_t
2827	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2828	{	2785	{
2829	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2830	{	2787	{
2831	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2832	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2853	return NOCHAR;	2810	return NOCHAR;
2854	}	2811	}
2855		2812
2856	// read the next octet	2813	// read the next octet
2857	uint32_t	2814	uint32_t
2858	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2859	{	2816	{
2860	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2861	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2862	: NOCHAR;	2819	: NOCHAR;
2863	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2864		2823
2865	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2866	/*	2825	/*
2867	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2868	* to the command.	2827	* to the command.
2869	*/	2828	*/
2870	wchar_t	2829	wchar_t
2871	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2872	{	2831	{
2873	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2874		2833
2875	if (c == NOCHAR)	2834	if (c == NOCHAR)
2876	throw out_of_input;	2835	throw out_of_input;
2877		2836
2878	return c;	2837	return c;
2879	}	2838	}
2880		2839
2881	uint32_t	2840	uint32_t
2882	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883	{	2842	{
2884	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2885		2844
2886	if (c == NOCHAR)	2845	if (c == NOCHAR)
2887	throw out_of_input;	2846	throw out_of_input;
…		…
3308	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3309	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3310	if (arg[p] == -1)	3269	if (arg[p] == -1)
3311	arg[p] = ndef;	3270	arg[p] = ndef;
3312		3271
3313	#ifdef DEBUG_CMD
3314	fprintf (stderr, "CSI ");
3315	for (p = 0; p < nargs; p++)
3316	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317	fprintf (stderr, "%c\n", ch);
3318	#endif
3319
3320	/*	3272	/*
3321	* private mode handling	3273	* private mode handling
3322	*/	3274	*/
3323	if (priv)	3275	if (priv)
3324	{	3276	{
3325	switch (priv)	3277	switch (priv)
3326	{	3278	{
3327	case '>':	3279	case '>':
3328	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3329	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.2.
		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[>0;94;0c");
		3290	}
3330	break;	3291	break;
3331	case '?':	3292	case '?':
3332	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3333	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3334	break;	3295	break;
…		…
3562	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563	{	3524	{
3564	int x, y;	3525	int x, y;
3565	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3566	Window wdummy;	3527	Window wdummy;
3567	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3568		3530
3569	if (nargs == 0)	3531	if (nargs == 0)
3570	return;	3532	return;
3571		3533
3572	switch (args[0])	3534	switch (args[0])
3573	{	3535	{
3574	/*	3536	/*
3575	* commands	3537	* commands
3576	*/	3538	*/
3577	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3578	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3579	break;	3541	break;
3580	case 2: /* iconify window */	3542	case 2: /* iconify window */
3581	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3582	break;	3544	break;
3583	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3584	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3585	break;	3547	break;
3586	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3587	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588	break;	3550	break;
3589	case 5: /* raise window */	3551	case 5: /* raise window */
3590	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3591	break;	3553	break;
3592	case 6: /* lower window */	3554	case 6: /* lower window */
3593	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3594	break;	3556	break;
3595	case 7: /* refresh window */	3557	case 7: /* refresh window */
3596	scr_touch (true);	3558	scr_touch (true);
3597	break;	3559	break;
3598	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3610		3572
3611	/*	3573	/*
3612	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3613	*/	3575	*/
3614	case 11: /* report window state */	3576	case 11: /* report window state */
3615	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3616	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617	break;	3579	break;
3618	case 13: /* report window position */	3580	case 13: /* report window position */
3619	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3620	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3621	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3622	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3623	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3624	break;	3586	break;
3625	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3626	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3627	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628	break;	3590	break;
3629	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3630	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631	break;	3593	break;
…		…
3633	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634	break;	3596	break;
3635	case 20: /* report icon label */	3597	case 20: /* report icon label */
3636	{	3598	{
3637	char *s;	3599	char *s;
3638	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3639	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 */
3640	XFree (s);	3602	XFree (s);
3641	}	3603	}
3642	break;	3604	break;
3643	case 21: /* report window title */	3605	case 21: /* report window title */
3644	{	3606	{
3645	char *s;	3607	char *s;
3646	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3647	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 */
3648	XFree (s);	3610	XFree (s);
3649	}	3611	}
3650	break;	3612	break;
3651	}	3613	}
…		…
3753	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)
3754	{	3716	{
3755	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3756	{	3718	{
3757	unsigned short r, g, b;	3719	unsigned short r, g, b;
3758	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3759	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3721	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3760	}	3722	}
3761	else	3723	else
3762	set_window_color (color, str);	3724	set_window_color (color, str);
3763	}	3725	}
…		…
3766	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3728	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3767	*/	3729	*/
3768	void	3730	void
3769	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3731	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3770	{	3732	{
3771	int changed = 0;
3772	int color;	3733	int color;
3773	char buf, name;	3734	char buf, name;
3774	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3775	int saveop = op;	3736	int saveop = op;
3776	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3777		3739
3778	assert (str != NULL);	3740	assert (str != NULL);
3779	switch (op)	3741	switch (op)
3780	{	3742	{
3781	case XTerm_name:	3743	case XTerm_name:
…		…
3797	unsigned long bytes_after;	3759	unsigned long bytes_after;
3798	unsigned char *value = 0;	3760	unsigned char *value = 0;
3799	const char *str = "";	3761	const char *str = "";
3800		3762
3801	if (prop	3763	if (prop
3802	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3803	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3804	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3805	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3806	&& actual_type != None	3768	&& actual_type != None
3807	&& actual_format == 8)	3769	&& actual_format == 8)
…		…
3819	{	3781	{
3820	*eq = 0;	3782	*eq = 0;
3821	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3822	}	3784	}
3823	else	3785	else
3824	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3825	display->atom (str));	3787	display->atom (str));
3826	}	3788	}
3827	break;	3789	break;
3828		3790
3829	case XTerm_Color:	3791	case XTerm_Color:
…		…
3842	*buf++ = '\0';	3804	*buf++ = '\0';
3843		3805
3844	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3845	{	3807	{
3846	unsigned short r, g, b;	3808	unsigned short r, g, b;
3847	pix_colors_focused[color].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3848	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3849	}	3811	}
3850	else	3812	else
3851	set_window_color (color, name);	3813	set_window_color (color, name);
3852	}	3814	}
…		…
3892	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
3893	break;	3855	break;
3894	#endif	3856	#endif
3895		3857
3896	case Rxvt_Pixmap:	3858	case Rxvt_Pixmap:
		3859	{
3897	if (*str != ';')	3860	if (*str != ';')
3898	{	3861	{
3899	#if XPM_BACKGROUND	3862	#if XPM_BACKGROUND
3900	scale_pixmap (""); /* reset to default scaling */	3863	scale_pixmap (""); /* reset to default scaling */
3901	set_bgPixmap (str); /* change pixmap */	3864	set_bgPixmap (str); /* change pixmap */
3902	scr_touch (true);	3865	scr_touch (true);
3903	#endif	3866	#endif
3904	}	3867	}
3905		3868
		3869	int changed = 0;
		3870
3906	while ((str = strchr (str, ';')) != NULL)	3871	while ((str = strchr (str, ';')) != NULL)
3907	{	3872	{
3908	str++;	3873	str++;
3909	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3910	changed += scale_pixmap (str);	3875	changed += scale_pixmap (str);
3911	#endif	3876	#endif
3912	}	3877	}
3913		3878
3914	if (changed)	3879	if (changed)
3915	{	3880	{
3916	#ifdef XPM_BACKGROUND	3881	#ifdef XPM_BACKGROUND
3917	resize_pixmap ();	3882	resize_pixmap ();
3918	scr_touch (true);	3883	scr_touch (true);
3919	#endif	3884	#endif
3920	}	3885	}
		3886	}
3921	break;	3887	break;
3922		3888
3923	case Rxvt_restoreFG:	3889	case Rxvt_restoreFG:
3924	set_window_color (Color_fg, str);	3890	set_window_color (Color_fg, str);
3925	break;	3891	break;
…		…
3962		3928
3963	res = strdup (str);	3929	res = strdup (str);
3964	allocated.push_back ((void *)res);	3930	allocated.push_back ((void *)res);
3965	set_fonts ();	3931	set_fonts ();
3966	}	3932	}
		3933	break;
		3934
		3935	case URxvt_version:
		3936	if (query)
		3937	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3938	URxvt_version,
		3939	rs[Rs_name],
		3940	VERSION[0], VERSION[2],
		3941	resp);
3967	break;	3942	break;
3968		3943
3969	#if ENABLE_FRILLS	3944	#if ENABLE_FRILLS
3970	case URxvt_locale:	3945	case URxvt_locale:
3971	if (query)	3946	if (query)
…		…
4034	return state;	4009	return state;
4035	}	4010	}
4036		4011
4037	/* we're not using priv _yet_ */	4012	/* we're not using priv _yet_ */
4038	void	4013	void
4039	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4014	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4040	{	4015	{
4041	unsigned int i, j;	4016	unsigned int i, j;
4042	int state;	4017	int state;
4043		4018
4044	static const struct	4019	static const struct

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs. Revision 1.288 by root, Sat Jan 28 20:33:31 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.288 by root, Sat Jan 28 20:33:31 2006 UTC