From ef3d2ea352c07819a79a0ebc5abd3b4d1fd58e56 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Tue, 6 Oct 2015 08:51:00 +0000
Subject: [PATCH] Another simple update for xwindows, from 5.x.

---
 usr.bin/file/magdir/xwindows | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/usr.bin/file/magdir/xwindows b/usr.bin/file/magdir/xwindows
index 5ff3046e7ca..628098e8fa8 100644
--- a/usr.bin/file/magdir/xwindows
+++ b/usr.bin/file/magdir/xwindows
@@ -1,4 +1,4 @@
-#	$OpenBSD: xwindows,v 1.3 2008/05/14 20:45:35 chl Exp $
+#	$OpenBSD: xwindows,v 1.4 2015/10/06 08:51:00 nicm Exp $
 
 #------------------------------------------------------------------------------
 # xwindows:  file(1) magic for various X/Window system file formats.
@@ -10,7 +10,7 @@
 >0	byte	=0				obsolete
 0	string	xkm				Compiled XKB Keymap: msb,
 >3	byte	>0				version %d
->0	byte	=0				obsolete
+>3	byte	=0				obsolete
 
 # xfsdump archive
 0	string	xFSdump0			xfsdump archive
@@ -18,9 +18,18 @@
 
 # Jaleo XFS files
 0	long	395726				Jaleo XFS file
->4	long	x				- version %ld
->8	long	x				- [%ld -
->20	long	x				%ldx
->24	long	x				%ldx
->28	long	1008				YUV422]
->28	long	1000				RGB24]
+>4	long	x				- version %d
+>8	long	x				- [%d -
+>20	long	x				\b%dx
+>24	long	x				\b%dx
+>28	long	1008				\bYUV422]
+>28	long	1000				\bRGB24]
+
+# Xcursor data
+# X11 mouse cursor format defined in libXcursor, see
+# http://www.x.org/archive/X11R6.8.1/doc/Xcursor.3.html
+# http://cgit.freedesktop.org/xorg/lib/libXcursor/tree/include/X11/Xcursor/Xcursor.h
+0	string		Xcur		Xcursor data
+!:mime	image/x-xcursor
+>10	leshort		x		version %d
+>>8	leshort		x		\b.%d
-- 
2.20.1