Hello community, here is the log from the commit of package kwin5 for openSUSE:Factory checked in at 2019-07-26 12:24:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwin5 (Old) and /work/SRC/openSUSE:Factory/.kwin5.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwin5" Fri Jul 26 12:24:30 2019 rev:102 rq:716643 version:5.16.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kwin5/kwin5.changes 2019-07-05 13:48:10.805403521 +0200 +++ /work/SRC/openSUSE:Factory/.kwin5.new.4126/kwin5.changes 2019-07-26 12:24:31.634456102 +0200 @@ -1,0 +2,22 @@ +Thu Jul 18 19:53:51 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Use %_kf5_debugdir to install logging categories files. + +------------------------------------------------------------------- +Tue Jul 9 17:29:07 UTC 2019 - [email protected] + +- Update to 5.16.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.3.php +- Changes since 5.16.2: + * Fix check for SCHED_RESET_ON_FORK feature in clean build + * [effects/blur] Disable sRGB when the framebuffer is linear (kde#408594) + * Fix maximize Apply Now rule + * [tabbox] Properly determine depressed modifiers on X11 (kde#407720) + * glx: Prefer an sRGB capable fbconfig + * Decorate only toplevel internal clients (kde#407612) +- Remove patches, now upstream: + * 0001-Fix-for-the-blur-effect-on-Intel-on-X.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-for-the-blur-effect-on-Intel-on-X.patch kwin-5.16.2.tar.xz kwin-5.16.2.tar.xz.sig New: ---- kwin-5.16.3.tar.xz kwin-5.16.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwin5.spec ++++++ --- /var/tmp/diff_new_pack.VIgcFB/_old 2019-07-26 12:24:33.606455291 +0200 +++ /var/tmp/diff_new_pack.VIgcFB/_new 2019-07-26 12:24:33.626455283 +0200 @@ -21,7 +21,7 @@ %global wayland (0%{?suse_version} >= 1330) %bcond_without lang Name: kwin5 -Version: 5.16.2 +Version: 5.16.3 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -36,8 +36,6 @@ Source1: https://download.kde.org/stable/plasma/%{version}/kwin-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-for-the-blur-effect-on-Intel-on-X.patch # PATCH-FIX-OPENSUSE Patch100: 0001-Revert-Make-WindowSwitching-Alt-Tab-the-default-left.patch # PATCH-FEATURE-OPENSUSE @@ -217,7 +215,7 @@ %verify(not caps) %{_kf5_bindir}/kwin_wayland %endif %{_kf5_bindir}/kwin_x11 -%config %{_kf5_configdir}/org_kde_kwin.categories +%{_kf5_debugdir}/org_kde_kwin.categories %{_kf5_knsrcfilesdir}/*.knsrc %{_kf5_libdir}/kconf_update_bin/ ++++++ kwin-5.16.2.tar.xz -> kwin-5.16.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/CMakeLists.txt new/kwin-5.16.3/CMakeLists.txt --- old/kwin-5.16.2/CMakeLists.txt 2019-06-25 13:44:41.000000000 +0200 +++ new/kwin-5.16.3/CMakeLists.txt 2019-07-09 17:48:17.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.16.2") +set(PROJECT_VERSION "5.16.3") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") @@ -350,7 +350,6 @@ "Required for disallowing ptrace on kwin_wayland process") check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H) -configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h ) check_include_file("linux/vt.h" HAVE_LINUX_VT_H) add_feature_info("linux/vt.h" @@ -366,6 +365,8 @@ HAVE_SCHED_RESET_ON_FORK "Required for running kwin_wayland with real-time scheduling") +configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h ) + ########### global ############### set(kwin_effects_dbus_xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kwin.Effects.xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/effects/blur/blur.cpp new/kwin-5.16.3/effects/blur/blur.cpp --- old/kwin-5.16.2/effects/blur/blur.cpp 2019-06-25 13:43:42.000000000 +0200 +++ new/kwin-5.16.3/effects/blur/blur.cpp 2019-07-09 17:45:19.000000000 +0200 @@ -126,7 +126,30 @@ m_renderTargets.reserve(m_downSampleIterations + 2); m_renderTextures.reserve(m_downSampleIterations + 2); - const GLenum textureFormat = GLPlatform::instance()->isGLES() ? GL_RGBA8 : GL_SRGB8_ALPHA8; + GLenum textureFormat = GL_RGBA8; + + // Check the color encoding of the default framebuffer + if (!GLPlatform::instance()->isGLES()) { + GLuint prevFbo = 0; + glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, reinterpret_cast<GLint *>(&prevFbo)); + + if (prevFbo != 0) { + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); + } + + GLenum colorEncoding = GL_LINEAR; + glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, GL_BACK_LEFT, + GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, + reinterpret_cast<GLint *>(&colorEncoding)); + + if (prevFbo != 0) { + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, prevFbo); + } + + if (colorEncoding == GL_SRGB) { + textureFormat = GL_SRGB8_ALPHA8; + } + } for (int i = 0; i <= m_downSampleIterations; i++) { m_renderTextures.append(GLTexture(textureFormat, effects->virtualScreenSize() / (1 << i))); @@ -643,7 +666,7 @@ const QRegion expandedBlurRegion = expand(shape) & expand(screen); - const bool isGLES = GLPlatform::instance()->isGLES(); + const bool useSRGB = m_renderTextures.first().internalFormat() == GL_SRGB8_ALPHA8; // Upload geometry for the down and upsample iterations GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); @@ -668,7 +691,7 @@ if (isDock) { m_renderTargets.last()->blitFromFramebuffer(sourceRect, destRect); - if (!isGLES) { + if (useSRGB) { glEnable(GL_FRAMEBUFFER_SRGB); } @@ -676,7 +699,7 @@ } else { m_renderTargets.first()->blitFromFramebuffer(sourceRect, destRect); - if (!isGLES) { + if (useSRGB) { glEnable(GL_FRAMEBUFFER_SRGB); } @@ -703,7 +726,7 @@ upscaleRenderToScreen(vbo, blurRectCount * (m_downSampleIterations + 1), shape.rectCount() * 6, screenProjection, windowRect.topLeft()); - if (!isGLES) { + if (useSRGB) { glDisable(GL_FRAMEBUFFER_SRGB); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/geometry.cpp new/kwin-5.16.3/geometry.cpp --- old/kwin-5.16.2/geometry.cpp 2019-06-25 13:43:42.000000000 +0200 +++ new/kwin-5.16.3/geometry.cpp 2019-07-09 17:45:19.000000000 +0200 @@ -2142,9 +2142,6 @@ void AbstractClient::maximize(MaximizeMode m) { - if (m == maximizeMode()) { - return; - } setMaximize(m & MaximizeVertical, m & MaximizeHorizontal); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/internal_client.cpp new/kwin-5.16.3/internal_client.cpp --- old/kwin-5.16.2/internal_client.cpp 2019-06-25 13:43:42.000000000 +0200 +++ new/kwin-5.16.3/internal_client.cpp 2019-07-09 17:45:19.000000000 +0200 @@ -37,7 +37,19 @@ { findInternalWindow(); updateInternalWindowGeometry(); - updateDecoration(true); + + // Qt asks our QPA to create a platform window for each QOffscreenSurface. + // Given that those windows aren't toplevels, findInternalWindow may not be + // able to find corresponding QWindow object for this client, which means + // no-border and pretty much every other property that depends on QWindow + // flags will have undefined value. Unfortunately the Aurorae decoration + // engine creates three internal clients per each decoration. One of those + // clients represents QOffscreenSurface. Thus we have to ensure that the + // QOffscreenSurface client is not decorated, otherwise kwin will fall + // into an infinite "recursion." + if (m_internalWindow) { + updateDecoration(true); + } } InternalClient::InternalClient(KWayland::Server::XdgShellSurfaceInterface *surface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/kcmkwin/kwindecoration/kwindecoration.desktop new/kwin-5.16.3/kcmkwin/kwindecoration/kwindecoration.desktop --- old/kwin-5.16.2/kcmkwin/kwindecoration/kwindecoration.desktop 2019-06-25 13:43:42.000000000 +0200 +++ new/kwin-5.16.3/kcmkwin/kwindecoration/kwindecoration.desktop 2019-07-09 17:45:19.000000000 +0200 @@ -90,6 +90,7 @@ Comment[pl]=Ustawienia pasków tytułów i obramowań okien Comment[pt]=Configurar as barras de título e contornos das janelas Comment[pt_BR]=Configure as barras de títulos e bordas da janela +Comment[ru]=Настройка заголовка и границ окон Comment[sk]=Nastaviť titulné pásy a okraje Comment[sv]=Anpassa namnlister och kanter för fönster Comment[uk]=Налаштовування смужок заголовків та рамок вікон diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/kcmkwin/kwindecoration/package/metadata.desktop new/kwin-5.16.3/kcmkwin/kwindecoration/package/metadata.desktop --- old/kwin-5.16.2/kcmkwin/kwindecoration/package/metadata.desktop 2019-06-25 13:43:42.000000000 +0200 +++ new/kwin-5.16.3/kcmkwin/kwindecoration/package/metadata.desktop 2019-07-09 17:45:19.000000000 +0200 @@ -92,6 +92,7 @@ Comment[pl]=Ustawienia pasków tytułów i obramowań okien Comment[pt]=Configurar as barras de título e contornos das janelas Comment[pt_BR]=Configure as barras de títulos e bordas da janela +Comment[ru]=Настройка заголовка и границ окон Comment[sk]=Nastaviť titulné pásy a okraje Comment[sv]=Anpassa namnlister och kanter för fönster Comment[uk]=Налаштовування смужок заголовків та рамок вікон diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/plugins/platforms/x11/standalone/glxbackend.cpp new/kwin-5.16.3/plugins/platforms/x11/standalone/glxbackend.cpp --- old/kwin-5.16.2/plugins/platforms/x11/standalone/glxbackend.cpp 2019-06-25 13:43:43.000000000 +0200 +++ new/kwin-5.16.3/plugins/platforms/x11/standalone/glxbackend.cpp 2019-07-09 17:45:19.000000000 +0200 @@ -416,9 +416,29 @@ 0 }; - // Try to find a double buffered configuration + const int attribs_srgb[] = { + GLX_RENDER_TYPE, GLX_RGBA_BIT, + GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_ALPHA_SIZE, 0, + GLX_DEPTH_SIZE, 0, + GLX_STENCIL_SIZE, 0, + GLX_CONFIG_CAVEAT, GLX_NONE, + GLX_DOUBLEBUFFER, true, + GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, true, + 0 + }; + + // Try to find a double buffered sRGB capable configuration int count = 0; - GLXFBConfig *configs = glXChooseFBConfig(display(), DefaultScreen(display()), attribs, &count); + GLXFBConfig *configs = glXChooseFBConfig(display(), DefaultScreen(display()), attribs_srgb, &count); + + if (count == 0) { + // Try to find a double buffered non-sRGB capable configuration + configs = glXChooseFBConfig(display(), DefaultScreen(display()), attribs, &count); + } struct FBConfig { GLXFBConfig config; @@ -452,7 +472,7 @@ if (candidates.size() > 0) { fbconfig = candidates.front().config; - int fbconfig_id, visual_id, red, green, blue, alpha, depth, stencil; + int fbconfig_id, visual_id, red, green, blue, alpha, depth, stencil, srgb; glXGetFBConfigAttrib(display(), fbconfig, GLX_FBCONFIG_ID, &fbconfig_id); glXGetFBConfigAttrib(display(), fbconfig, GLX_VISUAL_ID, &visual_id); glXGetFBConfigAttrib(display(), fbconfig, GLX_RED_SIZE, &red); @@ -461,9 +481,10 @@ glXGetFBConfigAttrib(display(), fbconfig, GLX_ALPHA_SIZE, &alpha); glXGetFBConfigAttrib(display(), fbconfig, GLX_DEPTH_SIZE, &depth); glXGetFBConfigAttrib(display(), fbconfig, GLX_STENCIL_SIZE, &stencil); + glXGetFBConfigAttrib(display(), fbconfig, GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, &srgb); - qCDebug(KWIN_X11STANDALONE, "Choosing GLXFBConfig %#x X visual %#x depth %d RGBA %d:%d:%d:%d ZS %d:%d", - fbconfig_id, visual_id, visualDepth(visual_id), red, green, blue, alpha, depth, stencil); + qCDebug(KWIN_X11STANDALONE, "Choosing GLXFBConfig %#x X visual %#x depth %d RGBA %d:%d:%d:%d ZS %d:%d sRGB: %d", + fbconfig_id, visual_id, visualDepth(visual_id), red, green, blue, alpha, depth, stencil, srgb); } if (fbconfig == nullptr) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/lt/kcm_kwin_effects.po new/kwin-5.16.3/po/lt/kcm_kwin_effects.po --- old/kwin-5.16.2/po/lt/kcm_kwin_effects.po 2019-06-25 13:44:12.000000000 +0200 +++ new/kwin-5.16.3/po/lt/kcm_kwin_effects.po 2019-07-09 17:46:50.000000000 +0200 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2019-03-19 03:40+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" -"Language: \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/lt/kcmkwincommon.po new/kwin-5.16.3/po/lt/kcmkwincommon.po --- old/kwin-5.16.2/po/lt/kcmkwincommon.po 2019-06-25 13:44:12.000000000 +0200 +++ new/kwin-5.16.3/po/lt/kcmkwincommon.po 2019-07-09 17:46:50.000000000 +0200 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2019-03-19 03:40+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" -"Language: \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/lt/kwin_scripts.po new/kwin-5.16.3/po/lt/kwin_scripts.po --- old/kwin-5.16.2/po/lt/kwin_scripts.po 2019-06-25 13:44:12.000000000 +0200 +++ new/kwin-5.16.3/po/lt/kwin_scripts.po 2019-07-09 17:46:50.000000000 +0200 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2018-08-16 09:15+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" -"Language: \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/nb/kwin.po new/kwin-5.16.3/po/nb/kwin.po --- old/kwin-5.16.2/po/nb/kwin.po 2019-06-25 13:44:15.000000000 +0200 +++ new/kwin-5.16.3/po/nb/kwin.po 2019-07-09 17:46:58.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kwin\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:46+0200\n" +"POT-Creation-Date: 2019-06-20 07:48+0200\n" "PO-Revision-Date: 2015-08-27 20:54+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -1527,7 +1527,7 @@ msgid "Applications to start once Wayland and Xwayland server are started" msgstr "Programmer som skal startes når Wayland og XWayland-tjener er startet" -#: main_x11.cpp:75 +#: main_x11.cpp:76 #, kde-format msgid "" "KWin is unstable.\n" @@ -1538,7 +1538,7 @@ "Det ser ut til at det har krasjet flere ganger etter hverandre.\n" "Du kan velge en annen vindusbehandler å kjøre:" -#: main_x11.cpp:227 +#: main_x11.cpp:228 #, kde-format msgid "" "kwin: unable to claim manager selection, another wm running? (try using --" @@ -1547,17 +1547,17 @@ "kwin: klarte ikke kreve kontroll over vindusbehandleren, er det en annen " "vindusbehandler som kjører? (prøv å bruke --replace)\n" -#: main_x11.cpp:244 +#: main_x11.cpp:245 #, kde-format msgid "kwin: another window manager is running (try using --replace)\n" msgstr "kwin: en annen vindusbehandler kjører (prøv å bruke --replace)\n" -#: main_x11.cpp:420 +#: main_x11.cpp:426 #, kde-format msgid "Replace already-running ICCCM2.0-compliant window manager" msgstr "Bytt ut en ICCCM2.0 vindusbehandler som allerede kjører" -#: main_x11.cpp:427 +#: main_x11.cpp:433 #, kde-format msgid "Disable KActivities integration." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/nn/kcm_kwindecoration.po new/kwin-5.16.3/po/nn/kcm_kwindecoration.po --- old/kwin-5.16.2/po/nn/kcm_kwindecoration.po 2019-06-25 13:44:16.000000000 +0200 +++ new/kwin-5.16.3/po/nn/kcm_kwindecoration.po 2019-07-09 17:47:02.000000000 +0200 @@ -16,7 +16,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 19.04.0\n" +"X-Generator: Lokalize 19.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/nn/kcmkwinscreenedges.po new/kwin-5.16.3/po/nn/kcmkwinscreenedges.po --- old/kwin-5.16.2/po/nn/kcmkwinscreenedges.po 2019-06-25 13:44:16.000000000 +0200 +++ new/kwin-5.16.3/po/nn/kcmkwinscreenedges.po 2019-07-09 17:47:02.000000000 +0200 @@ -1,7 +1,7 @@ # Translation of kcmkwinscreenedges to Norwegian Nynorsk # # Eirik U. Birkeland <[email protected]>, 2009, 2010. -# Karl Ove Hufthammer <[email protected]>, 2010, 2015, 2016, 2017, 2018. +# Karl Ove Hufthammer <[email protected]>, 2010, 2015, 2016, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: kcmkwinscreenedges\n" @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/nn/kwin_effects.po new/kwin-5.16.3/po/nn/kwin_effects.po --- old/kwin-5.16.2/po/nn/kwin_effects.po 2019-06-25 13:44:16.000000000 +0200 +++ new/kwin-5.16.3/po/nn/kwin_effects.po 2019-07-09 17:47:02.000000000 +0200 @@ -2,7 +2,7 @@ # # Bjørn Steensrud <[email protected]>, 2007. # Håvard Korsvoll <[email protected]>, 2008. -# Karl Ove Hufthammer <[email protected]>, 2008, 2010, 2015, 2016, 2018. +# Karl Ove Hufthammer <[email protected]>, 2008, 2010, 2015, 2016, 2018, 2019. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. # Sveinung Kvilhaugsvik <[email protected]>, 2009. # Øystein Steffensen-Alværvik <[email protected]>, 2018. @@ -18,7 +18,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/pt/kcm_kwin_effects.po new/kwin-5.16.3/po/pt/kcm_kwin_effects.po --- old/kwin-5.16.2/po/pt/kcm_kwin_effects.po 2019-06-25 13:44:18.000000000 +0200 +++ new/kwin-5.16.3/po/pt/kcm_kwin_effects.po 2019-07-09 17:47:11.000000000 +0200 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2019-03-29 14:27+0000\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/pt/kcm_kwin_virtualdesktops.po new/kwin-5.16.3/po/pt/kcm_kwin_virtualdesktops.po --- old/kwin-5.16.2/po/pt/kcm_kwin_virtualdesktops.po 2019-06-25 13:44:18.000000000 +0200 +++ new/kwin-5.16.3/po/pt/kcm_kwin_virtualdesktops.po 2019-07-09 17:47:11.000000000 +0200 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2019-01-09 11:02+0000\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/pt/kcmkwincommon.po new/kwin-5.16.3/po/pt/kcmkwincommon.po --- old/kwin-5.16.2/po/pt/kcmkwincommon.po 2019-06-25 13:44:18.000000000 +0200 +++ new/kwin-5.16.3/po/pt/kcmkwincommon.po 2019-07-09 17:47:11.000000000 +0200 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2019-01-09 11:04+0000\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kcm_kwin_virtualdesktops.po new/kwin-5.16.3/po/se/kcm_kwin_virtualdesktops.po --- old/kwin-5.16.2/po/se/kcm_kwin_virtualdesktops.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kcm_kwin_virtualdesktops.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kcm_kwindesktop\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-03-19 03:40+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2007-12-10 04:54+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kcm_kwindecoration.po new/kwin-5.16.3/po/se/kcm_kwindecoration.po --- old/kwin-5.16.2/po/se/kcm_kwindecoration.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kcm_kwindecoration.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kcmkwindecoration\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-03 03:46+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2007-12-28 23:37+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kcmkwincommon.po new/kwin-5.16.3/po/se/kcmkwincommon.po --- old/kwin-5.16.2/po/se/kcmkwincommon.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kcmkwincommon.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kcmkwincompositing\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-03-19 03:40+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2007-12-27 19:05+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kcmkwincompositing.po new/kwin-5.16.3/po/se/kcmkwincompositing.po --- old/kwin-5.16.2/po/se/kcmkwincompositing.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kcmkwincompositing.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kcmkwincompositing\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-03-20 03:42+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2007-12-27 19:05+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kcmkwinrules.po new/kwin-5.16.3/po/se/kcmkwinrules.po --- old/kwin-5.16.2/po/se/kcmkwinrules.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kcmkwinrules.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kcmkwinrules\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-01-01 03:11+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2006-01-10 20:20+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kcmkwm.po new/kwin-5.16.3/po/se/kcmkwm.po --- old/kwin-5.16.2/po/se/kcmkwm.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kcmkwm.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kcmkwm\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-08-16 09:15+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2005-10-25 00:11+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kwin.po new/kwin-5.16.3/po/se/kwin.po --- old/kwin-5.16.2/po/se/kwin.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kwin.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kwin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-04 03:36+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-06-20 07:48+0200\n" "PO-Revision-Date: 2007-12-20 11:35+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -1514,7 +1514,7 @@ msgid "Applications to start once Wayland and Xwayland server are started" msgstr "" -#: main_x11.cpp:75 +#: main_x11.cpp:76 #, kde-format msgid "" "KWin is unstable.\n" @@ -1525,7 +1525,7 @@ "Lea riekčanan moddii maŋŋálága.\n" "Sáhtát válljet vuodjit muhttin eará lásegieđahalli:" -#: main_x11.cpp:227 +#: main_x11.cpp:228 #, kde-format msgid "" "kwin: unable to claim manager selection, another wm running? (try using --" @@ -1534,17 +1534,17 @@ "kwin: Ii sáhttán gieđahallat lásiid. Leago eará lásegieđahalli jođus? " "(Geahččal --replace molssaeavttuin)\n" -#: main_x11.cpp:244 +#: main_x11.cpp:245 #, kde-format msgid "kwin: another window manager is running (try using --replace)\n" msgstr "" -#: main_x11.cpp:420 +#: main_x11.cpp:426 #, kde-format msgid "Replace already-running ICCCM2.0-compliant window manager" msgstr "Buhtte ICCCM2.0-heivvolaš lásegieđahalli mii juo lea jođus" -#: main_x11.cpp:427 +#: main_x11.cpp:433 #, kde-format msgid "Disable KActivities integration." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/po/se/kwin_clients.po new/kwin-5.16.3/po/se/kwin_clients.po --- old/kwin-5.16.2/po/se/kwin_clients.po 2019-06-25 13:44:20.000000000 +0200 +++ new/kwin-5.16.3/po/se/kwin_clients.po 2019-07-09 17:47:16.000000000 +0200 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kwin_clients\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-09 04:05+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2005-01-29 18:47+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/shell_client.cpp new/kwin-5.16.3/shell_client.cpp --- old/kwin-5.16.2/shell_client.cpp 2019-06-25 13:43:43.000000000 +0200 +++ new/kwin-5.16.3/shell_client.cpp 2019-07-09 17:45:19.000000000 +0200 @@ -827,6 +827,10 @@ } // TODO: add more checks as in Client + if (m_requestedMaximizeMode == oldMode) { + return; + } + // call into decoration update borders if (isDecorated() && decoration()->client() && !(options->borderlessMaximizedWindows() && m_requestedMaximizeMode == KWin::MaximizeFull)) { changeMaximizeRecursion = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwin-5.16.2/tabbox/tabbox.cpp new/kwin-5.16.3/tabbox/tabbox.cpp --- old/kwin-5.16.2/tabbox/tabbox.cpp 2019-06-25 13:43:43.000000000 +0200 +++ new/kwin-5.16.3/tabbox/tabbox.cpp 2019-07-09 17:45:19.000000000 +0200 @@ -921,10 +921,8 @@ /** * Handles alt-tab / control-tab **/ -static bool areKeySymXsDepressed(bool bAll, const uint keySyms[], int nKeySyms) { - - qCDebug(KWIN_TABBOX) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms; - +static bool areKeySymXsDepressed(const uint keySyms[], int nKeySyms) +{ Xcb::QueryKeymap keys; QScopedPointer<xcb_key_symbols_t, KeySymbolsDeleter> symbols(xcb_key_symbols_alloc(connection())); @@ -933,42 +931,38 @@ } const auto keymap = keys->keys; + bool depressed = false; for (int iKeySym = 0; iKeySym < nKeySyms; iKeySym++) { uint keySymX = keySyms[ iKeySym ]; xcb_keycode_t *keyCodes = xcb_key_symbols_get_keycode(symbols.data(), keySymX); if (!keyCodes) { continue; } - xcb_keycode_t keyCodeX = keyCodes[0]; - free(keyCodes); - if (keyCodeX == XCB_NO_SYMBOL) { - continue; - } - int i = keyCodeX / 8; - char mask = 1 << (keyCodeX - (i * 8)); - // Abort if bad index value, - if (i < 0 || i >= 32) - return false; - - qCDebug(KWIN_TABBOX) << iKeySym << ": keySymX=0x" << QString::number(keySymX, 16) - << " i=" << i << " mask=0x" << QString::number(mask, 16) - << " keymap[i]=0x" << QString::number(keymap[i], 16); - - // If ALL keys passed need to be depressed, - if (bAll) { - if ((keymap[i] & mask) == 0) - return false; - } else { - // If we are looking for ANY key press, and this key is depressed, - if (keymap[i] & mask) - return true; + int j = 0; + while (keyCodes[j] != XCB_NO_SYMBOL) { + const xcb_keycode_t keyCodeX = keyCodes[j++]; + int i = keyCodeX / 8; + char mask = 1 << (keyCodeX - (i * 8)); + + if (i < 0 || i >= 32) { + continue; + } + + qCDebug(KWIN_TABBOX) << iKeySym << ": keySymX=0x" << QString::number(keySymX, 16) + << " i=" << i << " mask=0x" << QString::number(mask, 16) + << " keymap[i]=0x" << QString::number(keymap[i], 16); + + if (keymap[i] & mask) { + depressed = true; + break; + } } + + free(keyCodes); } - // If we were looking for ANY key press, then none was found, return false, - // If we were looking for ALL key presses, then all were found, return true. - return bAll; + return depressed; } static bool areModKeysDepressedX11(const QKeySequence &seq) @@ -999,7 +993,7 @@ rgKeySyms[nKeySyms++] = XK_Meta_R; } - return areKeySymXsDepressed(false, rgKeySyms, nKeySyms); + return areKeySymXsDepressed(rgKeySyms, nKeySyms); } static bool areModKeysDepressedWayland(const QKeySequence &seq)
