sfx2/source/appl/appuno.cxx | 2
vcl/Library_vclplug_gen.mk | 1
vcl/unx/generic/window/FWS.cxx | 231 ------------------------------------
vcl/unx/generic/window/FWS.hxx | 53 --------
vcl/unx/generic/window/salframe.cxx | 7 -
5 files changed, 1 insertion(+), 293 deletions(-)
New commits:
commit 8ff4d23ef33647991df9068bde2cccfe87a4a200
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jan 22 17:08:08 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 23 07:32:47 2019 +0100
fix DBG_UTIL macro block
ever since
commit cef4c601d825027e807236a5b364edddb39be809
Date: Mon May 27 12:52:19 2002 +0000
#98405#: more debugging code for macro recording
Change-Id: I7e7f4d917e4efabc7bd3bdef824f389c4f715b7a
Reviewed-on: https://gerrit.libreoffice.org/66741
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 57bc154ad891..5fbb3094d0d2 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -876,7 +876,7 @@ void TransformParameters( sal_uInt16 nSlotId, const
uno::Sequence<beans::Propert
}
}
}
-#ifdef DB_UTIL
+#ifdef DBG_UTIL
if ( nFoundArgs == nCount )
{
// except for the "special" slots: assure that every argument was
convertible
commit 2abb72999df2b188ff174e4f7d639a3d0ecb602d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jan 22 16:47:27 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 23 07:32:42 2019 +0100
remove FWS X11 protocol stuff
so old even google can find no mention of any of this
Change-Id: I82b1470c3c903b26718cbe244b98584575d75cef
Reviewed-on: https://gerrit.libreoffice.org/66740
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 328b259bf05a..f9b73e637d03 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/gdi/salgdi \
vcl/unx/generic/gdi/salvd \
vcl/unx/generic/gdi/xrender_peer \
- vcl/unx/generic/window/FWS \
vcl/unx/generic/window/salframe \
vcl/unx/generic/window/salobj \
vcl/unx/x11/x11sys \
diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx
deleted file mode 100644
index 96ef09fdd111..000000000000
--- a/vcl/unx/generic/window/FWS.cxx
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include "FWS.hxx"
-
-static Atom fwsIconAtom;
-
-static Atom FWS_CLIENT;
-static Atom FWS_COMM_WINDOW;
-static Atom FWS_PROTOCOLS;
-static Atom FWS_STACK_UNDER;
-static Atom FWS_PARK_ICONS;
-static Atom FWS_PASS_ALL_INPUT;
-static Atom FWS_PASSES_INPUT;
-static Atom FWS_HANDLES_FOCUS;
-
-static Atom FWS_REGISTER_WINDOW;
-static Atom FWS_STATE_CHANGE;
-static Atom FWS_UNSEEN_STATE;
-static Atom FWS_NORMAL_STATE;
-static Atom WM_PROTOCOLS;
-static Atom WM_CHANGE_STATE;
-
-static Window fwsCommWindow;
-
-// Initialize our atoms and determine if the current window manager is
-// providing FWS extension support.
-Bool
-WMSupportsFWS (Display *display, int screen)
-{
- Atom protocol;
- Atom propType;
- int propFormat;
- unsigned long propItems;
- unsigned long propBytesAfter;
- unsigned char *propData;
- char propName[64];
-
- FWS_CLIENT = XInternAtom(display, "_SUN_FWS_CLIENT",
False);
- FWS_COMM_WINDOW = XInternAtom(display, "_SUN_FWS_COMM_WINDOW",
False);
- FWS_PROTOCOLS = XInternAtom(display, "_SUN_FWS_PROTOCOLS",
False);
- FWS_STACK_UNDER = XInternAtom(display, "_SUN_FWS_STACK_UNDER",
False);
- FWS_PARK_ICONS = XInternAtom(display, "_SUN_FWS_PARK_ICONS",
False);
- FWS_PASS_ALL_INPUT = XInternAtom(display, "_SUN_FWS_PASS_ALL_INPUT",
False);
- FWS_PASSES_INPUT = XInternAtom(display, "_SUN_FWS_PASSES_INPUT",
False);
- FWS_HANDLES_FOCUS = XInternAtom(display, "_SUN_FWS_HANDLES_FOCUS",
False);
- FWS_REGISTER_WINDOW= XInternAtom(display,
"_SUN_FWS_REGISTER_WINDOW",False);
- FWS_STATE_CHANGE = XInternAtom(display, "_SUN_FWS_STATE_CHANGE",
False);
- FWS_UNSEEN_STATE = XInternAtom(display, "_SUN_FWS_UNSEEN_STATE",
False);
- FWS_NORMAL_STATE = XInternAtom(display, "_SUN_FWS_NORMAL_STATE",
False);
- WM_PROTOCOLS = XInternAtom(display, "WM_PROTOCOLS",
False);
- WM_CHANGE_STATE = XInternAtom(display, "WM_CHANGE_STATE",
False);
-
- snprintf (propName, sizeof(propName), "_SUN_FWS_NEXT_ICON_%d", screen);
- fwsIconAtom = XInternAtom(display, propName, False);
-
- if (XGetWindowProperty (display, DefaultRootWindow (display),
- FWS_COMM_WINDOW, 0, 1,
- False, AnyPropertyType, &propType,
- &propFormat, &propItems,
- &propBytesAfter, &propData) != Success)
- return False;
-
- if (propFormat != 32 ||
- propItems != 1 ||
- propBytesAfter != 0)
- {
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Bad FWS_COMM_WINDOW property on root window.\n");
- #endif
- XFree (propData);
- return False;
- }
-
- fwsCommWindow = *reinterpret_cast< ::Window * >(propData);
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Using fwsCommWindow = 0x%lx.\n", fwsCommWindow);
- #endif
- XFree (propData);
-
- if (XGetWindowProperty (display, DefaultRootWindow (display),
- FWS_PROTOCOLS, 0, 10,
- False, AnyPropertyType, &propType,
- &propFormat, &propItems,
- &propBytesAfter, &propData) != Success)
- {
- return False;
- }
-
- if (propFormat != 32 ||
- propBytesAfter != 0)
- {
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Bad FWS_PROTOCOLS property on root window.\n");
- #endif
- XFree (propData);
- return False;
- }
-
- for (unsigned long i = 0; i < propItems; ++i)
- {
- protocol = reinterpret_cast<Atom *>(propData)[i];
- if (protocol == FWS_STACK_UNDER)
- {
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Using fwsStackUnder.\n");
- #endif
- }
- else
- if (protocol == FWS_PARK_ICONS)
- {
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Using fwsParkIcons.\n");
- #endif
- }
- else
- if (protocol == FWS_PASSES_INPUT)
- {
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Using fwsPassesInput.\n");
- #endif
- }
- else
- if (protocol == FWS_HANDLES_FOCUS)
- {
- #if OSL_DEBUG_LEVEL > 1
- fprintf (stderr, "Using fwsHandlesFocus.\n");
- #endif
- }
- }
-
- XFree (propData);
- return True;
-}
-
-// Handle X errors (temporarily) to record the occurrence of BadWindow
-// errors without crashing. Used to detect the FWS_COMM_WINDOW root window
-// property containing an old or obsolete window id.
-extern "C" {
-
-static Bool badWindowFound;
-static int (* oldHandler) (Display *, XErrorEvent *);
-
-static int
-newHandler (Display *display, XErrorEvent *xerror)
-{
- if (xerror->error_code != BadWindow)
- (*oldHandler)(display, xerror);
- else
- badWindowFound = True;
-
- return 0;
-}
-
-}
-
-// Send a client message to the FWS_COMM_WINDOW indicating the existence
-// of a new FWS client window. Be careful to avoid BadWindow errors on
-// the XSendEvent in case the FWS_COMM_WINDOW root window property had
-// old/obsolete junk in it.
-Bool
-RegisterFwsWindow (Display *display, Window window)
-{
- XClientMessageEvent msg;
-
- msg.type = ClientMessage;
- msg.window = fwsCommWindow;
- msg.message_type = FWS_REGISTER_WINDOW;
- msg.format = 32;
- msg.data.l[0] = window;
-
- XSync (display, False);
- badWindowFound = False;
- oldHandler = XSetErrorHandler (newHandler);
-
- XSendEvent (display, fwsCommWindow, False, NoEventMask,
- reinterpret_cast<XEvent *>(&msg));
- XSync (display, False);
-
- XSetErrorHandler (oldHandler);
- #if OSL_DEBUG_LEVEL > 1
- if (badWindowFound)
- fprintf (stderr, "No FWS client window to register with.\n");
- #endif
-
- return !badWindowFound;
-}
-
-// Add the FWS protocol atoms to the WMProtocols property for the window.
-void
-AddFwsProtocols (Display *display, Window window)
-{
- #define MAX_FWS_PROTOS 10
-
- Atom fwsProtocols[ MAX_FWS_PROTOS ];
- int nProtos = 0;
-
- fwsProtocols[ nProtos++ ] = FWS_CLIENT;
- fwsProtocols[ nProtos++ ] = FWS_STACK_UNDER;
- fwsProtocols[ nProtos++ ] = FWS_STATE_CHANGE;
- fwsProtocols[ nProtos++ ] = FWS_PASS_ALL_INPUT;
- XChangeProperty (display, window, WM_PROTOCOLS,
- XA_ATOM, 32, PropModeAppend,
- reinterpret_cast<unsigned char *>(fwsProtocols), nProtos);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/window/FWS.hxx b/vcl/unx/generic/window/FWS.hxx
deleted file mode 100644
index d9a354456828..000000000000
--- a/vcl/unx/generic/window/FWS.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX
-#define INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX
-
-#include <X11/Xlib.h>
-
-extern "C" {
-
-/* Initialize our atoms and determine if the current window manager is
- * providing FWS extension support.
- */
-
-Bool
-WMSupportsFWS (Display *display, int screen);
-
-/* Send a client message to the FWS_COMM_WINDOW indicating the existence
- * of a new FWS client window. Be careful to avoid BadWindow errors on
- * the XSendEvent in case the FWS_COMM_WINDOW root window property had
- * old/obsolete junk in it.
- */
-
-Bool
-RegisterFwsWindow (Display *display, Window window);
-
-/* Add the FWS protocol atoms to the WMProtocols property for the window.
- */
-
-void
-AddFwsProtocols (Display *display, Window window);
-
-} /* extern "C" */
-
-#endif // INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 0d4c309adc8b..f4a24cfe6458 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -41,7 +41,6 @@
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
-#include "FWS.hxx"
#include <X11/extensions/shape.h>
#include <unx/salunx.h>
@@ -2218,12 +2217,6 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen,
sal_Int32 nScreen )
return;
pDisplay_->getWMAdaptor()->showFullScreen( this, bFullScreen );
- if( IsOverrideRedirect()
- && WMSupportsFWS( GetXDisplay(), GetDisplay()->GetRootWindow(
m_nXScreen ) ) )
- {
- AddFwsProtocols( GetXDisplay(), GetShellWindow() );
- RegisterFwsWindow( GetXDisplay(), GetShellWindow() );
- }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
