diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-22 11:18:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-22 13:15:57 +0200 |
| commit | 3eee14d4e769ad063e71ccb476f722188a66d50f (patch) | |
| tree | 7337627ec7ea4a509dccf592584f4146530b6845 /desktop | |
| parent | 0541176c24e044fc296d7431e033faf48f69ef09 (diff) | |
tdf#156825 Half of the splash screen is visible on both monitors under Linux
Blind fix, since I don't have two screens.
regression from
commit 4c00a5bce384c5fa3b46cf5bb29c7e9b1e506ea0
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu Jul 20 11:27:17 2023 +0200
Assume that, if we have X11, it supports Xinerama
It looks like I missed the removal of some USE_XINERAMA pieces
Change-Id: I402db170916efe935d8ff9f96cc9b327070809b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155939
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_oosplash.mk | 6 | ||||
| -rw-r--r-- | desktop/unx/source/splashx.c | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 308c76945aef..2808e0113510 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -24,15 +24,9 @@ $(eval $(call gb_Executable_add_cobjects,oosplash,\ )) ifneq ($(USING_X11),) - -$(eval $(call gb_Executable_add_defs,oosplash,\ - -DUSE_XINERAMA \ -)) - $(eval $(call gb_Executable_add_libs,oosplash,\ -lXinerama \ )) - endif ifneq ($(DISABLE_GUI),TRUE) diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 4f7239ab6159..4dc50a740695 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -16,9 +16,7 @@ #include <X11/Xatom.h> #include <X11/Xutil.h> -#ifdef USING_X11 #include <X11/extensions/Xinerama.h> -#endif #include <osl/endian.h> #include <fcntl.h> @@ -406,10 +404,8 @@ static int splash_init_display( struct splash* splash, int argc, char** argv ) { char *display_name = NULL; int i; -#ifdef USING_X11 int n_xinerama_screens = 1; XineramaScreenInfo* p_screens = NULL; -#endif for ( i = 0; i < argc; i++ ) { @@ -442,7 +438,6 @@ static int splash_init_display( struct splash* splash, int argc, char** argv ) splash->display_x_pos = 0; splash->display_y_pos = 0; -#ifdef USING_X11 p_screens = XineramaQueryScreens( splash->display, &n_xinerama_screens ); if( p_screens ) { @@ -459,7 +454,6 @@ static int splash_init_display( struct splash* splash, int argc, char** argv ) } XFree( p_screens ); } -#endif return 1; } @@ -812,6 +806,6 @@ struct splash* splash_create(rtl_uString* pAppPath, int argc, char** argv) } -#endif // ENABLE_QUICKSTART_LIBPNG +#endif // defined(ENABLE_QUICKSTART_LIBPNG) && HAVE_FEATURE_UI /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |