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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 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
…		…
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	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1036	{
1048	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1038	want_refresh = 1;
1050		1039
1051	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1041	}
1053	#endif	1042	#endif
1054		1043
1055	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1056	void	1045	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1059	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1060	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1061	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1062	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1063	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1064	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1066	}
1079	}	1067	}
1080	#endif	1068	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1072	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1073	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1074	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1075	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1076	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1077	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1078	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1079	}
1093	}	1080	}
1094	#endif	1081	#endif
…		…
1102	: scr_page (UP, mouse_slip_wheel_speed))	1089	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1090	{
1104	if (view_start == top_row \|\| view_start == 0)	1091	if (view_start == top_row \|\| view_start == 0)
1105	mouse_slip_wheel_speed = 0;	1092	mouse_slip_wheel_speed = 0;
1106		1093
1107	refresh_type \|= SMOOTH_REFRESH;
1108	want_refresh = 1;	1094	want_refresh = 1;
1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110	}	1096	}
1111	}	1097	}
1112	#endif	1098	#endif
…		…
1142		1128
1143	memmove (cmdbuf_base, cmdbuf_ptr, n);	1129	memmove (cmdbuf_base, cmdbuf_ptr, n);
1144	cmdbuf_ptr = cmdbuf_base;	1130	cmdbuf_ptr = cmdbuf_base;
1145	cmdbuf_endp = cmdbuf_ptr + n;	1131	cmdbuf_endp = cmdbuf_ptr + n;
1146		1132
1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1133	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148		1134
1149	if (r > 0)	1135	if (r > 0)
1150	{	1136	{
1151	cmdbuf_endp += r;	1137	cmdbuf_endp += r;
1152	return true;	1138	return true;
…		…
1185	}	1171	}
1186		1172
1187	void	1173	void
1188	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1189	{	1175	{
1190	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1191	recolour_cursor ();	1177	recolour_cursor ();
1192		1178
1193	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1194	hidden_pointer = 0;	1180	hidden_pointer = 0;
1195		1181
…		…
1203	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1204	{	1190	{
1205	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1206	return;	1192	return;
1207		1193
1208	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1209	XFlush (display->display);	1195	XFlush (xdisp);
1210		1196
1211	hidden_pointer = 1;	1197	hidden_pointer = 1;
1212	}	1198	}
1213		1199
1214	void	1200	void
…		…
1287	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1288	(32 + x + 1),	1274	(32 + x + 1),
1289	(32 + y + 1));	1275	(32 + y + 1));
1290	}	1276	}
1291		1277
1292	#ifdef USING_W11LIB
1293	void
1294	rxvt_W11_process_x_event (XEvent *ev)
1295	{
1296	rxvt_t *r = rxvt_get_r ();
1297
1298	x_cb (*ev);
1299	}
1300	#endif
1301
1302	/{{{ process an X event /	1278	/{{{ process an X event /
1303	void	1279	void
1304	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1305	{	1281	{
1306	make_current ();	1282	make_current ();
1307		1283
1308	dDisp;	1284	dLocal (Display *, xdisp);
1309		1285
1310	if (ev.xany.window == vt	1286	if (ev.xany.window == vt
1311	&& SHOULD_INVOKE (HOOK_X_EVENT)	1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313	return;	1289	return;
…		…
1410	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1411	break;	1387	break;
1412		1388
1413	case ClientMessage:	1389	case ClientMessage:
1414	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	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	{
1417	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)))
1418	destroy ();	1400	destroy ();
		1401	}
1419	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1420	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])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1423	&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	}
1424	#endif	1418	#endif
1425	}	1419	}
1426	#if ENABLE_XEMBED
1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428	{
1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430	focus_in ();
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();
1433	}
1434	#endif
1435	#ifdef OFFIX_DND
1436	/* OffiX Dnd (drag 'n' drop) protocol */
1437	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438	&& (ev.xclient.data.l[0] == DndFile
1439	\|\| ev.xclient.data.l[0] == DndDir
1440	\|\| ev.xclient.data.l[0] == DndLink))
1441	{
1442	/* Get Dnd data */
1443	Atom ActualType;
1444	int ActualFormat;
1445	unsigned char *data;
1446	unsigned long Size, RemainingBytes;
1447
1448	XGetWindowProperty (disp, display->root,
1449	xa[XA_DNDSELECTION],
1450	0L, 1000000L,
1451	False, AnyPropertyType,
1452	&ActualType, &ActualFormat,
1453	&Size, &RemainingBytes,
1454	&data);
1455	set_string_property (XA_CUT_BUFFER0, data);
1456	XFree (data);
1457	selection_paste (display->root, XA_CUT_BUFFER0, true);
1458	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459	}
1460	#endif /* OFFIX_DND */
1461	break;	1420	break;
1462		1421
1463	case MappingNotify:	1422	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1424	break;
…		…
1498	break;	1457	break;
1499		1458
1500	case ConfigureNotify:	1459	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1502	{	1461	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1463	;
1505		1464
1506	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1507	{	1466	{
1508	seen_resize = 1;	1467	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1469	}
1511		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1475	check_our_parents ();
1515	#endif	1476	#endif
1516	}	1477	}
1517	break;	1478	break;
1518		1479
1519	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1485
1524	break;	1486	break;
1525		1487
1526	case SelectionClear:	1488	case SelectionClear:
1527	selection_clear ();	1489	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1564	{	1526	{
1565	do	1527	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1569		1531
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1533
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1575		1537
1576	want_refresh = 1;	1538	want_refresh = 1;
1577	}	1539	}
1578	else	1540	else
1579	{	1541	{
1580	XEvent unused_event;	1542	XEvent unused_event;
1581		1543
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1583	;	1545	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1547	;
1586		1548
1587	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1588	{	1550	{
1589	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1590	scrollbar_show (0);	1552	scrollbar_show (0);
1591	}	1553	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1554
1597	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1600	#endif	1558	#endif
1601	}	1559	}
1602	break;	1560	break;
1603		1561
1604	case MotionNotify:	1562	case MotionNotify:
1605	#ifdef POINTER_BLANK	1563	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1564	if (hidden_pointer)
1607	pointer_unblank ();	1565	pointer_unblank ();
1608	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif	1566	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1568	break;
1618		1569
1619	if (ev.xany.window == vt)	1570	if (ev.xany.window == vt)
…		…
1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1574	; // nop
1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1625	{	1576	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1627	;	1578	;
1628		1579
1629	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1630	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1584	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1649	#endif
1699	}	1650	}
1700	}	1651	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1653	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1704	MotionNotify, &ev))	1655	MotionNotify, &ev))
1705	;	1656	;
1706		1657
1707	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1708	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1662	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1727	{	1678	{
1728	hidden_cursor = 0;	1679	hidden_cursor = 0;
1729	want_refresh = 1;	1680	want_refresh = 1;
1730	}	1681	}
1731		1682
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1684	}
1734	#endif	1685	#endif
1735		1686
1736	#if defined(POINTER_BLANK)	1687	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1766	}	1717	}
1767	#endif	1718	#endif
1768	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1722	#endif
1772	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1774	{	1725	{
1775	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1856	/*	1807	/*
1857	* VT window processing of button press	1808	* VT window processing of button press
1858	*/	1809	*/
1859	if (ev.window == vt)	1810	if (ev.window == vt)
1860	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1861	#if ISO_14755	1815	#if ISO_14755
1862	// 5.4	1816	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1864	{	1818	{
1865	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1861	else
1908	{	1862	{
1909	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1911		1865
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1866	switch (ev.button)
1914	{	1867	{
1915	case Button1:	1868	case Button1:
1916	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1870	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1873	#else
1921	selection.rect = false;	1874	selection.rect = false;
1922	#endif	1875	#endif
1923		1876
1924	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1879	{
1927	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1929	else	1882	else
1930	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1931	}	1884	}
1932	else	1885	else
1933	{	1886	{
1934	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1888	MEvent.clicks++;
1936	else	1889	else
1937	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1938		1891
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1893	}
1941		1894
1942	MEvent.button = Button1;	1895	MEvent.button = Button1;
1943	break;	1896	break;
1944		1897
1945	case Button3:	1898	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1948	else	1901	else
1949	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1950		1903
1951	MEvent.button = Button3;	1904	MEvent.button = Button3;
1952	break;	1905	break;
1953	}	1906	}
1954	}	1907	}
1955		1908
1956	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1957	return;	1910	return;
1958	}	1911	}
1959		1912
…		…
2098	}	2051	}
2099	}	2052	}
2100		2053
2101	return;	2054	return;
2102	}	2055	}
2103
2104	#if MENUBAR
2105	/*
2106	* Menubar window processing of button press
2107	*/
2108	if (isMenuBarWindow (ev.window))
2109	menubar_control (ev);
2110	#endif
2111	}	2056	}
2112		2057
2113	void	2058	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2059	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2060	{
…		…
2121		2066
2122	if (scrollbar_isUpDn ())	2067	if (scrollbar_isUpDn ())
2123	{	2068	{
2124	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2125	scrollbar_show (0);	2070	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2071	}
2130		2072
2131	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2134	#endif	2076	#endif
2135		2077
2136	if (ev.window == vt)	2078	if (ev.window == vt)
2137	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2138	#if ISO_14755	2083	#if ISO_14755
2139	// 5.4	2084	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2141	return;	2086	return;
2142	#endif	2087	#endif
		2088
2143	if (reportmode)	2089	if (reportmode)
2144	{	2090	{
2145	/* mouse report from vt window */	2091	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2118	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2175		2121
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2122	switch (ev.button)
2180	{	2123	{
2181	case Button1:	2124	case Button1:
2182	case Button3:	2125	case Button3:
2183	selection_make (ev.time);	2126	selection_make (ev.time);
2184	break;	2127	break;
		2128
2185	case Button2:	2129	case Button2:
2186	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);
2187	break;	2132	break;
		2133
2188	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2189	case Button4:	2135	case Button4:
2190	case Button5:	2136	case Button5:
2191	{	2137	{
2192	int i;	2138	int i;
…		…
2224	}	2170	}
2225	break;	2171	break;
2226	#endif	2172	#endif
2227	}	2173	}
2228	}	2174	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2175	}
2234		2176
2235	#ifdef TRANSPARENT	2177	#ifdef TRANSPARENT
2236	#if TINTING	2178	#if TINTING
2237	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2238		2180
2239	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2240		2182
2241	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)
2242	{	2184	{
2243	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2187	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2190	int i;
2249		2191
2250	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2251		2193
2252	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2253		2195
2254	/* for convenience */	2196	/* for convenience */
2255	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2418	Atom atype;
2477	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2420	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2423
2483	pchanged = 0;	2424	pchanged = 0;
2484		2425
2485	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2487		2428
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2490		2431
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2492		2433
2493	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2494	{	2435	{
2495	if (am_transparent)	2436	if (am_transparent)
2496	{	2437	{
2497	pchanged = 1;	2438	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2500	}	2441	}
2501		2442
2502	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2503	}	2444	}
2504		2445
2505	/* 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. */
2506	XSync (disp, False);	2447	XSync (xdisp, False);
2507		2448
2508	/*	2449	/*
2509	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2511	* 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.
2512	*/	2453	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2517		2458
2518	if (!i \|\| prop == NULL)	2459	if (!i \|\| prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2523		2464
2524	if (!i \|\| prop == NULL	2465	if (!i \|\| prop == NULL
2525	#if TINTING	2466	#if TINTING
2526	\|\| !rs[Rs_color + Color_tint]	2467	\|\| !ISSET_PIXCOLOR (Color_tint)
2527	#endif	2468	#endif
2528	)	2469	)
2529	have_pixmap = 0;	2470	have_pixmap = 0;
2530	else	2471	else
2531	{	2472	{
…		…
2544	Window cr;	2485	Window cr;
2545	XImage *image;	2486	XImage *image;
2546	GC gc;	2487	GC gc;
2547	XGCValues gcvalue;	2488	XGCValues gcvalue;
2548		2489
2549	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2494	nx = ny = 0;
2554		2495
…		…
2567	}	2508	}
2568		2509
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2512
2572	XSync (disp, False);	2513	XSync (xdisp, False);
2573	allowedxerror = -1;	2514	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2516
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2519	allowedxerror = 0;
2579		2520
…		…
2582	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2583	{	2524	{
2584	pchanged = 1;	2525	pchanged = 1;
2585	if (pixmap != None)	2526	if (pixmap != None)
2586	{	2527	{
2587	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2588	pixmap = None;	2529	pixmap = None;
2589	}	2530	}
2590	}	2531	}
2591		2532
2592	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2593	}	2534	}
2594	else	2535	else
2595	{	2536	{
2596	if (pixmap != None)	2537	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2598		2539
2599	#if TINTING	2540	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2542	{
2602	unsigned short rm, gm, bm;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2543	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2544
		2545	rgba c;
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused [Color_tint].get (this, c);
2606		2547
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608	}	2549	}
2609	#endif	2550	#endif
2610		2551
2611	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2617	XDestroyImage (image);	2557	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2620		2560
2621	if (!am_transparent \|\| !am_pixmap_trans)	2561	if (!am_transparent \|\| !am_pixmap_trans)
2622	pchanged = 1;	2562	pchanged = 1;
2623		2563
2624	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2625	}	2565	}
2626	}	2566	}
2627		2567
2628	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630	else	2570	else
2631	{	2571	{
2632	unsigned int n;	2572	unsigned int n;
2633	/*	2573	/*
2634	* InheritPixmap transparency	2574	* InheritPixmap transparency
2635	*/	2575	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2577	{
2638	oldp = parent[i];	2578	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2640	&parent[i], &list, &n);
2641	XFree (list);	2580	XFree (list);
2642		2581
2643	if (parent[i] == display->root)	2582	if (parent[i] == display->root)
2644	{	2583	{
2645	if (oldp != None)	2584	if (oldp != None)
…		…
2653	}	2592	}
2654		2593
2655	n = 0;	2594	n = 0;
2656		2595
2657	if (pchanged)	2596	if (pchanged)
2658	{
2659	for (; n < (unsigned int)i; n++)	2597	for (; n < (unsigned int)i; n++)
2660	{	2598	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2599	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2600
2662	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2601	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2663	{	2602	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2603	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2604	break;
2666	}	2605	}
2667	}	2606	}
2668	}
2669		2607
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2608	if (n > (sizeof (parent) / sizeof (parent[0])))
2671	{	2609	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2610	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2611	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2612	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2613	/* XXX: also turn off Opt_transparent? */
2676	}	2614	}
2677	else	2615	else
2678	{	2616	{
2679	#if WAIT_FOR_WM
2680	/* wait (an arbitrary period) for the WM to do its thing
2681	* needed for fvwm2.2.2 (and before?) */
2682	sleep (1);
2683	#endif
2684	for (n = 0; n < (unsigned int)i; n++)	2617	for (n = 0; n < (unsigned int)i; n++)
2685	{	2618	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2619	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2620	XClearWindow (xdisp, parent[n]);
2688	}	2621	}
2689		2622
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2623	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2691	am_transparent = 1;	2624	am_transparent = 1;
2692	}	2625	}
2693		2626
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2627	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2628	parent[i] = None;
2696	}	2629	}
2697		2630
2698	if (scrollBar.win)	2631	if (scrollBar.win)
2699	{	2632	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2633	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2634	scrollBar.setIdle ();
2702	scrollbar_show (0);	2635	scrollbar_show (0);
2703	}	2636	}
2704		2637
2705	if (am_transparent)	2638	if (am_transparent)
…		…
2780	}	2713	}
2781		2714
2782	// scr_add_lines only works for nlines <= nrow - 1.	2715	// scr_add_lines only works for nlines <= nrow - 1.
2783	if (nlines >= nrow - 1)	2716	if (nlines >= nrow - 1)
2784	{	2717	{
		2718	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2719	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786	scr_add_lines (buf, str - buf, nlines);	2720	scr_add_lines (buf, str - buf, nlines);
2787		2721
2788	nlines = 0;	2722	nlines = 0;
2789	str = buf;	2723	str = buf;
2790	eol = str + min (ncol, UBUFSIZ);	2724	eol = str + min (ncol, UBUFSIZ);
…		…
2805		2739
2806	seq_begin = cmdbuf_ptr;	2740	seq_begin = cmdbuf_ptr;
2807	ch = next_char ();	2741	ch = next_char ();
2808	}	2742	}
2809		2743
		2744	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2745	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811	scr_add_lines (buf, str - buf, nlines);	2746	scr_add_lines (buf, str - buf, nlines);
2812		2747
2813	/*	2748	/*
2814	* If there have been a lot of new lines, then update the screen	2749	* If there have been a lot of new lines, then update the screen
2815	* What the heck I'll cheat and only refresh less than every page-full.	2750	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2821	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2756	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822	refresh_limit++;	2757	refresh_limit++;
2823	else	2758	else
2824	{	2759	{
2825	flag = true;	2760	flag = true;
2826	scr_refresh (refresh_type);	2761	scr_refresh ();
2827	want_refresh = 1;	2762	want_refresh = 1;
2828	}	2763	}
2829	}	2764	}
2830		2765
2831	}	2766	}
…		…
2849	return flag;	2784	return flag;
2850	}	2785	}
2851		2786
2852	// read the next character	2787	// read the next character
2853	wchar_t	2788	wchar_t
2854	rxvt_term::next_char ()	2789	rxvt_term::next_char () NOTHROW
2855	{	2790	{
2856	while (cmdbuf_ptr < cmdbuf_endp)	2791	while (cmdbuf_ptr < cmdbuf_endp)
2857	{	2792	{
2858	// assume 7-bit to be ascii ALWAYS	2793	// assume 7-bit to be ascii ALWAYS
2859	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2794	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2880	return NOCHAR;	2815	return NOCHAR;
2881	}	2816	}
2882		2817
2883	// read the next octet	2818	// read the next octet
2884	uint32_t	2819	uint32_t
2885	rxvt_term::next_octet ()	2820	rxvt_term::next_octet () NOTHROW
2886	{	2821	{
2887	return cmdbuf_ptr < cmdbuf_endp	2822	return cmdbuf_ptr < cmdbuf_endp
2888	? (unsigned char)*cmdbuf_ptr++	2823	? (unsigned char)*cmdbuf_ptr++
2889	: NOCHAR;	2824	: NOCHAR;
2890	}	2825	}
		2826
		2827	static class out_of_input out_of_input;
2891		2828
2892	/* rxvt_cmd_getc () - Return next input character */	2829	/* rxvt_cmd_getc () - Return next input character */
2893	/*	2830	/*
2894	* Return the next input character after first passing any keyboard input	2831	* Return the next input character after first passing any keyboard input
2895	* to the command.	2832	* to the command.
2896	*/	2833	*/
2897	wchar_t	2834	wchar_t
2898	rxvt_term::cmd_getc ()	2835	rxvt_term::cmd_getc () THROW ((class out_of_input))
2899	{	2836	{
2900	wchar_t c = next_char ();	2837	wchar_t c = next_char ();
2901		2838
2902	if (c == NOCHAR)	2839	if (c == NOCHAR)
2903	throw out_of_input;	2840	throw out_of_input;
2904		2841
2905	return c;	2842	return c;
2906	}	2843	}
2907		2844
2908	uint32_t	2845	uint32_t
2909	rxvt_term::cmd_get8 ()	2846	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910	{	2847	{
2911	uint32_t c = next_octet ();	2848	uint32_t c = next_octet ();
2912		2849
2913	if (c == NOCHAR)	2850	if (c == NOCHAR)
2914	throw out_of_input;	2851	throw out_of_input;
…		…
3152	scr_charset_set (2, (unsigned int)cmd_getc ());	3089	scr_charset_set (2, (unsigned int)cmd_getc ());
3153	break;	3090	break;
3154	case '+':	3091	case '+':
3155	scr_charset_set (3, (unsigned int)cmd_getc ());	3092	scr_charset_set (3, (unsigned int)cmd_getc ());
3156	break;	3093	break;
3157	#if ENABLE_FRILLS	3094	#if !ENABLE_MINIMAL
3158	case '6':	3095	case '6':
3159	scr_backindex ();	3096	scr_backindex ();
3160	break;	3097	break;
3161	#endif	3098	#endif
3162	case '7':	3099	case '7':
3163	scr_cursor (SAVE);	3100	scr_cursor (SAVE);
3164	break;	3101	break;
3165	case '8':	3102	case '8':
3166	scr_cursor (RESTORE);	3103	scr_cursor (RESTORE);
3167	break;	3104	break;
3168	#if ENABLE_FRILLS	3105	#if !ENABLE_MINIMAL
3169	case '9':	3106	case '9':
3170	scr_forwardindex ();	3107	scr_forwardindex ();
3171	break;	3108	break;
3172	#endif	3109	#endif
3173	case '=':	3110	case '=':
…		…
3335	ndef = get_byte_array_bit (csi_defaults, i);	3272	ndef = get_byte_array_bit (csi_defaults, i);
3336	for (p = 0; p < nargs; p++)	3273	for (p = 0; p < nargs; p++)
3337	if (arg[p] == -1)	3274	if (arg[p] == -1)
3338	arg[p] = ndef;	3275	arg[p] = ndef;
3339		3276
3340	#ifdef DEBUG_CMD
3341	fprintf (stderr, "CSI ");
3342	for (p = 0; p < nargs; p++)
3343	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344	fprintf (stderr, "%c\n", ch);
3345	#endif
3346
3347	/*	3277	/*
3348	* private mode handling	3278	* private mode handling
3349	*/	3279	*/
3350	if (priv)	3280	if (priv)
3351	{	3281	{
3352	switch (priv)	3282	switch (priv)
3353	{	3283	{
3354	case '>':	3284	case '>':
3355	if (ch == CSI_DA) /* secondary device attributes */	3285	if (ch == CSI_DA) /* secondary device attributes */
3356	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3286	{
		3287	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3288	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3289	//
		3290	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3291	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3292	// that we do not support xterm mouse reporting (should be 95 when we do).
		3293	//
		3294	tt_printf ("\033[>%d;94;0c", 'U');
		3295	}
3357	break;	3296	break;
3358	case '?':	3297	case '?':
3359	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3298	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3360	process_terminal_mode (ch, priv, nargs, arg);	3299	process_terminal_mode (ch, priv, nargs, arg);
3361	break;	3300	break;
…		…
3564	break;	3503	break;
3565	case CSI_75:	3504	case CSI_75:
3566	scr_cursor (RESTORE);	3505	scr_cursor (RESTORE);
3567	break;	3506	break;
3568		3507
3569	#if ENABLE_FRILLS	3508	#if !ENABLE_MINIMAL
3570	case CSI_74:	3509	case CSI_74:
3571	process_window_ops (arg, nargs);	3510	process_window_ops (arg, nargs);
3572	break;	3511	break;
3573	#endif	3512	#endif
3574		3513
…		…
3581	break;	3520	break;
3582	}	3521	}
3583	}	3522	}
3584	/}}} /	3523	/}}} /
3585		3524
3586	#if ENABLE_FRILLS	3525	#if !ENABLE_MINIMAL
3587	/* ARGSUSED */	3526	/* ARGSUSED */
3588	void	3527	void
3589	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3528	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590	{	3529	{
3591	int x, y;	3530	int x, y;
3592	XWindowAttributes wattr;	3531	XWindowAttributes wattr;
3593	Window wdummy;	3532	Window wdummy;
3594	dDisp;	3533
		3534	dLocal (Display *, xdisp);
3595		3535
3596	if (nargs == 0)	3536	if (nargs == 0)
3597	return;	3537	return;
3598		3538
3599	switch (args[0])	3539	switch (args[0])
3600	{	3540	{
3601	/*	3541	/*
3602	* commands	3542	* commands
3603	*/	3543	*/
3604	case 1: /* deiconify window */	3544	case 1: /* deiconify window */
3605	XMapWindow (disp, parent[0]);	3545	XMapWindow (xdisp, parent[0]);
3606	break;	3546	break;
3607	case 2: /* iconify window */	3547	case 2: /* iconify window */
3608	XIconifyWindow (disp, parent[0], display->screen);	3548	XIconifyWindow (xdisp, parent[0], display->screen);
3609	break;	3549	break;
3610	case 3: /* set position (pixels) */	3550	case 3: /* set position (pixels) */
3611	XMoveWindow (disp, parent[0], args[1], args[2]);	3551	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3612	break;	3552	break;
3613	case 4: /* set size (pixels) */	3553	case 4: /* set size (pixels) */
3614	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3554	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615	break;	3555	break;
3616	case 5: /* raise window */	3556	case 5: /* raise window */
3617	XRaiseWindow (disp, parent[0]);	3557	XRaiseWindow (xdisp, parent[0]);
3618	break;	3558	break;
3619	case 6: /* lower window */	3559	case 6: /* lower window */
3620	XLowerWindow (disp, parent[0]);	3560	XLowerWindow (xdisp, parent[0]);
3621	break;	3561	break;
3622	case 7: /* refresh window */	3562	case 7: /* refresh window */
3623	scr_touch (true);	3563	scr_touch (true);
3624	break;	3564	break;
3625	case 8: /* set size (chars) */	3565	case 8: /* set size (chars) */
…		…
3632	if (args[0] >= 24) /* set height (chars) */	3572	if (args[0] >= 24) /* set height (chars) */
3633	set_widthheight ((unsigned int)width,	3573	set_widthheight ((unsigned int)width,
3634	(unsigned int) (args[1] * fheight));	3574	(unsigned int) (args[1] * fheight));
3635	break;	3575	break;
3636		3576
3637
3638	/*	3577	/*
3639	* reports - some output format copied from XTerm	3578	* reports - some output format copied from XTerm
3640	*/	3579	*/
3641	case 11: /* report window state */	3580	case 11: /* report window state */
3642	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3643	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3582	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644	break;	3583	break;
3645	case 13: /* report window position */	3584	case 13: /* report window position */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3585	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	XTranslateCoordinates (disp, parent[0], wattr.root,	3586	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3648	-wattr.border_width, -wattr.border_width,	3587	-wattr.border_width, -wattr.border_width,
3649	&x, &y, &wdummy);	3588	&x, &y, &wdummy);
3650	tt_printf ("\033[3;%d;%dt", x, y);	3589	tt_printf ("\033[3;%d;%dt", x, y);
3651	break;	3590	break;
3652	case 14: /* report window size (pixels) */	3591	case 14: /* report window size (pixels) */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3592	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3593	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655	break;	3594	break;
3656	case 18: /* report text area size (chars) */	3595	case 18: /* report text area size (chars) */
3657	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3596	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658	break;	3597	break;
…		…
3660	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661	break;	3600	break;
3662	case 20: /* report icon label */	3601	case 20: /* report icon label */
3663	{	3602	{
3664	char *s;	3603	char *s;
3665	XGetIconName (disp, parent[0], &s);	3604	XGetIconName (xdisp, parent[0], &s);
3666	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3605	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667	XFree (s);	3606	XFree (s);
3668	}	3607	}
3669	break;	3608	break;
3670	case 21: /* report window title */	3609	case 21: /* report window title */
3671	{	3610	{
3672	char *s;	3611	char *s;
3673	XFetchName (disp, parent[0], &s);	3612	XFetchName (xdisp, parent[0], &s);
3674	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3613	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675	XFree (s);	3614	XFree (s);
3676	}	3615	}
3677	break;	3616	break;
3678	}	3617	}
…		…
3779	void	3718	void
3780	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3719	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781	{	3720	{
3782	if (str[0] == '?' && !str[1])	3721	if (str[0] == '?' && !str[1])
3783	{	3722	{
3784	unsigned short r, g, b;	3723	rgba c;
3785	pix_colors_focused[color].get (display, r, g, b);	3724	pix_colors_focused[color].get (this, c);
		3725
		3726	#if XFT
		3727	if (c.a != rgba::MAX_CC)
		3728	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3729	else
		3730	#endif
3786	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3731	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787	}	3732	}
3788	else	3733	else
3789	set_window_color (color, str);	3734	set_window_color (color, str);
3790	}	3735	}
3791		3736
…		…
3793	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3738	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3794	*/	3739	*/
3795	void	3740	void
3796	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3741	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797	{	3742	{
3798	int changed = 0;
3799	int color;	3743	int color;
3800	char buf, name;	3744	char buf, name;
3801	bool query = str[0] == '?' && !str[1];	3745	bool query = str[0] == '?' && !str[1];
3802	int saveop = op;	3746	int saveop = op;
3803	dDisp;	3747
		3748	dLocal (Display *, xdisp);
3804		3749
3805	assert (str != NULL);	3750	assert (str != NULL);
3806	switch (op)	3751	switch (op)
3807	{	3752	{
3808	case XTerm_name:	3753	case XTerm_name:
…		…
3824	unsigned long bytes_after;	3769	unsigned long bytes_after;
3825	unsigned char *value = 0;	3770	unsigned char *value = 0;
3826	const char *str = "";	3771	const char *str = "";
3827		3772
3828	if (prop	3773	if (prop
3829	&& XGetWindowProperty (disp, parent[0],	3774	&& XGetWindowProperty (xdisp, parent[0],
3830	prop, 0, 1<<16, 0, AnyPropertyType,	3775	prop, 0, 1<<16, 0, AnyPropertyType,
3831	&actual_type, &actual_format,	3776	&actual_type, &actual_format,
3832	&nitems, &bytes_after, &value) == Success	3777	&nitems, &bytes_after, &value) == Success
3833	&& actual_type != None	3778	&& actual_type != None
3834	&& actual_format == 8)	3779	&& actual_format == 8)
3835	str = (const char *)(value);	3780	str = (const char *)(value);
3836		3781
3837	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3782	tt_printf ("\033]%d;%s%c", op, str, resp);
3838		3783
3839	XFree (value);	3784	XFree (value);
3840	}	3785	}
3841	else	3786	else
3842	{	3787	{
…		…
3846	{	3791	{
3847	*eq = 0;	3792	*eq = 0;
3848	set_utf8_property (display->atom (str), eq + 1);	3793	set_utf8_property (display->atom (str), eq + 1);
3849	}	3794	}
3850	else	3795	else
3851	XDeleteProperty (disp, parent[0],	3796	XDeleteProperty (xdisp, parent[0],
3852	display->atom (str));	3797	display->atom (str));
3853	}	3798	}
3854	break;	3799	break;
3855		3800
3856	case XTerm_Color:	3801	case XTerm_Color:
…		…
3866	break;	3811	break;
3867		3812
3868	if ((buf = strchr (name, ';')) != NULL)	3813	if ((buf = strchr (name, ';')) != NULL)
3869	*buf++ = '\0';	3814	*buf++ = '\0';
3870		3815
3871	if (name[0] == '?' && !name[1])	3816	process_color_seq (op, color, name, resp);
3872	{
3873	unsigned short r, g, b;
3874	pix_colors_focused[color].get (display, r, g, b);
3875	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876	}
3877	else
3878	set_window_color (color, name);
3879	}	3817	}
3880	break;	3818	break;
3881	case XTerm_Color00:	3819	case XTerm_Color00:
3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3820	process_color_seq (op, Color_fg, str, resp);
3883	break;	3821	break;
3884	case XTerm_Color01:	3822	case XTerm_Color01:
3885	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3823	process_color_seq (op, Color_bg, str, resp);
3886	break;	3824	break;
3887	#ifndef NO_CURSORCOLOR	3825	#ifndef NO_CURSORCOLOR
3888	case XTerm_Color_cursor:	3826	case XTerm_Color_cursor:
3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3827	process_color_seq (op, Color_cursor, str, resp);
3890	break;	3828	break;
3891	#endif	3829	#endif
3892	case XTerm_Color_pointer_fg:	3830	case XTerm_Color_pointer_fg:
3893	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3831	process_color_seq (op, Color_pointer_fg, str, resp);
3894	break;	3832	break;
3895	case XTerm_Color_pointer_bg:	3833	case XTerm_Color_pointer_bg:
3896	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3834	process_color_seq (op, Color_pointer_bg, str, resp);
3897	break;	3835	break;
3898	#ifndef NO_BOLD_UNDERLINE_REVERSE	3836	#ifndef NO_BOLD_UNDERLINE_REVERSE
3899	case XTerm_Color_RV:	3837	case XTerm_Color_RV:
3900	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3838	process_color_seq (op, Color_RV, str, resp);
3901	break;	3839	break;
3902	case Rxvt_Color_BD:	3840	case Rxvt_Color_BD:
3903	case URxvt_Color_BD:	3841	case URxvt_Color_BD:
3904	process_color_seq (op, Color_BD, str, resp);	3842	process_color_seq (op, Color_BD, str, resp);
3905	break;	3843	break;
3906	case Rxvt_Color_UL:	3844	case Rxvt_Color_UL:
3907	case URxvt_Color_UL:	3845	case URxvt_Color_UL:
3908	process_color_seq (op, Color_UL, str, resp);	3846	process_color_seq (op, Color_UL, str, resp);
3909	break;	3847	break;
3910	case URxvt_Color_IT:	3848	case URxvt_Color_IT:
3911	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3849	process_color_seq (op, Color_IT, str, resp);
3912	break;	3850	break;
3913	#endif	3851	#endif
3914	#if TRANSPARENT && TINTING	3852	#if TRANSPARENT && TINTING
3915	case URxvt_Color_tint:	3853	case URxvt_Color_tint:
3916	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3854	process_color_seq (op, Color_tint, str, resp);
		3855
3917	check_our_parents ();	3856	check_our_parents ();
		3857
3918	if (am_transparent)	3858	if (am_transparent)
3919	want_full_refresh = want_refresh = 1;	3859	want_full_refresh = want_refresh = 1;
		3860
3920	break;	3861	break;
3921	#endif	3862	#endif
3922		3863
3923	case Rxvt_Pixmap:	3864	case Rxvt_Pixmap:
		3865	{
3924	if (*str != ';')	3866	if (*str != ';')
3925	{	3867	{
3926	#if XPM_BACKGROUND	3868	#if XPM_BACKGROUND
3927	scale_pixmap (""); /* reset to default scaling */	3869	scale_pixmap (""); /* reset to default scaling */
3928	set_bgPixmap (str); /* change pixmap */	3870	set_bgPixmap (str); /* change pixmap */
3929	scr_touch (true);	3871	scr_touch (true);
3930	#endif	3872	#endif
3931	}	3873	}
3932		3874
		3875	int changed = 0;
		3876
3933	while ((str = strchr (str, ';')) != NULL)	3877	while ((str = strchr (str, ';')) != NULL)
3934	{	3878	{
3935	str++;	3879	str++;
3936	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3937	changed += scale_pixmap (str);	3881	changed += scale_pixmap (str);
3938	#endif	3882	#endif
3939	}	3883	}
3940		3884
3941	if (changed)	3885	if (changed)
3942	{	3886	{
3943	#ifdef XPM_BACKGROUND	3887	#ifdef XPM_BACKGROUND
3944	resize_pixmap ();	3888	resize_pixmap ();
3945	scr_touch (true);	3889	scr_touch (true);
3946	#endif	3890	#endif
3947	}	3891	}
		3892	}
3948	break;	3893	break;
3949		3894
3950	case Rxvt_restoreFG:	3895	case Rxvt_restoreFG:
3951	set_window_color (Color_fg, str);	3896	set_window_color (Color_fg, str);
3952	break;	3897	break;
…		…
3956		3901
3957	case XTerm_logfile:	3902	case XTerm_logfile:
3958	// TODO, when secure mode?	3903	// TODO, when secure mode?
3959	break;	3904	break;
3960		3905
3961	#ifdef MENUBAR
3962	case URxvt_Menu:
3963	if (OPTION (Opt_insecure))
3964	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965	break;
3966	#endif
3967	#if 0	3906	#if 0
3968	case Rxvt_dumpscreen: /* no error notices */	3907	case Rxvt_dumpscreen: /* no error notices */
3969	{	3908	{
3970	int fd;	3909	int fd;
3971	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)
…		…
3997	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
3998	set_fonts ();	3937	set_fonts ();
3999	}	3938	}
4000	break;	3939	break;
4001		3940
4002	#if ENABLE_FRILLS	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
		3949	#if !ENABLE_MINIMAL
4003	case URxvt_locale:	3950	case URxvt_locale:
4004	if (query)	3951	if (query)
4005	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);
4006	else	3953	else
4007	{	3954	{
4008	set_locale (str);	3955	set_locale (str);
4009	pty.set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
4010	init_xlocale ();	3957	init_xlocale ();
4011	}	3958	}
4012	break;	3959	break;
4013		3960
4014	case URxvt_view_up:	3961	case URxvt_view_up:
…		…
4067	return state;	4014	return state;
4068	}	4015	}
4069		4016
4070	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4071	void	4018	void
4072	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)
4073	{	4020	{
4074	unsigned int i, j;	4021	unsigned int i, j;
4075	int state;	4022	int state;
4076		4023
4077	static const struct	4024	static const struct
…		…
4088	{ 5, PrivMode_rVideo },	4035	{ 5, PrivMode_rVideo },
4089	{ 6, PrivMode_relOrigin },	4036	{ 6, PrivMode_relOrigin },
4090	{ 7, PrivMode_Autowrap },	4037	{ 7, PrivMode_Autowrap },
4091	// 8, bi-directional support mode	4038	// 8, bi-directional support mode
4092	{ 9, PrivMode_MouseX10 },	4039	{ 9, PrivMode_MouseX10 },
4093	#ifdef menuBar_esc
4094	{ menuBar_esc, PrivMode_menuBar },
4095	#endif
4096	// 18, 19 printing-related	4040	// 18, 19 printing-related
4097	{ 25, PrivMode_VisibleCursor },	4041	{ 25, PrivMode_VisibleCursor },
4098	#ifdef scrollBar_esc	4042	#ifdef scrollBar_esc
4099	{ scrollBar_esc, PrivMode_scrollBar },	4043	{ scrollBar_esc, PrivMode_scrollBar },
4100	#endif	4044	#endif
…		…
4195	/* 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 */
4196	case 9: /* X10 mouse reporting */	4140	case 9: /* X10 mouse reporting */
4197	if (state) /* orthogonal */	4141	if (state) /* orthogonal */
4198	priv_modes &= ~PrivMode_MouseX11;	4142	priv_modes &= ~PrivMode_MouseX11;
4199	break;	4143	break;
4200	#ifdef menuBar_esc
4201	case menuBar_esc:
4202	#ifdef MENUBAR
4203	map_menuBar (state);
4204	#endif
4205	break;
4206	#endif
4207	#ifdef scrollBar_esc	4144	#ifdef scrollBar_esc
4208	case scrollBar_esc:	4145	case scrollBar_esc:
4209	if (scrollbar_mapping (state))	4146	if (scrollbar_mapping (state))
4210	{	4147	{
4211	resize_all_windows (0, 0, 0);	4148	resize_all_windows (0, 0, 0);
…		…
4381	scr_color (Color_bg, Color_bg);	4318	scr_color (Color_bg, Color_bg);
4382	break;	4319	break;
4383		4320
4384	//case 50: // not variable spacing	4321	//case 50: // not variable spacing
4385		4322
4386	#if ENABLE_FRILLS	4323	#if !ENABLE_MINIMAL
4387	case 90:	4324	case 90:
4388	case 91: /* set bright fg color */	4325	case 91: /* set bright fg color */
4389	case 92:	4326	case 92:
4390	case 93:	4327	case 93:
4391	case 94:	4328	case 94:
…		…
4456	rxvt_term::tt_write (const char *data, unsigned int len)	4393	rxvt_term::tt_write (const char *data, unsigned int len)
4457	{	4394	{
4458	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)))
4459	return;	4396	return;
4460		4397
4461	if (pty.pty < 0)	4398	if (pty->pty < 0)
4462	return;	4399	return;
4463		4400
4464	if (v_buflen == 0)	4401	if (v_buflen == 0)
4465	{	4402	{
4466	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));
4467		4404
4468	if ((unsigned int)written == len)	4405	if ((unsigned int)written == len)
4469	return;	4406	return;
4470		4407
4471	data += written;	4408	data += written;
…		…
4480	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4417	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4481	}	4418	}
4482		4419
4483	void rxvt_term::pty_write ()	4420	void rxvt_term::pty_write ()
4484	{	4421	{
4485	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));
4486		4423
4487	if (written > 0)	4424	if (written > 0)
4488	{	4425	{
4489	v_buflen -= written;	4426	v_buflen -= written;
4490		4427

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC vs. Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC