mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg-server: implement xf86OpenConsole/xf86CloseConsole

Browse Source
This commit is contained in:
Matheus
2026-06-29 00:56:01 -03:00
parent 09d7f8cd1d
commit 93a34606a1
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/xorg-server/jinx-working-patch.patch
+41 -2
View File
@@ -788,35 +788,74 @@ index 0000000..f4d19d9
+} +}
diff --git xorg-server-workdir/hw/xfree86/os-support/astral/astral_init.c xorg-server-workdir/hw/xfree86/os-support/astral/astral_init.c diff --git xorg-server-workdir/hw/xfree86/os-support/astral/astral_init.c xorg-server-workdir/hw/xfree86/os-support/astral/astral_init.c
new file mode 100644 new file mode 100644
index 0000000..f0d9039 index 0000000..ce5a72f
--- /dev/null --- /dev/null
+++ xorg-server-workdir/hw/xfree86/os-support/astral/astral_init.c +++ xorg-server-workdir/hw/xfree86/os-support/astral/astral_init.c
@@ -0,0 +1,32 @@ @@ -0,0 +1,71 @@
+#ifdef HAVE_XORG_CONFIG_H +#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h> +#include <xorg-config.h>
+#endif +#endif
+ +
+#include <astral/sysctl.h>
+#include <errno.h>
+#include <string.h>
+
+#include "xf86.h"
+#include "xf86_OSlib.h" +#include "xf86_OSlib.h"
+#include "xf86Priv.h"
+
+static int NoConsoleLock;
+
+static int
+astralSetConsoleLock(int locked)
+{
+ int name[] = { SYS_CTL_KERN, SYS_CTL_KERN_CONSOLE_LOCK };
+
+ return sysctl(name, 2, NULL, NULL, &locked, sizeof(locked));
+}
+ +
+void +void
+xf86OpenConsole(void) +xf86OpenConsole(void)
+{ +{
+ if (serverGeneration != 1)
+ return;
+
+ if (NoConsoleLock)
+ return;
+
+ if (astralSetConsoleLock(1) < 0)
+ FatalError("xf86OpenConsole: console lock failed: %s\n",
+ strerror(errno));
+} +}
+ +
+void +void
+xf86CloseConsole(void) +xf86CloseConsole(void)
+{ +{
+ if (NoConsoleLock)
+ return;
+
+ if (astralSetConsoleLock(0) < 0) {
+ xf86Msg(X_WARNING, "xf86CloseConsole: console unlock failed: %s\n",
+ strerror(errno));
+ return;
+ }
+} +}
+ +
+int +int
+xf86ProcessArgument(int argc, char *argv[], int i) +xf86ProcessArgument(int argc, char *argv[], int i)
+{ +{
+ if (!strcmp(argv[i], "-noconsolelock")) {
+ NoConsoleLock = 1;
+ return 1;
+ }
+
+ return 0; + return 0;
+} +}
+ +
+void +void
+xf86UseMsg(void) +xf86UseMsg(void)
+{ +{
+ ErrorF("-noconsolelock don't lock the kernel console\n");
+} +}
+ +
+void +void
recipes/xorg-server
+1 -1
View File
@@ -1,5 +1,5 @@
name=xorg-server name=xorg-server
revision=1 revision=2
from_source=xorg-server from_source=xorg-server
imagedeps="meson ninja-build build-essential" imagedeps="meson ninja-build build-essential"
hostdeps="xgcc xbinutils pkgconfig autoconf automake libtool pkgconfig util-macros xtrans fontutil" hostdeps="xgcc xbinutils pkgconfig autoconf automake libtool pkgconfig util-macros xtrans fontutil"