[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.302 by root, Tue Jan 31 21:35:39 2006 UTC

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

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.302 by root, Tue Jan 31 21:35:39 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.302 by root, Tue Jan 31 21:35:39 2006 UTC