summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hw/xfree86/common/xf86Config.c2
-rw-r--r--hw/xfree86/drivers/modesetting/dri2.c2
-rw-r--r--hw/xfree86/os-support/solaris/sun_apm.c67
-rw-r--r--hw/xfree86/os-support/xf86_OSlib.h11
-rw-r--r--hw/xwayland/meson.build1
-rw-r--r--include/xkbfile.h85
-rw-r--r--os/osinit.c1
-rw-r--r--present/meson.build7
-rw-r--r--xkb/xkbInit.c7
-rw-r--r--xkb/xkbout.c4
-rw-r--r--xkb/xkbtext.c5
-rw-r--r--xkb/xkbtext_priv.h37
12 files changed, 72 insertions, 157 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index c3d87fbe2..09e946c9a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -893,7 +893,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
rules = "base";
/* Xkb default options. */
- XkbInitRules(&set, rules, "pc105", "us", NULL, NULL);
+ XkbInitRules(&set, rules, XKB_DFLT_MODEL, XKB_DFLT_LAYOUT, NULL, NULL);
XkbSetRulesDflts(&set);
XkbFreeRMLVOSet(&set, FALSE);
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index 8be3810bf..86092565f 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -550,10 +550,8 @@ can_exchange(ScrnInfoPtr scrn, DrawablePtr draw,
drmmode_crtc_private_ptr drmmode_crtc = config->crtc[i]->driver_private;
/* Don't do pageflipping if CRTCs are rotated. */
-#ifdef GLAMOR_HAS_GBM
if (drmmode_crtc->rotate_bo.gbm)
return FALSE;
-#endif
if (xf86_crtc_on(config->crtc[i]))
num_crtcs_on++;
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index 24a743f17..cddc6b3cb 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -54,6 +54,7 @@
#endif
#include <errno.h>
+#include <sys/srn.h>
#include <X11/X.h>
#include "os.h"
@@ -63,34 +64,11 @@
#include "xf86_OSproc.h"
#include "xf86_OSlib.h"
-#ifndef PLEASE_FIX_THIS
-#define APM_STANDBY_REQ 0xa01
-#define APM_SUSPEND_REQ 0xa02
-#define APM_NORMAL_RESUME 0xa03
-#define APM_CRIT_RESUME 0xa04
-#define APM_BATTERY_LOW 0xa05
-#define APM_POWER_CHANGE 0xa06
-#define APM_UPDATE_TIME 0xa07
-#define APM_CRIT_SUSPEND_REQ 0xa08
-#define APM_USER_STANDBY_REQ 0xa09
-#define APM_USER_SUSPEND_REQ 0xa0a
-#define APM_SYS_STANDBY_RESUME 0xa0b
-#define APM_IOC_NEXTEVENT 0xa0c
-#define APM_IOC_RESUME 0xa0d
-#define APM_IOC_SUSPEND 0xa0e
-#define APM_IOC_STANDBY 0xa0f
-#endif
-
typedef struct apm_event_info {
int type;
} apm_event_info;
-/*
- This may be replaced with a better device name
- very soon...
-*/
#define APM_DEVICE "/dev/srn"
-#define APM_DEVICE1 "/dev/apm"
static void *APMihPtr = NULL;
static void sunCloseAPM(void);
@@ -99,20 +77,17 @@ static struct {
u_int apmBsd;
pmEvent xf86;
} sunToXF86Array[] = {
- {APM_STANDBY_REQ, XF86_APM_SYS_STANDBY},
- {APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND},
- {APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME},
- {APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME},
- {APM_BATTERY_LOW, XF86_APM_LOW_BATTERY},
- {APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE},
- {APM_UPDATE_TIME, XF86_APM_UPDATE_TIME},
- {APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND},
- {APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY},
- {APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND},
- {APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
-#ifdef APM_CAPABILITY_CHANGE
- {APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
-#endif
+ {SRN_STANDBY_REQ, XF86_APM_SYS_STANDBY},
+ {SRN_SUSPEND_REQ, XF86_APM_SYS_SUSPEND},
+ {SRN_NORMAL_RESUME, XF86_APM_NORMAL_RESUME},
+ {SRN_CRIT_RESUME, XF86_APM_CRITICAL_RESUME},
+ {SRN_BATTERY_LOW, XF86_APM_LOW_BATTERY},
+ {SRN_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE},
+ {SRN_UPDATE_TIME, XF86_APM_UPDATE_TIME},
+ {SRN_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND},
+ {SRN_USER_STANDBY_REQ, XF86_APM_USER_STANDBY},
+ {SRN_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND},
+ {SRN_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
};
static pmEvent
@@ -139,9 +114,9 @@ sunPMGetEventFromOS(int fd, pmEvent * events, int num)
for (i = 0; i < num; i++) {
- if (ioctl(fd, APM_IOC_NEXTEVENT, &sunEvent) < 0) {
+ if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) {
if (errno != EAGAIN) {
- xf86Msg(X_WARNING, "sunPMGetEventFromOS: APM_IOC_NEXTEVENT"
+ xf86Msg(X_WARNING, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
" %s\n", strerror(errno));
}
break;
@@ -159,7 +134,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
/* XXX: NOT CURRENTLY RETURNED FROM OS */
case XF86_APM_SYS_STANDBY:
case XF86_APM_USER_STANDBY:
- if (ioctl(fd, APM_IOC_STANDBY, NULL) == 0)
+ if (ioctl(fd, SRN_IOC_STANDBY, NULL) == 0)
return PM_WAIT; /* should we stop the Xserver in standby, too? */
else
return PM_NONE;
@@ -167,10 +142,10 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_CRITICAL_SUSPEND:
case XF86_APM_USER_SUSPEND:
xf86Msg(X_WARNING, "Got SUSPENDED\n");
- if (ioctl(fd, APM_IOC_SUSPEND, NULL) == 0)
+ if (ioctl(fd, SRN_IOC_SUSPEND, NULL) == 0)
return PM_CONTINUE;
else {
- xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_SUSPEND"
+ xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
" %s\n", strerror(errno));
return PM_FAILED;
}
@@ -180,10 +155,10 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_STANDBY_FAILED:
case XF86_APM_SUSPEND_FAILED:
xf86Msg(X_WARNING, "Got RESUME\n");
- if (ioctl(fd, APM_IOC_RESUME, NULL) == 0)
+ if (ioctl(fd, SRN_IOC_RESUME, NULL) == 0)
return PM_CONTINUE;
else {
- xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_RESUME"
+ xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
" %s\n", strerror(errno));
return PM_FAILED;
}
@@ -202,9 +177,7 @@ xf86OSPMOpen(void)
}
if ((fd = open(APM_DEVICE, O_RDWR)) == -1) {
- if ((fd = open(APM_DEVICE1, O_RDWR)) == -1) {
- return NULL;
- }
+ return NULL;
}
xf86PMGetEventFromOs = sunPMGetEventFromOS;
xf86PMConfirmEventToOs = sunPMConfirmEventToOs;
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 7bdacb9e9..11d3f1244 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -106,17 +106,6 @@
#include <sys/vt.h>
#endif
-#if defined(__sun)
-#include <sys/kbd.h>
-#include <sys/kbio.h>
-
-/* undefine symbols from <sys/kbd.h> we don't need that conflict with enum
- definitions in parser/xf86tokens.h */
-#undef STRING
-#undef LEFTALT
-#undef RIGHTALT
-#endif /* __sun */
-
#if !defined(VT_ACKACQ)
#define VT_ACKACQ 2
#endif /* !VT_ACKACQ */
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 458f3c09e..460c57300 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -182,6 +182,7 @@ pkgconfig.generate(
filebase: 'xwayland',
name: 'Xwayland',
description: 'X Server for Wayland',
+ dataonly: true,
variables: [
'exec_prefix=${prefix}',
'xwayland=' + xwayland_path / xwayland_server.name(),
diff --git a/include/xkbfile.h b/include/xkbfile.h
index bfc83ac92..df2221313 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -29,13 +29,6 @@
#include "xkbstr.h"
-/***====================================================================***/
-
-#define XkbXKMFile 0
-#define XkbCFile 1
-#define XkbXKBFile 2
-#define XkbMessage 3
-
typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
@@ -78,84 +71,6 @@ typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
_XFUNCPROTOBEGIN
-extern _X_EXPORT char *XkbIndentText(unsigned /* size */
- );
-
-extern _X_EXPORT char *XkbAtomText(Atom /* atm */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbKeysymText(KeySym /* sym */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbStringText(char * /* str */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbKeyNameText(char * /* name */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbModIndexText(unsigned /* ndx */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbModMaskText(unsigned /* mask */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbVModIndexText(XkbDescPtr /* xkb */ ,
- unsigned /* ndx */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbVModMaskText(XkbDescPtr /* xkb */ ,
- unsigned /* modMask */ ,
- unsigned /* mask */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbConfigText(unsigned /* config */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT const char *XkbSIMatchText(unsigned /* type */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbIMWhichStateMaskText(unsigned /* use_which */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbControlsMaskText(unsigned /* ctrls */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbGeomFPText(int /* val */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbDoodadTypeText(unsigned /* type */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT const char *XkbActionTypeText(unsigned /* type */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbActionText(XkbDescPtr /* xkb */ ,
- XkbAction * /* action */ ,
- unsigned /* format */
- );
-
-extern _X_EXPORT char *XkbBehaviorText(XkbDescPtr /* xkb */ ,
- XkbBehavior * /* behavior */ ,
- unsigned /* format */
- );
-
-/***====================================================================***/
-
#define _XkbKSLower (1<<0)
#define _XkbKSUpper (1<<1)
diff --git a/os/osinit.c b/os/osinit.c
index 2c4604b87..c01466aa0 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -66,7 +66,6 @@ SOFTWARE.
#include "misc.h"
#include "os.h"
#include "opaque.h"
-#include "misc.h"
#include "dixstruct.h"
#include "dixstruct_priv.h"
diff --git a/present/meson.build b/present/meson.build
index 1a74a9cbc..ec5d4cc6e 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -16,11 +16,18 @@ hdrs_present = [
'presentext.h',
]
+if host_machine.system() in ['freebsd', 'openbsd']
+ epoll_dep = dependency('epoll-shim')
+else
+ epoll_dep = []
+endif
+
libxserver_present = static_library('libxserver_present',
srcs_present,
include_directories: inc,
dependencies: [
common_dep,
+ epoll_dep,
dependency('presentproto', version: '>= 1.2')
],
)
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 1e189a3f0..a9c5bbf71 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -75,13 +75,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#endif
-#define MAX_TOC 16
-typedef struct _SrvXkmInfo {
- DeviceIntPtr dev;
- FILE *file;
- XkbDescPtr xkb;
-} SrvXkmInfo;
-
/***====================================================================***/
#ifndef XKB_DFLT_RULES_PROP
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 46e07db3f..297b3aa9c 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -32,11 +32,13 @@
#include <ctype.h>
#include <stdlib.h>
#include <X11/Xfuncs.h>
-
#include <X11/X.h>
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include <X11/extensions/XKMformat.h>
+
+#include "xkb/xkbtext_priv.h"
+
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 7f377fdfc..7bc93bfac 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -31,12 +31,13 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
-
#include <X11/Xos.h>
-
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/extensions/XKMformat.h>
+
+#include "xkb/xkbtext_priv.h"
+
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
diff --git a/xkb/xkbtext_priv.h b/xkb/xkbtext_priv.h
new file mode 100644
index 000000000..a76283784
--- /dev/null
+++ b/xkb/xkbtext_priv.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_XKB_XKBTEXT_PRIV_H
+#define _XSERVER_XKB_XKBTEXt_PRIV_H
+
+#include <X11/X.h>
+
+#include "xkbstr.h"
+
+#define XkbXKMFile 0
+#define XkbCFile 1
+#define XkbXKBFile 2
+#define XkbMessage 3
+
+char *XkbIndentText(unsigned size);
+char *XkbAtomText(Atom atm, unsigned format);
+char *XkbKeysymText(KeySym sym, unsigned format);
+char *XkbStringText(char *str, unsigned format);
+char *XkbKeyNameText(char *name, unsigned format);
+char *XkbModIndexText(unsigned ndx, unsigned format);
+char *XkbModMaskText(unsigned mask, unsigned format);
+char *XkbVModIndexText(XkbDescPtr xkb, unsigned ndx, unsigned format);
+char *XkbVModMaskText(XkbDescPtr xkb, unsigned modMask, unsigned mask,
+ unsigned format);
+char *XkbConfigText(unsigned config, unsigned format);
+const char *XkbSIMatchText(unsigned type, unsigned format);
+char *XkbIMWhichStateMaskText(unsigned use_which, unsigned format);
+char *XkbControlsMaskText(unsigned ctrls, unsigned format);
+char *XkbGeomFPText(int val, unsigned format);
+char *XkbDoodadTypeText(unsigned type, unsigned format);
+const char *XkbActionTypeText(unsigned type, unsigned format);
+char *XkbActionText(XkbDescPtr xkb, XkbAction *action, unsigned format);
+char *XkbBehaviorText(XkbDescPtr xkb, XkbBehavior *behavior, unsigned format);
+
+#endif /* _XSERVER_XKB_XKBTEXT_PRIV_H */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 11:40:37 +0000