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

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.303 by root, Tue Jan 31 21:47:56 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.303 by root, Tue Jan 31 21:47:56 2006 UTC