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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.168 by root, Sun Sep 5 09:32:59 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>
		58	#include <csignal>
54		59
55	/----------------------------------------------------------------------/	60	/----------------------------------------------------------------------/
56		61
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		63
…		…
343	valid_keysym = keysym != NoSymbol;	348	valid_keysym = keysym != NoSymbol;
344	}	349	}
345		350
346	if (valid_keysym)	351	if (valid_keysym)
347	{	352	{
		353	#ifdef KEYSYM_RESOURCE
		354	if (keyboard->dispatch (this, keysym, ev.state))
		355	return;
		356	#endif
		357
348	if (TermWin.saveLines)	358	if (TermWin.saveLines)
349	{	359	{
350	#ifdef UNSHIFTED_SCROLLKEYS	360	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	361	if (!ctrl && !meta)
352	#else	362	#else
…		…
417	{	427	{
418	/* normal XTerm key bindings */	428	/* normal XTerm key bindings */
419	case XK_Insert: /* Shift+Insert = paste mouse selection */	429	case XK_Insert: /* Shift+Insert = paste mouse selection */
420	selection_request (ev.time, 0, 0);	430	selection_request (ev.time, 0, 0);
421	return;	431	return;
422	#if TODO // TODO	432	#if TODO
423	/* rxvt extras */	433	/* rxvt extras */
424	case XK_KP_Add: /* Shift+KP_Add = bigger font */	434	case XK_KP_Add: /* Shift+KP_Add = bigger font */
425	change_font (FONT_UP);	435	change_font (FONT_UP);
426	return;	436	return;
427	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	437	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
486	}	496	}
487	#endif	497	#endif
488		498
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	499	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	500	{
491	#ifdef KEYSYM_RESOURCE
492	if (! (shft \| ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493	{
494	unsigned int l;
495	const unsigned char *kbuf0;
496
497	kbuf0 = (Keysym_map[keysym & 0xFF]);
498	l = (unsigned int)*kbuf0++;
499
500	/* escape prefix */
501	if (meta
502	# ifdef META8_OPTION
503	&& meta_char == C0_ESC
504	# endif
505	)
506	{
507	const unsigned char ch = C0_ESC;
508	tt_write (&ch, 1);
509	}
510
511	tt_write (kbuf0, l);
512	return;
513	}
514	else
515	#endif
516	{	501	{
517	newlen = 1;	502	newlen = 1;
518	switch (keysym)	503	switch (keysym)
519	{	504	{
520	#ifndef NO_BACKSPACE_KEY	505	#ifndef NO_BACKSPACE_KEY
…		…
787	#undef FKEY	772	#undef FKEY
788	default:	773	default:
789	newlen = 0;	774	newlen = 0;
790	break;	775	break;
791	}	776	}
		777
792	if (newlen)	778	if (newlen)
793	len = strlen (kbuf);	779	len = strlen (kbuf);
794	}	780	}
795		781
796	/*	782	/*
…		…
804	}	790	}
805	else if (ctrl && keysym == XK_minus)	791	else if (ctrl && keysym == XK_minus)
806	{	792	{
807	len = 1;	793	len = 1;
808	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;
809	}	800	}
810	else	801	else
811	{	802	{
812	#ifdef META8_OPTION	803	#ifdef META8_OPTION
813	/* set 8-bit on */	804	/* set 8-bit on */
…		…
872	#endif /* DEBUG_CMD */	863	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	864	tt_write (kbuf, (unsigned int)len);
874	}	865	}
875	/}}} /	866	/}}} /
876		867
877	#if (MENUBAR_MAX)	868	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
878	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	869	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
879	/* attempt to `write' count to the input buffer */	870	/* attempt to `write' count to the input buffer */
880	unsigned int	871	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	872	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	873	{
…		…
905		896
906	cmd_parse ();	897	cmd_parse ();
907		898
908	return 0;	899	return 0;
909	}	900	}
910	#endif /* MENUBAR_MAX */	901	#endif
911		902
912	void	903	void
913	rxvt_term::flush ()	904	rxvt_term::flush ()
914	{	905	{
915	flush_ev.stop ();	906	flush_ev.stop ();
…		…
1016	{	1007	{
1017	if (mouse_slip_wheel_speed == 0	1008	if (mouse_slip_wheel_speed == 0
1018	\|\| 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)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1010	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1011	{
		1012	if (TermWin.view_start == TermWin.nscrolled \|\|
		1013	TermWin.view_start == 0)
		1014	mouse_slip_wheel_speed = 0;
		1015
1021	refresh_type \|= SMOOTH_REFRESH;	1016	refresh_type \|= SMOOTH_REFRESH;
1022	want_refresh = 1;	1017	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1018	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1019	}
1025	}	1020	}
…		…
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1052	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1053	{
1059	SET_R (this);	1054	SET_R (this);
1060	SET_LOCALE (locale);	1055	SET_LOCALE (locale);
1061		1056
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1057	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1058	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1059	while (pty_fill ())
1067	if (cmd_parse ())	1060	if (cmd_parse ())
1068	break;	1061	break;
		1062
		1063	if (revents & EVENT_WRITE)
		1064	pty_write ();
1069	}	1065	}
1070		1066
1071	void	1067	void
1072	rxvt_term::pointer_unblank ()	1068	rxvt_term::pointer_unblank ()
1073	{	1069	{
…		…
1087	rxvt_term::pointer_blank ()	1083	rxvt_term::pointer_blank ()
1088	{	1084	{
1089	if (! (options & Opt_pointerBlank))	1085	if (! (options & Opt_pointerBlank))
1090	return;	1086	return;
1091		1087
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1088	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1093	XFlush (display->display);	1089	XFlush (display->display);
1094		1090
1095	hidden_pointer = 1;	1091	hidden_pointer = 1;
1096	}	1092	}
1097		1093
…		…
1186		1182
1187	/{{{ process an X event /	1183	/{{{ process an X event /
1188	void	1184	void
1189	rxvt_term::x_cb (XEvent &ev)	1185	rxvt_term::x_cb (XEvent &ev)
1190	{	1186	{
		1187	dDisp;
		1188
1191	SET_R (this);	1189	SET_R (this);
1192	SET_LOCALE (locale);	1190	SET_LOCALE (locale);
1193		1191
1194	#if defined(CURSOR_BLINK)	1192	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1193	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1214	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1215	pointer_blank ();
1218	}	1216	}
1219	#endif	1217	#endif
1220		1218
1221	Window unused_root, unused_child;	1219	Window unused_root, unused_child;
1222	int unused_root_x, unused_root_y;	1220	int unused_root_x, unused_root_y;
1223	unsigned int unused_mask;	1221	unsigned int unused_mask;
1224		1222
1225	switch (ev.type)	1223	switch (ev.type)
1226	{	1224	{
1227	case KeyPress:	1225	case KeyPress:
1228	#if ISO_14755	1226	#if ISO_14755
…		…
1326	Atom ActualType;	1324	Atom ActualType;
1327	int ActualFormat;	1325	int ActualFormat;
1328	unsigned char *data;	1326	unsigned char *data;
1329	unsigned long Size, RemainingBytes;	1327	unsigned long Size, RemainingBytes;
1330		1328
1331	XGetWindowProperty (display->display, display->root,	1329	XGetWindowProperty (disp, display->root,
1332	xa[XA_DNDSELECTION],	1330	xa[XA_DNDSELECTION],
1333	0L, 1000000L,	1331	0L, 1000000L,
1334	False, AnyPropertyType,	1332	False, AnyPropertyType,
1335	&ActualType, &ActualFormat,	1333	&ActualType, &ActualFormat,
1336	&Size, &RemainingBytes,	1334	&Size, &RemainingBytes,
1337	&data);	1335	&data);
1338	XChangeProperty (display->display, display->root,	1336	set_string_property (XA_CUT_BUFFER0, data);
1339	XA_CUT_BUFFER0, XA_STRING,
1340	8, PropModeReplace,
1341	data, strlen (data));
1342	XFree (data);	1337	XFree (data);
1343	selection_paste (display->root, XA_CUT_BUFFER0, True);	1338	selection_paste (display->root, XA_CUT_BUFFER0, true);
1344	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1339	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1345	}	1340	}
1346	#endif /* OFFIX_DND */	1341	#endif /* OFFIX_DND */
1347	break;	1342	break;
1348		1343
1349	case MappingNotify:	1344	case MappingNotify:
…		…
1442	{ /* Wrap lots of configures into one */	1437	{ /* Wrap lots of configures into one */
1443	width = ev.xconfigure.width;	1438	width = ev.xconfigure.width;
1444	height = ev.xconfigure.height;	1439	height = ev.xconfigure.height;
1445	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1440	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446	}	1441	}
1447	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1442	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1448		1443
1449	if (szHint.width != width \|\| szHint.height != height)	1444	if (szHint.width != width \|\| szHint.height != height)
1450	{	1445	{
1451	seen_resize = 1;	1446	seen_resize = 1;
1452	resize_all_windows (width, height, 1);	1447	resize_all_windows (width, height, 1);
1453	}	1448	}
1454		1449
1455	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456	if (options & Opt_transparent)	1451	if (options & Opt_transparent)
1457	{
1458	check_our_parents ();	1452	check_our_parents ();
1459	if (am_transparent)
1460	want_refresh = want_full_refresh = 1;
1461	}
1462	#endif	1453	#endif
1463	}	1454	}
1464	break;	1455	break;
1465		1456
1466	case PropertyNotify:	1457	case PropertyNotify:
…		…
1474	selection_clear ();	1465	selection_clear ();
1475	break;	1466	break;
1476		1467
1477	case SelectionNotify:	1468	case SelectionNotify:
1478	if (selection_wait == Sel_normal)	1469	if (selection_wait == Sel_normal)
1479	selection_paste (ev.xselection.requestor,	1470	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480	ev.xselection.property, True);
1481	break;	1471	break;
1482		1472
1483	case SelectionRequest:	1473	case SelectionRequest:
1484	selection_send (ev.xselectionrequest);	1474	selection_send (ev.xselectionrequest);
1485	break;	1475	break;
…		…
1509	if (ev.xany.window == TermWin.vt)	1499	if (ev.xany.window == TermWin.vt)
1510	{	1500	{
1511	do	1501	do
1512	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1513	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
1514	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1504	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1515		1505
1516	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1506	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517		1507
1518	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1508	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1519	scr_expose (ev.xexpose.x, ev.xexpose.y,	1509	scr_expose (ev.xexpose.x, ev.xexpose.y,
1520	ev.xexpose.width, ev.xexpose.height, False);	1510	ev.xexpose.width, ev.xexpose.height, False);
1521		1511
1522	scr_refresh (refresh_type);	1512	scr_refresh (refresh_type);
1523	}	1513	}
1524	else	1514	else
1525	{	1515	{
1526	XEvent unused_event;	1516	XEvent unused_event;
1527		1517
1528	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1518	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1529	;	1519	;
1530	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1520	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1531	;	1521	;
1532		1522
1533	if (isScrollbarWindow (ev.xany.window))	1523	if (isScrollbarWindow (ev.xany.window))
1534	{	1524	{
1535	scrollBar.setIdle ();	1525	scrollBar.setIdle ();
…		…
1540	menubar_expose ();	1530	menubar_expose ();
1541	#endif	1531	#endif
1542		1532
1543	#ifdef TRANSPARENT	1533	#ifdef TRANSPARENT
1544	if (am_transparent && ev.xany.window == TermWin.parent[0])	1534	if (am_transparent && ev.xany.window == TermWin.parent[0])
1545	XClearWindow (display->display, ev.xany.window);	1535	XClearWindow (disp, ev.xany.window);
1546	#endif	1536	#endif
1547	}	1537	}
1548	break;	1538	break;
1549		1539
1550	case MotionNotify:	1540	case MotionNotify:
…		…
1564		1554
1565	if (ev.xany.window == TermWin.vt)	1555	if (ev.xany.window == TermWin.vt)
1566	{	1556	{
1567	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1557	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1568	{	1558	{
1569	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1559	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1570	;	1560	;
1571		1561
1572	XQueryPointer (display->display, TermWin.vt,	1562	XQueryPointer (disp, TermWin.vt,
1573	&unused_root, &unused_child,	1563	&unused_root, &unused_child,
1574	&unused_root_x, &unused_root_y,	1564	&unused_root_x, &unused_root_y,
1575	&ev.xbutton.x, &ev.xbutton.y,	1565	&ev.xbutton.x, &ev.xbutton.y,
1576	&ev.xbutton.state);	1566	&ev.xbutton.state);
1577	#ifdef MOUSE_THRESHOLD	1567	#ifdef MOUSE_THRESHOLD
…		…
1641	#endif	1631	#endif
1642	}	1632	}
1643	}	1633	}
1644	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1634	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645	{	1635	{
1646	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1636	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1647	MotionNotify, &ev))	1637	MotionNotify, &ev))
1648	;	1638	;
1649		1639
1650	XQueryPointer (display->display, scrollBar.win,	1640	XQueryPointer (disp, scrollBar.win,
1651	&unused_root, &unused_child,	1641	&unused_root, &unused_child,
1652	&unused_root_x, &unused_root_y,	1642	&unused_root_x, &unused_root_y,
1653	&ev.xbutton.x, &ev.xbutton.y,	1643	&ev.xbutton.x, &ev.xbutton.y,
1654	&unused_mask);	1644	&unused_mask);
1655	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1645	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1674	case PropertyNotify:	1664	case PropertyNotify:
1675	/*	1665	/*
1676	* 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,
1677	* 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.
1678	*/	1668	*/
1679	if (xa[XA_XROOTPMAPID] == 0)
1680	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682	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])
1683	return;	1671	return;
1684		1672
1685	/* FALLTHROUGH */	1673	/* FALLTHROUGH */
1686	case ReparentNotify:	1674	case ReparentNotify:
1687	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1675	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1759	{	1747	{
1760	case Button1:	1748	case Button1:
1761	/* allow meta + click to select rectangular areas */	1749	/* allow meta + click to select rectangular areas */
1762	/* should be done in screen.C */	1750	/* should be done in screen.C */
1763	#if ENABLE_FRILLS	1751	#if ENABLE_FRILLS
1764	selection.rect = !! (ev.state & ModMetaMask);	1752	selection.rect = !!(ev.state & ModMetaMask);
1765	#else	1753	#else
1766	selection.rect = false;	1754	selection.rect = false;
1767	#endif	1755	#endif
1768		1756
1769	/* allow shift+left click to extend selection */	1757	/* allow shift+left click to extend selection */
…		…
2095	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2083	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2096	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2084	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2085	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098	int i;	2086	int i;
2099		2087
2100	Visual* visual = display->visual;	2088	Visual *visual = display->visual;
2101		2089
2102	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2090	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2103		2091
2104	/* for convenience */	2092	/* for convenience */
2105	mask_r = visual->red_mask;	2093	mask_r = visual->red_mask;
…		…
2326	Atom atype;	2314	Atom atype;
2327	unsigned char *prop = NULL;	2315	unsigned char *prop = NULL;
2328	Window root, oldp, *list;	2316	Window root, oldp, *list;
2329	Pixmap rootpixmap = None;	2317	Pixmap rootpixmap = None;
2330	XWindowAttributes wattr, wrootattr;	2318	XWindowAttributes wattr, wrootattr;
		2319	dDisp;
2331		2320
2332	pchanged = 0;	2321	pchanged = 0;
2333		2322
2334	if (!(options & Opt_transparent))	2323	if (!(options & Opt_transparent))
2335	return pchanged; /* Don't try any more */	2324	return pchanged; /* Don't try any more */
2336		2325
2337	XGetWindowAttributes (display->display, display->root, &wrootattr);	2326	XGetWindowAttributes (disp, display->root, &wrootattr);
2338	rootdepth = wrootattr.depth;	2327	rootdepth = wrootattr.depth;
2339		2328
2340	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2329	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2341		2330
2342	if (rootdepth != wattr.depth)	2331	if (rootdepth != wattr.depth)
2343	{	2332	{
2344	if (am_transparent)	2333	if (am_transparent)
2345	{	2334	{
2346	pchanged = 1;	2335	pchanged = 1;
2347	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2336	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2348	am_transparent = am_pixmap_trans = 0;	2337	am_transparent = am_pixmap_trans = 0;
2349	}	2338	}
2350		2339
2351	return pchanged; /* Don't try any more */	2340	return pchanged; /* Don't try any more */
2352	}	2341	}
2353		2342
2354	/* 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. */
2355	XSync (display->display, False);	2344	XSync (disp, False);
2356		2345
2357	/*	2346	/*
2358	* Make the frame window set by the window manager have	2347	* Make the frame window set by the window manager have
2359	* the root background. Some window managers put multiple nested frame	2348	* the root background. Some window managers put multiple nested frame
2360	* 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.
2361	*/	2350	*/
2362	i = (xa[XA_XROOTPMAPID]	2351	i = (xa[XA_XROOTPMAP_ID]
2363	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2352	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2364	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2353	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365	&nitems, &bytes_after, &prop) == Success);	2354	&nitems, &bytes_after, &prop) == Success);
2366		2355
2367	if (!i \|\| prop == NULL)	2356	if (!i \|\| prop == NULL)
2368	i = (xa[XA_XSETROOTID]	2357	i = (xa[XA_ESETROOT_PMAP_ID]
2369	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2358	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2370	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2359	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371	&nitems, &bytes_after, &prop) == Success);	2360	&nitems, &bytes_after, &prop) == Success);
2372		2361
2373	if (!i \|\| prop == NULL	2362	if (!i \|\| prop == NULL
2374	#if TINTING	2363	#if TINTING
…		…
2393	Window cr;	2382	Window cr;
2394	XImage *image;	2383	XImage *image;
2395	GC gc;	2384	GC gc;
2396	XGCValues gcvalue;	2385	XGCValues gcvalue;
2397		2386
2398	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2387	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2399	0, 0, &sx, &sy, &cr);	2388	0, 0, &sx, &sy, &cr);
2400	nw = (unsigned int)szHint.width;	2389	nw = (unsigned int)szHint.width;
2401	nh = (unsigned int)szHint.height;	2390	nh = (unsigned int)szHint.height;
2402	nx = ny = 0;	2391	nx = ny = 0;
2403		2392
…		…
2415	sy = 0;	2404	sy = 0;
2416	}	2405	}
2417		2406
2418	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2407	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2419	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2408	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2409
		2410	XSync (disp, False);
2420	allowedxerror = -1;	2411	allowedxerror = -1;
2421	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2412	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422		2413
2423	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2414	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2424	/* XXX: may need a delay here? */	2415	/* XXX: may need a delay here? */
2425	allowedxerror = 0;	2416	allowedxerror = 0;
2426		2417
…		…
2429	if (am_transparent && am_pixmap_trans)	2420	if (am_transparent && am_pixmap_trans)
2430	{	2421	{
2431	pchanged = 1;	2422	pchanged = 1;
2432	if (TermWin.pixmap != None)	2423	if (TermWin.pixmap != None)
2433	{	2424	{
2434	XFreePixmap (display->display, TermWin.pixmap);	2425	XFreePixmap (disp, TermWin.pixmap);
2435	TermWin.pixmap = None;	2426	TermWin.pixmap = None;
2436	}	2427	}
2437	}	2428	}
2438		2429
2439	am_pixmap_trans = 0;	2430	am_pixmap_trans = 0;
2440	}	2431	}
2441	else	2432	else
2442	{	2433	{
2443	if (TermWin.pixmap != None)	2434	if (TermWin.pixmap != None)
2444	XFreePixmap (display->display, TermWin.pixmap);	2435	XFreePixmap (disp, TermWin.pixmap);
2445		2436
2446	#if TINTING	2437	#if TINTING
2447	if (ISSET_PIXCOLOR (Color_tint))	2438	if (ISSET_PIXCOLOR (Color_tint))
2448	{	2439	{
2449	unsigned short rm, gm, bm;	2440	unsigned short rm, gm, bm;
…		…
2453		2444
2454	ShadeXImage (display, image, shade, rm, gm, bm);	2445	ShadeXImage (display, image, shade, rm, gm, bm);
2455	}	2446	}
2456	#endif	2447	#endif
2457		2448
2458	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2449	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2459	szHint.width, szHint.height, image->depth);	2450	szHint.width, szHint.height, image->depth);
2460	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2451	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2461	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2452	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2462	nx, ny, image->width, image->height);	2453	nx, ny, image->width, image->height);
2463	XFreeGC (display->display, gc);	2454	XFreeGC (disp, gc);
2464	XDestroyImage (image);	2455	XDestroyImage (image);
2465	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2456	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2466	XClearWindow (display->display, TermWin.parent[0]);	2457	XClearWindow (disp, TermWin.parent[0]);
2467		2458
2468	if (!am_transparent \|\| !am_pixmap_trans)	2459	if (!am_transparent \|\| !am_pixmap_trans)
2469	pchanged = 1;	2460	pchanged = 1;
2470		2461
2471	am_transparent = am_pixmap_trans = 1;	2462	am_transparent = am_pixmap_trans = 1;
2472	}	2463	}
2473	}	2464	}
2474		2465
2475	if (!am_pixmap_trans)	2466	if (am_pixmap_trans)
		2467	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2468	else
2476	{	2469	{
2477	unsigned int n;	2470	unsigned int n;
2478	/*	2471	/*
2479	* InheritPixmap transparency	2472	* InheritPixmap transparency
2480	*/	2473	*/
2481	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2474	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2482	{	2475	{
2483	oldp = TermWin.parent[i];	2476	oldp = TermWin.parent[i];
2484	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2477	XQueryTree (disp, TermWin.parent[i - 1], &root,
2485	&TermWin.parent[i], &list, &n);	2478	&TermWin.parent[i], &list, &n);
2486	XFree (list);	2479	XFree (list);
2487		2480
2488	if (TermWin.parent[i] == display->root)	2481	if (TermWin.parent[i] == display->root)
2489	{	2482	{
…		…
2501		2494
2502	if (pchanged)	2495	if (pchanged)
2503	{	2496	{
2504	for (; n < (unsigned int)i; n++)	2497	for (; n < (unsigned int)i; n++)
2505	{	2498	{
2506	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2499	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2507	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2500	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2508	{	2501	{
2509	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2502	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2510	break;	2503	break;
2511	}	2504	}
2512	}	2505	}
2513	}	2506	}
2514		2507
2515	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2508	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2516	{	2509	{
2517	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2510	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2518	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2511	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2519	am_transparent = 0;	2512	am_transparent = 0;
2520	/* XXX: also turn off Opt_transparent? */	2513	/* XXX: also turn off Opt_transparent? */
2521	}	2514	}
2522	else	2515	else
2523	{	2516	{
…		…
2526	* needed for fvwm2.2.2 (and before?) */	2519	* needed for fvwm2.2.2 (and before?) */
2527	sleep (1);	2520	sleep (1);
2528	#endif	2521	#endif
2529	for (n = 0; n < (unsigned int)i; n++)	2522	for (n = 0; n < (unsigned int)i; n++)
2530	{	2523	{
2531	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2524	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2532	XClearWindow (display->display, TermWin.parent[n]);	2525	XClearWindow (disp, TermWin.parent[n]);
2533	}	2526	}
2534		2527
2535	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2528	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2536	am_transparent = 1;	2529	am_transparent = 1;
2537	}	2530	}
2538		2531
2539	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2532	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2540	TermWin.parent[i] = None;	2533	TermWin.parent[i] = None;
2541	}	2534	}
2542		2535
2543	if (scrollBar.win)	2536	if (scrollBar.win)
2544	{	2537	{
2545	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2538	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2546	scrollBar.setIdle ();	2539	scrollBar.setIdle ();
2547	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 ();
2548	}	2548	}
2549		2549
2550	return pchanged;	2550	return pchanged;
2551	}	2551	}
2552	#endif	2552	#endif
…		…
2704	if (len == (size_t)-1)	2704	if (len == (size_t)-1)
2705	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
2706		2706
2707	// assume wchar == unicode	2707	// assume wchar == unicode
2708	cmdbuf_ptr += len;	2708	cmdbuf_ptr += len;
2709	return wc;	2709	return wc & UNICODE_MASK;
2710	}	2710	}
2711		2711
2712	return NOCHAR;	2712	return NOCHAR;
2713	}	2713	}
2714		2714
…		…
3416	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3416	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417	{	3417	{
3418	int x, y;	3418	int x, y;
3419	XWindowAttributes wattr;	3419	XWindowAttributes wattr;
3420	Window wdummy;	3420	Window wdummy;
		3421	dDisp;
3421		3422
3422	if (nargs == 0)	3423	if (nargs == 0)
3423	return;	3424	return;
3424		3425
3425	switch (args[0])	3426	switch (args[0])
3426	{	3427	{
3427	/*	3428	/*
3428	* commands	3429	* commands
3429	*/	3430	*/
3430	case 1: /* deiconify window */	3431	case 1: /* deiconify window */
3431	XMapWindow (display->display, TermWin.parent[0]);	3432	XMapWindow (disp, TermWin.parent[0]);
3432	break;	3433	break;
3433	case 2: /* iconify window */	3434	case 2: /* iconify window */
3434	XIconifyWindow (display->display, TermWin.parent[0],	3435	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3435	DefaultScreen (display->display));
3436	break;	3436	break;
3437	case 3: /* set position (pixels) */	3437	case 3: /* set position (pixels) */
3438	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3438	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3439	break;	3439	break;
3440	case 4: /* set size (pixels) */	3440	case 4: /* set size (pixels) */
3441	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3441	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442	break;	3442	break;
3443	case 5: /* raise window */	3443	case 5: /* raise window */
3444	XRaiseWindow (display->display, TermWin.parent[0]);	3444	XRaiseWindow (disp, TermWin.parent[0]);
3445	break;	3445	break;
3446	case 6: /* lower window */	3446	case 6: /* lower window */
3447	XLowerWindow (display->display, TermWin.parent[0]);	3447	XLowerWindow (disp, TermWin.parent[0]);
3448	break;	3448	break;
3449	case 7: /* refresh window */	3449	case 7: /* refresh window */
3450	scr_touch (true);	3450	scr_touch (true);
3451	break;	3451	break;
3452	case 8: /* set size (chars) */	3452	case 8: /* set size (chars) */
…		…
3464		3464
3465	/*	3465	/*
3466	* reports - some output format copied from XTerm	3466	* reports - some output format copied from XTerm
3467	*/	3467	*/
3468	case 11: /* report window state */	3468	case 11: /* report window state */
3469	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3469	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3470	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3470	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471	break;	3471	break;
3472	case 13: /* report window position */	3472	case 13: /* report window position */
3473	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3473	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3474	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3474	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3475	-wattr.border_width, -wattr.border_width,	3475	-wattr.border_width, -wattr.border_width,
3476	&x, &y, &wdummy);	3476	&x, &y, &wdummy);
3477	tt_printf ("\033[3;%d;%dt", x, y);	3477	tt_printf ("\033[3;%d;%dt", x, y);
3478	break;	3478	break;
3479	case 14: /* report window size (pixels) */	3479	case 14: /* report window size (pixels) */
3480	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3480	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3481	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3481	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482	break;	3482	break;
3483	case 18: /* report text area size (chars) */	3483	case 18: /* report text area size (chars) */
3484	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3484	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3485	break;	3485	break;
…		…
3487	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3487	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3488	break;	3488	break;
3489	case 20: /* report icon label */	3489	case 20: /* report icon label */
3490	{	3490	{
3491	char *s;	3491	char *s;
3492	XGetIconName (display->display, TermWin.parent[0], &s);	3492	XGetIconName (disp, TermWin.parent[0], &s);
3493	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 */
3494	XFree (s);	3494	XFree (s);
3495	}	3495	}
3496	break;	3496	break;
3497	case 21: /* report window title */	3497	case 21: /* report window title */
3498	{	3498	{
3499	char *s;	3499	char *s;
3500	XFetchName (display->display, TermWin.parent[0], &s);	3500	XFetchName (disp, TermWin.parent[0], &s);
3501	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 */
3502	XFree (s);	3502	XFree (s);
3503	}	3503	}
3504	break;	3504	break;
3505	}	3505	}
…		…
3512	* ends_how is terminator used. returned input must be free()'d	3512	* ends_how is terminator used. returned input must be free()'d
3513	*/	3513	*/
3514	unsigned char *	3514	unsigned char *
3515	rxvt_term::get_to_st (unicode_t &ends_how)	3515	rxvt_term::get_to_st (unicode_t &ends_how)
3516	{	3516	{
3517	unicode_t seen_esc = 0, ch;	3517	unicode_t ch;
		3518	bool seen_esc = false;
3518	unsigned int n = 0;	3519	unsigned int n = 0;
3519	unsigned char *s;
3520	unsigned char string[STRING_MAX];	3520	wchar_t string[STRING_MAX];
3521		3521
3522	while ((ch = cmd_getc ()) != NOCHAR)	3522	while ((ch = cmd_getc ()) != NOCHAR)
3523	{	3523	{
3524	if (seen_esc)	3524	if (seen_esc)
3525	{	3525	{
…		…
3528	else	3528	else
3529	return NULL;	3529	return NULL;
3530	}	3530	}
3531	else if (ch == C0_ESC)	3531	else if (ch == C0_ESC)
3532	{	3532	{
3533	seen_esc = 1;	3533	seen_esc = true;
3534	continue;	3534	continue;
3535	}	3535	}
3536	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3536	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3537	break;	3537	break;
3538	else if (ch < 0x20)	3538	else if (ch < 0x20)
3539	return NULL; /* other control character - exit */	3539	return NULL; /* other control character - exit */
3540		3540
3541	seen_esc = 0;	3541	seen_esc = false;
3542		3542
3543	if (n >= sizeof (string) - 1)	3543	if (n >= sizeof (string) - 1)
3544	// stop at some sane length	3544	// stop at some sane length
3545	return NULL;	3545	return NULL;
3546		3546
…		…
3550	string[n++] = ch;	3550	string[n++] = ch;
3551	}	3551	}
3552		3552
3553	string[n++] = '\0';	3553	string[n++] = '\0';
3554		3554
3555	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556	return NULL;
3557
3558	ends_how = (ch == 0x5c ? C0_ESC : ch);	3555	ends_how = (ch == 0x5c ? C0_ESC : ch);
3559	strncpy (s, string, n);	3556
3560	return s;	3557	return (unsigned char *)rxvt_wcstombs (string);
3561	}	3558	}
3562		3559
3563	/----------------------------------------------------------------------/	3560	/----------------------------------------------------------------------/
3564	/*	3561	/*
3565	* 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)'
…		…
3650	int changed = 0;	3647	int changed = 0;
3651	int color;	3648	int color;
3652	char buf, name;	3649	char buf, name;
3653	bool query = str[0] == '?' && !str[1];	3650	bool query = str[0] == '?' && !str[1];
3654	int saveop = op;	3651	int saveop = op;
		3652	dDisp;
3655		3653
3656	assert (str != NULL);	3654	assert (str != NULL);
3657	switch (op)	3655	switch (op)
3658	{	3656	{
3659	case XTerm_name:	3657	case XTerm_name:
…		…
3666	set_title (str);	3664	set_title (str);
3667	break;	3665	break;
3668	case XTerm_property:	3666	case XTerm_property:
3669	if (str[0] == '?')	3667	if (str[0] == '?')
3670	{	3668	{
3671	Atom prop = XInternAtom (display->display, str + 1, True);	3669	Atom prop = display->atom (str + 1);
3672	Atom actual_type;	3670	Atom actual_type;
3673	int actual_format;	3671	int actual_format;
3674	unsigned long nitems;	3672	unsigned long nitems;
3675	unsigned long bytes_after;	3673	unsigned long bytes_after;
3676	unsigned char *value = 0;	3674	unsigned char *value = 0;
3677	const char *str = "";	3675	const char *str = "";
3678		3676
3679	if (prop	3677	if (prop
3680	&& XGetWindowProperty (display->display, TermWin.parent[0],	3678	&& XGetWindowProperty (disp, TermWin.parent[0],
3681	prop, 0, 1<<16, 0, AnyPropertyType,	3679	prop, 0, 1<<16, 0, AnyPropertyType,
3682	&actual_type, &actual_format,	3680	&actual_type, &actual_format,
3683	&nitems, &bytes_after, &value) == Success	3681	&nitems, &bytes_after, &value) == Success
3684	&& actual_type != None	3682	&& actual_type != None
3685	&& actual_format == 8)	3683	&& actual_format == 8)
…		…
3694	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3692	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695		3693
3696	if (eq)	3694	if (eq)
3697	{	3695	{
3698	*eq = 0;	3696	*eq = 0;
3699	XChangeProperty (display->display, TermWin.parent[0],	3697	set_utf8_property (display->atom (str), eq + 1);
3700	display->atom (str), XA_STRING, 8,
3701	PropModeReplace, (unsigned char *)eq + 1,
3702	strlen (eq + 1));
3703	}	3698	}
3704	else	3699	else
3705	XDeleteProperty (display->display, TermWin.parent[0],	3700	XDeleteProperty (disp, TermWin.parent[0],
3706	display->atom (str));	3701	display->atom (str));
3707	}	3702	}
3708	break;	3703	break;
3709		3704
3710	case XTerm_Color:	3705	case XTerm_Color:
…		…
3761	break;	3756	break;
3762	case XTerm_Color_RV:	3757	case XTerm_Color_RV:
3763	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3758	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3764	break;	3759	break;
3765	#endif	3760	#endif
3766	#if TRANSPARENT \|\| TINTING	3761	#if TRANSPARENT && TINTING
3767	case XTerm_Color_tint:	3762	case XTerm_Color_tint:
3768	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3763	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3769	check_our_parents ();	3764	check_our_parents ();
3770	if (am_transparent)	3765	if (am_transparent)
3771	want_full_refresh = want_refresh = 1;	3766	want_full_refresh = want_refresh = 1;
…		…
3785	{	3780	{
3786	str++;	3781	str++;
3787	#if XPM_BACKGROUND	3782	#if XPM_BACKGROUND
3788	changed += scale_pixmap (str);	3783	changed += scale_pixmap (str);
3789	#endif	3784	#endif
3790
3791	}	3785	}
		3786
3792	if (changed)	3787	if (changed)
3793	{	3788	{
3794	#ifdef XPM_BACKGROUND	3789	#ifdef XPM_BACKGROUND
3795	resize_pixmap ();	3790	resize_pixmap ();
3796	#endif	3791	#endif
…		…
3837	if (query)	3832	if (query)
3838	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);
3839	else	3834	else
3840	{	3835	{
3841	set_locale (str);	3836	set_locale (str);
		3837	pty.set_utf8_mode (enc_utf8);
3842	# ifdef USE_XIM	3838	# ifdef USE_XIM
3843	im_cb ();	3839	im_cb ();
3844	# endif	3840	# endif
3845	}	3841	}
3846	break;	3842	break;
…		…
4284		4280
4285	/* ---------------------------------------------------------------------- */	4281	/* ---------------------------------------------------------------------- */
4286	/* 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,
4287	* or generated by us in response to a query ESC sequence.	4283	* or generated by us in response to a query ESC sequence.
4288	*/	4284	*/
		4285	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4286
4289	void	4287	void
4290	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4288	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4291	{	4289	{
4292	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));
4293		4293
4294	if (len)	4294	if ((unsigned int)written == len)
		4295	return;
		4296
		4297	data += written;
		4298	len -= written;
4295	{	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
4296	if (v_buflen == 0)	4317	if (v_buflen == 0)
4297	{	4318	{
4298	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300	if ((unsigned int)written == len)
4301	return;
4302
4303	data += written;
4304	len -= written;
4305	}
4306
4307
4308	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310	memcpy (v_buffer + v_buflen, data, len);
4311	v_buflen += len;
4312	}
4313
4314	for (;;)
4315	{
4316	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318	if (written > 0)
4319	{
4320	v_buflen -= written;
4321
4322	if (v_buflen == 0)
4323	{
4324	free (v_buffer);	4319	free (v_buffer);
4325	v_buffer = 0;	4320	v_buffer = 0;
4326	v_buflen = 0;	4321	v_buflen = 0;
4327		4322
4328	pty_ev.set (EVENT_READ);	4323	pty_ev.set (EVENT_READ);
4329	return;
4330	}
4331
4332	memmove (v_buffer, v_buffer + written, v_buflen);
4333	}
4334	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4335	// original code just ignores this...
4336	destroy ();
4337	else
4338	{
4339	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4340	return;	4324	return;
4341	}	4325	}
		4326
		4327	memmove (v_buffer, v_buffer + written, v_buflen);
4342	}	4328	}
		4329	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4330	// original code just ignores this...
		4331	destroy ();
4343	}	4332	}
4344		4333
4345	/----------------------- end-of-file (C source) -----------------------/	4334	/----------------------- end-of-file (C source) -----------------------/
4346		4335

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.168 by root, Sun Sep 5 09:32:59 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.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC