Builder is now only used when there are properties. Added support for…

… returning bytes for readPad. xkb.xml had a reply with duplicate fields. Renamed on of the nKeyAliases to nKeyAliases2.
moaxcp · Oct 30, 2021 · c9c8904 · c9c8904
1 parent a0a7d39
commit c9c8904
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/buildSrc/src/main/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaClass.groovy b/buildSrc/src/main/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaClass.groovy
@@ -172,7 +172,9 @@ abstract class JavaClass implements JavaType {
     }
 
     void addHeaderStatements(MethodSpec.Builder builder) {
-        builder.addStatement('$T $L = $T.builder()', builderClassName, 'javaBuilder', className)
+        if(!properties.isEmpty()) {
+            builder.addStatement('$T $L = $T.builder()', builderClassName, 'javaBuilder', className)
+        }
     }
 
     void addReadStatements(MethodSpec.Builder methodBuilder) {

diff --git a/src/main/java/com/github/moaxcp/x11client/protocol/X11Input.java b/src/main/java/com/github/moaxcp/x11client/protocol/X11Input.java
@@ -57,9 +57,7 @@ public interface X11Input {
 
   List<Integer> readFd(int length) throws IOException;
 
-  default void readPad(int length) throws IOException {
-    readByte(length);
-  }
+  byte[] readPad(int length) throws IOException;
 
   default void readPadAlign(int forLength) throws IOException {
     readPad(XObject.getSizeForPadAlign(forLength));

diff --git a/src/main/java/com/github/moaxcp/x11client/protocol/X11InputStream.java b/src/main/java/com/github/moaxcp/x11client/protocol/X11InputStream.java
@@ -173,6 +173,21 @@ public List<Integer> readFd(int length) throws IOException {
     return readInt32(length);
   }
 
+  @Override
+  public byte[] readPad(int length) throws IOException {
+    byte[] bytes = new byte[length];
+    int read = in.read(bytes);
+    int sum = read;
+    while(read != -1 && sum < length) {
+      read = in.read(bytes, sum, length - sum);
+      sum += read;
+    }
+    if(read == -1) {
+      throw new IOException("could not read " + length + " bytes for pad");
+    }
+    return bytes;
+  }
+
   @Override
   public int available() throws IOException {
     return in.available();

diff --git a/src/main/xcbXmls/xkb.xml b/src/main/xcbXmls/xkb.xml
@@ -2288,7 +2288,7 @@ authorization from the authors.
 					<field name="nShapes" type="CARD16" />
 					<field name="nSections" type="CARD16" />
 					<field name="nDoodads" type="CARD16" />
-					<field name="nKeyAliases" type="CARD16" />
+					<field name="nKeyAliases2" type="CARD16" />
 					<field name="baseColorNdx" type="CARD8" />
 					<field name="labelColorNdx" type="CARD8" />
 					<field name="labelFont" type="CountedString16" />