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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC

…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
230	# if !UNICODE3	227	# if !UNICODE3
231	if (ch >= 0x10000)	228	if (ch >= 0x10000)
232	ch = 0xfffd;	229	ch = 0xfffd;
233	# endif	230	# endif
234	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
236	}	235	}
237		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
238	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
240		244
241	free (fname);	245	free (fname);
242		246
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	307	{
304	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
305	unsigned int newlen;	309	unsigned int newlen;
306	KeySym keysym;	310	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	311	int valid_keysym;
311	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
312		313
313	/*	314	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	444	scr_move_to (0, 1);
444	return;	445	return;
445	}	446	}
446	else if (keysym == XK_End)	447	else if (keysym == XK_End)
447	{	448	{
448	scr_move_to (1, 0);	449	scr_move_to (1, 1);
449	return;	450	return;
450	}	451	}
451	}	452	}
452	#endif	453	#endif
453	}	454	}
…		…
464	{	465	{
465	switch (keysym)	466	switch (keysym)
466	{	467	{
467	/* normal XTerm key bindings */	468	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	469	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	470	selection_request (ev.time);
470	return;	471	return;
471	#if TODO	472	#if TODO
472	/* rxvt extras */	473	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	474	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	475	change_font (FONT_UP);
…		…
905	{	906	{
906	const char ch = C0_ESC;	907	const char ch = C0_ESC;
907	tt_write (&ch, 1);	908	tt_write (&ch, 1);
908	}	909	}
909		910
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	911	tt_write (kbuf, (unsigned int)len);
921	}	912	}
922	/}}} /	913	/}}} /
923		914
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	916	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	917	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	918	{
930	unsigned int n, s;	919	unsigned int n, s;
931		920
…		…
1008	while (l->is_longer () && row < end_row);	997	while (l->is_longer () && row < end_row);
1009	}	998	}
1010	while (row < end_row);	999	while (row < end_row);
1011	}	1000	}
1012		1001
1013	scr_refresh (refresh_type);	1002	scr_refresh ();
1014	scrollbar_show (1);	1003	scrollbar_show (1);
1015	#ifdef USE_XIM	1004	#ifdef USE_XIM
1016	IMSendSpot ();	1005	IMSendSpot ();
1017	#endif	1006	#endif
1018	}	1007	}
…		…
1021	}	1010	}
1022		1011
1023	void	1012	void
1024	rxvt_term::check_cb (check_watcher &w)	1013	rxvt_term::check_cb (check_watcher &w)
1025	{	1014	{
1026	SET_R (this);	1015	make_current ();
1027	SET_LOCALE (locale);
1028		1016
1029	display->flush ();	1017	display->flush ();
1030		1018
1031	if (want_refresh && !flush_ev.active)	1019	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1020	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1021	}
1034		1022
1035	void	1023	void
1036	rxvt_term::flush_cb (time_watcher &w)	1024	rxvt_term::flush_cb (time_watcher &w)
1037	{	1025	{
1038	SET_R (this);	1026	make_current ();
1039	SET_LOCALE (locale);
1040		1027
1041	refresh_limit = 1;	1028	refresh_limit = 1;
1042	refresh_count = 0;	1029	refresh_count = 0;
1043	flush ();	1030	flush ();
1044	}	1031	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1036	{
1050	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1038	want_refresh = 1;
1052		1039
1053	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1041	}
1055	#endif	1042	#endif
1056		1043
1057	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1058	void	1045	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1059	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1060	{
1074	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1061	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1062	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1063	{
1077	refresh_type \|= SMOOTH_REFRESH;
1078	want_refresh = 1;	1064	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1066	}
1081	}	1067	}
1082	#endif	1068	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1072	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1073	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1074	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1075	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1076	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type \|= SMOOTH_REFRESH;
1092	want_refresh = 1;	1077	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1078	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1079	}
1095	}	1080	}
1096	#endif	1081	#endif
…		…
1104	: scr_page (UP, mouse_slip_wheel_speed))	1089	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1090	{
1106	if (view_start == top_row \|\| view_start == 0)	1091	if (view_start == top_row \|\| view_start == 0)
1107	mouse_slip_wheel_speed = 0;	1092	mouse_slip_wheel_speed = 0;
1108		1093
1109	refresh_type \|= SMOOTH_REFRESH;
1110	want_refresh = 1;	1094	want_refresh = 1;
1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112	}	1096	}
1113	}	1097	}
1114	#endif	1098	#endif
…		…
1144		1128
1145	memmove (cmdbuf_base, cmdbuf_ptr, n);	1129	memmove (cmdbuf_base, cmdbuf_ptr, n);
1146	cmdbuf_ptr = cmdbuf_base;	1130	cmdbuf_ptr = cmdbuf_base;
1147	cmdbuf_endp = cmdbuf_ptr + n;	1131	cmdbuf_endp = cmdbuf_ptr + n;
1148		1132
1149	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1133	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150		1134
1151	if (r > 0)	1135	if (r > 0)
1152	{	1136	{
1153	cmdbuf_endp += r;	1137	cmdbuf_endp += r;
1154	return true;	1138	return true;
…		…
1172	}	1156	}
1173		1157
1174	void	1158	void
1175	rxvt_term::pty_cb (io_watcher &w, short revents)	1159	rxvt_term::pty_cb (io_watcher &w, short revents)
1176	{	1160	{
1177	SET_R (this);	1161	make_current ();
1178	SET_LOCALE (locale);
1179		1162
1180	if (revents & EVENT_READ)	1163	if (revents & EVENT_READ)
1181	// loop, but don't allow a single term to monopolize us	1164	// loop, but don't allow a single term to monopolize us
1182	while (pty_fill ())	1165	while (pty_fill ())
1183	if (cmd_parse ())	1166	if (cmd_parse ())
…		…
1188	}	1171	}
1189		1172
1190	void	1173	void
1191	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1192	{	1175	{
1193	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1194	recolour_cursor ();	1177	recolour_cursor ();
1195		1178
1196	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1197	hidden_pointer = 0;	1180	hidden_pointer = 0;
1198		1181
…		…
1206	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1207	{	1190	{
1208	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1209	return;	1192	return;
1210		1193
1211	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1212	XFlush (display->display);	1195	XFlush (xdisp);
1213		1196
1214	hidden_pointer = 1;	1197	hidden_pointer = 1;
1215	}	1198	}
1216		1199
1217	void	1200	void
1218	rxvt_term::pointer_cb (time_watcher &w)	1201	rxvt_term::pointer_cb (time_watcher &w)
1219	{	1202	{
1220	SET_R (this);	1203	make_current ();
1221	SET_LOCALE (locale);
1222		1204
1223	pointer_blank ();	1205	pointer_blank ();
1224	}	1206	}
1225	#endif	1207	#endif
1226		1208
…		…
1291	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1292	(32 + x + 1),	1274	(32 + x + 1),
1293	(32 + y + 1));	1275	(32 + y + 1));
1294	}	1276	}
1295		1277
1296	#ifdef USING_W11LIB
1297	void
1298	rxvt_W11_process_x_event (XEvent *ev)
1299	{
1300	rxvt_t *r = rxvt_get_r ();
1301
1302	x_cb (*ev);
1303	}
1304	#endif
1305
1306	/{{{ process an X event /	1278	/{{{ process an X event /
1307	void	1279	void
1308	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1309	{	1281	{
1310	dDisp;	1282	make_current ();
1311		1283
1312	SET_R (this);	1284	dLocal (Display *, xdisp);
1313	SET_LOCALE (locale);
1314		1285
1315	if (ev.xany.window == vt	1286	if (ev.xany.window == vt
		1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317	return;	1289	return;
1318		1290
1319	// for XQueryPointer	1291	// for XQueryPointer
1320	Window unused_root, unused_child;	1292	Window unused_root, unused_child;
…		…
1414	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1415	break;	1387	break;
1416		1388
1417	case ClientMessage:	1389	case ClientMessage:
1418	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1419	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1421	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422	destroy ();	1400	destroy ();
		1401	}
1423	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1424	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1426	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1427	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1428	#endif	1418	#endif
1429	}	1419	}
1430	#if ENABLE_XEMBED
1431	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432	{
1433	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434	focus_in ();
1435	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436	focus_out ();
1437	}
1438	#endif
1439	#ifdef OFFIX_DND
1440	/* OffiX Dnd (drag 'n' drop) protocol */
1441	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442	&& (ev.xclient.data.l[0] == DndFile
1443	\|\| ev.xclient.data.l[0] == DndDir
1444	\|\| ev.xclient.data.l[0] == DndLink))
1445	{
1446	/* Get Dnd data */
1447	Atom ActualType;
1448	int ActualFormat;
1449	unsigned char *data;
1450	unsigned long Size, RemainingBytes;
1451
1452	XGetWindowProperty (disp, display->root,
1453	xa[XA_DNDSELECTION],
1454	0L, 1000000L,
1455	False, AnyPropertyType,
1456	&ActualType, &ActualFormat,
1457	&Size, &RemainingBytes,
1458	&data);
1459	set_string_property (XA_CUT_BUFFER0, data);
1460	XFree (data);
1461	selection_paste (display->root, XA_CUT_BUFFER0, true);
1462	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463	}
1464	#endif /* OFFIX_DND */
1465	break;	1420	break;
1466		1421
1467	case MappingNotify:	1422	case MappingNotify:
1468	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1469	break;	1424	break;
…		…
1502	break;	1457	break;
1503		1458
1504	case ConfigureNotify:	1459	case ConfigureNotify:
1505	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1506	{	1461	{
1507	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1508	;	1463	;
1509		1464
1510	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1511	{	1466	{
1512	seen_resize = 1;	1467	seen_resize = 1;
1513	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514	}	1469	}
1515		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1516	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1518	check_our_parents ();	1475	check_our_parents ();
1519	#endif	1476	#endif
1520	}	1477	}
1521	break;	1478	break;
1522		1479
1523	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1526	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1527		1485
1528	break;	1486	break;
1529		1487
1530	case SelectionClear:	1488	case SelectionClear:
1531	selection_clear ();	1489	selection_clear ();
…		…
1567	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1568	{	1526	{
1569	do	1527	do
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1573		1531
1574	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575		1533
1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1577	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1578	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1579		1537
1580	want_refresh = 1;	1538	want_refresh = 1;
1581	}	1539	}
1582	else	1540	else
1583	{	1541	{
1584	XEvent unused_event;	1542	XEvent unused_event;
1585		1543
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1587	;	1545	;
1588	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1589	;	1547	;
1590		1548
1591	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1592	{	1550	{
1593	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1594	scrollbar_show (0);	1552	scrollbar_show (0);
1595	}	1553	}
1596	#ifdef MENUBAR
1597	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598	menubar_expose ();
1599	#endif
1600		1554
1601	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1602	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1603	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1604	#endif	1558	#endif
1605	}	1559	}
1606	break;	1560	break;
1607		1561
1608	case MotionNotify:	1562	case MotionNotify:
1609	#ifdef POINTER_BLANK	1563	#ifdef POINTER_BLANK
1610	if (hidden_pointer)	1564	if (hidden_pointer)
1611	pointer_unblank ();	1565	pointer_unblank ();
1612	#endif	1566	#endif
1613	#if MENUBAR
1614	if (isMenuBarWindow (ev.xany.window))
1615	{
1616	menubar_control (ev.xbutton);
1617	break;
1618	}
1619	#endif
1620	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621	break;	1568	break;
1622		1569
1623	if (ev.xany.window == vt)	1570	if (ev.xany.window == vt)
1624	{	1571	{
		1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626	; // nop	1574	; // nop
1627	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1628	{	1576	{
1629	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1630	;	1578	;
1631		1579
1632	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1633	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1634	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1635	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1636	&ev.xbutton.state);	1584	&ev.xbutton.state);
1637	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1701	#endif	1649	#endif
1702	}	1650	}
1703	}	1651	}
1704	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1705	{	1653	{
1706	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1707	MotionNotify, &ev))	1655	MotionNotify, &ev))
1708	;	1656	;
1709		1657
1710	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1711	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1712	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1713	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1714	&unused_mask);	1662	&unused_mask);
1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1730	{	1678	{
1731	hidden_cursor = 0;	1679	hidden_cursor = 0;
1732	want_refresh = 1;	1680	want_refresh = 1;
1733	}	1681	}
1734		1682
1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736	}	1684	}
1737	#endif	1685	#endif
1738		1686
1739	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1768	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1769	}	1717	}
1770	#endif	1718	#endif
1771	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1772	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1773	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774	#endif	1722	#endif
1775	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1777	{	1725	{
1778	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1822		1770
1823	#if TRANSPARENT	1771	#if TRANSPARENT
1824	void	1772	void
1825	rxvt_term::rootwin_cb (XEvent &ev)	1773	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1774	{
1827	SET_R (this);	1775	make_current ();
1828	SET_LOCALE (locale);
1829		1776
1830	switch (ev.type)	1777	switch (ev.type)
1831	{	1778	{
1832	case PropertyNotify:	1779	case PropertyNotify:
1833	/*	1780	/*
…		…
1860	/*	1807	/*
1861	* VT window processing of button press	1808	* VT window processing of button press
1862	*/	1809	*/
1863	if (ev.window == vt)	1810	if (ev.window == vt)
1864	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1865	#if ISO_14755	1815	#if ISO_14755
1866	// 5.4	1816	// 5.4
1867	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1868	{	1818	{
1869	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1911	else	1861	else
1912	{	1862	{
1913	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1914	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1915		1865
1916	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917	switch (ev.button)	1866	switch (ev.button)
1918	{	1867	{
1919	case Button1:	1868	case Button1:
1920	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1921	/* should be done in screen.C */	1870	/* should be done in screen.C */
1922	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1923	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1924	#else	1873	#else
1925	selection.rect = false;	1874	selection.rect = false;
1926	#endif	1875	#endif
1927		1876
1928	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930	{	1879	{
1931	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1932	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1933	else	1882	else
1934	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1935	}	1884	}
1936	else	1885	else
1937	{	1886	{
1938	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1939	MEvent.clicks++;	1888	MEvent.clicks++;
1940	else	1889	else
1941	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1942		1891
1943	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1944	}	1893	}
1945		1894
1946	MEvent.button = Button1;	1895	MEvent.button = Button1;
1947	break;	1896	break;
1948		1897
1949	case Button3:	1898	case Button3:
1950	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1951	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1952	else	1901	else
1953	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1954		1903
1955	MEvent.button = Button3;	1904	MEvent.button = Button3;
1956	break;	1905	break;
1957	}	1906	}
1958	}	1907	}
1959		1908
1960	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1961	return;	1910	return;
1962	}	1911	}
1963		1912
…		…
2102	}	2051	}
2103	}	2052	}
2104		2053
2105	return;	2054	return;
2106	}	2055	}
2107
2108	#if MENUBAR
2109	/*
2110	* Menubar window processing of button press
2111	*/
2112	if (isMenuBarWindow (ev.window))
2113	menubar_control (ev);
2114	#endif
2115	}	2056	}
2116		2057
2117	void	2058	void
2118	rxvt_term::button_release (XButtonEvent &ev)	2059	rxvt_term::button_release (XButtonEvent &ev)
2119	{	2060	{
…		…
2125		2066
2126	if (scrollbar_isUpDn ())	2067	if (scrollbar_isUpDn ())
2127	{	2068	{
2128	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2129	scrollbar_show (0);	2070	scrollbar_show (0);
2130	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131	refresh_type &= ~SMOOTH_REFRESH;
2132	#endif
2133	}	2071	}
2134		2072
2135	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2136	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
2137	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2138	#endif	2076	#endif
2139		2077
2140	if (ev.window == vt)	2078	if (ev.window == vt)
2141	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2142	#if ISO_14755	2083	#if ISO_14755
2143	// 5.4	2084	// 5.4
2144	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2145	return;	2086	return;
2146	#endif	2087	#endif
		2088
2147	if (reportmode)	2089	if (reportmode)
2148	{	2090	{
2149	/* mouse report from vt window */	2091	/* mouse report from vt window */
2150	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2151	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2175	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2176	&& bypass_keystate	2118	&& bypass_keystate
2177	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2178	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2179		2121
2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181	return;
2182
2183	switch (ev.button)	2122	switch (ev.button)
2184	{	2123	{
2185	case Button1:	2124	case Button1:
2186	case Button3:	2125	case Button3:
2187	selection_make (ev.time);	2126	selection_make (ev.time);
2188	break;	2127	break;
		2128
2189	case Button2:	2129	case Button2:
2190	selection_request (ev.time, ev.x, ev.y);	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2191	break;	2132	break;
		2133
2192	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2193	case Button4:	2135	case Button4:
2194	case Button5:	2136	case Button5:
2195	{	2137	{
2196	int i;	2138	int i;
…		…
2228	}	2170	}
2229	break;	2171	break;
2230	#endif	2172	#endif
2231	}	2173	}
2232	}	2174	}
2233	#ifdef MENUBAR
2234	else if (isMenuBarWindow (ev.window))
2235	menubar_control (ev);
2236	#endif
2237	}	2175	}
2238		2176
2239	#ifdef TRANSPARENT	2177	#ifdef TRANSPARENT
2240	#if TINTING	2178	#if TINTING
2241	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2242		2180
2243	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2244		2182
2245	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2246	{	2184	{
2247	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2248	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2249	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2250	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252	int i;	2190	int i;
2253		2191
2254	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2255		2193
2256	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2257		2195
2258	/* for convenience */	2196	/* for convenience */
2259	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2480	Atom atype;	2418	Atom atype;
2481	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2482	Window root, oldp, *list;	2420	Window root, oldp, *list;
2483	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2484	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2485	dDisp;
2486		2423
2487	pchanged = 0;	2424	pchanged = 0;
2488		2425
2489	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2490	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2491		2428
2492	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2493	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2494		2431
2495	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2496		2433
2497	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2498	{	2435	{
2499	if (am_transparent)	2436	if (am_transparent)
2500	{	2437	{
2501	pchanged = 1;	2438	pchanged = 1;
2502	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2503	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2504	}	2441	}
2505		2442
2506	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2507	}	2444	}
2508		2445
2509	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2510	XSync (disp, False);	2447	XSync (xdisp, False);
2511		2448
2512	/*	2449	/*
2513	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2514	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2515	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2516	*/	2453	*/
2517	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2521		2458
2522	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2523	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2524	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2527		2464
2528	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2529	#if TINTING	2466	#if TINTING
…		…
2548	Window cr;	2485	Window cr;
2549	XImage *image;	2486	XImage *image;
2550	GC gc;	2487	GC gc;
2551	XGCValues gcvalue;	2488	XGCValues gcvalue;
2552		2489
2553	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2554	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2555	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2556	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2557	nx = ny = 0;	2494	nx = ny = 0;
2558		2495
…		…
2571	}	2508	}
2572		2509
2573	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2574	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2575		2512
2576	XSync (disp, False);	2513	XSync (xdisp, False);
2577	allowedxerror = -1;	2514	allowedxerror = -1;
2578	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579		2516
2580	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2581	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2582	allowedxerror = 0;	2519	allowedxerror = 0;
2583		2520
…		…
2586	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2587	{	2524	{
2588	pchanged = 1;	2525	pchanged = 1;
2589	if (pixmap != None)	2526	if (pixmap != None)
2590	{	2527	{
2591	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2592	pixmap = None;	2529	pixmap = None;
2593	}	2530	}
2594	}	2531	}
2595		2532
2596	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2597	}	2534	}
2598	else	2535	else
2599	{	2536	{
2600	if (pixmap != None)	2537	if (pixmap != None)
2601	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2602		2539
2603	#if TINTING	2540	#if TINTING
2604	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2605	{	2542	{
2606	unsigned short rm, gm, bm;	2543	rxvt_rgba c;
2607	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2544	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608		2545
2609	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused[Color_tint].get (this, c);
2610		2547
2611	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2612	}	2549	}
2613	#endif	2550	#endif
2614		2551
2615	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2616	szHint.width, szHint.height, image->depth);
2617	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2618	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2619	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2620	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2621	XDestroyImage (image);	2557	XDestroyImage (image);
2622	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2623	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2624		2560
2625	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2626	pchanged = 1;	2562	pchanged = 1;
2627		2563
2628	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2629	}	2565	}
2630	}	2566	}
2631		2567
2632	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2633	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2634	else	2570	else
2635	{	2571	{
2636	unsigned int n;	2572	unsigned int n;
2637	/*	2573	/*
2638	* InheritPixmap transparency	2574	* InheritPixmap transparency
2639	*/	2575	*/
2640	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641	{	2577	{
2642	oldp = parent[i];	2578	oldp = parent[i];
2643	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root,
2644	&parent[i], &list, &n);	2580	&parent[i], &list, &n);
2645	XFree (list);	2581	XFree (list);
2646		2582
2647	if (parent[i] == display->root)	2583	if (parent[i] == display->root)
2648	{	2584	{
…		…
2660		2596
2661	if (pchanged)	2597	if (pchanged)
2662	{	2598	{
2663	for (; n < (unsigned int)i; n++)	2599	for (; n < (unsigned int)i; n++)
2664	{	2600	{
2665	XGetWindowAttributes (disp, parent[n], &wattr);	2601	XGetWindowAttributes (xdisp, parent[n], &wattr);
2666	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2602	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2667	{	2603	{
2668	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669	break;	2605	break;
2670	}	2606	}
2671	}	2607	}
2672	}	2608	}
2673		2609
2674	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2675	{	2611	{
2676	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2677	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2678	am_transparent = 0;	2614	am_transparent = 0;
2679	/* XXX: also turn off Opt_transparent? */	2615	/* XXX: also turn off Opt_transparent? */
2680	}	2616	}
2681	else	2617	else
2682	{	2618	{
2683	#if WAIT_FOR_WM
2684	/* wait (an arbitrary period) for the WM to do its thing
2685	* needed for fvwm2.2.2 (and before?) */
2686	sleep (1);
2687	#endif
2688	for (n = 0; n < (unsigned int)i; n++)	2619	for (n = 0; n < (unsigned int)i; n++)
2689	{	2620	{
2690	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2691	XClearWindow (disp, parent[n]);	2622	XClearWindow (xdisp, parent[n]);
2692	}	2623	}
2693		2624
2694	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2695	am_transparent = 1;	2626	am_transparent = 1;
2696	}	2627	}
2697		2628
2698	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699	parent[i] = None;	2630	parent[i] = None;
2700	}	2631	}
2701		2632
2702	if (scrollBar.win)	2633	if (scrollBar.win)
2703	{	2634	{
2704	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2705	scrollBar.setIdle ();	2636	scrollBar.setIdle ();
2706	scrollbar_show (0);	2637	scrollbar_show (0);
2707	}	2638	}
2708		2639
2709	if (am_transparent)	2640	if (am_transparent)
…		…
2784	}	2715	}
2785		2716
2786	// scr_add_lines only works for nlines <= nrow - 1.	2717	// scr_add_lines only works for nlines <= nrow - 1.
2787	if (nlines >= nrow - 1)	2718	if (nlines >= nrow - 1)
2788	{	2719	{
		2720	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2721	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790	scr_add_lines (buf, str - buf, nlines);	2722	scr_add_lines (buf, str - buf, nlines);
2791		2723
2792	nlines = 0;	2724	nlines = 0;
2793	str = buf;	2725	str = buf;
2794	eol = str + min (ncol, UBUFSIZ);	2726	eol = str + min (ncol, UBUFSIZ);
…		…
2809		2741
2810	seq_begin = cmdbuf_ptr;	2742	seq_begin = cmdbuf_ptr;
2811	ch = next_char ();	2743	ch = next_char ();
2812	}	2744	}
2813		2745
		2746	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2747	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815	scr_add_lines (buf, str - buf, nlines);	2748	scr_add_lines (buf, str - buf, nlines);
2816		2749
2817	/*	2750	/*
2818	* If there have been a lot of new lines, then update the screen	2751	* If there have been a lot of new lines, then update the screen
2819	* What the heck I'll cheat and only refresh less than every page-full.	2752	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2825	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2758	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826	refresh_limit++;	2759	refresh_limit++;
2827	else	2760	else
2828	{	2761	{
2829	flag = true;	2762	flag = true;
2830	scr_refresh (refresh_type);	2763	scr_refresh ();
2831	want_refresh = 1;	2764	want_refresh = 1;
2832	}	2765	}
2833	}	2766	}
2834		2767
2835	}	2768	}
…		…
2853	return flag;	2786	return flag;
2854	}	2787	}
2855		2788
2856	// read the next character	2789	// read the next character
2857	wchar_t	2790	wchar_t
2858	rxvt_term::next_char ()	2791	rxvt_term::next_char () NOTHROW
2859	{	2792	{
2860	while (cmdbuf_ptr < cmdbuf_endp)	2793	while (cmdbuf_ptr < cmdbuf_endp)
2861	{	2794	{
2862	// assume 7-bit to be ascii ALWAYS	2795	// assume 7-bit to be ascii ALWAYS
2863	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2796	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2884	return NOCHAR;	2817	return NOCHAR;
2885	}	2818	}
2886		2819
2887	// read the next octet	2820	// read the next octet
2888	uint32_t	2821	uint32_t
2889	rxvt_term::next_octet ()	2822	rxvt_term::next_octet () NOTHROW
2890	{	2823	{
2891	return cmdbuf_ptr < cmdbuf_endp	2824	return cmdbuf_ptr < cmdbuf_endp
2892	? (unsigned char)*cmdbuf_ptr++	2825	? (unsigned char)*cmdbuf_ptr++
2893	: NOCHAR;	2826	: NOCHAR;
2894	}	2827	}
		2828
		2829	static class out_of_input out_of_input;
2895		2830
2896	/* rxvt_cmd_getc () - Return next input character */	2831	/* rxvt_cmd_getc () - Return next input character */
2897	/*	2832	/*
2898	* Return the next input character after first passing any keyboard input	2833	* Return the next input character after first passing any keyboard input
2899	* to the command.	2834	* to the command.
2900	*/	2835	*/
2901	wchar_t	2836	wchar_t
2902	rxvt_term::cmd_getc ()	2837	rxvt_term::cmd_getc () THROW ((class out_of_input))
2903	{	2838	{
2904	wchar_t c = next_char ();	2839	wchar_t c = next_char ();
2905		2840
2906	if (c == NOCHAR)	2841	if (c == NOCHAR)
2907	throw out_of_input;	2842	throw out_of_input;
2908		2843
2909	return c;	2844	return c;
2910	}	2845	}
2911		2846
2912	uint32_t	2847	uint32_t
2913	rxvt_term::cmd_get8 ()	2848	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914	{	2849	{
2915	uint32_t c = next_octet ();	2850	uint32_t c = next_octet ();
2916		2851
2917	if (c == NOCHAR)	2852	if (c == NOCHAR)
2918	throw out_of_input;	2853	throw out_of_input;
…		…
3339	ndef = get_byte_array_bit (csi_defaults, i);	3274	ndef = get_byte_array_bit (csi_defaults, i);
3340	for (p = 0; p < nargs; p++)	3275	for (p = 0; p < nargs; p++)
3341	if (arg[p] == -1)	3276	if (arg[p] == -1)
3342	arg[p] = ndef;	3277	arg[p] = ndef;
3343		3278
3344	#ifdef DEBUG_CMD
3345	fprintf (stderr, "CSI ");
3346	for (p = 0; p < nargs; p++)
3347	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348	fprintf (stderr, "%c\n", ch);
3349	#endif
3350
3351	/*	3279	/*
3352	* private mode handling	3280	* private mode handling
3353	*/	3281	*/
3354	if (priv)	3282	if (priv)
3355	{	3283	{
3356	switch (priv)	3284	switch (priv)
3357	{	3285	{
3358	case '>':	3286	case '>':
3359	if (ch == CSI_DA) /* secondary device attributes */	3287	if (ch == CSI_DA) /* secondary device attributes */
3360	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3288	{
		3289	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3290	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3291	//
		3292	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3293	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3294	// that we do not support xterm mouse reporting (should be 95 when we do).
		3295	//
		3296	tt_printf ("\033[>%d;94;0c", 'U');
		3297	}
3361	break;	3298	break;
3362	case '?':	3299	case '?':
3363	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3300	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3364	process_terminal_mode (ch, priv, nargs, arg);	3301	process_terminal_mode (ch, priv, nargs, arg);
3365	break;	3302	break;
…		…
3593	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594	{	3531	{
3595	int x, y;	3532	int x, y;
3596	XWindowAttributes wattr;	3533	XWindowAttributes wattr;
3597	Window wdummy;	3534	Window wdummy;
3598	dDisp;	3535
		3536	dLocal (Display *, xdisp);
3599		3537
3600	if (nargs == 0)	3538	if (nargs == 0)
3601	return;	3539	return;
3602		3540
3603	switch (args[0])	3541	switch (args[0])
3604	{	3542	{
3605	/*	3543	/*
3606	* commands	3544	* commands
3607	*/	3545	*/
3608	case 1: /* deiconify window */	3546	case 1: /* deiconify window */
3609	XMapWindow (disp, parent[0]);	3547	XMapWindow (xdisp, parent[0]);
3610	break;	3548	break;
3611	case 2: /* iconify window */	3549	case 2: /* iconify window */
3612	XIconifyWindow (disp, parent[0], display->screen);	3550	XIconifyWindow (xdisp, parent[0], display->screen);
3613	break;	3551	break;
3614	case 3: /* set position (pixels) */	3552	case 3: /* set position (pixels) */
3615	XMoveWindow (disp, parent[0], args[1], args[2]);	3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3616	break;	3554	break;
3617	case 4: /* set size (pixels) */	3555	case 4: /* set size (pixels) */
3618	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619	break;	3557	break;
3620	case 5: /* raise window */	3558	case 5: /* raise window */
3621	XRaiseWindow (disp, parent[0]);	3559	XRaiseWindow (xdisp, parent[0]);
3622	break;	3560	break;
3623	case 6: /* lower window */	3561	case 6: /* lower window */
3624	XLowerWindow (disp, parent[0]);	3562	XLowerWindow (xdisp, parent[0]);
3625	break;	3563	break;
3626	case 7: /* refresh window */	3564	case 7: /* refresh window */
3627	scr_touch (true);	3565	scr_touch (true);
3628	break;	3566	break;
3629	case 8: /* set size (chars) */	3567	case 8: /* set size (chars) */
…		…
3641		3579
3642	/*	3580	/*
3643	* reports - some output format copied from XTerm	3581	* reports - some output format copied from XTerm
3644	*/	3582	*/
3645	case 11: /* report window state */	3583	case 11: /* report window state */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3584	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648	break;	3586	break;
3649	case 13: /* report window position */	3587	case 13: /* report window position */
3650	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3651	XTranslateCoordinates (disp, parent[0], wattr.root,	3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3652	-wattr.border_width, -wattr.border_width,	3590	-wattr.border_width, -wattr.border_width,
3653	&x, &y, &wdummy);	3591	&x, &y, &wdummy);
3654	tt_printf ("\033[3;%d;%dt", x, y);	3592	tt_printf ("\033[3;%d;%dt", x, y);
3655	break;	3593	break;
3656	case 14: /* report window size (pixels) */	3594	case 14: /* report window size (pixels) */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (xdisp, parent[0], &wattr);
3658	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659	break;	3597	break;
3660	case 18: /* report text area size (chars) */	3598	case 18: /* report text area size (chars) */
3661	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662	break;	3600	break;
…		…
3664	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665	break;	3603	break;
3666	case 20: /* report icon label */	3604	case 20: /* report icon label */
3667	{	3605	{
3668	char *s;	3606	char *s;
3669	XGetIconName (disp, parent[0], &s);	3607	XGetIconName (xdisp, parent[0], &s);
3670	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671	XFree (s);	3609	XFree (s);
3672	}	3610	}
3673	break;	3611	break;
3674	case 21: /* report window title */	3612	case 21: /* report window title */
3675	{	3613	{
3676	char *s;	3614	char *s;
3677	XFetchName (disp, parent[0], &s);	3615	XFetchName (xdisp, parent[0], &s);
3678	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3616	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679	XFree (s);	3617	XFree (s);
3680	}	3618	}
3681	break;	3619	break;
3682	}	3620	}
…		…
3783	void	3721	void
3784	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3722	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785	{	3723	{
3786	if (str[0] == '?' && !str[1])	3724	if (str[0] == '?' && !str[1])
3787	{	3725	{
3788	unsigned short r, g, b;	3726	rxvt_rgba c;
3789	pix_colors_focused[color].get (display, r, g, b);	3727	pix_colors_focused[color].get (this, c);
		3728
		3729	#if XFT
		3730	if (c.a != rxvt_rgba::MAX_CC)
		3731	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3732	else
		3733	#endif
3790	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3734	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791	}	3735	}
3792	else	3736	else
3793	set_window_color (color, str);	3737	set_window_color (color, str);
3794	}	3738	}
3795		3739
…		…
3797	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3741	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3798	*/	3742	*/
3799	void	3743	void
3800	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3744	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801	{	3745	{
3802	int changed = 0;
3803	int color;	3746	int color;
3804	char buf, name;	3747	char buf, name;
3805	bool query = str[0] == '?' && !str[1];	3748	bool query = str[0] == '?' && !str[1];
3806	int saveop = op;	3749	int saveop = op;
3807	dDisp;	3750
		3751	dLocal (Display *, xdisp);
3808		3752
3809	assert (str != NULL);	3753	assert (str != NULL);
3810	switch (op)	3754	switch (op)
3811	{	3755	{
3812	case XTerm_name:	3756	case XTerm_name:
…		…
3828	unsigned long bytes_after;	3772	unsigned long bytes_after;
3829	unsigned char *value = 0;	3773	unsigned char *value = 0;
3830	const char *str = "";	3774	const char *str = "";
3831		3775
3832	if (prop	3776	if (prop
3833	&& XGetWindowProperty (disp, parent[0],	3777	&& XGetWindowProperty (xdisp, parent[0],
3834	prop, 0, 1<<16, 0, AnyPropertyType,	3778	prop, 0, 1<<16, 0, AnyPropertyType,
3835	&actual_type, &actual_format,	3779	&actual_type, &actual_format,
3836	&nitems, &bytes_after, &value) == Success	3780	&nitems, &bytes_after, &value) == Success
3837	&& actual_type != None	3781	&& actual_type != None
3838	&& actual_format == 8)	3782	&& actual_format == 8)
3839	str = (const char *)(value);	3783	str = (const char *)(value);
3840		3784
3841	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3785	tt_printf ("\033]%d;%s%c", op, str, resp);
3842		3786
3843	XFree (value);	3787	XFree (value);
3844	}	3788	}
3845	else	3789	else
3846	{	3790	{
…		…
3850	{	3794	{
3851	*eq = 0;	3795	*eq = 0;
3852	set_utf8_property (display->atom (str), eq + 1);	3796	set_utf8_property (display->atom (str), eq + 1);
3853	}	3797	}
3854	else	3798	else
3855	XDeleteProperty (disp, parent[0],	3799	XDeleteProperty (xdisp, parent[0],
3856	display->atom (str));	3800	display->atom (str));
3857	}	3801	}
3858	break;	3802	break;
3859		3803
3860	case XTerm_Color:	3804	case XTerm_Color:
…		…
3870	break;	3814	break;
3871		3815
3872	if ((buf = strchr (name, ';')) != NULL)	3816	if ((buf = strchr (name, ';')) != NULL)
3873	*buf++ = '\0';	3817	*buf++ = '\0';
3874		3818
3875	if (name[0] == '?' && !name[1])	3819	process_color_seq (op, color, name, resp);
3876	{
3877	unsigned short r, g, b;
3878	pix_colors_focused[color].get (display, r, g, b);
3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880	}
3881	else
3882	set_window_color (color, name);
3883	}	3820	}
3884	break;	3821	break;
3885	case XTerm_Color00:	3822	case XTerm_Color00:
3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3823	process_color_seq (op, Color_fg, str, resp);
3887	break;	3824	break;
3888	case XTerm_Color01:	3825	case XTerm_Color01:
3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3826	process_color_seq (op, Color_bg, str, resp);
3890	break;	3827	break;
3891	#ifndef NO_CURSORCOLOR	3828	#ifndef NO_CURSORCOLOR
3892	case XTerm_Color_cursor:	3829	case XTerm_Color_cursor:
3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3830	process_color_seq (op, Color_cursor, str, resp);
3894	break;	3831	break;
3895	#endif	3832	#endif
3896	case XTerm_Color_pointer_fg:	3833	case XTerm_Color_pointer_fg:
3897	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3834	process_color_seq (op, Color_pointer_fg, str, resp);
3898	break;	3835	break;
3899	case XTerm_Color_pointer_bg:	3836	case XTerm_Color_pointer_bg:
3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3837	process_color_seq (op, Color_pointer_bg, str, resp);
3901	break;	3838	break;
3902	#ifndef NO_BOLD_UNDERLINE_REVERSE	3839	#ifndef NO_BOLD_UNDERLINE_REVERSE
3903	case XTerm_Color_RV:	3840	case XTerm_Color_RV:
3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3841	process_color_seq (op, Color_RV, str, resp);
3905	break;	3842	break;
3906	case Rxvt_Color_BD:	3843	case Rxvt_Color_BD:
3907	case URxvt_Color_BD:	3844	case URxvt_Color_BD:
3908	process_color_seq (op, Color_BD, str, resp);	3845	process_color_seq (op, Color_BD, str, resp);
3909	break;	3846	break;
3910	case Rxvt_Color_UL:	3847	case Rxvt_Color_UL:
3911	case URxvt_Color_UL:	3848	case URxvt_Color_UL:
3912	process_color_seq (op, Color_UL, str, resp);	3849	process_color_seq (op, Color_UL, str, resp);
3913	break;	3850	break;
3914	case URxvt_Color_IT:	3851	case URxvt_Color_IT:
3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3852	process_color_seq (op, Color_IT, str, resp);
3916	break;	3853	break;
3917	#endif	3854	#endif
3918	#if TRANSPARENT && TINTING	3855	#if TRANSPARENT && TINTING
3919	case URxvt_Color_tint:	3856	case URxvt_Color_tint:
3920	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3857	process_color_seq (op, Color_tint, str, resp);
3921	check_our_parents ();	3858	check_our_parents ();
3922	if (am_transparent)	3859	if (am_transparent)
3923	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3924	break;	3861	break;
3925	#endif	3862	#endif
3926		3863
3927	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
		3865	{
3928	if (*str != ';')	3866	if (*str != ';')
3929	{	3867	{
3930	#if XPM_BACKGROUND	3868	#if XPM_BACKGROUND
3931	scale_pixmap (""); /* reset to default scaling */	3869	scale_pixmap (""); /* reset to default scaling */
3932	set_bgPixmap (str); /* change pixmap */	3870	set_bgPixmap (str); /* change pixmap */
3933	scr_touch (true);	3871	scr_touch (true);
3934	#endif	3872	#endif
3935	}	3873	}
3936		3874
		3875	int changed = 0;
		3876
3937	while ((str = strchr (str, ';')) != NULL)	3877	while ((str = strchr (str, ';')) != NULL)
3938	{	3878	{
3939	str++;	3879	str++;
3940	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3881	changed += scale_pixmap (str);
3942	#endif	3882	#endif
3943	}	3883	}
3944		3884
3945	if (changed)	3885	if (changed)
3946	{	3886	{
3947	#ifdef XPM_BACKGROUND	3887	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3888	resize_pixmap ();
3949	scr_touch (true);	3889	scr_touch (true);
3950	#endif	3890	#endif
3951	}	3891	}
		3892	}
3952	break;	3893	break;
3953		3894
3954	case Rxvt_restoreFG:	3895	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3896	set_window_color (Color_fg, str);
3956	break;	3897	break;
…		…
3960		3901
3961	case XTerm_logfile:	3902	case XTerm_logfile:
3962	// TODO, when secure mode?	3903	// TODO, when secure mode?
3963	break;	3904	break;
3964		3905
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3906	#if 0
3972	case Rxvt_dumpscreen: /* no error notices */	3907	case Rxvt_dumpscreen: /* no error notices */
3973	{	3908	{
3974	int fd;	3909	int fd;
3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3910	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
…		…
4001	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
4002	set_fonts ();	3937	set_fonts ();
4003	}	3938	}
4004	break;	3939	break;
4005		3940
		3941	case URxvt_version:
		3942	if (query)
		3943	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3944	op,
		3945	rs[Rs_name], VERSION[0], VERSION[2],
		3946	resp);
		3947	break;
		3948
4006	#if ENABLE_FRILLS	3949	#if ENABLE_FRILLS
4007	case URxvt_locale:	3950	case URxvt_locale:
4008	if (query)	3951	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3953	else
4011	{	3954	{
4012	set_locale (str);	3955	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3957	init_xlocale ();
4015	}	3958	}
4016	break;	3959	break;
4017		3960
4018	case URxvt_view_up:	3961	case URxvt_view_up:
…		…
4071	return state;	4014	return state;
4072	}	4015	}
4073		4016
4074	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4075	void	4018	void
4076	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4019	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077	{	4020	{
4078	unsigned int i, j;	4021	unsigned int i, j;
4079	int state;	4022	int state;
4080		4023
4081	static const struct	4024	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4035	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4036	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4037	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4038	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4039	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4040	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4041	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4042	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4043	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4044	#endif
…		…
4199	/* case 8: - auto repeat, can't do on a per window basis */	4139	/* case 8: - auto repeat, can't do on a per window basis */
4200	case 9: /* X10 mouse reporting */	4140	case 9: /* X10 mouse reporting */
4201	if (state) /* orthogonal */	4141	if (state) /* orthogonal */
4202	priv_modes &= ~PrivMode_MouseX11;	4142	priv_modes &= ~PrivMode_MouseX11;
4203	break;	4143	break;
4204	#ifdef menuBar_esc
4205	case menuBar_esc:
4206	#ifdef MENUBAR
4207	map_menuBar (state);
4208	#endif
4209	break;
4210	#endif
4211	#ifdef scrollBar_esc	4144	#ifdef scrollBar_esc
4212	case scrollBar_esc:	4145	case scrollBar_esc:
4213	if (scrollbar_mapping (state))	4146	if (scrollbar_mapping (state))
4214	{	4147	{
4215	resize_all_windows (0, 0, 0);	4148	resize_all_windows (0, 0, 0);
…		…
4460	rxvt_term::tt_write (const char *data, unsigned int len)	4393	rxvt_term::tt_write (const char *data, unsigned int len)
4461	{	4394	{
4462	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4395	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463	return;	4396	return;
4464		4397
4465	if (pty.pty < 0)	4398	if (pty->pty < 0)
4466	return;	4399	return;
4467		4400
4468	if (v_buflen == 0)	4401	if (v_buflen == 0)
4469	{	4402	{
4470	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4403	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471		4404
4472	if ((unsigned int)written == len)	4405	if ((unsigned int)written == len)
4473	return;	4406	return;
4474		4407
4475	data += written;	4408	data += written;
…		…
4484	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4417	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4485	}	4418	}
4486		4419
4487	void rxvt_term::pty_write ()	4420	void rxvt_term::pty_write ()
4488	{	4421	{
4489	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4422	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490		4423
4491	if (written > 0)	4424	if (written > 0)
4492	{	4425	{
4493	v_buflen -= written;	4426	v_buflen -= written;
4494		4427

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC vs. Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC