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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.190 by root, Mon Jan 17 00:59:23 2005 UTC

…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
		53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
53	#include <wchar.h>	57	#include <cwchar>
54	#include <signal.h>	58	#include <csignal>
55		59
56	/----------------------------------------------------------------------/	60	/----------------------------------------------------------------------/
57		61
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		63
…		…
344	valid_keysym = keysym != NoSymbol;	348	valid_keysym = keysym != NoSymbol;
345	}	349	}
346		350
347	if (valid_keysym)	351	if (valid_keysym)
348	{	352	{
		353	#ifdef KEYSYM_RESOURCE
		354	if (keyboard->dispatch (this, keysym, ev.state))
		355	return;
		356	#endif
		357
349	if (TermWin.saveLines)	358	if (TermWin.saveLines)
350	{	359	{
351	#ifdef UNSHIFTED_SCROLLKEYS	360	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	361	if (!ctrl && !meta)
353	#else	362	#else
…		…
487	}	496	}
488	#endif	497	#endif
489		498
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	499	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	500	{
492	#ifdef KEYSYM_RESOURCE
493	if (! (shft \| ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494	{
495	unsigned int l;
496	const unsigned char *kbuf0;
497
498	kbuf0 = (Keysym_map[keysym & 0xFF]);
499	l = (unsigned int)*kbuf0++;
500
501	/* escape prefix */
502	if (meta
503	# ifdef META8_OPTION
504	&& meta_char == C0_ESC
505	# endif
506	)
507	{
508	const unsigned char ch = C0_ESC;
509	tt_write (&ch, 1);
510	}
511
512	tt_write (kbuf0, l);
513	return;
514	}
515	else
516	#endif
517	{	501	{
518	newlen = 1;	502	newlen = 1;
519	switch (keysym)	503	switch (keysym)
520	{	504	{
521	#ifndef NO_BACKSPACE_KEY	505	#ifndef NO_BACKSPACE_KEY
…		…
788	#undef FKEY	772	#undef FKEY
789	default:	773	default:
790	newlen = 0;	774	newlen = 0;
791	break;	775	break;
792	}	776	}
		777
793	if (newlen)	778	if (newlen)
794	len = strlen (kbuf);	779	len = strlen (kbuf);
795	}	780	}
796		781
797	/*	782	/*
…		…
805	}	790	}
806	else if (ctrl && keysym == XK_minus)	791	else if (ctrl && keysym == XK_minus)
807	{	792	{
808	len = 1;	793	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	794	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		795	}
		796	else if (keysym == XK_ISO_Left_Tab)
		797	{
		798	strcpy (kbuf, "\033[Z");
		799	len = 3;
810	}	800	}
811	else	801	else
812	{	802	{
813	#ifdef META8_OPTION	803	#ifdef META8_OPTION
814	/* set 8-bit on */	804	/* set 8-bit on */
…		…
873	#endif /* DEBUG_CMD */	863	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	864	tt_write (kbuf, (unsigned int)len);
875	}	865	}
876	/}}} /	866	/}}} /
877		867
878	#if (MENUBAR_MAX)	868	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
879	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	869	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
880	/* attempt to `write' count to the input buffer */	870	/* attempt to `write' count to the input buffer */
881	unsigned int	871	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	872	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	873	{
…		…
906		896
907	cmd_parse ();	897	cmd_parse ();
908		898
909	return 0;	899	return 0;
910	}	900	}
911	#endif /* MENUBAR_MAX */	901	#endif
912		902
913	void	903	void
914	rxvt_term::flush ()	904	rxvt_term::flush ()
915	{	905	{
916	flush_ev.stop ();	906	flush_ev.stop ();
…		…
1017	{	1007	{
1018	if (mouse_slip_wheel_speed == 0	1008	if (mouse_slip_wheel_speed == 0
1019	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1009	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1010	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1011	{
		1012	if (TermWin.view_start == TermWin.nscrolled \|\|
		1013	TermWin.view_start == 0)
		1014	mouse_slip_wheel_speed = 0;
		1015
1022	refresh_type \|= SMOOTH_REFRESH;	1016	refresh_type \|= SMOOTH_REFRESH;
1023	want_refresh = 1;	1017	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1018	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1019	}
1026	}	1020	}
…		…
1058	rxvt_term::pty_cb (io_watcher &w, short revents)	1052	rxvt_term::pty_cb (io_watcher &w, short revents)
1059	{	1053	{
1060	SET_R (this);	1054	SET_R (this);
1061	SET_LOCALE (locale);	1055	SET_LOCALE (locale);
1062		1056
1063	if (revents & EVENT_WRITE)
1064	tt_write (0, 0);
1065	else if (revents & EVENT_READ)	1057	if (revents & EVENT_READ)
1066	// loop, but don't allow a single term to monopolize us	1058	// loop, but don't allow a single term to monopolize us
1067	while (pty_fill ())	1059	while (pty_fill ())
1068	if (cmd_parse ())	1060	if (cmd_parse ())
1069	break;	1061	break;
		1062
		1063	if (revents & EVENT_WRITE)
		1064	pty_write ();
1070	}	1065	}
1071		1066
1072	void	1067	void
1073	rxvt_term::pointer_unblank ()	1068	rxvt_term::pointer_unblank ()
1074	{	1069	{
…		…
1088	rxvt_term::pointer_blank ()	1083	rxvt_term::pointer_blank ()
1089	{	1084	{
1090	if (! (options & Opt_pointerBlank))	1085	if (! (options & Opt_pointerBlank))
1091	return;	1086	return;
1092		1087
1093	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1088	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094	XFlush (display->display);	1089	XFlush (display->display);
1095		1090
1096	hidden_pointer = 1;	1091	hidden_pointer = 1;
1097	}	1092	}
1098		1093
…		…
1217	if (ev.type == KeyPress && hidden_pointer == 0)	1212	if (ev.type == KeyPress && hidden_pointer == 0)
1218	pointer_blank ();	1213	pointer_blank ();
1219	}	1214	}
1220	#endif	1215	#endif
1221		1216
1222	Window unused_root, unused_child;	1217	Window unused_root, unused_child;
1223	int unused_root_x, unused_root_y;	1218	int unused_root_x, unused_root_y;
1224	unsigned int unused_mask;	1219	unsigned int unused_mask;
1225		1220
1226	switch (ev.type)	1221	switch (ev.type)
1227	{	1222	{
1228	case KeyPress:	1223	case KeyPress:
1229	#if ISO_14755	1224	#if ISO_14755
…		…
1334	0L, 1000000L,	1329	0L, 1000000L,
1335	False, AnyPropertyType,	1330	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1331	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1332	&Size, &RemainingBytes,
1338	&data);	1333	&data);
1339	XChangeProperty (display->display, display->root,	1334	set_string_property (XA_CUT_BUFFER0, data);
1340	XA_CUT_BUFFER0, XA_STRING,
1341	8, PropModeReplace,
1342	data, strlen (data));
1343	XFree (data);	1335	XFree (data);
1344	selection_paste (display->root, XA_CUT_BUFFER0, True);	1336	selection_paste (display->root, XA_CUT_BUFFER0, true);
1345	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1337	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1346	}	1338	}
1347	#endif /* OFFIX_DND */	1339	#endif /* OFFIX_DND */
1348	break;	1340	break;
1349		1341
…		…
1453	resize_all_windows (width, height, 1);	1445	resize_all_windows (width, height, 1);
1454	}	1446	}
1455		1447
1456	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1448	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457	if (options & Opt_transparent)	1449	if (options & Opt_transparent)
1458	{
1459	check_our_parents ();	1450	check_our_parents ();
1460	if (am_transparent)
1461	want_refresh = want_full_refresh = 1;
1462	}
1463	#endif	1451	#endif
1464	}	1452	}
1465	break;	1453	break;
1466		1454
1467	case PropertyNotify:	1455	case PropertyNotify:
…		…
1475	selection_clear ();	1463	selection_clear ();
1476	break;	1464	break;
1477		1465
1478	case SelectionNotify:	1466	case SelectionNotify:
1479	if (selection_wait == Sel_normal)	1467	if (selection_wait == Sel_normal)
1480	selection_paste (ev.xselection.requestor,	1468	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481	ev.xselection.property, True);
1482	break;	1469	break;
1483		1470
1484	case SelectionRequest:	1471	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1472	selection_send (ev.xselectionrequest);
1486	break;	1473	break;
…		…
1675	case PropertyNotify:	1662	case PropertyNotify:
1676	/*	1663	/*
1677	* if user used some Esetroot compatible prog to set the root bg,	1664	* if user used some Esetroot compatible prog to set the root bg,
1678	* use the property to determine the pixmap. We use it later on.	1665	* use the property to determine the pixmap. We use it later on.
1679	*/	1666	*/
1680	if (xa[XA_XROOTPMAPID] == 0)
1681	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1667	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1668	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684	return;	1669	return;
1685		1670
1686	/* FALLTHROUGH */	1671	/* FALLTHROUGH */
1687	case ReparentNotify:	1672	case ReparentNotify:
1688	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1673	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1760	{	1745	{
1761	case Button1:	1746	case Button1:
1762	/* allow meta + click to select rectangular areas */	1747	/* allow meta + click to select rectangular areas */
1763	/* should be done in screen.C */	1748	/* should be done in screen.C */
1764	#if ENABLE_FRILLS	1749	#if ENABLE_FRILLS
1765	selection.rect = !! (ev.state & ModMetaMask);	1750	selection.rect = !!(ev.state & ModMetaMask);
1766	#else	1751	#else
1767	selection.rect = false;	1752	selection.rect = false;
1768	#endif	1753	#endif
1769		1754
1770	/* allow shift+left click to extend selection */	1755	/* allow shift+left click to extend selection */
…		…
2358	/*	2343	/*
2359	* Make the frame window set by the window manager have	2344	* Make the frame window set by the window manager have
2360	* the root background. Some window managers put multiple nested frame	2345	* the root background. Some window managers put multiple nested frame
2361	* windows for each client, so we have to take care about that.	2346	* windows for each client, so we have to take care about that.
2362	*/	2347	*/
2363	i = (xa[XA_XROOTPMAPID]	2348	i = (xa[XA_XROOTPMAP_ID]
2364	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2349	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2365	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2350	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366	&nitems, &bytes_after, &prop) == Success);	2351	&nitems, &bytes_after, &prop) == Success);
2367		2352
2368	if (!i \|\| prop == NULL)	2353	if (!i \|\| prop == NULL)
2369	i = (xa[XA_XSETROOTID]	2354	i = (xa[XA_ESETROOT_PMAP_ID]
2370	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2355	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2371	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372	&nitems, &bytes_after, &prop) == Success);	2357	&nitems, &bytes_after, &prop) == Success);
2373		2358
2374	if (!i \|\| prop == NULL	2359	if (!i \|\| prop == NULL
2375	#if TINTING	2360	#if TINTING
…		…
2416	sy = 0;	2401	sy = 0;
2417	}	2402	}
2418		2403
2419	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2404	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2405	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2406
		2407	XSync (display->display, False);
2421	allowedxerror = -1;	2408	allowedxerror = -1;
2422	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2409	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423		2410
2424	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2411	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2425	/* XXX: may need a delay here? */	2412	/* XXX: may need a delay here? */
…		…
2471		2458
2472	am_transparent = am_pixmap_trans = 1;	2459	am_transparent = am_pixmap_trans = 1;
2473	}	2460	}
2474	}	2461	}
2475		2462
2476	if (!am_pixmap_trans)	2463	if (am_pixmap_trans)
		2464	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
		2465	else
2477	{	2466	{
2478	unsigned int n;	2467	unsigned int n;
2479	/*	2468	/*
2480	* InheritPixmap transparency	2469	* InheritPixmap transparency
2481	*/	2470	*/
…		…
2544	if (scrollBar.win)	2533	if (scrollBar.win)
2545	{	2534	{
2546	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2535	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547	scrollBar.setIdle ();	2536	scrollBar.setIdle ();
2548	scrollbar_show (0);	2537	scrollbar_show (0);
		2538	}
		2539
		2540	if (am_transparent)
		2541	{
		2542	want_refresh = want_full_refresh = 1;
		2543	if (am_pixmap_trans)
		2544	flush ();
2549	}	2545	}
2550		2546
2551	return pchanged;	2547	return pchanged;
2552	}	2548	}
2553	#endif	2549	#endif
…		…
2705	if (len == (size_t)-1)	2701	if (len == (size_t)-1)
2706	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2702	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707		2703
2708	// assume wchar == unicode	2704	// assume wchar == unicode
2709	cmdbuf_ptr += len;	2705	cmdbuf_ptr += len;
2710	return wc;	2706	return wc & UNICODE_MASK;
2711	}	2707	}
2712		2708
2713	return NOCHAR;	2709	return NOCHAR;
2714	}	2710	}
2715		2711
…		…
3513	* ends_how is terminator used. returned input must be free()'d	3509	* ends_how is terminator used. returned input must be free()'d
3514	*/	3510	*/
3515	unsigned char *	3511	unsigned char *
3516	rxvt_term::get_to_st (unicode_t &ends_how)	3512	rxvt_term::get_to_st (unicode_t &ends_how)
3517	{	3513	{
3518	unicode_t seen_esc = 0, ch;	3514	unicode_t ch;
		3515	bool seen_esc = false;
3519	unsigned int n = 0;	3516	unsigned int n = 0;
3520	unsigned char *s;
3521	unsigned char string[STRING_MAX];	3517	wchar_t string[STRING_MAX];
3522		3518
3523	while ((ch = cmd_getc ()) != NOCHAR)	3519	while ((ch = cmd_getc ()) != NOCHAR)
3524	{	3520	{
3525	if (seen_esc)	3521	if (seen_esc)
3526	{	3522	{
…		…
3529	else	3525	else
3530	return NULL;	3526	return NULL;
3531	}	3527	}
3532	else if (ch == C0_ESC)	3528	else if (ch == C0_ESC)
3533	{	3529	{
3534	seen_esc = 1;	3530	seen_esc = true;
3535	continue;	3531	continue;
3536	}	3532	}
3537	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3533	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3538	break;	3534	break;
3539	else if (ch < 0x20)	3535	else if (ch < 0x20)
3540	return NULL; /* other control character - exit */	3536	return NULL; /* other control character - exit */
3541		3537
3542	seen_esc = 0;	3538	seen_esc = false;
3543		3539
3544	if (n >= sizeof (string) - 1)	3540	if (n >= sizeof (string) - 1)
3545	// stop at some sane length	3541	// stop at some sane length
3546	return NULL;	3542	return NULL;
3547		3543
…		…
3551	string[n++] = ch;	3547	string[n++] = ch;
3552	}	3548	}
3553		3549
3554	string[n++] = '\0';	3550	string[n++] = '\0';
3555		3551
3556	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557	return NULL;
3558
3559	ends_how = (ch == 0x5c ? C0_ESC : ch);	3552	ends_how = (ch == 0x5c ? C0_ESC : ch);
3560	strncpy (s, string, n);	3553
3561	return s;	3554	return (unsigned char *)rxvt_wcstombs (string);
3562	}	3555	}
3563		3556
3564	/----------------------------------------------------------------------/	3557	/----------------------------------------------------------------------/
3565	/*	3558	/*
3566	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3559	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3667	set_title (str);	3660	set_title (str);
3668	break;	3661	break;
3669	case XTerm_property:	3662	case XTerm_property:
3670	if (str[0] == '?')	3663	if (str[0] == '?')
3671	{	3664	{
3672	Atom prop = XInternAtom (display->display, str + 1, True);	3665	Atom prop = display->atom (str + 1);
3673	Atom actual_type;	3666	Atom actual_type;
3674	int actual_format;	3667	int actual_format;
3675	unsigned long nitems;	3668	unsigned long nitems;
3676	unsigned long bytes_after;	3669	unsigned long bytes_after;
3677	unsigned char *value = 0;	3670	unsigned char *value = 0;
…		…
3695	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3688	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696		3689
3697	if (eq)	3690	if (eq)
3698	{	3691	{
3699	*eq = 0;	3692	*eq = 0;
3700	XChangeProperty (display->display, TermWin.parent[0],	3693	set_utf8_property (display->atom (str), eq + 1);
3701	display->atom (str), XA_STRING, 8,
3702	PropModeReplace, (unsigned char *)eq + 1,
3703	strlen (eq + 1));
3704	}	3694	}
3705	else	3695	else
3706	XDeleteProperty (display->display, TermWin.parent[0],	3696	XDeleteProperty (display->display, TermWin.parent[0],
3707	display->atom (str));	3697	display->atom (str));
3708	}	3698	}
…		…
3838	if (query)	3828	if (query)
3839	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3829	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3840	else	3830	else
3841	{	3831	{
3842	set_locale (str);	3832	set_locale (str);
		3833	pty.set_utf8_mode (enc_utf8);
3843	# ifdef USE_XIM	3834	# ifdef USE_XIM
3844	im_cb ();	3835	im_cb ();
3845	# endif	3836	# endif
3846	}	3837	}
3847	break;	3838	break;
…		…
4285		4276
4286	/* ---------------------------------------------------------------------- */	4277	/* ---------------------------------------------------------------------- */
4287	/* Write data to the pty as typed by the user, pasted with the mouse,	4278	/* Write data to the pty as typed by the user, pasted with the mouse,
4288	* or generated by us in response to a query ESC sequence.	4279	* or generated by us in response to a query ESC sequence.
4289	*/	4280	*/
		4281	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4282
4290	void	4283	void
4291	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4284	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292	{	4285	{
4293	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4286	if (v_buflen == 0)
		4287	{
		4288	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294		4289
4295	if (len)	4290	if ((unsigned int)written == len)
		4291	return;
		4292
		4293	data += written;
		4294	len -= written;
4296	{	4295	}
		4296
		4297	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4298
		4299	memcpy (v_buffer + v_buflen, data, len);
		4300	v_buflen += len;
		4301
		4302	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4303	}
		4304
		4305	void rxvt_term::pty_write ()
		4306	{
		4307	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4308
		4309	if (written > 0)
		4310	{
		4311	v_buflen -= written;
		4312
4297	if (v_buflen == 0)	4313	if (v_buflen == 0)
4298	{	4314	{
4299	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301	if ((unsigned int)written == len)
4302	return;
4303
4304	data += written;
4305	len -= written;
4306	}
4307
4308
4309	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311	memcpy (v_buffer + v_buflen, data, len);
4312	v_buflen += len;
4313	}
4314
4315	for (;;)
4316	{
4317	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319	if (written > 0)
4320	{
4321	v_buflen -= written;
4322
4323	if (v_buflen == 0)
4324	{
4325	free (v_buffer);	4315	free (v_buffer);
4326	v_buffer = 0;	4316	v_buffer = 0;
4327	v_buflen = 0;	4317	v_buflen = 0;
4328		4318
4329	pty_ev.set (EVENT_READ);	4319	pty_ev.set (EVENT_READ);
4330	return;
4331	}
4332
4333	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}
4335	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4336	// original code just ignores this...
4337	destroy ();
4338	else
4339	{
4340	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4341	return;	4320	return;
4342	}	4321	}
		4322
		4323	memmove (v_buffer, v_buffer + written, v_buflen);
4343	}	4324	}
		4325	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4326	// original code just ignores this...
		4327	destroy ();
4344	}	4328	}
4345		4329
4346	/----------------------- end-of-file (C source) -----------------------/	4330	/----------------------- end-of-file (C source) -----------------------/
4347		4331

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs. Revision 1.190 by root, Mon Jan 17 00:59:23 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.190 by root, Mon Jan 17 00:59:23 2005 UTC