summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--oldsrc/beamergui.pro27
-rw-r--r--oldsrc/displaymanager.cpp36
-rw-r--r--oldsrc/displaymanager.h32
-rw-r--r--oldsrc/main.cpp11
-rw-r--r--oldsrc/output.cpp119
-rw-r--r--oldsrc/output.h47
-rw-r--r--oldsrc/widget.cpp145
-rw-r--r--oldsrc/widget.h31
-rw-r--r--oldsrc/widget.ui39
9 files changed, 0 insertions, 487 deletions
diff --git a/oldsrc/beamergui.pro b/oldsrc/beamergui.pro
deleted file mode 100644
index 936b664..0000000
--- a/oldsrc/beamergui.pro
+++ /dev/null
@@ -1,27 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-10-14T14:24:40
-#
-#-------------------------------------------------
-
-QT += core gui
-
-TARGET = beamergui
-TEMPLATE = app
-
-
-SOURCES += main.cpp\
- widget.cpp \
- output.cpp \
- displaymanager.cpp
-
-HEADERS += \
- widget.h \
- output.h \
- displaymanager.h
-
-FORMS += widget.ui
-
-
-LIBS += -lXrandr -lX11
-
diff --git a/oldsrc/displaymanager.cpp b/oldsrc/displaymanager.cpp
deleted file mode 100644
index 61f35ea..0000000
--- a/oldsrc/displaymanager.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "displaymanager.h"
-
-
-DisplayManager * DisplayManager::Instance = NULL;
-
-DisplayManager::DisplayManager()
-{
- dpy = NULL;
- resources = NULL;
-
-
- // Get initial data (to be freed)
- dpy = XOpenDisplay(NULL);
- resources = XRRGetScreenResourcesCurrent(dpy, DefaultRootWindow(dpy));
-
- // Get outputs
- for (int i = 0; i < resources->noutput; ++i) {
- XRROutputInfo *info = XRRGetOutputInfo (dpy, resources, resources->outputs[i]);
- if (info->connection == RR_Connected)
- Outputs.push_back(Output(dpy, resources, resources->outputs[i]));
- XRRFreeOutputInfo(info);
- }
-}
-
-DisplayManager::~DisplayManager()
-{
- XCloseDisplay(dpy);
- XRRFreeScreenResources(resources);
-}
-
-DisplayManager *DisplayManager::Inst()
-{
- if (Instance == 0)
- Instance = new DisplayManager();
- return Instance;
-}
diff --git a/oldsrc/displaymanager.h b/oldsrc/displaymanager.h
deleted file mode 100644
index 775b87b..0000000
--- a/oldsrc/displaymanager.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef DISPLAYMANAGER_H
-#define DISPLAYMANAGER_H
-
-#include <QDebug>
-#include "output.h"
-
-#include <vector>
-using namespace std;
-
-class DisplayManager
-{
-public:
-
- inline vector<Output>& getConnectedOutputs(){ return Outputs; }
-
-private:
-
- Display *dpy;
- XRRScreenResources *resources;
- vector<Output> Outputs;
-
-
-/** Singleton pattern **/
-public:
- static DisplayManager * Inst();
-private:
- static DisplayManager * Instance;
- DisplayManager();
- ~DisplayManager();
-};
-
-#endif // DISPLAYMANAGER_H
diff --git a/oldsrc/main.cpp b/oldsrc/main.cpp
deleted file mode 100644
index cb48fbb..0000000
--- a/oldsrc/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <QtGui/QApplication>
-#include "widget.h"
-
-
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
- Widget w;
- w.show();
- return a.exec();
-}
diff --git a/oldsrc/output.cpp b/oldsrc/output.cpp
deleted file mode 100644
index 94f6c89..0000000
--- a/oldsrc/output.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "output.h"
-#include "stdio.h"
-
-
-//DEVUTG
-#include <inttypes.h>
-
-Output::Output(Display *dpy, XRRScreenResources *resources, RROutput output)
- :dpy(dpy), resources(resources), ID(output)
-{
-
-}
-
-
-bool Output::hasEDID() const
-{
- int nprop;
- Atom *props = XRRListOutputProperties(dpy, ID, &nprop);
- Atom actual_type;
- int actual_format;
- unsigned long nitems, bytes_after;
- unsigned char *prop;
- XRRPropertyInfo *propinfo;
- int bytes_per_item, k;
-
- for (int i = 0; i < nprop; ++i) {
- char *atom_name = XGetAtomName (dpy, props[i]);
- if ( strcmp (atom_name, "EDID") == 0)
- {
- fprintf (stderr, "EDIDCHECK");
- XRRGetOutputProperty (dpy, ID, props[i],
- 0, 100, False, False,
- AnyPropertyType,
- &actual_type, &actual_format,
- &nitems, &bytes_after, &prop);
-
- propinfo = XRRQueryOutputProperty(dpy, ID, props[i]);
- bytes_per_item = actual_format / 8;
-
- fprintf (stderr, "\t%s: ", atom_name);
-
- for (k = 0; k < nitems; k++)
- {
- if (k != 0)
- {
- if ((k % 16) == 0)
- {
- fprintf (stderr, "\n\t\t");
- }
- }
- const uint8_t *val = prop + (k * bytes_per_item);
- fprintf (stderr, "%d02", *val);
-
- }
- free(propinfo);
- return true;
- }
- }
-
-}
-
-
-
-bool Output::isProjector() const
-{
- XRROutputInfo *info = XRRGetOutputInfo (dpy, resources, ID);
- bool result = ( info->mm_height == 0 && info->mm_width == 0 );
- XRRFreeOutputInfo(info);
- return result;
-}
-
-Resolution Output::getCurrentMode() const
-{
- XRROutputInfo *OutputInfo = XRRGetOutputInfo (dpy, resources, ID);
- XRRCrtcInfo *CrtcInfo = XRRGetCrtcInfo(dpy, resources, OutputInfo->crtc);
- Resolution result = { CrtcInfo->width, CrtcInfo->height };
- XRRFreeCrtcInfo(CrtcInfo);
- XRRFreeOutputInfo(OutputInfo);
- return result;
-}
-
-
-Resolution Output::getPreferredMode() const
-{
- XRROutputInfo *OutputInfo = XRRGetOutputInfo (dpy, resources, ID);
- RRMode preferred = OutputInfo->modes[OutputInfo->npreferred];
- XRRFreeOutputInfo(OutputInfo);
- return getResolution(preferred);
-}
-
-
-QSet<Resolution> Output::getSupportedModes() const
-{
- QSet<Resolution> result;
- XRROutputInfo *info = XRRGetOutputInfo (dpy, resources, ID);
- for (int i = 0; i < info->nmode; ++i)
- result.insert(getResolution(info->modes[i]));
- XRRFreeOutputInfo(info);
- return result;
-}
-
-
-Resolution Output::addMode(Resolution) const
-{
- // TODO
- return Resolution();
-}
-
-Resolution Output::getResolution(RRMode mode) const
-{
- for (int i = 0; i < resources->nmode; ++i) {
- if ( resources->modes[i].id == mode ) {
- Resolution res = {resources->modes[i].width, resources->modes[i].height};
- return res;
- }
- }
- fprintf ( stderr, "Could not find a mode for the requested XID %d", (int)mode);
- exit(1);
-}
diff --git a/oldsrc/output.h b/oldsrc/output.h
deleted file mode 100644
index 553444d..0000000
--- a/oldsrc/output.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef OUTPUT_H
-#define OUTPUT_H
-
-#include <QDebug>
-#include <QSet>
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-
-typedef struct _Resolution{
- unsigned int width;
- unsigned int height;
-}Resolution;
-
-inline bool operator==(const Resolution& lhs, const Resolution& rhs) {
- return lhs.width == rhs.width && lhs.height == rhs.height;
-}
-
-inline uint qHash(const Resolution &key)
-{
- return qHash(key.width ^ key.height);
-}
-
-class Output
-{
-public:
-
-
- Output(Display *dpy, XRRScreenResources *resources, RROutput output);
-
- bool hasEDID() const;
- bool isProjector() const;
- Resolution getCurrentMode() const;
- Resolution getPreferredMode() const;
- QSet<Resolution> getSupportedModes() const;
- Resolution addMode(Resolution) const;
-
-private:
-
- Display *dpy;
- XRRScreenResources *resources;
- RROutput ID;
-
- Resolution getResolution(RRMode) const;
-};
-
-#endif // OUTPUT_H
diff --git a/oldsrc/widget.cpp b/oldsrc/widget.cpp
deleted file mode 100644
index 7867f92..0000000
--- a/oldsrc/widget.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include "widget.h"
-#include "ui_widget.h"
-#include "displaymanager.h"
-
-
-//#include <QString>
-//#include <QSet>
-//#include <QDebug>
-#include <vector>
-using namespace std;
-
-#include <algorithm>
-
-Widget::Widget(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::Widget)
-{
- ui->setupUi(this);
-
- DisplayManager* DM = DisplayManager::Inst();
-
- for (std::vector<Output>::iterator i = DM->getConnectedOutputs().begin(); i != DM->getConnectedOutputs().end(); ++i)
- {
- qDebug() << "EDID?" << ( (*i).hasEDID() ? "true" : "false");
- qDebug() << "Proj?" << ( (*i).isProjector() ? "true" : "false");
- qDebug() << "Current?" << (*i).getCurrentMode().width<< (*i).getCurrentMode().height;
- qDebug() << "Preferred?" << (*i).getPreferredMode().width << (*i).getPreferredMode().height;
- QSet<Resolution> modes = (*i).getSupportedModes();
- for ( QSet<Resolution>::iterator i = modes.begin(); i != modes.end(); ++i )
- {
- qDebug() << "---- " << (*i).width << (*i).height;
- }
- }
-
-
-
-
-
-// XManager * XM = XManager::Inst();
-
-
-// switch ( XM->getOutputInfos().size() ){
-// /*************************************************************************/
-// case 1:// In case of one connected output - xrandr --auto
-// qDebug() << "Normal output";
-// exit(0);
-// break;
-// /*************************************************************************/
-// case 2: // In case of two connected outputs
-
-// /*********************************************************************/
-// // If one of the two connected outputs is a beamer
-// if ( true ) //( XM->getOutputInfos()[0]->mm_width == 0 && XM->getOutputInfos()[0]->mm_height == 0 )
-// // || ( XM->getOutputInfos()[1]->mm_width == 0 && XM->getOutputInfos()[1]->mm_height == 0 ) )
-// {
-// /*****************************************************************/
-// // If the beamer transmits reliable EDID data.
-// if( isReliableEDIDpresent() )
-// {
-// qDebug() << "beamer output reliable EDID ";
-// configureWidgetForBeamerWithEDID();
-// }
-// /*****************************************************************/
-// // If the beamer DOES NOT transmits reliable EDID data.
-// else
-// {
-// qDebug() << "beamer output no reliable EDID ";
-// configureWidgetForBeamerWithEDID();
-// }
-// /*****************************************************************/
-
-// }
-// /*********************************************************************/
-// // If NEITHER of the outputs is a beamer (likely dualscreen setup)
-// else
-// {
-// // Just apply preferred settings
-// qDebug() << "dualscreen output";
-
-// }
-// break;
-// /*************************************************************************/
-// default:
-// // If there are more than 3 outputs
-// // its up to the user. Quit.
-// exit(0);
-// break;
-// }
-// /*************************************************************************/
-
-
-
-
-
-
- //Remove borders and stuff
- setWindowFlags(windowFlags() | Qt::FramelessWindowHint);
-
-
-
-
- // QSet<RRMode> outputs0, outputs1;
- // for (int i = 0; i < XManager::Inst()->getOutputInfos()[0]->nmode; ++i)
- // outputs0.insert(XManager::Inst()->getOutputInfos()[0]->modes[i]);
- // for (int i = 0; i < XManager::Inst()->getOutputInfos()[1]->nmode; ++i)
- // outputs1.insert(XManager::Inst()->getOutputInfos()[1]->modes[i]);
- // outputs0.intersect(outputs1);
-
- // // Fill treewidget with data from cups dests;
- // for ( QSet<RRMode>::iterator it = outputs0.begin(); it != outputs0.end(); ++it )
- // {
- // qDebug() << *it;
- // qDebug() << XManager::Inst()->getModeMap()[*it];
- // ui->comboBox->addItem(XManager::Inst()->getModeMap().at(*it), (unsigned long long int)*it);
- // }
-
- // // Fill treewidget with data from cups dests;
- // for ( map<XID, char *>::iterator it = XManager::Inst()->getModeMap().begin(); it != XManager::Inst()->getModeMap().end(); ++it )
- // {
- // qDebug() << it->first ;
- //// qDebug() << XManager::getInstance()->getModeMap()[*it];
- //// ui->comboBox->addItem(XManager::getInstance()->getModeMap().at(*it), (unsigned long long int)*it);
- // }
-
- // Resize widget to its content
- resize(sizeHint());
-
- // Center dialog on screenbottom
- const QRect desktopRect = QApplication::desktop()->screenGeometry();
- this->move( desktopRect.width()/2-this->width()/2,
- desktopRect.height()-this->height());
- }
-
- Widget::~Widget()
- {
- delete ui;
- }
-
- void Widget::configureWidgetForBeamerWithEDID()
- {
- }
-
- void Widget::configureWidgetForBeamerWithOUTEDID()
- {
- }
diff --git a/oldsrc/widget.h b/oldsrc/widget.h
deleted file mode 100644
index fc8570a..0000000
--- a/oldsrc/widget.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef WIDGET_H
-#define WIDGET_H
-
-#include <QWidget>
-#include <QtGui>
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-
-namespace Ui {
-class Widget;
-}
-
-class Widget : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit Widget(QWidget *parent = 0);
- ~Widget();
-
-private:
-
- Ui::Widget * ui;
-
- void configureWidgetForBeamerWithEDID();
- void configureWidgetForBeamerWithOUTEDID();
-
-};
-
-#endif // WIDGET_H
diff --git a/oldsrc/widget.ui b/oldsrc/widget.ui
deleted file mode 100644
index cfa9bdf..0000000
--- a/oldsrc/widget.ui
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Widget</class>
- <widget class="QWidget" name="Widget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>600</width>
- <height>480</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QComboBox" name="comboBox"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton">
- <property name="text">
- <string>PushButton</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-11-21 14:27:24 +0100