From owner-svn-src-user@FreeBSD.ORG Thu Nov 14 13:25:48 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99349CF1; Thu, 14 Nov 2013 13:25:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A3BA2ABF; Thu, 14 Nov 2013 13:25:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAEDPmTu033039; Thu, 14 Nov 2013 13:25:48 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAEDPl4N033036; Thu, 14 Nov 2013 13:25:47 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201311141325.rAEDPl4N033036@svn.freebsd.org> From: Aleksandr Rybalko Date: Thu, 14 Nov 2013 13:25:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258130 - user/ed/newcons/sys/dev/vt X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 13:25:48 -0000 Author: ray Date: Thu Nov 14 13:25:47 2013 New Revision: 258130 URL: http://svnweb.freebsd.org/changeset/base/258130 Log: Save last mouse event and check if the button1-up event happen w/o movement, then ignore it. Otherwise such events broke double/triple click sequence. Sponsored by: The FreeBSD Foundation Modified: user/ed/newcons/sys/dev/vt/vt.h user/ed/newcons/sys/dev/vt/vt_buf.c user/ed/newcons/sys/dev/vt/vt_core.c Modified: user/ed/newcons/sys/dev/vt/vt.h ============================================================================== --- user/ed/newcons/sys/dev/vt/vt.h Thu Nov 14 12:14:27 2013 (r258129) +++ user/ed/newcons/sys/dev/vt/vt.h Thu Nov 14 13:25:47 2013 (r258130) @@ -160,6 +160,7 @@ struct vt_buf { term_pos_t vb_cursor; /* (u) Cursor position. */ term_pos_t vb_mark_start; /* (b) Copy region start. */ term_pos_t vb_mark_end; /* (b) Copy region end. */ + int vb_mark_last; /* Last mouse event. */ term_rect_t vb_dirtyrect; /* (b) Dirty rectangle. */ struct vt_bufmask vb_dirtymask; /* (b) Dirty bitmasks. */ term_char_t *vb_buffer; /* (u) Data buffer. */ @@ -189,6 +190,7 @@ void vtbuf_extract_marked(struct vt_buf #define VTB_MARK_WORD 3 #define VTB_MARK_ROW 4 #define VTB_MARK_EXTEND 5 +#define VTB_MARK_MOVE 6 #define VTBUF_SLCK_ENABLE(vb) vtbuf_scroll_mode((vb), 1) #define VTBUF_SLCK_DISABLE(vb) vtbuf_scroll_mode((vb), 0) Modified: user/ed/newcons/sys/dev/vt/vt_buf.c ============================================================================== --- user/ed/newcons/sys/dev/vt/vt_buf.c Thu Nov 14 12:14:27 2013 (r258129) +++ user/ed/newcons/sys/dev/vt/vt_buf.c Thu Nov 14 13:25:47 2013 (r258130) @@ -627,7 +627,11 @@ vtbuf_set_mark(struct vt_buf *vb, int ty { switch (type) { - case VTB_MARK_END: + case VTB_MARK_END: /* B1 UP */ + if (vb->vb_mark_last != VTB_MARK_MOVE) + return (0); + /* FALLTHROUGH */ + case VTB_MARK_MOVE: case VTB_MARK_EXTEND: vtbuf_flush_mark(vb); /* Clean old mark. */ vb->vb_mark_end.tp_col = col; @@ -656,11 +660,14 @@ vtbuf_set_mark(struct vt_buf *vb, int ty vtbuf_wth(vb, row); break; case VTB_MARK_NONE: + vb->vb_mark_last = type; + /* FALLTHROUGH */ default: /* panic? */ return (0); } + vb->vb_mark_last = type; /* Draw new marked region. */ vtbuf_flush_mark(vb); return (1); Modified: user/ed/newcons/sys/dev/vt/vt_core.c ============================================================================== --- user/ed/newcons/sys/dev/vt/vt_core.c Thu Nov 14 12:14:27 2013 (r258129) +++ user/ed/newcons/sys/dev/vt/vt_core.c Thu Nov 14 13:25:47 2013 (r258130) @@ -1102,7 +1102,7 @@ vt_mouse_event(int type, int x, int y, i vd->vd_mx = x; vd->vd_my = y; if ((vd->vd_mstate & MOUSE_BUTTON1DOWN) && - (vtbuf_set_mark(&vw->vw_buf, VTB_MARK_END, + (vtbuf_set_mark(&vw->vw_buf, VTB_MARK_MOVE, vd->vd_mx / vf->vf_width, vd->vd_my / vf->vf_height) == 1)) { @@ -1170,7 +1170,7 @@ vt_mouse_event(int type, int x, int y, i switch (cnt) { case 0: /* up */ if (!(vd->vd_mstate & MOUSE_BUTTON1DOWN)) - mark = VTB_MARK_END; + mark = VTB_MARK_EXTEND; else mark = 0; break;