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

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.305 by root, Thu Feb 2 18:04:45 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.305 by root, Thu Feb 2 18:04:45 2006 UTC