From owner-svn-src-user@FreeBSD.ORG  Mon Nov 11 11:30:48 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 ESMTP id 51C2FA12;
 Mon, 11 Nov 2013 11:30:48 +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 3FE972FC2;
 Mon, 11 Nov 2013 11:30: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 rABBUmut021543;
 Mon, 11 Nov 2013 11:30:48 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABBUmXa021542;
 Mon, 11 Nov 2013 11:30:48 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201311111130.rABBUmXa021542@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Mon, 11 Nov 2013 11:30:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257966 - 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 11:30:48 -0000

Author: ray
Date: Mon Nov 11 11:30:47 2013
New Revision: 257966
URL: http://svnweb.freebsd.org/changeset/base/257966

Log:
  Use opt_syscons.h to get defines.
  Define max number of windows as VT_MAXWINDOWS if defined, or as MAXCONS, or 12.
  Define VT_MOUSE_PASTEBUTTON and VT_MOUSE_EXTENDBUTTON if defined
  SC_TWOBUTTON_MOUSE or VT_TWOBUTTON_MOUSE.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/dev/vt/vt.h

Modified: user/ed/newcons/sys/dev/vt/vt.h
==============================================================================
--- user/ed/newcons/sys/dev/vt/vt.h	Mon Nov 11 11:13:12 2013	(r257965)
+++ user/ed/newcons/sys/dev/vt/vt.h	Mon Nov 11 11:30:47 2013	(r257966)
@@ -45,9 +45,26 @@
 #include <sys/terminal.h>
 #include <sys/sysctl.h>
 
+#include "opt_syscons.h"
+
+#ifndef	VT_MAXWINDOWS
+#ifdef	MAXCONS
+#define	VT_MAXWINDOWS	MAXCONS
+#else
 #define	VT_MAXWINDOWS	12
+#endif
+#endif
+
 #define	VT_CONSWINDOW	0
 
+#if defined(SC_TWOBUTTON_MOUSE) || defined(VT_TWOBUTTON_MOUSE)
+#define VT_MOUSE_PASTEBUTTON	MOUSE_BUTTON3DOWN	/* right button */
+#define VT_MOUSE_EXTENDBUTTON	MOUSE_BUTTON2DOWN	/* not really used */
+#else
+#define VT_MOUSE_PASTEBUTTON	MOUSE_BUTTON2DOWN	/* middle button */
+#define VT_MOUSE_EXTENDBUTTON	MOUSE_BUTTON3DOWN	/* right button */
+#endif /* defined(SC_TWOBUTTON_MOUSE) || defined(VT_TWOBUTTON_MOUSE) */
+
 #define	SC_DRIVER_NAME	"vt"
 #define	DPRINTF(_l, ...)	if (vt_debug > (_l)) printf( __VA_ARGS__ )
 #define	ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)