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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.469 by sf-exg, Sat Jan 8 10:15:36 2011 UTC vs.
Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
257	#endif	257	#endif
258		258
259	void	259	void
260	rxvt_term::commit_iso14755 ()	260	rxvt_term::commit_iso14755 ()
261	{	261	{
262	wchar_t ch[2];
263
264	ch[0] = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
265	ch[1] = 0;
266		263
267	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
268	{	265	{
269	char mb[16];	266	char mb[MB_LEN_MAX];
270	int len;	267	int len;
271		268
272	// allow verbatim 0-bytes and control-bytes to be entered	269	// allow verbatim 0-bytes and control-bytes to be entered
273	if (ch[0] >= 0x20)	270	if (ch >= 0x20)
274	len = wcstombs (mb, ch, 16);	271	len = wctomb (mb, ch);
275	else	272	else
276	{	273	{
277	mb[0] = ch[0];	274	mb[0] = ch;
278	len = 1;	275	len = 1;
279	}	276	}
280		277
281	if (len > 0)	278	if (len > 0)
282	tt_write (mb, len);	279	tt_write (mb, len);
…		…
569	selection_request (ev.time);	566	selection_request (ev.time);
570	return;	567	return;
571	#if TODO	568	#if TODO
572	/* rxvt extras */	569	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	570	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	571	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	573	return;
579	#endif	574	#endif
580	}	575	}
581	}	576	}
582	}	577	}
…		…
936	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)	931	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
937	mouse_slip_wheel_speed = 0;	932	mouse_slip_wheel_speed = 0;
938	#endif	933	#endif
939	}	934	}
940		935
941	#if defined (KEYSYM_RESOURCE)
942	unsigned int
943	rxvt_term::cmd_write (const char *str, unsigned int count)
944	{
945	unsigned int n, s;
946
947	n = cmdbuf_ptr - cmdbuf_base;
948	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950	if (n > 0 && s < count)
951	{
952	memmove (cmdbuf_base, cmdbuf_ptr,
953	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954	cmdbuf_ptr = cmdbuf_base;
955	cmdbuf_endp -= n;
956	s += n;
957	}
958
959	if (count > s)
960	{
961	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962	count = s;
963	}
964
965	for (; count--;)
966	cmdbuf_endp++ = str++;
967
968	cmd_parse ();
969
970	return 0;
971	}
972	#endif
973
974	void	936	void
975	rxvt_term::flush ()	937	rxvt_term::flush ()
976	{	938	{
977	flush_ev.stop ();	939	flush_ev.stop ();
978		940
979	#ifdef HAVE_BG_PIXMAP	941	#ifdef HAVE_BG_PIXMAP
980	if (bgPixmap.flags & bgPixmap_t::hasChanged)	942	if (bg_flags & BG_NEEDS_REFRESH)
981	{	943	{
982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;	944	bg_flags &= ~BG_NEEDS_REFRESH;
983	// scr_clear (true); This needs to be researched further!
984	scr_touch (false);	945	scr_touch (false);
985	}	946	}
986	#endif	947	#endif
987		948
988	if (want_refresh)	949	if (want_refresh)
…		…
1153	{	1114	{
1154	}	1115	}
1155	} event_handler;	1116	} event_handler;
1156	#endif	1117	#endif
1157		1118
		1119	/* make sure all the cmd data is at beginning of cmdbuf */
		1120	void
		1121	rxvt_term::cmdbuf_reify ()
		1122	{
		1123	if (cmdbuf_ptr == cmdbuf_base)
		1124	return;
		1125
		1126	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1127
		1128	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1129	cmdbuf_ptr = cmdbuf_base;
		1130	cmdbuf_endp = cmdbuf_ptr + used;
		1131
		1132	}
		1133
		1134	#if defined (KEYSYM_RESOURCE)
		1135	void
		1136	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1137	{
		1138	cmdbuf_reify ();
		1139
		1140	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1141
		1142	if (count > avail)
		1143	return;
		1144
		1145	memcpy (cmdbuf_endp, str, count);
		1146	cmdbuf_endp += count;
		1147
		1148	cmd_parse ();
		1149	}
		1150	#endif
		1151
1158	bool	1152	bool
1159	rxvt_term::pty_fill ()	1153	rxvt_term::pty_fill ()
1160	{	1154	{
1161	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1155	cmdbuf_reify ();
1162		1156
1163	if (CBUFSIZ == n)	1157	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164	{	1158
1165	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1159	if (!avail)
1166	n = 0;
1167	}	1160	{
1168		1161	// normally this indicates a "too long" command sequence - just drop the data we have
1169	memmove (cmdbuf_base, cmdbuf_ptr, n);
1170	cmdbuf_ptr = cmdbuf_base;	1162	cmdbuf_ptr = cmdbuf_base;
1171	cmdbuf_endp = cmdbuf_ptr + n;	1163	cmdbuf_endp = cmdbuf_ptr;
		1164	avail = CBUFSIZ;
		1165	}
1172		1166
1173	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1167	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174		1168
1175	if (r > 0)	1169	if (r > 0)
1176	{	1170	{
1177	cmdbuf_endp += r;	1171	cmdbuf_endp += r;
1178	return true;	1172	return true;
…		…
1446	&& ev.xfocus.mode != NotifyGrab)	1440	&& ev.xfocus.mode != NotifyGrab)
1447	focus_out ();	1441	focus_out ();
1448	break;	1442	break;
1449		1443
1450	case ConfigureNotify:	1444	case ConfigureNotify:
1451	if (ev.xconfigure.window == parent[0])	1445	if (ev.xconfigure.window == parent)
1452	{	1446	{
1453	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454	;	1448	;
1455		1449
1456	#ifdef HAVE_BG_PIXMAP	1450	#ifdef HAVE_BG_PIXMAP
1457	bool moved = false;	1451	bool moved = false;
1458	if (bgPixmap.window_position_sensitive ())	1452	if (bg_window_position_sensitive ())
1459	{	1453	{
1460	int x, y;	1454	int x, y;
1461	if (ev.xconfigure.send_event)	1455	if (ev.xconfigure.send_event)
1462	{	1456	{
1463	x = ev.xconfigure.x;	1457	x = ev.xconfigure.x;
1464	y = ev.xconfigure.y;	1458	y = ev.xconfigure.y;
1465	}	1459	}
1466	else	1460	else
1467	get_window_origin (x, y);	1461	get_window_origin (x, y);
1468		1462
1469	if (bgPixmap.set_position (x, y)	1463	if (bg_set_position (x, y)
1470	\|\| (bgPixmap.flags & bgPixmap_t::isInvalid))	1464	\|\| !(bg_flags & BG_IS_VALID))
1471	moved = true;	1465	moved = true;
1472	}	1466	}
1473	#endif	1467	#endif
1474		1468
1475	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
…		…
1483	if (moved)	1477	if (moved)
1484	{	1478	{
1485	if (mapped)	1479	if (mapped)
1486	update_background ();	1480	update_background ();
1487	else	1481	else
1488	bgPixmap.invalidate ();	1482	bg_invalidate ();
1489	}	1483	}
1490	#endif	1484	#endif
1491	}	1485	}
1492		1486
1493	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494	}	1488	}
1495	break;	1489	break;
1496		1490
1497	case PropertyNotify:	1491	case PropertyNotify:
1498	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1492	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500	&& ev.xproperty.state == PropertyNewValue)
1501	selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503	break;	1493	break;
1504		1494
1505	case SelectionClear:	1495	case SelectionClear:
1506	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1496	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507	break;
1508
1509	case SelectionNotify:
1510	if (selection_wait == Sel_normal)
1511	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512	break;	1497	break;
1513		1498
1514	case SelectionRequest:	1499	case SelectionRequest:
1515	selection_send (ev.xselectionrequest);	1500	selection_send (ev.xselectionrequest);
1516	break;	1501	break;
…		…
1527	* by scheduling background redraw as soon as we can, but giving a short	1512	* by scheduling background redraw as soon as we can, but giving a short
1528	* bit of time for ConfigureNotifies to arrive.	1513	* bit of time for ConfigureNotifies to arrive.
1529	* We should render background PRIOR to drawing any text, but AFTER all	1514	* We should render background PRIOR to drawing any text, but AFTER all
1530	* of ConfigureNotifys for the best results.	1515	* of ConfigureNotifys for the best results.
1531	*/	1516	*/
1532	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1517	if (!(bg_flags & BG_IS_VALID))
1533	update_background_ev.start (0.025);	1518	update_background_ev.start (0.025);
1534	#endif	1519	#endif
1535	mapped = 1;	1520	mapped = 1;
1536	#ifdef TEXT_BLINK	1521	#ifdef TEXT_BLINK
1537	text_blink_ev.start ();	1522	text_blink_ev.start ();
…		…
1552	if (ev.xany.window == vt)	1537	if (ev.xany.window == vt)
1553	{	1538	{
1554	do	1539	do
1555	{	1540	{
1556	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1557	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, false);
1558	}	1543	}
1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1544	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560		1545
1561	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1546	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562		1547
1563	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1548	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564	{	1549	{
1565	scr_expose (ev.xexpose.x, ev.xexpose.y,	1550	scr_expose (ev.xexpose.x, ev.xexpose.y,
1566	ev.xexpose.width, ev.xexpose.height, False);	1551	ev.xexpose.width, ev.xexpose.height, false);
1567	}	1552	}
1568		1553
1569	want_refresh = 1;	1554	want_refresh = 1;
1570	}	1555	}
1571	else	1556	else
…		…
1731	rxvt_term::set_urgency (bool enable)	1716	rxvt_term::set_urgency (bool enable)
1732	{	1717	{
1733	if (enable == urgency_hint)	1718	if (enable == urgency_hint)
1734	return;	1719	return;
1735		1720
1736	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1721	if (XWMHints *h = XGetWMHints (dpy, parent))
1737	{	1722	{
1738	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1723	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1739	XSetWMHints (dpy, parent[0], h);	1724	XSetWMHints (dpy, parent, h);
1740	urgency_hint = enable;	1725	urgency_hint = enable;
1741	}	1726	}
1742	}	1727	}
1743	#endif	1728	#endif
1744		1729
…		…
1852	* use the property to determine the pixmap. We use it later on.	1837	* use the property to determine the pixmap. We use it later on.
1853	*/	1838	*/
1854	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1839	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1840	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856	{	1841	{
1857	bgPixmap.set_root_pixmap ();	1842	bg_set_root_pixmap ();
1858	update_background ();	1843	update_background ();
1859	}	1844	}
1860		1845
1861	break;	1846	break;
1862	}	1847	}
…		…
2399	: NOCHAR;	2384	: NOCHAR;
2400	}	2385	}
2401		2386
2402	static class out_of_input out_of_input;	2387	static class out_of_input out_of_input;
2403		2388
2404	/* rxvt_cmd_getc () - Return next input character */
2405	/*
2406	* Return the next input character after first passing any keyboard input
2407	* to the command.
2408	*/
2409	wchar_t	2389	wchar_t
2410	rxvt_term::cmd_getc () THROW ((class out_of_input))	2390	rxvt_term::cmd_getc () THROW ((class out_of_input))
2411	{	2391	{
2412	wchar_t c = next_char ();	2392	wchar_t c = next_char ();
2413		2393
…		…
2506	pclose_printer (fd);	2486	pclose_printer (fd);
2507	}	2487	}
2508	#endif /* PRINTPIPE */	2488	#endif /* PRINTPIPE */
2509	/}}} /	2489	/}}} /
2510		2490
2511	/* INDENT-OFF */
2512	enum {	2491	enum {
2513	C1_40 = 0x40,	2492	C1_40 = 0x40,
2514	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2493	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2494	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2495	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2496	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518	};	2497	};
2519	/* INDENT-ON */
2520		2498
2521	/{{{ process non-printing single characters /	2499	/{{{ process non-printing single characters /
2522	void	2500	void
2523	rxvt_term::process_nonprinting (unicode_t ch)	2501	rxvt_term::process_nonprinting (unicode_t ch)
2524	{	2502	{
…		…
2646	return;	2624	return;
2647	}	2625	}
2648		2626
2649	switch (ch)	2627	switch (ch)
2650	{	2628	{
2651	/* case 1: do_tek_mode (); break; */
2652	case '#':	2629	case '#':
2653	if (cmd_getc () == '8')	2630	if (cmd_getc () == '8')
2654	scr_E ();	2631	scr_E ();
2655	break;	2632	break;
2656	case '(':	2633	case '(':
…		…
2701	}	2678	}
2702	break;	2679	break;
2703		2680
2704	/* kidnapped escape sequence: Should be 8.3.48 */	2681	/* kidnapped escape sequence: Should be 8.3.48 */
2705	case C1_ESA: /* ESC G */	2682	case C1_ESA: /* ESC G */
2706	process_graphics ();	2683	// used by original rxvt for rob nations own graphics mode
		2684	if (cmd_getc () == 'Q')
		2685	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707	break;	2686	break;
2708		2687
2709	/* 8.3.63: CHARACTER TABULATION SET */	2688	/* 8.3.63: CHARACTER TABULATION SET */
2710	case C1_HTS: /* ESC H */	2689	case C1_HTS: /* ESC H */
2711	scr_set_tab (1);	2690	scr_set_tab (1);
…		…
2715	case C1_RI: /* ESC M */	2694	case C1_RI: /* ESC M */
2716	scr_index (DN);	2695	scr_index (DN);
2717	break;	2696	break;
2718		2697
2719	/* 8.3.142: SINGLE-SHIFT TWO */	2698	/* 8.3.142: SINGLE-SHIFT TWO */
2720	/case C1_SS2: scr_single_shift (2); break; /	2699	/* case C1_SS2: break; */
2721		2700
2722	/* 8.3.143: SINGLE-SHIFT THREE */	2701	/* 8.3.143: SINGLE-SHIFT THREE */
2723	/case C1_SS3: scr_single_shift (3); break; /	2702	/* case C1_SS3: break; */
2724		2703
2725	/* 8.3.27: DEVICE CONTROL STRING */	2704	/* 8.3.27: DEVICE CONTROL STRING */
2726	case C1_DCS: /* ESC P */	2705	case C1_DCS: /* ESC P */
2727	process_dcs_seq ();	2706	process_dcs_seq ();
2728	break;	2707	break;
…		…
2761	}	2740	}
2762	}	2741	}
2763	/}}} /	2742	/}}} /
2764		2743
2765	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2744	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2766	/* INDENT-OFF */
2767	enum {	2745	enum {
2768	CSI_ICH = 0x40,	2746	CSI_ICH = 0x40,
2769	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2747	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2748	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2749	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2791	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2769	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2771	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2772	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2795	};	2773	};
2796	/* INDENT-ON */
2797		2774
2798	void	2775	void
2799	rxvt_term::process_csi_seq ()	2776	rxvt_term::process_csi_seq ()
2800	{	2777	{
2801	unicode_t ch, priv, i;	2778	unicode_t ch, priv, i;
…		…
3111	}	3088	}
3112	}	3089	}
3113	/}}} /	3090	/}}} /
3114		3091
3115	#if !ENABLE_MINIMAL	3092	#if !ENABLE_MINIMAL
3116	/* ARGSUSED */
3117	void	3093	void
3118	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3094	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119	{	3095	{
3120	int x, y;	3096	int x, y;
3121	XWindowAttributes wattr;	3097	XWindowAttributes wattr;
…		…
3130	{	3106	{
3131	/*	3107	/*
3132	* commands	3108	* commands
3133	*/	3109	*/
3134	case 1: /* deiconify window */	3110	case 1: /* deiconify window */
3135	XMapWindow (dpy, parent[0]);	3111	XMapWindow (dpy, parent);
3136	break;	3112	break;
3137	case 2: /* iconify window */	3113	case 2: /* iconify window */
3138	XIconifyWindow (dpy, parent[0], display->screen);	3114	XIconifyWindow (dpy, parent, display->screen);
3139	break;	3115	break;
3140	case 3: /* set position (pixels) */	3116	case 3: /* set position (pixels) */
3141	XMoveWindow (dpy, parent[0], args[1], args[2]);	3117	XMoveWindow (dpy, parent, args[1], args[2]);
3142	break;	3118	break;
3143	case 4: /* set size (pixels) */	3119	case 4: /* set size (pixels) */
3144	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3120	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145	break;	3121	break;
3146	case 5: /* raise window */	3122	case 5: /* raise window */
3147	XRaiseWindow (dpy, parent[0]);	3123	XRaiseWindow (dpy, parent);
3148	break;	3124	break;
3149	case 6: /* lower window */	3125	case 6: /* lower window */
3150	XLowerWindow (dpy, parent[0]);	3126	XLowerWindow (dpy, parent);
3151	break;	3127	break;
3152	case 7: /* refresh window */	3128	case 7: /* refresh window */
3153	scr_touch (true);	3129	scr_touch (true);
3154	break;	3130	break;
3155	case 8: /* set size (chars) */	3131	case 8: /* set size (chars) */
…		…
3166		3142
3167	/*	3143	/*
3168	* reports - some output format copied from XTerm	3144	* reports - some output format copied from XTerm
3169	*/	3145	*/
3170	case 11: /* report window state */	3146	case 11: /* report window state */
3171	XGetWindowAttributes (dpy, parent[0], &wattr);	3147	XGetWindowAttributes (dpy, parent, &wattr);
3172	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3148	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173	break;	3149	break;
3174	case 13: /* report window position */	3150	case 13: /* report window position */
3175	XGetWindowAttributes (dpy, parent[0], &wattr);	3151	XGetWindowAttributes (dpy, parent, &wattr);
3176	XTranslateCoordinates (dpy, parent[0], wattr.root,	3152	XTranslateCoordinates (dpy, parent, wattr.root,
3177	-wattr.border_width, -wattr.border_width,	3153	-wattr.border_width, -wattr.border_width,
3178	&x, &y, &wdummy);	3154	&x, &y, &wdummy);
3179	tt_printf ("\033[3;%d;%dt", x, y);	3155	tt_printf ("\033[3;%d;%dt", x, y);
3180	break;	3156	break;
3181	case 14: /* report window size (pixels) */	3157	case 14: /* report window size (pixels) */
3182	XGetWindowAttributes (dpy, parent[0], &wattr);	3158	XGetWindowAttributes (dpy, parent, &wattr);
3183	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3159	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184	break;	3160	break;
3185	case 18: /* report text area size (chars) */	3161	case 18: /* report text area size (chars) */
3186	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3162	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187	break;	3163	break;
…		…
3189	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3165	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190	break;	3166	break;
3191	case 20: /* report icon label */	3167	case 20: /* report icon label */
3192	{	3168	{
3193	char *s;	3169	char *s;
3194	XGetIconName (dpy, parent[0], &s);	3170	XGetIconName (dpy, parent, &s);
3195	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3171	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196	XFree (s);	3172	XFree (s);
3197	}	3173	}
3198	break;	3174	break;
3199	case 21: /* report window title */	3175	case 21: /* report window title */
3200	{	3176	{
3201	char *s;	3177	char *s;
3202	XFetchName (dpy, parent[0], &s);	3178	XFetchName (dpy, parent, &s);
3203	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3179	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3204	XFree (s);	3180	XFree (s);
3205	}	3181	}
3206	break;	3182	break;
3207	}	3183	}
…		…
3361	unsigned long bytes_after;	3337	unsigned long bytes_after;
3362	unsigned char *value = 0;	3338	unsigned char *value = 0;
3363	const char *str = "";	3339	const char *str = "";
3364		3340
3365	if (prop	3341	if (prop
3366	&& XGetWindowProperty (dpy, parent[0],	3342	&& XGetWindowProperty (dpy, parent,
3367	prop, 0, 1<<16, 0, AnyPropertyType,	3343	prop, 0, 1<<16, 0, AnyPropertyType,
3368	&actual_type, &actual_format,	3344	&actual_type, &actual_format,
3369	&nitems, &bytes_after, &value) == Success	3345	&nitems, &bytes_after, &value) == Success
3370	&& actual_type != None	3346	&& actual_type != None
3371	&& actual_format == 8)	3347	&& actual_format == 8)
…		…
3383	{	3359	{
3384	*eq = 0;	3360	*eq = 0;
3385	set_utf8_property (display->atom (str), eq + 1);	3361	set_utf8_property (display->atom (str), eq + 1);
3386	}	3362	}
3387	else	3363	else
3388	XDeleteProperty (dpy, parent[0],	3364	XDeleteProperty (dpy, parent,
3389	display->atom (str));	3365	display->atom (str));
3390	}	3366	}
3391	break;	3367	break;
3392		3368
3393	case XTerm_Color:	3369	case XTerm_Color:
…		…
3454	process_color_seq (op, Color_tint, str, resp);	3430	process_color_seq (op, Color_tint, str, resp);
3455	{	3431	{
3456	bool changed = false;	3432	bool changed = false;
3457		3433
3458	if (ISSET_PIXCOLOR (Color_tint))	3434	if (ISSET_PIXCOLOR (Color_tint))
3459	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460	else
3461	changed = bgPixmap.unset_tint ();
3462		3436
3463	if (changed)	3437	if (changed)
3464	update_background ();	3438	update_background ();
3465	}	3439	}
3466		3440
…		…
3472	if (!strcmp (str, "?"))	3446	if (!strcmp (str, "?"))
3473	{	3447	{
3474	char str[256];	3448	char str[256];
3475		3449
3476	sprintf (str, "[%dx%d+%d+%d]",	3450	sprintf (str, "[%dx%d+%d+%d]",
3477	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3451	min (h_scale, 32767), min (v_scale, 32767),
3478	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3452	min (h_align, 32767), min (v_align, 32767));
3479	process_xterm_seq (XTerm_title, str, CHAR_ST);	3453	process_xterm_seq (XTerm_title, str, CHAR_ST);
3480	}	3454	}
3481	else	3455	else
3482	{	3456	{
3483	int changed = 0;	3457	int changed = 0;
3484		3458
3485	if (*str != ';')	3459	if (*str != ';')
3486	{	3460	{
3487	if (bgPixmap.set_file (str)) /* change pixmap */	3461	if (bg_set_file (str)) /* change pixmap */
3488	{	3462	{
3489	changed++;	3463	changed++;
3490	str = strchr (str, ';');	3464	str = strchr (str, ';');
3491	if (str == NULL)	3465	if (str == NULL)
3492	bgPixmap.set_defaultGeometry ();	3466	bg_set_default_geometry ();
3493	else	3467	else
3494	bgPixmap.set_geometry (str+1);	3468	bg_set_geometry (str+1);
3495	}	3469	}
3496	}	3470	}
3497	else	3471	else
3498	{	3472	{
3499	str++;	3473	str++;
3500	if (bgPixmap.set_geometry (str, true))	3474	if (bg_set_geometry (str, true))
3501	changed++;	3475	changed++;
3502	}	3476	}
3503		3477
3504	if (changed)	3478	if (changed)
3505	{	3479	{
3506	if (bgPixmap.window_position_sensitive ())	3480	if (bg_window_position_sensitive ())
3507	{	3481	{
3508	int x, y;	3482	int x, y;
3509	get_window_origin (x, y);	3483	get_window_origin (x, y);
3510	bgPixmap.set_position (x, y);	3484	bg_set_position (x, y);
3511	}	3485	}
3512	update_background ();	3486	update_background ();
3513	}	3487	}
3514	}	3488	}
3515	break;	3489	break;
…		…
3984	}	3958	}
3985	}	3959	}
3986	}	3960	}
3987	/}}} /	3961	/}}} /
3988		3962
3989	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3990	void
3991	rxvt_term::process_graphics ()
3992	{
3993	unicode_t ch, cmd = cmd_getc ();
3994
3995	if (cmd == 'Q')
3996	{
3997	/* query graphics */
3998	tt_printf ("\033G0\012"); /* no graphics */
3999	return;
4000	}
4001	/* swallow other graphics sequences until terminating ':' */
4002	do
4003	ch = cmd_getc ();
4004	while (ch != ':');
4005	}
4006	/}}} /
4007
4008	/* ------------------------------------------------------------------------- */	3963	/* ------------------------------------------------------------------------- */
4009		3964
4010	/*	3965	/*
4011	* Send printf () formatted output to the command.	3966	* Send printf () formatted output to the command.
4012	* Only use for small amounts of data.	3967	* Only use for small amounts of data.
…		…
4040		3995
4041	if (v_buflen == 0)	3996	if (v_buflen == 0)
4042	{	3997	{
4043	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	3998	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4044		3999
		4000	max_it (written, 0);
		4001
4045	if ((unsigned int)written == len)	4002	if (written == len)
4046	return;	4003	return;
4047		4004
4048	data += written;	4005	data += written;
4049	len -= written;	4006	len -= written;
4050	}	4007	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.469 by sf-exg, Sat Jan 8 10:15:36 2011 UTC vs. Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.469 by sf-exg, Sat Jan 8 10:15:36 2011 UTC vs.
Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC