#
# Copyright 1998 Kristian Nielsen.
#
-
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
# FIXME: This does not do full C prototype parsing, but relies on
# knowledge on how the X11 include files are formatted. It will
# probably need to be modified for new include files. It also fails
#
# This program expects to be run from Wine's main directory.
-$X11_include_dir = "/usr/X11R6/include";
+$X11_include_dir = "/usr/X11/include";
$outdir = "tsx11";
$wantfile = "$outdir/X11_calls";
-@dolist = ("Xlib", "Xresource", "Xutil", "xpm", "XShm", "xf86dga", "xf86vmode");
+@dolist = ("Xlib", "Xresource", "Xutil", "XShm", "xf86dga", "xf86dga2", "xf86vmode", "shape", "xvideo");
# First read list of wanted function names.
$x11_incl = "";
$extensions_dir = "";
- $pre_file = "";
- $post_file = "";
+ $pre_file = "#ifdef HAVE_X11_XLIB_H\n";
+ $post_file = "#endif /* defined(HAVE_X11_XLIB_H) */\n";
+ $inc_name = $name;
if($name eq "Xutil" || $name eq "Xresource" || $name eq "XShm") {
$x11_incl = "#include <X11/Xlib.h>\n";
# For Xutil, we need X11/Xresource.h for XUniqueContext().
$pre_file = "#ifdef HAVE_LIBXXF86DGA\n";
$post_file = "#endif /* defined(HAVE_LIBXXF86DGA) */\n";
}
+ if($name eq "xf86dga2") {
+ $x11_incl = "#include <X11/Xlib.h>\n";
+ $extensions_dir = "extensions/";
+ $pre_file = "#ifdef HAVE_LIBXXF86DGA2\n";
+ $post_file = "#endif /* defined(HAVE_LIBXXF86DGA2) */\n";
+ $inc_name = "xf86dga";
+ }
if($name eq "XShm") {
$extensions_dir = "extensions/";
$pre_file = "#ifdef HAVE_LIBXXSHM\n";
$post_file = "#endif /* defined(HAVE_LIBXXSHM) */\n";
}
- if($name eq "xpm") {
- $pre_file = "#ifdef HAVE_LIBXXPM\n";
- $post_file = "#endif /* defined(HAVE_LIBXXPM) */\n";
- }
if($name eq "xf86vmode") {
$x11_incl = "#include <X11/Xlib.h>\n";
$extensions_dir = "extensions/";
$pre_file = "#include \"windef.h\"\n#ifdef HAVE_LIBXXF86VM\n#define XMD_H\n#include \"basetsd.h\"\n";
$post_file = "#endif /* defined(HAVE_LIBXXF86VM) */\n";
}
+ if($name eq "shape") {
+ $extensions_dir = "extensions/";
+ $pre_file = "#ifdef HAVE_LIBXSHAPE\n#include <X11/IntrinsicP.h>\n";
+ $post_file = "#endif /* defined(HAVE_LIBXSHAPE) */\n";
+ $inc_name = "shape";
+ }
+ if($name eq "xvideo") {
+ $x11_incl = "#include <X11/Xlib.h>\n#include <X11/extensions/Xv.h>\n#include <X11/extensions/XShm.h>\n";
+ $extensions_dir = "extensions/";
+ $pre_file = "#ifdef HAVE_XVIDEO\n";
+ $post_file = "#endif /* defined(HAVE_XVIDEO) */\n";
+ $inc_name = "Xvlib";
+ }
+
print OUTH <<END;
/*
* Thread safe wrappers around $name calls.
* Always include this file instead of <X11/$name.h>.
* This file was generated automatically by tools/make_X11wrappers
- *
- * Copyright 1998 Kristian Nielsen
+ * DO NOT EDIT!
*/
#ifndef __WINE_TS_$ucname\_H
#define __WINE_TS_$ucname\_H
-#include "config.h"
-
-#ifndef X_DISPLAY_MISSING
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
$pre_file
-$x11_incl#include <X11/$extensions_dir$name.h>
+$x11_incl#include <X11/$extensions_dir$inc_name.h>
+
+extern void (*wine_tsx11_lock)(void);
+extern void (*wine_tsx11_unlock)(void);
END
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
$pre_file
-$x11_incl#include <X11/$extensions_dir$name.h>
+$x11_incl#include <X11/$extensions_dir$inc_name.h>
-#include "debugtools.h"
#include "ts_$lcname.h"
-#include "x11drv.h"
-DEFAULT_DEBUG_CHANNEL(x11)
END
- if($name eq "xpm") { # Handle as special case.
- output_fn("XpmCreatePixmapFromData", "int",
- "Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *",
- "Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5",
- "a0, a1, a2, a3, a4, a5");
- output_fn("XpmAttributesSize", "int", "void", "void", "");
- } elsif($name eq "XShm") {
+ if ($name eq "XShm") {
output_fn("XShmQueryExtension", "Bool",
"Display *", "Display *a0", "a0");
output_fn("XShmQueryVersion", "Bool",
- "Display *, int *, int *, Bool *",
+ "Display *, int *, int *, Bool *",
"Display *a0, int *a1, int *a2, Bool *a3", "a0, a1, a2, a3");
output_fn("XShmPixmapFormat", "int",
"Display *", "Display *a0", "a0");
"Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10", "a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10");
output_fn("XShmGetImage", Status,
"Display *, Drawable, XImage *, int, int, unsigned long",
- "Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5",
+ "Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5",
"a0, a1, a2, a3, a4, a5");
output_fn("XShmCreateImage", "XImage *",
"Display *, Visual *, unsigned int, int, char *, XShmSegmentInfo *, unsigned int, unsigned int",
"Display*a0,int a1,int a2",
"a0,a1,a2"
);
+ } elsif($name eq "xf86dga2") {
+ output_fn_short("Bool", "XDGAQueryVersion", "Display*" ,"int*","int*");
+ output_fn_short("Bool", "XDGAQueryExtension", "Display*" ,"int*","int*");
+ output_fn_short("XDGAMode*", "XDGAQueryModes", "Display*" ,"int", "int*");
+ output_fn_short("XDGADevice*", "XDGASetMode", "Display*" ,"int","int");
+ output_fn_short("Bool", "XDGAOpenFramebuffer", "Display*" ,"int");
+ output_fn_short("void", "XDGACloseFramebuffer", "Display*" ,"int");
+ output_fn_short("void", "XDGASetViewport", "Display*" ,"int", "int", "int", "int");
+ output_fn_short("void", "XDGAInstallColormap", "Display*" , "int", "Colormap");
+ output_fn_short("Colormap", "XDGACreateColormap", "Display*" ,"int", "XDGADevice*", "int");
+ output_fn_short("void", "XDGASelectInput", "Display*" ,"int", "long");
+ output_fn_short("void", "XDGAFillRectangle", "Display*" ,"int", "int", "int", "unsigned int", "unsigned int", "unsigned long");
+ output_fn_short("void", "XDGACopyArea", "Display*" ,"int", "int", "int", "unsigned int", "unsigned int", "int", "int");
+ output_fn_short("void", "XDGACopyTransparentArea", "Display*" ,"int", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned long");
+ output_fn_short("int", "XDGAGetViewportStatus", "Display*" ,"int");
+ output_fn_short("void", "XDGASync", "Display*" ,"int");
+ output_fn_short("Bool", "XDGASetClientVersion", "Display*");
+ output_fn_short("void", "XDGAChangePixmapMode", "Display*" ,"int", "int*", "int*", "int");
+ output_fn_short("void", "XDGAKeyEventToXKeyEvent", "XDGAKeyEvent*" ,"XKeyEvent*");
+ } elsif ($name eq "xvideo") {
+ output_fn_short("int", "XvQueryExtension", "Display*", "unsigned int*", "unsigned int*", "unsigned int*", "unsigned int*", "unsigned int*");
+ output_fn_short("int", "XvQueryAdaptors", "Display*", "Window", "unsigned int*", "XvAdaptorInfo**");
+ output_fn_short("int", "XvQueryEncodings", "Display*", "XvPortID", "unsigned int*", "XvEncodingInfo**");
+ output_fn_short("int", "XvPutVideo", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
+ output_fn_short("int", "XvPutStill", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
+ output_fn_short("int", "XvGetVideo", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
+ output_fn_short("int", "XvGetStill", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
+ output_fn_short("int", "XvStopVideo", "Display*", "XvPortID", "Drawable");
+ output_fn_short("int", "XvGrabPort", "Display*", "XvPortID", "Time");
+ output_fn_short("int", "XvUngrabPort", "Display*", "XvPortID", "Time");
+ output_fn_short("int", "XvSelectVideoNotify", "Display*", "Drawable", "Bool");
+ output_fn_short("int", "XvSelectPortNotify", "Display*", "XvPortID", "Bool");
+ output_fn_short("int", "XvSetPortAttribute", "Display*", "XvPortID", "Atom", "int");
+ output_fn_short("int", "XvGetPortAttribute", "Display*", "XvPortID", "Atom", "int*");
+ output_fn_short("int", "XvQueryBestSize", "Display*", "XvPortID", "Bool", "unsigned int", "unsigned int", "unsigned int", "unsigned int", "unsigned int*", "unsigned int*");
+ output_fn_short("XvAttribute*", "XvQueryPortAttributes", "Display*", "XvPortID", "int*");
+ output_fn_short("void", "XvFreeAdaptorInfo", "XvAdaptorInfo*");
+ output_fn_short("void", "XvFreeEncodingInfo", "XvEncodingInfo*");
+ output_fn_short("XvImageFormatValues *", "XvListImageFormats", "Display*", "XvPortID", "int*");
+ output_fn_short("XvImage *", "XvCreateImage", "Display*", "XvPortID", "int", "char*", "int", "int");
+ output_fn_short("int", "XvPutImage", "Display*", "XvPortID", "Drawable", "GC", "XvImage*", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
+ output_fn_short("int", "XvShmPutImage", "Display*", "XvPortID", "Drawable", "GC", "XvImage*", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int", "Bool");
+output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int", "char*", "int", "int", "XShmSegmentInfo*");
} elsif($name eq "xf86vmode") {
output_fn("XF86VidModeQueryVersion",Bool,
"Display*,int*,int*",
"Display*,int,int,int",
"Display*a0,int a1,int a2,int a3",
"a0,a1,a2,a3"
- );
+ );
+
} else {
- open(IN,
- "echo \"$x11_incl#include <X11/$extensions_dir$name.h>\" | " .
+ open(IN,
+ "echo \"$x11_incl#include <X11/$extensions_dir$name.h>\" | " .
"gcc -L$X11_include_dir -DNeedFunctionPrototypes -E - | " .
"grep -v '^[ \t]*\$)' |"
) || die "open";
"int (*TSXSynchronize(Display *, Bool))(Display *)",
"int (*TSXSynchronize(Display *a0, Bool a1))(Display *)",
"a0, a1");
- print OUTC "\nextern void _XInitImageFuncPtrs(XImage *);\n";
- output_fn("_XInitImageFuncPtrs", "void", "XImage *", "XImage *a0", "a0");
} elsif($name eq "Xutil") {
output_fn("XDestroyImage", "int",
"struct _XImage *", "struct _XImage *a0", "a0");
"struct _XImage *, long",
"struct _XImage *a0, long a1", "a0, a1");
output_fn("XUniqueContext", "XContext", "void", "void", "");
+ output_fn("XDeleteContext", "int",
+ "Display*,XID,XContext",
+ "Display*a0,XID a1,XContext a2",
+ "a0,a1,a2");
}
print OUTH <<END;
$post_file
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_$ucname\_H */
END
print OUTC <<END;
$post_file
-#endif /* !defined(X_DISPLAY_MISSING) */
END
$actuals);
}
+sub output_fn_short {
+ # Example call:
+ # output_fn_sort("Bool", "XDGAQueryExtension", "Display *", "int *", "int *");
+ #
+ my ($result_type, $fn_name, @args) = @_;
+
+ my ($i, $proto, $formals, $actuals) = (0,
+ "$result_type TS$fn_name(",
+ "$result_type TS$fn_name(",
+ "");
+ while ($val = shift @args) {
+ $proto = $proto . $val;
+ $formals = $formals . $val . " a$i";
+ $actuals = $actuals . " a$i";
+ $i++;
+ if (@args) {
+ $proto = $proto . ", ";
+ $formals = $formals . ", ";
+ $actuals = $actuals . ", ";
+ }
+ }
+ $proto = $proto . ")";
+ $formals = $formals . ")";
+
+
+ raw_output_fn($fn_name,
+ $result_type =~ /^\s*void\s*$/ ? "" : "$result_type r",
+ $proto,
+ $formals,
+ $actuals);
+}
+
sub raw_output_fn {
# Example call:
# output_fn("main", "int r", "int main(int, char **)", "int main(int a0, char **a1)", "a0, a1")
# print OUTH "#define $fn_name TS$fn_name\n";
print OUTC "{\n";
print OUTC " $resultdecl;\n" if $resultdecl;
- print OUTC " TRACE(\"Call $fn_name\\n\");\n";
- print OUTC " EnterCriticalSection( &X11DRV_CritSection );\n";
+ print OUTC " wine_tsx11_lock();\n";
print OUTC " ";
print OUTC "r = " if $resultdecl;
print OUTC "$fn_name($actuals);\n";
- print OUTC " LeaveCriticalSection( &X11DRV_CritSection );\n";
- print OUTC " TRACE(\"Ret $fn_name\\n\");\n";
+ print OUTC " wine_tsx11_unlock();\n";
print OUTC " return r;\n" if $resultdecl;
print OUTC "}\n";
$want{$fn_name} = 2;
projects / wine / blobdiff