functions from libgamma-facade that will not be moved into classes

Signed-off-by: Mattias Andrée <maandree@operamail.com>

4 files changed, 345 insertions, 1 deletions

diff --git a/src/libgamma-facade.cc b/src/libgamma-facade.cc
new file mode 100644
index 0000000..4937e78
--- /dev/null
+++ b/src/libgamma-facade.cc
@@ -0,0 +1,176 @@
+/**
+ * libgammamm -- C++ wrapper for libgamma
+ * Copyright (C) 2014  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "libgamma-facade.hh"
+
+#include <cstdlib>
+
+
+namespace libgamma
+{
+  /**
+   * List available adjustment methods by their order of preference based on the environment.
+   * 
+   * @param  operation  Allowed values:
+   *                      0: Methods that the environment suggests will work, excluding fake.
+   *                      1: Methods that the environment suggests will work, including fake.
+   *                      2: All real non-fake methods.
+   *                      3: All real methods.
+   *                      4: All methods.
+   *                    Other values invoke undefined behaviour.
+   * @return            Array of methods.
+   */
+  std::vector<int> list_methods(int operation)
+  {
+    int* methods = (int*)malloc(LIBGAMMA_METHOD_COUNT * sizeof(int));
+    size_t n, i;
+    std::vector<int> rc;
+    
+    n = libgamma_list_methods(methods, LIBGAMMA_METHOD_COUNT, operation);
+    if (n > LIBGAMMA_METHOD_COUNT)
+      {
+	free(methods);
+	methods = (int*)malloc(n * sizeof(int));
+	libgamma_list_methods(methods, n, operation);
+      }
+    
+    for (i = 0; i < n; i++)
+      rc.push_back(methods[i]);
+    
+    free(methods);
+    return rc;
+  }
+  
+  
+  /**
+   * Check whether an adjustment method is available, non-existing (invalid) methods will be
+   * identified as not available under the rationale that the library may be out of date.
+   * 
+   * @param   method  The adjustment method.
+   * @return          Whether the adjustment method is available.
+   */
+  int is_method_available(int method)
+  {
+    return libgamma_is_method_available(method);
+  }
+  
+  
+  /**
+   * Return the capabilities of an adjustment method.
+   * 
+   * @param  output  The data structure to fill with the method's capabilities,
+   * @param  method  The adjustment method (display server and protocol).
+   */
+  void method_capabilities(MethodCapabilities* output, int method)
+  {
+    libgamma_method_capabilities_t caps;
+    libgamma_method_capabilities(&caps, method);
+    *output = MethodCapabilities(&caps);
+  }
+  
+  
+  /**
+   * Return the default site for an adjustment method.
+   * 
+   * @param   method  The adjustment method (display server and protocol.)
+   * @return          The default site, `nullptr` if it cannot be determined or if
+   *                  multiple sites are not supported by the adjustment method.
+   */
+  std::string* method_default_site(int method)
+  {
+    char* cstr = libgamma_method_default_site(method);
+    if (cstr == nullptr)
+      return nullptr;
+    return new std::string(cstr);
+  }
+  
+  
+  /**
+   * Return the default variable that determines
+   * the default site for an adjustment method.
+   * 
+   * @param   method  The adjustment method (display server and protocol.)
+   * @return          The environ variables that is used to determine the
+   *                  default site. `nullptr` if there is none, that is, if
+   *                  the method does not support multiple sites.
+   *                  This value should not be `free`:d.
+   */
+  std::string* method_default_site_variable(int method)
+  {
+    const char* cstr = libgamma_method_default_site_variable(method);
+    if (cstr == nullptr)
+      return nullptr;
+    return new std::string(cstr);
+  }
+  
+  /**
+   * Convert a raw representation of an EDID to a lowercase hexadecimal representation.
+   * 
+   * @param   edid    The EDID in raw representation.
+   * @param   length  The length of `edid`.
+   * @return          The EDID in lowercase hexadecimal representation.
+   */
+  std::string behex_edid(const unsigned char* edid, size_t length)
+  {
+    return behex_edid_lowercase(edid, length);
+  }
+  
+  /**
+   * Convert a raw representation of an EDID to a lowercase hexadecimal representation.
+   * 
+   * @param   edid    The EDID in raw representation.
+   * @param   length  The length of `edid`.
+   * @return          The EDID in lowercase hexadecimal representation.
+   */
+  std::string behex_edid_lowercase(const unsigned char* edid, size_t length)
+  {
+    char* cstr = libgamma_behex_edid_lowercase(edid, length);
+    std::string rc = std::string(cstr);
+    free(cstr);
+    return rc;
+  }
+  
+  /**
+   * Convert a raw representation of an EDID to an uppercase hexadecimal representation.
+   * 
+   * @param   edid    The EDID in raw representation.
+   * @param   length  The length of `edid`.
+   * @return          The EDID in uppercase hexadecimal representation.
+   */
+  std::string behex_edid_uppercase(const unsigned char* edid, size_t length)
+  {
+    char* cstr = libgamma_behex_edid_uppercase(edid, length);
+    std::string rc = std::string(cstr);
+    free(cstr);
+    return rc;
+  }
+  
+  /**
+   * Convert an hexadecimal representation of an EDID to a raw representation.
+   * 
+   * @param   edid  The EDID in hexadecimal representation.
+   * @return        The EDID in raw representation, it will be half the length
+   *                of `edid` (the input value).
+   */
+  unsigned char* unhex_edid(const std::string edid)
+  {
+    const char* cstr = edid.c_str();
+    return libgamma_unhex_edid(cstr);
+  }
+  
+}
+
diff --git a/src/libgamma-facade.hh b/src/libgamma-facade.hh
new file mode 100644
index 0000000..98ee78e
--- /dev/null
+++ b/src/libgamma-facade.hh
@@ -0,0 +1,122 @@
+/**
+ * libgammamm -- C++ wrapper for libgamma
+ * Copyright (C) 2014  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef LIBGAMMA_FACADE_HH
+#define LIBGAMMA_FACADE_HH
+
+
+#include <string>
+#include <vector>
+
+#include "libgamma-native.hh"
+#include "libgamma-method.hh"
+
+
+namespace libgamma
+{
+  /**
+   * List available adjustment methods by their order of preference based on the environment.
+   * 
+   * @param  operation  Allowed values:
+   *                      0: Methods that the environment suggests will work, excluding fake.
+   *                      1: Methods that the environment suggests will work, including fake.
+   *                      2: All real non-fake methods.
+   *                      3: All real methods.
+   *                      4: All methods.
+   *                    Other values invoke undefined behaviour.
+   * @return            Array of methods.
+   */
+  std::vector<int> list_methods(int operation);
+  
+  /**
+   * Check whether an adjustment method is available, non-existing (invalid) methods will be
+   * identified as not available under the rationale that the library may be out of date.
+   * 
+   * @param   method  The adjustment method.
+   * @return          Whether the adjustment method is available.
+   */
+  int is_method_available(int method);
+  
+  /**
+   * Return the capabilities of an adjustment method.
+   * 
+   * @param  output  The data structure to fill with the method's capabilities,
+   * @param  method  The adjustment method (display server and protocol).
+   */
+  void method_capabilities(MethodCapabilities* output, int method);
+  
+  /**
+   * Return the default site for an adjustment method.
+   * 
+   * @param   method  The adjustment method (display server and protocol.)
+   * @return          The default site, `nullptr` if it cannot be determined or if
+   *                  multiple sites are not supported by the adjustment method.
+   */
+  std::string* method_default_site(int method);
+  
+  /**
+   * Return the default variable that determines
+   * the default site for an adjustment method.
+   * 
+   * @param   method  The adjustment method (display server and protocol.)
+   * @return          The environ variables that is used to determine the
+   *                  default site. `nullptr` if there is none, that is, if
+   *                  the method does not support multiple sites.
+   */
+  std::string* method_default_site_variable(int method);
+  
+  /**
+   * Convert a raw representation of an EDID to a lowercase hexadecimal representation.
+   * 
+   * @param   edid    The EDID in raw representation.
+   * @param   length  The length of `edid`.
+   * @return          The EDID in lowercase hexadecimal representation.
+   */
+  std::string behex_edid(const unsigned char* edid, size_t length);
+  
+  /**
+   * Convert a raw representation of an EDID to a lowercase hexadecimal representation.
+   * 
+   * @param   edid    The EDID in raw representation.
+   * @param   length  The length of `edid`.
+   * @return          The EDID in lowercase hexadecimal representation.
+   */
+  std::string behex_edid_lowercase(const unsigned char* edid, size_t length);
+  
+  /**
+   * Convert a raw representation of an EDID to an uppercase hexadecimal representation.
+   * 
+   * @param   edid    The EDID in raw representation.
+   * @param   length  The length of `edid`.
+   * @return          The EDID in uppercase hexadecimal representation.
+   */
+  std::string behex_edid_uppercase(const unsigned char* edid, size_t length);
+  
+  /**
+   * Convert an hexadecimal representation of an EDID to a raw representation.
+   * 
+   * @param   edid  The EDID in hexadecimal representation.
+   * @return        The EDID in raw representation, it will be half the length
+   *                of `edid` (the input value).
+   */
+  unsigned char* unhex_edid(const std::string edid);
+  
+}
+
+
+#endif
+
diff --git a/src/libgamma.hh b/src/libgamma.hh
index 64ca221..2a2666c 100644
--- a/src/libgamma.hh
+++ b/src/libgamma.hh
@@ -21,6 +21,7 @@
 
 #include "libgamma-error.hh"
 #include "libgamma-method.hh"
+#include "libgamma-facade.hh"
 
 
 #endif
diff --git a/src/test.cc b/src/test.cc
index 5118e8e..0c63f88 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -27,9 +27,11 @@ int main(void)
   libgamma::Partition* partition;
   libgamma::CRTC* crtc;
   libgamma::CRTCInformation info;
+  int method;
   
   std::string* str;
   char* cstr;
+  unsigned char* edid;
   
   libgamma::perror("test", 0);
   libgamma::perror("test", 2);
@@ -46,7 +48,50 @@ int main(void)
   delete str;
   std::cout << std::endl;
   
-  site = new libgamma::Site(LIBGAMMA_METHOD_X_RANDR, new std::string(":0"));
+  for (int m : libgamma::list_methods(0))
+    std::cout << m << " ";
+  std::cout << std::endl;
+  for (int m : libgamma::list_methods(1))
+    std::cout << m << " ";
+  std::cout << std::endl;
+  for (int m : libgamma::list_methods(2))
+    std::cout << m << " ";
+  std::cout << std::endl;
+  for (int m : libgamma::list_methods(3))
+    std::cout << m << " ";
+  std::cout << std::endl;
+  for (int m : libgamma::list_methods(4))
+    std::cout << m << " ";
+  std::cout << std::endl;
+  std::cout << std::endl;
+  method = libgamma::list_methods(0)[0];
+  
+  std::cout << libgamma::is_method_available(LIBGAMMA_METHOD_X_RANDR) << std::endl;
+  str = libgamma::method_default_site(LIBGAMMA_METHOD_X_RANDR);
+  if (str == nullptr)
+    std::cout << "(nullptr)" << std::endl;
+  else
+    std::cout << *str << std::endl;
+  delete str;
+  str = libgamma::method_default_site_variable(LIBGAMMA_METHOD_X_RANDR);
+  if (str == nullptr)
+    std::cout << "(nullptr)" << std::endl;
+  else
+    std::cout << *str << std::endl;
+  delete str;
+  std::cout << std::endl;
+  
+  edid = libgamma::unhex_edid("0123456789abcdef");
+  cstr = libgamma_behex_edid(edid, 8);
+  std::cout << cstr << std::endl;
+  free(cstr);
+  std::cout << libgamma::behex_edid(edid, 8) << std::endl;
+  std::cout << libgamma::behex_edid_lowercase(edid, 8) << std::endl;
+  std::cout << libgamma::behex_edid_uppercase(edid, 8) << std::endl;
+  free(edid);
+  std::cout << std::endl;
+  
+  site = new libgamma::Site(method, new std::string(":0"));
   std::cout << site->partitions_available << std::endl;
   partition = new libgamma::Partition(site, 0);
   std::cout << partition->crtcs_available << std::endl;