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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 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;
1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505	}	1469	}
1506		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1507	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1509	check_our_parents ();	1475	check_our_parents ();
1510	#endif	1476	#endif
1511	}	1477	}
1512	break;	1478	break;
1513		1479
1514	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1517	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1518		1485
1519	break;	1486	break;
1520		1487
1521	case SelectionClear:	1488	case SelectionClear:
1522	selection_clear ();	1489	selection_clear ();
…		…
1558	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1559	{	1526	{
1560	do	1527	do
1561	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1562	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1563	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1564		1531
1565	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566		1533
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1570		1537
1571	want_refresh = 1;	1538	want_refresh = 1;
1572	}	1539	}
1573	else	1540	else
1574	{	1541	{
1575	XEvent unused_event;	1542	XEvent unused_event;
1576		1543
1577	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1578	;	1545	;
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1580	;	1547	;
1581		1548
1582	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1583	{	1550	{
1584	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1585	scrollbar_show (0);	1552	scrollbar_show (0);
1586	}	1553	}
1587		1554
1588	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1589	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1590	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1591	#endif	1558	#endif
1592	}	1559	}
1593	break;	1560	break;
1594		1561
1595	case MotionNotify:	1562	case MotionNotify:
…		…
1605	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607	; // nop	1574	; // nop
1608	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1609	{	1576	{
1610	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1611	;	1578	;
1612		1579
1613	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1614	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1615	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1616	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1617	&ev.xbutton.state);	1584	&ev.xbutton.state);
1618	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1682	#endif	1649	#endif
1683	}	1650	}
1684	}	1651	}
1685	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686	{	1653	{
1687	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1688	MotionNotify, &ev))	1655	MotionNotify, &ev))
1689	;	1656	;
1690		1657
1691	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1692	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1693	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1694	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1695	&unused_mask);	1662	&unused_mask);
1696	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1711	{	1678	{
1712	hidden_cursor = 0;	1679	hidden_cursor = 0;
1713	want_refresh = 1;	1680	want_refresh = 1;
1714	}	1681	}
1715		1682
1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717	}	1684	}
1718	#endif	1685	#endif
1719		1686
1720	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1721	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1749	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1750	}	1717	}
1751	#endif	1718	#endif
1752	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1753	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1754	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755	#endif	1722	#endif
1756	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1757	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1758	{	1725	{
1759	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1840	/*	1807	/*
1841	* VT window processing of button press	1808	* VT window processing of button press
1842	*/	1809	*/
1843	if (ev.window == vt)	1810	if (ev.window == vt)
1844	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1845	#if ISO_14755	1815	#if ISO_14755
1846	// 5.4	1816	// 5.4
1847	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1848	{	1818	{
1849	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1891	else	1861	else
1892	{	1862	{
1893	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1894	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1895		1865
1896	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897	switch (ev.button)	1866	switch (ev.button)
1898	{	1867	{
1899	case Button1:	1868	case Button1:
1900	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1901	/* should be done in screen.C */	1870	/* should be done in screen.C */
1902	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1903	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1904	#else	1873	#else
1905	selection.rect = false;	1874	selection.rect = false;
1906	#endif	1875	#endif
1907		1876
1908	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1909	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910	{	1879	{
1911	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1912	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1913	else	1882	else
1914	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1915	}	1884	}
1916	else	1885	else
1917	{	1886	{
1918	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1919	MEvent.clicks++;	1888	MEvent.clicks++;
1920	else	1889	else
1921	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1922		1891
1923	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1924	}	1893	}
1925		1894
1926	MEvent.button = Button1;	1895	MEvent.button = Button1;
1927	break;	1896	break;
1928		1897
1929	case Button3:	1898	case Button3:
1930	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1931	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1932	else	1901	else
1933	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1934		1903
1935	MEvent.button = Button3;	1904	MEvent.button = Button3;
1936	break;	1905	break;
1937	}	1906	}
1938	}	1907	}
1939		1908
1940	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1941	return;	1910	return;
1942	}	1911	}
1943		1912
…		…
2106	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2107	#endif	2076	#endif
2108		2077
2109	if (ev.window == vt)	2078	if (ev.window == vt)
2110	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2111	#if ISO_14755	2083	#if ISO_14755
2112	// 5.4	2084	// 5.4
2113	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2114	return;	2086	return;
2115	#endif	2087	#endif
		2088
2116	if (reportmode)	2089	if (reportmode)
2117	{	2090	{
2118	/* mouse report from vt window */	2091	/* mouse report from vt window */
2119	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2120	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2144	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2145	&& bypass_keystate	2118	&& bypass_keystate
2146	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2147	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2148		2121
2149	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150	return;
2151
2152	switch (ev.button)	2122	switch (ev.button)
2153	{	2123	{
2154	case Button1:	2124	case Button1:
2155	case Button3:	2125	case Button3:
2156	selection_make (ev.time);	2126	selection_make (ev.time);
2157	break;	2127	break;
		2128
2158	case Button2:	2129	case Button2:
2159	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);
2160	break;	2132	break;
		2133
2161	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2162	case Button4:	2135	case Button4:
2163	case Button5:	2136	case Button5:
2164	{	2137	{
2165	int i;	2138	int i;
…		…
2205	#if TINTING	2178	#if TINTING
2206	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2207		2180
2208	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2209		2182
2210	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)
2211	{	2184	{
2212	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2213	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2214	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2215	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217	int i;	2190	int i;
2218		2191
2219	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2220		2193
2221	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2222		2195
2223	/* for convenience */	2196	/* for convenience */
2224	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2445	Atom atype;	2418	Atom atype;
2446	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2447	Window root, oldp, *list;	2420	Window root, oldp, *list;
2448	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2449	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2450	dDisp;
2451		2423
2452	pchanged = 0;	2424	pchanged = 0;
2453		2425
2454	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2455	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2456		2428
2457	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2458	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2459		2431
2460	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2461		2433
2462	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2463	{	2435	{
2464	if (am_transparent)	2436	if (am_transparent)
2465	{	2437	{
2466	pchanged = 1;	2438	pchanged = 1;
2467	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2468	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2469	}	2441	}
2470		2442
2471	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2472	}	2444	}
2473		2445
2474	/* 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. */
2475	XSync (disp, False);	2447	XSync (xdisp, False);
2476		2448
2477	/*	2449	/*
2478	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2479	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2480	* 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.
2481	*/	2453	*/
2482	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2483	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2486		2458
2487	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2488	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2492		2464
2493	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2494	#if TINTING	2466	#if TINTING
…		…
2513	Window cr;	2485	Window cr;
2514	XImage *image;	2486	XImage *image;
2515	GC gc;	2487	GC gc;
2516	XGCValues gcvalue;	2488	XGCValues gcvalue;
2517		2489
2518	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2519	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2520	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2521	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2522	nx = ny = 0;	2494	nx = ny = 0;
2523		2495
…		…
2536	}	2508	}
2537		2509
2538	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2539	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2540		2512
2541	XSync (disp, False);	2513	XSync (xdisp, False);
2542	allowedxerror = -1;	2514	allowedxerror = -1;
2543	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544		2516
2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2546	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2547	allowedxerror = 0;	2519	allowedxerror = 0;
2548		2520
…		…
2551	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2552	{	2524	{
2553	pchanged = 1;	2525	pchanged = 1;
2554	if (pixmap != None)	2526	if (pixmap != None)
2555	{	2527	{
2556	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2557	pixmap = None;	2529	pixmap = None;
2558	}	2530	}
2559	}	2531	}
2560		2532
2561	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2562	}	2534	}
2563	else	2535	else
2564	{	2536	{
2565	if (pixmap != None)	2537	if (pixmap != None)
2566	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2567		2539
2568	#if TINTING	2540	#if TINTING
2569	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2570	{	2542	{
2571	unsigned short rm, gm, bm;	2543	rxvt_rgba c;
2572	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2544	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573		2545
2574	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused[Color_tint].get (this, c);
2575		2547
2576	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577	}	2549	}
2578	#endif	2550	#endif
2579		2551
2580	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2581	szHint.width, szHint.height, image->depth);
2582	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2583	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2584	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2585	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2586	XDestroyImage (image);	2557	XDestroyImage (image);
2587	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2588	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2589		2560
2590	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2591	pchanged = 1;	2562	pchanged = 1;
2592		2563
2593	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2594	}	2565	}
2595	}	2566	}
2596		2567
2597	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2599	else	2570	else
2600	{	2571	{
2601	unsigned int n;	2572	unsigned int n;
2602	/*	2573	/*
2603	* InheritPixmap transparency	2574	* InheritPixmap transparency
2604	*/	2575	*/
2605	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606	{	2577	{
2607	oldp = parent[i];	2578	oldp = parent[i];
2608	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root,
2609	&parent[i], &list, &n);	2580	&parent[i], &list, &n);
2610	XFree (list);	2581	XFree (list);
2611		2582
2612	if (parent[i] == display->root)	2583	if (parent[i] == display->root)
2613	{	2584	{
…		…
2625		2596
2626	if (pchanged)	2597	if (pchanged)
2627	{	2598	{
2628	for (; n < (unsigned int)i; n++)	2599	for (; n < (unsigned int)i; n++)
2629	{	2600	{
2630	XGetWindowAttributes (disp, parent[n], &wattr);	2601	XGetWindowAttributes (xdisp, parent[n], &wattr);
2631	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2602	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2632	{	2603	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;	2605	break;
2635	}	2606	}
2636	}	2607	}
2637	}	2608	}
2638		2609
2639	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2640	{	2611	{
2641	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2642	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2643	am_transparent = 0;	2614	am_transparent = 0;
2644	/* XXX: also turn off Opt_transparent? */	2615	/* XXX: also turn off Opt_transparent? */
2645	}	2616	}
2646	else	2617	else
2647	{	2618	{
2648	#if WAIT_FOR_WM
2649	/* wait (an arbitrary period) for the WM to do its thing
2650	* needed for fvwm2.2.2 (and before?) */
2651	sleep (1);
2652	#endif
2653	for (n = 0; n < (unsigned int)i; n++)	2619	for (n = 0; n < (unsigned int)i; n++)
2654	{	2620	{
2655	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2656	XClearWindow (disp, parent[n]);	2622	XClearWindow (xdisp, parent[n]);
2657	}	2623	}
2658		2624
2659	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2660	am_transparent = 1;	2626	am_transparent = 1;
2661	}	2627	}
2662		2628
2663	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664	parent[i] = None;	2630	parent[i] = None;
2665	}	2631	}
2666		2632
2667	if (scrollBar.win)	2633	if (scrollBar.win)
2668	{	2634	{
2669	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2670	scrollBar.setIdle ();	2636	scrollBar.setIdle ();
2671	scrollbar_show (0);	2637	scrollbar_show (0);
2672	}	2638	}
2673		2639
2674	if (am_transparent)	2640	if (am_transparent)
…		…
2820	return flag;	2786	return flag;
2821	}	2787	}
2822		2788
2823	// read the next character	2789	// read the next character
2824	wchar_t	2790	wchar_t
2825	rxvt_term::next_char ()	2791	rxvt_term::next_char () NOTHROW
2826	{	2792	{
2827	while (cmdbuf_ptr < cmdbuf_endp)	2793	while (cmdbuf_ptr < cmdbuf_endp)
2828	{	2794	{
2829	// assume 7-bit to be ascii ALWAYS	2795	// assume 7-bit to be ascii ALWAYS
2830	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2796	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2851	return NOCHAR;	2817	return NOCHAR;
2852	}	2818	}
2853		2819
2854	// read the next octet	2820	// read the next octet
2855	uint32_t	2821	uint32_t
2856	rxvt_term::next_octet ()	2822	rxvt_term::next_octet () NOTHROW
2857	{	2823	{
2858	return cmdbuf_ptr < cmdbuf_endp	2824	return cmdbuf_ptr < cmdbuf_endp
2859	? (unsigned char)*cmdbuf_ptr++	2825	? (unsigned char)*cmdbuf_ptr++
2860	: NOCHAR;	2826	: NOCHAR;
2861	}	2827	}
		2828
		2829	static class out_of_input out_of_input;
2862		2830
2863	/* rxvt_cmd_getc () - Return next input character */	2831	/* rxvt_cmd_getc () - Return next input character */
2864	/*	2832	/*
2865	* Return the next input character after first passing any keyboard input	2833	* Return the next input character after first passing any keyboard input
2866	* to the command.	2834	* to the command.
2867	*/	2835	*/
2868	wchar_t	2836	wchar_t
2869	rxvt_term::cmd_getc ()	2837	rxvt_term::cmd_getc () THROW ((class out_of_input))
2870	{	2838	{
2871	wchar_t c = next_char ();	2839	wchar_t c = next_char ();
2872		2840
2873	if (c == NOCHAR)	2841	if (c == NOCHAR)
2874	throw out_of_input;	2842	throw out_of_input;
2875		2843
2876	return c;	2844	return c;
2877	}	2845	}
2878		2846
2879	uint32_t	2847	uint32_t
2880	rxvt_term::cmd_get8 ()	2848	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881	{	2849	{
2882	uint32_t c = next_octet ();	2850	uint32_t c = next_octet ();
2883		2851
2884	if (c == NOCHAR)	2852	if (c == NOCHAR)
2885	throw out_of_input;	2853	throw out_of_input;
…		…
3306	ndef = get_byte_array_bit (csi_defaults, i);	3274	ndef = get_byte_array_bit (csi_defaults, i);
3307	for (p = 0; p < nargs; p++)	3275	for (p = 0; p < nargs; p++)
3308	if (arg[p] == -1)	3276	if (arg[p] == -1)
3309	arg[p] = ndef;	3277	arg[p] = ndef;
3310		3278
3311	#ifdef DEBUG_CMD
3312	fprintf (stderr, "CSI ");
3313	for (p = 0; p < nargs; p++)
3314	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315	fprintf (stderr, "%c\n", ch);
3316	#endif
3317
3318	/*	3279	/*
3319	* private mode handling	3280	* private mode handling
3320	*/	3281	*/
3321	if (priv)	3282	if (priv)
3322	{	3283	{
3323	switch (priv)	3284	switch (priv)
3324	{	3285	{
3325	case '>':	3286	case '>':
3326	if (ch == CSI_DA) /* secondary device attributes */	3287	if (ch == CSI_DA) /* secondary device attributes */
3327	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	}
3328	break;	3298	break;
3329	case '?':	3299	case '?':
3330	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3300	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3331	process_terminal_mode (ch, priv, nargs, arg);	3301	process_terminal_mode (ch, priv, nargs, arg);
3332	break;	3302	break;
…		…
3560	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561	{	3531	{
3562	int x, y;	3532	int x, y;
3563	XWindowAttributes wattr;	3533	XWindowAttributes wattr;
3564	Window wdummy;	3534	Window wdummy;
3565	dDisp;	3535
		3536	dLocal (Display *, xdisp);
3566		3537
3567	if (nargs == 0)	3538	if (nargs == 0)
3568	return;	3539	return;
3569		3540
3570	switch (args[0])	3541	switch (args[0])
3571	{	3542	{
3572	/*	3543	/*
3573	* commands	3544	* commands
3574	*/	3545	*/
3575	case 1: /* deiconify window */	3546	case 1: /* deiconify window */
3576	XMapWindow (disp, parent[0]);	3547	XMapWindow (xdisp, parent[0]);
3577	break;	3548	break;
3578	case 2: /* iconify window */	3549	case 2: /* iconify window */
3579	XIconifyWindow (disp, parent[0], display->screen);	3550	XIconifyWindow (xdisp, parent[0], display->screen);
3580	break;	3551	break;
3581	case 3: /* set position (pixels) */	3552	case 3: /* set position (pixels) */
3582	XMoveWindow (disp, parent[0], args[1], args[2]);	3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3583	break;	3554	break;
3584	case 4: /* set size (pixels) */	3555	case 4: /* set size (pixels) */
3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586	break;	3557	break;
3587	case 5: /* raise window */	3558	case 5: /* raise window */
3588	XRaiseWindow (disp, parent[0]);	3559	XRaiseWindow (xdisp, parent[0]);
3589	break;	3560	break;
3590	case 6: /* lower window */	3561	case 6: /* lower window */
3591	XLowerWindow (disp, parent[0]);	3562	XLowerWindow (xdisp, parent[0]);
3592	break;	3563	break;
3593	case 7: /* refresh window */	3564	case 7: /* refresh window */
3594	scr_touch (true);	3565	scr_touch (true);
3595	break;	3566	break;
3596	case 8: /* set size (chars) */	3567	case 8: /* set size (chars) */
…		…
3608		3579
3609	/*	3580	/*
3610	* reports - some output format copied from XTerm	3581	* reports - some output format copied from XTerm
3611	*/	3582	*/
3612	case 11: /* report window state */	3583	case 11: /* report window state */
3613	XGetWindowAttributes (disp, parent[0], &wattr);	3584	XGetWindowAttributes (xdisp, parent[0], &wattr);
3614	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615	break;	3586	break;
3616	case 13: /* report window position */	3587	case 13: /* report window position */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3618	XTranslateCoordinates (disp, parent[0], wattr.root,	3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3619	-wattr.border_width, -wattr.border_width,	3590	-wattr.border_width, -wattr.border_width,
3620	&x, &y, &wdummy);	3591	&x, &y, &wdummy);
3621	tt_printf ("\033[3;%d;%dt", x, y);	3592	tt_printf ("\033[3;%d;%dt", x, y);
3622	break;	3593	break;
3623	case 14: /* report window size (pixels) */	3594	case 14: /* report window size (pixels) */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (xdisp, parent[0], &wattr);
3625	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626	break;	3597	break;
3627	case 18: /* report text area size (chars) */	3598	case 18: /* report text area size (chars) */
3628	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629	break;	3600	break;
…		…
3631	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632	break;	3603	break;
3633	case 20: /* report icon label */	3604	case 20: /* report icon label */
3634	{	3605	{
3635	char *s;	3606	char *s;
3636	XGetIconName (disp, parent[0], &s);	3607	XGetIconName (xdisp, parent[0], &s);
3637	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 */
3638	XFree (s);	3609	XFree (s);
3639	}	3610	}
3640	break;	3611	break;
3641	case 21: /* report window title */	3612	case 21: /* report window title */
3642	{	3613	{
3643	char *s;	3614	char *s;
3644	XFetchName (disp, parent[0], &s);	3615	XFetchName (xdisp, parent[0], &s);
3645	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 */
3646	XFree (s);	3617	XFree (s);
3647	}	3618	}
3648	break;	3619	break;
3649	}	3620	}
…		…
3750	void	3721	void
3751	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)
3752	{	3723	{
3753	if (str[0] == '?' && !str[1])	3724	if (str[0] == '?' && !str[1])
3754	{	3725	{
3755	unsigned short r, g, b;	3726	rxvt_rgba c;
3756	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
3757	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);
3758	}	3735	}
3759	else	3736	else
3760	set_window_color (color, str);	3737	set_window_color (color, str);
3761	}	3738	}
3762		3739
…		…
3764	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3741	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3765	*/	3742	*/
3766	void	3743	void
3767	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3744	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768	{	3745	{
3769	int changed = 0;
3770	int color;	3746	int color;
3771	char buf, name;	3747	char buf, name;
3772	bool query = str[0] == '?' && !str[1];	3748	bool query = str[0] == '?' && !str[1];
3773	int saveop = op;	3749	int saveop = op;
3774	dDisp;	3750
		3751	dLocal (Display *, xdisp);
3775		3752
3776	assert (str != NULL);	3753	assert (str != NULL);
3777	switch (op)	3754	switch (op)
3778	{	3755	{
3779	case XTerm_name:	3756	case XTerm_name:
…		…
3795	unsigned long bytes_after;	3772	unsigned long bytes_after;
3796	unsigned char *value = 0;	3773	unsigned char *value = 0;
3797	const char *str = "";	3774	const char *str = "";
3798		3775
3799	if (prop	3776	if (prop
3800	&& XGetWindowProperty (disp, parent[0],	3777	&& XGetWindowProperty (xdisp, parent[0],
3801	prop, 0, 1<<16, 0, AnyPropertyType,	3778	prop, 0, 1<<16, 0, AnyPropertyType,
3802	&actual_type, &actual_format,	3779	&actual_type, &actual_format,
3803	&nitems, &bytes_after, &value) == Success	3780	&nitems, &bytes_after, &value) == Success
3804	&& actual_type != None	3781	&& actual_type != None
3805	&& actual_format == 8)	3782	&& actual_format == 8)
3806	str = (const char *)(value);	3783	str = (const char *)(value);
3807		3784
3808	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3785	tt_printf ("\033]%d;%s%c", op, str, resp);
3809		3786
3810	XFree (value);	3787	XFree (value);
3811	}	3788	}
3812	else	3789	else
3813	{	3790	{
…		…
3817	{	3794	{
3818	*eq = 0;	3795	*eq = 0;
3819	set_utf8_property (display->atom (str), eq + 1);	3796	set_utf8_property (display->atom (str), eq + 1);
3820	}	3797	}
3821	else	3798	else
3822	XDeleteProperty (disp, parent[0],	3799	XDeleteProperty (xdisp, parent[0],
3823	display->atom (str));	3800	display->atom (str));
3824	}	3801	}
3825	break;	3802	break;
3826		3803
3827	case XTerm_Color:	3804	case XTerm_Color:
…		…
3837	break;	3814	break;
3838		3815
3839	if ((buf = strchr (name, ';')) != NULL)	3816	if ((buf = strchr (name, ';')) != NULL)
3840	*buf++ = '\0';	3817	*buf++ = '\0';
3841		3818
3842	if (name[0] == '?' && !name[1])	3819	process_color_seq (op, color, name, resp);
3843	{
3844	unsigned short r, g, b;
3845	pix_colors_focused[color].get (display, r, g, b);
3846	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847	}
3848	else
3849	set_window_color (color, name);
3850	}	3820	}
3851	break;	3821	break;
3852	case XTerm_Color00:	3822	case XTerm_Color00:
3853	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3823	process_color_seq (op, Color_fg, str, resp);
3854	break;	3824	break;
3855	case XTerm_Color01:	3825	case XTerm_Color01:
3856	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3826	process_color_seq (op, Color_bg, str, resp);
3857	break;	3827	break;
3858	#ifndef NO_CURSORCOLOR	3828	#ifndef NO_CURSORCOLOR
3859	case XTerm_Color_cursor:	3829	case XTerm_Color_cursor:
3860	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3830	process_color_seq (op, Color_cursor, str, resp);
3861	break;	3831	break;
3862	#endif	3832	#endif
3863	case XTerm_Color_pointer_fg:	3833	case XTerm_Color_pointer_fg:
3864	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3834	process_color_seq (op, Color_pointer_fg, str, resp);
3865	break;	3835	break;
3866	case XTerm_Color_pointer_bg:	3836	case XTerm_Color_pointer_bg:
3867	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3837	process_color_seq (op, Color_pointer_bg, str, resp);
3868	break;	3838	break;
3869	#ifndef NO_BOLD_UNDERLINE_REVERSE	3839	#ifndef NO_BOLD_UNDERLINE_REVERSE
3870	case XTerm_Color_RV:	3840	case XTerm_Color_RV:
3871	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3841	process_color_seq (op, Color_RV, str, resp);
3872	break;	3842	break;
3873	case Rxvt_Color_BD:	3843	case Rxvt_Color_BD:
3874	case URxvt_Color_BD:	3844	case URxvt_Color_BD:
3875	process_color_seq (op, Color_BD, str, resp);	3845	process_color_seq (op, Color_BD, str, resp);
3876	break;	3846	break;
3877	case Rxvt_Color_UL:	3847	case Rxvt_Color_UL:
3878	case URxvt_Color_UL:	3848	case URxvt_Color_UL:
3879	process_color_seq (op, Color_UL, str, resp);	3849	process_color_seq (op, Color_UL, str, resp);
3880	break;	3850	break;
3881	case URxvt_Color_IT:	3851	case URxvt_Color_IT:
3882	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3852	process_color_seq (op, Color_IT, str, resp);
3883	break;	3853	break;
3884	#endif	3854	#endif
3885	#if TRANSPARENT && TINTING	3855	#if TRANSPARENT && TINTING
3886	case URxvt_Color_tint:	3856	case URxvt_Color_tint:
3887	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3857	process_color_seq (op, Color_tint, str, resp);
3888	check_our_parents ();	3858	check_our_parents ();
3889	if (am_transparent)	3859	if (am_transparent)
3890	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3891	break;	3861	break;
3892	#endif	3862	#endif
3893		3863
3894	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
		3865	{
3895	if (*str != ';')	3866	if (*str != ';')
3896	{	3867	{
3897	#if XPM_BACKGROUND	3868	#if XPM_BACKGROUND
3898	scale_pixmap (""); /* reset to default scaling */	3869	scale_pixmap (""); /* reset to default scaling */
3899	set_bgPixmap (str); /* change pixmap */	3870	set_bgPixmap (str); /* change pixmap */
3900	scr_touch (true);	3871	scr_touch (true);
3901	#endif	3872	#endif
3902	}	3873	}
3903		3874
		3875	int changed = 0;
		3876
3904	while ((str = strchr (str, ';')) != NULL)	3877	while ((str = strchr (str, ';')) != NULL)
3905	{	3878	{
3906	str++;	3879	str++;
3907	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3908	changed += scale_pixmap (str);	3881	changed += scale_pixmap (str);
3909	#endif	3882	#endif
3910	}	3883	}
3911		3884
3912	if (changed)	3885	if (changed)
3913	{	3886	{
3914	#ifdef XPM_BACKGROUND	3887	#ifdef XPM_BACKGROUND
3915	resize_pixmap ();	3888	resize_pixmap ();
3916	scr_touch (true);	3889	scr_touch (true);
3917	#endif	3890	#endif
3918	}	3891	}
		3892	}
3919	break;	3893	break;
3920		3894
3921	case Rxvt_restoreFG:	3895	case Rxvt_restoreFG:
3922	set_window_color (Color_fg, str);	3896	set_window_color (Color_fg, str);
3923	break;	3897	break;
…		…
3962	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
3963	set_fonts ();	3937	set_fonts ();
3964	}	3938	}
3965	break;	3939	break;
3966		3940
		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
3967	#if ENABLE_FRILLS	3949	#if ENABLE_FRILLS
3968	case URxvt_locale:	3950	case URxvt_locale:
3969	if (query)	3951	if (query)
3970	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);
3971	else	3953	else
3972	{	3954	{
3973	set_locale (str);	3955	set_locale (str);
3974	pty->set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
3975	init_xlocale ();	3957	init_xlocale ();
…		…
4032	return state;	4014	return state;
4033	}	4015	}
4034		4016
4035	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4036	void	4018	void
4037	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)
4038	{	4020	{
4039	unsigned int i, j;	4021	unsigned int i, j;
4040	int state;	4022	int state;
4041		4023
4042	static const struct	4024	static const struct

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.269 by root, Tue Jan 17 12:22:59 2006 UTC vs. Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC