D2356.id4982.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2356.id4982.diff
View Options

	Index: head/sys/dev/vt/vt_core.c
	===================================================================
	--- head/sys/dev/vt/vt_core.c
	+++ head/sys/dev/vt/vt_core.c
	@@ -1029,7 +1029,7 @@
	int
	vt_is_cursor_in_area(const struct vt_device vd, const term_rect_t area)
	{
	- unsigned int mx, my, x1, y1, x2, y2;
	+ unsigned int mx, my;

	/*
	* We use the cursor position saved during the current refresh,
	@@ -1038,18 +1038,12 @@
	mx = vd->vd_mx_drawn + vd->vd_curwindow->vw_draw_area.tr_begin.tp_col;
	my = vd->vd_my_drawn + vd->vd_curwindow->vw_draw_area.tr_begin.tp_row;

	- x1 = area->tr_begin.tp_col;
	- y1 = area->tr_begin.tp_row;
	- x2 = area->tr_end.tp_col;
	- y2 = area->tr_end.tp_row;
	-
	- if (((mx >= x1 && x2 - 1 >= mx) \|\|
	- (mx < x1 && mx + vd->vd_mcursor->width >= x1)) &&
	- ((my >= y1 && y2 - 1 >= my) \|\|
	- (my < y1 && my + vd->vd_mcursor->height >= y1)))
	- return (1);
	-
	- return (0);
	+ if (mx >= area->tr_end.tp_col \|\|
	+ mx + vd->vd_mcursor->width <= area->tr_begin.tp_col \|\|
	+ my >= area->tr_end.tp_row \|\|
	+ my + vd->vd_mcursor->height <= area->tr_begin.tp_row)
	+ return (0);
	+ return (1);
	}

	static void