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
old mode 100644 (file)
new mode 100755 (executable)
index 36f45ea..5b3c18d
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -1,77 +1,98 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -plw
 use strict;
 
-sub trans_lines($);
-
-my @xids=("WINDOW","VISUALTYPE","DRAWABLE","FONT","ATOM","COLORMAP","FONTABLE","GCONTEXT","PIXMAP","SCREEN");
-
-my $input = $ARGV[0];
-
-open(INFILE,"<",$input) or die("Couldn't open file $input.\n");
-
-my @in_data = <INFILE>;
-my @out_data;
-
-foreach my $line (@in_data) {
-       
-       if($line =~ /#[a-z]/ or $line =~ /print/ or $line =~ /\/\// or $line =~ /\/\*/) {
-               $out_data[@out_data] = $line;
-               next;
+BEGIN {
+       %::const = map { $_ => 1 } (
+               # constants in xcb.h
+               "XCBNone",
+               "XCBCopyFromParent",
+               "XCBCurrentTime",
+               "XCBNoSymbol",
+               "XCBError",
+               "XCBReply",
+               # renamed constants
+               "XCBButtonAny",
+               "XCBButton1",
+               "XCBButton2",
+               "XCBButton3",
+               "XCBButton4",
+               "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>)
+       {
+               chomp;
+               die "invalid constant name: \"$_\"" unless /^XCB[A-Za-z0-9_]*$/;
+               $::const{$_} = 1;
        }
-
-       trans_lines($line);
+       close(CONST);
 }
 
-
-foreach my $newline (@out_data) {
-       print $newline;
-}
-
-#################
-sub trans_lines($)
+sub convert($$)
 {
-       my $line = $_[0];
-       
-       $line =~ s/XCB/xcb_/g;  
-       
-       foreach my $xid (@xids) {
-               if($line =~ /$xid/ and $line =~ /xcb_/) {
-                       my $lcxid = lc($xid);
-                       
-                       #var
-                       my $xidsp = $lcxid . " ";
-                       my $xidspun = $lcxid . "_t ";
-
-                       ##
-                       $line =~ s/$xid/$lcxid/g;
-
-                       #var
-                       $line =~ s/$xidsp/$xidspun/g;
-               }
+       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-Z0-9]*_[A-Z0-9_]*$/ or !/^XCB(.+)/;
+       my $const = defined $::const{$_};
+       $_ = $1;
+
+       s/^(GX|RandR|XFixes|XP|XvMC|ScreenSaver)(.)/uc($1) . "_" . $2/e unless /^ScreenSaver(?:Reset|Active)$/;
+
+       my %abbr = (
+               "Iter" => "iterator",
+               "Req" => "request",
+               "Rep" => "reply",
+       );
+
+       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;
 
-       #func without XID in it
-       my $funcline = $line;
-
-       if($funcline =~ /xcb_/) {
-               $funcline =~ s/[A-Z]/"_" . lc($&)/eg;
-               $funcline =~ s/__/_/g;
+       s/^_shape_shape_/_shape_/;
+       s/^_xf_?86_dri/_xf86dri/;
+       $_ = "_family_decnet" if $_ eq "_family_de_cnet";
+       return "XCB" . uc($_) if $const;
 
-               if($funcline =~ /event/i) {
-                       $funcline =~ /event/i;
-                       $funcline = $` . "event" . "_t" . $';
-
-                       $funcline =~ s/__/_/g;
-               }
-
-               #repair NULL's
-               $funcline =~ s/_n_u_l_l/NULL/g;
-               #repair XCBSCREEN
-               $funcline =~ s/s_c_r_e_e_n/screen/g;    
-       }
+       $_ .= "_t" unless $fun or /_id$/;
 
-       $line = $funcline;
-               
-       $out_data[@out_data] = $line;
+       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;