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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.196 by root, Thu Feb 17 12:23:39 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
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	#include <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
		57	#include <csignal>
54		58
55	/----------------------------------------------------------------------/	59	/----------------------------------------------------------------------/
56		60
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		62
…		…
113	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
114	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
115	XK_Print, 0x2399,	119	XK_Print, 0x2399,
116		120
117	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
118	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
119	0,	131	0,
120	};	132	};
121		133
122	void	134	void
123	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
…		…
272	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	284	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273	* escape sequence to toggle the Keypad.	285	* escape sequence to toggle the Keypad.
274	*	286	*
275	* Always permit `shift' to override the current setting	287	* Always permit `shift' to override the current setting
276	*/	288	*/
277	shft = (ev.state & ShiftMask);	289	shft = ev.state & ShiftMask;
278	ctrl = (ev.state & ControlMask);	290	ctrl = ev.state & ControlMask;
279	meta = (ev.state & ModMetaMask);	291	meta = ev.state & ModMetaMask;
280		292
281	if (numlock_state \|\| (ev.state & ModNumLockMask))	293	if (numlock_state \|\| (ev.state & ModNumLockMask))
282	{	294	{
283	numlock_state = (ev.state & ModNumLockMask);	295	numlock_state = (ev.state & ModNumLockMask);
284	PrivMode ((!numlock_state), PrivMode_aplKP);	296	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
343	valid_keysym = keysym != NoSymbol;	355	valid_keysym = keysym != NoSymbol;
344	}	356	}
345		357
346	if (valid_keysym)	358	if (valid_keysym)
347	{	359	{
		360	#ifdef KEYSYM_RESOURCE
		361	if (keyboard->dispatch (this, keysym, ev.state))
		362	return;
		363	#endif
		364
348	if (TermWin.saveLines)	365	if (TermWin.saveLines)
349	{	366	{
350	#ifdef UNSHIFTED_SCROLLKEYS	367	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	368	if (!ctrl && !meta)
352	#else	369	#else
…		…
486	}	503	}
487	#endif	504	#endif
488		505
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	506	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	507	{
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	{	508	{
517	newlen = 1;	509	newlen = 1;
518	switch (keysym)	510	switch (keysym)
519	{	511	{
520	#ifndef NO_BACKSPACE_KEY	512	#ifndef NO_BACKSPACE_KEY
…		…
528	else	520	else
529	strcpy (kbuf, key_backspace);	521	strcpy (kbuf, key_backspace);
530	break;	522	break;
531	#endif	523	#endif
532	#ifndef NO_DELETE_KEY	524	#ifndef NO_DELETE_KEY
		525	# ifdef XK_KP_Prior
		526	case XK_KP_Delete:
		527	/* allow shift to override */
		528	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		529	{
		530	strcpy (kbuf, "\033On");
		531	break;
		532	}
		533	/* FALLTHROUGH */
		534	# endif
533	case XK_Delete:	535	case XK_Delete:
534	strcpy (kbuf, key_delete);	536	strcpy (kbuf, key_delete);
535	break;	537	break;
536	#endif	538	#endif
537	case XK_Tab:	539	case XK_Tab:
…		…
640	#ifdef XK_KP_Begin	642	#ifdef XK_KP_Begin
641	case XK_KP_Begin:	643	case XK_KP_Begin:
642	strcpy (kbuf, "\033Ou");	644	strcpy (kbuf, "\033Ou");
643	break;	645	break;
644		646
645	case XK_KP_Insert:
646	strcpy (kbuf, "\033Op");
647	break;
648
649	case XK_KP_Delete:
650	strcpy (kbuf, "\033On");
651	break;
652	#endif	647	#endif
653	case XK_KP_F1: /* "\033OP" */	648	case XK_KP_F1: /* "\033OP" */
654	case XK_KP_F2: /* "\033OQ" */	649	case XK_KP_F2: /* "\033OQ" */
655	case XK_KP_F3: /* "\033OR" */	650	case XK_KP_F3: /* "\033OR" */
656	case XK_KP_F4: /* "\033OS" */	651	case XK_KP_F4: /* "\033OS" */
…		…
688	break;	683	break;
689		684
690	case XK_Find:	685	case XK_Find:
691	strcpy (kbuf, "\033[1~");	686	strcpy (kbuf, "\033[1~");
692	break;	687	break;
		688
		689	#ifdef XK_KP_End
		690	case XK_KP_Insert:
		691	/* allow shift to override */
		692	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		693	{
		694	strcpy (kbuf, "\033Op");
		695	break;
		696	}
		697	/* FALLTHROUGH */
		698	#endif
693	case XK_Insert:	699	case XK_Insert:
694	strcpy (kbuf, "\033[2~");	700	strcpy (kbuf, "\033[2~");
695	break;	701	break;
696	#ifdef DXK_Remove /* support for DEC remove like key */	702	#ifdef DXK_Remove /* support for DEC remove like key */
697	case DXK_Remove:	703	case DXK_Remove:
…		…
787	#undef FKEY	793	#undef FKEY
788	default:	794	default:
789	newlen = 0;	795	newlen = 0;
790	break;	796	break;
791	}	797	}
		798
792	if (newlen)	799	if (newlen)
793	len = strlen (kbuf);	800	len = strlen (kbuf);
794	}	801	}
795		802
796	/*	803	/*
…		…
804	}	811	}
805	else if (ctrl && keysym == XK_minus)	812	else if (ctrl && keysym == XK_minus)
806	{	813	{
807	len = 1;	814	len = 1;
808	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	815	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		816	}
		817	else if (keysym == XK_ISO_Left_Tab)
		818	{
		819	strcpy (kbuf, "\033[Z");
		820	len = 3;
809	}	821	}
810	else	822	else
811	{	823	{
812	#ifdef META8_OPTION	824	#ifdef META8_OPTION
813	/* set 8-bit on */	825	/* set 8-bit on */
…		…
872	#endif /* DEBUG_CMD */	884	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	885	tt_write (kbuf, (unsigned int)len);
874	}	886	}
875	/}}} /	887	/}}} /
876		888
877	#if (MENUBAR_MAX)	889	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
878	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	890	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
879	/* attempt to `write' count to the input buffer */	891	/* attempt to `write' count to the input buffer */
880	unsigned int	892	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	893	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	894	{
…		…
905		917
906	cmd_parse ();	918	cmd_parse ();
907		919
908	return 0;	920	return 0;
909	}	921	}
910	#endif /* MENUBAR_MAX */	922	#endif
911		923
912	void	924	void
913	rxvt_term::flush ()	925	rxvt_term::flush ()
914	{	926	{
915	flush_ev.stop ();	927	flush_ev.stop ();
…		…
1016	{	1028	{
1017	if (mouse_slip_wheel_speed == 0	1029	if (mouse_slip_wheel_speed == 0
1018	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1030	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1031	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1032	{
		1033	if (TermWin.view_start == TermWin.nscrolled \|\|
		1034	TermWin.view_start == 0)
		1035	mouse_slip_wheel_speed = 0;
		1036
1021	refresh_type \|= SMOOTH_REFRESH;	1037	refresh_type \|= SMOOTH_REFRESH;
1022	want_refresh = 1;	1038	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1040	}
1025	}	1041	}
…		…
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1073	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1074	{
1059	SET_R (this);	1075	SET_R (this);
1060	SET_LOCALE (locale);	1076	SET_LOCALE (locale);
1061		1077
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1078	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1079	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1080	while (pty_fill ())
1067	if (cmd_parse ())	1081	if (cmd_parse ())
1068	break;	1082	break;
		1083
		1084	if (revents & EVENT_WRITE)
		1085	pty_write ();
1069	}	1086	}
1070		1087
1071	void	1088	void
1072	rxvt_term::pointer_unblank ()	1089	rxvt_term::pointer_unblank ()
1073	{	1090	{
…		…
1087	rxvt_term::pointer_blank ()	1104	rxvt_term::pointer_blank ()
1088	{	1105	{
1089	if (! (options & Opt_pointerBlank))	1106	if (! (options & Opt_pointerBlank))
1090	return;	1107	return;
1091		1108
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1093	XFlush (display->display);	1110	XFlush (display->display);
1094		1111
1095	hidden_pointer = 1;	1112	hidden_pointer = 1;
1096	}	1113	}
1097		1114
…		…
1186		1203
1187	/{{{ process an X event /	1204	/{{{ process an X event /
1188	void	1205	void
1189	rxvt_term::x_cb (XEvent &ev)	1206	rxvt_term::x_cb (XEvent &ev)
1190	{	1207	{
		1208	dDisp;
		1209
1191	SET_R (this);	1210	SET_R (this);
1192	SET_LOCALE (locale);	1211	SET_LOCALE (locale);
1193		1212
1194	#if defined(CURSOR_BLINK)	1213	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1214	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1235	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1236	pointer_blank ();
1218	}	1237	}
1219	#endif	1238	#endif
1220		1239
1221	Window unused_root, unused_child;	1240	Window unused_root, unused_child;
1222	int unused_root_x, unused_root_y;	1241	int unused_root_x, unused_root_y;
1223	unsigned int unused_mask;	1242	unsigned int unused_mask;
1224		1243
1225	switch (ev.type)	1244	switch (ev.type)
1226	{	1245	{
1227	case KeyPress:	1246	case KeyPress:
1228	#if ISO_14755	1247	#if ISO_14755
…		…
1326	Atom ActualType;	1345	Atom ActualType;
1327	int ActualFormat;	1346	int ActualFormat;
1328	unsigned char *data;	1347	unsigned char *data;
1329	unsigned long Size, RemainingBytes;	1348	unsigned long Size, RemainingBytes;
1330		1349
1331	XGetWindowProperty (display->display, display->root,	1350	XGetWindowProperty (disp, display->root,
1332	xa[XA_DNDSELECTION],	1351	xa[XA_DNDSELECTION],
1333	0L, 1000000L,	1352	0L, 1000000L,
1334	False, AnyPropertyType,	1353	False, AnyPropertyType,
1335	&ActualType, &ActualFormat,	1354	&ActualType, &ActualFormat,
1336	&Size, &RemainingBytes,	1355	&Size, &RemainingBytes,
1337	&data);	1356	&data);
1338	XChangeProperty (display->display, display->root,	1357	set_string_property (XA_CUT_BUFFER0, data);
1339	XA_CUT_BUFFER0, XA_STRING,
1340	8, PropModeReplace,
1341	data, strlen (data));
1342	XFree (data);	1358	XFree (data);
1343	selection_paste (display->root, XA_CUT_BUFFER0, True);	1359	selection_paste (display->root, XA_CUT_BUFFER0, true);
1344	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1360	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1345	}	1361	}
1346	#endif /* OFFIX_DND */	1362	#endif /* OFFIX_DND */
1347	break;	1363	break;
1348		1364
1349	case MappingNotify:	1365	case MappingNotify:
…		…
1442	{ /* Wrap lots of configures into one */	1458	{ /* Wrap lots of configures into one */
1443	width = ev.xconfigure.width;	1459	width = ev.xconfigure.width;
1444	height = ev.xconfigure.height;	1460	height = ev.xconfigure.height;
1445	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1461	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446	}	1462	}
1447	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1463	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1448		1464
1449	if (szHint.width != width \|\| szHint.height != height)	1465	if (szHint.width != width \|\| szHint.height != height)
1450	{	1466	{
1451	seen_resize = 1;	1467	seen_resize = 1;
1452	resize_all_windows (width, height, 1);	1468	resize_all_windows (width, height, 1);
1453	}	1469	}
1454		1470
1455	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1471	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456	if (options & Opt_transparent)	1472	if (options & Opt_transparent)
1457	{
1458	check_our_parents ();	1473	check_our_parents ();
1459	if (am_transparent)
1460	want_refresh = want_full_refresh = 1;
1461	}
1462	#endif	1474	#endif
1463	}	1475	}
1464	break;	1476	break;
1465		1477
1466	case PropertyNotify:	1478	case PropertyNotify:
…		…
1474	selection_clear ();	1486	selection_clear ();
1475	break;	1487	break;
1476		1488
1477	case SelectionNotify:	1489	case SelectionNotify:
1478	if (selection_wait == Sel_normal)	1490	if (selection_wait == Sel_normal)
1479	selection_paste (ev.xselection.requestor,	1491	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480	ev.xselection.property, True);
1481	break;	1492	break;
1482		1493
1483	case SelectionRequest:	1494	case SelectionRequest:
1484	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1485	break;	1496	break;
…		…
1509	if (ev.xany.window == TermWin.vt)	1520	if (ev.xany.window == TermWin.vt)
1510	{	1521	{
1511	do	1522	do
1512	scr_expose (ev.xexpose.x, ev.xexpose.y,	1523	scr_expose (ev.xexpose.x, ev.xexpose.y,
1513	ev.xexpose.width, ev.xexpose.height, False);	1524	ev.xexpose.width, ev.xexpose.height, False);
1514	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1525	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1515		1526
1516	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1527	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517		1528
1518	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1529	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1519	scr_expose (ev.xexpose.x, ev.xexpose.y,	1530	scr_expose (ev.xexpose.x, ev.xexpose.y,
1520	ev.xexpose.width, ev.xexpose.height, False);	1531	ev.xexpose.width, ev.xexpose.height, False);
1521		1532
1522	scr_refresh (refresh_type);	1533	scr_refresh (refresh_type);
1523	}	1534	}
1524	else	1535	else
1525	{	1536	{
1526	XEvent unused_event;	1537	XEvent unused_event;
1527		1538
1528	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1539	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1529	;	1540	;
1530	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1541	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1531	;	1542	;
1532		1543
1533	if (isScrollbarWindow (ev.xany.window))	1544	if (isScrollbarWindow (ev.xany.window))
1534	{	1545	{
1535	scrollBar.setIdle ();	1546	scrollBar.setIdle ();
…		…
1540	menubar_expose ();	1551	menubar_expose ();
1541	#endif	1552	#endif
1542		1553
1543	#ifdef TRANSPARENT	1554	#ifdef TRANSPARENT
1544	if (am_transparent && ev.xany.window == TermWin.parent[0])	1555	if (am_transparent && ev.xany.window == TermWin.parent[0])
1545	XClearWindow (display->display, ev.xany.window);	1556	XClearWindow (disp, ev.xany.window);
1546	#endif	1557	#endif
1547	}	1558	}
1548	break;	1559	break;
1549		1560
1550	case MotionNotify:	1561	case MotionNotify:
…		…
1564		1575
1565	if (ev.xany.window == TermWin.vt)	1576	if (ev.xany.window == TermWin.vt)
1566	{	1577	{
1567	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1578	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1568	{	1579	{
1569	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1580	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1570	;	1581	;
1571		1582
1572	XQueryPointer (display->display, TermWin.vt,	1583	XQueryPointer (disp, TermWin.vt,
1573	&unused_root, &unused_child,	1584	&unused_root, &unused_child,
1574	&unused_root_x, &unused_root_y,	1585	&unused_root_x, &unused_root_y,
1575	&ev.xbutton.x, &ev.xbutton.y,	1586	&ev.xbutton.x, &ev.xbutton.y,
1576	&ev.xbutton.state);	1587	&ev.xbutton.state);
1577	#ifdef MOUSE_THRESHOLD	1588	#ifdef MOUSE_THRESHOLD
…		…
1641	#endif	1652	#endif
1642	}	1653	}
1643	}	1654	}
1644	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1655	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645	{	1656	{
1646	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1657	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1647	MotionNotify, &ev))	1658	MotionNotify, &ev))
1648	;	1659	;
1649		1660
1650	XQueryPointer (display->display, scrollBar.win,	1661	XQueryPointer (disp, scrollBar.win,
1651	&unused_root, &unused_child,	1662	&unused_root, &unused_child,
1652	&unused_root_x, &unused_root_y,	1663	&unused_root_x, &unused_root_y,
1653	&ev.xbutton.x, &ev.xbutton.y,	1664	&ev.xbutton.x, &ev.xbutton.y,
1654	&unused_mask);	1665	&unused_mask);
1655	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1674	case PropertyNotify:	1685	case PropertyNotify:
1675	/*	1686	/*
1676	* if user used some Esetroot compatible prog to set the root bg,	1687	* 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.	1688	* use the property to determine the pixmap. We use it later on.
1678	*/	1689	*/
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])	1690	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1691	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1683	return;	1692	return;
1684		1693
1685	/* FALLTHROUGH */	1694	/* FALLTHROUGH */
1686	case ReparentNotify:	1695	case ReparentNotify:
1687	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1696	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1759	{	1768	{
1760	case Button1:	1769	case Button1:
1761	/* allow meta + click to select rectangular areas */	1770	/* allow meta + click to select rectangular areas */
1762	/* should be done in screen.C */	1771	/* should be done in screen.C */
1763	#if ENABLE_FRILLS	1772	#if ENABLE_FRILLS
1764	selection.rect = !! (ev.state & ModMetaMask);	1773	selection.rect = !!(ev.state & ModMetaMask);
1765	#else	1774	#else
1766	selection.rect = false;	1775	selection.rect = false;
1767	#endif	1776	#endif
1768		1777
1769	/* allow shift+left click to extend selection */	1778	/* allow shift+left click to extend selection */
…		…
2095	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2104	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2096	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2105	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2106	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098	int i;	2107	int i;
2099		2108
2100	Visual* visual = display->visual;	2109	Visual *visual = display->visual;
2101		2110
2102	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2111	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2103		2112
2104	/* for convenience */	2113	/* for convenience */
2105	mask_r = visual->red_mask;	2114	mask_r = visual->red_mask;
…		…
2326	Atom atype;	2335	Atom atype;
2327	unsigned char *prop = NULL;	2336	unsigned char *prop = NULL;
2328	Window root, oldp, *list;	2337	Window root, oldp, *list;
2329	Pixmap rootpixmap = None;	2338	Pixmap rootpixmap = None;
2330	XWindowAttributes wattr, wrootattr;	2339	XWindowAttributes wattr, wrootattr;
		2340	dDisp;
2331		2341
2332	pchanged = 0;	2342	pchanged = 0;
2333		2343
2334	if (!(options & Opt_transparent))	2344	if (!(options & Opt_transparent))
2335	return pchanged; /* Don't try any more */	2345	return pchanged; /* Don't try any more */
2336		2346
2337	XGetWindowAttributes (display->display, display->root, &wrootattr);	2347	XGetWindowAttributes (disp, display->root, &wrootattr);
2338	rootdepth = wrootattr.depth;	2348	rootdepth = wrootattr.depth;
2339		2349
2340	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2350	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2341		2351
2342	if (rootdepth != wattr.depth)	2352	if (rootdepth != wattr.depth)
2343	{	2353	{
2344	if (am_transparent)	2354	if (am_transparent)
2345	{	2355	{
2346	pchanged = 1;	2356	pchanged = 1;
2347	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2357	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2348	am_transparent = am_pixmap_trans = 0;	2358	am_transparent = am_pixmap_trans = 0;
2349	}	2359	}
2350		2360
2351	return pchanged; /* Don't try any more */	2361	return pchanged; /* Don't try any more */
2352	}	2362	}
2353		2363
2354	/* Get all X ops out of the queue so that our information is up-to-date. */	2364	/* Get all X ops out of the queue so that our information is up-to-date. */
2355	XSync (display->display, False);	2365	XSync (disp, False);
2356		2366
2357	/*	2367	/*
2358	* Make the frame window set by the window manager have	2368	* Make the frame window set by the window manager have
2359	* the root background. Some window managers put multiple nested frame	2369	* the root background. Some window managers put multiple nested frame
2360	* windows for each client, so we have to take care about that.	2370	* windows for each client, so we have to take care about that.
2361	*/	2371	*/
2362	i = (xa[XA_XROOTPMAPID]	2372	i = (xa[XA_XROOTPMAP_ID]
2363	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2373	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2364	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2374	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365	&nitems, &bytes_after, &prop) == Success);	2375	&nitems, &bytes_after, &prop) == Success);
2366		2376
2367	if (!i \|\| prop == NULL)	2377	if (!i \|\| prop == NULL)
2368	i = (xa[XA_XSETROOTID]	2378	i = (xa[XA_ESETROOT_PMAP_ID]
2369	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2379	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2370	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2380	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371	&nitems, &bytes_after, &prop) == Success);	2381	&nitems, &bytes_after, &prop) == Success);
2372		2382
2373	if (!i \|\| prop == NULL	2383	if (!i \|\| prop == NULL
2374	#if TINTING	2384	#if TINTING
…		…
2393	Window cr;	2403	Window cr;
2394	XImage *image;	2404	XImage *image;
2395	GC gc;	2405	GC gc;
2396	XGCValues gcvalue;	2406	XGCValues gcvalue;
2397		2407
2398	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2408	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2399	0, 0, &sx, &sy, &cr);	2409	0, 0, &sx, &sy, &cr);
2400	nw = (unsigned int)szHint.width;	2410	nw = (unsigned int)szHint.width;
2401	nh = (unsigned int)szHint.height;	2411	nh = (unsigned int)szHint.height;
2402	nx = ny = 0;	2412	nx = ny = 0;
2403		2413
…		…
2415	sy = 0;	2425	sy = 0;
2416	}	2426	}
2417		2427
2418	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2428	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2419	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2429	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2430
		2431	XSync (disp, False);
2420	allowedxerror = -1;	2432	allowedxerror = -1;
2421	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2433	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422		2434
2423	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2435	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2424	/* XXX: may need a delay here? */	2436	/* XXX: may need a delay here? */
2425	allowedxerror = 0;	2437	allowedxerror = 0;
2426		2438
…		…
2429	if (am_transparent && am_pixmap_trans)	2441	if (am_transparent && am_pixmap_trans)
2430	{	2442	{
2431	pchanged = 1;	2443	pchanged = 1;
2432	if (TermWin.pixmap != None)	2444	if (TermWin.pixmap != None)
2433	{	2445	{
2434	XFreePixmap (display->display, TermWin.pixmap);	2446	XFreePixmap (disp, TermWin.pixmap);
2435	TermWin.pixmap = None;	2447	TermWin.pixmap = None;
2436	}	2448	}
2437	}	2449	}
2438		2450
2439	am_pixmap_trans = 0;	2451	am_pixmap_trans = 0;
2440	}	2452	}
2441	else	2453	else
2442	{	2454	{
2443	if (TermWin.pixmap != None)	2455	if (TermWin.pixmap != None)
2444	XFreePixmap (display->display, TermWin.pixmap);	2456	XFreePixmap (disp, TermWin.pixmap);
2445		2457
2446	#if TINTING	2458	#if TINTING
2447	if (ISSET_PIXCOLOR (Color_tint))	2459	if (ISSET_PIXCOLOR (Color_tint))
2448	{	2460	{
2449	unsigned short rm, gm, bm;	2461	unsigned short rm, gm, bm;
…		…
2453		2465
2454	ShadeXImage (display, image, shade, rm, gm, bm);	2466	ShadeXImage (display, image, shade, rm, gm, bm);
2455	}	2467	}
2456	#endif	2468	#endif
2457		2469
2458	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2470	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2459	szHint.width, szHint.height, image->depth);	2471	szHint.width, szHint.height, image->depth);
2460	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2472	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2461	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2473	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2462	nx, ny, image->width, image->height);	2474	nx, ny, image->width, image->height);
2463	XFreeGC (display->display, gc);	2475	XFreeGC (disp, gc);
2464	XDestroyImage (image);	2476	XDestroyImage (image);
2465	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2477	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2466	XClearWindow (display->display, TermWin.parent[0]);	2478	XClearWindow (disp, TermWin.parent[0]);
2467		2479
2468	if (!am_transparent \|\| !am_pixmap_trans)	2480	if (!am_transparent \|\| !am_pixmap_trans)
2469	pchanged = 1;	2481	pchanged = 1;
2470		2482
2471	am_transparent = am_pixmap_trans = 1;	2483	am_transparent = am_pixmap_trans = 1;
2472	}	2484	}
2473	}	2485	}
2474		2486
2475	if (!am_pixmap_trans)	2487	if (am_pixmap_trans)
		2488	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2489	else
2476	{	2490	{
2477	unsigned int n;	2491	unsigned int n;
2478	/*	2492	/*
2479	* InheritPixmap transparency	2493	* InheritPixmap transparency
2480	*/	2494	*/
2481	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2495	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2482	{	2496	{
2483	oldp = TermWin.parent[i];	2497	oldp = TermWin.parent[i];
2484	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2498	XQueryTree (disp, TermWin.parent[i - 1], &root,
2485	&TermWin.parent[i], &list, &n);	2499	&TermWin.parent[i], &list, &n);
2486	XFree (list);	2500	XFree (list);
2487		2501
2488	if (TermWin.parent[i] == display->root)	2502	if (TermWin.parent[i] == display->root)
2489	{	2503	{
…		…
2501		2515
2502	if (pchanged)	2516	if (pchanged)
2503	{	2517	{
2504	for (; n < (unsigned int)i; n++)	2518	for (; n < (unsigned int)i; n++)
2505	{	2519	{
2506	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2520	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2507	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2521	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2508	{	2522	{
2509	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2523	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2510	break;	2524	break;
2511	}	2525	}
2512	}	2526	}
2513	}	2527	}
2514		2528
2515	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2529	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2516	{	2530	{
2517	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2531	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2518	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2532	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2519	am_transparent = 0;	2533	am_transparent = 0;
2520	/* XXX: also turn off Opt_transparent? */	2534	/* XXX: also turn off Opt_transparent? */
2521	}	2535	}
2522	else	2536	else
2523	{	2537	{
…		…
2526	* needed for fvwm2.2.2 (and before?) */	2540	* needed for fvwm2.2.2 (and before?) */
2527	sleep (1);	2541	sleep (1);
2528	#endif	2542	#endif
2529	for (n = 0; n < (unsigned int)i; n++)	2543	for (n = 0; n < (unsigned int)i; n++)
2530	{	2544	{
2531	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2545	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2532	XClearWindow (display->display, TermWin.parent[n]);	2546	XClearWindow (disp, TermWin.parent[n]);
2533	}	2547	}
2534		2548
2535	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2549	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2536	am_transparent = 1;	2550	am_transparent = 1;
2537	}	2551	}
2538		2552
2539	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2553	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2540	TermWin.parent[i] = None;	2554	TermWin.parent[i] = None;
2541	}	2555	}
2542		2556
2543	if (scrollBar.win)	2557	if (scrollBar.win)
2544	{	2558	{
2545	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2559	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2546	scrollBar.setIdle ();	2560	scrollBar.setIdle ();
2547	scrollbar_show (0);	2561	scrollbar_show (0);
		2562	}
		2563
		2564	if (am_transparent)
		2565	{
		2566	want_refresh = want_full_refresh = 1;
		2567	if (am_pixmap_trans)
		2568	flush ();
2548	}	2569	}
2549		2570
2550	return pchanged;	2571	return pchanged;
2551	}	2572	}
2552	#endif	2573	#endif
…		…
2704	if (len == (size_t)-1)	2725	if (len == (size_t)-1)
2705	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2726	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706		2727
2707	// assume wchar == unicode	2728	// assume wchar == unicode
2708	cmdbuf_ptr += len;	2729	cmdbuf_ptr += len;
2709	return wc;	2730	return wc & UNICODE_MASK;
2710	}	2731	}
2711		2732
2712	return NOCHAR;	2733	return NOCHAR;
2713	}	2734	}
2714		2735
…		…
3177	{	3198	{
3178	switch (priv)	3199	switch (priv)
3179	{	3200	{
3180	case '>':	3201	case '>':
3181	if (ch == CSI_DA) /* secondary device attributes */	3202	if (ch == CSI_DA) /* secondary device attributes */
3182	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3203	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183	break;	3204	break;
3184	case '?':	3205	case '?':
3185	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3206	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3186	process_terminal_mode (ch, priv, nargs, arg);	3207	process_terminal_mode (ch, priv, nargs, arg);
3187	break;	3208	break;
…		…
3416	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3437	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417	{	3438	{
3418	int x, y;	3439	int x, y;
3419	XWindowAttributes wattr;	3440	XWindowAttributes wattr;
3420	Window wdummy;	3441	Window wdummy;
		3442	dDisp;
3421		3443
3422	if (nargs == 0)	3444	if (nargs == 0)
3423	return;	3445	return;
3424		3446
3425	switch (args[0])	3447	switch (args[0])
3426	{	3448	{
3427	/*	3449	/*
3428	* commands	3450	* commands
3429	*/	3451	*/
3430	case 1: /* deiconify window */	3452	case 1: /* deiconify window */
3431	XMapWindow (display->display, TermWin.parent[0]);	3453	XMapWindow (disp, TermWin.parent[0]);
3432	break;	3454	break;
3433	case 2: /* iconify window */	3455	case 2: /* iconify window */
3434	XIconifyWindow (display->display, TermWin.parent[0],	3456	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3435	DefaultScreen (display->display));
3436	break;	3457	break;
3437	case 3: /* set position (pixels) */	3458	case 3: /* set position (pixels) */
3438	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3459	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3439	break;	3460	break;
3440	case 4: /* set size (pixels) */	3461	case 4: /* set size (pixels) */
3441	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3462	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442	break;	3463	break;
3443	case 5: /* raise window */	3464	case 5: /* raise window */
3444	XRaiseWindow (display->display, TermWin.parent[0]);	3465	XRaiseWindow (disp, TermWin.parent[0]);
3445	break;	3466	break;
3446	case 6: /* lower window */	3467	case 6: /* lower window */
3447	XLowerWindow (display->display, TermWin.parent[0]);	3468	XLowerWindow (disp, TermWin.parent[0]);
3448	break;	3469	break;
3449	case 7: /* refresh window */	3470	case 7: /* refresh window */
3450	scr_touch (true);	3471	scr_touch (true);
3451	break;	3472	break;
3452	case 8: /* set size (chars) */	3473	case 8: /* set size (chars) */
…		…
3464		3485
3465	/*	3486	/*
3466	* reports - some output format copied from XTerm	3487	* reports - some output format copied from XTerm
3467	*/	3488	*/
3468	case 11: /* report window state */	3489	case 11: /* report window state */
3469	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3490	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3470	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3491	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471	break;	3492	break;
3472	case 13: /* report window position */	3493	case 13: /* report window position */
3473	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3494	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3474	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3495	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3475	-wattr.border_width, -wattr.border_width,	3496	-wattr.border_width, -wattr.border_width,
3476	&x, &y, &wdummy);	3497	&x, &y, &wdummy);
3477	tt_printf ("\033[3;%d;%dt", x, y);	3498	tt_printf ("\033[3;%d;%dt", x, y);
3478	break;	3499	break;
3479	case 14: /* report window size (pixels) */	3500	case 14: /* report window size (pixels) */
3480	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3501	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3481	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3502	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482	break;	3503	break;
3483	case 18: /* report text area size (chars) */	3504	case 18: /* report text area size (chars) */
3484	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3505	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3485	break;	3506	break;
…		…
3487	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3508	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3488	break;	3509	break;
3489	case 20: /* report icon label */	3510	case 20: /* report icon label */
3490	{	3511	{
3491	char *s;	3512	char *s;
3492	XGetIconName (display->display, TermWin.parent[0], &s);	3513	XGetIconName (disp, TermWin.parent[0], &s);
3493	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3514	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3515	XFree (s);
3495	}	3516	}
3496	break;	3517	break;
3497	case 21: /* report window title */	3518	case 21: /* report window title */
3498	{	3519	{
3499	char *s;	3520	char *s;
3500	XFetchName (display->display, TermWin.parent[0], &s);	3521	XFetchName (disp, TermWin.parent[0], &s);
3501	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3522	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502	XFree (s);	3523	XFree (s);
3503	}	3524	}
3504	break;	3525	break;
3505	}	3526	}
…		…
3512	* ends_how is terminator used. returned input must be free()'d	3533	* ends_how is terminator used. returned input must be free()'d
3513	*/	3534	*/
3514	unsigned char *	3535	unsigned char *
3515	rxvt_term::get_to_st (unicode_t &ends_how)	3536	rxvt_term::get_to_st (unicode_t &ends_how)
3516	{	3537	{
3517	unicode_t seen_esc = 0, ch;	3538	unicode_t ch;
		3539	bool seen_esc = false;
3518	unsigned int n = 0;	3540	unsigned int n = 0;
3519	unsigned char *s;
3520	unsigned char string[STRING_MAX];	3541	wchar_t string[STRING_MAX];
3521		3542
3522	while ((ch = cmd_getc ()) != NOCHAR)	3543	while ((ch = cmd_getc ()) != NOCHAR)
3523	{	3544	{
3524	if (seen_esc)	3545	if (seen_esc)
3525	{	3546	{
…		…
3528	else	3549	else
3529	return NULL;	3550	return NULL;
3530	}	3551	}
3531	else if (ch == C0_ESC)	3552	else if (ch == C0_ESC)
3532	{	3553	{
3533	seen_esc = 1;	3554	seen_esc = true;
3534	continue;	3555	continue;
3535	}	3556	}
3536	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3557	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3537	break;	3558	break;
3538	else if (ch < 0x20)	3559	else if (ch < 0x20)
3539	return NULL; /* other control character - exit */	3560	return NULL; /* other control character - exit */
3540		3561
3541	seen_esc = 0;	3562	seen_esc = false;
3542		3563
3543	if (n >= sizeof (string) - 1)	3564	if (n >= sizeof (string) - 1)
3544	// stop at some sane length	3565	// stop at some sane length
3545	return NULL;	3566	return NULL;
3546		3567
…		…
3550	string[n++] = ch;	3571	string[n++] = ch;
3551	}	3572	}
3552		3573
3553	string[n++] = '\0';	3574	string[n++] = '\0';
3554		3575
3555	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556	return NULL;
3557
3558	ends_how = (ch == 0x5c ? C0_ESC : ch);	3576	ends_how = (ch == 0x5c ? C0_ESC : ch);
3559	strncpy (s, string, n);	3577
3560	return s;	3578	return (unsigned char *)rxvt_wcstombs (string);
3561	}	3579	}
3562		3580
3563	/----------------------------------------------------------------------/	3581	/----------------------------------------------------------------------/
3564	/*	3582	/*
3565	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3583	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3650	int changed = 0;	3668	int changed = 0;
3651	int color;	3669	int color;
3652	char buf, name;	3670	char buf, name;
3653	bool query = str[0] == '?' && !str[1];	3671	bool query = str[0] == '?' && !str[1];
3654	int saveop = op;	3672	int saveop = op;
		3673	dDisp;
3655		3674
3656	assert (str != NULL);	3675	assert (str != NULL);
3657	switch (op)	3676	switch (op)
3658	{	3677	{
3659	case XTerm_name:	3678	case XTerm_name:
…		…
3666	set_title (str);	3685	set_title (str);
3667	break;	3686	break;
3668	case XTerm_property:	3687	case XTerm_property:
3669	if (str[0] == '?')	3688	if (str[0] == '?')
3670	{	3689	{
3671	Atom prop = XInternAtom (display->display, str + 1, True);	3690	Atom prop = display->atom (str + 1);
3672	Atom actual_type;	3691	Atom actual_type;
3673	int actual_format;	3692	int actual_format;
3674	unsigned long nitems;	3693	unsigned long nitems;
3675	unsigned long bytes_after;	3694	unsigned long bytes_after;
3676	unsigned char *value = 0;	3695	unsigned char *value = 0;
3677	const char *str = "";	3696	const char *str = "";
3678		3697
3679	if (prop	3698	if (prop
3680	&& XGetWindowProperty (display->display, TermWin.parent[0],	3699	&& XGetWindowProperty (disp, TermWin.parent[0],
3681	prop, 0, 1<<16, 0, AnyPropertyType,	3700	prop, 0, 1<<16, 0, AnyPropertyType,
3682	&actual_type, &actual_format,	3701	&actual_type, &actual_format,
3683	&nitems, &bytes_after, &value) == Success	3702	&nitems, &bytes_after, &value) == Success
3684	&& actual_type != None	3703	&& actual_type != None
3685	&& actual_format == 8)	3704	&& actual_format == 8)
…		…
3694	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3713	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695		3714
3696	if (eq)	3715	if (eq)
3697	{	3716	{
3698	*eq = 0;	3717	*eq = 0;
3699	XChangeProperty (display->display, TermWin.parent[0],	3718	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	}	3719	}
3704	else	3720	else
3705	XDeleteProperty (display->display, TermWin.parent[0],	3721	XDeleteProperty (disp, TermWin.parent[0],
3706	display->atom (str));	3722	display->atom (str));
3707	}	3723	}
3708	break;	3724	break;
3709		3725
3710	case XTerm_Color:	3726	case XTerm_Color:
…		…
3785	{	3801	{
3786	str++;	3802	str++;
3787	#if XPM_BACKGROUND	3803	#if XPM_BACKGROUND
3788	changed += scale_pixmap (str);	3804	changed += scale_pixmap (str);
3789	#endif	3805	#endif
3790
3791	}	3806	}
		3807
3792	if (changed)	3808	if (changed)
3793	{	3809	{
3794	#ifdef XPM_BACKGROUND	3810	#ifdef XPM_BACKGROUND
3795	resize_pixmap ();	3811	resize_pixmap ();
3796	#endif	3812	#endif
…		…
3837	if (query)	3853	if (query)
3838	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3854	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3839	else	3855	else
3840	{	3856	{
3841	set_locale (str);	3857	set_locale (str);
		3858	pty.set_utf8_mode (enc_utf8);
3842	# ifdef USE_XIM	3859	# ifdef USE_XIM
3843	im_cb ();	3860	im_cb ();
3844	# endif	3861	# endif
3845	}	3862	}
3846	break;	3863	break;
…		…
4284		4301
4285	/* ---------------------------------------------------------------------- */	4302	/* ---------------------------------------------------------------------- */
4286	/* Write data to the pty as typed by the user, pasted with the mouse,	4303	/* 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.	4304	* or generated by us in response to a query ESC sequence.
4288	*/	4305	*/
		4306	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4307
4289	void	4308	void
4290	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4309	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4291	{	4310	{
4292	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4311	if (v_buflen == 0)
		4312	{
		4313	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4293		4314
4294	if (len)	4315	if ((unsigned int)written == len)
		4316	return;
		4317
		4318	data += written;
		4319	len -= written;
4295	{	4320	}
		4321
		4322	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4323
		4324	memcpy (v_buffer + v_buflen, data, len);
		4325	v_buflen += len;
		4326
		4327	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4328	}
		4329
		4330	void rxvt_term::pty_write ()
		4331	{
		4332	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4333
		4334	if (written > 0)
		4335	{
		4336	v_buflen -= written;
		4337
4296	if (v_buflen == 0)	4338	if (v_buflen == 0)
4297	{	4339	{
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);	4340	free (v_buffer);
4325	v_buffer = 0;	4341	v_buffer = 0;
4326	v_buflen = 0;	4342	v_buflen = 0;
4327		4343
4328	pty_ev.set (EVENT_READ);	4344	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;	4345	return;
4341	}	4346	}
		4347
		4348	memmove (v_buffer, v_buffer + written, v_buflen);
4342	}	4349	}
		4350	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4351	// original code just ignores this...
		4352	destroy ();
4343	}	4353	}
4344		4354
4345	/----------------------- end-of-file (C source) -----------------------/	4355	/----------------------- end-of-file (C source) -----------------------/
4346		4356

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.170 by root, Sun Nov 21 20:19:24 2004 UTC vs. Revision 1.196 by root, Thu Feb 17 12:23:39 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.196 by root, Thu Feb 17 12:23:39 2005 UTC