hyprwm
/
hyprwayland-scanner
mirror of https://github.com/hyprwm/hyprwayland-scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: fix protocol types in events sometimes unrecognized

This commit is contained in:
Vaxry 2024-05-07 14:26:05 +01:00
parent 1270ebaa53
commit 6119dc2a96
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.cpp
View File

@ -9,7 +9,6 @@
#include <filesystem> #include <filesystem>
struct SRequestArgument { struct SRequestArgument {
std::string CType;
std::string wlType; std::string wlType;
std::string interface; std::string interface;
std::string enumName; std::string enumName;
@ -107,8 +106,15 @@ std::string WPTypeToCType(const SRequestArgument& arg, bool event /* events pass
return "uint32_t"; return "uint32_t";
} }
if (arg.wlType == "object") if (arg.wlType == "object") {
if (!arg.interface.empty() && event) {
for (auto& i : XMLDATA.ifaces) {
if (i.name == arg.interface)
return camelize("C_" + arg.interface + "*");
}
}
return "wl_resource*"; return "wl_resource*";
}
if (arg.wlType == "int" || arg.wlType == "fd") if (arg.wlType == "int" || arg.wlType == "fd")
return "int32_t"; return "int32_t";
if (arg.wlType == "fixed") if (arg.wlType == "fixed")
@ -173,7 +179,6 @@ void parseXML(pugi::xml_document& doc) {
sargm.interface = arg.attribute("interface").as_string(); sargm.interface = arg.attribute("interface").as_string();
sargm.enumName = arg.attribute("enum").as_string(); sargm.enumName = arg.attribute("enum").as_string();
sargm.allowNull = arg.attribute("allow-null").as_string() == std::string{"true"}; sargm.allowNull = arg.attribute("allow-null").as_string() == std::string{"true"};
sargm.CType = WPTypeToCType(sargm, false);
srq.args.push_back(sargm); srq.args.push_back(sargm);
} }
@ -193,7 +198,6 @@ void parseXML(pugi::xml_document& doc) {
sargm.wlType = arg.attribute("type").as_string(); sargm.wlType = arg.attribute("type").as_string();
sargm.enumName = arg.attribute("enum").as_string(); sargm.enumName = arg.attribute("enum").as_string();
sargm.allowNull = arg.attribute("allow-null").as_string() == std::string{"true"}; sargm.allowNull = arg.attribute("allow-null").as_string() == std::string{"true"};
sargm.CType = WPTypeToCType(sargm, true);
sev.args.push_back(sargm); sev.args.push_back(sargm);
} }
@ -309,7 +313,7 @@ class {} {{
std::string args = ", "; std::string args = ", ";
for (auto& arg : rq.args) { for (auto& arg : rq.args) {
args += arg.CType + ", "; args += WPTypeToCType(arg, false) + ", ";
} }
args.pop_back(); args.pop_back();
@ -325,7 +329,7 @@ class {} {{
for (auto& ev : iface.events) { for (auto& ev : iface.events) {
std::string args = ""; std::string args = "";
for (auto& arg : ev.args) { for (auto& arg : ev.args) {
args += arg.CType + ", "; args += WPTypeToCType(arg, true) + ", ";
} }
if (!args.empty()) { if (!args.empty()) {
@ -348,7 +352,7 @@ class {} {{
std::string args = ", "; std::string args = ", ";
for (auto& arg : rq.args) { for (auto& arg : rq.args) {
args += arg.CType + ", "; args += WPTypeToCType(arg, false) + ", ";
} }
if (!args.empty()) { if (!args.empty()) {
@ -462,7 +466,7 @@ static const wl_interface* dummyTypes[] = { nullptr };
std::string argsC = ", "; std::string argsC = ", ";
for (auto& arg : rq.args) { for (auto& arg : rq.args) {
argsC += arg.CType + " " + arg.name + ", "; argsC += WPTypeToCType(arg, false) + " " + arg.name + ", ";
} }
argsC.pop_back(); argsC.pop_back();
@ -521,7 +525,7 @@ static const void* {}[] = {{
std::string argsC = ""; std::string argsC = "";
for (auto& arg : ev.args) { for (auto& arg : ev.args) {
argsC += arg.CType + " " + arg.name + ", "; argsC += WPTypeToCType(arg, true) + " " + arg.name + ", ";
} }
if (!argsC.empty()) { if (!argsC.empty()) {
@ -531,7 +535,7 @@ static const void* {}[] = {{
std::string argsN = ", "; std::string argsN = ", ";
for (auto& arg : ev.args) { for (auto& arg : ev.args) {
if (arg.interface.empty() || arg.wlType != "new_id") if (!WPTypeToCType(arg, true).starts_with("C"))
argsN += arg.name + ", "; argsN += arg.name + ", ";
else else
argsN += arg.name + "->pResource, "; argsN += arg.name + "->pResource, ";
@ -676,7 +680,7 @@ void {}::onDestroyCalled() {{
for (auto& rq : iface.requests) { for (auto& rq : iface.requests) {
std::string args = ", "; std::string args = ", ";
for (auto& arg : rq.args) { for (auto& arg : rq.args) {
args += arg.CType + ", "; args += WPTypeToCType(arg, false) + ", ";
} }
args.pop_back(); args.pop_back();