[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54371] trunk/blender: removing xinerama on X11 dependency, this wasn't working very usefully.
Campbell Barton
ideasman42 at gmail.com
Thu Feb 7 15:10:01 CET 2013
Revision: 54371
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54371
Author: campbellbarton
Date: 2013-02-07 14:10:01 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
removing xinerama on X11 dependency, this wasn't working very usefully.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/freebsd7-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/freebsd9-config.py
trunk/blender/build_files/scons/config/linux-config.py
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/ghost/SConscript
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/CMakeLists.txt 2013-02-07 14:10:01 UTC (rev 54371)
@@ -166,7 +166,6 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
- option(WITH_X11_XINERAMA "Enable multi-monitor support" ON)
option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON)
@@ -431,7 +430,6 @@
set(WITH_GHOST_XDND OFF)
set(WITH_X11_XF86VMODE OFF)
set(WITH_X11_XINPUT OFF)
- set(WITH_X11_XINERAMA OFF)
endif()
if(MINGW)
@@ -822,14 +820,6 @@
endif()
endif()
- if(WITH_X11_XINERAMA)
- if(X11_Xinerama_LIB)
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}")
- else()
- set(WITH_X11_XINERAMA OFF)
- endif()
- endif()
-
if(WITH_X11_XF86VMODE)
# XXX, why dont cmake make this available?
FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH})
@@ -2162,7 +2152,6 @@
info_cfg_option(WITH_INSTALL_PORTABLE)
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
- info_cfg_option(WITH_X11_XINERAMA)
info_cfg_option(WITH_MEM_JEMALLOC)
info_cfg_option(WITH_SYSTEM_GLEW)
info_cfg_option(WITH_SYSTEM_OPENJPEG)
Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py 2013-02-07 14:10:01 UTC (rev 54371)
@@ -139,9 +139,9 @@
WITH_BF_STATICOPENGL = False
BF_OPENGL = '/usr/local'
BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi Xinerama'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libXinerama.a'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
WITH_BF_COLLADA = False
BF_COLLADA = '#source/blender/collada'
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2013-02-07 14:10:01 UTC (rev 54371)
@@ -139,9 +139,9 @@
WITH_BF_STATICOPENGL = False
BF_OPENGL = '/usr/local'
BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi Xinerama'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libXinerama.a'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
WITH_BF_COLLADA = False
BF_COLLADA = '#source/blender/collada'
Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py 2013-02-07 14:10:01 UTC (rev 54371)
@@ -139,9 +139,9 @@
WITH_BF_STATICOPENGL = False
BF_OPENGL = '/usr/local'
BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi Xinerama'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libXinerama.a'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
WITH_BF_COLLADA = False
BF_COLLADA = '#source/blender/collada'
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/build_files/scons/config/linux-config.py 2013-02-07 14:10:01 UTC (rev 54371)
@@ -151,9 +151,9 @@
WITH_BF_STATICOPENGL = False
BF_OPENGL = '/usr'
BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi Xinerama'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libXinerama.a'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
WITH_BF_COLLADA = False
BF_COLLADA = '#source/blender/collada'
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2013-02-07 14:10:01 UTC (rev 54371)
@@ -276,13 +276,6 @@
)
endif()
- if(WITH_X11_XINERAMA)
- add_definitions(-DWITH_X11_XINERAMA)
- list(APPEND INC_SYS
- ${X11_Xinerama_INCLUDE_PATH}
- )
- endif()
-
elseif(WIN32)
## Warnings as errors, this is too strict!
#if(MSVC)
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/intern/ghost/SConscript 2013-02-07 14:10:01 UTC (rev 54371)
@@ -67,7 +67,6 @@
## just dont use the PREFIX.
# defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option
defs += ['WITH_X11_XINPUT'] # XXX, make an option
- defs += ['WITH_X11_XINERAMA']
# freebsd doesn't seem to support XDND protocol
if env['WITH_GHOST_XDND'] and window_system not in ('freebsd7', 'freebsd8', 'freebsd9'):
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2013-02-07 07:24:22 UTC (rev 54370)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2013-02-07 14:10:01 UTC (rev 54371)
@@ -50,10 +50,6 @@
# include "GHOST_DropTargetX11.h"
#endif
-#ifdef WITH_X11_XINERAMA
-# include "X11/extensions/Xinerama.h"
-#endif
-
#include "GHOST_Debug.h"
#include <X11/Xatom.h>
@@ -241,47 +237,9 @@
GHOST_TUns32& height) const
{
if (m_display) {
-
-#ifdef WITH_X11_XINERAMA
- GHOST_TInt32 m_x = 1, m_y = 1;
- getCursorPosition(m_x, m_y);
-
- /* NOTE, no way to select a primary monitor, uses the first */
- bool success = false;
- int dummy1, dummy2;
- if (XineramaQueryExtension(m_display, &dummy1, &dummy2)) {
- if (XineramaIsActive(m_display)) {
- int heads = 0;
- XineramaScreenInfo *p = XineramaQueryScreens(m_display, &heads);
- /* with a single head, all dimensions is fine */
- if (heads > 1) {
- int i;
- for (i = 0; i < heads; i++) {
- if ((m_x >= p[i].x_org) && (m_x <= p[i].x_org + p[i].width) &&
- (m_y >= p[i].y_org) && (m_y <= p[i].y_org + p[i].height))
- {
- width = p[i].width;
- height = p[i].height;
- break;
- }
- }
- /* highly unlikely! */
- if (i == heads) {
- width = p[0].width;
- height = p[0].height;
- }
- success = true;
- }
- XFree(p);
- }
- }
-
- if (success) {
- return;
- }
-#endif
-
- /* fallback to all */
+ /* note, for this to work as documented,
+ * we would need to use Xinerama check r54370 for code that did thia,
+ * we've since removed since its not worth the extra dep - campbell */
getAllDisplayDimensions(width, height);
}
}
More information about the Bf-blender-cvs
mailing list