Clean up a couple of warnings in xprint

[free-sw/xcb/libxcb] / tools / api_conv.pl

diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 60d40df..5b3c18d 100755 (executable)
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -19,6 +19,30 @@ BEGIN {
                "XCBButton5",
                "XCBHostInsert",
                "XCBHostDelete",
+               "XCBGlxGC_GL_CURRENT_BIT",
+               "XCBGlxGC_GL_POINT_BIT",
+               "XCBGlxGC_GL_LINE_BIT",
+               "XCBGlxGC_GL_POLYGON_BIT",
+               "XCBGlxGC_GL_POLYGON_STIPPLE_BIT",
+               "XCBGlxGC_GL_PIXEL_MODE_BIT",
+               "XCBGlxGC_GL_LIGHTING_BIT",
+               "XCBGlxGC_GL_FOG_BIT",
+               "XCBGlxGC_GL_DEPTH_BUFFER_BIT",
+               "XCBGlxGC_GL_ACCUM_BUFFER_BIT",
+               "XCBGlxGC_GL_STENCIL_BUFFER_BIT",
+               "XCBGlxGC_GL_VIEWPORT_BIT",
+               "XCBGlxGC_GL_TRANSFORM_BIT",
+               "XCBGlxGC_GL_ENABLE_BIT",
+               "XCBGlxGC_GL_COLOR_BUFFER_BIT",
+               "XCBGlxGC_GL_HINT_BIT",
+               "XCBGlxGC_GL_EVAL_BIT",
+               "XCBGlxGC_GL_LIST_BIT",
+               "XCBGlxGC_GL_TEXTURE_BIT",
+               "XCBGlxGC_GL_SCISSOR_BIT",
+               "XCBGlxGC_GL_ALL_ATTRIB_BITS",
+               "XCBGlxRM_GL_RENDER",
+               "XCBGlxRM_GL_FEEDBACK",
+               "XCBGlxRM_GL_SELECT",
        );
        open(CONST, shift) or die "failed to open constants list: $!";
        while(<CONST>)
@@ -35,14 +59,15 @@ sub convert($$)
        local $_ = shift;
        my ($fun) = @_;
 
+       return "xcb_generate_id" if /^xcb_[a-z0-9_]+_new$/ or /^XCB[A-Z0-9]+New$/;
        return "uint$1_t" if /^CARD(8|16|32)$/;
        return "int$1_t" if /^INT(8|16|32)$/;
        return "uint8_t" if $_ eq 'BOOL' or $_ eq 'BYTE';
-       return $_ if /^[A-Z]*_[A-Z_]*$/ or !/^XCB(.+)/;
+       return $_ if /^[A-Z0-9]*_[A-Z0-9_]*$/ or !/^XCB(.+)/;
        my $const = defined $::const{$_};
        $_ = $1;
 
-       s/^(GX|RandR|XFixes|XP|XvMC)(.)/uc($1) . "_" . $2/e;
+       s/^(GX|RandR|XFixes|XP|XvMC|ScreenSaver)(.)/uc($1) . "_" . $2/e unless /^ScreenSaver(?:Reset|Active)$/;
 
        my %abbr = (
                "Iter" => "iterator",
@@ -50,8 +75,17 @@ sub convert($$)
                "Rep" => "reply",
        );
 
-       s/([0-9]+|[A-Z](?:[A-Z]*|[a-z]*))_?(?=[0-9A-Z]|$)/"_" . ($abbr{$1} or lc($1))/eg;
+       my $word;
+       if(/CHAR2B|INT64|FLOAT32|FLOAT64|BOOL32|STRING8/)
+       {
+               $word = qr/[A-Z](?:[A-Z0-9]*|[a-z]*)/;
+       } else {
+               $word = qr/[0-9]+|[A-Z](?:[A-Z]*|[a-z]*)/;
+       }
+       s/($word)_?(?=[0-9A-Z]|$)/"_" . ($abbr{$1} or lc($1))/eg;
 
+       s/^_shape_shape_/_shape_/;
+       s/^_xf_?86_dri/_xf86dri/;
        $_ = "_family_decnet" if $_ eq "_family_de_cnet";
        return "XCB" . uc($_) if $const;
 
@@ -60,4 +94,5 @@ sub convert($$)
        return "xcb" . $_;
 }
 
+s/^(\s*#\s*include\s*<)X11\/XCB\//$1xcb\//;
 s/([_A-Za-z][_A-Za-z0-9]*)([ \t]*\()?/convert($1, defined $2) . ($2 or "")/eg;