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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.474 by sf-exg, Fri Jan 28 00:08:58 2011 UTC vs.
Revision 1.488 by sf-exg, Mon May 30 18:39:03 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
…		…
1152	{	1114	{
1153	}	1115	}
1154	} event_handler;	1116	} event_handler;
1155	#endif	1117	#endif
1156		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
1157	bool	1152	bool
1158	rxvt_term::pty_fill ()	1153	rxvt_term::pty_fill ()
1159	{	1154	{
1160	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1155	cmdbuf_reify ();
1161		1156
1162	if (CBUFSIZ == n)	1157	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163	{	1158
1164	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1159	if (!avail)
1165	n = 0;
1166	}	1160	{
1167		1161	// normally this indicates a "too long" command sequence - just drop the data we have
1168	memmove (cmdbuf_base, cmdbuf_ptr, n);
1169	cmdbuf_ptr = cmdbuf_base;	1162	cmdbuf_ptr = cmdbuf_base;
1170	cmdbuf_endp = cmdbuf_ptr + n;	1163	cmdbuf_endp = cmdbuf_ptr;
		1164	avail = CBUFSIZ;
		1165	}
1171		1166
1172	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1167	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173		1168
1174	if (r > 0)	1169	if (r > 0)
1175	{	1170	{
1176	cmdbuf_endp += r;	1171	cmdbuf_endp += r;
1177	return true;	1172	return true;
…		…
1445	&& ev.xfocus.mode != NotifyGrab)	1440	&& ev.xfocus.mode != NotifyGrab)
1446	focus_out ();	1441	focus_out ();
1447	break;	1442	break;
1448		1443
1449	case ConfigureNotify:	1444	case ConfigureNotify:
1450	if (ev.xconfigure.window == parent[0])	1445	if (ev.xconfigure.window == parent)
1451	{	1446	{
1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453	;	1448	;
1454		1449
1455	#ifdef HAVE_BG_PIXMAP	1450	#ifdef HAVE_BG_PIXMAP
…		…
1492	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493	}	1488	}
1494	break;	1489	break;
1495		1490
1496	case PropertyNotify:	1491	case PropertyNotify:
1497	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1492	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499	&& ev.xproperty.state == PropertyNewValue)
1500	selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502	break;	1493	break;
1503		1494
1504	case SelectionClear:	1495	case SelectionClear:
1505	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1496	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506	break;
1507
1508	case SelectionNotify:
1509	if (selection_wait == Sel_normal)
1510	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511	break;	1497	break;
1512		1498
1513	case SelectionRequest:	1499	case SelectionRequest:
1514	selection_send (ev.xselectionrequest);	1500	selection_send (ev.xselectionrequest);
1515	break;	1501	break;
…		…
1551	if (ev.xany.window == vt)	1537	if (ev.xany.window == vt)
1552	{	1538	{
1553	do	1539	do
1554	{	1540	{
1555	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1556	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, false);
1557	}	1543	}
1558	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1544	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559		1545
1560	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1546	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561		1547
1562	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1548	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563	{	1549	{
1564	scr_expose (ev.xexpose.x, ev.xexpose.y,	1550	scr_expose (ev.xexpose.x, ev.xexpose.y,
1565	ev.xexpose.width, ev.xexpose.height, False);	1551	ev.xexpose.width, ev.xexpose.height, false);
1566	}	1552	}
1567		1553
1568	want_refresh = 1;	1554	want_refresh = 1;
1569	}	1555	}
1570	else	1556	else
…		…
1730	rxvt_term::set_urgency (bool enable)	1716	rxvt_term::set_urgency (bool enable)
1731	{	1717	{
1732	if (enable == urgency_hint)	1718	if (enable == urgency_hint)
1733	return;	1719	return;
1734		1720
1735	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1721	if (XWMHints *h = XGetWMHints (dpy, parent))
1736	{	1722	{
1737	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1723	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1738	XSetWMHints (dpy, parent[0], h);	1724	XSetWMHints (dpy, parent, h);
1739	urgency_hint = enable;	1725	urgency_hint = enable;
1740	}	1726	}
1741	}	1727	}
1742	#endif	1728	#endif
1743		1729
…		…
2233	wchar_t ch = NOCHAR;	2219	wchar_t ch = NOCHAR;
2234	char *seq_begin; // remember start of esc-sequence here	2220	char *seq_begin; // remember start of esc-sequence here
2235		2221
2236	for (;;)	2222	for (;;)
2237	{	2223	{
2238	if (expect_false (ch == NOCHAR))	2224	if (ecb_unlikely (ch == NOCHAR))
2239	{	2225	{
2240	seq_begin = cmdbuf_ptr;	2226	seq_begin = cmdbuf_ptr;
2241	ch = next_char ();	2227	ch = next_char ();
2242		2228
2243	if (ch == NOCHAR)	2229	if (ch == NOCHAR)
2244	break;	2230	break;
2245	}	2231	}
2246		2232
2247	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2233	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2248	{	2234	{
2249	if (expect_false (!seen_input))	2235	if (ecb_unlikely (!seen_input))
2250	{	2236	{
2251	seen_input = 1;	2237	seen_input = 1;
2252	// many badly-written programs (e.g. jed) contain a race condition:	2238	// many badly-written programs (e.g. jed) contain a race condition:
2253	// they first read the screensize and then install a SIGWINCH handler.	2239	// they first read the screensize and then install a SIGWINCH handler.
2254	// some window managers resize the window early, and these programs	2240	// some window managers resize the window early, and these programs
…		…
2267	wchar_t *str = buf;	2253	wchar_t *str = buf;
2268	wchar_t *eol = str + min (ncol, UBUFSIZ);	2254	wchar_t *eol = str + min (ncol, UBUFSIZ);
2269		2255
2270	for (;;)	2256	for (;;)
2271	{	2257	{
2272	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2258	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2273	break;	2259	break;
2274		2260
2275	*str++ = ch;	2261	*str++ = ch;
2276		2262
2277	if (expect_false (ch == C0_LF \|\| str >= eol))	2263	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2278	{	2264	{
2279	if (ch == C0_LF)	2265	if (ch == C0_LF)
2280	nlines++;	2266	nlines++;
2281		2267
2282	refresh_count++;	2268	refresh_count++;
…		…
2360	rxvt_term::next_char () NOTHROW	2346	rxvt_term::next_char () NOTHROW
2361	{	2347	{
2362	while (cmdbuf_ptr < cmdbuf_endp)	2348	while (cmdbuf_ptr < cmdbuf_endp)
2363	{	2349	{
2364	// assume 7-bit to be ascii ALWAYS	2350	// assume 7-bit to be ascii ALWAYS
2365	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2351	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2366	return *cmdbuf_ptr++;	2352	return *cmdbuf_ptr++;
2367		2353
2368	wchar_t wc;	2354	wchar_t wc;
2369	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2355	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370		2356
…		…
2398	: NOCHAR;	2384	: NOCHAR;
2399	}	2385	}
2400		2386
2401	static class out_of_input out_of_input;	2387	static class out_of_input out_of_input;
2402		2388
2403	/* rxvt_cmd_getc () - Return next input character */
2404	/*
2405	* Return the next input character after first passing any keyboard input
2406	* to the command.
2407	*/
2408	wchar_t	2389	wchar_t
2409	rxvt_term::cmd_getc () THROW ((class out_of_input))	2390	rxvt_term::cmd_getc () THROW ((class out_of_input))
2410	{	2391	{
2411	wchar_t c = next_char ();	2392	wchar_t c = next_char ();
2412		2393
…		…
2505	pclose_printer (fd);	2486	pclose_printer (fd);
2506	}	2487	}
2507	#endif /* PRINTPIPE */	2488	#endif /* PRINTPIPE */
2508	/}}} /	2489	/}}} /
2509		2490
2510	/* INDENT-OFF */
2511	enum {	2491	enum {
2512	C1_40 = 0x40,	2492	C1_40 = 0x40,
2513	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,
2514	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,
2515	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,
2516	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,
2517	};	2497	};
2518	/* INDENT-ON */
2519		2498
2520	/{{{ process non-printing single characters /	2499	/{{{ process non-printing single characters /
2521	void	2500	void
2522	rxvt_term::process_nonprinting (unicode_t ch)	2501	rxvt_term::process_nonprinting (unicode_t ch)
2523	{	2502	{
…		…
2645	return;	2624	return;
2646	}	2625	}
2647		2626
2648	switch (ch)	2627	switch (ch)
2649	{	2628	{
2650	/* case 1: do_tek_mode (); break; */
2651	case '#':	2629	case '#':
2652	if (cmd_getc () == '8')	2630	if (cmd_getc () == '8')
2653	scr_E ();	2631	scr_E ();
2654	break;	2632	break;
2655	case '(':	2633	case '(':
…		…
2694		2672
2695	/* 8.3.87: NEXT LINE */	2673	/* 8.3.87: NEXT LINE */
2696	case C1_NEL: /* ESC E */	2674	case C1_NEL: /* ESC E */
2697	{	2675	{
2698	wchar_t nlcr[] = { C0_LF, C0_CR };	2676	wchar_t nlcr[] = { C0_LF, C0_CR };
2699	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2677	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700	}	2678	}
2701	break;	2679	break;
2702		2680
2703	/* kidnapped escape sequence: Should be 8.3.48 */	2681	/* kidnapped escape sequence: Should be 8.3.48 */
2704	case C1_ESA: /* ESC G */	2682	case C1_ESA: /* ESC G */
2705	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 */
2706	break;	2686	break;
2707		2687
2708	/* 8.3.63: CHARACTER TABULATION SET */	2688	/* 8.3.63: CHARACTER TABULATION SET */
2709	case C1_HTS: /* ESC H */	2689	case C1_HTS: /* ESC H */
2710	scr_set_tab (1);	2690	scr_set_tab (1);
…		…
2714	case C1_RI: /* ESC M */	2694	case C1_RI: /* ESC M */
2715	scr_index (DN);	2695	scr_index (DN);
2716	break;	2696	break;
2717		2697
2718	/* 8.3.142: SINGLE-SHIFT TWO */	2698	/* 8.3.142: SINGLE-SHIFT TWO */
2719	/case C1_SS2: scr_single_shift (2); break; /	2699	/* case C1_SS2: break; */
2720		2700
2721	/* 8.3.143: SINGLE-SHIFT THREE */	2701	/* 8.3.143: SINGLE-SHIFT THREE */
2722	/case C1_SS3: scr_single_shift (3); break; /	2702	/* case C1_SS3: break; */
2723		2703
2724	/* 8.3.27: DEVICE CONTROL STRING */	2704	/* 8.3.27: DEVICE CONTROL STRING */
2725	case C1_DCS: /* ESC P */	2705	case C1_DCS: /* ESC P */
2726	process_dcs_seq ();	2706	process_dcs_seq ();
2727	break;	2707	break;
…		…
2760	}	2740	}
2761	}	2741	}
2762	/}}} /	2742	/}}} /
2763		2743
2764	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2744	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2765	/* INDENT-OFF */
2766	enum {	2745	enum {
2767	CSI_ICH = 0x40,	2746	CSI_ICH = 0x40,
2768	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,
2769	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 ,
2770	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,
…		…
2790	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, */
2791	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, */
2792	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, */
2793	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, {, \|, }, ~, */
2794	};	2773	};
2795	/* INDENT-ON */
2796		2774
2797	void	2775	void
2798	rxvt_term::process_csi_seq ()	2776	rxvt_term::process_csi_seq ()
2799	{	2777	{
2800	unicode_t ch, priv, i;	2778	unicode_t ch, priv, i;
…		…
2880	scr_soft_reset ();	2858	scr_soft_reset ();
2881		2859
2882	static const int pm_h[] = { 7, 25 };	2860	static const int pm_h[] = { 7, 25 };
2883	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2861	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884		2862
2885	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2863	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2864	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887	}	2865	}
2888	break;	2866	break;
2889	}	2867	}
2890		2868
2891	return;	2869	return;
…		…
3110	}	3088	}
3111	}	3089	}
3112	/}}} /	3090	/}}} /
3113		3091
3114	#if !ENABLE_MINIMAL	3092	#if !ENABLE_MINIMAL
3115	/* ARGSUSED */
3116	void	3093	void
3117	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3094	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118	{	3095	{
3119	int x, y;	3096	int x, y;
3120	XWindowAttributes wattr;	3097	XWindowAttributes wattr;
…		…
3129	{	3106	{
3130	/*	3107	/*
3131	* commands	3108	* commands
3132	*/	3109	*/
3133	case 1: /* deiconify window */	3110	case 1: /* deiconify window */
3134	XMapWindow (dpy, parent[0]);	3111	XMapWindow (dpy, parent);
3135	break;	3112	break;
3136	case 2: /* iconify window */	3113	case 2: /* iconify window */
3137	XIconifyWindow (dpy, parent[0], display->screen);	3114	XIconifyWindow (dpy, parent, display->screen);
3138	break;	3115	break;
3139	case 3: /* set position (pixels) */	3116	case 3: /* set position (pixels) */
3140	XMoveWindow (dpy, parent[0], args[1], args[2]);	3117	XMoveWindow (dpy, parent, args[1], args[2]);
3141	break;	3118	break;
3142	case 4: /* set size (pixels) */	3119	case 4: /* set size (pixels) */
3143	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3120	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144	break;	3121	break;
3145	case 5: /* raise window */	3122	case 5: /* raise window */
3146	XRaiseWindow (dpy, parent[0]);	3123	XRaiseWindow (dpy, parent);
3147	break;	3124	break;
3148	case 6: /* lower window */	3125	case 6: /* lower window */
3149	XLowerWindow (dpy, parent[0]);	3126	XLowerWindow (dpy, parent);
3150	break;	3127	break;
3151	case 7: /* refresh window */	3128	case 7: /* refresh window */
3152	scr_touch (true);	3129	scr_touch (true);
3153	break;	3130	break;
3154	case 8: /* set size (chars) */	3131	case 8: /* set size (chars) */
…		…
3165		3142
3166	/*	3143	/*
3167	* reports - some output format copied from XTerm	3144	* reports - some output format copied from XTerm
3168	*/	3145	*/
3169	case 11: /* report window state */	3146	case 11: /* report window state */
3170	XGetWindowAttributes (dpy, parent[0], &wattr);	3147	XGetWindowAttributes (dpy, parent, &wattr);
3171	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3148	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172	break;	3149	break;
3173	case 13: /* report window position */	3150	case 13: /* report window position */
3174	XGetWindowAttributes (dpy, parent[0], &wattr);	3151	XGetWindowAttributes (dpy, parent, &wattr);
3175	XTranslateCoordinates (dpy, parent[0], wattr.root,	3152	XTranslateCoordinates (dpy, parent, wattr.root,
3176	-wattr.border_width, -wattr.border_width,	3153	-wattr.border_width, -wattr.border_width,
3177	&x, &y, &wdummy);	3154	&x, &y, &wdummy);
3178	tt_printf ("\033[3;%d;%dt", x, y);	3155	tt_printf ("\033[3;%d;%dt", x, y);
3179	break;	3156	break;
3180	case 14: /* report window size (pixels) */	3157	case 14: /* report window size (pixels) */
3181	XGetWindowAttributes (dpy, parent[0], &wattr);	3158	XGetWindowAttributes (dpy, parent, &wattr);
3182	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3159	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183	break;	3160	break;
3184	case 18: /* report text area size (chars) */	3161	case 18: /* report text area size (chars) */
3185	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3162	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186	break;	3163	break;
…		…
3188	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3165	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189	break;	3166	break;
3190	case 20: /* report icon label */	3167	case 20: /* report icon label */
3191	{	3168	{
3192	char *s;	3169	char *s;
3193	XGetIconName (dpy, parent[0], &s);	3170	XGetIconName (dpy, parent, &s);
3194	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 */
3195	XFree (s);	3172	XFree (s);
3196	}	3173	}
3197	break;	3174	break;
3198	case 21: /* report window title */	3175	case 21: /* report window title */
3199	{	3176	{
3200	char *s;	3177	char *s;
3201	XFetchName (dpy, parent[0], &s);	3178	XFetchName (dpy, parent, &s);
3202	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 */
3203	XFree (s);	3180	XFree (s);
3204	}	3181	}
3205	break;	3182	break;
3206	}	3183	}
…		…
3360	unsigned long bytes_after;	3337	unsigned long bytes_after;
3361	unsigned char *value = 0;	3338	unsigned char *value = 0;
3362	const char *str = "";	3339	const char *str = "";
3363		3340
3364	if (prop	3341	if (prop
3365	&& XGetWindowProperty (dpy, parent[0],	3342	&& XGetWindowProperty (dpy, parent,
3366	prop, 0, 1<<16, 0, AnyPropertyType,	3343	prop, 0, 1<<16, 0, AnyPropertyType,
3367	&actual_type, &actual_format,	3344	&actual_type, &actual_format,
3368	&nitems, &bytes_after, &value) == Success	3345	&nitems, &bytes_after, &value) == Success
3369	&& actual_type != None	3346	&& actual_type != None
3370	&& actual_format == 8)	3347	&& actual_format == 8)
…		…
3382	{	3359	{
3383	*eq = 0;	3360	*eq = 0;
3384	set_utf8_property (display->atom (str), eq + 1);	3361	set_utf8_property (display->atom (str), eq + 1);
3385	}	3362	}
3386	else	3363	else
3387	XDeleteProperty (dpy, parent[0],	3364	XDeleteProperty (dpy, parent,
3388	display->atom (str));	3365	display->atom (str));
3389	}	3366	}
3390	break;	3367	break;
3391		3368
3392	case XTerm_Color:	3369	case XTerm_Color:
…		…
3627	return state;	3604	return state;
3628	}	3605	}
3629		3606
3630	/* we're not using priv _yet_ */	3607	/* we're not using priv _yet_ */
3631	void	3608	void
3632	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3609	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633	{	3610	{
3634	unsigned int i, j;	3611	unsigned int i, j;
3635	int state;	3612	int state;
3636		3613
3637	static const struct	3614	static const struct
…		…
3698	for (i = 0; i < nargs; i++)	3675	for (i = 0; i < nargs; i++)
3699	{	3676	{
3700	state = -1;	3677	state = -1;
3701		3678
3702	/* basic handling */	3679	/* basic handling */
3703	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3680	for (j = 0; j < ecb_array_length (argtopriv); j++)
3704	if (argtopriv[j].argval == arg[i])	3681	if (argtopriv[j].argval == arg[i])
3705	{	3682	{
3706	state = privcases (mode, argtopriv[j].bit);	3683	state = privcases (mode, argtopriv[j].bit);
3707	break;	3684	break;
3708	}	3685	}
…		…
3981	}	3958	}
3982	}	3959	}
3983	}	3960	}
3984	/}}} /	3961	/}}} /
3985		3962
3986	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3987	void
3988	rxvt_term::process_graphics ()
3989	{
3990	unicode_t ch, cmd = cmd_getc ();
3991
3992	if (cmd == 'Q')
3993	{
3994	/* query graphics */
3995	tt_printf ("\033G0\012"); /* no graphics */
3996	return;
3997	}
3998	/* swallow other graphics sequences until terminating ':' */
3999	do
4000	ch = cmd_getc ();
4001	while (ch != ':');
4002	}
4003	/}}} /
4004
4005	/* ------------------------------------------------------------------------- */	3963	/* ------------------------------------------------------------------------- */
4006		3964
4007	/*	3965	/*
4008	* Send printf () formatted output to the command.	3966	* Send printf () formatted output to the command.
4009	* Only use for small amounts of data.	3967	* Only use for small amounts of data.
…		…
4037		3995
4038	if (v_buflen == 0)	3996	if (v_buflen == 0)
4039	{	3997	{
4040	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));
4041		3999
		4000	max_it (written, 0);
		4001
4042	if ((unsigned int)written == len)	4002	if (written == len)
4043	return;	4003	return;
4044		4004
4045	data += written;	4005	data += written;
4046	len -= written;	4006	len -= written;
4047	}	4007	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.474 by sf-exg, Fri Jan 28 00:08:58 2011 UTC vs. Revision 1.488 by sf-exg, Mon May 30 18:39:03 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.474 by sf-exg, Fri Jan 28 00:08:58 2011 UTC vs.
Revision 1.488 by sf-exg, Mon May 30 18:39:03 2011 UTC