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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

…		…
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, Sel_Primary);
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_STR_LEN, kbuf, len, DT_END)))	872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	873	return;
874		874
875	if (len <= 0)	875	if (len <= 0)
876	return; /* not mapped */	876	return; /* not mapped */
877		877
…		…
919	#endif /* DEBUG_CMD */	919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	920	tt_write (kbuf, (unsigned int)len);
921	}	921	}
922	/}}} /	922	/}}} /
923		923
924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	924	#if defined (KEYSYM_RESOURCE)
925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
926	/* attempt to `write' count to the input buffer */
927	unsigned int	925	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	926	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	927	{
930	unsigned int n, s;	928	unsigned int n, s;
931		929
…		…
972		970
973	if (want_refresh)	971	if (want_refresh)
974	{	972	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	973	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	974	{
977	int row = -view_start;	975	int row = view_start;
		976	int end_row = row + nrow;
978		977
979	while (row > -nsaved && ROW (row - 1).is_longer ())	978	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	979	--row;
981		980
982	while (row < -view_start + nrow)	981	do
983	{	982	{
984	int start_row = row;	983	int start_row = row;
985	line_t *l;	984	line_t *l;
986		985
987	do	986	do
988	{	987	{
989	l = &ROW (row);	988	l = &ROW (row++);
990		989
991	if (!(l->f & LINE_FILTERED))	990	if (!(l->f & LINE_FILTERED))
992	{	991	{
993	// line not filtered, mark it as filtered	992	// line not filtered, mark it as filtered
994	l->f \|= LINE_FILTERED;	993	l->f \|= LINE_FILTERED;
995	while (l->is_longer ())	994	while (l->is_longer ())
996	{	995	{
997	l = &ROW (++row);	996	l = &ROW (row++);
998	l->f \|= LINE_FILTERED;	997	l->f \|= LINE_FILTERED;
999	}	998	}
1000		999
1001	// and filter it	1000	// and filter it
1002	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));
1003		1002
1004	break;	1003	break;
1005	}	1004	}
1006	}	1005	}
1007	while (l->is_longer ());	1006	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	1007	}
		1008	while (row < end_row);
1011		1009	}
1012	}
1013		1010
1014	scr_refresh (refresh_type);	1011	scr_refresh ();
1015	scrollbar_show (1);	1012	scrollbar_show (1);
1016	#ifdef USE_XIM	1013	#ifdef USE_XIM
1017	IMSendSpot ();	1014	IMSendSpot ();
1018	#endif	1015	#endif
1019	}	1016	}
…		…
1022	}	1019	}
1023		1020
1024	void	1021	void
1025	rxvt_term::check_cb (check_watcher &w)	1022	rxvt_term::check_cb (check_watcher &w)
1026	{	1023	{
1027	SET_R (this);	1024	make_current ();
1028	SET_LOCALE (locale);
1029		1025
1030	display->flush ();	1026	display->flush ();
1031		1027
1032	if (want_refresh && !flush_ev.active)	1028	if (want_refresh && !flush_ev.active)
1033	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
1034	}	1030	}
1035		1031
1036	void	1032	void
1037	rxvt_term::flush_cb (time_watcher &w)	1033	rxvt_term::flush_cb (time_watcher &w)
1038	{	1034	{
1039	SET_R (this);	1035	make_current ();
1040	SET_LOCALE (locale);
1041		1036
1042	refresh_limit = 1;	1037	refresh_limit = 1;
1043	refresh_count = 0;	1038	refresh_count = 0;
1044	flush ();	1039	flush ();
1045	}	1040	}
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1068	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1069	{
1075	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1070	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1071	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1072	{
1078	refresh_type \|= SMOOTH_REFRESH;
1079	want_refresh = 1;	1073	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1074	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1075	}
1082	}	1076	}
1083	#endif	1077	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1081	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1082	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1083	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1084	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1085	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type \|= SMOOTH_REFRESH;
1093	want_refresh = 1;	1086	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1087	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1088	}
1096	}	1089	}
1097	#endif	1090	#endif
…		…
1102	{	1095	{
1103	if (mouse_slip_wheel_speed == 0	1096	if (mouse_slip_wheel_speed == 0
1104	\|\| 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)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1098	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1099	{
1107	if (view_start == nsaved \|\|	1100	if (view_start == top_row \|\| view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1101	mouse_slip_wheel_speed = 0;
1110		1102
1111	refresh_type \|= SMOOTH_REFRESH;
1112	want_refresh = 1;	1103	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1105	}
1115	}	1106	}
1116	#endif	1107	#endif
…		…
1146		1137
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1138	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1139	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1140	cmdbuf_endp = cmdbuf_ptr + n;
1150		1141
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1142	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1143
1153	if (r > 0)	1144	if (r > 0)
1154	{	1145	{
1155	cmdbuf_endp += r;	1146	cmdbuf_endp += r;
1156	return true;	1147	return true;
…		…
1174	}	1165	}
1175		1166
1176	void	1167	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1168	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1169	{
1179	SET_R (this);	1170	make_current ();
1180	SET_LOCALE (locale);
1181		1171
1182	if (revents & EVENT_READ)	1172	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1173	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1174	while (pty_fill ())
1185	if (cmd_parse ())	1175	if (cmd_parse ())
…		…
1217	}	1207	}
1218		1208
1219	void	1209	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1210	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1211	{
1222	SET_R (this);	1212	make_current ();
1223	SET_LOCALE (locale);
1224		1213
1225	pointer_blank ();	1214	pointer_blank ();
1226	}	1215	}
1227	#endif	1216	#endif
1228		1217
…		…
1307		1296
1308	/{{{ process an X event /	1297	/{{{ process an X event /
1309	void	1298	void
1310	rxvt_term::x_cb (XEvent &ev)	1299	rxvt_term::x_cb (XEvent &ev)
1311	{	1300	{
		1301	make_current ();
		1302
1312	dDisp;	1303	dDisp;
1313		1304
1314	SET_R (this);	1305	if (ev.xany.window == vt
1315	SET_LOCALE (locale);	1306	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1308	return;
1316		1309
1317	#if defined(CURSOR_BLINK)	1310	// for XQueryPointer
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319	{
1320	if (hidden_cursor)
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327	}
1328	#endif
1329
1330	#if defined(POINTER_BLANK)
1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332	{
1333	if (ev.type == MotionNotify
1334	\|\| ev.type == ButtonPress
1335	\|\| ev.type == ButtonRelease)
1336	if (hidden_pointer)
1337	pointer_unblank ();
1338
1339	if (ev.type == KeyPress && hidden_pointer == 0)
1340	pointer_blank ();
1341	}
1342	#endif
1343
1344	Window unused_root, unused_child;	1311	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1312	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1313	unsigned int unused_mask;
1347		1314
1348	switch (ev.type)	1315	switch (ev.type)
…		…
1355		1322
1356	break;	1323	break;
1357		1324
1358	case KeyRelease:	1325	case KeyRelease:
1359	{	1326	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1327	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1328	KeySym keysym;
1362		1329
1363	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 :/
1364	#endif	1331	#endif
1365		1332
1366	#if ENABLE_FRILLS \|\| ISO_14755	1333	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1334	// ISO 14755 support
1368	if (iso14755buf)	1335	if (iso14755buf)
…		…
1373	# endif	1340	# endif
1374	# if ISO_14755	1341	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1342	// iso14755 part 5.2 handling: release time
1376	// first: controls	1343	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1344	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1345	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1346	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1347	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1348	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1349	commit_iso14755 ();
1383	return; // case-break;	1350	goto skip_switch;
1384	}	1351	}
1385		1352
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1353	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1354	if (i[0] == keysym)
1388	{	1355	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1356	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1357	commit_iso14755 ();
1391	return; // case-break;	1358	goto skip_switch;
1392	}	1359	}
1393		1360
1394	scr_bell ();	1361	scr_bell ();
1395	# endif	1362	# endif
1396	iso14755buf = 0;	1363	iso14755buf = 0;
…		…
1416	iso14755buf = 0;	1383	iso14755buf = 0;
1417	}	1384	}
1418	#endif	1385	#endif
1419		1386
1420	if (ev.xany.window == vt	1387	if (ev.xany.window == vt
1421	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1388	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1422	break;	1389	break;
1423		1390
1424	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1391	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425	if (!(ev.xkey.state & ControlMask))	1392	if (!(ev.xkey.state & ControlMask))
1426	slip_wheel_ev.stop ();	1393	slip_wheel_ev.stop ();
1427	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1394	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1428	mouse_slip_wheel_speed = 0;	1395	mouse_slip_wheel_speed = 0;
1429	#endif	1396	#endif
1430	break;	1397	break;
1431	}	1398	}
1432		1399
…		…
1535	{	1502	{
1536	seen_resize = 1;	1503	seen_resize = 1;
1537	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538	}	1505	}
1539		1506
		1507	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1508
1540	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1509	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541	if (OPTION (Opt_transparent))	1510	if (OPTION (Opt_transparent))
1542	check_our_parents ();	1511	check_our_parents ();
1543	#endif	1512	#endif
1544	}	1513	}
…		…
1562		1531
1563	case SelectionRequest:	1532	case SelectionRequest:
1564	selection_send (ev.xselectionrequest);	1533	selection_send (ev.xselectionrequest);
1565	break;	1534	break;
1566		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
1567	case UnmapNotify:	1544	case UnmapNotify:
1568	mapped = 0;	1545	mapped = 0;
1569	#ifdef TEXT_BLINK	1546	#ifdef TEXT_BLINK
1570	text_blink_ev.stop ();	1547	text_blink_ev.stop ();
1571	#endif	1548	#endif
1572	break;	1549	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574	case MapNotify:
1575	mapped = 1;
1576	#ifdef TEXT_BLINK
1577	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578	#endif
1579	break;	1550	break;
1580		1551
1581	#ifdef TRANSPARENT	1552	#ifdef TRANSPARENT
1582	case ReparentNotify:	1553	case ReparentNotify:
1583	rootwin_cb (ev);	1554	rootwin_cb (ev);
…		…
1597		1568
1598	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1599	scr_expose (ev.xexpose.x, ev.xexpose.y,	1570	scr_expose (ev.xexpose.x, ev.xexpose.y,
1600	ev.xexpose.width, ev.xexpose.height, False);	1571	ev.xexpose.width, ev.xexpose.height, False);
1601		1572
1602	scr_refresh (refresh_type);	1573	want_refresh = 1;
1603	}	1574	}
1604	else	1575	else
1605	{	1576	{
1606	XEvent unused_event;	1577	XEvent unused_event;
1607		1578
…		…
1613	if (isScrollbarWindow (ev.xany.window))	1584	if (isScrollbarWindow (ev.xany.window))
1614	{	1585	{
1615	scrollBar.setIdle ();	1586	scrollBar.setIdle ();
1616	scrollbar_show (0);	1587	scrollbar_show (0);
1617	}	1588	}
1618	#ifdef MENUBAR
1619	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620	menubar_expose ();
1621	#endif
1622		1589
1623	#ifdef TRANSPARENT	1590	#ifdef TRANSPARENT
1624	if (am_transparent && ev.xany.window == parent[0])	1591	if (am_transparent && ev.xany.window == parent[0])
1625	XClearWindow (disp, ev.xany.window);	1592	XClearWindow (disp, ev.xany.window);
1626	#endif	1593	#endif
…		…
1630	case MotionNotify:	1597	case MotionNotify:
1631	#ifdef POINTER_BLANK	1598	#ifdef POINTER_BLANK
1632	if (hidden_pointer)	1599	if (hidden_pointer)
1633	pointer_unblank ();	1600	pointer_unblank ();
1634	#endif	1601	#endif
1635	#if MENUBAR
1636	if (isMenuBarWindow (ev.xany.window))
1637	{
1638	menubar_control (ev.xbutton);
1639	break;
1640	}
1641	#endif
1642	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1602	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643	break;	1603	break;
1644		1604
1645	if (ev.xany.window == vt)	1605	if (ev.xany.window == vt)
1646	{	1606	{
		1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648	; // nop	1609	; // nop
1649	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1650	{	1611	{
1651	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1652	;	1613	;
…		…
1734	&unused_root_x, &unused_root_y,	1695	&unused_root_x, &unused_root_y,
1735	&ev.xbutton.x, &ev.xbutton.y,	1696	&ev.xbutton.x, &ev.xbutton.y,
1736	&unused_mask);	1697	&unused_mask);
1737	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738	scrollbar_size ());	1699	scrollbar_size ());
1739	scr_refresh (refresh_type);	1700	want_refresh = 1;
1740	refresh_limit = 0;	1701	refresh_limit = 0;
1741	scrollbar_show (1);	1702	scrollbar_show (1);
1742	}	1703	}
1743	break;	1704	break;
1744	}	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
1745	}	1735	}
1746		1736
1747	void	1737	void
1748	rxvt_term::focus_in ()	1738	rxvt_term::focus_in ()
1749	{	1739	{
…		…
1815		1805
1816	#if TRANSPARENT	1806	#if TRANSPARENT
1817	void	1807	void
1818	rxvt_term::rootwin_cb (XEvent &ev)	1808	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1809	{
1820	SET_R (this);	1810	make_current ();
1821	SET_LOCALE (locale);
1822		1811
1823	switch (ev.type)	1812	switch (ev.type)
1824	{	1813	{
1825	case PropertyNotify:	1814	case PropertyNotify:
1826	/*	1815	/*
…		…
1917	#else	1906	#else
1918	selection.rect = false;	1907	selection.rect = false;
1919	#endif	1908	#endif
1920		1909
1921	/* allow shift+left click to extend selection */	1910	/* allow shift+left click to extend selection */
1922	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923	{	1912	{
1924	if (MEvent.button == Button1 && clickintime)	1913	if (MEvent.button == Button1 && clickintime)
1925	selection_rotate (ev.x, ev.y);	1914	selection_rotate (ev.x, ev.y);
1926	else	1915	else
1927	selection_extend (ev.x, ev.y, 1);	1916	selection_extend (ev.x, ev.y, 1);
…		…
2095	}	2084	}
2096	}	2085	}
2097		2086
2098	return;	2087	return;
2099	}	2088	}
2100
2101	#if MENUBAR
2102	/*
2103	* Menubar window processing of button press
2104	*/
2105	if (isMenuBarWindow (ev.window))
2106	menubar_control (ev);
2107	#endif
2108	}	2089	}
2109		2090
2110	void	2091	void
2111	rxvt_term::button_release (XButtonEvent &ev)	2092	rxvt_term::button_release (XButtonEvent &ev)
2112	{	2093	{
…		…
2118		2099
2119	if (scrollbar_isUpDn ())	2100	if (scrollbar_isUpDn ())
2120	{	2101	{
2121	scrollBar.setIdle ();	2102	scrollBar.setIdle ();
2122	scrollbar_show (0);	2103	scrollbar_show (0);
2123	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124	refresh_type &= ~SMOOTH_REFRESH;
2125	#endif
2126	}	2104	}
2127		2105
2128	#ifdef SELECTION_SCROLLING	2106	#ifdef SELECTION_SCROLLING
2129	if (sel_scroll_ev.active)	2107	if (sel_scroll_ev.active)
2130	sel_scroll_ev.stop();	2108	sel_scroll_ev.stop();
…		…
2177	{	2155	{
2178	case Button1:	2156	case Button1:
2179	case Button3:	2157	case Button3:
2180	selection_make (ev.time);	2158	selection_make (ev.time);
2181	break;	2159	break;
		2160
2182	case Button2:	2161	case Button2:
2183	selection_request (ev.time, ev.x, ev.y);	2162	if (IN_RANGE_EXC (ev.x, 0, width)
		2163	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2164	{
		2165	if (ev.state & ShiftMask)
		2166	selection_request (ev.time, Sel_Clipboard);
		2167	else
		2168	selection_request (ev.time, Sel_Primary);
		2169	}
2184	break;	2170	break;
		2171
2185	#ifdef MOUSE_WHEEL	2172	#ifdef MOUSE_WHEEL
2186	case Button4:	2173	case Button4:
2187	case Button5:	2174	case Button5:
2188	{	2175	{
2189	int i;	2176	int i;
…		…
2211	slip_wheel_ev.start ();	2198	slip_wheel_ev.start ();
2212	}	2199	}
2213	else	2200	else
2214	{	2201	{
2215	# endif	2202	# endif
2216	# ifdef JUMP_MOUSE_WHEEL
2217	scr_page (v, i);	2203	scr_page (v, i);
2218	scr_refresh (SMOOTH_REFRESH);
2219	scrollbar_show (1);	2204	scrollbar_show (1);
2220	# else
2221	while (i--)
2222	{
2223	scr_page (v, 1);
2224	scr_refresh (SMOOTH_REFRESH);
2225	scrollbar_show (1);
2226	}
2227	# endif
2228	# ifdef MOUSE_SLIP_WHEELING	2205	# ifdef MOUSE_SLIP_WHEELING
2229	}	2206	}
2230	#endif	2207	# endif
2231	}	2208	}
2232	break;	2209	break;
2233	#endif	2210	#endif
2234	}	2211	}
2235	}	2212	}
2236	#ifdef MENUBAR
2237	else if (isMenuBarWindow (ev.window))
2238	menubar_control (ev);
2239	#endif
2240	}	2213	}
2241		2214
2242	#ifdef TRANSPARENT	2215	#ifdef TRANSPARENT
2243	#if TINTING	2216	#if TINTING
2244	/* taken from aterm-0.4.2 */	2217	/* taken from aterm-0.4.2 */
…		…
2787	}	2760	}
2788		2761
2789	// scr_add_lines only works for nlines <= nrow - 1.	2762	// scr_add_lines only works for nlines <= nrow - 1.
2790	if (nlines >= nrow - 1)	2763	if (nlines >= nrow - 1)
2791	{	2764	{
		2765	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2766	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793	scr_add_lines (buf, str - buf, nlines);	2767	scr_add_lines (buf, str - buf, nlines);
2794		2768
2795	nlines = 0;	2769	nlines = 0;
2796	str = buf;	2770	str = buf;
2797	eol = str + min (ncol, UBUFSIZ);	2771	eol = str + min (ncol, UBUFSIZ);
…		…
2812		2786
2813	seq_begin = cmdbuf_ptr;	2787	seq_begin = cmdbuf_ptr;
2814	ch = next_char ();	2788	ch = next_char ();
2815	}	2789	}
2816		2790
		2791	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2792	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818	scr_add_lines (buf, str - buf, nlines);	2793	scr_add_lines (buf, str - buf, nlines);
2819		2794
2820	/*	2795	/*
2821	* If there have been a lot of new lines, then update the screen	2796	* If there have been a lot of new lines, then update the screen
2822	* What the heck I'll cheat and only refresh less than every page-full.	2797	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2828	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2803	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829	refresh_limit++;	2804	refresh_limit++;
2830	else	2805	else
2831	{	2806	{
2832	flag = true;	2807	flag = true;
2833	scr_refresh (refresh_type);	2808	scr_refresh ();
2834	flush_ev.stop ();	2809	want_refresh = 1;
2835	}	2810	}
2836	}	2811	}
2837		2812
2838	}	2813	}
2839	else	2814	else
…		…
3800	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3775	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3801	*/	3776	*/
3802	void	3777	void
3803	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3778	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804	{	3779	{
3805	int changed = 0;
3806	int color;	3780	int color;
3807	char buf, name;	3781	char buf, name;
3808	bool query = str[0] == '?' && !str[1];	3782	bool query = str[0] == '?' && !str[1];
3809	int saveop = op;	3783	int saveop = op;
3810	dDisp;	3784	dDisp;
…		…
3865	{	3839	{
3866	if ((name = strchr (buf, ';')) == NULL)	3840	if ((name = strchr (buf, ';')) == NULL)
3867	break;	3841	break;
3868		3842
3869	*name++ = '\0';	3843	*name++ = '\0';
3870	color = atoi (buf);	3844	color = atoi (buf) + minCOLOR;
3871		3845
3872	if (color < 0 \|\| color >= TOTAL_COLORS)	3846	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873	break;	3847	break;
3874		3848
3875	if ((buf = strchr (name, ';')) != NULL)	3849	if ((buf = strchr (name, ';')) != NULL)
3876	*buf++ = '\0';	3850	*buf++ = '\0';
3877		3851
3878	if (name[0] == '?' && !name[1])	3852	if (name[0] == '?' && !name[1])
3879	{	3853	{
3880	unsigned short r, g, b;	3854	unsigned short r, g, b;
3881	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3855	pix_colors_focused[color].get (display, r, g, b);
3882	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3856	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883	}	3857	}
3884	else	3858	else
3885	set_window_color (color + minCOLOR, name);	3859	set_window_color (color, name);
3886	}	3860	}
3887	break;	3861	break;
3888	case XTerm_Color00:	3862	case XTerm_Color00:
3889	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3863	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3890	break;	3864	break;
3891	case XTerm_Color01:	3865	case XTerm_Color01:
3892	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3866	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3893	break;	3867	break;
3894	#ifndef NO_CURSORCOLOR	3868	#ifndef NO_CURSORCOLOR
3895	case XTerm_Color_cursor:	3869	case XTerm_Color_cursor:
3896	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3870	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3897	break;	3871	break;
…		…
3901	break;	3875	break;
3902	case XTerm_Color_pointer_bg:	3876	case XTerm_Color_pointer_bg:
3903	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3877	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3904	break;	3878	break;
3905	#ifndef NO_BOLD_UNDERLINE_REVERSE	3879	#ifndef NO_BOLD_UNDERLINE_REVERSE
3906	case XTerm_Color_BD:
3907	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908	break;
3909	case XTerm_Color_UL:
3910	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911	break;
3912	case XTerm_Color_RV:	3880	case XTerm_Color_RV:
3913	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3881	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3882	break;
		3883	case Rxvt_Color_BD:
		3884	case URxvt_Color_BD:
		3885	process_color_seq (op, Color_BD, str, resp);
		3886	break;
		3887	case Rxvt_Color_UL:
		3888	case URxvt_Color_UL:
		3889	process_color_seq (op, Color_UL, str, resp);
3914	break;	3890	break;
3915	case URxvt_Color_IT:	3891	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3892	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917	break;	3893	break;
3918	#endif	3894	#endif
…		…
3923	if (am_transparent)	3899	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3900	want_full_refresh = want_refresh = 1;
3925	break;	3901	break;
3926	#endif	3902	#endif
3927		3903
3928	case XTerm_Pixmap:	3904	case Rxvt_Pixmap:
		3905	{
3929	if (*str != ';')	3906	if (*str != ';')
3930	{	3907	{
3931	#if XPM_BACKGROUND	3908	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3909	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3910	set_bgPixmap (str); /* change pixmap */
3934	#endif
3935	scr_touch (true);	3911	scr_touch (true);
		3912	#endif
3936	}	3913	}
		3914
		3915	int changed = 0;
		3916
3937	while ((str = strchr (str, ';')) != NULL)	3917	while ((str = strchr (str, ';')) != NULL)
3938	{	3918	{
3939	str++;	3919	str++;
3940	#if XPM_BACKGROUND	3920	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3921	changed += scale_pixmap (str);
3942	#endif	3922	#endif
3943	}	3923	}
3944		3924
3945	if (changed)	3925	if (changed)
3946	{	3926	{
3947	#ifdef XPM_BACKGROUND	3927	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3928	resize_pixmap ();
3949	#endif
3950	scr_touch (true);	3929	scr_touch (true);
		3930	#endif
3951	}	3931	}
		3932	}
3952	break;	3933	break;
3953		3934
3954	case XTerm_restoreFG:	3935	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3936	set_window_color (Color_fg, str);
3956	break;	3937	break;
3957	case XTerm_restoreBG:	3938	case Rxvt_restoreBG:
3958	set_window_color (Color_bg, str);	3939	set_window_color (Color_bg, str);
3959	break;	3940	break;
3960		3941
3961	case XTerm_logfile:	3942	case XTerm_logfile:
3962	// TODO, when secure mode?	3943	// TODO, when secure mode?
3963	break;	3944	break;
3964		3945
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3946	#if 0
3972	case XTerm_dumpscreen: /* no error notices */	3947	case Rxvt_dumpscreen: /* no error notices */
3973	{	3948	{
3974	int fd;	3949	int fd;
3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3950	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3976	{	3951	{
3977	scr_dump (fd);	3952	scr_dump (fd);
…		…
4008	if (query)	3983	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3984	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3985	else
4011	{	3986	{
4012	set_locale (str);	3987	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3988	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3989	init_xlocale ();
4015	}	3990	}
4016	break;	3991	break;
4017		3992
4018	case URxvt_view_up:	3993	case URxvt_view_up:
…		…
4092	{ 5, PrivMode_rVideo },	4067	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4068	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4069	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4070	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4071	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4072	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4073	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4074	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4075	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4076	#endif
…		…
4151	/* extra handling for values with state unkept */	4123	/* extra handling for values with state unkept */
4152	switch (arg[i])	4124	switch (arg[i])
4153	{	4125	{
4154	#if ENABLE_STYLES	4126	#if ENABLE_STYLES
4155	case 1021:	4127	case 1021:
4156	if (mode)	4128	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4129
4161	scr_touch (true);	4130	scr_touch (true);
4162	break;	4131	break;
4163	#endif	4132	#endif
4164	case 1048: /* alternative cursor save */	4133	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4155	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4156	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4157	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4158	break;
4190	case 4: /* smooth scrolling */	4159	case 4: /* smooth scrolling */
4191	if (!state)	4160	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4161	break;
4196	case 5: /* reverse video */	4162	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4163	scr_rvideo_mode (state);
4198	break;	4164	break;
4199	case 6: /* relative/absolute origins */	4165	case 6: /* relative/absolute origins */
…		…
4205	/* case 8: - auto repeat, can't do on a per window basis */	4171	/* case 8: - auto repeat, can't do on a per window basis */
4206	case 9: /* X10 mouse reporting */	4172	case 9: /* X10 mouse reporting */
4207	if (state) /* orthogonal */	4173	if (state) /* orthogonal */
4208	priv_modes &= ~PrivMode_MouseX11;	4174	priv_modes &= ~PrivMode_MouseX11;
4209	break;	4175	break;
4210	#ifdef menuBar_esc
4211	case menuBar_esc:
4212	#ifdef MENUBAR
4213	map_menuBar (state);
4214	#endif
4215	break;
4216	#endif
4217	#ifdef scrollBar_esc	4176	#ifdef scrollBar_esc
4218	case scrollBar_esc:	4177	case scrollBar_esc:
4219	if (scrollbar_mapping (state))	4178	if (scrollbar_mapping (state))
4220	{	4179	{
4221	resize_all_windows (0, 0, 0);	4180	resize_all_windows (0, 0, 0);
…		…
4240	#if 0	4199	#if 0
4241	case 1001:	4200	case 1001:
4242	break; /* X11 mouse highlighting */	4201	break; /* X11 mouse highlighting */
4243	#endif	4202	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4203	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4204	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4205	break;
4250	case 1011: /* scroll to bottom on key press */	4206	case 1011: /* scroll to bottom on key press */
4251	if (state)	4207	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4208	break;
4256	case 1047: /* secondary screen w/ clearing last */	4209	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4210	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4211	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4212	scr_erase_screen (2);
…		…
4469	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4422	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470		4423
4471	void	4424	void
4472	rxvt_term::tt_write (const char *data, unsigned int len)	4425	rxvt_term::tt_write (const char *data, unsigned int len)
4473	{	4426	{
4474	if (pty.pty < 0)	4427	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475	return;	4428	return;
4476		4429
		4430	if (pty->pty < 0)
		4431	return;
		4432
4477	if (v_buflen == 0)	4433	if (v_buflen == 0)
4478	{	4434	{
4479	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4435	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480		4436
4481	if ((unsigned int)written == len)	4437	if ((unsigned int)written == len)
4482	return;	4438	return;
4483		4439
4484	data += written;	4440	data += written;
…		…
4493	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4449	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4494	}	4450	}
4495		4451
4496	void rxvt_term::pty_write ()	4452	void rxvt_term::pty_write ()
4497	{	4453	{
4498	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4454	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499		4455
4500	if (written > 0)	4456	if (written > 0)
4501	{	4457	{
4502	v_buflen -= written;	4458	v_buflen -= written;
4503		4459

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.246 by root, Fri Jan 6 18:36:21 2006 UTC vs. Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC