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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.238 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	147	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	148	return;
149		149
150	for (;;)	150	for (;;)
151	{	151	{
152	const line_t &l = ROW(y - view_start);	152	const line_t &l = ROW(y + view_start);
153		153
154	text_t t = l.t[x];	154	text_t t = l.t[x];
155		155
156	if (t != NOCHAR \|\| !x)	156	if (t != NOCHAR \|\| !x)
157	{	157	{
…		…
443	scr_move_to (0, 1);	443	scr_move_to (0, 1);
444	return;	444	return;
445	}	445	}
446	else if (keysym == XK_End)	446	else if (keysym == XK_End)
447	{	447	{
448	scr_move_to (1, 0);	448	scr_move_to (1, 1);
449	return;	449	return;
450	}	450	}
451	}	451	}
452	#endif	452	#endif
453	}	453	}
…		…
464	{	464	{
465	switch (keysym)	465	switch (keysym)
466	{	466	{
467	/* normal XTerm key bindings */	467	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	468	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	469	selection_request (ev.time);
470	return;	470	return;
471	#if TODO	471	#if TODO
472	/* rxvt extras */	472	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	473	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	474	change_font (FONT_UP);
…		…
867	#endif	867	#endif
868	/* nil */ ;	868	/* nil */ ;
869	}	869	}
870	}	870	}
871		871
		872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		873	return;
		874
872	if (len <= 0)	875	if (len <= 0)
873	return; /* not mapped */	876	return; /* not mapped */
874		877
875	if (OPTION (Opt_scrollTtyKeypress))	878	if (OPTION (Opt_scrollTtyKeypress))
876	if (view_start)	879	if (view_start)
…		…
916	#endif /* DEBUG_CMD */	919	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	920	tt_write (kbuf, (unsigned int)len);
918	}	921	}
919	/}}} /	922	/}}} /
920		923
921	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	924	#if defined (KEYSYM_RESOURCE)
922	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
923	/* attempt to `write' count to the input buffer */
924	unsigned int	925	unsigned int
925	rxvt_term::cmd_write (const char *str, unsigned int count)	926	rxvt_term::cmd_write (const char *str, unsigned int count)
926	{	927	{
927	unsigned int n, s;	928	unsigned int n, s;
928		929
…		…
969		970
970	if (want_refresh)	971	if (want_refresh)
971	{	972	{
972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	973	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973	{	974	{
974	int row = -view_start;	975	int row = view_start;
		976	int end_row = row + nrow;
975		977
976	while (row > -nsaved && ROW (row - 1).is_longer ())	978	while (row > top_row && ROW (row - 1).is_longer ())
977	--row;	979	--row;
978		980
979	while (row < -view_start + nrow)	981	do
980	{	982	{
981	int start_row = row;	983	int start_row = row;
982	line_t *l;	984	line_t *l;
983		985
984	do	986	do
985	{	987	{
986	l = &ROW (row);	988	l = &ROW (row++);
987		989
988	if (!(l->f & LINE_FILTERED))	990	if (!(l->f & LINE_FILTERED))
989	{	991	{
990	// line not filtered, mark it as filtered	992	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	993	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	994	while (l->is_longer ())
993	{	995	{
994	l = &ROW (++row);	996	l = &ROW (row++);
995	l->f \|= LINE_FILTERED;	997	l->f \|= LINE_FILTERED;
996	}	998	}
997		999
998	// and filter it	1000	// and filter it
999	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	1001	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000		1002
1001	break;	1003	break;
1002	}	1004	}
1003	}	1005	}
1004	while (l->is_longer ());	1006	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	1007	}
		1008	while (row < end_row);
1008		1009	}
1009	}
1010		1010
1011	scr_refresh (refresh_type);	1011	scr_refresh ();
1012	scrollbar_show (1);	1012	scrollbar_show (1);
1013	#ifdef USE_XIM	1013	#ifdef USE_XIM
1014	IMSendSpot ();	1014	IMSendSpot ();
1015	#endif	1015	#endif
1016	}	1016	}
…		…
1019	}	1019	}
1020		1020
1021	void	1021	void
1022	rxvt_term::check_cb (check_watcher &w)	1022	rxvt_term::check_cb (check_watcher &w)
1023	{	1023	{
1024	SET_R (this);	1024	make_current ();
1025	SET_LOCALE (locale);
1026		1025
1027	display->flush ();	1026	display->flush ();
1028		1027
1029	if (want_refresh && !flush_ev.active)	1028	if (want_refresh && !flush_ev.active)
1030	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1029	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1031	}	1030	}
1032		1031
1033	void	1032	void
1034	rxvt_term::flush_cb (time_watcher &w)	1033	rxvt_term::flush_cb (time_watcher &w)
1035	{	1034	{
1036	SET_R (this);	1035	make_current ();
1037	SET_LOCALE (locale);
1038		1036
1039	refresh_limit = 1;	1037	refresh_limit = 1;
1040	refresh_count = 0;	1038	refresh_count = 0;
1041	flush ();	1039	flush ();
1042	}	1040	}
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1068	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1069	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1070	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1071	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1072	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1073	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1074	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1075	}
1079	}	1076	}
1080	#endif	1077	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1081	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1082	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1083	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1084	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1085	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1086	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1087	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1088	}
1093	}	1089	}
1094	#endif	1090	#endif
…		…
1099	{	1095	{
1100	if (mouse_slip_wheel_speed == 0	1096	if (mouse_slip_wheel_speed == 0
1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1097	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102	: scr_page (UP, mouse_slip_wheel_speed))	1098	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1099	{
1104	if (view_start == nsaved \|\|	1100	if (view_start == top_row \|\| view_start == 0)
1105	view_start == 0)
1106	mouse_slip_wheel_speed = 0;	1101	mouse_slip_wheel_speed = 0;
1107		1102
1108	refresh_type \|= SMOOTH_REFRESH;
1109	want_refresh = 1;	1103	want_refresh = 1;
1110	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111	}	1105	}
1112	}	1106	}
1113	#endif	1107	#endif
…		…
1143		1137
1144	memmove (cmdbuf_base, cmdbuf_ptr, n);	1138	memmove (cmdbuf_base, cmdbuf_ptr, n);
1145	cmdbuf_ptr = cmdbuf_base;	1139	cmdbuf_ptr = cmdbuf_base;
1146	cmdbuf_endp = cmdbuf_ptr + n;	1140	cmdbuf_endp = cmdbuf_ptr + n;
1147		1141
1148	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1142	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149		1143
1150	if (r > 0)	1144	if (r > 0)
1151	{	1145	{
1152	cmdbuf_endp += r;	1146	cmdbuf_endp += r;
1153	return true;	1147	return true;
…		…
1171	}	1165	}
1172		1166
1173	void	1167	void
1174	rxvt_term::pty_cb (io_watcher &w, short revents)	1168	rxvt_term::pty_cb (io_watcher &w, short revents)
1175	{	1169	{
1176	SET_R (this);	1170	make_current ();
1177	SET_LOCALE (locale);
1178		1171
1179	if (revents & EVENT_READ)	1172	if (revents & EVENT_READ)
1180	// loop, but don't allow a single term to monopolize us	1173	// loop, but don't allow a single term to monopolize us
1181	while (pty_fill ())	1174	while (pty_fill ())
1182	if (cmd_parse ())	1175	if (cmd_parse ())
…		…
1202		1195
1203	#ifdef POINTER_BLANK	1196	#ifdef POINTER_BLANK
1204	void	1197	void
1205	rxvt_term::pointer_blank ()	1198	rxvt_term::pointer_blank ()
1206	{	1199	{
1207	if (! OPTION (Opt_pointerBlank))	1200	if (!OPTION (Opt_pointerBlank))
1208	return;	1201	return;
1209		1202
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1203	XDefineCursor (display->display, vt, display->blank_cursor);
1211	XFlush (display->display);	1204	XFlush (display->display);
1212		1205
…		…
1214	}	1207	}
1215		1208
1216	void	1209	void
1217	rxvt_term::pointer_cb (time_watcher &w)	1210	rxvt_term::pointer_cb (time_watcher &w)
1218	{	1211	{
1219	SET_R (this);	1212	make_current ();
1220	SET_LOCALE (locale);
1221		1213
1222	pointer_blank ();	1214	pointer_blank ();
1223	}	1215	}
1224	#endif	1216	#endif
1225		1217
…		…
1304		1296
1305	/{{{ process an X event /	1297	/{{{ process an X event /
1306	void	1298	void
1307	rxvt_term::x_cb (XEvent &ev)	1299	rxvt_term::x_cb (XEvent &ev)
1308	{	1300	{
		1301	make_current ();
		1302
1309	dDisp;	1303	dDisp;
1310		1304
1311	SET_R (this);	1305	if (ev.xany.window == vt
1312	SET_LOCALE (locale);	1306	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1308	return;
1313		1309
1314	#if defined(CURSOR_BLINK)	1310	// for XQueryPointer
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1316	{
1317	if (hidden_cursor)
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324	}
1325	#endif
1326
1327	#if defined(POINTER_BLANK)
1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329	{
1330	if (ev.type == MotionNotify
1331	\|\| ev.type == ButtonPress
1332	\|\| ev.type == ButtonRelease)
1333	if (hidden_pointer)
1334	pointer_unblank ();
1335
1336	if (ev.type == KeyPress && hidden_pointer == 0)
1337	pointer_blank ();
1338	}
1339	#endif
1340
1341	Window unused_root, unused_child;	1311	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1312	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1313	unsigned int unused_mask;
1344		1314
1345	switch (ev.type)	1315	switch (ev.type)
…		…
1352		1322
1353	break;	1323	break;
1354		1324
1355	case KeyRelease:	1325	case KeyRelease:
1356	{	1326	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1327	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1328	KeySym keysym;
1359		1329
1360	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1330	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361	#endif	1331	#endif
1362		1332
1363	#if ENABLE_FRILLS \|\| ISO_14755	1333	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1334	// ISO 14755 support
1365	if (iso14755buf)	1335	if (iso14755buf)
…		…
1370	# endif	1340	# endif
1371	# if ISO_14755	1341	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1342	// iso14755 part 5.2 handling: release time
1373	// first: controls	1343	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1344	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1345	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1346	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1347	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1348	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1349	commit_iso14755 ();
1380	return; // case-break;	1350	goto skip_switch;
1381	}	1351	}
1382		1352
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1353	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1354	if (i[0] == keysym)
1385	{	1355	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1356	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1357	commit_iso14755 ();
1388	return; // case-break;	1358	goto skip_switch;
1389	}	1359	}
1390		1360
1391	scr_bell ();	1361	scr_bell ();
1392	# endif	1362	# endif
1393	iso14755buf = 0;	1363	iso14755buf = 0;
…		…
1412	else	1382	else
1413	iso14755buf = 0;	1383	iso14755buf = 0;
1414	}	1384	}
1415	#endif	1385	#endif
1416		1386
		1387	if (ev.xany.window == vt
		1388	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1389	break;
		1390
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1391	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1392	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1393	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1394	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1395	mouse_slip_wheel_speed = 0;
1422	#endif	1396	#endif
1423	break;	1397	break;
1424	}	1398	}
1425		1399
…		…
1528	{	1502	{
1529	seen_resize = 1;	1503	seen_resize = 1;
1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531	}	1505	}
1532		1506
		1507	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1508
1533	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1509	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534	if (OPTION (Opt_transparent))	1510	if (OPTION (Opt_transparent))
1535	check_our_parents ();	1511	check_our_parents ();
1536	#endif	1512	#endif
1537	}	1513	}
…		…
1555		1531
1556	case SelectionRequest:	1532	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1533	selection_send (ev.xselectionrequest);
1558	break;	1534	break;
1559		1535
		1536	case MapNotify:
		1537	mapped = 1;
		1538	#ifdef TEXT_BLINK
		1539	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1540	#endif
		1541	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1542	break;
		1543
1560	case UnmapNotify:	1544	case UnmapNotify:
1561	mapped = 0;	1545	mapped = 0;
1562	#ifdef TEXT_BLINK	1546	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1547	text_blink_ev.stop ();
1564	#endif	1548	#endif
1565	break;	1549	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567	case MapNotify:
1568	mapped = 1;
1569	#ifdef TEXT_BLINK
1570	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571	#endif
1572	break;	1550	break;
1573		1551
1574	#ifdef TRANSPARENT	1552	#ifdef TRANSPARENT
1575	case ReparentNotify:	1553	case ReparentNotify:
1576	rootwin_cb (ev);	1554	rootwin_cb (ev);
…		…
1590		1568
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1570	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1571	ev.xexpose.width, ev.xexpose.height, False);
1594		1572
1595	scr_refresh (refresh_type);	1573	want_refresh = 1;
1596	}	1574	}
1597	else	1575	else
1598	{	1576	{
1599	XEvent unused_event;	1577	XEvent unused_event;
1600		1578
…		…
1606	if (isScrollbarWindow (ev.xany.window))	1584	if (isScrollbarWindow (ev.xany.window))
1607	{	1585	{
1608	scrollBar.setIdle ();	1586	scrollBar.setIdle ();
1609	scrollbar_show (0);	1587	scrollbar_show (0);
1610	}	1588	}
1611	#ifdef MENUBAR
1612	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613	menubar_expose ();
1614	#endif
1615		1589
1616	#ifdef TRANSPARENT	1590	#ifdef TRANSPARENT
1617	if (am_transparent && ev.xany.window == parent[0])	1591	if (am_transparent && ev.xany.window == parent[0])
1618	XClearWindow (disp, ev.xany.window);	1592	XClearWindow (disp, ev.xany.window);
1619	#endif	1593	#endif
…		…
1623	case MotionNotify:	1597	case MotionNotify:
1624	#ifdef POINTER_BLANK	1598	#ifdef POINTER_BLANK
1625	if (hidden_pointer)	1599	if (hidden_pointer)
1626	pointer_unblank ();	1600	pointer_unblank ();
1627	#endif	1601	#endif
1628	#if MENUBAR
1629	if (isMenuBarWindow (ev.xany.window))
1630	{
1631	menubar_control (ev.xbutton);
1632	break;
1633	}
1634	#endif
1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1602	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1603	break;
1637		1604
1638	if (ev.xany.window == vt)	1605	if (ev.xany.window == vt)
1639	{	1606	{
		1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
		1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1609	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1611	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643	;	1613	;
1644		1614
1645	XQueryPointer (disp, vt,	1615	XQueryPointer (disp, vt,
…		…
1725	&unused_root_x, &unused_root_y,	1695	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1696	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1697	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1699	scrollbar_size ());
1730	scr_refresh (refresh_type);	1700	want_refresh = 1;
1731	refresh_limit = 0;	1701	refresh_limit = 0;
1732	scrollbar_show (1);	1702	scrollbar_show (1);
1733	}	1703	}
1734	break;	1704	break;
1735	}	1705	}
		1706
		1707	skip_switch: ;
		1708
		1709	#if defined(CURSOR_BLINK)
		1710	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1711	{
		1712	if (hidden_cursor)
		1713	{
		1714	hidden_cursor = 0;
		1715	want_refresh = 1;
		1716	}
		1717
		1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1719	}
		1720	#endif
		1721
		1722	#if defined(POINTER_BLANK)
		1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1724	{
		1725	if (ev.type == MotionNotify
		1726	\|\| ev.type == ButtonPress
		1727	\|\| ev.type == ButtonRelease)
		1728	if (hidden_pointer)
		1729	pointer_unblank ();
		1730
		1731	if (ev.type == KeyPress && hidden_pointer == 0)
		1732	pointer_blank ();
		1733	}
		1734	#endif
1736	}	1735	}
1737		1736
1738	void	1737	void
1739	rxvt_term::focus_in ()	1738	rxvt_term::focus_in ()
1740	{	1739	{
…		…
1806		1805
1807	#if TRANSPARENT	1806	#if TRANSPARENT
1808	void	1807	void
1809	rxvt_term::rootwin_cb (XEvent &ev)	1808	rxvt_term::rootwin_cb (XEvent &ev)
1810	{	1809	{
1811	SET_R (this);	1810	make_current ();
1812	SET_LOCALE (locale);
1813		1811
1814	switch (ev.type)	1812	switch (ev.type)
1815	{	1813	{
1816	case PropertyNotify:	1814	case PropertyNotify:
1817	/*	1815	/*
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1863	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1864	if (ev.button == MEvent.button && clickintime)
1867	{	1865	{
1868	/* same button, within alloted time */	1866	/* same button, within alloted time */
1869	MEvent.clicks++;	1867	MEvent.clicks++;
		1868
1870	if (MEvent.clicks > 1)	1869	if (MEvent.clicks > 1)
1871	{	1870	{
1872	/* only report double clicks */	1871	/* only report double clicks */
1873	MEvent.clicks = 2;	1872	MEvent.clicks = 2;
1874	mouse_report (ev);	1873	mouse_report (ev);
…		…
1894	else	1893	else
1895	{	1894	{
1896	if (ev.button != MEvent.button)	1895	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1896	MEvent.clicks = 0;
1898		1897
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))	1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1899	switch (ev.button)
1901	{	1900	{
1902	case Button1:	1901	case Button1:
1903	/* allow meta + click to select rectangular areas */	1902	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1903	/* should be done in screen.C */
…		…
1907	#else	1906	#else
1908	selection.rect = false;	1907	selection.rect = false;
1909	#endif	1908	#endif
1910		1909
1911	/* allow shift+left click to extend selection */	1910	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1912	{
1914	if (MEvent.button == Button1 && clickintime)	1913	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1914	selection_rotate (ev.x, ev.y);
1916	else	1915	else
1917	selection_extend (ev.x, ev.y, 1);	1916	selection_extend (ev.x, ev.y, 1);
…		…
2082	}	2081	}
2083		2082
2084	break;	2083	break;
2085	}	2084	}
2086	}	2085	}
		2086
2087	return;	2087	return;
2088	}	2088	}
2089	#if MENUBAR
2090	/*
2091	* Menubar window processing of button press
2092	*/
2093	if (isMenuBarWindow (ev.window))
2094	menubar_control (ev);
2095	#endif
2096	}	2089	}
2097		2090
2098	void	2091	void
2099	rxvt_term::button_release (XButtonEvent &ev)	2092	rxvt_term::button_release (XButtonEvent &ev)
2100	{	2093	{
…		…
2106		2099
2107	if (scrollbar_isUpDn ())	2100	if (scrollbar_isUpDn ())
2108	{	2101	{
2109	scrollBar.setIdle ();	2102	scrollBar.setIdle ();
2110	scrollbar_show (0);	2103	scrollbar_show (0);
2111	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112	refresh_type &= ~SMOOTH_REFRESH;
2113	#endif
2114	}	2104	}
2115		2105
2116	#ifdef SELECTION_SCROLLING	2106	#ifdef SELECTION_SCROLLING
2117	if (sel_scroll_ev.active)	2107	if (sel_scroll_ev.active)
2118	sel_scroll_ev.stop();	2108	sel_scroll_ev.stop();
…		…
2156	if (priv_modes & PrivMode_mouse_report	2146	if (priv_modes & PrivMode_mouse_report
2157	&& bypass_keystate	2147	&& bypass_keystate
2158	&& ev.button == Button1 && MEvent.clicks <= 1)	2148	&& ev.button == Button1 && MEvent.clicks <= 1)
2159	selection_extend (ev.x, ev.y, 0);	2149	selection_extend (ev.x, ev.y, 0);
2160		2150
		2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2152	return;
		2153
2161	switch (ev.button)	2154	switch (ev.button)
2162	{	2155	{
2163	case Button1:	2156	case Button1:
2164	case Button3:	2157	case Button3:
2165	selection_make (ev.time);	2158	selection_make (ev.time);
2166	break;	2159	break;
		2160
2167	case Button2:	2161	case Button2:
		2162	if (IN_RANGE_EXC (ev.x, 0, width)
		2163	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2168	selection_request (ev.time, ev.x, ev.y);	2164	selection_request (ev.time);
		2165
2169	break;	2166	break;
		2167
2170	#ifdef MOUSE_WHEEL	2168	#ifdef MOUSE_WHEEL
2171	case Button4:	2169	case Button4:
2172	case Button5:	2170	case Button5:
2173	{	2171	{
2174	int i;	2172	int i;
…		…
2196	slip_wheel_ev.start ();	2194	slip_wheel_ev.start ();
2197	}	2195	}
2198	else	2196	else
2199	{	2197	{
2200	# endif	2198	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2199	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2200	scrollbar_show (1);
2205	# else
2206	while (i--)
2207	{
2208	scr_page (v, 1);
2209	scr_refresh (SMOOTH_REFRESH);
2210	scrollbar_show (1);
2211	}
2212	# endif
2213	# ifdef MOUSE_SLIP_WHEELING	2201	# ifdef MOUSE_SLIP_WHEELING
2214	}	2202	}
2215	#endif	2203	# endif
2216	}	2204	}
2217	break;	2205	break;
2218	#endif	2206	#endif
2219	}	2207	}
2220	}	2208	}
2221	#ifdef MENUBAR
2222	else if (isMenuBarWindow (ev.window))
2223	menubar_control (ev);
2224	#endif
2225	}	2209	}
2226		2210
2227	#ifdef TRANSPARENT	2211	#ifdef TRANSPARENT
2228	#if TINTING	2212	#if TINTING
2229	/* taken from aterm-0.4.2 */	2213	/* taken from aterm-0.4.2 */
…		…
2709		2693
2710	bool	2694	bool
2711	rxvt_term::cmd_parse ()	2695	rxvt_term::cmd_parse ()
2712	{	2696	{
2713	bool flag = false;	2697	bool flag = false;
2714	unicode_t ch = NOCHAR;	2698	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2699	char *seq_begin; // remember start of esc-sequence here
2716		2700
2717	for (;;)	2701	for (;;)
2718	{	2702	{
2719	if (ch == NOCHAR)	2703	if (ch == NOCHAR)
…		…
2740	if (seen_resize && cmd_pid)	2724	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2725	kill (-cmd_pid, SIGWINCH);
2742	}	2726	}
2743		2727
2744	/* Read a text string from the input buffer */	2728	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2729	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2730	bool refreshnow = false;
2747	int nlines = 0;	2731	int nlines = 0;
2748	unicode_t *str = buf;	2732	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2733	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2734
2751	for (;;)	2735	for (;;)
2752	{	2736	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2737	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2738	break;
…		…
2772	}	2756	}
2773		2757
2774	// scr_add_lines only works for nlines <= nrow - 1.	2758	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2759	if (nlines >= nrow - 1)
2776	{	2760	{
		2761	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2762	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778	scr_add_lines (buf, nlines, str - buf);	2763	scr_add_lines (buf, str - buf, nlines);
2779		2764
2780	nlines = 0;	2765	nlines = 0;
2781	str = buf;	2766	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2767	eol = str + min (ncol, UBUFSIZ);
2783	}	2768	}
…		…
2797		2782
2798	seq_begin = cmdbuf_ptr;	2783	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2784	ch = next_char ();
2800	}	2785	}
2801		2786
		2787	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2788	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803	scr_add_lines (buf, nlines, str - buf);	2789	scr_add_lines (buf, str - buf, nlines);
2804		2790
2805	/*	2791	/*
2806	* If there have been a lot of new lines, then update the screen	2792	* If there have been a lot of new lines, then update the screen
2807	* What the heck I'll cheat and only refresh less than every page-full.	2793	* What the heck I'll cheat and only refresh less than every page-full.
2808	* the number of pages between refreshes is refresh_limit, which	2794	* the number of pages between refreshes is refresh_limit, which
…		…
2813	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2799	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814	refresh_limit++;	2800	refresh_limit++;
2815	else	2801	else
2816	{	2802	{
2817	flag = true;	2803	flag = true;
2818	scr_refresh (refresh_type);	2804	scr_refresh ();
2819	flush_ev.stop ();	2805	want_refresh = 1;
2820	}	2806	}
2821	}	2807	}
2822		2808
2823	}	2809	}
2824	else	2810	else
…		…
2839	}	2825	}
2840		2826
2841	return flag;	2827	return flag;
2842	}	2828	}
2843		2829
2844	// read the next octet
2845	unicode_t
2846	rxvt_term::next_octet ()
2847	{
2848	return cmdbuf_ptr < cmdbuf_endp
2849	? *cmdbuf_ptr++
2850	: NOCHAR;
2851	}
2852
2853	// read the next character	2830	// read the next character
2854	unicode_t	2831	wchar_t
2855	rxvt_term::next_char ()	2832	rxvt_term::next_char ()
2856	{	2833	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2834	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2835	{
2859	// assume 7-bit to be ascii ALWAYS	2836	// assume 7-bit to be ascii ALWAYS
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2846	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2847	break;
2871	}	2848	}
2872		2849
2873	if (len == (size_t)-1)	2850	if (len == (size_t)-1)
2874	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2851	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875		2852
2876	// assume wchar == unicode	2853	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2854	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2855	return wc & UNICODE_MASK;
2879	}	2856	}
2880		2857
2881	return NOCHAR;	2858	return NOCHAR;
		2859	}
		2860
		2861	// read the next octet
		2862	uint32_t
		2863	rxvt_term::next_octet ()
		2864	{
		2865	return cmdbuf_ptr < cmdbuf_endp
		2866	? (unsigned char)*cmdbuf_ptr++
		2867	: NOCHAR;
2882	}	2868	}
2883		2869
2884	/* rxvt_cmd_getc () - Return next input character */	2870	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2871	/*
2886	* Return the next input character after first passing any keyboard input	2872	* Return the next input character after first passing any keyboard input
2887	* to the command.	2873	* to the command.
2888	*/	2874	*/
2889	unicode_t	2875	wchar_t
2890	rxvt_term::cmd_getc ()	2876	rxvt_term::cmd_getc ()
2891	{	2877	{
2892	unicode_t c = next_char ();	2878	wchar_t c = next_char ();
2893		2879
2894	if (c == NOCHAR)	2880	if (c == NOCHAR)
2895	throw out_of_input;	2881	throw out_of_input;
2896		2882
2897	return c;	2883	return c;
2898	}	2884	}
2899		2885
2900	unicode_t	2886	uint32_t
2901	rxvt_term::cmd_get8 ()	2887	rxvt_term::cmd_get8 ()
2902	{	2888	{
2903	unicode_t c = next_octet ();	2889	uint32_t c = next_octet ();
2904		2890
2905	if (c == NOCHAR)	2891	if (c == NOCHAR)
2906	throw out_of_input;	2892	throw out_of_input;
2907		2893
2908	return c;	2894	return c;
…		…
3175	break;	3161	break;
3176		3162
3177	/* 8.3.87: NEXT LINE */	3163	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3164	case C1_NEL: /* ESC E */
3179	{	3165	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3166	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3167	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3168	}
3183	break;	3169	break;
3184		3170
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3171	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3172	case C1_ESA: /* ESC G */
…		…
3785	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3771	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3786	*/	3772	*/
3787	void	3773	void
3788	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3774	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789	{	3775	{
3790	int changed = 0;
3791	int color;	3776	int color;
3792	char buf, name;	3777	char buf, name;
3793	bool query = str[0] == '?' && !str[1];	3778	bool query = str[0] == '?' && !str[1];
3794	int saveop = op;	3779	int saveop = op;
3795	dDisp;	3780	dDisp;
…		…
3850	{	3835	{
3851	if ((name = strchr (buf, ';')) == NULL)	3836	if ((name = strchr (buf, ';')) == NULL)
3852	break;	3837	break;
3853		3838
3854	*name++ = '\0';	3839	*name++ = '\0';
3855	color = atoi (buf);	3840	color = atoi (buf) + minCOLOR;
3856		3841
3857	if (color < 0 \|\| color >= TOTAL_COLORS)	3842	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858	break;	3843	break;
3859		3844
3860	if ((buf = strchr (name, ';')) != NULL)	3845	if ((buf = strchr (name, ';')) != NULL)
3861	*buf++ = '\0';	3846	*buf++ = '\0';
3862		3847
3863	if (name[0] == '?' && !name[1])	3848	if (name[0] == '?' && !name[1])
3864	{	3849	{
3865	unsigned short r, g, b;	3850	unsigned short r, g, b;
3866	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3851	pix_colors_focused[color].get (display, r, g, b);
3867	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3852	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868	}	3853	}
3869	else	3854	else
3870	set_window_color (color + minCOLOR, name);	3855	set_window_color (color, name);
3871	}	3856	}
3872	break;	3857	break;
3873	case XTerm_Color00:	3858	case XTerm_Color00:
3874	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3875	break;	3860	break;
3876	case XTerm_Color01:	3861	case XTerm_Color01:
3877	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3878	break;	3863	break;
3879	#ifndef NO_CURSORCOLOR	3864	#ifndef NO_CURSORCOLOR
3880	case XTerm_Color_cursor:	3865	case XTerm_Color_cursor:
3881	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3882	break;	3867	break;
…		…
3886	break;	3871	break;
3887	case XTerm_Color_pointer_bg:	3872	case XTerm_Color_pointer_bg:
3888	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3889	break;	3874	break;
3890	#ifndef NO_BOLD_UNDERLINE_REVERSE	3875	#ifndef NO_BOLD_UNDERLINE_REVERSE
3891	case XTerm_Color_BD:
3892	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893	break;
3894	case XTerm_Color_UL:
3895	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896	break;
3897	case XTerm_Color_RV:	3876	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3878	break;
		3879	case Rxvt_Color_BD:
		3880	case URxvt_Color_BD:
		3881	process_color_seq (op, Color_BD, str, resp);
		3882	break;
		3883	case Rxvt_Color_UL:
		3884	case URxvt_Color_UL:
		3885	process_color_seq (op, Color_UL, str, resp);
3899	break;	3886	break;
3900	case URxvt_Color_IT:	3887	case URxvt_Color_IT:
3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902	break;	3889	break;
3903	#endif	3890	#endif
…		…
3908	if (am_transparent)	3895	if (am_transparent)
3909	want_full_refresh = want_refresh = 1;	3896	want_full_refresh = want_refresh = 1;
3910	break;	3897	break;
3911	#endif	3898	#endif
3912		3899
3913	case XTerm_Pixmap:	3900	case Rxvt_Pixmap:
		3901	{
3914	if (*str != ';')	3902	if (*str != ';')
3915	{	3903	{
3916	#if XPM_BACKGROUND	3904	#if XPM_BACKGROUND
3917	scale_pixmap (""); /* reset to default scaling */	3905	scale_pixmap (""); /* reset to default scaling */
3918	set_bgPixmap (str); /* change pixmap */	3906	set_bgPixmap (str); /* change pixmap */
3919	#endif
3920	scr_touch (true);	3907	scr_touch (true);
		3908	#endif
3921	}	3909	}
		3910
		3911	int changed = 0;
		3912
3922	while ((str = strchr (str, ';')) != NULL)	3913	while ((str = strchr (str, ';')) != NULL)
3923	{	3914	{
3924	str++;	3915	str++;
3925	#if XPM_BACKGROUND	3916	#if XPM_BACKGROUND
3926	changed += scale_pixmap (str);	3917	changed += scale_pixmap (str);
3927	#endif	3918	#endif
3928	}	3919	}
3929		3920
3930	if (changed)	3921	if (changed)
3931	{	3922	{
3932	#ifdef XPM_BACKGROUND	3923	#ifdef XPM_BACKGROUND
3933	resize_pixmap ();	3924	resize_pixmap ();
3934	#endif
3935	scr_touch (true);	3925	scr_touch (true);
		3926	#endif
3936	}	3927	}
		3928	}
3937	break;	3929	break;
3938		3930
3939	case XTerm_restoreFG:	3931	case Rxvt_restoreFG:
3940	set_window_color (Color_fg, str);	3932	set_window_color (Color_fg, str);
3941	break;	3933	break;
3942	case XTerm_restoreBG:	3934	case Rxvt_restoreBG:
3943	set_window_color (Color_bg, str);	3935	set_window_color (Color_bg, str);
3944	break;	3936	break;
3945		3937
3946	case XTerm_logfile:	3938	case XTerm_logfile:
3947	// TODO, when secure mode?	3939	// TODO, when secure mode?
3948	break;	3940	break;
3949		3941
3950	#ifdef MENUBAR
3951	case URxvt_Menu:
3952	if (OPTION (Opt_insecure))
3953	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954	break;
3955	#endif
3956	#if 0	3942	#if 0
3957	case XTerm_dumpscreen: /* no error notices */	3943	case Rxvt_dumpscreen: /* no error notices */
3958	{	3944	{
3959	int fd;	3945	int fd;
3960	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3946	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3961	{	3947	{
3962	scr_dump (fd);	3948	scr_dump (fd);
…		…
3993	if (query)	3979	if (query)
3994	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3980	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3995	else	3981	else
3996	{	3982	{
3997	set_locale (str);	3983	set_locale (str);
3998	pty.set_utf8_mode (enc_utf8);	3984	pty->set_utf8_mode (enc_utf8);
3999	init_xlocale ();	3985	init_xlocale ();
4000	}	3986	}
4001	break;	3987	break;
4002		3988
4003	case URxvt_view_up:	3989	case URxvt_view_up:
…		…
4014	break;	4000	break;
4015	#endif	4001	#endif
4016		4002
4017	#if ENABLE_PERL	4003	#if ENABLE_PERL
4018	case URxvt_perl:	4004	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4005	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	4006	; // no responses yet
4021	break;	4007	break;
4022	#endif	4008	#endif
4023	}	4009	}
4024	}	4010	}
…		…
4077	{ 5, PrivMode_rVideo },	4063	{ 5, PrivMode_rVideo },
4078	{ 6, PrivMode_relOrigin },	4064	{ 6, PrivMode_relOrigin },
4079	{ 7, PrivMode_Autowrap },	4065	{ 7, PrivMode_Autowrap },
4080	// 8, bi-directional support mode	4066	// 8, bi-directional support mode
4081	{ 9, PrivMode_MouseX10 },	4067	{ 9, PrivMode_MouseX10 },
4082	#ifdef menuBar_esc
4083	{ menuBar_esc, PrivMode_menuBar },
4084	#endif
4085	// 18, 19 printing-related	4068	// 18, 19 printing-related
4086	{ 25, PrivMode_VisibleCursor },	4069	{ 25, PrivMode_VisibleCursor },
4087	#ifdef scrollBar_esc	4070	#ifdef scrollBar_esc
4088	{ scrollBar_esc, PrivMode_scrollBar },	4071	{ scrollBar_esc, PrivMode_scrollBar },
4089	#endif	4072	#endif
…		…
4136	/* extra handling for values with state unkept */	4119	/* extra handling for values with state unkept */
4137	switch (arg[i])	4120	switch (arg[i])
4138	{	4121	{
4139	#if ENABLE_STYLES	4122	#if ENABLE_STYLES
4140	case 1021:	4123	case 1021:
4141	if (mode)	4124	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4125
4146	scr_touch (true);	4126	scr_touch (true);
4147	break;	4127	break;
4148	#endif	4128	#endif
4149	case 1048: /* alternative cursor save */	4129	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4151	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4152	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4153	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4154	break;
4175	case 4: /* smooth scrolling */	4155	case 4: /* smooth scrolling */
4176	if (!state)	4156	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4157	break;
4181	case 5: /* reverse video */	4158	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4159	scr_rvideo_mode (state);
4183	break;	4160	break;
4184	case 6: /* relative/absolute origins */	4161	case 6: /* relative/absolute origins */
…		…
4190	/* case 8: - auto repeat, can't do on a per window basis */	4167	/* case 8: - auto repeat, can't do on a per window basis */
4191	case 9: /* X10 mouse reporting */	4168	case 9: /* X10 mouse reporting */
4192	if (state) /* orthogonal */	4169	if (state) /* orthogonal */
4193	priv_modes &= ~PrivMode_MouseX11;	4170	priv_modes &= ~PrivMode_MouseX11;
4194	break;	4171	break;
4195	#ifdef menuBar_esc
4196	case menuBar_esc:
4197	#ifdef MENUBAR
4198	map_menuBar (state);
4199	#endif
4200	break;
4201	#endif
4202	#ifdef scrollBar_esc	4172	#ifdef scrollBar_esc
4203	case scrollBar_esc:	4173	case scrollBar_esc:
4204	if (scrollbar_mapping (state))	4174	if (scrollbar_mapping (state))
4205	{	4175	{
4206	resize_all_windows (0, 0, 0);	4176	resize_all_windows (0, 0, 0);
…		…
4225	#if 0	4195	#if 0
4226	case 1001:	4196	case 1001:
4227	break; /* X11 mouse highlighting */	4197	break; /* X11 mouse highlighting */
4228	#endif	4198	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4199	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4200	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4201	break;
4235	case 1011: /* scroll to bottom on key press */	4202	case 1011: /* scroll to bottom on key press */
4236	if (state)	4203	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4204	break;
4241	case 1047: /* secondary screen w/ clearing last */	4205	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4206	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4207	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4208	scr_erase_screen (2);
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4418	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4419
4456	void	4420	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4421	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4422	{
		4423	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4424	return;
		4425
		4426	if (pty->pty < 0)
		4427	return;
		4428
4459	if (v_buflen == 0)	4429	if (v_buflen == 0)
4460	{	4430	{
4461	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4431	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4462		4432
4463	if ((unsigned int)written == len)	4433	if ((unsigned int)written == len)
4464	return;	4434	return;
4465		4435
4466	data += written;	4436	data += written;
…		…
4475	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4445	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4476	}	4446	}
4477		4447
4478	void rxvt_term::pty_write ()	4448	void rxvt_term::pty_write ()
4479	{	4449	{
4480	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4450	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4481		4451
4482	if (written > 0)	4452	if (written > 0)
4483	{	4453	{
4484	v_buflen -= written;	4454	v_buflen -= written;
4485		4455

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.238 by root, Fri Jan 6 02:58:02 2006 UTC vs. Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.238 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC