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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.195 by root, Thu Feb 17 12:06:21 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	#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
…		…
272	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	276	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273	* escape sequence to toggle the Keypad.	277	* escape sequence to toggle the Keypad.
274	*	278	*
275	* Always permit `shift' to override the current setting	279	* Always permit `shift' to override the current setting
276	*/	280	*/
277	shft = (ev.state & ShiftMask);	281	shft = ev.state & ShiftMask;
278	ctrl = (ev.state & ControlMask);	282	ctrl = ev.state & ControlMask;
279	meta = (ev.state & ModMetaMask);	283	meta = ev.state & ModMetaMask;
280		284
281	if (numlock_state \|\| (ev.state & ModNumLockMask))	285	if (numlock_state \|\| (ev.state & ModNumLockMask))
282	{	286	{
283	numlock_state = (ev.state & ModNumLockMask);	287	numlock_state = (ev.state & ModNumLockMask);
284	PrivMode ((!numlock_state), PrivMode_aplKP);	288	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
343	valid_keysym = keysym != NoSymbol;	347	valid_keysym = keysym != NoSymbol;
344	}	348	}
345		349
346	if (valid_keysym)	350	if (valid_keysym)
347	{	351	{
		352	#ifdef KEYSYM_RESOURCE
		353	if (keyboard->dispatch (this, keysym, ev.state))
		354	return;
		355	#endif
		356
348	if (TermWin.saveLines)	357	if (TermWin.saveLines)
349	{	358	{
350	#ifdef UNSHIFTED_SCROLLKEYS	359	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	360	if (!ctrl && !meta)
352	#else	361	#else
…		…
417	{	426	{
418	/* normal XTerm key bindings */	427	/* normal XTerm key bindings */
419	case XK_Insert: /* Shift+Insert = paste mouse selection */	428	case XK_Insert: /* Shift+Insert = paste mouse selection */
420	selection_request (ev.time, 0, 0);	429	selection_request (ev.time, 0, 0);
421	return;	430	return;
422	#if TODO // TODO	431	#if TODO
423	/* rxvt extras */	432	/* rxvt extras */
424	case XK_KP_Add: /* Shift+KP_Add = bigger font */	433	case XK_KP_Add: /* Shift+KP_Add = bigger font */
425	change_font (FONT_UP);	434	change_font (FONT_UP);
426	return;	435	return;
427	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	436	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
486	}	495	}
487	#endif	496	#endif
488		497
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	498	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	499	{
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	{	500	{
517	newlen = 1;	501	newlen = 1;
518	switch (keysym)	502	switch (keysym)
519	{	503	{
520	#ifndef NO_BACKSPACE_KEY	504	#ifndef NO_BACKSPACE_KEY
…		…
787	#undef FKEY	771	#undef FKEY
788	default:	772	default:
789	newlen = 0;	773	newlen = 0;
790	break;	774	break;
791	}	775	}
		776
792	if (newlen)	777	if (newlen)
793	len = strlen (kbuf);	778	len = strlen (kbuf);
794	}	779	}
795		780
796	/*	781	/*
…		…
804	}	789	}
805	else if (ctrl && keysym == XK_minus)	790	else if (ctrl && keysym == XK_minus)
806	{	791	{
807	len = 1;	792	len = 1;
808	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	793	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		794	}
		795	else if (keysym == XK_ISO_Left_Tab)
		796	{
		797	strcpy (kbuf, "\033[Z");
		798	len = 3;
809	}	799	}
810	else	800	else
811	{	801	{
812	#ifdef META8_OPTION	802	#ifdef META8_OPTION
813	/* set 8-bit on */	803	/* set 8-bit on */
…		…
872	#endif /* DEBUG_CMD */	862	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	863	tt_write (kbuf, (unsigned int)len);
874	}	864	}
875	/}}} /	865	/}}} /
876		866
877	#if (MENUBAR_MAX)	867	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
878	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	868	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
879	/* attempt to `write' count to the input buffer */	869	/* attempt to `write' count to the input buffer */
880	unsigned int	870	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	871	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	872	{
…		…
905		895
906	cmd_parse ();	896	cmd_parse ();
907		897
908	return 0;	898	return 0;
909	}	899	}
910	#endif /* MENUBAR_MAX */	900	#endif
911		901
912	void	902	void
913	rxvt_term::flush ()	903	rxvt_term::flush ()
914	{	904	{
		905	flush_ev.stop ();
		906
915	#ifdef TRANSPARENT	907	#ifdef TRANSPARENT
916	if (want_full_refresh)	908	if (want_full_refresh)
917	{	909	{
918	want_full_refresh = 0;	910	want_full_refresh = 0;
919	scr_clear ();	911	scr_clear ();
…		…
929	IMSendSpot ();	921	IMSendSpot ();
930	#endif	922	#endif
931	}	923	}
932		924
933	display->flush ();	925	display->flush ();
934
935	flush_ev.stop ();
936	}	926	}
937		927
938	void	928	void
939	rxvt_term::check_cb (check_watcher &w)	929	rxvt_term::check_cb (check_watcher &w)
940	{	930	{
…		…
1016	{	1006	{
1017	if (mouse_slip_wheel_speed == 0	1007	if (mouse_slip_wheel_speed == 0
1018	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1008	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1009	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1010	{
		1011	if (TermWin.view_start == TermWin.nscrolled \|\|
		1012	TermWin.view_start == 0)
		1013	mouse_slip_wheel_speed = 0;
		1014
1021	refresh_type \|= SMOOTH_REFRESH;	1015	refresh_type \|= SMOOTH_REFRESH;
1022	want_refresh = 1;	1016	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1017	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1018	}
1025	}	1019	}
…		…
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1051	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1052	{
1059	SET_R (this);	1053	SET_R (this);
1060	SET_LOCALE (locale);	1054	SET_LOCALE (locale);
1061		1055
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1056	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1057	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1058	while (pty_fill ())
1067	if (cmd_parse ())	1059	if (cmd_parse ())
1068	break;	1060	break;
		1061
		1062	if (revents & EVENT_WRITE)
		1063	pty_write ();
1069	}	1064	}
1070		1065
1071	void	1066	void
1072	rxvt_term::pointer_unblank ()	1067	rxvt_term::pointer_unblank ()
1073	{	1068	{
…		…
1087	rxvt_term::pointer_blank ()	1082	rxvt_term::pointer_blank ()
1088	{	1083	{
1089	if (! (options & Opt_pointerBlank))	1084	if (! (options & Opt_pointerBlank))
1090	return;	1085	return;
1091		1086
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1087	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1093	XFlush (display->display);	1088	XFlush (display->display);
1094		1089
1095	hidden_pointer = 1;	1090	hidden_pointer = 1;
1096	}	1091	}
1097		1092
…		…
1186		1181
1187	/{{{ process an X event /	1182	/{{{ process an X event /
1188	void	1183	void
1189	rxvt_term::x_cb (XEvent &ev)	1184	rxvt_term::x_cb (XEvent &ev)
1190	{	1185	{
		1186	dDisp;
		1187
1191	SET_R (this);	1188	SET_R (this);
1192	SET_LOCALE (locale);	1189	SET_LOCALE (locale);
1193		1190
1194	#if defined(CURSOR_BLINK)	1191	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1192	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1213	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1214	pointer_blank ();
1218	}	1215	}
1219	#endif	1216	#endif
1220		1217
1221	#ifdef USE_XIM
1222	if (XFilterEvent (&ev, None))
1223	return;
1224	#endif
1225
1226	Window unused_root, unused_child;	1218	Window unused_root, unused_child;
1227	int unused_root_x, unused_root_y;	1219	int unused_root_x, unused_root_y;
1228	unsigned int unused_mask;	1220	unsigned int unused_mask;
1229		1221
1230	switch (ev.type)	1222	switch (ev.type)
1231	{	1223	{
1232	case KeyPress:	1224	case KeyPress:
1233	#if ISO_14755	1225	#if ISO_14755
…		…
1331	Atom ActualType;	1323	Atom ActualType;
1332	int ActualFormat;	1324	int ActualFormat;
1333	unsigned char *data;	1325	unsigned char *data;
1334	unsigned long Size, RemainingBytes;	1326	unsigned long Size, RemainingBytes;
1335		1327
1336	XGetWindowProperty (display->display, display->root,	1328	XGetWindowProperty (disp, display->root,
1337	xa[XA_DNDSELECTION],	1329	xa[XA_DNDSELECTION],
1338	0L, 1000000L,	1330	0L, 1000000L,
1339	False, AnyPropertyType,	1331	False, AnyPropertyType,
1340	&ActualType, &ActualFormat,	1332	&ActualType, &ActualFormat,
1341	&Size, &RemainingBytes,	1333	&Size, &RemainingBytes,
1342	&data);	1334	&data);
1343	XChangeProperty (display->display, display->root,	1335	set_string_property (XA_CUT_BUFFER0, data);
1344	XA_CUT_BUFFER0, XA_STRING,
1345	8, PropModeReplace,
1346	data, strlen (data));
1347	XFree (data);	1336	XFree (data);
1348	selection_paste (display->root, XA_CUT_BUFFER0, True);	1337	selection_paste (display->root, XA_CUT_BUFFER0, true);
1349	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1338	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350	}	1339	}
1351	#endif /* OFFIX_DND */	1340	#endif /* OFFIX_DND */
1352	break;	1341	break;
1353		1342
1354	case MappingNotify:	1343	case MappingNotify:
…		…
1447	{ /* Wrap lots of configures into one */	1436	{ /* Wrap lots of configures into one */
1448	width = ev.xconfigure.width;	1437	width = ev.xconfigure.width;
1449	height = ev.xconfigure.height;	1438	height = ev.xconfigure.height;
1450	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1439	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451	}	1440	}
1452	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1441	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1453		1442
1454	if (szHint.width != width \|\| szHint.height != height)	1443	if (szHint.width != width \|\| szHint.height != height)
1455	{	1444	{
1456	seen_resize = 1;	1445	seen_resize = 1;
1457	resize_all_windows (width, height, 1);	1446	resize_all_windows (width, height, 1);
1458	}	1447	}
1459		1448
1460	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1449	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461	if (options & Opt_transparent)	1450	if (options & Opt_transparent)
1462	{
1463	check_our_parents ();	1451	check_our_parents ();
1464	if (am_transparent)
1465	want_refresh = want_full_refresh = 1;
1466	}
1467	#endif	1452	#endif
1468	}	1453	}
1469	break;	1454	break;
1470		1455
1471	case PropertyNotify:	1456	case PropertyNotify:
…		…
1479	selection_clear ();	1464	selection_clear ();
1480	break;	1465	break;
1481		1466
1482	case SelectionNotify:	1467	case SelectionNotify:
1483	if (selection_wait == Sel_normal)	1468	if (selection_wait == Sel_normal)
1484	selection_paste (ev.xselection.requestor,	1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485	ev.xselection.property, True);
1486	break;	1470	break;
1487		1471
1488	case SelectionRequest:	1472	case SelectionRequest:
1489	selection_send (ev.xselectionrequest);	1473	selection_send (ev.xselectionrequest);
1490	break;	1474	break;
…		…
1514	if (ev.xany.window == TermWin.vt)	1498	if (ev.xany.window == TermWin.vt)
1515	{	1499	{
1516	do	1500	do
1517	scr_expose (ev.xexpose.x, ev.xexpose.y,	1501	scr_expose (ev.xexpose.x, ev.xexpose.y,
1518	ev.xexpose.width, ev.xexpose.height, False);	1502	ev.xexpose.width, ev.xexpose.height, False);
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1503	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1520		1504
1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1505	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522		1506
1523	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1507	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1524	scr_expose (ev.xexpose.x, ev.xexpose.y,	1508	scr_expose (ev.xexpose.x, ev.xexpose.y,
1525	ev.xexpose.width, ev.xexpose.height, False);	1509	ev.xexpose.width, ev.xexpose.height, False);
1526		1510
1527	scr_refresh (refresh_type);	1511	scr_refresh (refresh_type);
1528	}	1512	}
1529	else	1513	else
1530	{	1514	{
1531	XEvent unused_event;	1515	XEvent unused_event;
1532		1516
1533	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1517	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534	;	1518	;
1535	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1519	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536	;	1520	;
1537		1521
1538	if (isScrollbarWindow (ev.xany.window))	1522	if (isScrollbarWindow (ev.xany.window))
1539	{	1523	{
1540	scrollBar.setIdle ();	1524	scrollBar.setIdle ();
…		…
1545	menubar_expose ();	1529	menubar_expose ();
1546	#endif	1530	#endif
1547		1531
1548	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1549	if (am_transparent && ev.xany.window == TermWin.parent[0])	1533	if (am_transparent && ev.xany.window == TermWin.parent[0])
1550	XClearWindow (display->display, ev.xany.window);	1534	XClearWindow (disp, ev.xany.window);
1551	#endif	1535	#endif
1552	}	1536	}
1553	break;	1537	break;
1554		1538
1555	case MotionNotify:	1539	case MotionNotify:
…		…
1562	{	1546	{
1563	menubar_control (ev.xbutton);	1547	menubar_control (ev.xbutton);
1564	break;	1548	break;
1565	}	1549	}
1566	#endif	1550	#endif
1567	if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))	1551	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568	break;	1552	break;
1569		1553
1570	if (ev.xany.window == TermWin.vt)	1554	if (ev.xany.window == TermWin.vt)
1571	{	1555	{
1572	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1556	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1573	{	1557	{
1574	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1558	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1575	;	1559	;
1576		1560
1577	XQueryPointer (display->display, TermWin.vt,	1561	XQueryPointer (disp, TermWin.vt,
1578	&unused_root, &unused_child,	1562	&unused_root, &unused_child,
1579	&unused_root_x, &unused_root_y,	1563	&unused_root_x, &unused_root_y,
1580	& (ev.xbutton.x), & (ev.xbutton.y),	1564	&ev.xbutton.x, &ev.xbutton.y,
1581	&unused_mask);	1565	&ev.xbutton.state);
1582	#ifdef MOUSE_THRESHOLD	1566	#ifdef MOUSE_THRESHOLD
1583	/* deal with a `jumpy' mouse */	1567	/* deal with a `jumpy' mouse */
1584	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)	1568	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585	{	1569	{
1586	#endif	1570	#endif
…		…
1591	iso14755_54 (ev.xbutton.x, ev.xbutton.y);	1575	iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592	break;	1576	break;
1593	}	1577	}
1594	#endif	1578	#endif
1595	selection_extend (ev.xbutton.x, ev.xbutton.y,	1579	selection_extend (ev.xbutton.x, ev.xbutton.y,
1596	(ev.xbutton.state & Button3Mask) ? 2 : 0);	1580	ev.xbutton.state & Button3Mask ? 2 : 0);
		1581
1597	#ifdef SELECTION_SCROLLING	1582	#ifdef SELECTION_SCROLLING
1598	if (ev.xbutton.y < TermWin.int_bwidth	1583	if (ev.xbutton.y < TermWin.int_bwidth
1599	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1584	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1600	{	1585	{
1601	int dist;	1586	int dist;
…		…
1612	selection_save_x = ev.xbutton.x;	1597	selection_save_x = ev.xbutton.x;
1613	selection_save_y = ev.xbutton.y;	1598	selection_save_y = ev.xbutton.y;
1614	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1599	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615		1600
1616	/* calc number of lines to scroll */	1601	/* calc number of lines to scroll */
1617	if (ev.xbutton.y<TermWin.int_bwidth)	1602	if (ev.xbutton.y < TermWin.int_bwidth)
1618	{	1603	{
1619	scroll_selection_dir = UP;	1604	scroll_selection_dir = UP;
1620	dist = TermWin.int_bwidth - ev.xbutton.y;	1605	dist = TermWin.int_bwidth - ev.xbutton.y;
1621	}	1606	}
1622	else	1607	else
…		…
1645	#endif	1630	#endif
1646	}	1631	}
1647	}	1632	}
1648	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1633	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649	{	1634	{
1650	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1635	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651	MotionNotify, &ev)) ;	1636	MotionNotify, &ev))
		1637	;
		1638
1652	XQueryPointer (display->display, scrollBar.win,	1639	XQueryPointer (disp, scrollBar.win,
1653	&unused_root, &unused_child,	1640	&unused_root, &unused_child,
1654	&unused_root_x, &unused_root_y,	1641	&unused_root_x, &unused_root_y,
1655	& (ev.xbutton.x), & (ev.xbutton.y),	1642	&ev.xbutton.x, &ev.xbutton.y,
1656	&unused_mask);	1643	&unused_mask);
1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1644	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658	scrollbar_size ());	1645	scrollbar_size ());
1659	scr_refresh (refresh_type);	1646	scr_refresh (refresh_type);
1660	refresh_limit = 0;	1647	refresh_limit = 0;
…		…
1676	case PropertyNotify:	1663	case PropertyNotify:
1677	/*	1664	/*
1678	* if user used some Esetroot compatible prog to set the root bg,	1665	* if user used some Esetroot compatible prog to set the root bg,
1679	* use the property to determine the pixmap. We use it later on.	1666	* use the property to determine the pixmap. We use it later on.
1680	*/	1667	*/
1681	if (xa[XA_XROOTPMAPID] == 0)
1682	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1668	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1669	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1685	return;	1670	return;
1686		1671
1687	/* FALLTHROUGH */	1672	/* FALLTHROUGH */
1688	case ReparentNotify:	1673	case ReparentNotify:
1689	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1674	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1715	return;	1700	return;
1716	}	1701	}
1717	#endif	1702	#endif
1718		1703
1719	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;	1704	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
		1705
1720	if (reportmode)	1706	if (reportmode)
1721	{	1707	{
1722	/* mouse report from vt window */	1708	/* mouse report from vt window */
1723	/* save the xbutton state (for ButtonRelease) */	1709	/* save the xbutton state (for ButtonRelease) */
1724	MEvent.state = ev.state;	1710	MEvent.state = ev.state;
…		…
1753	}	1739	}
1754	else	1740	else
1755	{	1741	{
1756	if (ev.button != MEvent.button)	1742	if (ev.button != MEvent.button)
1757	MEvent.clicks = 0;	1743	MEvent.clicks = 0;
		1744
1758	switch (ev.button)	1745	switch (ev.button)
1759	{	1746	{
1760	case Button1:	1747	case Button1:
		1748	/* allow meta + click to select rectangular areas */
		1749	/* should be done in screen.C */
		1750	#if ENABLE_FRILLS
		1751	selection.rect = !!(ev.state & ModMetaMask);
		1752	#else
		1753	selection.rect = false;
		1754	#endif
		1755
1761	/* allow shift+left click to extend selection */	1756	/* allow shift+left click to extend selection */
1762	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1757	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763	{	1758	{
1764	if (MEvent.button == Button1 && clickintime)	1759	if (MEvent.button == Button1 && clickintime)
1765	selection_rotate (ev.x, ev.y);	1760	selection_rotate (ev.x, ev.y);
…		…
2087	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2082	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2083	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2084	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2085	int i;
2091		2086
2092	Visual* visual = display->visual;	2087	Visual *visual = display->visual;
2093		2088
2094	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2089	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2095		2090
2096	/* for convenience */	2091	/* for convenience */
2097	mask_r = visual->red_mask;	2092	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2313	Atom atype;
2319	unsigned char *prop = NULL;	2314	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2315	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2316	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2317	XWindowAttributes wattr, wrootattr;
		2318	dDisp;
2323		2319
2324	pchanged = 0;	2320	pchanged = 0;
2325		2321
2326	if (!(options & Opt_transparent))	2322	if (!(options & Opt_transparent))
2327	return pchanged; /* Don't try any more */	2323	return pchanged; /* Don't try any more */
2328		2324
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2325	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2326	rootdepth = wrootattr.depth;
2331		2327
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2328	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2333		2329
2334	if (rootdepth != wattr.depth)	2330	if (rootdepth != wattr.depth)
2335	{	2331	{
2336	if (am_transparent)	2332	if (am_transparent)
2337	{	2333	{
2338	pchanged = 1;	2334	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2335	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2336	am_transparent = am_pixmap_trans = 0;
2341	}	2337	}
2342		2338
2343	return pchanged; /* Don't try any more */	2339	return pchanged; /* Don't try any more */
2344	}	2340	}
2345		2341
2346	/* Get all X ops out of the queue so that our information is up-to-date. */	2342	/* Get all X ops out of the queue so that our information is up-to-date. */
2347	XSync (display->display, False);	2343	XSync (disp, False);
2348		2344
2349	/*	2345	/*
2350	* Make the frame window set by the window manager have	2346	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2347	* the root background. Some window managers put multiple nested frame
2352	* windows for each client, so we have to take care about that.	2348	* windows for each client, so we have to take care about that.
2353	*/	2349	*/
2354	i = (xa[XA_XROOTPMAPID]	2350	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2351	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2352	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2353	&nitems, &bytes_after, &prop) == Success);
2358		2354
2359	if (!i \|\| prop == NULL)	2355	if (!i \|\| prop == NULL)
2360	i = (xa[XA_XSETROOTID]	2356	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2357	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2358	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2359	&nitems, &bytes_after, &prop) == Success);
2364		2360
2365	if (!i \|\| prop == NULL	2361	if (!i \|\| prop == NULL
2366	#if TINTING	2362	#if TINTING
…		…
2385	Window cr;	2381	Window cr;
2386	XImage *image;	2382	XImage *image;
2387	GC gc;	2383	GC gc;
2388	XGCValues gcvalue;	2384	XGCValues gcvalue;
2389		2385
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2386	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2387	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2388	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2389	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2390	nx = ny = 0;
2395		2391
…		…
2407	sy = 0;	2403	sy = 0;
2408	}	2404	}
2409		2405
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2406	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2407	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2408
		2409	XSync (disp, False);
2412	allowedxerror = -1;	2410	allowedxerror = -1;
2413	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2411	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414		2412
2415	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2413	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2416	/* XXX: may need a delay here? */	2414	/* XXX: may need a delay here? */
2417	allowedxerror = 0;	2415	allowedxerror = 0;
2418		2416
…		…
2421	if (am_transparent && am_pixmap_trans)	2419	if (am_transparent && am_pixmap_trans)
2422	{	2420	{
2423	pchanged = 1;	2421	pchanged = 1;
2424	if (TermWin.pixmap != None)	2422	if (TermWin.pixmap != None)
2425	{	2423	{
2426	XFreePixmap (display->display, TermWin.pixmap);	2424	XFreePixmap (disp, TermWin.pixmap);
2427	TermWin.pixmap = None;	2425	TermWin.pixmap = None;
2428	}	2426	}
2429	}	2427	}
2430		2428
2431	am_pixmap_trans = 0;	2429	am_pixmap_trans = 0;
2432	}	2430	}
2433	else	2431	else
2434	{	2432	{
2435	if (TermWin.pixmap != None)	2433	if (TermWin.pixmap != None)
2436	XFreePixmap (display->display, TermWin.pixmap);	2434	XFreePixmap (disp, TermWin.pixmap);
2437		2435
2438	#if TINTING	2436	#if TINTING
2439	if (ISSET_PIXCOLOR (Color_tint))	2437	if (ISSET_PIXCOLOR (Color_tint))
2440	{	2438	{
2441	unsigned short rm, gm, bm;	2439	unsigned short rm, gm, bm;
…		…
2445		2443
2446	ShadeXImage (display, image, shade, rm, gm, bm);	2444	ShadeXImage (display, image, shade, rm, gm, bm);
2447	}	2445	}
2448	#endif	2446	#endif
2449		2447
2450	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2448	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2451	szHint.width, szHint.height, image->depth);	2449	szHint.width, szHint.height, image->depth);
2452	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2450	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2453	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2451	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2454	nx, ny, image->width, image->height);	2452	nx, ny, image->width, image->height);
2455	XFreeGC (display->display, gc);	2453	XFreeGC (disp, gc);
2456	XDestroyImage (image);	2454	XDestroyImage (image);
2457	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2455	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2458	XClearWindow (display->display, TermWin.parent[0]);	2456	XClearWindow (disp, TermWin.parent[0]);
2459		2457
2460	if (!am_transparent \|\| !am_pixmap_trans)	2458	if (!am_transparent \|\| !am_pixmap_trans)
2461	pchanged = 1;	2459	pchanged = 1;
2462		2460
2463	am_transparent = am_pixmap_trans = 1;	2461	am_transparent = am_pixmap_trans = 1;
2464	}	2462	}
2465	}	2463	}
2466		2464
2467	if (!am_pixmap_trans)	2465	if (am_pixmap_trans)
		2466	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2467	else
2468	{	2468	{
2469	unsigned int n;	2469	unsigned int n;
2470	/*	2470	/*
2471	* InheritPixmap transparency	2471	* InheritPixmap transparency
2472	*/	2472	*/
2473	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2473	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2474	{	2474	{
2475	oldp = TermWin.parent[i];	2475	oldp = TermWin.parent[i];
2476	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2476	XQueryTree (disp, TermWin.parent[i - 1], &root,
2477	&TermWin.parent[i], &list, &n);	2477	&TermWin.parent[i], &list, &n);
2478	XFree (list);	2478	XFree (list);
2479		2479
2480	if (TermWin.parent[i] == display->root)	2480	if (TermWin.parent[i] == display->root)
2481	{	2481	{
…		…
2493		2493
2494	if (pchanged)	2494	if (pchanged)
2495	{	2495	{
2496	for (; n < (unsigned int)i; n++)	2496	for (; n < (unsigned int)i; n++)
2497	{	2497	{
2498	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2498	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2499	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2499	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2500	{	2500	{
2501	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2501	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2502	break;	2502	break;
2503	}	2503	}
2504	}	2504	}
2505	}	2505	}
2506		2506
2507	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2507	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2508	{	2508	{
2509	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2509	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2510	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2510	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2511	am_transparent = 0;	2511	am_transparent = 0;
2512	/* XXX: also turn off Opt_transparent? */	2512	/* XXX: also turn off Opt_transparent? */
2513	}	2513	}
2514	else	2514	else
2515	{	2515	{
…		…
2518	* needed for fvwm2.2.2 (and before?) */	2518	* needed for fvwm2.2.2 (and before?) */
2519	sleep (1);	2519	sleep (1);
2520	#endif	2520	#endif
2521	for (n = 0; n < (unsigned int)i; n++)	2521	for (n = 0; n < (unsigned int)i; n++)
2522	{	2522	{
2523	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2523	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2524	XClearWindow (display->display, TermWin.parent[n]);	2524	XClearWindow (disp, TermWin.parent[n]);
2525	}	2525	}
2526		2526
2527	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2527	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2528	am_transparent = 1;	2528	am_transparent = 1;
2529	}	2529	}
2530		2530
2531	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2531	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2532	TermWin.parent[i] = None;	2532	TermWin.parent[i] = None;
2533	}	2533	}
2534		2534
2535	if (scrollBar.win)	2535	if (scrollBar.win)
2536	{	2536	{
2537	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2537	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538	scrollBar.setIdle ();	2538	scrollBar.setIdle ();
2539	scrollbar_show (0);	2539	scrollbar_show (0);
		2540	}
		2541
		2542	if (am_transparent)
		2543	{
		2544	want_refresh = want_full_refresh = 1;
		2545	if (am_pixmap_trans)
		2546	flush ();
2540	}	2547	}
2541		2548
2542	return pchanged;	2549	return pchanged;
2543	}	2550	}
2544	#endif	2551	#endif
…		…
2696	if (len == (size_t)-1)	2703	if (len == (size_t)-1)
2697	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2704	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2698		2705
2699	// assume wchar == unicode	2706	// assume wchar == unicode
2700	cmdbuf_ptr += len;	2707	cmdbuf_ptr += len;
2701	return wc;	2708	return wc & UNICODE_MASK;
2702	}	2709	}
2703		2710
2704	return NOCHAR;	2711	return NOCHAR;
2705	}	2712	}
2706		2713
…		…
3169	{	3176	{
3170	switch (priv)	3177	switch (priv)
3171	{	3178	{
3172	case '>':	3179	case '>':
3173	if (ch == CSI_DA) /* secondary device attributes */	3180	if (ch == CSI_DA) /* secondary device attributes */
3174	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3181	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175	break;	3182	break;
3176	case '?':	3183	case '?':
3177	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3184	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3178	process_terminal_mode (ch, priv, nargs, arg);	3185	process_terminal_mode (ch, priv, nargs, arg);
3179	break;	3186	break;
…		…
3408	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3415	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409	{	3416	{
3410	int x, y;	3417	int x, y;
3411	XWindowAttributes wattr;	3418	XWindowAttributes wattr;
3412	Window wdummy;	3419	Window wdummy;
		3420	dDisp;
3413		3421
3414	if (nargs == 0)	3422	if (nargs == 0)
3415	return;	3423	return;
3416		3424
3417	switch (args[0])	3425	switch (args[0])
3418	{	3426	{
3419	/*	3427	/*
3420	* commands	3428	* commands
3421	*/	3429	*/
3422	case 1: /* deiconify window */	3430	case 1: /* deiconify window */
3423	XMapWindow (display->display, TermWin.parent[0]);	3431	XMapWindow (disp, TermWin.parent[0]);
3424	break;	3432	break;
3425	case 2: /* iconify window */	3433	case 2: /* iconify window */
3426	XIconifyWindow (display->display, TermWin.parent[0],	3434	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3427	DefaultScreen (display->display));
3428	break;	3435	break;
3429	case 3: /* set position (pixels) */	3436	case 3: /* set position (pixels) */
3430	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3437	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3431	break;	3438	break;
3432	case 4: /* set size (pixels) */	3439	case 4: /* set size (pixels) */
3433	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3440	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434	break;	3441	break;
3435	case 5: /* raise window */	3442	case 5: /* raise window */
3436	XRaiseWindow (display->display, TermWin.parent[0]);	3443	XRaiseWindow (disp, TermWin.parent[0]);
3437	break;	3444	break;
3438	case 6: /* lower window */	3445	case 6: /* lower window */
3439	XLowerWindow (display->display, TermWin.parent[0]);	3446	XLowerWindow (disp, TermWin.parent[0]);
3440	break;	3447	break;
3441	case 7: /* refresh window */	3448	case 7: /* refresh window */
3442	scr_touch (true);	3449	scr_touch (true);
3443	break;	3450	break;
3444	case 8: /* set size (chars) */	3451	case 8: /* set size (chars) */
…		…
3456		3463
3457	/*	3464	/*
3458	* reports - some output format copied from XTerm	3465	* reports - some output format copied from XTerm
3459	*/	3466	*/
3460	case 11: /* report window state */	3467	case 11: /* report window state */
3461	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3468	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3462	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3469	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463	break;	3470	break;
3464	case 13: /* report window position */	3471	case 13: /* report window position */
3465	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3472	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3466	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3473	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3467	-wattr.border_width, -wattr.border_width,	3474	-wattr.border_width, -wattr.border_width,
3468	&x, &y, &wdummy);	3475	&x, &y, &wdummy);
3469	tt_printf ("\033[3;%d;%dt", x, y);	3476	tt_printf ("\033[3;%d;%dt", x, y);
3470	break;	3477	break;
3471	case 14: /* report window size (pixels) */	3478	case 14: /* report window size (pixels) */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3479	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3473	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3480	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474	break;	3481	break;
3475	case 18: /* report text area size (chars) */	3482	case 18: /* report text area size (chars) */
3476	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3483	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3477	break;	3484	break;
…		…
3479	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3486	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3480	break;	3487	break;
3481	case 20: /* report icon label */	3488	case 20: /* report icon label */
3482	{	3489	{
3483	char *s;	3490	char *s;
3484	XGetIconName (display->display, TermWin.parent[0], &s);	3491	XGetIconName (disp, TermWin.parent[0], &s);
3485	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3492	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486	XFree (s);	3493	XFree (s);
3487	}	3494	}
3488	break;	3495	break;
3489	case 21: /* report window title */	3496	case 21: /* report window title */
3490	{	3497	{
3491	char *s;	3498	char *s;
3492	XFetchName (display->display, TermWin.parent[0], &s);	3499	XFetchName (disp, TermWin.parent[0], &s);
3493	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3500	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3501	XFree (s);
3495	}	3502	}
3496	break;	3503	break;
3497	}	3504	}
…		…
3504	* ends_how is terminator used. returned input must be free()'d	3511	* ends_how is terminator used. returned input must be free()'d
3505	*/	3512	*/
3506	unsigned char *	3513	unsigned char *
3507	rxvt_term::get_to_st (unicode_t &ends_how)	3514	rxvt_term::get_to_st (unicode_t &ends_how)
3508	{	3515	{
3509	unicode_t seen_esc = 0, ch;	3516	unicode_t ch;
		3517	bool seen_esc = false;
3510	unsigned int n = 0;	3518	unsigned int n = 0;
3511	unsigned char *s;
3512	unsigned char string[STRING_MAX];	3519	wchar_t string[STRING_MAX];
3513		3520
3514	while ((ch = cmd_getc ()) != NOCHAR)	3521	while ((ch = cmd_getc ()) != NOCHAR)
3515	{	3522	{
3516	if (seen_esc)	3523	if (seen_esc)
3517	{	3524	{
…		…
3520	else	3527	else
3521	return NULL;	3528	return NULL;
3522	}	3529	}
3523	else if (ch == C0_ESC)	3530	else if (ch == C0_ESC)
3524	{	3531	{
3525	seen_esc = 1;	3532	seen_esc = true;
3526	continue;	3533	continue;
3527	}	3534	}
3528	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3535	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3529	break;	3536	break;
3530	else if (ch < 0x20)	3537	else if (ch < 0x20)
3531	return NULL; /* other control character - exit */	3538	return NULL; /* other control character - exit */
3532		3539
3533	seen_esc = 0;	3540	seen_esc = false;
3534		3541
3535	if (n >= sizeof (string) - 1)	3542	if (n >= sizeof (string) - 1)
3536	// stop at some sane length	3543	// stop at some sane length
3537	return NULL;	3544	return NULL;
3538		3545
…		…
3542	string[n++] = ch;	3549	string[n++] = ch;
3543	}	3550	}
3544		3551
3545	string[n++] = '\0';	3552	string[n++] = '\0';
3546		3553
3547	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548	return NULL;
3549
3550	ends_how = (ch == 0x5c ? C0_ESC : ch);	3554	ends_how = (ch == 0x5c ? C0_ESC : ch);
3551	strncpy (s, string, n);	3555
3552	return s;	3556	return (unsigned char *)rxvt_wcstombs (string);
3553	}	3557	}
3554		3558
3555	/----------------------------------------------------------------------/	3559	/----------------------------------------------------------------------/
3556	/*	3560	/*
3557	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3561	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3642	int changed = 0;	3646	int changed = 0;
3643	int color;	3647	int color;
3644	char buf, name;	3648	char buf, name;
3645	bool query = str[0] == '?' && !str[1];	3649	bool query = str[0] == '?' && !str[1];
3646	int saveop = op;	3650	int saveop = op;
		3651	dDisp;
3647		3652
3648	assert (str != NULL);	3653	assert (str != NULL);
3649	switch (op)	3654	switch (op)
3650	{	3655	{
3651	case XTerm_name:	3656	case XTerm_name:
…		…
3658	set_title (str);	3663	set_title (str);
3659	break;	3664	break;
3660	case XTerm_property:	3665	case XTerm_property:
3661	if (str[0] == '?')	3666	if (str[0] == '?')
3662	{	3667	{
3663	Atom prop = XInternAtom (display->display, str + 1, True);	3668	Atom prop = display->atom (str + 1);
3664	Atom actual_type;	3669	Atom actual_type;
3665	int actual_format;	3670	int actual_format;
3666	unsigned long nitems;	3671	unsigned long nitems;
3667	unsigned long bytes_after;	3672	unsigned long bytes_after;
3668	unsigned char *value = 0;	3673	unsigned char *value = 0;
3669	const char *str = "";	3674	const char *str = "";
3670		3675
3671	if (prop	3676	if (prop
3672	&& XGetWindowProperty (display->display, TermWin.parent[0],	3677	&& XGetWindowProperty (disp, TermWin.parent[0],
3673	prop, 0, 1<<16, 0, AnyPropertyType,	3678	prop, 0, 1<<16, 0, AnyPropertyType,
3674	&actual_type, &actual_format,	3679	&actual_type, &actual_format,
3675	&nitems, &bytes_after, &value) == Success	3680	&nitems, &bytes_after, &value) == Success
3676	&& actual_type != None	3681	&& actual_type != None
3677	&& actual_format == 8)	3682	&& actual_format == 8)
…		…
3686	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3691	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687		3692
3688	if (eq)	3693	if (eq)
3689	{	3694	{
3690	*eq = 0;	3695	*eq = 0;
3691	XChangeProperty (display->display, TermWin.parent[0],	3696	set_utf8_property (display->atom (str), eq + 1);
3692	display->atom (str), XA_STRING, 8,
3693	PropModeReplace, (unsigned char *)eq + 1,
3694	strlen (eq + 1));
3695	}	3697	}
3696	else	3698	else
3697	XDeleteProperty (display->display, TermWin.parent[0],	3699	XDeleteProperty (disp, TermWin.parent[0],
3698	display->atom (str));	3700	display->atom (str));
3699	}	3701	}
3700	break;	3702	break;
3701		3703
3702	case XTerm_Color:	3704	case XTerm_Color:
…		…
3753	break;	3755	break;
3754	case XTerm_Color_RV:	3756	case XTerm_Color_RV:
3755	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3757	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756	break;	3758	break;
3757	#endif	3759	#endif
3758	#if TRANSPARENT \|\| TINTING	3760	#if TRANSPARENT && TINTING
3759	case XTerm_Color_tint:	3761	case XTerm_Color_tint:
3760	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3762	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3761	check_our_parents ();	3763	check_our_parents ();
3762	if (am_transparent)	3764	if (am_transparent)
3763	want_full_refresh = want_refresh = 1;	3765	want_full_refresh = want_refresh = 1;
…		…
3777	{	3779	{
3778	str++;	3780	str++;
3779	#if XPM_BACKGROUND	3781	#if XPM_BACKGROUND
3780	changed += scale_pixmap (str);	3782	changed += scale_pixmap (str);
3781	#endif	3783	#endif
3782
3783	}	3784	}
		3785
3784	if (changed)	3786	if (changed)
3785	{	3787	{
3786	#ifdef XPM_BACKGROUND	3788	#ifdef XPM_BACKGROUND
3787	resize_pixmap ();	3789	resize_pixmap ();
3788	#endif	3790	#endif
…		…
3829	if (query)	3831	if (query)
3830	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3832	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3831	else	3833	else
3832	{	3834	{
3833	set_locale (str);	3835	set_locale (str);
		3836	pty.set_utf8_mode (enc_utf8);
3834	# ifdef USE_XIM	3837	# ifdef USE_XIM
3835	im_cb ();	3838	im_cb ();
3836	# endif	3839	# endif
3837	}	3840	}
3838	break;	3841	break;
…		…
4276		4279
4277	/* ---------------------------------------------------------------------- */	4280	/* ---------------------------------------------------------------------- */
4278	/* Write data to the pty as typed by the user, pasted with the mouse,	4281	/* Write data to the pty as typed by the user, pasted with the mouse,
4279	* or generated by us in response to a query ESC sequence.	4282	* or generated by us in response to a query ESC sequence.
4280	*/	4283	*/
		4284	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4285
4281	void	4286	void
4282	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4287	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4283	{	4288	{
4284	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4289	if (v_buflen == 0)
		4290	{
		4291	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4285		4292
4286	if (len)	4293	if ((unsigned int)written == len)
		4294	return;
		4295
		4296	data += written;
		4297	len -= written;
4287	{	4298	}
		4299
		4300	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4301
		4302	memcpy (v_buffer + v_buflen, data, len);
		4303	v_buflen += len;
		4304
		4305	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4306	}
		4307
		4308	void rxvt_term::pty_write ()
		4309	{
		4310	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4311
		4312	if (written > 0)
		4313	{
		4314	v_buflen -= written;
		4315
4288	if (v_buflen == 0)	4316	if (v_buflen == 0)
4289	{	4317	{
4290	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292	if ((unsigned int)written == len)
4293	return;
4294
4295	data += written;
4296	len -= written;
4297	}
4298
4299
4300	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302	memcpy (v_buffer + v_buflen, data, len);
4303	v_buflen += len;
4304	}
4305
4306	for (;;)
4307	{
4308	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310	if (written > 0)
4311	{
4312	v_buflen -= written;
4313
4314	if (v_buflen == 0)
4315	{
4316	free (v_buffer);	4318	free (v_buffer);
4317	v_buffer = 0;	4319	v_buffer = 0;
4318	v_buflen = 0;	4320	v_buflen = 0;
4319		4321
4320	pty_ev.set (EVENT_READ);	4322	pty_ev.set (EVENT_READ);
4321	return;
4322	}
4323
4324	memmove (v_buffer, v_buffer + written, v_buflen);
4325	}
4326	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4327	// original code just ignores this...
4328	destroy ();
4329	else
4330	{
4331	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4332	return;	4323	return;
4333	}	4324	}
		4325
		4326	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}	4327	}
		4328	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4329	// original code just ignores this...
		4330	destroy ();
4335	}	4331	}
4336		4332
4337	/----------------------- end-of-file (C source) -----------------------/	4333	/----------------------- end-of-file (C source) -----------------------/
4338		4334

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs. Revision 1.195 by root, Thu Feb 17 12:06:21 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.195 by root, Thu Feb 17 12:06:21 2005 UTC