openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 10:19:00 +00:00
Code Issues Projects Releases Wiki Activity

When no device is provided in the config file, try xf86Info.consoleFd

Browse Source 
before defaulting to an hard-coded device name. Tested by tobhe@
This commit is contained in:
matthieu
2022-11-10 17:38:58 +00:00
parent fed98a76a4
commit bd36b57990
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
driver/xf86-video-wsfb/src/wsfb_driver.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: wsfb_driver.c,v 1.42 2022/11/10 17:36:42 matthieu Exp $ */
/* $OpenBSD: wsfb_driver.c,v 1.43 2022/11/10 17:38:58 matthieu Exp $ */
/*
* Copyright © 2001-2012 Matthieu Herrb
* All rights reserved.
@@ -61,6 +61,8 @@
#include "shadow.h"
#include "dgaproc.h"
#include <xf86Priv.h>
/* For visuals */
#include "fb.h"
@@ -298,10 +300,14 @@ wsfb_open(const char *dev)
/* Second: environment variable. */
dev = getenv("XDEVICE");
if (dev == NULL || ((fd = priv_open_device(dev)) == -1)) {
/* Last try: default device. */
dev = WSFB_DEFAULT_DEV;
if ((fd = priv_open_device(dev)) == -1) {
return -1;
if (xf86Info.consoleFd > 0) {
fd = xf86Info.consoleFd;
} else {
/* Last try: default device. */
dev = WSFB_DEFAULT_DEV;
if ((fd = priv_open_device(dev)) == -1) {
return -1;
}
}
}
}