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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.296 by root, Tue Jan 31 14:16:59 2006 UTC

…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
230	# if !UNICODE3	227	# if !UNICODE3
231	if (ch >= 0x10000)	228	if (ch >= 0x10000)
232	ch = 0xfffd;	229	ch = 0xfffd;
233	# endif	230	# endif
234	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
236	}	235	}
237		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
238	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
240		244
241	free (fname);	245	free (fname);
242		246
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	307	{
304	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
305	unsigned int newlen;	309	unsigned int newlen;
306	KeySym keysym;	310	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	311	int valid_keysym;
311	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
312		313
313	/*	314	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	465	{
465	switch (keysym)	466	switch (keysym)
466	{	467	{
467	/* normal XTerm key bindings */	468	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	469	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	470	selection_request (ev.time);
470	return;	471	return;
471	#if TODO	472	#if TODO
472	/* rxvt extras */	473	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	474	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	475	change_font (FONT_UP);
…		…
905	{	906	{
906	const char ch = C0_ESC;	907	const char ch = C0_ESC;
907	tt_write (&ch, 1);	908	tt_write (&ch, 1);
908	}	909	}
909		910
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	911	tt_write (kbuf, (unsigned int)len);
921	}	912	}
922	/}}} /	913	/}}} /
923		914
924	#if defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
…		…
1006	while (l->is_longer () && row < end_row);	997	while (l->is_longer () && row < end_row);
1007	}	998	}
1008	while (row < end_row);	999	while (row < end_row);
1009	}	1000	}
1010		1001
1011	scr_refresh (refresh_type);	1002	scr_refresh ();
1012	scrollbar_show (1);	1003	scrollbar_show (1);
1013	#ifdef USE_XIM	1004	#ifdef USE_XIM
1014	IMSendSpot ();	1005	IMSendSpot ();
1015	#endif	1006	#endif
1016	}	1007	}
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1036	{
1046	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1038	want_refresh = 1;
1048		1039
1049	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1041	}
1051	#endif	1042	#endif
1052		1043
1053	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1054	void	1045	void
…		…
1068	rxvt_term::cont_scroll_cb (time_watcher &w)	1059	rxvt_term::cont_scroll_cb (time_watcher &w)
1069	{	1060	{
1070	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1061	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1071	scr_page (scrollbar_isUp() ? UP : DN, 1))	1062	scr_page (scrollbar_isUp() ? UP : DN, 1))
1072	{	1063	{
1073	refresh_type \|= SMOOTH_REFRESH;
1074	want_refresh = 1;	1064	want_refresh = 1;
1075	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076	}	1066	}
1077	}	1067	}
1078	#endif	1068	#endif
…		…
1082	rxvt_term::sel_scroll_cb (time_watcher &w)	1072	rxvt_term::sel_scroll_cb (time_watcher &w)
1083	{	1073	{
1084	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1074	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085	{	1075	{
1086	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1076	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087	refresh_type \|= SMOOTH_REFRESH;
1088	want_refresh = 1;	1077	want_refresh = 1;
1089	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1078	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090	}	1079	}
1091	}	1080	}
1092	#endif	1081	#endif
…		…
1100	: scr_page (UP, mouse_slip_wheel_speed))	1089	: scr_page (UP, mouse_slip_wheel_speed))
1101	{	1090	{
1102	if (view_start == top_row \|\| view_start == 0)	1091	if (view_start == top_row \|\| view_start == 0)
1103	mouse_slip_wheel_speed = 0;	1092	mouse_slip_wheel_speed = 0;
1104		1093
1105	refresh_type \|= SMOOTH_REFRESH;
1106	want_refresh = 1;	1094	want_refresh = 1;
1107	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108	}	1096	}
1109	}	1097	}
1110	#endif	1098	#endif
…		…
1140		1128
1141	memmove (cmdbuf_base, cmdbuf_ptr, n);	1129	memmove (cmdbuf_base, cmdbuf_ptr, n);
1142	cmdbuf_ptr = cmdbuf_base;	1130	cmdbuf_ptr = cmdbuf_base;
1143	cmdbuf_endp = cmdbuf_ptr + n;	1131	cmdbuf_endp = cmdbuf_ptr + n;
1144		1132
1145	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1133	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146		1134
1147	if (r > 0)	1135	if (r > 0)
1148	{	1136	{
1149	cmdbuf_endp += r;	1137	cmdbuf_endp += r;
1150	return true;	1138	return true;
…		…
1183	}	1171	}
1184		1172
1185	void	1173	void
1186	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1187	{	1175	{
1188	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1189	recolour_cursor ();	1177	recolour_cursor ();
1190		1178
1191	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1192	hidden_pointer = 0;	1180	hidden_pointer = 0;
1193		1181
…		…
1201	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1202	{	1190	{
1203	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1204	return;	1192	return;
1205		1193
1206	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1207	XFlush (display->display);	1195	XFlush (xdisp);
1208		1196
1209	hidden_pointer = 1;	1197	hidden_pointer = 1;
1210	}	1198	}
1211		1199
1212	void	1200	void
…		…
1285	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1286	(32 + x + 1),	1274	(32 + x + 1),
1287	(32 + y + 1));	1275	(32 + y + 1));
1288	}	1276	}
1289		1277
1290	#ifdef USING_W11LIB
1291	void
1292	rxvt_W11_process_x_event (XEvent *ev)
1293	{
1294	rxvt_t *r = rxvt_get_r ();
1295
1296	x_cb (*ev);
1297	}
1298	#endif
1299
1300	/{{{ process an X event /	1278	/{{{ process an X event /
1301	void	1279	void
1302	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1303	{	1281	{
1304	make_current ();	1282	make_current ();
1305		1283
1306	dDisp;	1284	dLocal (Display *, xdisp);
1307		1285
1308	if (ev.xany.window == vt	1286	if (ev.xany.window == vt
1309	&& SHOULD_INVOKE (HOOK_X_EVENT)	1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1310	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311	return;	1289	return;
…		…
1408	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1409	break;	1387	break;
1410		1388
1411	case ClientMessage:	1389	case ClientMessage:
1412	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1413	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1415	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1400	destroy ();
		1401	}
1417	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1418	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1420	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1421	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1422	#endif	1418	#endif
1423	}	1419	}
1424	#if ENABLE_XEMBED
1425	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426	{
1427	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428	focus_in ();
1429	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430	focus_out ();
1431	}
1432	#endif
1433	#ifdef OFFIX_DND
1434	/* OffiX Dnd (drag 'n' drop) protocol */
1435	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436	&& (ev.xclient.data.l[0] == DndFile
1437	\|\| ev.xclient.data.l[0] == DndDir
1438	\|\| ev.xclient.data.l[0] == DndLink))
1439	{
1440	/* Get Dnd data */
1441	Atom ActualType;
1442	int ActualFormat;
1443	unsigned char *data;
1444	unsigned long Size, RemainingBytes;
1445
1446	XGetWindowProperty (disp, display->root,
1447	xa[XA_DNDSELECTION],
1448	0L, 1000000L,
1449	False, AnyPropertyType,
1450	&ActualType, &ActualFormat,
1451	&Size, &RemainingBytes,
1452	&data);
1453	set_string_property (XA_CUT_BUFFER0, data);
1454	XFree (data);
1455	selection_paste (display->root, XA_CUT_BUFFER0, true);
1456	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457	}
1458	#endif /* OFFIX_DND */
1459	break;	1420	break;
1460		1421
1461	case MappingNotify:	1422	case MappingNotify:
1462	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1463	break;	1424	break;
…		…
1496	break;	1457	break;
1497		1458
1498	case ConfigureNotify:	1459	case ConfigureNotify:
1499	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1500	{	1461	{
1501	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1502	;	1463	;
1503		1464
1504	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1505	{	1466	{
1506	seen_resize = 1;	1467	seen_resize = 1;
1507	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508	}	1469	}
1509		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1510	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1511	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1512	check_our_parents ();	1475	check_our_parents ();
1513	#endif	1476	#endif
1514	}	1477	}
1515	break;	1478	break;
1516		1479
1517	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1520	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1521		1485
1522	break;	1486	break;
1523		1487
1524	case SelectionClear:	1488	case SelectionClear:
1525	selection_clear ();	1489	selection_clear ();
…		…
1561	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1562	{	1526	{
1563	do	1527	do
1564	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1565	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1566	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1567		1531
1568	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569		1533
1570	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1571	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1572	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1573		1537
1574	want_refresh = 1;	1538	want_refresh = 1;
1575	}	1539	}
1576	else	1540	else
1577	{	1541	{
1578	XEvent unused_event;	1542	XEvent unused_event;
1579		1543
1580	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1581	;	1545	;
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1583	;	1547	;
1584		1548
1585	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1586	{	1550	{
1587	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1588	scrollbar_show (0);	1552	scrollbar_show (0);
1589	}	1553	}
1590		1554
1591	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1592	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1593	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1594	#endif	1558	#endif
1595	}	1559	}
1596	break;	1560	break;
1597		1561
1598	case MotionNotify:	1562	case MotionNotify:
…		…
1608	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610	; // nop	1574	; // nop
1611	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1612	{	1576	{
1613	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1614	;	1578	;
1615		1579
1616	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1617	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1618	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1619	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1620	&ev.xbutton.state);	1584	&ev.xbutton.state);
1621	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1685	#endif	1649	#endif
1686	}	1650	}
1687	}	1651	}
1688	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689	{	1653	{
1690	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1691	MotionNotify, &ev))	1655	MotionNotify, &ev))
1692	;	1656	;
1693		1657
1694	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1695	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1696	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1697	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1698	&unused_mask);	1662	&unused_mask);
1699	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1714	{	1678	{
1715	hidden_cursor = 0;	1679	hidden_cursor = 0;
1716	want_refresh = 1;	1680	want_refresh = 1;
1717	}	1681	}
1718		1682
1719	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720	}	1684	}
1721	#endif	1685	#endif
1722		1686
1723	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1724	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1752	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1753	}	1717	}
1754	#endif	1718	#endif
1755	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1756	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1757	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758	#endif	1722	#endif
1759	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1760	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1761	{	1725	{
1762	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1843	/*	1807	/*
1844	* VT window processing of button press	1808	* VT window processing of button press
1845	*/	1809	*/
1846	if (ev.window == vt)	1810	if (ev.window == vt)
1847	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1848	#if ISO_14755	1815	#if ISO_14755
1849	// 5.4	1816	// 5.4
1850	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1851	{	1818	{
1852	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1894	else	1861	else
1895	{	1862	{
1896	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1898		1865
1899	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1866	switch (ev.button)
1901	{	1867	{
1902	case Button1:	1868	case Button1:
1903	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1870	/* should be done in screen.C */
1905	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1906	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1907	#else	1873	#else
1908	selection.rect = false;	1874	selection.rect = false;
1909	#endif	1875	#endif
1910		1876
1911	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1879	{
1914	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1916	else	1882	else
1917	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1918	}	1884	}
1919	else	1885	else
1920	{	1886	{
1921	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1922	MEvent.clicks++;	1888	MEvent.clicks++;
1923	else	1889	else
1924	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1925		1891
1926	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1927	}	1893	}
1928		1894
1929	MEvent.button = Button1;	1895	MEvent.button = Button1;
1930	break;	1896	break;
1931		1897
1932	case Button3:	1898	case Button3:
1933	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1934	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1935	else	1901	else
1936	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1937		1903
1938	MEvent.button = Button3;	1904	MEvent.button = Button3;
1939	break;	1905	break;
1940	}	1906	}
1941	}	1907	}
1942		1908
1943	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1944	return;	1910	return;
1945	}	1911	}
1946		1912
…		…
2100		2066
2101	if (scrollbar_isUpDn ())	2067	if (scrollbar_isUpDn ())
2102	{	2068	{
2103	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2104	scrollbar_show (0);	2070	scrollbar_show (0);
2105	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106	refresh_type &= ~SMOOTH_REFRESH;
2107	#endif
2108	}	2071	}
2109		2072
2110	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2111	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
2112	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2113	#endif	2076	#endif
2114		2077
2115	if (ev.window == vt)	2078	if (ev.window == vt)
2116	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2117	#if ISO_14755	2083	#if ISO_14755
2118	// 5.4	2084	// 5.4
2119	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2120	return;	2086	return;
2121	#endif	2087	#endif
		2088
2122	if (reportmode)	2089	if (reportmode)
2123	{	2090	{
2124	/* mouse report from vt window */	2091	/* mouse report from vt window */
2125	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2126	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2150	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2151	&& bypass_keystate	2118	&& bypass_keystate
2152	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2153	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2154		2121
2155	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156	return;
2157
2158	switch (ev.button)	2122	switch (ev.button)
2159	{	2123	{
2160	case Button1:	2124	case Button1:
2161	case Button3:	2125	case Button3:
2162	selection_make (ev.time);	2126	selection_make (ev.time);
2163	break;	2127	break;
		2128
2164	case Button2:	2129	case Button2:
2165	selection_request (ev.time, ev.x, ev.y);	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2166	break;	2132	break;
		2133
2167	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2168	case Button4:	2135	case Button4:
2169	case Button5:	2136	case Button5:
2170	{	2137	{
2171	int i;	2138	int i;
…		…
2211	#if TINTING	2178	#if TINTING
2212	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2213		2180
2214	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2215		2182
2216	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2217	{	2184	{
2218	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2219	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2220	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2221	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223	int i;	2190	int i;
2224		2191
2225	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2226		2193
2227	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2228		2195
2229	/* for convenience */	2196	/* for convenience */
2230	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2451	Atom atype;	2418	Atom atype;
2452	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2453	Window root, oldp, *list;	2420	Window root, oldp, *list;
2454	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2455	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2456	dDisp;
2457		2423
2458	pchanged = 0;	2424	pchanged = 0;
2459		2425
2460	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2461	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2462		2428
2463	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2464	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2465		2431
2466	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2467		2433
2468	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2469	{	2435	{
2470	if (am_transparent)	2436	if (am_transparent)
2471	{	2437	{
2472	pchanged = 1;	2438	pchanged = 1;
2473	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2474	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2475	}	2441	}
2476		2442
2477	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2478	}	2444	}
2479		2445
2480	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2481	XSync (disp, False);	2447	XSync (xdisp, False);
2482		2448
2483	/*	2449	/*
2484	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2485	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2486	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2487	*/	2453	*/
2488	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2492		2458
2493	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2494	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2495	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2496	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2498		2464
2499	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2500	#if TINTING	2466	#if TINTING
…		…
2519	Window cr;	2485	Window cr;
2520	XImage *image;	2486	XImage *image;
2521	GC gc;	2487	GC gc;
2522	XGCValues gcvalue;	2488	XGCValues gcvalue;
2523		2489
2524	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2525	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2526	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2527	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2528	nx = ny = 0;	2494	nx = ny = 0;
2529		2495
…		…
2542	}	2508	}
2543		2509
2544	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2545	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2546		2512
2547	XSync (disp, False);	2513	XSync (xdisp, False);
2548	allowedxerror = -1;	2514	allowedxerror = -1;
2549	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550		2516
2551	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2552	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2553	allowedxerror = 0;	2519	allowedxerror = 0;
2554		2520
…		…
2557	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2558	{	2524	{
2559	pchanged = 1;	2525	pchanged = 1;
2560	if (pixmap != None)	2526	if (pixmap != None)
2561	{	2527	{
2562	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2563	pixmap = None;	2529	pixmap = None;
2564	}	2530	}
2565	}	2531	}
2566		2532
2567	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2568	}	2534	}
2569	else	2535	else
2570	{	2536	{
2571	if (pixmap != None)	2537	if (pixmap != None)
2572	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2573		2539
2574	#if TINTING	2540	#if TINTING
2575	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2576	{	2542	{
2577	unsigned short rm, gm, bm;
2578	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2543	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579		2544
		2545	rxvt_rgba c;
2580	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused [Color_tint].get (this, c);
2581		2547
2582	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583	}	2549	}
2584	#endif	2550	#endif
2585		2551
2586	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2587	szHint.width, szHint.height, image->depth);
2588	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2589	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2590	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2591	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2592	XDestroyImage (image);	2557	XDestroyImage (image);
2593	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2594	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2595		2560
2596	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2597	pchanged = 1;	2562	pchanged = 1;
2598		2563
2599	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2600	}	2565	}
2601	}	2566	}
2602		2567
2603	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2604	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2605	else	2570	else
2606	{	2571	{
2607	unsigned int n;	2572	unsigned int n;
2608	/*	2573	/*
2609	* InheritPixmap transparency	2574	* InheritPixmap transparency
2610	*/	2575	*/
2611	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612	{	2577	{
2613	oldp = parent[i];	2578	oldp = parent[i];
2614	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root,
2615	&parent[i], &list, &n);	2580	&parent[i], &list, &n);
2616	XFree (list);	2581	XFree (list);
2617		2582
2618	if (parent[i] == display->root)	2583	if (parent[i] == display->root)
2619	{	2584	{
…		…
2631		2596
2632	if (pchanged)	2597	if (pchanged)
2633	{	2598	{
2634	for (; n < (unsigned int)i; n++)	2599	for (; n < (unsigned int)i; n++)
2635	{	2600	{
2636	XGetWindowAttributes (disp, parent[n], &wattr);	2601	XGetWindowAttributes (xdisp, parent[n], &wattr);
2637	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2602	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2638	{	2603	{
2639	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640	break;	2605	break;
2641	}	2606	}
2642	}	2607	}
2643	}	2608	}
2644		2609
2645	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2646	{	2611	{
2647	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2648	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2649	am_transparent = 0;	2614	am_transparent = 0;
2650	/* XXX: also turn off Opt_transparent? */	2615	/* XXX: also turn off Opt_transparent? */
2651	}	2616	}
2652	else	2617	else
2653	{	2618	{
2654	#if WAIT_FOR_WM
2655	/* wait (an arbitrary period) for the WM to do its thing
2656	* needed for fvwm2.2.2 (and before?) */
2657	sleep (1);
2658	#endif
2659	for (n = 0; n < (unsigned int)i; n++)	2619	for (n = 0; n < (unsigned int)i; n++)
2660	{	2620	{
2661	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2662	XClearWindow (disp, parent[n]);	2622	XClearWindow (xdisp, parent[n]);
2663	}	2623	}
2664		2624
2665	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2666	am_transparent = 1;	2626	am_transparent = 1;
2667	}	2627	}
2668		2628
2669	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670	parent[i] = None;	2630	parent[i] = None;
2671	}	2631	}
2672		2632
2673	if (scrollBar.win)	2633	if (scrollBar.win)
2674	{	2634	{
2675	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2676	scrollBar.setIdle ();	2636	scrollBar.setIdle ();
2677	scrollbar_show (0);	2637	scrollbar_show (0);
2678	}	2638	}
2679		2639
2680	if (am_transparent)	2640	if (am_transparent)
…		…
2798	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2758	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799	refresh_limit++;	2759	refresh_limit++;
2800	else	2760	else
2801	{	2761	{
2802	flag = true;	2762	flag = true;
2803	scr_refresh (refresh_type);	2763	scr_refresh ();
2804	want_refresh = 1;	2764	want_refresh = 1;
2805	}	2765	}
2806	}	2766	}
2807		2767
2808	}	2768	}
…		…
2826	return flag;	2786	return flag;
2827	}	2787	}
2828		2788
2829	// read the next character	2789	// read the next character
2830	wchar_t	2790	wchar_t
2831	rxvt_term::next_char ()	2791	rxvt_term::next_char () NOTHROW
2832	{	2792	{
2833	while (cmdbuf_ptr < cmdbuf_endp)	2793	while (cmdbuf_ptr < cmdbuf_endp)
2834	{	2794	{
2835	// assume 7-bit to be ascii ALWAYS	2795	// assume 7-bit to be ascii ALWAYS
2836	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2796	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2857	return NOCHAR;	2817	return NOCHAR;
2858	}	2818	}
2859		2819
2860	// read the next octet	2820	// read the next octet
2861	uint32_t	2821	uint32_t
2862	rxvt_term::next_octet ()	2822	rxvt_term::next_octet () NOTHROW
2863	{	2823	{
2864	return cmdbuf_ptr < cmdbuf_endp	2824	return cmdbuf_ptr < cmdbuf_endp
2865	? (unsigned char)*cmdbuf_ptr++	2825	? (unsigned char)*cmdbuf_ptr++
2866	: NOCHAR;	2826	: NOCHAR;
2867	}	2827	}
		2828
		2829	static class out_of_input out_of_input;
2868		2830
2869	/* rxvt_cmd_getc () - Return next input character */	2831	/* rxvt_cmd_getc () - Return next input character */
2870	/*	2832	/*
2871	* Return the next input character after first passing any keyboard input	2833	* Return the next input character after first passing any keyboard input
2872	* to the command.	2834	* to the command.
2873	*/	2835	*/
2874	wchar_t	2836	wchar_t
2875	rxvt_term::cmd_getc ()	2837	rxvt_term::cmd_getc () THROW ((class out_of_input))
2876	{	2838	{
2877	wchar_t c = next_char ();	2839	wchar_t c = next_char ();
2878		2840
2879	if (c == NOCHAR)	2841	if (c == NOCHAR)
2880	throw out_of_input;	2842	throw out_of_input;
2881		2843
2882	return c;	2844	return c;
2883	}	2845	}
2884		2846
2885	uint32_t	2847	uint32_t
2886	rxvt_term::cmd_get8 ()	2848	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887	{	2849	{
2888	uint32_t c = next_octet ();	2850	uint32_t c = next_octet ();
2889		2851
2890	if (c == NOCHAR)	2852	if (c == NOCHAR)
2891	throw out_of_input;	2853	throw out_of_input;
…		…
3129	scr_charset_set (2, (unsigned int)cmd_getc ());	3091	scr_charset_set (2, (unsigned int)cmd_getc ());
3130	break;	3092	break;
3131	case '+':	3093	case '+':
3132	scr_charset_set (3, (unsigned int)cmd_getc ());	3094	scr_charset_set (3, (unsigned int)cmd_getc ());
3133	break;	3095	break;
3134	#if ENABLE_FRILLS	3096	#if !ENABLE_MINIMAL
3135	case '6':	3097	case '6':
3136	scr_backindex ();	3098	scr_backindex ();
3137	break;	3099	break;
3138	#endif	3100	#endif
3139	case '7':	3101	case '7':
3140	scr_cursor (SAVE);	3102	scr_cursor (SAVE);
3141	break;	3103	break;
3142	case '8':	3104	case '8':
3143	scr_cursor (RESTORE);	3105	scr_cursor (RESTORE);
3144	break;	3106	break;
3145	#if ENABLE_FRILLS	3107	#if !ENABLE_MINIMAL
3146	case '9':	3108	case '9':
3147	scr_forwardindex ();	3109	scr_forwardindex ();
3148	break;	3110	break;
3149	#endif	3111	#endif
3150	case '=':	3112	case '=':
…		…
3312	ndef = get_byte_array_bit (csi_defaults, i);	3274	ndef = get_byte_array_bit (csi_defaults, i);
3313	for (p = 0; p < nargs; p++)	3275	for (p = 0; p < nargs; p++)
3314	if (arg[p] == -1)	3276	if (arg[p] == -1)
3315	arg[p] = ndef;	3277	arg[p] = ndef;
3316		3278
3317	#ifdef DEBUG_CMD
3318	fprintf (stderr, "CSI ");
3319	for (p = 0; p < nargs; p++)
3320	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3321	fprintf (stderr, "%c\n", ch);
3322	#endif
3323
3324	/*	3279	/*
3325	* private mode handling	3280	* private mode handling
3326	*/	3281	*/
3327	if (priv)	3282	if (priv)
3328	{	3283	{
3329	switch (priv)	3284	switch (priv)
3330	{	3285	{
3331	case '>':	3286	case '>':
3332	if (ch == CSI_DA) /* secondary device attributes */	3287	if (ch == CSI_DA) /* secondary device attributes */
3333	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3288	{
		3289	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3290	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3291	//
		3292	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3293	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3294	// that we do not support xterm mouse reporting (should be 95 when we do).
		3295	//
		3296	tt_printf ("\033[>%d;94;0c", 'U');
		3297	}
3334	break;	3298	break;
3335	case '?':	3299	case '?':
3336	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3300	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3337	process_terminal_mode (ch, priv, nargs, arg);	3301	process_terminal_mode (ch, priv, nargs, arg);
3338	break;	3302	break;
…		…
3541	break;	3505	break;
3542	case CSI_75:	3506	case CSI_75:
3543	scr_cursor (RESTORE);	3507	scr_cursor (RESTORE);
3544	break;	3508	break;
3545		3509
3546	#if ENABLE_FRILLS	3510	#if !ENABLE_MINIMAL
3547	case CSI_74:	3511	case CSI_74:
3548	process_window_ops (arg, nargs);	3512	process_window_ops (arg, nargs);
3549	break;	3513	break;
3550	#endif	3514	#endif
3551		3515
…		…
3558	break;	3522	break;
3559	}	3523	}
3560	}	3524	}
3561	/}}} /	3525	/}}} /
3562		3526
3563	#if ENABLE_FRILLS	3527	#if !ENABLE_MINIMAL
3564	/* ARGSUSED */	3528	/* ARGSUSED */
3565	void	3529	void
3566	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567	{	3531	{
3568	int x, y;	3532	int x, y;
3569	XWindowAttributes wattr;	3533	XWindowAttributes wattr;
3570	Window wdummy;	3534	Window wdummy;
3571	dDisp;	3535
		3536	dLocal (Display *, xdisp);
3572		3537
3573	if (nargs == 0)	3538	if (nargs == 0)
3574	return;	3539	return;
3575		3540
3576	switch (args[0])	3541	switch (args[0])
3577	{	3542	{
3578	/*	3543	/*
3579	* commands	3544	* commands
3580	*/	3545	*/
3581	case 1: /* deiconify window */	3546	case 1: /* deiconify window */
3582	XMapWindow (disp, parent[0]);	3547	XMapWindow (xdisp, parent[0]);
3583	break;	3548	break;
3584	case 2: /* iconify window */	3549	case 2: /* iconify window */
3585	XIconifyWindow (disp, parent[0], display->screen);	3550	XIconifyWindow (xdisp, parent[0], display->screen);
3586	break;	3551	break;
3587	case 3: /* set position (pixels) */	3552	case 3: /* set position (pixels) */
3588	XMoveWindow (disp, parent[0], args[1], args[2]);	3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3589	break;	3554	break;
3590	case 4: /* set size (pixels) */	3555	case 4: /* set size (pixels) */
3591	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592	break;	3557	break;
3593	case 5: /* raise window */	3558	case 5: /* raise window */
3594	XRaiseWindow (disp, parent[0]);	3559	XRaiseWindow (xdisp, parent[0]);
3595	break;	3560	break;
3596	case 6: /* lower window */	3561	case 6: /* lower window */
3597	XLowerWindow (disp, parent[0]);	3562	XLowerWindow (xdisp, parent[0]);
3598	break;	3563	break;
3599	case 7: /* refresh window */	3564	case 7: /* refresh window */
3600	scr_touch (true);	3565	scr_touch (true);
3601	break;	3566	break;
3602	case 8: /* set size (chars) */	3567	case 8: /* set size (chars) */
…		…
3614		3579
3615	/*	3580	/*
3616	* reports - some output format copied from XTerm	3581	* reports - some output format copied from XTerm
3617	*/	3582	*/
3618	case 11: /* report window state */	3583	case 11: /* report window state */
3619	XGetWindowAttributes (disp, parent[0], &wattr);	3584	XGetWindowAttributes (xdisp, parent[0], &wattr);
3620	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621	break;	3586	break;
3622	case 13: /* report window position */	3587	case 13: /* report window position */
3623	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3624	XTranslateCoordinates (disp, parent[0], wattr.root,	3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3625	-wattr.border_width, -wattr.border_width,	3590	-wattr.border_width, -wattr.border_width,
3626	&x, &y, &wdummy);	3591	&x, &y, &wdummy);
3627	tt_printf ("\033[3;%d;%dt", x, y);	3592	tt_printf ("\033[3;%d;%dt", x, y);
3628	break;	3593	break;
3629	case 14: /* report window size (pixels) */	3594	case 14: /* report window size (pixels) */
3630	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (xdisp, parent[0], &wattr);
3631	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632	break;	3597	break;
3633	case 18: /* report text area size (chars) */	3598	case 18: /* report text area size (chars) */
3634	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635	break;	3600	break;
…		…
3637	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638	break;	3603	break;
3639	case 20: /* report icon label */	3604	case 20: /* report icon label */
3640	{	3605	{
3641	char *s;	3606	char *s;
3642	XGetIconName (disp, parent[0], &s);	3607	XGetIconName (xdisp, parent[0], &s);
3643	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644	XFree (s);	3609	XFree (s);
3645	}	3610	}
3646	break;	3611	break;
3647	case 21: /* report window title */	3612	case 21: /* report window title */
3648	{	3613	{
3649	char *s;	3614	char *s;
3650	XFetchName (disp, parent[0], &s);	3615	XFetchName (xdisp, parent[0], &s);
3651	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3616	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652	XFree (s);	3617	XFree (s);
3653	}	3618	}
3654	break;	3619	break;
3655	}	3620	}
…		…
3756	void	3721	void
3757	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3722	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758	{	3723	{
3759	if (str[0] == '?' && !str[1])	3724	if (str[0] == '?' && !str[1])
3760	{	3725	{
3761	unsigned short r, g, b;	3726	rxvt_rgba c;
3762	pix_colors_focused[color].get (display, r, g, b);	3727	pix_colors_focused[color].get (this, c);
		3728
		3729	#if XFT
		3730	if (c.a != rxvt_rgba::MAX_CC)
		3731	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3732	else
		3733	#endif
3763	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3734	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764	}	3735	}
3765	else	3736	else
3766	set_window_color (color, str);	3737	set_window_color (color, str);
3767	}	3738	}
3768		3739
…		…
3770	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3741	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3771	*/	3742	*/
3772	void	3743	void
3773	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3744	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774	{	3745	{
3775	int changed = 0;
3776	int color;	3746	int color;
3777	char buf, name;	3747	char buf, name;
3778	bool query = str[0] == '?' && !str[1];	3748	bool query = str[0] == '?' && !str[1];
3779	int saveop = op;	3749	int saveop = op;
3780	dDisp;	3750
		3751	dLocal (Display *, xdisp);
3781		3752
3782	assert (str != NULL);	3753	assert (str != NULL);
3783	switch (op)	3754	switch (op)
3784	{	3755	{
3785	case XTerm_name:	3756	case XTerm_name:
…		…
3801	unsigned long bytes_after;	3772	unsigned long bytes_after;
3802	unsigned char *value = 0;	3773	unsigned char *value = 0;
3803	const char *str = "";	3774	const char *str = "";
3804		3775
3805	if (prop	3776	if (prop
3806	&& XGetWindowProperty (disp, parent[0],	3777	&& XGetWindowProperty (xdisp, parent[0],
3807	prop, 0, 1<<16, 0, AnyPropertyType,	3778	prop, 0, 1<<16, 0, AnyPropertyType,
3808	&actual_type, &actual_format,	3779	&actual_type, &actual_format,
3809	&nitems, &bytes_after, &value) == Success	3780	&nitems, &bytes_after, &value) == Success
3810	&& actual_type != None	3781	&& actual_type != None
3811	&& actual_format == 8)	3782	&& actual_format == 8)
3812	str = (const char *)(value);	3783	str = (const char *)(value);
3813		3784
3814	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3785	tt_printf ("\033]%d;%s%c", op, str, resp);
3815		3786
3816	XFree (value);	3787	XFree (value);
3817	}	3788	}
3818	else	3789	else
3819	{	3790	{
…		…
3823	{	3794	{
3824	*eq = 0;	3795	*eq = 0;
3825	set_utf8_property (display->atom (str), eq + 1);	3796	set_utf8_property (display->atom (str), eq + 1);
3826	}	3797	}
3827	else	3798	else
3828	XDeleteProperty (disp, parent[0],	3799	XDeleteProperty (xdisp, parent[0],
3829	display->atom (str));	3800	display->atom (str));
3830	}	3801	}
3831	break;	3802	break;
3832		3803
3833	case XTerm_Color:	3804	case XTerm_Color:
…		…
3843	break;	3814	break;
3844		3815
3845	if ((buf = strchr (name, ';')) != NULL)	3816	if ((buf = strchr (name, ';')) != NULL)
3846	*buf++ = '\0';	3817	*buf++ = '\0';
3847		3818
3848	if (name[0] == '?' && !name[1])	3819	process_color_seq (op, color, name, resp);
3849	{
3850	unsigned short r, g, b;
3851	pix_colors_focused[color].get (display, r, g, b);
3852	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853	}
3854	else
3855	set_window_color (color, name);
3856	}	3820	}
3857	break;	3821	break;
3858	case XTerm_Color00:	3822	case XTerm_Color00:
3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3823	process_color_seq (op, Color_fg, str, resp);
3860	break;	3824	break;
3861	case XTerm_Color01:	3825	case XTerm_Color01:
3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3826	process_color_seq (op, Color_bg, str, resp);
3863	break;	3827	break;
3864	#ifndef NO_CURSORCOLOR	3828	#ifndef NO_CURSORCOLOR
3865	case XTerm_Color_cursor:	3829	case XTerm_Color_cursor:
3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3830	process_color_seq (op, Color_cursor, str, resp);
3867	break;	3831	break;
3868	#endif	3832	#endif
3869	case XTerm_Color_pointer_fg:	3833	case XTerm_Color_pointer_fg:
3870	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3834	process_color_seq (op, Color_pointer_fg, str, resp);
3871	break;	3835	break;
3872	case XTerm_Color_pointer_bg:	3836	case XTerm_Color_pointer_bg:
3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3837	process_color_seq (op, Color_pointer_bg, str, resp);
3874	break;	3838	break;
3875	#ifndef NO_BOLD_UNDERLINE_REVERSE	3839	#ifndef NO_BOLD_UNDERLINE_REVERSE
3876	case XTerm_Color_RV:	3840	case XTerm_Color_RV:
3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3841	process_color_seq (op, Color_RV, str, resp);
3878	break;	3842	break;
3879	case Rxvt_Color_BD:	3843	case Rxvt_Color_BD:
3880	case URxvt_Color_BD:	3844	case URxvt_Color_BD:
3881	process_color_seq (op, Color_BD, str, resp);	3845	process_color_seq (op, Color_BD, str, resp);
3882	break;	3846	break;
3883	case Rxvt_Color_UL:	3847	case Rxvt_Color_UL:
3884	case URxvt_Color_UL:	3848	case URxvt_Color_UL:
3885	process_color_seq (op, Color_UL, str, resp);	3849	process_color_seq (op, Color_UL, str, resp);
3886	break;	3850	break;
3887	case URxvt_Color_IT:	3851	case URxvt_Color_IT:
3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3852	process_color_seq (op, Color_IT, str, resp);
3889	break;	3853	break;
3890	#endif	3854	#endif
3891	#if TRANSPARENT && TINTING	3855	#if TRANSPARENT && TINTING
3892	case URxvt_Color_tint:	3856	case URxvt_Color_tint:
3893	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3857	process_color_seq (op, Color_tint, str, resp);
3894	check_our_parents ();	3858	check_our_parents ();
3895	if (am_transparent)	3859	if (am_transparent)
3896	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3897	break;	3861	break;
3898	#endif	3862	#endif
3899		3863
3900	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
		3865	{
3901	if (*str != ';')	3866	if (*str != ';')
3902	{	3867	{
3903	#if XPM_BACKGROUND	3868	#if XPM_BACKGROUND
3904	scale_pixmap (""); /* reset to default scaling */	3869	scale_pixmap (""); /* reset to default scaling */
3905	set_bgPixmap (str); /* change pixmap */	3870	set_bgPixmap (str); /* change pixmap */
3906	scr_touch (true);	3871	scr_touch (true);
3907	#endif	3872	#endif
3908	}	3873	}
3909		3874
		3875	int changed = 0;
		3876
3910	while ((str = strchr (str, ';')) != NULL)	3877	while ((str = strchr (str, ';')) != NULL)
3911	{	3878	{
3912	str++;	3879	str++;
3913	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3914	changed += scale_pixmap (str);	3881	changed += scale_pixmap (str);
3915	#endif	3882	#endif
3916	}	3883	}
3917		3884
3918	if (changed)	3885	if (changed)
3919	{	3886	{
3920	#ifdef XPM_BACKGROUND	3887	#ifdef XPM_BACKGROUND
3921	resize_pixmap ();	3888	resize_pixmap ();
3922	scr_touch (true);	3889	scr_touch (true);
3923	#endif	3890	#endif
3924	}	3891	}
		3892	}
3925	break;	3893	break;
3926		3894
3927	case Rxvt_restoreFG:	3895	case Rxvt_restoreFG:
3928	set_window_color (Color_fg, str);	3896	set_window_color (Color_fg, str);
3929	break;	3897	break;
…		…
3968	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
3969	set_fonts ();	3937	set_fonts ();
3970	}	3938	}
3971	break;	3939	break;
3972		3940
3973	#if ENABLE_FRILLS	3941	case URxvt_version:
		3942	if (query)
		3943	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3944	op,
		3945	rs[Rs_name], VERSION[0], VERSION[2],
		3946	resp);
		3947	break;
		3948
		3949	#if !ENABLE_MINIMAL
3974	case URxvt_locale:	3950	case URxvt_locale:
3975	if (query)	3951	if (query)
3976	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3977	else	3953	else
3978	{	3954	{
3979	set_locale (str);	3955	set_locale (str);
3980	pty.set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
3981	init_xlocale ();	3957	init_xlocale ();
3982	}	3958	}
3983	break;	3959	break;
3984		3960
3985	case URxvt_view_up:	3961	case URxvt_view_up:
…		…
4038	return state;	4014	return state;
4039	}	4015	}
4040		4016
4041	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4042	void	4018	void
4043	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4019	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044	{	4020	{
4045	unsigned int i, j;	4021	unsigned int i, j;
4046	int state;	4022	int state;
4047		4023
4048	static const struct	4024	static const struct
…		…
4342	scr_color (Color_bg, Color_bg);	4318	scr_color (Color_bg, Color_bg);
4343	break;	4319	break;
4344		4320
4345	//case 50: // not variable spacing	4321	//case 50: // not variable spacing
4346		4322
4347	#if ENABLE_FRILLS	4323	#if !ENABLE_MINIMAL
4348	case 90:	4324	case 90:
4349	case 91: /* set bright fg color */	4325	case 91: /* set bright fg color */
4350	case 92:	4326	case 92:
4351	case 93:	4327	case 93:
4352	case 94:	4328	case 94:
…		…
4417	rxvt_term::tt_write (const char *data, unsigned int len)	4393	rxvt_term::tt_write (const char *data, unsigned int len)
4418	{	4394	{
4419	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4395	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420	return;	4396	return;
4421		4397
4422	if (pty.pty < 0)	4398	if (pty->pty < 0)
4423	return;	4399	return;
4424		4400
4425	if (v_buflen == 0)	4401	if (v_buflen == 0)
4426	{	4402	{
4427	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4403	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428		4404
4429	if ((unsigned int)written == len)	4405	if ((unsigned int)written == len)
4430	return;	4406	return;
4431		4407
4432	data += written;	4408	data += written;
…		…
4441	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4417	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4442	}	4418	}
4443		4419
4444	void rxvt_term::pty_write ()	4420	void rxvt_term::pty_write ()
4445	{	4421	{
4446	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4422	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447		4423
4448	if (written > 0)	4424	if (written > 0)
4449	{	4425	{
4450	v_buflen -= written;	4426	v_buflen -= written;
4451		4427

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC vs. Revision 1.296 by root, Tue Jan 31 14:16:59 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.296 by root, Tue Jan 31 14:16:59 2006 UTC