Another update to the LuminaRandR class - start writing up the non-active device detection routines.

4 files changed, 200 insertions, 3 deletions

diff --git a/src-qt5/core/libLumina/LuminaRandR-X11.cpp b/src-qt5/core/libLumina/LuminaRandR-X11.cpp
new file mode 100644
index 00000000..64712fd0
--- /dev/null
+++ b/src-qt5/core/libLumina/LuminaRandR-X11.cpp
@@ -0,0 +1,170 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "LuminaRandR.h"
+
+#include "xcb/randr.h"
+#include "xcb/xcb_atom.h"
+
+#include <QDebug>
+#include <QX11Info>
+
+class OutputDevice::p_objects{
+public:
+	xcb_atom_t monitor_atom;
+	QList<xcb_randr_output_t> outputs; //the actual output devices used by the monitor
+};
+
+//Global Listing of Devices
+QList<OutputDevice> OutputDevice::availableMonitors(){
+  QList<OutputDevice> list;
+  //Get the list of monitors
+  xcb_randr_get_monitors_cookie_t cookie = xcb_randr_get_monitors_unchecked(QX11Info::connection(), QX11Info::appRootWindow(), 1);
+  xcb_randr_get_monitors_reply_t *reply = xcb_randr_get_monitors_reply(QX11Info::connection(), cookie, NULL);
+  if(reply==0){ 
+    qDebug() << "Could not get monitor list";
+    return list;
+  }
+  xcb_randr_monitor_info_iterator_t iter = xcb_randr_get_monitors_monitors_iterator(reply);
+  qDebug() << "Number of Monitors:" << xcb_randr_get_monitors_monitors_length(reply);
+  while(iter.rem>0){
+    qDebug() << "Found Monitor:";
+    //qDebug() << " Index:" << iter.index << "Rem:" << iter.rem;
+    xcb_get_atom_name_reply_t *nreply = xcb_get_atom_name_reply(QX11Info::connection(), xcb_get_atom_name_unchecked(QX11Info::connection(), iter.data->name), NULL);
+    QString name = QString::fromLocal8Bit(xcb_get_atom_name_name(nreply), xcb_get_atom_name_name_length(nreply));
+    free(nreply);
+
+    qDebug() << "  - Name:" << iter.data->name << name;
+    qDebug() << "  - Primary:" << (iter.data->primary == 1);
+    qDebug() << "  - Automatic:" << (iter.data->automatic == 1);
+    qDebug() << "  - nOutput:" << iter.data->nOutput;
+    qDebug() << "  - Geometry:" << QRect(iter.data->x, iter.data->y, iter.data->width, iter.data->height);
+    qDebug() << "  - Physical Size (mm):" << iter.data->width_in_millimeters << "x" << iter.data->height_in_millimeters;
+    qDebug() << "  - Number of outputs:" << xcb_randr_monitor_info_outputs_length(iter.data);
+    xcb_randr_monitor_info_next(&iter);
+  }
+
+  //Free up any objects we are done with
+  free(reply);
+  //Return the list
+  return list;
+}
+
+//FUNCTIONS (do not use directly - use the static list function instead)
+OutputDevice::OutputDevice(){
+  enabled = false;
+  p_obj = new p_objects();
+  p_obj->monitor_atom = 0;
+}
+
+OutputDevice::~OutputDevice(){
+  
+}
+
+//Modification
+bool OutputDevice::setAsPrimary(){
+  if(isPrimary){ return true; }
+  if( !p_obj->outputs.isEmpty() ){
+    xcb_randr_set_output_primary (QX11Info::connection(), QX11Info::appRootWindow(), p_obj->outputs[0]);
+    isPrimary = true;
+  }
+  return isPrimary;
+}
+
+bool OutputDevice::disable(){
+  if(p_obj->monitor_atom!=0){
+    xcb_randr_delete_monitor(QX11Info::connection(), QX11Info::appRootWindow(), p_obj->monitor_atom);
+    p_obj->monitor_atom = 0;
+    return true; 
+  }
+  return false;
+}
+
+void OutputDevice::enable(QRect geom){
+  //if no geom provided, will add as the right-most screen at optimal resolution
+  if(p_obj->monitor_atom!=0){ return; }
+  qDebug() << "Enable Monitor:" << geom;
+
+}
+
+void OutputDevice::changeResolution(QSize){
+
+}
+
+OutputDeviceList::OutputDeviceList(){
+  xcb_randr_get_screen_resources_reply_t *reply = xcb_randr_get_screen_resources_reply(QX11Info::connection(),
+		xcb_randr_get_screen_resources_unchecked(QX11Info::connection(), QX11Info::appRootWindow()),
+		NULL);
+  int outputnum = xcb_randr_get_screen_resources_outputs_length(reply);
+  qDebug() << "Probing Screen Resources:";
+  qDebug() << " - Number of Outputs:" << outputnum;
+  qDebug() << " - Number of CRTC's:" << xcb_randr_get_screen_resources_crtcs_length(reply);
+  qDebug() << " - Number of Modes:" << xcb_randr_get_screen_resources_modes_length(reply);
+  qDebug() << " - Number of Names:" << xcb_randr_get_screen_resources_names_length(reply);
+  for(int i=0; i<outputnum; i++){
+    xcb_randr_output_t output = xcb_randr_get_screen_resources_outputs(reply)[i];
+    //Now display the info about this output
+    xcb_randr_get_output_info_reply_t *info = xcb_randr_get_output_info_reply(QX11Info::connection(), 
+		xcb_randr_get_output_info_unchecked(QX11Info::connection(), output, QX11Info::appTime()),
+		NULL);
+    qDebug() << "==== Output Information #"+QString::number(i);
+    qDebug() << "Number of Modes:" << xcb_randr_get_output_info_modes_length(info);
+    qDebug() << "Number of Clones:" << xcb_randr_get_output_info_clones_length(info);
+
+    //Names
+    int name_len = xcb_randr_get_output_info_name_length(info);
+    qDebug() << "Number of Names:" << name_len;
+    for(int n=0; n<name_len; n++){
+      xcb_get_atom_name_reply_t *nreply = xcb_get_atom_name_reply(QX11Info::connection(), xcb_get_atom_name_unchecked(QX11Info::connection(), xcb_randr_get_output_info_name(info)[n]), NULL);
+      QString name = QString::fromLocal8Bit(xcb_get_atom_name_name(nreply), xcb_get_atom_name_name_length(nreply));
+      free(nreply);
+      qDebug() << " -- " << name;
+    }
+
+    //Properties
+    xcb_randr_list_output_properties_reply_t *pinfo = xcb_randr_list_output_properties_reply(QX11Info::connection(), 
+		xcb_randr_list_output_properties_unchecked(QX11Info::connection(), output),
+		NULL);
+    int pinfo_len = xcb_randr_list_output_properties_atoms_length(pinfo);
+    qDebug() << "Properties:" << pinfo_len;
+    for(int p=0; p<pinfo_len; p++){
+      xcb_atom_t atom = xcb_randr_list_output_properties_atoms(pinfo)[p];
+      //Property Name
+      xcb_get_atom_name_reply_t *nreply = xcb_get_atom_name_reply(QX11Info::connection(), xcb_get_atom_name_unchecked(QX11Info::connection(), atom), NULL);
+      QString name = QString::fromLocal8Bit(xcb_get_atom_name_name(nreply), xcb_get_atom_name_name_length(nreply));
+      free(nreply);
+      //Property Value
+      xcb_randr_query_output_property_reply_t *pvalue = xcb_randr_query_output_property_reply(QX11Info::connection(),
+		xcb_randr_query_output_property_unchecked(QX11Info::connection(), output, atom),
+		NULL);
+      QStringList values; //need to read values
+      for(int v=0; v<xcb_randr_query_output_property_valid_values_length(pvalue); v++){
+        values << QString::number(xcb_randr_query_output_property_valid_values(pvalue)[v] );
+      }
+      free(pvalue);
+      qDebug() << " -- " << name << "=" << values;
+
+    }
+    free(pinfo);
+
+    free(info);
+  }
+  
+  free(reply);
+}
+
+OutputDeviceList::~OutputDeviceList(){
+
+}
+
+//Simplification functions for dealing with multiple monitors
+void OutputDeviceList::setPrimaryMonitor(QString id){
+
+}
+
+void OutputDeviceList::disableMonitor(QString id){
+
+}
diff --git a/src-qt5/core/libLumina/LuminaRandR.h b/src-qt5/core/libLumina/LuminaRandR.h
index bf2ba51a..448c676d 100644
--- a/src-qt5/core/libLumina/LuminaRandR.h
+++ b/src-qt5/core/libLumina/LuminaRandR.h
@@ -43,9 +43,10 @@ public:
 	~OutputDevice();
 
 	//Modification
-	void setAsPrimary();
-	void setEnabled(bool, QRect geom = QRect());
-	void setResolution(QSize);
+	bool setAsPrimary();
+	bool disable();
+	void enable(QRect geom = QRect()); //if no geom provided, will add as the right-most screen at optimal resolution
+	void changeResolution(QSize);
 	
 	//Now define a simple public_objects class so that each implementation 
 	//  has a storage container for placing private objects as needed
@@ -53,4 +54,17 @@ public:
 	p_objects* p_obj;
 };
 
+class OutputDeviceList : public QList<OutputDevice>{
+public:
+	OutputDeviceList();
+	~OutputDeviceList();
+
+	//Simplification functions for dealing with multiple monitors
+	void setPrimaryMonitor(QString id);
+	void disableMonitor(QString id);
+	//void enableMonitor(QString id, 
+
+private:
+
+};
 #endif
diff --git a/src-qt5/core/libLumina/LuminaRandR.pri b/src-qt5/core/libLumina/LuminaRandR.pri
new file mode 100644
index 00000000..0812819f
--- /dev/null
+++ b/src-qt5/core/libLumina/LuminaRandR.pri
@@ -0,0 +1,12 @@
+#include("$${PWD}/../../OS-detect.pri")
+
+QT *= x11extras
+
+#X11/XCB includes
+LIBS *= -lxcb -lxcb-randr
+SOURCES *= $${PWD}/LuminaRandR-X11.cpp
+
+#General API/Header
+HEADERS *= $${PWD}/LuminaRandR.h
+
+INCLUDEPATH *= ${PWD}
diff --git a/src-qt5/core/libLumina/test/main.cpp b/src-qt5/core/libLumina/test/main.cpp
index 39c229e2..309fb938 100644
--- a/src-qt5/core/libLumina/test/main.cpp
+++ b/src-qt5/core/libLumina/test/main.cpp
@@ -8,5 +8,6 @@ int main(int argc, char** argv){
   qDebug() << "Starting monitor scan...";
   QList<OutputDevice> outputs = OutputDevice::availableMonitors();
   qDebug() << "Finished monitor Scan";
+  OutputDeviceList();
   return 0;
 }