[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.192 by root, Fri Feb 4 11:41: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
…		…
1187		1182
1188	/{{{ process an X event /	1183	/{{{ process an X event /
1189	void	1184	void
1190	rxvt_term::x_cb (XEvent &ev)	1185	rxvt_term::x_cb (XEvent &ev)
1191	{	1186	{
		1187	dDisp;
		1188
1192	SET_R (this);	1189	SET_R (this);
1193	SET_LOCALE (locale);	1190	SET_LOCALE (locale);
1194		1191
1195	#if defined(CURSOR_BLINK)	1192	#if defined(CURSOR_BLINK)
1196	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1193	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1217	if (ev.type == KeyPress && hidden_pointer == 0)	1214	if (ev.type == KeyPress && hidden_pointer == 0)
1218	pointer_blank ();	1215	pointer_blank ();
1219	}	1216	}
1220	#endif	1217	#endif
1221		1218
1222	Window unused_root, unused_child;	1219	Window unused_root, unused_child;
1223	int unused_root_x, unused_root_y;	1220	int unused_root_x, unused_root_y;
1224	unsigned int unused_mask;	1221	unsigned int unused_mask;
1225		1222
1226	switch (ev.type)	1223	switch (ev.type)
1227	{	1224	{
1228	case KeyPress:	1225	case KeyPress:
1229	#if ISO_14755	1226	#if ISO_14755
…		…
1327	Atom ActualType;	1324	Atom ActualType;
1328	int ActualFormat;	1325	int ActualFormat;
1329	unsigned char *data;	1326	unsigned char *data;
1330	unsigned long Size, RemainingBytes;	1327	unsigned long Size, RemainingBytes;
1331		1328
1332	XGetWindowProperty (display->display, display->root,	1329	XGetWindowProperty (disp, display->root,
1333	xa[XA_DNDSELECTION],	1330	xa[XA_DNDSELECTION],
1334	0L, 1000000L,	1331	0L, 1000000L,
1335	False, AnyPropertyType,	1332	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1333	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1334	&Size, &RemainingBytes,
1338	&data);	1335	&data);
1339	XChangeProperty (display->display, display->root,	1336	set_string_property (XA_CUT_BUFFER0, data);
1340	XA_CUT_BUFFER0, XA_STRING,
1341	8, PropModeReplace,
1342	data, strlen (data));
1343	XFree (data);	1337	XFree (data);
1344	selection_paste (display->root, XA_CUT_BUFFER0, True);	1338	selection_paste (display->root, XA_CUT_BUFFER0, true);
1345	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1339	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346	}	1340	}
1347	#endif /* OFFIX_DND */	1341	#endif /* OFFIX_DND */
1348	break;	1342	break;
1349		1343
1350	case MappingNotify:	1344	case MappingNotify:
…		…
1443	{ /* Wrap lots of configures into one */	1437	{ /* Wrap lots of configures into one */
1444	width = ev.xconfigure.width;	1438	width = ev.xconfigure.width;
1445	height = ev.xconfigure.height;	1439	height = ev.xconfigure.height;
1446	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1440	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447	}	1441	}
1448	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1442	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1449		1443
1450	if (szHint.width != width \|\| szHint.height != height)	1444	if (szHint.width != width \|\| szHint.height != height)
1451	{	1445	{
1452	seen_resize = 1;	1446	seen_resize = 1;
1453	resize_all_windows (width, height, 1);	1447	resize_all_windows (width, height, 1);
1454	}	1448	}
1455		1449
1456	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457	if (options & Opt_transparent)	1451	if (options & Opt_transparent)
1458	{
1459	check_our_parents ();	1452	check_our_parents ();
1460	if (am_transparent)
1461	want_refresh = want_full_refresh = 1;
1462	}
1463	#endif	1453	#endif
1464	}	1454	}
1465	break;	1455	break;
1466		1456
1467	case PropertyNotify:	1457	case PropertyNotify:
…		…
1475	selection_clear ();	1465	selection_clear ();
1476	break;	1466	break;
1477		1467
1478	case SelectionNotify:	1468	case SelectionNotify:
1479	if (selection_wait == Sel_normal)	1469	if (selection_wait == Sel_normal)
1480	selection_paste (ev.xselection.requestor,	1470	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481	ev.xselection.property, True);
1482	break;	1471	break;
1483		1472
1484	case SelectionRequest:	1473	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1474	selection_send (ev.xselectionrequest);
1486	break;	1475	break;
…		…
1510	if (ev.xany.window == TermWin.vt)	1499	if (ev.xany.window == TermWin.vt)
1511	{	1500	{
1512	do	1501	do
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
1515	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1504	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1516		1505
1517	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1506	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518		1507
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1508	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1520	scr_expose (ev.xexpose.x, ev.xexpose.y,	1509	scr_expose (ev.xexpose.x, ev.xexpose.y,
1521	ev.xexpose.width, ev.xexpose.height, False);	1510	ev.xexpose.width, ev.xexpose.height, False);
1522		1511
1523	scr_refresh (refresh_type);	1512	scr_refresh (refresh_type);
1524	}	1513	}
1525	else	1514	else
1526	{	1515	{
1527	XEvent unused_event;	1516	XEvent unused_event;
1528		1517
1529	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1518	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530	;	1519	;
1531	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1520	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532	;	1521	;
1533		1522
1534	if (isScrollbarWindow (ev.xany.window))	1523	if (isScrollbarWindow (ev.xany.window))
1535	{	1524	{
1536	scrollBar.setIdle ();	1525	scrollBar.setIdle ();
…		…
1541	menubar_expose ();	1530	menubar_expose ();
1542	#endif	1531	#endif
1543		1532
1544	#ifdef TRANSPARENT	1533	#ifdef TRANSPARENT
1545	if (am_transparent && ev.xany.window == TermWin.parent[0])	1534	if (am_transparent && ev.xany.window == TermWin.parent[0])
1546	XClearWindow (display->display, ev.xany.window);	1535	XClearWindow (disp, ev.xany.window);
1547	#endif	1536	#endif
1548	}	1537	}
1549	break;	1538	break;
1550		1539
1551	case MotionNotify:	1540	case MotionNotify:
…		…
1565		1554
1566	if (ev.xany.window == TermWin.vt)	1555	if (ev.xany.window == TermWin.vt)
1567	{	1556	{
1568	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1557	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1569	{	1558	{
1570	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1559	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1571	;	1560	;
1572		1561
1573	XQueryPointer (display->display, TermWin.vt,	1562	XQueryPointer (disp, TermWin.vt,
1574	&unused_root, &unused_child,	1563	&unused_root, &unused_child,
1575	&unused_root_x, &unused_root_y,	1564	&unused_root_x, &unused_root_y,
1576	&ev.xbutton.x, &ev.xbutton.y,	1565	&ev.xbutton.x, &ev.xbutton.y,
1577	&ev.xbutton.state);	1566	&ev.xbutton.state);
1578	#ifdef MOUSE_THRESHOLD	1567	#ifdef MOUSE_THRESHOLD
…		…
1642	#endif	1631	#endif
1643	}	1632	}
1644	}	1633	}
1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1634	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646	{	1635	{
1647	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1636	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648	MotionNotify, &ev))	1637	MotionNotify, &ev))
1649	;	1638	;
1650		1639
1651	XQueryPointer (display->display, scrollBar.win,	1640	XQueryPointer (disp, scrollBar.win,
1652	&unused_root, &unused_child,	1641	&unused_root, &unused_child,
1653	&unused_root_x, &unused_root_y,	1642	&unused_root_x, &unused_root_y,
1654	&ev.xbutton.x, &ev.xbutton.y,	1643	&ev.xbutton.x, &ev.xbutton.y,
1655	&unused_mask);	1644	&unused_mask);
1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1645	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1675	case PropertyNotify:	1664	case PropertyNotify:
1676	/*	1665	/*
1677	* if user used some Esetroot compatible prog to set the root bg,	1666	* 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.	1667	* use the property to determine the pixmap. We use it later on.
1679	*/	1668	*/
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])	1669	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1670	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684	return;	1671	return;
1685		1672
1686	/* FALLTHROUGH */	1673	/* FALLTHROUGH */
1687	case ReparentNotify:	1674	case ReparentNotify:
1688	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1675	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1760	{	1747	{
1761	case Button1:	1748	case Button1:
1762	/* allow meta + click to select rectangular areas */	1749	/* allow meta + click to select rectangular areas */
1763	/* should be done in screen.C */	1750	/* should be done in screen.C */
1764	#if ENABLE_FRILLS	1751	#if ENABLE_FRILLS
1765	selection.rect = !! (ev.state & ModMetaMask);	1752	selection.rect = !!(ev.state & ModMetaMask);
1766	#else	1753	#else
1767	selection.rect = false;	1754	selection.rect = false;
1768	#endif	1755	#endif
1769		1756
1770	/* allow shift+left click to extend selection */	1757	/* allow shift+left click to extend selection */
…		…
2096	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2083	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2097	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2084	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2085	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099	int i;	2086	int i;
2100		2087
2101	Visual* visual = display->visual;	2088	Visual *visual = display->visual;
2102		2089
2103	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2090	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2104		2091
2105	/* for convenience */	2092	/* for convenience */
2106	mask_r = visual->red_mask;	2093	mask_r = visual->red_mask;
…		…
2327	Atom atype;	2314	Atom atype;
2328	unsigned char *prop = NULL;	2315	unsigned char *prop = NULL;
2329	Window root, oldp, *list;	2316	Window root, oldp, *list;
2330	Pixmap rootpixmap = None;	2317	Pixmap rootpixmap = None;
2331	XWindowAttributes wattr, wrootattr;	2318	XWindowAttributes wattr, wrootattr;
		2319	dDisp;
2332		2320
2333	pchanged = 0;	2321	pchanged = 0;
2334		2322
2335	if (!(options & Opt_transparent))	2323	if (!(options & Opt_transparent))
2336	return pchanged; /* Don't try any more */	2324	return pchanged; /* Don't try any more */
2337		2325
2338	XGetWindowAttributes (display->display, display->root, &wrootattr);	2326	XGetWindowAttributes (disp, display->root, &wrootattr);
2339	rootdepth = wrootattr.depth;	2327	rootdepth = wrootattr.depth;
2340		2328
2341	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2329	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2342		2330
2343	if (rootdepth != wattr.depth)	2331	if (rootdepth != wattr.depth)
2344	{	2332	{
2345	if (am_transparent)	2333	if (am_transparent)
2346	{	2334	{
2347	pchanged = 1;	2335	pchanged = 1;
2348	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2336	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2349	am_transparent = am_pixmap_trans = 0;	2337	am_transparent = am_pixmap_trans = 0;
2350	}	2338	}
2351		2339
2352	return pchanged; /* Don't try any more */	2340	return pchanged; /* Don't try any more */
2353	}	2341	}
2354		2342
2355	/* Get all X ops out of the queue so that our information is up-to-date. */	2343	/* Get all X ops out of the queue so that our information is up-to-date. */
2356	XSync (display->display, False);	2344	XSync (disp, False);
2357		2345
2358	/*	2346	/*
2359	* Make the frame window set by the window manager have	2347	* Make the frame window set by the window manager have
2360	* the root background. Some window managers put multiple nested frame	2348	* the root background. Some window managers put multiple nested frame
2361	* windows for each client, so we have to take care about that.	2349	* windows for each client, so we have to take care about that.
2362	*/	2350	*/
2363	i = (xa[XA_XROOTPMAPID]	2351	i = (xa[XA_XROOTPMAP_ID]
2364	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2352	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2353	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366	&nitems, &bytes_after, &prop) == Success);	2354	&nitems, &bytes_after, &prop) == Success);
2367		2355
2368	if (!i \|\| prop == NULL)	2356	if (!i \|\| prop == NULL)
2369	i = (xa[XA_XSETROOTID]	2357	i = (xa[XA_ESETROOT_PMAP_ID]
2370	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2358	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2359	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372	&nitems, &bytes_after, &prop) == Success);	2360	&nitems, &bytes_after, &prop) == Success);
2373		2361
2374	if (!i \|\| prop == NULL	2362	if (!i \|\| prop == NULL
2375	#if TINTING	2363	#if TINTING
…		…
2394	Window cr;	2382	Window cr;
2395	XImage *image;	2383	XImage *image;
2396	GC gc;	2384	GC gc;
2397	XGCValues gcvalue;	2385	XGCValues gcvalue;
2398		2386
2399	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2387	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2400	0, 0, &sx, &sy, &cr);	2388	0, 0, &sx, &sy, &cr);
2401	nw = (unsigned int)szHint.width;	2389	nw = (unsigned int)szHint.width;
2402	nh = (unsigned int)szHint.height;	2390	nh = (unsigned int)szHint.height;
2403	nx = ny = 0;	2391	nx = ny = 0;
2404		2392
…		…
2416	sy = 0;	2404	sy = 0;
2417	}	2405	}
2418		2406
2419	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2407	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2408	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2409
		2410	XSync (disp, False);
2421	allowedxerror = -1;	2411	allowedxerror = -1;
2422	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2412	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423		2413
2424	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2414	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2425	/* XXX: may need a delay here? */	2415	/* XXX: may need a delay here? */
2426	allowedxerror = 0;	2416	allowedxerror = 0;
2427		2417
…		…
2430	if (am_transparent && am_pixmap_trans)	2420	if (am_transparent && am_pixmap_trans)
2431	{	2421	{
2432	pchanged = 1;	2422	pchanged = 1;
2433	if (TermWin.pixmap != None)	2423	if (TermWin.pixmap != None)
2434	{	2424	{
2435	XFreePixmap (display->display, TermWin.pixmap);	2425	XFreePixmap (disp, TermWin.pixmap);
2436	TermWin.pixmap = None;	2426	TermWin.pixmap = None;
2437	}	2427	}
2438	}	2428	}
2439		2429
2440	am_pixmap_trans = 0;	2430	am_pixmap_trans = 0;
2441	}	2431	}
2442	else	2432	else
2443	{	2433	{
2444	if (TermWin.pixmap != None)	2434	if (TermWin.pixmap != None)
2445	XFreePixmap (display->display, TermWin.pixmap);	2435	XFreePixmap (disp, TermWin.pixmap);
2446		2436
2447	#if TINTING	2437	#if TINTING
2448	if (ISSET_PIXCOLOR (Color_tint))	2438	if (ISSET_PIXCOLOR (Color_tint))
2449	{	2439	{
2450	unsigned short rm, gm, bm;	2440	unsigned short rm, gm, bm;
…		…
2454		2444
2455	ShadeXImage (display, image, shade, rm, gm, bm);	2445	ShadeXImage (display, image, shade, rm, gm, bm);
2456	}	2446	}
2457	#endif	2447	#endif
2458		2448
2459	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2449	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2460	szHint.width, szHint.height, image->depth);	2450	szHint.width, szHint.height, image->depth);
2461	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2451	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2462	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2452	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2463	nx, ny, image->width, image->height);	2453	nx, ny, image->width, image->height);
2464	XFreeGC (display->display, gc);	2454	XFreeGC (disp, gc);
2465	XDestroyImage (image);	2455	XDestroyImage (image);
2466	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2456	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2467	XClearWindow (display->display, TermWin.parent[0]);	2457	XClearWindow (disp, TermWin.parent[0]);
2468		2458
2469	if (!am_transparent \|\| !am_pixmap_trans)	2459	if (!am_transparent \|\| !am_pixmap_trans)
2470	pchanged = 1;	2460	pchanged = 1;
2471		2461
2472	am_transparent = am_pixmap_trans = 1;	2462	am_transparent = am_pixmap_trans = 1;
2473	}	2463	}
2474	}	2464	}
2475		2465
2476	if (!am_pixmap_trans)	2466	if (am_pixmap_trans)
		2467	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2468	else
2477	{	2469	{
2478	unsigned int n;	2470	unsigned int n;
2479	/*	2471	/*
2480	* InheritPixmap transparency	2472	* InheritPixmap transparency
2481	*/	2473	*/
2482	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2474	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2483	{	2475	{
2484	oldp = TermWin.parent[i];	2476	oldp = TermWin.parent[i];
2485	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2477	XQueryTree (disp, TermWin.parent[i - 1], &root,
2486	&TermWin.parent[i], &list, &n);	2478	&TermWin.parent[i], &list, &n);
2487	XFree (list);	2479	XFree (list);
2488		2480
2489	if (TermWin.parent[i] == display->root)	2481	if (TermWin.parent[i] == display->root)
2490	{	2482	{
…		…
2502		2494
2503	if (pchanged)	2495	if (pchanged)
2504	{	2496	{
2505	for (; n < (unsigned int)i; n++)	2497	for (; n < (unsigned int)i; n++)
2506	{	2498	{
2507	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2499	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2508	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2500	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2509	{	2501	{
2510	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2502	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2511	break;	2503	break;
2512	}	2504	}
2513	}	2505	}
2514	}	2506	}
2515		2507
2516	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2508	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2517	{	2509	{
2518	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2510	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2519	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2511	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2520	am_transparent = 0;	2512	am_transparent = 0;
2521	/* XXX: also turn off Opt_transparent? */	2513	/* XXX: also turn off Opt_transparent? */
2522	}	2514	}
2523	else	2515	else
2524	{	2516	{
…		…
2527	* needed for fvwm2.2.2 (and before?) */	2519	* needed for fvwm2.2.2 (and before?) */
2528	sleep (1);	2520	sleep (1);
2529	#endif	2521	#endif
2530	for (n = 0; n < (unsigned int)i; n++)	2522	for (n = 0; n < (unsigned int)i; n++)
2531	{	2523	{
2532	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2524	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2533	XClearWindow (display->display, TermWin.parent[n]);	2525	XClearWindow (disp, TermWin.parent[n]);
2534	}	2526	}
2535		2527
2536	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2528	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2537	am_transparent = 1;	2529	am_transparent = 1;
2538	}	2530	}
2539		2531
2540	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2532	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2541	TermWin.parent[i] = None;	2533	TermWin.parent[i] = None;
2542	}	2534	}
2543		2535
2544	if (scrollBar.win)	2536	if (scrollBar.win)
2545	{	2537	{
2546	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2538	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547	scrollBar.setIdle ();	2539	scrollBar.setIdle ();
2548	scrollbar_show (0);	2540	scrollbar_show (0);
		2541	}
		2542
		2543	if (am_transparent)
		2544	{
		2545	want_refresh = want_full_refresh = 1;
		2546	if (am_pixmap_trans)
		2547	flush ();
2549	}	2548	}
2550		2549
2551	return pchanged;	2550	return pchanged;
2552	}	2551	}
2553	#endif	2552	#endif
…		…
2705	if (len == (size_t)-1)	2704	if (len == (size_t)-1)
2706	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2705	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707		2706
2708	// assume wchar == unicode	2707	// assume wchar == unicode
2709	cmdbuf_ptr += len;	2708	cmdbuf_ptr += len;
2710	return wc;	2709	return wc & UNICODE_MASK;
2711	}	2710	}
2712		2711
2713	return NOCHAR;	2712	return NOCHAR;
2714	}	2713	}
2715		2714
…		…
3417	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3416	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418	{	3417	{
3419	int x, y;	3418	int x, y;
3420	XWindowAttributes wattr;	3419	XWindowAttributes wattr;
3421	Window wdummy;	3420	Window wdummy;
		3421	dDisp;
3422		3422
3423	if (nargs == 0)	3423	if (nargs == 0)
3424	return;	3424	return;
3425		3425
3426	switch (args[0])	3426	switch (args[0])
3427	{	3427	{
3428	/*	3428	/*
3429	* commands	3429	* commands
3430	*/	3430	*/
3431	case 1: /* deiconify window */	3431	case 1: /* deiconify window */
3432	XMapWindow (display->display, TermWin.parent[0]);	3432	XMapWindow (disp, TermWin.parent[0]);
3433	break;	3433	break;
3434	case 2: /* iconify window */	3434	case 2: /* iconify window */
3435	XIconifyWindow (display->display, TermWin.parent[0],	3435	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3436	DefaultScreen (display->display));
3437	break;	3436	break;
3438	case 3: /* set position (pixels) */	3437	case 3: /* set position (pixels) */
3439	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3438	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3440	break;	3439	break;
3441	case 4: /* set size (pixels) */	3440	case 4: /* set size (pixels) */
3442	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3441	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443	break;	3442	break;
3444	case 5: /* raise window */	3443	case 5: /* raise window */
3445	XRaiseWindow (display->display, TermWin.parent[0]);	3444	XRaiseWindow (disp, TermWin.parent[0]);
3446	break;	3445	break;
3447	case 6: /* lower window */	3446	case 6: /* lower window */
3448	XLowerWindow (display->display, TermWin.parent[0]);	3447	XLowerWindow (disp, TermWin.parent[0]);
3449	break;	3448	break;
3450	case 7: /* refresh window */	3449	case 7: /* refresh window */
3451	scr_touch (true);	3450	scr_touch (true);
3452	break;	3451	break;
3453	case 8: /* set size (chars) */	3452	case 8: /* set size (chars) */
…		…
3465		3464
3466	/*	3465	/*
3467	* reports - some output format copied from XTerm	3466	* reports - some output format copied from XTerm
3468	*/	3467	*/
3469	case 11: /* report window state */	3468	case 11: /* report window state */
3470	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3469	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3470	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472	break;	3471	break;
3473	case 13: /* report window position */	3472	case 13: /* report window position */
3474	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3473	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3475	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3474	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3476	-wattr.border_width, -wattr.border_width,	3475	-wattr.border_width, -wattr.border_width,
3477	&x, &y, &wdummy);	3476	&x, &y, &wdummy);
3478	tt_printf ("\033[3;%d;%dt", x, y);	3477	tt_printf ("\033[3;%d;%dt", x, y);
3479	break;	3478	break;
3480	case 14: /* report window size (pixels) */	3479	case 14: /* report window size (pixels) */
3481	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3480	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3482	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3481	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483	break;	3482	break;
3484	case 18: /* report text area size (chars) */	3483	case 18: /* report text area size (chars) */
3485	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3484	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3486	break;	3485	break;
…		…
3488	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3487	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489	break;	3488	break;
3490	case 20: /* report icon label */	3489	case 20: /* report icon label */
3491	{	3490	{
3492	char *s;	3491	char *s;
3493	XGetIconName (display->display, TermWin.parent[0], &s);	3492	XGetIconName (disp, TermWin.parent[0], &s);
3494	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3493	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495	XFree (s);	3494	XFree (s);
3496	}	3495	}
3497	break;	3496	break;
3498	case 21: /* report window title */	3497	case 21: /* report window title */
3499	{	3498	{
3500	char *s;	3499	char *s;
3501	XFetchName (display->display, TermWin.parent[0], &s);	3500	XFetchName (disp, TermWin.parent[0], &s);
3502	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3501	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503	XFree (s);	3502	XFree (s);
3504	}	3503	}
3505	break;	3504	break;
3506	}	3505	}
…		…
3513	* ends_how is terminator used. returned input must be free()'d	3512	* ends_how is terminator used. returned input must be free()'d
3514	*/	3513	*/
3515	unsigned char *	3514	unsigned char *
3516	rxvt_term::get_to_st (unicode_t &ends_how)	3515	rxvt_term::get_to_st (unicode_t &ends_how)
3517	{	3516	{
3518	unicode_t seen_esc = 0, ch;	3517	unicode_t ch;
		3518	bool seen_esc = false;
3519	unsigned int n = 0;	3519	unsigned int n = 0;
3520	unsigned char *s;
3521	unsigned char string[STRING_MAX];	3520	wchar_t string[STRING_MAX];
3522		3521
3523	while ((ch = cmd_getc ()) != NOCHAR)	3522	while ((ch = cmd_getc ()) != NOCHAR)
3524	{	3523	{
3525	if (seen_esc)	3524	if (seen_esc)
3526	{	3525	{
…		…
3529	else	3528	else
3530	return NULL;	3529	return NULL;
3531	}	3530	}
3532	else if (ch == C0_ESC)	3531	else if (ch == C0_ESC)
3533	{	3532	{
3534	seen_esc = 1;	3533	seen_esc = true;
3535	continue;	3534	continue;
3536	}	3535	}
3537	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3536	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3538	break;	3537	break;
3539	else if (ch < 0x20)	3538	else if (ch < 0x20)
3540	return NULL; /* other control character - exit */	3539	return NULL; /* other control character - exit */
3541		3540
3542	seen_esc = 0;	3541	seen_esc = false;
3543		3542
3544	if (n >= sizeof (string) - 1)	3543	if (n >= sizeof (string) - 1)
3545	// stop at some sane length	3544	// stop at some sane length
3546	return NULL;	3545	return NULL;
3547		3546
…		…
3551	string[n++] = ch;	3550	string[n++] = ch;
3552	}	3551	}
3553		3552
3554	string[n++] = '\0';	3553	string[n++] = '\0';
3555		3554
3556	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557	return NULL;
3558
3559	ends_how = (ch == 0x5c ? C0_ESC : ch);	3555	ends_how = (ch == 0x5c ? C0_ESC : ch);
3560	strncpy (s, string, n);	3556
3561	return s;	3557	return (unsigned char *)rxvt_wcstombs (string);
3562	}	3558	}
3563		3559
3564	/----------------------------------------------------------------------/	3560	/----------------------------------------------------------------------/
3565	/*	3561	/*
3566	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3562	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3651	int changed = 0;	3647	int changed = 0;
3652	int color;	3648	int color;
3653	char buf, name;	3649	char buf, name;
3654	bool query = str[0] == '?' && !str[1];	3650	bool query = str[0] == '?' && !str[1];
3655	int saveop = op;	3651	int saveop = op;
		3652	dDisp;
3656		3653
3657	assert (str != NULL);	3654	assert (str != NULL);
3658	switch (op)	3655	switch (op)
3659	{	3656	{
3660	case XTerm_name:	3657	case XTerm_name:
…		…
3667	set_title (str);	3664	set_title (str);
3668	break;	3665	break;
3669	case XTerm_property:	3666	case XTerm_property:
3670	if (str[0] == '?')	3667	if (str[0] == '?')
3671	{	3668	{
3672	Atom prop = XInternAtom (display->display, str + 1, True);	3669	Atom prop = display->atom (str + 1);
3673	Atom actual_type;	3670	Atom actual_type;
3674	int actual_format;	3671	int actual_format;
3675	unsigned long nitems;	3672	unsigned long nitems;
3676	unsigned long bytes_after;	3673	unsigned long bytes_after;
3677	unsigned char *value = 0;	3674	unsigned char *value = 0;
3678	const char *str = "";	3675	const char *str = "";
3679		3676
3680	if (prop	3677	if (prop
3681	&& XGetWindowProperty (display->display, TermWin.parent[0],	3678	&& XGetWindowProperty (disp, TermWin.parent[0],
3682	prop, 0, 1<<16, 0, AnyPropertyType,	3679	prop, 0, 1<<16, 0, AnyPropertyType,
3683	&actual_type, &actual_format,	3680	&actual_type, &actual_format,
3684	&nitems, &bytes_after, &value) == Success	3681	&nitems, &bytes_after, &value) == Success
3685	&& actual_type != None	3682	&& actual_type != None
3686	&& actual_format == 8)	3683	&& actual_format == 8)
…		…
3695	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3692	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696		3693
3697	if (eq)	3694	if (eq)
3698	{	3695	{
3699	*eq = 0;	3696	*eq = 0;
3700	XChangeProperty (display->display, TermWin.parent[0],	3697	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	}	3698	}
3705	else	3699	else
3706	XDeleteProperty (display->display, TermWin.parent[0],	3700	XDeleteProperty (disp, TermWin.parent[0],
3707	display->atom (str));	3701	display->atom (str));
3708	}	3702	}
3709	break;	3703	break;
3710		3704
3711	case XTerm_Color:	3705	case XTerm_Color:
…		…
3786	{	3780	{
3787	str++;	3781	str++;
3788	#if XPM_BACKGROUND	3782	#if XPM_BACKGROUND
3789	changed += scale_pixmap (str);	3783	changed += scale_pixmap (str);
3790	#endif	3784	#endif
3791
3792	}	3785	}
		3786
3793	if (changed)	3787	if (changed)
3794	{	3788	{
3795	#ifdef XPM_BACKGROUND	3789	#ifdef XPM_BACKGROUND
3796	resize_pixmap ();	3790	resize_pixmap ();
3797	#endif	3791	#endif
…		…
3838	if (query)	3832	if (query)
3839	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3833	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3840	else	3834	else
3841	{	3835	{
3842	set_locale (str);	3836	set_locale (str);
		3837	pty.set_utf8_mode (enc_utf8);
3843	# ifdef USE_XIM	3838	# ifdef USE_XIM
3844	im_cb ();	3839	im_cb ();
3845	# endif	3840	# endif
3846	}	3841	}
3847	break;	3842	break;
…		…
4285		4280
4286	/* ---------------------------------------------------------------------- */	4281	/* ---------------------------------------------------------------------- */
4287	/* Write data to the pty as typed by the user, pasted with the mouse,	4282	/* 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.	4283	* or generated by us in response to a query ESC sequence.
4289	*/	4284	*/
		4285	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4286
4290	void	4287	void
4291	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4288	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292	{	4289	{
4293	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4290	if (v_buflen == 0)
		4291	{
		4292	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294		4293
4295	if (len)	4294	if ((unsigned int)written == len)
		4295	return;
		4296
		4297	data += written;
		4298	len -= written;
4296	{	4299	}
		4300
		4301	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4302
		4303	memcpy (v_buffer + v_buflen, data, len);
		4304	v_buflen += len;
		4305
		4306	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4307	}
		4308
		4309	void rxvt_term::pty_write ()
		4310	{
		4311	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4312
		4313	if (written > 0)
		4314	{
		4315	v_buflen -= written;
		4316
4297	if (v_buflen == 0)	4317	if (v_buflen == 0)
4298	{	4318	{
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);	4319	free (v_buffer);
4326	v_buffer = 0;	4320	v_buffer = 0;
4327	v_buflen = 0;	4321	v_buflen = 0;
4328		4322
4329	pty_ev.set (EVENT_READ);	4323	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;	4324	return;
4342	}	4325	}
		4326
		4327	memmove (v_buffer, v_buffer + written, v_buflen);
4343	}	4328	}
		4329	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4330	// original code just ignores this...
		4331	destroy ();
4344	}	4332	}
4345		4333
4346	/----------------------- end-of-file (C source) -----------------------/	4334	/----------------------- end-of-file (C source) -----------------------/
4347		4335

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.192 by root, Fri Feb 4 11:41: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.192 by root, Fri Feb 4 11:41:23 2005 UTC