Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 10:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kinfocenter: remove incomplete multi-screen support

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-06-05 04:34:02 +03:00
parent 5d964cb611
commit a7d28da6a6
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
kinfocenter/Modules/opengl/opengl.cpp
View file

@ -118,6 +118,8 @@ QTreeWidgetItem *newItem(QTreeWidgetItem *parent, QString textCol1, QString text
return newItem(parent, NULL, textCol1, textCol2); return newItem(parent, NULL, textCol1, textCol2);
} }
static const int scrnum = 0;
static bool IsDirect = false; static bool IsDirect = false;
static struct { static struct {
@ -203,7 +205,7 @@ static bool get_dri_device() { return false; }
#ifndef KCM_ENABLE_OPENGLES #ifndef KCM_ENABLE_OPENGLES
static void static void
mesa_hack(Display *dpy, int scrnum) mesa_hack(Display *dpy)
{ {
int attribs[] = { int attribs[] = {
GLX_RGBA, GLX_RGBA,
@ -605,7 +607,7 @@ void print_egl(QTreeWidgetItem *l1, QTreeWidgetItem *l2)
} }
#endif #endif
static QTreeWidgetItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect, QTreeWidgetItem *l1, QTreeWidgetItem *after) static QTreeWidgetItem *get_gl_info(Display *dpy, Bool allowDirect, QTreeWidgetItem *l1, QTreeWidgetItem *after)
{ {
Window win; Window win;
XSetWindowAttributes attr; XSetWindowAttributes attr;
@ -787,7 +789,6 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
char *displayName = NULL; char *displayName = NULL;
Display *dpy; Display *dpy;
int numScreens, scrnum;
dpy = XOpenDisplay(displayName); dpy = XOpenDisplay(displayName);
if (!dpy) { if (!dpy) {
@ -808,28 +809,20 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
l1->setExpanded(true); l1->setExpanded(true);
l1->setFlags(Qt::ItemIsEnabled); l1->setFlags(Qt::ItemIsEnabled);
numScreens = ScreenCount(dpy);
scrnum = 0;
#ifdef KCMGL_MANY_SCREENS
for (; scrnum < numScreens; scrnum++)
#endif
{
#ifndef KCM_ENABLE_OPENGLES #ifndef KCM_ENABLE_OPENGLES
mesa_hack(dpy, scrnum); mesa_hack(dpy);
#endif #endif
l2 = get_gl_info(dpy, scrnum, true, l1, l2); l2 = get_gl_info(dpy, true, l1, l2);
if (l2) if (l2)
l2->setExpanded(true); l2->setExpanded(true);
#ifndef KCM_ENABLE_OPENGLES #ifndef KCM_ENABLE_OPENGLES
if (IsDirect) if (IsDirect)
l2 = get_gl_info(dpy, scrnum, false, l1, l2); l2 = get_gl_info(dpy, false, l1, l2);
#endif #endif
// TODO print_visual_info(dpy, scrnum, mode); // TODO: print_visual_info(dpy, mode);
}
#ifndef KCM_ENABLE_OPENGLES #ifndef KCM_ENABLE_OPENGLES
if (l2) if (l2)