Attachment 171626 Details for Bug 210382 – Increase limit, rename DEFAULT to MAX (includes man page change)

[patch] Increase limit, rename DEFAULT to MAX (includes man page change)

vt.patch (text/plain), 2.38 KB, created by Felix on 2016-06-20 22:32:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix

Created: 2016-06-20 22:32:04 UTC

Size: 2.38 KB

patch

obsolete

>Index: sys/dev/vt/hw/fb/vt_fb.c
>===================================================================
>--- sys/dev/vt/hw/fb/vt_fb.c	(revision 302017)
>+++ sys/dev/vt/hw/fb/vt_fb.c	(working copy)
>@@ -416,10 +416,10 @@
> 	int err;
>
> 	info = vd->vd_softc;
>-	vd->vd_height = MIN(VT_FB_DEFAULT_HEIGHT, info->fb_height);
>+	vd->vd_height = MIN(VT_FB_MAX_HEIGHT, info->fb_height);
> 	margin = (info->fb_height - vd->vd_height) >> 1;
> 	vd->vd_transpose = margin * info->fb_stride;
>-	vd->vd_width = MIN(VT_FB_DEFAULT_WIDTH, info->fb_width);
>+	vd->vd_width = MIN(VT_FB_MAX_WIDTH, info->fb_width);
> 	margin = (info->fb_width - vd->vd_width) >> 1;
> 	vd->vd_transpose += margin * (info->fb_bpp / NBBY);
> 	vd->vd_video_dev = info->fb_video_dev;
>Index: sys/dev/vt/vt.h
>===================================================================
>--- sys/dev/vt/vt.h	(revision 302017)
>+++ sys/dev/vt/vt.h	(working copy)
>@@ -377,11 +377,11 @@
> #define	PIXEL_WIDTH(w)	((w) / 8)
> #define	PIXEL_HEIGHT(h)	((h) / 16)
>
>-#ifndef VT_FB_DEFAULT_WIDTH
>-#define	VT_FB_DEFAULT_WIDTH	2048
>+#ifndef VT_FB_MAX_WIDTH
>+#define	VT_FB_MAX_WIDTH		4096
> #endif
>-#ifndef VT_FB_DEFAULT_HEIGHT
>-#define	VT_FB_DEFAULT_HEIGHT	1200
>+#ifndef VT_FB_MAX_HEIGHT
>+#define	VT_FB_MAX_HEIGHT	2400
> #endif
>
> /* name argument is not used yet. */
>Index: sys/dev/vt/vt_core.c
>===================================================================
>--- sys/dev/vt/vt_core.c	(revision 302017)
>+++ sys/dev/vt/vt_core.c	(working copy)
>@@ -181,8 +181,8 @@
>
> SET_DECLARE(vt_drv_set, struct vt_driver);
>
>-#define	_VTDEFH	MAX(100, PIXEL_HEIGHT(VT_FB_DEFAULT_HEIGHT))
>-#define	_VTDEFW	MAX(200, PIXEL_WIDTH(VT_FB_DEFAULT_WIDTH))
>+#define	_VTDEFH	MAX(100, PIXEL_HEIGHT(VT_FB_MAX_HEIGHT))
>+#define	_VTDEFW	MAX(200, PIXEL_WIDTH(VT_FB_MAX_WIDTH))
>
> struct terminal	vt_consterm;
> static struct vt_window	vt_conswindow;
>Index: share/man/man4/vt.4
>===================================================================
>--- share/man/man4/vt.4	(revision 302017)
>+++ share/man/man4/vt.4	(working copy)
>@@ -24,7 +24,7 @@
> .\"
> .\" $FreeBSD$
> .\"
>-.Dd April 17, 2016
>+.Dd June 21, 2016
> .Dt "VIRTUAL TERMINALS" 4
> .Os
> .Sh NAME
>@@ -36,8 +36,8 @@
> .Cd "options VT_MAXWINDOWS=N"
> .Cd "options VT_ALT_TO_ESC_HACK=1"
> .Cd "options VT_TWOBUTTON_MOUSE"
>-.Cd "options VT_FB_DEFAULT_WIDTH=X"
>-.Cd "options VT_FB_DEFAULT_HEIGHT=Y"
>+.Cd "options VT_FB_MAX_WIDTH=X"
>+.Cd "options VT_FB_MAX_HEIGHT=Y"
> .Cd "options SC_NO_CUTPASTE"
> .Cd "device vt"
> .Pp

Actions: View | Diff

Attachments on bug 210382: 171584 | 171602 | 171626 | 213861