Register XFree86 DDX specific "XFree86_VT" Atom to appease xinit(1).

Make sure to initialize default XKB rules earlier for Core Keyboard.

merge xorg-server 21.1.18.

initial import of xorg-server-21.1.18

Make sure the keyboard device is actually enabled in DDXRingBell().

Also use consistent variable names for readability.

Allocate keyboard and mouse event buffers in the device private structures.

Also simplify GetEvents functions.

Allocate X68kKbdPriv dynamically to make it really private.

DEVICE_OFF and DEVICE_CLOSE operations are adjusted accordingly.
x68kGetKbdType() function is also added to get keyboard map type
specified in the config file.

Allocate X68kMousePriv dynamically to avoid static buffers.

DEVICE_OFF and DEVICE_CLOSE operations are also adjusted.

Reduce references to x68kKbdPriv and x68kMousePriv for readability.

Refactor X68k input device handling to remove SIGIO based event processing.

The keyboard and pointer input events are now processed directly
using fd event notifications registered via DIX SetNotifyFd(),
instead of the legacy SIGIO-based asynchronous I/O.

Use consistent name for DeviceIntPtr variables among keyboard and mouse.

Make sure the keyboard device is actually enabled in DDXRingBell().

Also use consistent variable names for readability.

No need to check if the device is enabled in event handler functions.

These event handlers are activated by SetNotifyFd() only after
DXX deviceProc() functions are called with DEVICE_ON from
DIX EnableDevice() function.

Remove unused variables.

Add a static function declaration in sunMouse.c.

Add and sort static function declarations in sunKbd.c.

Allocate keyboard and mouse event buffers in the device private structures.

Also simplify GetEvents functions.

Tested on Sun 3/60 with bwtwo.

Replace old FNDELAY for fcntl(2) with O_NONBLOCK defined in POSIX.

Also Refactor sunKbdPrivRec in sunKbd.c to make it private.

Now the keyboard device is opened and sunKbdPrivRec is dynamically
allocated within the DEVICE_INIT phase of sunKbdProc().
DEVICE_OFF and DEVICE_CLOSE operations are also adjusted accordingly.

Tested on Sun 3/60.

Refactor sunPtrPrivRec in sunMouse.c to make it really private.

The mouse device is now opened and sunPtrPrivRec is allocated
within the DEVICE_INIT phase of sunMouseProc(). DEVICE_OFF and
DEVICE_CLOSE operations are also adjusted accordingly.

Tested on Sun 3/60.

Reduce global references to sunPtrPriv, as sunKbd.c does.

Refactor Xsun input device handling to remove SIGIO based event processing.

The keyboard and pointer input events are now processed directly
using fd event notifications registered via DIX SetNotifyFd(),
instead of the legacy SIGIO-based asynchronous I/O.

This refactoring improves the maintainability and portability of
the code by aligning with modern Xorg server practices.

Tested on Sun 3/60 with bwtwo, Type-4 keyboard and mouse.

Initialize DDX pointer valuators consistently with other drivers/servers.

This may not be strictly necessary, since InitValuatorAxisStruct()
for all axes is also called from the DIX InitPointerDeviceStruct()
via InitValuatorClassDeviceStruct() with default values.

However, for future X.Org updates, it is beneficial to keep the
DIX-DDX interface implementation in MouseProc's DEVICE_INIT operation
consistent with the official xf86-input-mouse driver, xquartz DDX server,
and others.

Properly apply DIX locking to input events in NetBSD-specific DDX servers.

This thread-based DIX locking approach using input_lock() and
input_unlock() has been available since X.Org 1.19.0:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/30ac7567980a1eb79d084a63e0e74e1d9a3af673

All xfree86 DDX implementations have switched to using these new
DIX locks instead of the old OsBlockSIGIO() / OsReleaseSIGIO() methods:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/6a5a4e60373c1386b311b2a8bb666c32d68a9d99

The xquartz DDX (an official X.Org server implementation) also uses
these locks for input events:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/7d6ebf3f4e4d517bb846d15a5deb131da19a267c

This should resolve occasional SIGSEGVs in the Xsun server caused
by NULL pointer dereferences around the event queue handlers
under heavy load.

Should be pulled up to netbsd-10.

merge xorg-server 21.1.16.

initial import of xorg-server-21.1.16

merge xorg-server 21.1.14.

initial import of xorg-server-21.1.14

merge xorg-server 21.1.13.

initial import of xorg-server-21.1.13

fix build on alpha.

some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.

make sure we fill in the name field in generated / converted modes
fixes PR 58321, tested by tsutsui@

xf86-video-wsfb: Add support for 16 color mode on Amiga

- Sets up 8bpp shadow framebuffer with depth 4
- Bitplane conversion done in shadow update function
- Adds new shadow update function shadowUpdateAfb4x8,
which is a slightly modified version of existing shadowUpdateAfb4/8.

Discussion on tech-x11: http://mail-index.netbsd.org/tech-x11/2024/02/29/msg002447.html

merge xorg-server 21.1.9.

initial import of xorg-server-21.1.9

merge xorg-server 21.1.8.

initial import of xorg-server-21.1.8

merge xorg-server 21.1.7.

initial import of xorg-server-21.1.7

merge xorg-server 21.1.6.

initial import of xorg-server-21.1.6

fix a couple of merge botches (duplicated) delete #if 0'd sections.

reduces diffs vs upstream.

merge xorg-server 1.21.1.5

initial import of xorg-server-21.1.5

avoid variable stack arrays.

USE_SSP=yes builds don't work with this new xorg-server version, adjust
the drmmode_set_gamma_lut() call to use malloc() instead of the stack,
and pass down a higher level pointer to gain access to the screen index
so error messages with xf86DrvMsg() work.

tested on pinebookpro.

Pull an upstream (post-21.1) fix for xf86CompatOutput().

https://gitlab.freedesktop.org/xorg/xserver/-/commit/75d70612888f18339703315549db781a22c0cb23
This is an additional fix against the previous revision that is
avaiable in 21.1 branch:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/80eeff3ebac772e25c9107199989e677457dbe06
and may avoid a possible out of bounds access at least on dumb wsfb servers.

ok'ed by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html

Restore -flipPixels option removed in upstream server-21.1-branch.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/d1c00c859c6676fbb540420c9055788bc19cb18f
Note ScrnInfoRec structure in hw/xfree86/common/xf86str.h isn't reverted
because it isn't used by -flipPixels option so that we can keep ABI
compatibility among xf86-video-foo drivers.

This -flipPixels is mandatory at least by Xorg server users with
xf86-video-wsfb driver on NetBSD/mac68k and SE/30 mono screen
that has "black=1 and white=0" VRAM.

"go for it" by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html

use PRIu64 and hopefully fix some clang builds.

Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> These are so close to identical that most DDXes implement one in terms
> of the other. All the relevant cases can be distinguished by the error
> code, so merge the functions together to make things simpler.

couple of changes needed for xorg-server 21.1.4.

- AbortDDX() is removed, make it static to avoid code churn since
it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
-fakescreenfps option since it require PRESENT.

fixes builds for sun3 and x68k.

merge xorg-server 21.1.4.

initial import of xorg-server-21.1.4

make this actually build again on arm/mips.

use "1ULL << 32" for a 64 bit member, not 1UL.

fix merge botch.

merge xorg-serer 21.1.3.

initial import of xorg-server-21.1.3

Follow the error path if asprintf fails, not if it succeeds.

recognize Southland Media MGX

Handle restoring keyboard state via AbortDevices() rather than AbortDDX().

Tested on 3/60. Note AbortDevices() and DEVICE_ABORT in deviceProc
functions were introduced after Xorg 1.14.0:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36

Switch to xf86-input-ws for mouse by default, to allow more advanced
input devices to Just Work.

merge xorg-server 1.20.13.

initial import of xorg-server-1.20.13

merge xorg-server 1.20.12 and xkeyboard-config 2.33.

initial import of xorg-server-1.20.12

elide cast warning: error: cast from pointer to integer of different size

Add missing include of compiler.h and make all declarations of
IOPortBase consistent.

use PORT_SIZE from compiler.h instead of int.

Provide canonical declaration of IOPortBase for MIPS here, too.

Avoid multiple definitions of the same variable.

merge xorg-server 1.20.11.

initial import of xorg-server-1.20.11

Explicitly include dix-config.h for HAVE_foo definitions referred in os.h.

Fixes "FatalError re-entered, aborting" error when Xservers get SIGSEGV.

Handle a new DEVICE_ABORT mode perperly in deviceProc funtions.
Also don't exit via FatalError() on an unknown mode because it looks
upstream assumes DDX deviceProc functions don't treat it fatal:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36

Avoid polluting console on non-fatal errors.

ErrorF() doesn't append newlines at the end of messages.

Add "Emulate3Buttons" support to the X68k Xorg based monolithic server.

Based on "Emulate3Buttons" functions in the xf86-input-mouse driver,
with various refactoring and cleanups:
- rewrite a magic three-dimensional array for a finate state machine
with proper named structures etc.
- separate 3 button emulation functions from other stuff

See my post on port-x68k@ (and tech-x11@) for more details:
https://mail-index.netbsd.org/port-x68k/2021/02/05/msg000074.html

add dummy ddxInputThreadInit() if INPUTTHREAD is defined.
fixes sun3 build and should fix x68k build too.

merge xorg-server 1.20.10.

initial import of xorg-server-1.20.10

valuator_mask_zero() is enough for mouse button events.

valuator_mask_zero() is enough for mouse button events.

Report which settings are chosen per a config file in the log file.

Also reorganize a logging strategy in parseError() and
make several variables and functions static or const.

Fix typo in comment.

Use exact-width interger types properly for register accesses etc.

No binary changes.

Remove unnecessary pointer casts from malloc(3).

Avoid a use of __UNVOLATILE(3). Tested on XM6i.

Add ModeDef for 640x480x4bit PseudoColor.

Restore video mode properly on exit even on CRT Mode 19 (640x480 31kHz VGA).

Fix a suspicious chunk disabled on xfree 4.x migration as sunKbd.c does.

Call LogInit() for logging to /var/log/X68k.%s.log as Xorg and Xsun servers.

Avoid dumb DevicePtr casts.

Remove more redundant command option arg checks.

Revert upstream "fb: Remove even/odd tile slow-pathing" changes.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/e572bcc7f4236b7e0f23ab762f225b3bce37db59
>> fb: Remove even/odd tile slow-pathing
>>
>> Again, clearly meant to be a fast path, but this turns out not to be the
>> case.

This causes serious performance regression on 1bpp servers.
Ok'ed by mrg@. See my post on tech-x11@ for more details:
https://mail-index.netbsd.org/tech-x11/2020/08/07/msg002115.html

Put probed framebuffer info to a log file by default.

Remove redundant command option arg checks.

Remove a leftover variable for non-XKB autorepeat.

Inform detected keyboard type and layout via LogMessage().

Call LogInit() for logging to /var/log/Xsun.%s.log as Xorg server.

Replace 'pointer' type with 'void *' to sync with upstream manner.

https://cgit.freedesktop.org/xorg/xserver/commit/?id=60014a4a98ff924ae7f6840781f768c1cc93bbab

TAB/space cleanup.

Trailing whitespace.

Use "empty" for rmlvo model and layout to avoid lingering default settings.

Now all modifier keys (CTRL, SHIFT, and NumLock) work as expected.

It seems XkbApplyMappingChange() doesn't update some XKB modifier
settings even if new modmap data is specified.

Backport the only patch from xorg-server 1.20.9 as I can't find a tarball.

From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@herrb.eu>
Date: Sat, 25 Jul 2020 19:33:50 +0200
Subject: [PATCH] fix for ZDI-11426

Avoid leaking un-initalized memory to clients by zeroing the
whole pixmap on initial allocation.

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative

Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Remove now unused ModMap data for each keyboard.

Initialize ModMap dynamically using keymap data per each keyboard.

Now ScrollLock LED works properly.

Remove unused functions required to handle non-XKB autorepeat.

Fix LED defintions to match xkb/xkbInit.c.

Now CapsLock and NumLock LEDs work correctly.
XXX: No ScrollLock LED

Explicitly initialize origColormapValid for readability.

Implement functions to restore palette settings on exiting Xserver.

Add prototype declarations for CG2 functions.

Use proper args for dixLookupResourceByType() to get defcolormap.

Botched in mechanical 1.20 updates.

Apply upstream "free the EQ allocated memory on shutdown" fixes.

This should be updated before 1.20 import:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=87d4f90bfcb509471ac9e7886e14a92b33223fd7

Use proper ANSI offsetof(3) to specify framebuffer offset in struct.

Fixes build error on sparc64. No binary change on sun3.

Normalize #include paths.

Import WIP Xorg-Server-1.20'fied monolithic Xsun servers.

This is based on 1.10 version imported into xorg-server.old and
all upstream API changes between xorg-server 1.10 and 1.20 are
applied almost mechanically.
https://github.com/tsutsui/xorg-server-Xsun/commits/xorg-server-1.20

Xsun and XsunMono servers are also confirmed working with bwtwo on
3/60 and tme, and cgtwo on tme. XKB stuff is still to be resolved.

Sync with xorg-server.old: Remove #ifdef XKB conditional.

> It has been mandatory on Xorg:
> https://cgit.freedesktop.org/xorg/xserver/commit/?id=40877c6680863bd6a8475f2bb0c54df55bcf0b0e

Pull 1bpp server fixes from xorg-server.old:

https://mail-index.netbsd.org/source-changes/2020/07/18/msg119488.html
> Fix 1bpp Xservers on "whitePixel=0, blackPixel=1" VRAMs.
>
> - Don't override pScreen->blackPixel and pScreen->whitePixel
> (set in MD server Init functions per -filpPixels option)
> on 1bpp servers in merged fbSetupScreen() (merged one
> from cfbSetupScrenn and mfbSetupScreen() in old xsrc/xfree)
> - Pull mfbCreateColormap() function from old xsrc/xfree tree
> and use it on 1bpp servers

Confirmed on luna68k 1bpp Xorg 1.20 server using xf86-video-wsfb
with "-flipPixels" option.

Add a stub for miinitext of GLX.

As per upstream commits for Xnest:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=67c303fff303f94b62f03a76de97116c6ebcfda9

Note GLXEXT is defined as 1 in xorg-server/include/xorg-server.h
(i.e. /usr/X11R7/include/xorg/xorg-server.h) so no proper way to
disable it on building MD servers per ${MACHINE} basis.

Update for removal of AddEnabledDevice and RemoveEnabledDevice.

Use the NotifyFd API instead as per upstream commits:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=55c2e1a3aa587c58a74066724e11e30b3df267b8
https://cgit.freedesktop.org/xorg/xserver/commit/?id=be5a513fee6cbf29ef7570e57eb0436d70fbd88c
https://cgit.freedesktop.org/xorg/xserver/commit/?id=60a91031d13e4d29c383087120e318f6b528b6e5
https://cgit.freedesktop.org/xorg/xserver/commit/?id=7def2fea30060d47780dc1eedc91fada5ae1934f

Pull changes of x68kInit.c rev 1.3 from xorg-server.old.

https://mail-index.netbsd.org/source-changes/2020/07/18/msg119473.html
> Use AllocDevicePair() to initialize input devices in InitInput().

Untested, but I'll re-visit on migrating to HAVE_XORG_SERVER_VER=120.

Remove clause 3 and 4 from X68k server files written by Yasushi Yamasaki.

I've finally contacted with Yamasaki-san and he kindly answered
"no objection to change them to 2 clause license" in private mail.
Diffs to be committed have also been confirmed by him.
We appreciate all his contribution to early NetBSD/x68k.

merge xorg-server 1.20.6.

initial import of xorg-server-1.20.6

Revert previous two commits, will fix this another way.

Don't autoload vesa on x86 at all as it conflicts with wsfb.

Try wsfb before vesa on x86. Modern video cards may not support VBE at all.

Try modesetting on x86, too.

Not the best option without functional GLAMOR, but it does work.

Match wsfb on x86, too.

When uefi booting without driver-specific GPU support, wsfb is the only
choice for a graphical driver.

While here, combine the wsfb cases.

merge xorg-server 1.20.5.

initial import of xorg-server-1.20.5

Undo local diff.

It was introduced as one of the patches fixing
https://bugs.freedesktop.org/show_bug.cgi?id=28181

This is marked fixed upstream, and was spotted on non-NetBSD, so it's
very likely to be unnecessary.

This diff was causing a double-free, causing Xorg to crash when closing
pkgsrc/emulators/{retroarch,nestopia}.
This is most likely a problem that became more evident from jemalloc
debug which is filling free'd memory with 0x5a5a5a...

Fixes PR xsrc/54246.

fix variable stack allocation for ssp

merge xorg-server 1.20.4.

initial import of xorg-server-1.20.4

Try the modesetting driver before wsfb on NetBSD arm and aarch64

Avoid dup inconsistent definitions.

protect dup typedef.

Remove duplicate length check (undo diff to upstream)

Undo merge botch, duplicate length checks

pEnt isn't initialized at this point, don't free it
Undo diff to upstream.

There's a good chance we aren't using this code at all.

Undo unnecessary diff to vendor branch.

make the intel driver work again with xorg-server 1.20:

- BlockHandler() timeout value changed from struct timeval ** to int **
that has a millisecond value.

- avoid a NULL ptr deref in ProcXF86BigfontQueryFont() and make some
code actually able to be run.

s/pointer/void */ in a few places. remove now (void *) casts.

s/inclue/include/ in an error message.

use xf86AddMatchedDriver().

merge xorg-server 1.20.3.

initial import of xorg-server-1.20.3