From owner-svn-src-user@FreeBSD.ORG  Mon Nov 11 12:15:53 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4CCEDDB8;
 Mon, 11 Nov 2013 12:15:53 +0000 (UTC) (envelope-from ray@FreeBSD.org)
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 3A97E22AC;
 Mon, 11 Nov 2013 12:15:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABCFrYx036306;
 Mon, 11 Nov 2013 12:15:53 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABCFrbH036305;
 Mon, 11 Nov 2013 12:15:53 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201311111215.rABCFrbH036305@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Mon, 11 Nov 2013 12:15:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257976 - 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.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 12:15:53 -0000

Author: ray
Date: Mon Nov 11 12:15:52 2013
New Revision: 257976
URL: http://svnweb.freebsd.org/changeset/base/257976

Log:
  o Remove include of sys/mouse.h, it is included from vt.h now.
  o Call vt_mouse_event method, to notify VT(9) about mouse events.
  o Add empty MOUSE_MOUSECHAR ioctl handler.
  o Remove trailing whitespace.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/dev/vt/vt_sysmouse.c

Modified: user/ed/newcons/sys/dev/vt/vt_sysmouse.c
==============================================================================
--- user/ed/newcons/sys/dev/vt/vt_sysmouse.c	Mon Nov 11 12:10:26 2013	(r257975)
+++ user/ed/newcons/sys/dev/vt/vt_sysmouse.c	Mon Nov 11 12:15:52 2013	(r257976)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/filio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/mouse.h>
 #include <sys/poll.h>
 #include <sys/random.h>
 #include <sys/selinfo.h>
@@ -172,6 +171,8 @@ sysmouse_process_event(mouse_info_t *mi)
 	if (sysmouse_status.flags == 0)
 		goto done;
 
+	vt_mouse_event(mi->operation, x, y, mi->u.event.id, mi->u.event.value);
+
 	/* The first five bytes are compatible with MouseSystems. */
 	buf[0] = MOUSE_MSC_SYNC |
 	    buttonmap[sysmouse_status.button & MOUSE_STDBUTTONS];
@@ -329,7 +330,7 @@ sysmouse_ioctl(struct cdev *dev, u_long 
 		sysmouse_status.dy = 0;
 		sysmouse_status.dz = 0;
 		mtx_unlock(&sysmouse_lock);
-		
+
 		return (0);
 	case MOUSE_SETLEVEL: {
 		int level;
@@ -358,6 +359,8 @@ sysmouse_ioctl(struct cdev *dev, u_long 
 
 		return (0);
 	}
+	case MOUSE_MOUSECHAR:
+		return (0);
 	default:
 		printf("sysmouse: unknown ioctl: %c:%lx\n",
 		    (char)IOCGROUP(cmd), IOCBASECMD(cmd));