From 36465a427ccbd75a611b875ede89b333bff32703 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Tue, 21 Nov 2023 23:01:41 -0500
Subject: [PATCH] Adding module-info and generated classes

---
 .idea/misc.xml                                |  2 +-
 .idea/modules.xml                             | 12 +++++++
 .../modules/buildSrc/x11-client.buildSrc.iml  |  8 +++++
 .idea/modules/x11-client.main.iml             |  8 ++---
 .idea/vcs.xml                                 |  5 +++
 .idea/x11-client.iml                          |  8 ++++-
 build.gradle                                  |  4 +--
 src/main/java/module-info.java                | 36 +++++++++++++++++++
 8 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/modules/buildSrc/x11-client.buildSrc.iml
 create mode 100644 src/main/java/module-info.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0f3f702e..22157975 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,5 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="nix 17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="nix 17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..eb2f066d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/x11-client.iml" filepath="$PROJECT_DIR$/.idea/x11-client.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/buildSrc/x11-client.buildSrc.iml" filepath="$PROJECT_DIR$/.idea/modules/buildSrc/x11-client.buildSrc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-client.main.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-client.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-client.test.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-client.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-client.testFixtures.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-client.testFixtures.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/buildSrc/x11-client.buildSrc.iml b/.idea/modules/buildSrc/x11-client.buildSrc.iml
new file mode 100644
index 00000000..6310a4df
--- /dev/null
+++ b/.idea/modules/buildSrc/x11-client.buildSrc.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../../buildSrc" dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/../../../buildSrc/.idea" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/x11-client.main.iml b/.idea/modules/x11-client.main.iml
index 4a4ce554..afc1871c 100644
--- a/.idea/modules/x11-client.main.iml
+++ b/.idea/modules/x11-client.main.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
-  <component name="CheckStyle-IDEA-Module">
-    <option name="configuration">
-      <map />
-    </option>
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
+    </content>
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..8d3e42f2 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GitSharedSettings">
+    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
+      <list />
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
diff --git a/.idea/x11-client.iml b/.idea/x11-client.iml
index fd3b7a2e..06ca6500 100644
--- a/.idea/x11-client.iml
+++ b/.idea/x11-client.iml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="x11-client:integrationTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.moaxcp.x11" external.system.module.version="" type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b7f7ac3c..0ff0b403 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,8 +59,8 @@ jacocoTestReport {
 }
 
 x11Protocol {
-    outputSrc = file('build/generated/xproto/java/')
-    outputResources = file('build/generated/xproto/resources')
+    outputSrc = file('src/xproto/java/')
+    outputResources = file('src/xproto/resources')
     xcbXmls = file('src/main/xcbXmls')
     keysymHeaders = file('src/main/keysym')
 }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 00000000..d95125ba
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,36 @@
+module com.github.moaxcp.x11.client {
+    exports com.github.moaxcp.x11client;
+    exports com.github.moaxcp.x11client.experimental;
+    exports com.github.moaxcp.x11client.protocol;
+    exports com.github.moaxcp.x11client.protocol.xproto;
+    exports com.github.moaxcp.x11client.protocol.bigreq;
+    exports com.github.moaxcp.x11client.protocol.composite;
+    exports com.github.moaxcp.x11client.protocol.damage;
+    exports com.github.moaxcp.x11client.protocol.dpms;
+    exports com.github.moaxcp.x11client.protocol.dri2;
+    exports com.github.moaxcp.x11client.protocol.dri3;
+    exports com.github.moaxcp.x11client.protocol.ge;
+    exports com.github.moaxcp.x11client.protocol.glx;
+    exports com.github.moaxcp.x11client.protocol.present;
+    exports com.github.moaxcp.x11client.protocol.randr;
+    exports com.github.moaxcp.x11client.protocol.record;
+    exports com.github.moaxcp.x11client.protocol.render;
+    exports com.github.moaxcp.x11client.protocol.res;
+    exports com.github.moaxcp.x11client.protocol.screensaver;
+    exports com.github.moaxcp.x11client.protocol.shape;
+    exports com.github.moaxcp.x11client.protocol.shm;
+    exports com.github.moaxcp.x11client.protocol.sync;
+    exports com.github.moaxcp.x11client.protocol.xc_misc;
+    exports com.github.moaxcp.x11client.protocol.xevie;
+    exports com.github.moaxcp.x11client.protocol.xf86dri;
+    exports com.github.moaxcp.x11client.protocol.xf86vidmode;
+    exports com.github.moaxcp.x11client.protocol.xfixes;
+    exports com.github.moaxcp.x11client.protocol.xinerama;
+    exports com.github.moaxcp.x11client.protocol.xinput;
+    exports com.github.moaxcp.x11client.protocol.xkb;
+    exports com.github.moaxcp.x11client.protocol.xprint;
+    exports com.github.moaxcp.x11client.protocol.xselinux;
+    exports com.github.moaxcp.x11client.protocol.xtest;
+    exports com.github.moaxcp.x11client.protocol.xv;
+    exports com.github.moaxcp.x11client.protocol.xvmc;
+}
\ No newline at end of file