Merge pull request #1358 from RyanGibb/output-dimensions

added output-dimensions option

src/client.cpp

@@ -58,7 +58,7 @@ void waybar::Client::handleGlobalRemove(void* data, struct wl_registry* /*regist
 void waybar::Client::handleOutput(struct waybar_output& output) {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
       .logical_position = [](void*, struct zxdg_output_v1*, int32_t, int32_t) {},
-      .logical_size = [](void*, struct zxdg_output_v1*, int32_t, int32_t) {},
+      .logical_size = &handleOutputLogicalSize,
       .done = &handleOutputDone,
       .name = &handleOutputName,
       .description = &handleOutputDescription,
@@ -79,7 +79,19 @@ struct waybar::waybar_output& waybar::Client::getOutput(void* addr) {
 }
 
 std::vector<Json::Value> waybar::Client::getOutputConfigs(struct waybar_output& output) {
-  return config.getOutputConfigs(output.name, output.identifier);
+  return config.getOutputConfigs(output.name, output.identifier, output.width, output.height);
+}
+
+void waybar::Client::handleOutputLogicalSize(void* data, struct zxdg_output_v1* object,
+                                             int32_t width, int32_t height) {
+  auto client = waybar::Client::inst();
+  try {
+    auto& output = client->getOutput(data);
+    output.width = width;
+    output.height = height;
+  } catch (const std::exception& e) {
+    std::cerr << e.what() << std::endl;
+  }
 }
 
 void waybar::Client::handleOutputDone(void* data, struct zxdg_output_v1* /*xdg_output*/) {

src/config.cpp

@@ -175,7 +175,7 @@ void Config::mergeConfig(Json::Value& a_config_, Json::Value& b_config_) {
   }
 }
 bool isValidOutput(const Json::Value& config, const std::string& name,
-                   const std::string& identifier) {
+                   const std::string& identifier, int32_t width, int32_t height) {
   const auto isOutputMatches = [&](const std::string& output) -> bool {
     if (output.substr(0, 1) == "$") {
       auto* const environment_value = std::getenv(output.substr(1).c_str());
@@ -227,6 +227,41 @@ bool isValidOutput(const Json::Value& config, const std::string& name,
     }
   }
 
+  // if "output-dimensions" is a string, make it an array of size 1
+  Json::Value config_output_dimensions = config["output-dimensions"];
+  if (config_output_dimensions.isString()) {
+    Json::Value jsonArray(Json::arrayValue);
+    jsonArray.append(config_output_dimensions);
+    config_output_dimensions = jsonArray;
+  }
+  if (config_output_dimensions.isArray()) {
+    for (auto const& config_output_dimension : config_output_dimensions) {
+      if (!config_output_dimension.isString()) {
+        continue;
+      }
+      std::string str = config_output_dimension.asString();
+      int i = str.find(" ");
+      std::string dimension = str.substr(0, i);
+      str = str.substr(i + 1);
+      i = str.find(" ");
+      std::string comparator = str.substr(0, i);
+      int value = std::stoi(str.substr(i));
+
+      int comparison_value;
+      if (dimension == "height") {
+        comparison_value = height;
+      } else if (dimension == "width") {
+        comparison_value = width;
+      } else {
+        continue;
+      }
+
+      if ((comparator == "<" && comparison_value >= value) ||
+          (comparator == ">" && comparison_value <= value)) {
+        return false;
+      }
+    }
+  }
   return true;
 }
 
@@ -242,15 +277,16 @@ void Config::load(const std::string& config) {
 }
 
 std::vector<Json::Value> Config::getOutputConfigs(const std::string& name,
-                                                  const std::string& identifier) {
+                                                  const std::string& identifier, int32_t width,
+                                                  int32_t height) {
   std::vector<Json::Value> configs;
   if (config_.isArray()) {
     for (auto const& config : config_) {
-      if (config.isObject() && isValidOutput(config, name, identifier)) {
+      if (config.isObject() && isValidOutput(config, name, identifier, width, height)) {
         configs.push_back(config);
       }
     }
-  } else if (isValidOutput(config_, name, identifier)) {
+  } else if (isValidOutput(config_, name, identifier, width, height)) {
     configs.push_back(config_);
   }
   return configs;