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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.291 by root, Sun Jan 29 20:51:27 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)
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
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);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/}}} /	906	/}}} /
923		907
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	909	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	911	{
930	unsigned int n, s;	912	unsigned int n, s;
931		913
…		…
1008	while (l->is_longer () && row < end_row);	990	while (l->is_longer () && row < end_row);
1009	}	991	}
1010	while (row < end_row);	992	while (row < end_row);
1011	}	993	}
1012		994
1013	scr_refresh (refresh_type);	995	scr_refresh ();
1014	scrollbar_show (1);	996	scrollbar_show (1);
1015	#ifdef USE_XIM	997	#ifdef USE_XIM
1016	IMSendSpot ();	998	IMSendSpot ();
1017	#endif	999	#endif
1018	}	1000	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1029	{
1048	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1031	want_refresh = 1;
1050		1032
1051	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1034	}
1053	#endif	1035	#endif
1054		1036
1055	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1056	void	1038	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1053	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1056	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1057	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1059	}
1079	}	1060	}
1080	#endif	1061	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1066	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1068	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1070	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1072	}
1093	}	1073	}
1094	#endif	1074	#endif
…		…
1102	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1083	{
1104	if (view_start == top_row \|\| view_start == 0)	1084	if (view_start == top_row \|\| view_start == 0)
1105	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1106		1086
1107	refresh_type \|= SMOOTH_REFRESH;
1108	want_refresh = 1;	1087	want_refresh = 1;
1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110	}	1089	}
1111	}	1090	}
1112	#endif	1091	#endif
…		…
1142		1121
1143	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1144	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1145	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1146		1125
1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148		1127
1149	if (r > 0)	1128	if (r > 0)
1150	{	1129	{
1151	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1152	return true;	1131	return true;
…		…
1185	}	1164	}
1186		1165
1187	void	1166	void
1188	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1189	{	1168	{
1190	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1191	recolour_cursor ();	1170	recolour_cursor ();
1192		1171
1193	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1194	hidden_pointer = 0;	1173	hidden_pointer = 0;
1195		1174
…		…
1203	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1204	{	1183	{
1205	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1206	return;	1185	return;
1207		1186
1208	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1209	XFlush (display->display);	1188	XFlush (xdisp);
1210		1189
1211	hidden_pointer = 1;	1190	hidden_pointer = 1;
1212	}	1191	}
1213		1192
1214	void	1193	void
…		…
1287	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1288	(32 + x + 1),	1267	(32 + x + 1),
1289	(32 + y + 1));	1268	(32 + y + 1));
1290	}	1269	}
1291		1270
1292	#ifdef USING_W11LIB
1293	void
1294	rxvt_W11_process_x_event (XEvent *ev)
1295	{
1296	rxvt_t *r = rxvt_get_r ();
1297
1298	x_cb (*ev);
1299	}
1300	#endif
1301
1302	/{{{ process an X event /	1271	/{{{ process an X event /
1303	void	1272	void
1304	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1305	{	1274	{
1306	make_current ();	1275	make_current ();
1307		1276
1308	dDisp;	1277	dLocal (Display *, xdisp);
1309		1278
1310	if (ev.xany.window == vt	1279	if (ev.xany.window == vt
1311	&& SHOULD_INVOKE (HOOK_X_EVENT)	1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313	return;	1282	return;
…		…
1410	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1411	break;	1380	break;
1412		1381
1413	case ClientMessage:	1382	case ClientMessage:
1414	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	1385	{
		1386	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1387	{
		1388	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1389	{
1417	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1390	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1391	{
		1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418	destroy ();	1393	destroy ();
		1394	}
1419	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1420	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1423	&ev);	1399	&ev);
		1400	#endif
		1401	}
		1402	}
		1403	#if ENABLE_XEMBED
		1404	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1405	{
		1406	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1407	focus_in ();
		1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1409	focus_out ();
		1410	}
1424	#endif	1411	#endif
1425	}	1412	}
1426	#if ENABLE_XEMBED
1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428	{
1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430	focus_in ();
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();
1433	}
1434	#endif
1435	#ifdef OFFIX_DND
1436	/* OffiX Dnd (drag 'n' drop) protocol */
1437	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438	&& (ev.xclient.data.l[0] == DndFile
1439	\|\| ev.xclient.data.l[0] == DndDir
1440	\|\| ev.xclient.data.l[0] == DndLink))
1441	{
1442	/* Get Dnd data */
1443	Atom ActualType;
1444	int ActualFormat;
1445	unsigned char *data;
1446	unsigned long Size, RemainingBytes;
1447
1448	XGetWindowProperty (disp, display->root,
1449	xa[XA_DNDSELECTION],
1450	0L, 1000000L,
1451	False, AnyPropertyType,
1452	&ActualType, &ActualFormat,
1453	&Size, &RemainingBytes,
1454	&data);
1455	set_string_property (XA_CUT_BUFFER0, data);
1456	XFree (data);
1457	selection_paste (display->root, XA_CUT_BUFFER0, true);
1458	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459	}
1460	#endif /* OFFIX_DND */
1461	break;	1413	break;
1462		1414
1463	case MappingNotify:	1415	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1417	break;
…		…
1498	break;	1450	break;
1499		1451
1500	case ConfigureNotify:	1452	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1502	{	1454	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1456	;
1505		1457
1506	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1507	{	1459	{
1508	seen_resize = 1;	1460	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1461	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1462	}
1511		1463
		1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1465
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1466	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1467	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1468	check_our_parents ();
1515	#endif	1469	#endif
1516	}	1470	}
1517	break;	1471	break;
1518		1472
1519	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1478
1524	break;	1479	break;
1525		1480
1526	case SelectionClear:	1481	case SelectionClear:
1527	selection_clear ();	1482	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1564	{	1519	{
1565	do	1520	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1569		1524
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1526
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1575		1530
1576	want_refresh = 1;	1531	want_refresh = 1;
1577	}	1532	}
1578	else	1533	else
1579	{	1534	{
1580	XEvent unused_event;	1535	XEvent unused_event;
1581		1536
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1583	;	1538	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1540	;
1586		1541
1587	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1588	{	1543	{
1589	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1590	scrollbar_show (0);	1545	scrollbar_show (0);
1591	}	1546	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1547
1597	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1600	#endif	1551	#endif
1601	}	1552	}
1602	break;	1553	break;
1603		1554
1604	case MotionNotify:	1555	case MotionNotify:
1605	#ifdef POINTER_BLANK	1556	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1557	if (hidden_pointer)
1607	pointer_unblank ();	1558	pointer_unblank ();
1608	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif	1559	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1560	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1561	break;
1618		1562
1619	if (ev.xany.window == vt)	1563	if (ev.xany.window == vt)
…		…
1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1567	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1569	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1627	;	1571	;
1628		1572
1629	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1630	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1577	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1642	#endif
1699	}	1643	}
1700	}	1644	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1646	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1704	MotionNotify, &ev))	1648	MotionNotify, &ev))
1705	;	1649	;
1706		1650
1707	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1708	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1655	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1727	{	1671	{
1728	hidden_cursor = 0;	1672	hidden_cursor = 0;
1729	want_refresh = 1;	1673	want_refresh = 1;
1730	}	1674	}
1731		1675
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1677	}
1734	#endif	1678	#endif
1735		1679
1736	#if defined(POINTER_BLANK)	1680	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1766	}	1710	}
1767	#endif	1711	#endif
1768	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1715	#endif
1772	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1774	{	1718	{
1775	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1856	/*	1800	/*
1857	* VT window processing of button press	1801	* VT window processing of button press
1858	*/	1802	*/
1859	if (ev.window == vt)	1803	if (ev.window == vt)
1860	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1861	#if ISO_14755	1808	#if ISO_14755
1862	// 5.4	1809	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1864	{	1811	{
1865	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1854	else
1908	{	1855	{
1909	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1911		1858
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1859	switch (ev.button)
1914	{	1860	{
1915	case Button1:	1861	case Button1:
1916	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1863	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1866	#else
1921	selection.rect = false;	1867	selection.rect = false;
1922	#endif	1868	#endif
1923		1869
1924	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1872	{
1927	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1929	else	1875	else
1930	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1931	}	1877	}
1932	else	1878	else
1933	{	1879	{
1934	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1881	MEvent.clicks++;
1936	else	1882	else
1937	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1938		1884
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1886	}
1941		1887
1942	MEvent.button = Button1;	1888	MEvent.button = Button1;
1943	break;	1889	break;
1944		1890
1945	case Button3:	1891	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1948	else	1894	else
1949	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1950		1896
1951	MEvent.button = Button3;	1897	MEvent.button = Button3;
1952	break;	1898	break;
1953	}	1899	}
1954	}	1900	}
1955		1901
1956	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1957	return;	1903	return;
1958	}	1904	}
1959		1905
…		…
2098	}	2044	}
2099	}	2045	}
2100		2046
2101	return;	2047	return;
2102	}	2048	}
2103
2104	#if MENUBAR
2105	/*
2106	* Menubar window processing of button press
2107	*/
2108	if (isMenuBarWindow (ev.window))
2109	menubar_control (ev);
2110	#endif
2111	}	2049	}
2112		2050
2113	void	2051	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2052	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2053	{
…		…
2121		2059
2122	if (scrollbar_isUpDn ())	2060	if (scrollbar_isUpDn ())
2123	{	2061	{
2124	scrollBar.setIdle ();	2062	scrollBar.setIdle ();
2125	scrollbar_show (0);	2063	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2064	}
2130		2065
2131	#ifdef SELECTION_SCROLLING	2066	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2067	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2134	#endif	2069	#endif
2135		2070
2136	if (ev.window == vt)	2071	if (ev.window == vt)
2137	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2138	#if ISO_14755	2076	#if ISO_14755
2139	// 5.4	2077	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2141	return;	2079	return;
2142	#endif	2080	#endif
		2081
2143	if (reportmode)	2082	if (reportmode)
2144	{	2083	{
2145	/* mouse report from vt window */	2084	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2111	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2175		2114
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2115	switch (ev.button)
2180	{	2116	{
2181	case Button1:	2117	case Button1:
2182	case Button3:	2118	case Button3:
2183	selection_make (ev.time);	2119	selection_make (ev.time);
2184	break;	2120	break;
		2121
2185	case Button2:	2122	case Button2:
2186	selection_request (ev.time, ev.x, ev.y);	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187	break;	2125	break;
		2126
2188	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2189	case Button4:	2128	case Button4:
2190	case Button5:	2129	case Button5:
2191	{	2130	{
2192	int i;	2131	int i;
…		…
2224	}	2163	}
2225	break;	2164	break;
2226	#endif	2165	#endif
2227	}	2166	}
2228	}	2167	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2168	}
2234		2169
2235	#ifdef TRANSPARENT	2170	#ifdef TRANSPARENT
2236	#if TINTING	2171	#if TINTING
2237	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2238		2173
2239	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2240		2175
2241	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2242	{	2177	{
2243	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2183	int i;
2249		2184
2250	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2251		2186
2252	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2253		2188
2254	/* for convenience */	2189	/* for convenience */
2255	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2411	Atom atype;
2477	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2413	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2416
2483	pchanged = 0;	2417	pchanged = 0;
2484		2418
2485	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2487		2421
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2490		2424
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2492		2426
2493	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2494	{	2428	{
2495	if (am_transparent)	2429	if (am_transparent)
2496	{	2430	{
2497	pchanged = 1;	2431	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2500	}	2434	}
2501		2435
2502	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2503	}	2437	}
2504		2438
2505	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2506	XSync (disp, False);	2440	XSync (xdisp, False);
2507		2441
2508	/*	2442	/*
2509	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2511	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2512	*/	2446	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2517		2451
2518	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2523		2457
2524	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2525	#if TINTING	2459	#if TINTING
…		…
2544	Window cr;	2478	Window cr;
2545	XImage *image;	2479	XImage *image;
2546	GC gc;	2480	GC gc;
2547	XGCValues gcvalue;	2481	XGCValues gcvalue;
2548		2482
2549	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2487	nx = ny = 0;
2554		2488
…		…
2567	}	2501	}
2568		2502
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2505
2572	XSync (disp, False);	2506	XSync (xdisp, False);
2573	allowedxerror = -1;	2507	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2509
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2512	allowedxerror = 0;
2579		2513
…		…
2582	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2583	{	2517	{
2584	pchanged = 1;	2518	pchanged = 1;
2585	if (pixmap != None)	2519	if (pixmap != None)
2586	{	2520	{
2587	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2588	pixmap = None;	2522	pixmap = None;
2589	}	2523	}
2590	}	2524	}
2591		2525
2592	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2593	}	2527	}
2594	else	2528	else
2595	{	2529	{
2596	if (pixmap != None)	2530	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2598		2532
2599	#if TINTING	2533	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2535	{
2602	unsigned short rm, gm, bm;	2536	rxvt_rgba c;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2538
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, c);
2606		2540
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608	}	2542	}
2609	#endif	2543	#endif
2610		2544
2611	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2617	XDestroyImage (image);	2550	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2620		2553
2621	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2622	pchanged = 1;	2555	pchanged = 1;
2623		2556
2624	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2625	}	2558	}
2626	}	2559	}
2627		2560
2628	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630	else	2563	else
2631	{	2564	{
2632	unsigned int n;	2565	unsigned int n;
2633	/*	2566	/*
2634	* InheritPixmap transparency	2567	* InheritPixmap transparency
2635	*/	2568	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2570	{
2638	oldp = parent[i];	2571	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2640	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2641	XFree (list);	2574	XFree (list);
2642		2575
2643	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2644	{	2577	{
…		…
2656		2589
2657	if (pchanged)	2590	if (pchanged)
2658	{	2591	{
2659	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2660	{	2593	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2662	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2663	{	2596	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2598	break;
2666	}	2599	}
2667	}	2600	}
2668	}	2601	}
2669		2602
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671	{	2604	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2607	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2676	}	2609	}
2677	else	2610	else
2678	{	2611	{
2679	#if WAIT_FOR_WM
2680	/* wait (an arbitrary period) for the WM to do its thing
2681	* needed for fvwm2.2.2 (and before?) */
2682	sleep (1);
2683	#endif
2684	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2685	{	2613	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2688	}	2616	}
2689		2617
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2691	am_transparent = 1;	2619	am_transparent = 1;
2692	}	2620	}
2693		2621
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2623	parent[i] = None;
2696	}	2624	}
2697		2625
2698	if (scrollBar.win)	2626	if (scrollBar.win)
2699	{	2627	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2702	scrollbar_show (0);	2630	scrollbar_show (0);
2703	}	2631	}
2704		2632
2705	if (am_transparent)	2633	if (am_transparent)
…		…
2823	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824	refresh_limit++;	2752	refresh_limit++;
2825	else	2753	else
2826	{	2754	{
2827	flag = true;	2755	flag = true;
2828	scr_refresh (refresh_type);	2756	scr_refresh ();
2829	want_refresh = 1;	2757	want_refresh = 1;
2830	}	2758	}
2831	}	2759	}
2832		2760
2833	}	2761	}
…		…
2851	return flag;	2779	return flag;
2852	}	2780	}
2853		2781
2854	// read the next character	2782	// read the next character
2855	wchar_t	2783	wchar_t
2856	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2857	{	2785	{
2858	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2859	{	2787	{
2860	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2861	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2882	return NOCHAR;	2810	return NOCHAR;
2883	}	2811	}
2884		2812
2885	// read the next octet	2813	// read the next octet
2886	uint32_t	2814	uint32_t
2887	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2888	{	2816	{
2889	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2890	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2891	: NOCHAR;	2819	: NOCHAR;
2892	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2893		2823
2894	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2895	/*	2825	/*
2896	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2897	* to the command.	2827	* to the command.
2898	*/	2828	*/
2899	wchar_t	2829	wchar_t
2900	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2901	{	2831	{
2902	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2903		2833
2904	if (c == NOCHAR)	2834	if (c == NOCHAR)
2905	throw out_of_input;	2835	throw out_of_input;
2906		2836
2907	return c;	2837	return c;
2908	}	2838	}
2909		2839
2910	uint32_t	2840	uint32_t
2911	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912	{	2842	{
2913	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2914		2844
2915	if (c == NOCHAR)	2845	if (c == NOCHAR)
2916	throw out_of_input;	2846	throw out_of_input;
…		…
3337	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3338	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3339	if (arg[p] == -1)	3269	if (arg[p] == -1)
3340	arg[p] = ndef;	3270	arg[p] = ndef;
3341		3271
3342	#ifdef DEBUG_CMD
3343	fprintf (stderr, "CSI ");
3344	for (p = 0; p < nargs; p++)
3345	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346	fprintf (stderr, "%c\n", ch);
3347	#endif
3348
3349	/*	3272	/*
3350	* private mode handling	3273	* private mode handling
3351	*/	3274	*/
3352	if (priv)	3275	if (priv)
3353	{	3276	{
3354	switch (priv)	3277	switch (priv)
3355	{	3278	{
3356	case '>':	3279	case '>':
3357	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3358	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3359	break;	3291	break;
3360	case '?':	3292	case '?':
3361	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3362	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3363	break;	3295	break;
…		…
3591	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592	{	3524	{
3593	int x, y;	3525	int x, y;
3594	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3595	Window wdummy;	3527	Window wdummy;
3596	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3597		3530
3598	if (nargs == 0)	3531	if (nargs == 0)
3599	return;	3532	return;
3600		3533
3601	switch (args[0])	3534	switch (args[0])
3602	{	3535	{
3603	/*	3536	/*
3604	* commands	3537	* commands
3605	*/	3538	*/
3606	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3607	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3608	break;	3541	break;
3609	case 2: /* iconify window */	3542	case 2: /* iconify window */
3610	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3611	break;	3544	break;
3612	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3613	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3614	break;	3547	break;
3615	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3616	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617	break;	3550	break;
3618	case 5: /* raise window */	3551	case 5: /* raise window */
3619	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3620	break;	3553	break;
3621	case 6: /* lower window */	3554	case 6: /* lower window */
3622	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3623	break;	3556	break;
3624	case 7: /* refresh window */	3557	case 7: /* refresh window */
3625	scr_touch (true);	3558	scr_touch (true);
3626	break;	3559	break;
3627	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3639		3572
3640	/*	3573	/*
3641	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3642	*/	3575	*/
3643	case 11: /* report window state */	3576	case 11: /* report window state */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3645	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646	break;	3579	break;
3647	case 13: /* report window position */	3580	case 13: /* report window position */
3648	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3649	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3650	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3651	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3652	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3653	break;	3586	break;
3654	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3655	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3656	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657	break;	3590	break;
3658	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3659	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660	break;	3593	break;
…		…
3662	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663	break;	3596	break;
3664	case 20: /* report icon label */	3597	case 20: /* report icon label */
3665	{	3598	{
3666	char *s;	3599	char *s;
3667	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3668	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669	XFree (s);	3602	XFree (s);
3670	}	3603	}
3671	break;	3604	break;
3672	case 21: /* report window title */	3605	case 21: /* report window title */
3673	{	3606	{
3674	char *s;	3607	char *s;
3675	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3676	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677	XFree (s);	3610	XFree (s);
3678	}	3611	}
3679	break;	3612	break;
3680	}	3613	}
…		…
3781	void	3714	void
3782	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783	{	3716	{
3784	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3785	{	3718	{
3786	unsigned short r, g, b;	3719	rxvt_rgba c;
3787	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, c);
		3721
		3722	#if XFT
		3723	if (c.a != rxvt_rgba::MAX_CC)
		3724	tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3725	else
		3726	#endif
3788	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3727	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789	}	3728	}
3790	else	3729	else
3791	set_window_color (color, str);	3730	set_window_color (color, str);
3792	}	3731	}
3793		3732
…		…
3795	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3734	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3796	*/	3735	*/
3797	void	3736	void
3798	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3737	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799	{	3738	{
3800	int changed = 0;
3801	int color;	3739	int color;
3802	char buf, name;	3740	char buf, name;
3803	bool query = str[0] == '?' && !str[1];	3741	bool query = str[0] == '?' && !str[1];
3804	int saveop = op;	3742	int saveop = op;
3805	dDisp;	3743
		3744	dLocal (Display *, xdisp);
3806		3745
3807	assert (str != NULL);	3746	assert (str != NULL);
3808	switch (op)	3747	switch (op)
3809	{	3748	{
3810	case XTerm_name:	3749	case XTerm_name:
…		…
3826	unsigned long bytes_after;	3765	unsigned long bytes_after;
3827	unsigned char *value = 0;	3766	unsigned char *value = 0;
3828	const char *str = "";	3767	const char *str = "";
3829		3768
3830	if (prop	3769	if (prop
3831	&& XGetWindowProperty (disp, parent[0],	3770	&& XGetWindowProperty (xdisp, parent[0],
3832	prop, 0, 1<<16, 0, AnyPropertyType,	3771	prop, 0, 1<<16, 0, AnyPropertyType,
3833	&actual_type, &actual_format,	3772	&actual_type, &actual_format,
3834	&nitems, &bytes_after, &value) == Success	3773	&nitems, &bytes_after, &value) == Success
3835	&& actual_type != None	3774	&& actual_type != None
3836	&& actual_format == 8)	3775	&& actual_format == 8)
3837	str = (const char *)(value);	3776	str = (const char *)(value);
3838		3777
3839	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3778	tt_printf ("\033]%d;%s%c", op, str, resp);
3840		3779
3841	XFree (value);	3780	XFree (value);
3842	}	3781	}
3843	else	3782	else
3844	{	3783	{
…		…
3848	{	3787	{
3849	*eq = 0;	3788	*eq = 0;
3850	set_utf8_property (display->atom (str), eq + 1);	3789	set_utf8_property (display->atom (str), eq + 1);
3851	}	3790	}
3852	else	3791	else
3853	XDeleteProperty (disp, parent[0],	3792	XDeleteProperty (xdisp, parent[0],
3854	display->atom (str));	3793	display->atom (str));
3855	}	3794	}
3856	break;	3795	break;
3857		3796
3858	case XTerm_Color:	3797	case XTerm_Color:
…		…
3868	break;	3807	break;
3869		3808
3870	if ((buf = strchr (name, ';')) != NULL)	3809	if ((buf = strchr (name, ';')) != NULL)
3871	*buf++ = '\0';	3810	*buf++ = '\0';
3872		3811
3873	if (name[0] == '?' && !name[1])	3812	process_color_seq (op, color, name, resp);
3874	{
3875	unsigned short r, g, b;
3876	pix_colors_focused[color].get (display, r, g, b);
3877	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878	}
3879	else
3880	set_window_color (color, name);
3881	}	3813	}
3882	break;	3814	break;
3883	case XTerm_Color00:	3815	case XTerm_Color00:
3884	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3816	process_color_seq (op, Color_fg, str, resp);
3885	break;	3817	break;
3886	case XTerm_Color01:	3818	case XTerm_Color01:
3887	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3819	process_color_seq (op, Color_bg, str, resp);
3888	break;	3820	break;
3889	#ifndef NO_CURSORCOLOR	3821	#ifndef NO_CURSORCOLOR
3890	case XTerm_Color_cursor:	3822	case XTerm_Color_cursor:
3891	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3823	process_color_seq (op, Color_cursor, str, resp);
3892	break;	3824	break;
3893	#endif	3825	#endif
3894	case XTerm_Color_pointer_fg:	3826	case XTerm_Color_pointer_fg:
3895	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3827	process_color_seq (op, Color_pointer_fg, str, resp);
3896	break;	3828	break;
3897	case XTerm_Color_pointer_bg:	3829	case XTerm_Color_pointer_bg:
3898	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3830	process_color_seq (op, Color_pointer_bg, str, resp);
3899	break;	3831	break;
3900	#ifndef NO_BOLD_UNDERLINE_REVERSE	3832	#ifndef NO_BOLD_UNDERLINE_REVERSE
3901	case XTerm_Color_RV:	3833	case XTerm_Color_RV:
3902	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3834	process_color_seq (op, Color_RV, str, resp);
3903	break;	3835	break;
3904	case Rxvt_Color_BD:	3836	case Rxvt_Color_BD:
3905	case URxvt_Color_BD:	3837	case URxvt_Color_BD:
3906	process_color_seq (op, Color_BD, str, resp);	3838	process_color_seq (op, Color_BD, str, resp);
3907	break;	3839	break;
3908	case Rxvt_Color_UL:	3840	case Rxvt_Color_UL:
3909	case URxvt_Color_UL:	3841	case URxvt_Color_UL:
3910	process_color_seq (op, Color_UL, str, resp);	3842	process_color_seq (op, Color_UL, str, resp);
3911	break;	3843	break;
3912	case URxvt_Color_IT:	3844	case URxvt_Color_IT:
3913	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3845	process_color_seq (op, Color_IT, str, resp);
3914	break;	3846	break;
3915	#endif	3847	#endif
3916	#if TRANSPARENT && TINTING	3848	#if TRANSPARENT && TINTING
3917	case URxvt_Color_tint:	3849	case URxvt_Color_tint:
3918	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3850	process_color_seq (op, Color_tint, str, resp);
3919	check_our_parents ();	3851	check_our_parents ();
3920	if (am_transparent)	3852	if (am_transparent)
3921	want_full_refresh = want_refresh = 1;	3853	want_full_refresh = want_refresh = 1;
3922	break;	3854	break;
3923	#endif	3855	#endif
3924		3856
3925	case Rxvt_Pixmap:	3857	case Rxvt_Pixmap:
		3858	{
3926	if (*str != ';')	3859	if (*str != ';')
3927	{	3860	{
3928	#if XPM_BACKGROUND	3861	#if XPM_BACKGROUND
3929	scale_pixmap (""); /* reset to default scaling */	3862	scale_pixmap (""); /* reset to default scaling */
3930	set_bgPixmap (str); /* change pixmap */	3863	set_bgPixmap (str); /* change pixmap */
3931	scr_touch (true);	3864	scr_touch (true);
3932	#endif	3865	#endif
3933	}	3866	}
3934		3867
		3868	int changed = 0;
		3869
3935	while ((str = strchr (str, ';')) != NULL)	3870	while ((str = strchr (str, ';')) != NULL)
3936	{	3871	{
3937	str++;	3872	str++;
3938	#if XPM_BACKGROUND	3873	#if XPM_BACKGROUND
3939	changed += scale_pixmap (str);	3874	changed += scale_pixmap (str);
3940	#endif	3875	#endif
3941	}	3876	}
3942		3877
3943	if (changed)	3878	if (changed)
3944	{	3879	{
3945	#ifdef XPM_BACKGROUND	3880	#ifdef XPM_BACKGROUND
3946	resize_pixmap ();	3881	resize_pixmap ();
3947	scr_touch (true);	3882	scr_touch (true);
3948	#endif	3883	#endif
3949	}	3884	}
		3885	}
3950	break;	3886	break;
3951		3887
3952	case Rxvt_restoreFG:	3888	case Rxvt_restoreFG:
3953	set_window_color (Color_fg, str);	3889	set_window_color (Color_fg, str);
3954	break;	3890	break;
…		…
3958		3894
3959	case XTerm_logfile:	3895	case XTerm_logfile:
3960	// TODO, when secure mode?	3896	// TODO, when secure mode?
3961	break;	3897	break;
3962		3898
3963	#ifdef MENUBAR
3964	case URxvt_Menu:
3965	if (OPTION (Opt_insecure))
3966	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967	break;
3968	#endif
3969	#if 0	3899	#if 0
3970	case Rxvt_dumpscreen: /* no error notices */	3900	case Rxvt_dumpscreen: /* no error notices */
3971	{	3901	{
3972	int fd;	3902	int fd;
3973	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3903	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
3999	allocated.push_back ((void *)res);	3929	allocated.push_back ((void *)res);
4000	set_fonts ();	3930	set_fonts ();
4001	}	3931	}
4002	break;	3932	break;
4003		3933
		3934	case URxvt_version:
		3935	if (query)
		3936	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3937	op,
		3938	rs[Rs_name], VERSION[0], VERSION[2],
		3939	resp);
		3940	break;
		3941
4004	#if ENABLE_FRILLS	3942	#if ENABLE_FRILLS
4005	case URxvt_locale:	3943	case URxvt_locale:
4006	if (query)	3944	if (query)
4007	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3945	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4008	else	3946	else
4009	{	3947	{
4010	set_locale (str);	3948	set_locale (str);
4011	pty.set_utf8_mode (enc_utf8);	3949	pty->set_utf8_mode (enc_utf8);
4012	init_xlocale ();	3950	init_xlocale ();
4013	}	3951	}
4014	break;	3952	break;
4015		3953
4016	case URxvt_view_up:	3954	case URxvt_view_up:
…		…
4069	return state;	4007	return state;
4070	}	4008	}
4071		4009
4072	/* we're not using priv _yet_ */	4010	/* we're not using priv _yet_ */
4073	void	4011	void
4074	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4012	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4075	{	4013	{
4076	unsigned int i, j;	4014	unsigned int i, j;
4077	int state;	4015	int state;
4078		4016
4079	static const struct	4017	static const struct
…		…
4090	{ 5, PrivMode_rVideo },	4028	{ 5, PrivMode_rVideo },
4091	{ 6, PrivMode_relOrigin },	4029	{ 6, PrivMode_relOrigin },
4092	{ 7, PrivMode_Autowrap },	4030	{ 7, PrivMode_Autowrap },
4093	// 8, bi-directional support mode	4031	// 8, bi-directional support mode
4094	{ 9, PrivMode_MouseX10 },	4032	{ 9, PrivMode_MouseX10 },
4095	#ifdef menuBar_esc
4096	{ menuBar_esc, PrivMode_menuBar },
4097	#endif
4098	// 18, 19 printing-related	4033	// 18, 19 printing-related
4099	{ 25, PrivMode_VisibleCursor },	4034	{ 25, PrivMode_VisibleCursor },
4100	#ifdef scrollBar_esc	4035	#ifdef scrollBar_esc
4101	{ scrollBar_esc, PrivMode_scrollBar },	4036	{ scrollBar_esc, PrivMode_scrollBar },
4102	#endif	4037	#endif
…		…
4197	/* case 8: - auto repeat, can't do on a per window basis */	4132	/* case 8: - auto repeat, can't do on a per window basis */
4198	case 9: /* X10 mouse reporting */	4133	case 9: /* X10 mouse reporting */
4199	if (state) /* orthogonal */	4134	if (state) /* orthogonal */
4200	priv_modes &= ~PrivMode_MouseX11;	4135	priv_modes &= ~PrivMode_MouseX11;
4201	break;	4136	break;
4202	#ifdef menuBar_esc
4203	case menuBar_esc:
4204	#ifdef MENUBAR
4205	map_menuBar (state);
4206	#endif
4207	break;
4208	#endif
4209	#ifdef scrollBar_esc	4137	#ifdef scrollBar_esc
4210	case scrollBar_esc:	4138	case scrollBar_esc:
4211	if (scrollbar_mapping (state))	4139	if (scrollbar_mapping (state))
4212	{	4140	{
4213	resize_all_windows (0, 0, 0);	4141	resize_all_windows (0, 0, 0);
…		…
4458	rxvt_term::tt_write (const char *data, unsigned int len)	4386	rxvt_term::tt_write (const char *data, unsigned int len)
4459	{	4387	{
4460	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4388	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461	return;	4389	return;
4462		4390
4463	if (pty.pty < 0)	4391	if (pty->pty < 0)
4464	return;	4392	return;
4465		4393
4466	if (v_buflen == 0)	4394	if (v_buflen == 0)
4467	{	4395	{
4468	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4396	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469		4397
4470	if ((unsigned int)written == len)	4398	if ((unsigned int)written == len)
4471	return;	4399	return;
4472		4400
4473	data += written;	4401	data += written;
…		…
4482	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4410	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4483	}	4411	}
4484		4412
4485	void rxvt_term::pty_write ()	4413	void rxvt_term::pty_write ()
4486	{	4414	{
4487	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4415	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488		4416
4489	if (written > 0)	4417	if (written > 0)
4490	{	4418	{
4491	v_buflen -= written;	4419	v_buflen -= written;
4492		4420

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC vs. Revision 1.291 by root, Sun Jan 29 20:51:27 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.291 by root, Sun Jan 29 20:51:27 2006 UTC