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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 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)
…		…
230	# if !UNICODE3	227	# if !UNICODE3
231	if (ch >= 0x10000)	228	if (ch >= 0x10000)
232	ch = 0xfffd;	229	ch = 0xfffd;
233	# endif	230	# endif
234	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
236	}	235	}
237		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
238	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
240		244
241	free (fname);	245	free (fname);
242		246
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	307	{
304	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
305	unsigned int newlen;	309	unsigned int newlen;
306	KeySym keysym;	310	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	311	int valid_keysym;
311	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
312		313
313	/*	314	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	465	{
465	switch (keysym)	466	switch (keysym)
466	{	467	{
467	/* normal XTerm key bindings */	468	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	469	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	470	selection_request (ev.time);
470	return;	471	return;
471	#if TODO	472	#if TODO
472	/* rxvt extras */	473	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	474	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	475	change_font (FONT_UP);
…		…
905	{	906	{
906	const char ch = C0_ESC;	907	const char ch = C0_ESC;
907	tt_write (&ch, 1);	908	tt_write (&ch, 1);
908	}	909	}
909		910
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	911	tt_write (kbuf, (unsigned int)len);
921	}	912	}
922	/}}} /	913	/}}} /
923		914
924	#if defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1036	{
1046	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1038	want_refresh = 1;
1048		1039
1049	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1041	}
1051	#endif	1042	#endif
1052		1043
1053	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1054	void	1045	void
…		…
1180	}	1171	}
1181		1172
1182	void	1173	void
1183	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1184	{	1175	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1186	recolour_cursor ();	1177	recolour_cursor ();
1187		1178
1188	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1180	hidden_pointer = 0;
1190		1181
…		…
1198	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1199	{	1190	{
1200	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1201	return;	1192	return;
1202		1193
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1204	XFlush (display->display);	1195	XFlush (xdisp);
1205		1196
1206	hidden_pointer = 1;	1197	hidden_pointer = 1;
1207	}	1198	}
1208		1199
1209	void	1200	void
…		…
1282	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1283	(32 + x + 1),	1274	(32 + x + 1),
1284	(32 + y + 1));	1275	(32 + y + 1));
1285	}	1276	}
1286		1277
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 /	1278	/{{{ process an X event /
1298	void	1279	void
1299	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1300	{	1281	{
1301	make_current ();	1282	make_current ();
1302		1283
1303	dDisp;	1284	dLocal (Display *, xdisp);
1304		1285
1305	if (ev.xany.window == vt	1286	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1289	return;
…		…
1405	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1406	break;	1387	break;
1407		1388
1408	case ClientMessage:	1389	case ClientMessage:
1409	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1412	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1400	destroy ();
		1401	}
1414	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1415	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1418	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1419	#endif	1418	#endif
1420	}	1419	}
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;	1420	break;
1457		1421
1458	case MappingNotify:	1422	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1424	break;
…		…
1493	break;	1457	break;
1494		1458
1495	case ConfigureNotify:	1459	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1497	{	1461	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1463	;
1500		1464
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1466	{
1503	seen_resize = 1;	1467	seen_resize = 1;
…		…
1512	#endif	1476	#endif
1513	}	1477	}
1514	break;	1478	break;
1515		1479
1516	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1485
1521	break;	1486	break;
1522		1487
1523	case SelectionClear:	1488	case SelectionClear:
1524	selection_clear ();	1489	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1561	{	1526	{
1562	do	1527	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1566		1531
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1533
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1572		1537
1573	want_refresh = 1;	1538	want_refresh = 1;
1574	}	1539	}
1575	else	1540	else
1576	{	1541	{
1577	XEvent unused_event;	1542	XEvent unused_event;
1578		1543
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1580	;	1545	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1547	;
1583		1548
1584	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1585	{	1550	{
1586	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1587	scrollbar_show (0);	1552	scrollbar_show (0);
1588	}	1553	}
1589		1554
1590	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1593	#endif	1558	#endif
1594	}	1559	}
1595	break;	1560	break;
1596		1561
1597	case MotionNotify:	1562	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1574	; // nop
1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1611	{	1576	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1613	;	1578	;
1614		1579
1615	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1616	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1584	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1649	#endif
1685	}	1650	}
1686	}	1651	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1653	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1690	MotionNotify, &ev))	1655	MotionNotify, &ev))
1691	;	1656	;
1692		1657
1693	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1694	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1662	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1713	{	1678	{
1714	hidden_cursor = 0;	1679	hidden_cursor = 0;
1715	want_refresh = 1;	1680	want_refresh = 1;
1716	}	1681	}
1717		1682
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1684	}
1720	#endif	1685	#endif
1721		1686
1722	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1751	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1752	}	1717	}
1753	#endif	1718	#endif
1754	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1722	#endif
1758	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1760	{	1725	{
1761	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1842	/*	1807	/*
1843	* VT window processing of button press	1808	* VT window processing of button press
1844	*/	1809	*/
1845	if (ev.window == vt)	1810	if (ev.window == vt)
1846	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1847	#if ISO_14755	1815	#if ISO_14755
1848	// 5.4	1816	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1850	{	1818	{
1851	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1861	else
1894	{	1862	{
1895	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1897		1865
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1866	switch (ev.button)
1900	{	1867	{
1901	case Button1:	1868	case Button1:
1902	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1870	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1873	#else
1907	selection.rect = false;	1874	selection.rect = false;
1908	#endif	1875	#endif
1909		1876
1910	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1879	{
1913	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1915	else	1882	else
1916	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1917	}	1884	}
1918	else	1885	else
1919	{	1886	{
1920	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1888	MEvent.clicks++;
1922	else	1889	else
1923	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1924		1891
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1893	}
1927		1894
1928	MEvent.button = Button1;	1895	MEvent.button = Button1;
1929	break;	1896	break;
1930		1897
1931	case Button3:	1898	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1934	else	1901	else
1935	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1936		1903
1937	MEvent.button = Button3;	1904	MEvent.button = Button3;
1938	break;	1905	break;
1939	}	1906	}
1940	}	1907	}
1941		1908
1942	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1943	return;	1910	return;
1944	}	1911	}
1945		1912
…		…
2108	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2109	#endif	2076	#endif
2110		2077
2111	if (ev.window == vt)	2078	if (ev.window == vt)
2112	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2113	#if ISO_14755	2083	#if ISO_14755
2114	// 5.4	2084	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2116	return;	2086	return;
2117	#endif	2087	#endif
		2088
2118	if (reportmode)	2089	if (reportmode)
2119	{	2090	{
2120	/* mouse report from vt window */	2091	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2118	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2150		2121
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2122	switch (ev.button)
2155	{	2123	{
2156	case Button1:	2124	case Button1:
2157	case Button3:	2125	case Button3:
2158	selection_make (ev.time);	2126	selection_make (ev.time);
2159	break;	2127	break;
		2128
2160	case Button2:	2129	case Button2:
2161	selection_request (ev.time, ev.x, ev.y);	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2162	break;	2132	break;
		2133
2163	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2164	case Button4:	2135	case Button4:
2165	case Button5:	2136	case Button5:
2166	{	2137	{
2167	int i;	2138	int i;
…		…
2207	#if TINTING	2178	#if TINTING
2208	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2209		2180
2210	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2211		2182
2212	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2213	{	2184	{
2214	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2215	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2216	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2217	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219	int i;	2190	int i;
2220		2191
2221	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2222		2193
2223	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2224		2195
2225	/* for convenience */	2196	/* for convenience */
2226	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2447	Atom atype;	2418	Atom atype;
2448	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2449	Window root, oldp, *list;	2420	Window root, oldp, *list;
2450	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2451	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2452	dDisp;
2453		2423
2454	pchanged = 0;	2424	pchanged = 0;
2455		2425
2456	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2457	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2458		2428
2459	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2460	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2461		2431
2462	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2463		2433
2464	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2465	{	2435	{
2466	if (am_transparent)	2436	if (am_transparent)
2467	{	2437	{
2468	pchanged = 1;	2438	pchanged = 1;
2469	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2470	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2471	}	2441	}
2472		2442
2473	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2474	}	2444	}
2475		2445
2476	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2477	XSync (disp, False);	2447	XSync (xdisp, False);
2478		2448
2479	/*	2449	/*
2480	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2481	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2482	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2483	*/	2453	*/
2484	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2485	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2488		2458
2489	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2490	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2491	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2494		2464
2495	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2496	#if TINTING	2466	#if TINTING
…		…
2515	Window cr;	2485	Window cr;
2516	XImage *image;	2486	XImage *image;
2517	GC gc;	2487	GC gc;
2518	XGCValues gcvalue;	2488	XGCValues gcvalue;
2519		2489
2520	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2521	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2522	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2523	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2524	nx = ny = 0;	2494	nx = ny = 0;
2525		2495
…		…
2538	}	2508	}
2539		2509
2540	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2541	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2542		2512
2543	XSync (disp, False);	2513	XSync (xdisp, False);
2544	allowedxerror = -1;	2514	allowedxerror = -1;
2545	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546		2516
2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2548	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2549	allowedxerror = 0;	2519	allowedxerror = 0;
2550		2520
…		…
2553	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2554	{	2524	{
2555	pchanged = 1;	2525	pchanged = 1;
2556	if (pixmap != None)	2526	if (pixmap != None)
2557	{	2527	{
2558	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2559	pixmap = None;	2529	pixmap = None;
2560	}	2530	}
2561	}	2531	}
2562		2532
2563	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2564	}	2534	}
2565	else	2535	else
2566	{	2536	{
2567	if (pixmap != None)	2537	if (pixmap != None)
2568	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2569		2539
2570	#if TINTING	2540	#if TINTING
2571	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2572	{	2542	{
2573	unsigned short rm, gm, bm;	2543	rxvt_rgba c;
2574	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2544	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575		2545
2576	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused[Color_tint].get (this, c);
2577		2547
2578	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579	}	2549	}
2580	#endif	2550	#endif
2581		2551
2582	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2583	szHint.width, szHint.height, image->depth);
2584	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2585	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2586	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2587	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2588	XDestroyImage (image);	2557	XDestroyImage (image);
2589	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2590	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2591		2560
2592	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2593	pchanged = 1;	2562	pchanged = 1;
2594		2563
2595	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2596	}	2565	}
2597	}	2566	}
2598		2567
2599	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2600	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601	else	2570	else
2602	{	2571	{
2603	unsigned int n;	2572	unsigned int n;
2604	/*	2573	/*
2605	* InheritPixmap transparency	2574	* InheritPixmap transparency
2606	*/	2575	*/
2607	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608	{	2577	{
2609	oldp = parent[i];	2578	oldp = parent[i];
2610	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root,
2611	&parent[i], &list, &n);	2580	&parent[i], &list, &n);
2612	XFree (list);	2581	XFree (list);
2613		2582
2614	if (parent[i] == display->root)	2583	if (parent[i] == display->root)
2615	{	2584	{
…		…
2627		2596
2628	if (pchanged)	2597	if (pchanged)
2629	{	2598	{
2630	for (; n < (unsigned int)i; n++)	2599	for (; n < (unsigned int)i; n++)
2631	{	2600	{
2632	XGetWindowAttributes (disp, parent[n], &wattr);	2601	XGetWindowAttributes (xdisp, parent[n], &wattr);
2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2602	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2634	{	2603	{
2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636	break;	2605	break;
2637	}	2606	}
2638	}	2607	}
2639	}	2608	}
2640		2609
2641	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642	{	2611	{
2643	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2644	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2645	am_transparent = 0;	2614	am_transparent = 0;
2646	/* XXX: also turn off Opt_transparent? */	2615	/* XXX: also turn off Opt_transparent? */
2647	}	2616	}
2648	else	2617	else
2649	{	2618	{
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++)	2619	for (n = 0; n < (unsigned int)i; n++)
2656	{	2620	{
2657	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2658	XClearWindow (disp, parent[n]);	2622	XClearWindow (xdisp, parent[n]);
2659	}	2623	}
2660		2624
2661	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2662	am_transparent = 1;	2626	am_transparent = 1;
2663	}	2627	}
2664		2628
2665	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666	parent[i] = None;	2630	parent[i] = None;
2667	}	2631	}
2668		2632
2669	if (scrollBar.win)	2633	if (scrollBar.win)
2670	{	2634	{
2671	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2672	scrollBar.setIdle ();	2636	scrollBar.setIdle ();
2673	scrollbar_show (0);	2637	scrollbar_show (0);
2674	}	2638	}
2675		2639
2676	if (am_transparent)	2640	if (am_transparent)
…		…
2822	return flag;	2786	return flag;
2823	}	2787	}
2824		2788
2825	// read the next character	2789	// read the next character
2826	wchar_t	2790	wchar_t
2827	rxvt_term::next_char ()	2791	rxvt_term::next_char () NOTHROW
2828	{	2792	{
2829	while (cmdbuf_ptr < cmdbuf_endp)	2793	while (cmdbuf_ptr < cmdbuf_endp)
2830	{	2794	{
2831	// assume 7-bit to be ascii ALWAYS	2795	// assume 7-bit to be ascii ALWAYS
2832	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2796	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2853	return NOCHAR;	2817	return NOCHAR;
2854	}	2818	}
2855		2819
2856	// read the next octet	2820	// read the next octet
2857	uint32_t	2821	uint32_t
2858	rxvt_term::next_octet ()	2822	rxvt_term::next_octet () NOTHROW
2859	{	2823	{
2860	return cmdbuf_ptr < cmdbuf_endp	2824	return cmdbuf_ptr < cmdbuf_endp
2861	? (unsigned char)*cmdbuf_ptr++	2825	? (unsigned char)*cmdbuf_ptr++
2862	: NOCHAR;	2826	: NOCHAR;
2863	}	2827	}
		2828
		2829	static class out_of_input out_of_input;
2864		2830
2865	/* rxvt_cmd_getc () - Return next input character */	2831	/* rxvt_cmd_getc () - Return next input character */
2866	/*	2832	/*
2867	* Return the next input character after first passing any keyboard input	2833	* Return the next input character after first passing any keyboard input
2868	* to the command.	2834	* to the command.
2869	*/	2835	*/
2870	wchar_t	2836	wchar_t
2871	rxvt_term::cmd_getc ()	2837	rxvt_term::cmd_getc () THROW ((class out_of_input))
2872	{	2838	{
2873	wchar_t c = next_char ();	2839	wchar_t c = next_char ();
2874		2840
2875	if (c == NOCHAR)	2841	if (c == NOCHAR)
2876	throw out_of_input;	2842	throw out_of_input;
2877		2843
2878	return c;	2844	return c;
2879	}	2845	}
2880		2846
2881	uint32_t	2847	uint32_t
2882	rxvt_term::cmd_get8 ()	2848	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883	{	2849	{
2884	uint32_t c = next_octet ();	2850	uint32_t c = next_octet ();
2885		2851
2886	if (c == NOCHAR)	2852	if (c == NOCHAR)
2887	throw out_of_input;	2853	throw out_of_input;
…		…
3125	scr_charset_set (2, (unsigned int)cmd_getc ());	3091	scr_charset_set (2, (unsigned int)cmd_getc ());
3126	break;	3092	break;
3127	case '+':	3093	case '+':
3128	scr_charset_set (3, (unsigned int)cmd_getc ());	3094	scr_charset_set (3, (unsigned int)cmd_getc ());
3129	break;	3095	break;
3130	#if ENABLE_FRILLS	3096	#if !ENABLE_MINIMAL
3131	case '6':	3097	case '6':
3132	scr_backindex ();	3098	scr_backindex ();
3133	break;	3099	break;
3134	#endif	3100	#endif
3135	case '7':	3101	case '7':
3136	scr_cursor (SAVE);	3102	scr_cursor (SAVE);
3137	break;	3103	break;
3138	case '8':	3104	case '8':
3139	scr_cursor (RESTORE);	3105	scr_cursor (RESTORE);
3140	break;	3106	break;
3141	#if ENABLE_FRILLS	3107	#if !ENABLE_MINIMAL
3142	case '9':	3108	case '9':
3143	scr_forwardindex ();	3109	scr_forwardindex ();
3144	break;	3110	break;
3145	#endif	3111	#endif
3146	case '=':	3112	case '=':
…		…
3308	ndef = get_byte_array_bit (csi_defaults, i);	3274	ndef = get_byte_array_bit (csi_defaults, i);
3309	for (p = 0; p < nargs; p++)	3275	for (p = 0; p < nargs; p++)
3310	if (arg[p] == -1)	3276	if (arg[p] == -1)
3311	arg[p] = ndef;	3277	arg[p] = ndef;
3312		3278
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	/*	3279	/*
3321	* private mode handling	3280	* private mode handling
3322	*/	3281	*/
3323	if (priv)	3282	if (priv)
3324	{	3283	{
3325	switch (priv)	3284	switch (priv)
3326	{	3285	{
3327	case '>':	3286	case '>':
3328	if (ch == CSI_DA) /* secondary device attributes */	3287	if (ch == CSI_DA) /* secondary device attributes */
3329	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3288	{
		3289	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3290	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3291	//
		3292	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3293	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3294	// that we do not support xterm mouse reporting (should be 95 when we do).
		3295	//
		3296	tt_printf ("\033[>%d;94;0c", 'U');
		3297	}
3330	break;	3298	break;
3331	case '?':	3299	case '?':
3332	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3300	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3333	process_terminal_mode (ch, priv, nargs, arg);	3301	process_terminal_mode (ch, priv, nargs, arg);
3334	break;	3302	break;
…		…
3537	break;	3505	break;
3538	case CSI_75:	3506	case CSI_75:
3539	scr_cursor (RESTORE);	3507	scr_cursor (RESTORE);
3540	break;	3508	break;
3541		3509
3542	#if ENABLE_FRILLS	3510	#if !ENABLE_MINIMAL
3543	case CSI_74:	3511	case CSI_74:
3544	process_window_ops (arg, nargs);	3512	process_window_ops (arg, nargs);
3545	break;	3513	break;
3546	#endif	3514	#endif
3547		3515
…		…
3554	break;	3522	break;
3555	}	3523	}
3556	}	3524	}
3557	/}}} /	3525	/}}} /
3558		3526
3559	#if ENABLE_FRILLS	3527	#if !ENABLE_MINIMAL
3560	/* ARGSUSED */	3528	/* ARGSUSED */
3561	void	3529	void
3562	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563	{	3531	{
3564	int x, y;	3532	int x, y;
3565	XWindowAttributes wattr;	3533	XWindowAttributes wattr;
3566	Window wdummy;	3534	Window wdummy;
3567	dDisp;	3535
		3536	dLocal (Display *, xdisp);
3568		3537
3569	if (nargs == 0)	3538	if (nargs == 0)
3570	return;	3539	return;
3571		3540
3572	switch (args[0])	3541	switch (args[0])
3573	{	3542	{
3574	/*	3543	/*
3575	* commands	3544	* commands
3576	*/	3545	*/
3577	case 1: /* deiconify window */	3546	case 1: /* deiconify window */
3578	XMapWindow (disp, parent[0]);	3547	XMapWindow (xdisp, parent[0]);
3579	break;	3548	break;
3580	case 2: /* iconify window */	3549	case 2: /* iconify window */
3581	XIconifyWindow (disp, parent[0], display->screen);	3550	XIconifyWindow (xdisp, parent[0], display->screen);
3582	break;	3551	break;
3583	case 3: /* set position (pixels) */	3552	case 3: /* set position (pixels) */
3584	XMoveWindow (disp, parent[0], args[1], args[2]);	3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3585	break;	3554	break;
3586	case 4: /* set size (pixels) */	3555	case 4: /* set size (pixels) */
3587	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588	break;	3557	break;
3589	case 5: /* raise window */	3558	case 5: /* raise window */
3590	XRaiseWindow (disp, parent[0]);	3559	XRaiseWindow (xdisp, parent[0]);
3591	break;	3560	break;
3592	case 6: /* lower window */	3561	case 6: /* lower window */
3593	XLowerWindow (disp, parent[0]);	3562	XLowerWindow (xdisp, parent[0]);
3594	break;	3563	break;
3595	case 7: /* refresh window */	3564	case 7: /* refresh window */
3596	scr_touch (true);	3565	scr_touch (true);
3597	break;	3566	break;
3598	case 8: /* set size (chars) */	3567	case 8: /* set size (chars) */
…		…
3610		3579
3611	/*	3580	/*
3612	* reports - some output format copied from XTerm	3581	* reports - some output format copied from XTerm
3613	*/	3582	*/
3614	case 11: /* report window state */	3583	case 11: /* report window state */
3615	XGetWindowAttributes (disp, parent[0], &wattr);	3584	XGetWindowAttributes (xdisp, parent[0], &wattr);
3616	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617	break;	3586	break;
3618	case 13: /* report window position */	3587	case 13: /* report window position */
3619	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3620	XTranslateCoordinates (disp, parent[0], wattr.root,	3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3621	-wattr.border_width, -wattr.border_width,	3590	-wattr.border_width, -wattr.border_width,
3622	&x, &y, &wdummy);	3591	&x, &y, &wdummy);
3623	tt_printf ("\033[3;%d;%dt", x, y);	3592	tt_printf ("\033[3;%d;%dt", x, y);
3624	break;	3593	break;
3625	case 14: /* report window size (pixels) */	3594	case 14: /* report window size (pixels) */
3626	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (xdisp, parent[0], &wattr);
3627	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628	break;	3597	break;
3629	case 18: /* report text area size (chars) */	3598	case 18: /* report text area size (chars) */
3630	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631	break;	3600	break;
…		…
3633	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634	break;	3603	break;
3635	case 20: /* report icon label */	3604	case 20: /* report icon label */
3636	{	3605	{
3637	char *s;	3606	char *s;
3638	XGetIconName (disp, parent[0], &s);	3607	XGetIconName (xdisp, parent[0], &s);
3639	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3640	XFree (s);	3609	XFree (s);
3641	}	3610	}
3642	break;	3611	break;
3643	case 21: /* report window title */	3612	case 21: /* report window title */
3644	{	3613	{
3645	char *s;	3614	char *s;
3646	XFetchName (disp, parent[0], &s);	3615	XFetchName (xdisp, parent[0], &s);
3647	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3616	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648	XFree (s);	3617	XFree (s);
3649	}	3618	}
3650	break;	3619	break;
3651	}	3620	}
…		…
3752	void	3721	void
3753	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3722	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3754	{	3723	{
3755	if (str[0] == '?' && !str[1])	3724	if (str[0] == '?' && !str[1])
3756	{	3725	{
3757	unsigned short r, g, b;	3726	rxvt_rgba c;
3758	pix_colors_focused[color].get (display, r, g, b);	3727	pix_colors_focused[color].get (this, c);
		3728
		3729	#if XFT
		3730	if (c.a != rxvt_rgba::MAX_CC)
		3731	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3732	else
		3733	#endif
3759	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3734	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3760	}	3735	}
3761	else	3736	else
3762	set_window_color (color, str);	3737	set_window_color (color, str);
3763	}	3738	}
3764		3739
…		…
3770	{	3745	{
3771	int color;	3746	int color;
3772	char buf, name;	3747	char buf, name;
3773	bool query = str[0] == '?' && !str[1];	3748	bool query = str[0] == '?' && !str[1];
3774	int saveop = op;	3749	int saveop = op;
3775	dDisp;	3750
		3751	dLocal (Display *, xdisp);
3776		3752
3777	assert (str != NULL);	3753	assert (str != NULL);
3778	switch (op)	3754	switch (op)
3779	{	3755	{
3780	case XTerm_name:	3756	case XTerm_name:
…		…
3796	unsigned long bytes_after;	3772	unsigned long bytes_after;
3797	unsigned char *value = 0;	3773	unsigned char *value = 0;
3798	const char *str = "";	3774	const char *str = "";
3799		3775
3800	if (prop	3776	if (prop
3801	&& XGetWindowProperty (disp, parent[0],	3777	&& XGetWindowProperty (xdisp, parent[0],
3802	prop, 0, 1<<16, 0, AnyPropertyType,	3778	prop, 0, 1<<16, 0, AnyPropertyType,
3803	&actual_type, &actual_format,	3779	&actual_type, &actual_format,
3804	&nitems, &bytes_after, &value) == Success	3780	&nitems, &bytes_after, &value) == Success
3805	&& actual_type != None	3781	&& actual_type != None
3806	&& actual_format == 8)	3782	&& actual_format == 8)
3807	str = (const char *)(value);	3783	str = (const char *)(value);
3808		3784
3809	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3785	tt_printf ("\033]%d;%s%c", op, str, resp);
3810		3786
3811	XFree (value);	3787	XFree (value);
3812	}	3788	}
3813	else	3789	else
3814	{	3790	{
…		…
3818	{	3794	{
3819	*eq = 0;	3795	*eq = 0;
3820	set_utf8_property (display->atom (str), eq + 1);	3796	set_utf8_property (display->atom (str), eq + 1);
3821	}	3797	}
3822	else	3798	else
3823	XDeleteProperty (disp, parent[0],	3799	XDeleteProperty (xdisp, parent[0],
3824	display->atom (str));	3800	display->atom (str));
3825	}	3801	}
3826	break;	3802	break;
3827		3803
3828	case XTerm_Color:	3804	case XTerm_Color:
…		…
3838	break;	3814	break;
3839		3815
3840	if ((buf = strchr (name, ';')) != NULL)	3816	if ((buf = strchr (name, ';')) != NULL)
3841	*buf++ = '\0';	3817	*buf++ = '\0';
3842		3818
3843	if (name[0] == '?' && !name[1])	3819	process_color_seq (op, color, name, resp);
3844	{
3845	unsigned short r, g, b;
3846	pix_colors_focused[color].get (display, r, g, b);
3847	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3848	}
3849	else
3850	set_window_color (color, name);
3851	}	3820	}
3852	break;	3821	break;
3853	case XTerm_Color00:	3822	case XTerm_Color00:
3854	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3823	process_color_seq (op, Color_fg, str, resp);
3855	break;	3824	break;
3856	case XTerm_Color01:	3825	case XTerm_Color01:
3857	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3826	process_color_seq (op, Color_bg, str, resp);
3858	break;	3827	break;
3859	#ifndef NO_CURSORCOLOR	3828	#ifndef NO_CURSORCOLOR
3860	case XTerm_Color_cursor:	3829	case XTerm_Color_cursor:
3861	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3830	process_color_seq (op, Color_cursor, str, resp);
3862	break;	3831	break;
3863	#endif	3832	#endif
3864	case XTerm_Color_pointer_fg:	3833	case XTerm_Color_pointer_fg:
3865	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3834	process_color_seq (op, Color_pointer_fg, str, resp);
3866	break;	3835	break;
3867	case XTerm_Color_pointer_bg:	3836	case XTerm_Color_pointer_bg:
3868	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3837	process_color_seq (op, Color_pointer_bg, str, resp);
3869	break;	3838	break;
3870	#ifndef NO_BOLD_UNDERLINE_REVERSE	3839	#ifndef NO_BOLD_UNDERLINE_REVERSE
3871	case XTerm_Color_RV:	3840	case XTerm_Color_RV:
3872	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3841	process_color_seq (op, Color_RV, str, resp);
3873	break;	3842	break;
3874	case Rxvt_Color_BD:	3843	case Rxvt_Color_BD:
3875	case URxvt_Color_BD:	3844	case URxvt_Color_BD:
3876	process_color_seq (op, Color_BD, str, resp);	3845	process_color_seq (op, Color_BD, str, resp);
3877	break;	3846	break;
3878	case Rxvt_Color_UL:	3847	case Rxvt_Color_UL:
3879	case URxvt_Color_UL:	3848	case URxvt_Color_UL:
3880	process_color_seq (op, Color_UL, str, resp);	3849	process_color_seq (op, Color_UL, str, resp);
3881	break;	3850	break;
3882	case URxvt_Color_IT:	3851	case URxvt_Color_IT:
3883	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3852	process_color_seq (op, Color_IT, str, resp);
3884	break;	3853	break;
3885	#endif	3854	#endif
3886	#if TRANSPARENT && TINTING	3855	#if TRANSPARENT && TINTING
3887	case URxvt_Color_tint:	3856	case URxvt_Color_tint:
3888	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3857	process_color_seq (op, Color_tint, str, resp);
3889	check_our_parents ();	3858	check_our_parents ();
3890	if (am_transparent)	3859	if (am_transparent)
3891	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3892	break;	3861	break;
3893	#endif	3862	#endif
…		…
3967	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
3968	set_fonts ();	3937	set_fonts ();
3969	}	3938	}
3970	break;	3939	break;
3971		3940
3972	#if ENABLE_FRILLS	3941	case URxvt_version:
		3942	if (query)
		3943	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3944	op,
		3945	rs[Rs_name], VERSION[0], VERSION[2],
		3946	resp);
		3947	break;
		3948
		3949	#if !ENABLE_MINIMAL
3973	case URxvt_locale:	3950	case URxvt_locale:
3974	if (query)	3951	if (query)
3975	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3976	else	3953	else
3977	{	3954	{
3978	set_locale (str);	3955	set_locale (str);
3979	pty->set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
3980	init_xlocale ();	3957	init_xlocale ();
…		…
4037	return state;	4014	return state;
4038	}	4015	}
4039		4016
4040	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4041	void	4018	void
4042	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4019	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4043	{	4020	{
4044	unsigned int i, j;	4021	unsigned int i, j;
4045	int state;	4022	int state;
4046		4023
4047	static const struct	4024	static const struct
…		…
4341	scr_color (Color_bg, Color_bg);	4318	scr_color (Color_bg, Color_bg);
4342	break;	4319	break;
4343		4320
4344	//case 50: // not variable spacing	4321	//case 50: // not variable spacing
4345		4322
4346	#if ENABLE_FRILLS	4323	#if !ENABLE_MINIMAL
4347	case 90:	4324	case 90:
4348	case 91: /* set bright fg color */	4325	case 91: /* set bright fg color */
4349	case 92:	4326	case 92:
4350	case 93:	4327	case 93:
4351	case 94:	4328	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC vs. Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC