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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
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, Sel_Primary);	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;
2160		2128
2161	case Button2:	2129	case Button2:
2162	if (IN_RANGE_EXC (ev.x, 0, width)	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2164	{
2165	if (ev.state & ShiftMask)
2166	selection_request (ev.time, Sel_Clipboard);
2167	else
2168	selection_request (ev.time, Sel_Primary);
2169	}
2170	break;	2132	break;
2171		2133
2172	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2173	case Button4:	2135	case Button4:
2174	case Button5:	2136	case Button5:
…		…
2216	#if TINTING	2178	#if TINTING
2217	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2218		2180
2219	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2220		2182
2221	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)
2222	{	2184	{
2223	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2224	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2225	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2226	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2227	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2228	int i;	2190	int i;
2229		2191
2230	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2231		2193
2232	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2233		2195
2234	/* for convenience */	2196	/* for convenience */
2235	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2456	Atom atype;	2418	Atom atype;
2457	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2458	Window root, oldp, *list;	2420	Window root, oldp, *list;
2459	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2460	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2461	dDisp;
2462		2423
2463	pchanged = 0;	2424	pchanged = 0;
2464		2425
2465	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2466	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2467		2428
2468	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2469	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2470		2431
2471	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2472		2433
2473	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2474	{	2435	{
2475	if (am_transparent)	2436	if (am_transparent)
2476	{	2437	{
2477	pchanged = 1;	2438	pchanged = 1;
2478	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2479	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2480	}	2441	}
2481		2442
2482	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2483	}	2444	}
2484		2445
2485	/* 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. */
2486	XSync (disp, False);	2447	XSync (xdisp, False);
2487		2448
2488	/*	2449	/*
2489	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2490	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2491	* 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.
2492	*/	2453	*/
2493	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2494	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2495	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2496	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2497		2458
2498	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2499	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2500	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2501	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2502	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2503		2464
2504	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2505	#if TINTING	2466	#if TINTING
2506	\|\| !rs[Rs_color + Color_tint]	2467	\|\| !ISSET_PIXCOLOR (Color_tint)
2507	#endif	2468	#endif
2508	)	2469	)
2509	have_pixmap = 0;	2470	have_pixmap = 0;
2510	else	2471	else
2511	{	2472	{
…		…
2524	Window cr;	2485	Window cr;
2525	XImage *image;	2486	XImage *image;
2526	GC gc;	2487	GC gc;
2527	XGCValues gcvalue;	2488	XGCValues gcvalue;
2528		2489
2529	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2530	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2531	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2532	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2533	nx = ny = 0;	2494	nx = ny = 0;
2534		2495
…		…
2547	}	2508	}
2548		2509
2549	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2550	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2551		2512
2552	XSync (disp, False);	2513	XSync (xdisp, False);
2553	allowedxerror = -1;	2514	allowedxerror = -1;
2554	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2555		2516
2556	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2557	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2558	allowedxerror = 0;	2519	allowedxerror = 0;
2559		2520
…		…
2562	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2563	{	2524	{
2564	pchanged = 1;	2525	pchanged = 1;
2565	if (pixmap != None)	2526	if (pixmap != None)
2566	{	2527	{
2567	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2568	pixmap = None;	2529	pixmap = None;
2569	}	2530	}
2570	}	2531	}
2571		2532
2572	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2573	}	2534	}
2574	else	2535	else
2575	{	2536	{
2576	if (pixmap != None)	2537	if (pixmap != None)
2577	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2578		2539
2579	#if TINTING	2540	#if TINTING
2580	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2581	{	2542	{
2582	unsigned short rm, gm, bm;
2583	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2543	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2584		2544
		2545	rgba c;
2585	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused [Color_tint].get (this, c);
2586		2547
2587	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2588	}	2549	}
2589	#endif	2550	#endif
2590		2551
2591	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2592	szHint.width, szHint.height, image->depth);
2593	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2594	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2595	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2596	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2597	XDestroyImage (image);	2557	XDestroyImage (image);
2598	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2599	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2600		2560
2601	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2602	pchanged = 1;	2562	pchanged = 1;
2603		2563
2604	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2605	}	2565	}
2606	}	2566	}
2607		2567
2608	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2609	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2610	else	2570	else
2611	{	2571	{
2612	unsigned int n;	2572	unsigned int n;
2613	/*	2573	/*
2614	* InheritPixmap transparency	2574	* InheritPixmap transparency
2615	*/	2575	*/
2616	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2617	{	2577	{
2618	oldp = parent[i];	2578	oldp = parent[i];
2619	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2620	&parent[i], &list, &n);
2621	XFree (list);	2580	XFree (list);
2622		2581
2623	if (parent[i] == display->root)	2582	if (parent[i] == display->root)
2624	{	2583	{
2625	if (oldp != None)	2584	if (oldp != None)
…		…
2633	}	2592	}
2634		2593
2635	n = 0;	2594	n = 0;
2636		2595
2637	if (pchanged)	2596	if (pchanged)
2638	{
2639	for (; n < (unsigned int)i; n++)	2597	for (; n < (unsigned int)i; n++)
2640	{	2598	{
2641	XGetWindowAttributes (disp, parent[n], &wattr);	2599	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2600
2642	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2601	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2643	{	2602	{
2644	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2603	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2645	break;	2604	break;
2646	}	2605	}
2647	}	2606	}
2648	}
2649		2607
2650	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2608	if (n > (sizeof (parent) / sizeof (parent[0])))
2651	{	2609	{
2652	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2610	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2653	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2611	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2654	am_transparent = 0;	2612	am_transparent = 0;
2655	/* XXX: also turn off Opt_transparent? */	2613	/* XXX: also turn off Opt_transparent? */
2656	}	2614	}
2657	else	2615	else
2658	{	2616	{
2659	#if WAIT_FOR_WM
2660	/* wait (an arbitrary period) for the WM to do its thing
2661	* needed for fvwm2.2.2 (and before?) */
2662	sleep (1);
2663	#endif
2664	for (n = 0; n < (unsigned int)i; n++)	2617	for (n = 0; n < (unsigned int)i; n++)
2665	{	2618	{
2666	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2619	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2667	XClearWindow (disp, parent[n]);	2620	XClearWindow (xdisp, parent[n]);
2668	}	2621	}
2669		2622
2670	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2623	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2671	am_transparent = 1;	2624	am_transparent = 1;
2672	}	2625	}
2673		2626
2674	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2627	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2675	parent[i] = None;	2628	parent[i] = None;
2676	}	2629	}
2677		2630
2678	if (scrollBar.win)	2631	if (scrollBar.win)
2679	{	2632	{
2680	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2633	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2681	scrollBar.setIdle ();	2634	scrollBar.setIdle ();
2682	scrollbar_show (0);	2635	scrollbar_show (0);
2683	}	2636	}
2684		2637
2685	if (am_transparent)	2638	if (am_transparent)
…		…
2831	return flag;	2784	return flag;
2832	}	2785	}
2833		2786
2834	// read the next character	2787	// read the next character
2835	wchar_t	2788	wchar_t
2836	rxvt_term::next_char ()	2789	rxvt_term::next_char () NOTHROW
2837	{	2790	{
2838	while (cmdbuf_ptr < cmdbuf_endp)	2791	while (cmdbuf_ptr < cmdbuf_endp)
2839	{	2792	{
2840	// assume 7-bit to be ascii ALWAYS	2793	// assume 7-bit to be ascii ALWAYS
2841	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2794	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2862	return NOCHAR;	2815	return NOCHAR;
2863	}	2816	}
2864		2817
2865	// read the next octet	2818	// read the next octet
2866	uint32_t	2819	uint32_t
2867	rxvt_term::next_octet ()	2820	rxvt_term::next_octet () NOTHROW
2868	{	2821	{
2869	return cmdbuf_ptr < cmdbuf_endp	2822	return cmdbuf_ptr < cmdbuf_endp
2870	? (unsigned char)*cmdbuf_ptr++	2823	? (unsigned char)*cmdbuf_ptr++
2871	: NOCHAR;	2824	: NOCHAR;
2872	}	2825	}
		2826
		2827	static class out_of_input out_of_input;
2873		2828
2874	/* rxvt_cmd_getc () - Return next input character */	2829	/* rxvt_cmd_getc () - Return next input character */
2875	/*	2830	/*
2876	* Return the next input character after first passing any keyboard input	2831	* Return the next input character after first passing any keyboard input
2877	* to the command.	2832	* to the command.
2878	*/	2833	*/
2879	wchar_t	2834	wchar_t
2880	rxvt_term::cmd_getc ()	2835	rxvt_term::cmd_getc () THROW ((class out_of_input))
2881	{	2836	{
2882	wchar_t c = next_char ();	2837	wchar_t c = next_char ();
2883		2838
2884	if (c == NOCHAR)	2839	if (c == NOCHAR)
2885	throw out_of_input;	2840	throw out_of_input;
2886		2841
2887	return c;	2842	return c;
2888	}	2843	}
2889		2844
2890	uint32_t	2845	uint32_t
2891	rxvt_term::cmd_get8 ()	2846	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2892	{	2847	{
2893	uint32_t c = next_octet ();	2848	uint32_t c = next_octet ();
2894		2849
2895	if (c == NOCHAR)	2850	if (c == NOCHAR)
2896	throw out_of_input;	2851	throw out_of_input;
…		…
3134	scr_charset_set (2, (unsigned int)cmd_getc ());	3089	scr_charset_set (2, (unsigned int)cmd_getc ());
3135	break;	3090	break;
3136	case '+':	3091	case '+':
3137	scr_charset_set (3, (unsigned int)cmd_getc ());	3092	scr_charset_set (3, (unsigned int)cmd_getc ());
3138	break;	3093	break;
3139	#if ENABLE_FRILLS	3094	#if !ENABLE_MINIMAL
3140	case '6':	3095	case '6':
3141	scr_backindex ();	3096	scr_backindex ();
3142	break;	3097	break;
3143	#endif	3098	#endif
3144	case '7':	3099	case '7':
3145	scr_cursor (SAVE);	3100	scr_cursor (SAVE);
3146	break;	3101	break;
3147	case '8':	3102	case '8':
3148	scr_cursor (RESTORE);	3103	scr_cursor (RESTORE);
3149	break;	3104	break;
3150	#if ENABLE_FRILLS	3105	#if !ENABLE_MINIMAL
3151	case '9':	3106	case '9':
3152	scr_forwardindex ();	3107	scr_forwardindex ();
3153	break;	3108	break;
3154	#endif	3109	#endif
3155	case '=':	3110	case '=':
…		…
3317	ndef = get_byte_array_bit (csi_defaults, i);	3272	ndef = get_byte_array_bit (csi_defaults, i);
3318	for (p = 0; p < nargs; p++)	3273	for (p = 0; p < nargs; p++)
3319	if (arg[p] == -1)	3274	if (arg[p] == -1)
3320	arg[p] = ndef;	3275	arg[p] = ndef;
3321		3276
3322	#ifdef DEBUG_CMD
3323	fprintf (stderr, "CSI ");
3324	for (p = 0; p < nargs; p++)
3325	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3326	fprintf (stderr, "%c\n", ch);
3327	#endif
3328
3329	/*	3277	/*
3330	* private mode handling	3278	* private mode handling
3331	*/	3279	*/
3332	if (priv)	3280	if (priv)
3333	{	3281	{
3334	switch (priv)	3282	switch (priv)
3335	{	3283	{
3336	case '>':	3284	case '>':
3337	if (ch == CSI_DA) /* secondary device attributes */	3285	if (ch == CSI_DA) /* secondary device attributes */
3338	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3286	{
		3287	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3288	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3289	//
		3290	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3291	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3292	// that we do not support xterm mouse reporting (should be 95 when we do).
		3293	//
		3294	tt_printf ("\033[>%d;94;0c", 'U');
		3295	}
3339	break;	3296	break;
3340	case '?':	3297	case '?':
3341	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3298	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3342	process_terminal_mode (ch, priv, nargs, arg);	3299	process_terminal_mode (ch, priv, nargs, arg);
3343	break;	3300	break;
…		…
3546	break;	3503	break;
3547	case CSI_75:	3504	case CSI_75:
3548	scr_cursor (RESTORE);	3505	scr_cursor (RESTORE);
3549	break;	3506	break;
3550		3507
3551	#if ENABLE_FRILLS	3508	#if !ENABLE_MINIMAL
3552	case CSI_74:	3509	case CSI_74:
3553	process_window_ops (arg, nargs);	3510	process_window_ops (arg, nargs);
3554	break;	3511	break;
3555	#endif	3512	#endif
3556		3513
…		…
3563	break;	3520	break;
3564	}	3521	}
3565	}	3522	}
3566	/}}} /	3523	/}}} /
3567		3524
3568	#if ENABLE_FRILLS	3525	#if !ENABLE_MINIMAL
3569	/* ARGSUSED */	3526	/* ARGSUSED */
3570	void	3527	void
3571	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3528	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3572	{	3529	{
3573	int x, y;	3530	int x, y;
3574	XWindowAttributes wattr;	3531	XWindowAttributes wattr;
3575	Window wdummy;	3532	Window wdummy;
3576	dDisp;	3533
		3534	dLocal (Display *, xdisp);
3577		3535
3578	if (nargs == 0)	3536	if (nargs == 0)
3579	return;	3537	return;
3580		3538
3581	switch (args[0])	3539	switch (args[0])
3582	{	3540	{
3583	/*	3541	/*
3584	* commands	3542	* commands
3585	*/	3543	*/
3586	case 1: /* deiconify window */	3544	case 1: /* deiconify window */
3587	XMapWindow (disp, parent[0]);	3545	XMapWindow (xdisp, parent[0]);
3588	break;	3546	break;
3589	case 2: /* iconify window */	3547	case 2: /* iconify window */
3590	XIconifyWindow (disp, parent[0], display->screen);	3548	XIconifyWindow (xdisp, parent[0], display->screen);
3591	break;	3549	break;
3592	case 3: /* set position (pixels) */	3550	case 3: /* set position (pixels) */
3593	XMoveWindow (disp, parent[0], args[1], args[2]);	3551	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3594	break;	3552	break;
3595	case 4: /* set size (pixels) */	3553	case 4: /* set size (pixels) */
3596	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3554	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3597	break;	3555	break;
3598	case 5: /* raise window */	3556	case 5: /* raise window */
3599	XRaiseWindow (disp, parent[0]);	3557	XRaiseWindow (xdisp, parent[0]);
3600	break;	3558	break;
3601	case 6: /* lower window */	3559	case 6: /* lower window */
3602	XLowerWindow (disp, parent[0]);	3560	XLowerWindow (xdisp, parent[0]);
3603	break;	3561	break;
3604	case 7: /* refresh window */	3562	case 7: /* refresh window */
3605	scr_touch (true);	3563	scr_touch (true);
3606	break;	3564	break;
3607	case 8: /* set size (chars) */	3565	case 8: /* set size (chars) */
…		…
3614	if (args[0] >= 24) /* set height (chars) */	3572	if (args[0] >= 24) /* set height (chars) */
3615	set_widthheight ((unsigned int)width,	3573	set_widthheight ((unsigned int)width,
3616	(unsigned int) (args[1] * fheight));	3574	(unsigned int) (args[1] * fheight));
3617	break;	3575	break;
3618		3576
3619
3620	/*	3577	/*
3621	* reports - some output format copied from XTerm	3578	* reports - some output format copied from XTerm
3622	*/	3579	*/
3623	case 11: /* report window state */	3580	case 11: /* report window state */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3625	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3582	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3626	break;	3583	break;
3627	case 13: /* report window position */	3584	case 13: /* report window position */
3628	XGetWindowAttributes (disp, parent[0], &wattr);	3585	XGetWindowAttributes (xdisp, parent[0], &wattr);
3629	XTranslateCoordinates (disp, parent[0], wattr.root,	3586	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3630	-wattr.border_width, -wattr.border_width,	3587	-wattr.border_width, -wattr.border_width,
3631	&x, &y, &wdummy);	3588	&x, &y, &wdummy);
3632	tt_printf ("\033[3;%d;%dt", x, y);	3589	tt_printf ("\033[3;%d;%dt", x, y);
3633	break;	3590	break;
3634	case 14: /* report window size (pixels) */	3591	case 14: /* report window size (pixels) */
3635	XGetWindowAttributes (disp, parent[0], &wattr);	3592	XGetWindowAttributes (xdisp, parent[0], &wattr);
3636	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3593	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3637	break;	3594	break;
3638	case 18: /* report text area size (chars) */	3595	case 18: /* report text area size (chars) */
3639	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3596	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3640	break;	3597	break;
…		…
3642	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3643	break;	3600	break;
3644	case 20: /* report icon label */	3601	case 20: /* report icon label */
3645	{	3602	{
3646	char *s;	3603	char *s;
3647	XGetIconName (disp, parent[0], &s);	3604	XGetIconName (xdisp, parent[0], &s);
3648	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3605	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3649	XFree (s);	3606	XFree (s);
3650	}	3607	}
3651	break;	3608	break;
3652	case 21: /* report window title */	3609	case 21: /* report window title */
3653	{	3610	{
3654	char *s;	3611	char *s;
3655	XFetchName (disp, parent[0], &s);	3612	XFetchName (xdisp, parent[0], &s);
3656	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3613	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3657	XFree (s);	3614	XFree (s);
3658	}	3615	}
3659	break;	3616	break;
3660	}	3617	}
…		…
3761	void	3718	void
3762	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3719	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3763	{	3720	{
3764	if (str[0] == '?' && !str[1])	3721	if (str[0] == '?' && !str[1])
3765	{	3722	{
3766	unsigned short r, g, b;	3723	rgba c;
3767	pix_colors_focused[color].get (display, r, g, b);	3724	pix_colors_focused[color].get (this, c);
		3725
		3726	#if XFT
		3727	if (c.a != rgba::MAX_CC)
		3728	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3729	else
		3730	#endif
3768	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3731	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3769	}	3732	}
3770	else	3733	else
3771	set_window_color (color, str);	3734	set_window_color (color, str);
3772	}	3735	}
3773		3736
…		…
3779	{	3742	{
3780	int color;	3743	int color;
3781	char buf, name;	3744	char buf, name;
3782	bool query = str[0] == '?' && !str[1];	3745	bool query = str[0] == '?' && !str[1];
3783	int saveop = op;	3746	int saveop = op;
3784	dDisp;	3747
		3748	dLocal (Display *, xdisp);
3785		3749
3786	assert (str != NULL);	3750	assert (str != NULL);
3787	switch (op)	3751	switch (op)
3788	{	3752	{
3789	case XTerm_name:	3753	case XTerm_name:
…		…
3805	unsigned long bytes_after;	3769	unsigned long bytes_after;
3806	unsigned char *value = 0;	3770	unsigned char *value = 0;
3807	const char *str = "";	3771	const char *str = "";
3808		3772
3809	if (prop	3773	if (prop
3810	&& XGetWindowProperty (disp, parent[0],	3774	&& XGetWindowProperty (xdisp, parent[0],
3811	prop, 0, 1<<16, 0, AnyPropertyType,	3775	prop, 0, 1<<16, 0, AnyPropertyType,
3812	&actual_type, &actual_format,	3776	&actual_type, &actual_format,
3813	&nitems, &bytes_after, &value) == Success	3777	&nitems, &bytes_after, &value) == Success
3814	&& actual_type != None	3778	&& actual_type != None
3815	&& actual_format == 8)	3779	&& actual_format == 8)
3816	str = (const char *)(value);	3780	str = (const char *)(value);
3817		3781
3818	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3782	tt_printf ("\033]%d;%s%c", op, str, resp);
3819		3783
3820	XFree (value);	3784	XFree (value);
3821	}	3785	}
3822	else	3786	else
3823	{	3787	{
…		…
3827	{	3791	{
3828	*eq = 0;	3792	*eq = 0;
3829	set_utf8_property (display->atom (str), eq + 1);	3793	set_utf8_property (display->atom (str), eq + 1);
3830	}	3794	}
3831	else	3795	else
3832	XDeleteProperty (disp, parent[0],	3796	XDeleteProperty (xdisp, parent[0],
3833	display->atom (str));	3797	display->atom (str));
3834	}	3798	}
3835	break;	3799	break;
3836		3800
3837	case XTerm_Color:	3801	case XTerm_Color:
…		…
3847	break;	3811	break;
3848		3812
3849	if ((buf = strchr (name, ';')) != NULL)	3813	if ((buf = strchr (name, ';')) != NULL)
3850	*buf++ = '\0';	3814	*buf++ = '\0';
3851		3815
3852	if (name[0] == '?' && !name[1])	3816	process_color_seq (op, color, name, resp);
3853	{
3854	unsigned short r, g, b;
3855	pix_colors_focused[color].get (display, r, g, b);
3856	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3857	}
3858	else
3859	set_window_color (color, name);
3860	}	3817	}
3861	break;	3818	break;
3862	case XTerm_Color00:	3819	case XTerm_Color00:
3863	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3820	process_color_seq (op, Color_fg, str, resp);
3864	break;	3821	break;
3865	case XTerm_Color01:	3822	case XTerm_Color01:
3866	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3823	process_color_seq (op, Color_bg, str, resp);
3867	break;	3824	break;
3868	#ifndef NO_CURSORCOLOR	3825	#ifndef NO_CURSORCOLOR
3869	case XTerm_Color_cursor:	3826	case XTerm_Color_cursor:
3870	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3827	process_color_seq (op, Color_cursor, str, resp);
3871	break;	3828	break;
3872	#endif	3829	#endif
3873	case XTerm_Color_pointer_fg:	3830	case XTerm_Color_pointer_fg:
3874	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3831	process_color_seq (op, Color_pointer_fg, str, resp);
3875	break;	3832	break;
3876	case XTerm_Color_pointer_bg:	3833	case XTerm_Color_pointer_bg:
3877	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3834	process_color_seq (op, Color_pointer_bg, str, resp);
3878	break;	3835	break;
3879	#ifndef NO_BOLD_UNDERLINE_REVERSE	3836	#ifndef NO_BOLD_UNDERLINE_REVERSE
3880	case XTerm_Color_RV:	3837	case XTerm_Color_RV:
3881	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3838	process_color_seq (op, Color_RV, str, resp);
3882	break;	3839	break;
3883	case Rxvt_Color_BD:	3840	case Rxvt_Color_BD:
3884	case URxvt_Color_BD:	3841	case URxvt_Color_BD:
3885	process_color_seq (op, Color_BD, str, resp);	3842	process_color_seq (op, Color_BD, str, resp);
3886	break;	3843	break;
3887	case Rxvt_Color_UL:	3844	case Rxvt_Color_UL:
3888	case URxvt_Color_UL:	3845	case URxvt_Color_UL:
3889	process_color_seq (op, Color_UL, str, resp);	3846	process_color_seq (op, Color_UL, str, resp);
3890	break;	3847	break;
3891	case URxvt_Color_IT:	3848	case URxvt_Color_IT:
3892	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3849	process_color_seq (op, Color_IT, str, resp);
3893	break;	3850	break;
3894	#endif	3851	#endif
3895	#if TRANSPARENT && TINTING	3852	#if TRANSPARENT && TINTING
3896	case URxvt_Color_tint:	3853	case URxvt_Color_tint:
3897	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3854	process_color_seq (op, Color_tint, str, resp);
		3855
3898	check_our_parents ();	3856	check_our_parents ();
		3857
3899	if (am_transparent)	3858	if (am_transparent)
3900	want_full_refresh = want_refresh = 1;	3859	want_full_refresh = want_refresh = 1;
		3860
3901	break;	3861	break;
3902	#endif	3862	#endif
3903		3863
3904	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
3905	{	3865	{
…		…
3976	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
3977	set_fonts ();	3937	set_fonts ();
3978	}	3938	}
3979	break;	3939	break;
3980		3940
3981	#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
3982	case URxvt_locale:	3950	case URxvt_locale:
3983	if (query)	3951	if (query)
3984	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);
3985	else	3953	else
3986	{	3954	{
3987	set_locale (str);	3955	set_locale (str);
3988	pty->set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
3989	init_xlocale ();	3957	init_xlocale ();
…		…
4046	return state;	4014	return state;
4047	}	4015	}
4048		4016
4049	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4050	void	4018	void
4051	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)
4052	{	4020	{
4053	unsigned int i, j;	4021	unsigned int i, j;
4054	int state;	4022	int state;
4055		4023
4056	static const struct	4024	static const struct
…		…
4350	scr_color (Color_bg, Color_bg);	4318	scr_color (Color_bg, Color_bg);
4351	break;	4319	break;
4352		4320
4353	//case 50: // not variable spacing	4321	//case 50: // not variable spacing
4354		4322
4355	#if ENABLE_FRILLS	4323	#if !ENABLE_MINIMAL
4356	case 90:	4324	case 90:
4357	case 91: /* set bright fg color */	4325	case 91: /* set bright fg color */
4358	case 92:	4326	case 92:
4359	case 93:	4327	case 93:
4360	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.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs. Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC