From d4ba7b5e6b0aa83892636731cf9be17bbcec8fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Fri, 4 Feb 2011 21:44:50 +0100 Subject: [PATCH 1/7] kwin: Fix the glBlendFunc() in the shader case. The RGB values were being multiplied by the alpha value twice. --- scene_opengl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene_opengl.cpp b/scene_opengl.cpp index a4bd2fdb32..a9cb18bc04 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -723,7 +723,7 @@ void SceneOpenGL::Window::prepareShaderRenderStates(TextureType type, double opa if (!opaque) { glEnable(GL_BLEND); if (alpha) { - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); } else { glBlendColor((float)opacity, (float)opacity, (float)opacity, (float)opacity); glBlendFunc(GL_ONE, GL_ONE_MINUS_CONSTANT_ALPHA); From 9865608fb305897d1c4d0bdf89a1b23332acbc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 5 Feb 2011 11:55:10 +0100 Subject: [PATCH 2/7] Fix a merge regression in Texture::release. Seems to be a lost change caused by rebasing moved code. --- scene_opengl_glx.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scene_opengl_glx.cpp b/scene_opengl_glx.cpp index 80759e9b30..fc7a52b1e7 100644 --- a/scene_opengl_glx.cpp +++ b/scene_opengl_glx.cpp @@ -640,7 +640,9 @@ void SceneOpenGL::Texture::init() void SceneOpenGL::Texture::release() { if (glxpixmap != None) { - glXReleaseTexImageEXT(display(), glxpixmap, GLX_FRONT_LEFT_EXT); + if (!options->glStrictBinding) { + glXReleaseTexImageEXT(display(), glxpixmap, GLX_FRONT_LEFT_EXT); + } glXDestroyPixmap(display(), glxpixmap); glxpixmap = None; } From 0b6e47ea35824f2b37505f50d361ea2d810d1a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 5 Feb 2011 11:56:48 +0100 Subject: [PATCH 3/7] Readd the hack for Xgl in findTarget. Apparently glXQueryDrawable does not work in NVIDIA blob for binding a texture from an icon. This fixes an abort, but the root cause should be found and fixed properly. --- scene_opengl_glx.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scene_opengl_glx.cpp b/scene_opengl_glx.cpp index fc7a52b1e7..4e89664f56 100644 --- a/scene_opengl_glx.cpp +++ b/scene_opengl_glx.cpp @@ -653,6 +653,17 @@ void SceneOpenGL::Texture::findTarget() unsigned int new_target = 0; if (glXQueryDrawable && glxpixmap != None) glXQueryDrawable(display(), glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target); + // HACK: this used to be a hack for Xgl. + // without this hack the NVIDIA blob aborts when trying to bind a texture from + // a pixmap icon + if (new_target == 0) { + if (NPOTTextureSupported() || + (isPowerOfTwo(mSize.width()) && isPowerOfTwo(mSize.height()))) { + new_target = GLX_TEXTURE_2D_EXT; + } else { + new_target = GLX_TEXTURE_RECTANGLE_EXT; + } + } switch(new_target) { case GLX_TEXTURE_2D_EXT: mTarget = GL_TEXTURE_2D; From e2d4cba4c8d3f66094b14916912c723d310547cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 5 Feb 2011 12:06:32 +0100 Subject: [PATCH 4/7] Temporarily workaround regression with NVIDIA. KWin's new shaders fail with NVIDIA and present just a black screen for the ortho shader (generic shader seems to work). Temporarily disabling the shaders to force a fallback to old rendering code. Of course the bug in the shader needs to be fixed. --- lib/kwinglutils.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/kwinglutils.cpp b/lib/kwinglutils.cpp index ff75932a39..49b94167a6 100644 --- a/lib/kwinglutils.cpp +++ b/lib/kwinglutils.cpp @@ -23,6 +23,7 @@ along with this program. If not, see . #ifdef KWIN_HAVE_OPENGL #include "kwinglobals.h" #include "kwineffects.h" +#include "kwinglplatform.h" #include "kdebug.h" #include @@ -1182,6 +1183,11 @@ GLShader *ShaderManager::loadShaderFromCode(const QByteArray &vertexSource, cons void ShaderManager::initShaders() { + // HACK: the generic shaders fail with NVIDIA's blob + // temporarily disable them to force kwin on GL 1.x profile + if (GLPlatform::instance()->driver() == Driver_NVidia) { + return; + } m_orthoShader = new GLShader(":/resources/scene-vertex.glsl", ":/resources/scene-fragment.glsl"); if (m_orthoShader->isValid()) { pushShader(SimpleShader, true); From 95c8ba203588bad26f38326fbbb2d8f3058e1295 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Mon, 7 Feb 2011 07:07:14 +0100 Subject: [PATCH 5/7] SVN_SILENT made messages (.desktop file) --- effects/invert/invert.desktop | 2 +- effects/login/login.desktop | 2 +- effects/logout/logout.desktop | 2 +- effects/taskbarthumbnail/taskbarthumbnail.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/effects/invert/invert.desktop b/effects/invert/invert.desktop index 3189bf4430..5344ae22c7 100644 --- a/effects/invert/invert.desktop +++ b/effects/invert/invert.desktop @@ -125,7 +125,7 @@ Comment[nn]=Snu fargane på skrivebordet og vindauge Comment[pa]=ਡੈਸਕਟਾਪ ਅਤੇ ਵਿੰਡੋ ਦੇ ਰੰਗ ਬਦਲੋ Comment[pl]=Odwrócenie kolorów pulpitu i okien Comment[pt]=Inverte a cor do ecrã e das janelas -Comment[pt_BR]=Inverte as cores da área de trabalho e das janelas +Comment[pt_BR]=Inverte as cores das janelas e da área de trabalho Comment[ro]=Inversează culoarea biroului și a ferestrelor Comment[ru]=Инверсия цвета рабочего стола и окон Comment[si]=වැඩතල හා කවුළු වල වර්‍ණ යටිකුරු කරන්න diff --git a/effects/login/login.desktop b/effects/login/login.desktop index 6d08e38f49..ff9b981859 100644 --- a/effects/login/login.desktop +++ b/effects/login/login.desktop @@ -126,7 +126,7 @@ Comment[nn]=Ton inn skrivebordet ved innlogging Comment[pa]=ਜਦੋਂ ਲਾਗਇਨ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਹੌਲੀ ਹੌਲੀ ਡੈਸਕਟਾਪ ਨੂੰ ਫਿੱਕਾ ਕਰੋ Comment[pl]=Płynne rozjaśnienie do pulpitu podczas logowania Comment[pt]=Desvanecer suavemente para o ecrã ao ligar-se -Comment[pt_BR]=Suaviza o desaparecimento da área de trabalho ao fazer login +Comment[pt_BR]=Suaviza o desaparecimento da área de trabalho ao fazer a autenticação Comment[ro]=Estompează lin biroul la autentificare Comment[ru]=Плавное проявление рабочего стола при входе в систему Comment[si]=පිවිසීමේදී වැඩතලයට සුමුදු අවපැහැකිරීමක් ලබාදෙන්න diff --git a/effects/logout/logout.desktop b/effects/logout/logout.desktop index 9c3cfd7308..198adc72c6 100644 --- a/effects/logout/logout.desktop +++ b/effects/logout/logout.desktop @@ -126,7 +126,7 @@ Comment[nn]=Ton ut skrivebordet ved utlogging Comment[pa]=ਜਦੋਂ ਲਾਗ-ਆਉਟ ਡਾਈਲਾਗ ਵੇਖਾਉਣਾ ਹੋਵੇ ਤਾਂ ਡੈਸਕਟਾਪ ਨੂੰ ਡਿ-ਸੈਚੂਰੇਟ ਕਰੋ Comment[pl]=Zmniejszenie nasycenia kolorów podczas pokazywania okna wylogowania Comment[pt]=Reduzir a saturação do ecrã ao mostrar a janela de fim de sessão -Comment[pt_BR]=Reduz a saturação da área de trabalho ao mostrar o diálogo de logout +Comment[pt_BR]=Reduz a saturação da área de trabalho ao mostrar o diálogo de desligamento Comment[ro]=Desaturează biroul la afișarea dialogului de ieșire Comment[ru]=Плавное обесцвечивание экрана при выходе из сеанса Comment[si]=පිටවීමෙ සංවාදය පෙන්වන විට වැඩතලය අසංතෘප්ත කරන්න diff --git a/effects/taskbarthumbnail/taskbarthumbnail.desktop b/effects/taskbarthumbnail/taskbarthumbnail.desktop index e443586e17..02c16af57b 100644 --- a/effects/taskbarthumbnail/taskbarthumbnail.desktop +++ b/effects/taskbarthumbnail/taskbarthumbnail.desktop @@ -120,7 +120,7 @@ Comment[nn]=Vis miniatyrbilete av vindauge når peikaren er over ikona på oppg Comment[pa]=ਵਿੰਡੋ ਥੰਮਨੇਲ ਵੇਖੋ, ਜਦੋਂ ਕਿ ਹੋਵਰਿੰਗ ਟਾਸਕਬਾਰ ਐਂਟਰੀ ਉੱਤੇ ਹੋਵੇ। Comment[pl]=Pokazuje miniaturki okien, kiedy kursor znajduje się na ich pozycji w pasku zadań Comment[pt]=Mostrar as miniaturas das janelas ao passar sobre os elementos da barra de tarefas -Comment[pt_BR]=Mostra miniaturas das janelas quando o cursor passar sobre os itens da barra de tarefas +Comment[pt_BR]=Mostra miniaturas das janelas quando o ponteiro do mouse passar sobre os itens da barra de tarefas Comment[ro]=Afișează miniaturile ferestrelor cînd cursorul planează deasupra înregistrărilor din bara de procese Comment[ru]=Показывать миниатюру окна при наведении мышью на элемент панели задач Comment[si]=ක්‍රියා තීරු ඇතුළත්කිරීම් වලට ඉහළින් හැසිරෙන විට කවුළු කුඩා රූ පෙන්වන්න From e1c04b7c3e2519af5c0f3e85a7f8e5bd8eeca16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 7 Feb 2011 19:19:51 +0100 Subject: [PATCH 6/7] Add shortcuts for new quick tile modes. Shortcuts for quick tile to the quarters of the screen added in 4.6. Thanks to Arthur Arlt for implementing this feature. FEATURE: 265461 FIXED-IN: 4.7.0 CCMAIL: arre2000@gmx.de --- kwinbindings.cpp | 8 ++++++++ placement.cpp | 32 ++++++++++++++++++++++++++++++++ workspace.h | 4 ++++ 3 files changed, 44 insertions(+) diff --git a/kwinbindings.cpp b/kwinbindings.cpp index fd23915a16..0a2c1fc290 100644 --- a/kwinbindings.cpp +++ b/kwinbindings.cpp @@ -122,6 +122,14 @@ DEF2("Window Quick Tile Left", I18N_NOOP("Quick Tile Window to the Left"), 0, slotWindowQuickTileLeft()); DEF2("Window Quick Tile Right", I18N_NOOP("Quick Tile Window to the Right"), 0, slotWindowQuickTileRight()); +DEF2("Window Quick Tile Top Left", I18N_NOOP("Quick Tile Window to the Top Left"), + 0, slotWindowQuickTileTopLeft()); +DEF2("Window Quick Tile Bottom Left", I18N_NOOP("Quick Tile Window to the Bottom Left"), + 0, slotWindowQuickTileBottomLeft()); +DEF2("Window Quick Tile Top Right", I18N_NOOP("Quick Tile Window to the Top Right"), + 0, slotWindowQuickTileTopRight()); +DEF2("Window Quick Tile Bottom Right", I18N_NOOP("Quick Tile Window to the Bottom Right"), + 0, slotWindowQuickTileBottomRight()); DEF2("Switch Window Up", I18N_NOOP("Switch to Window Above"), Qt::META + Qt::ALT + Qt::Key_Up, slotSwitchWindowUp()); DEF2("Switch Window Down", I18N_NOOP("Switch to Window Below"), diff --git a/placement.cpp b/placement.cpp index a578803864..0f3d4d3926 100644 --- a/placement.cpp +++ b/placement.cpp @@ -700,6 +700,38 @@ void Workspace::slotWindowQuickTileRight() active_client->setQuickTileMode(QuickTileRight, true); } +void Workspace::slotWindowQuickTileTopLeft() +{ + if (!active_client) { + return; + } + active_client->setQuickTileMode(QuickTileTopLeft, true); +} + +void Workspace::slotWindowQuickTileTopRight() +{ + if (!active_client) { + return; + } + active_client->setQuickTileMode(QuickTileTopRight, true); +} + +void Workspace::slotWindowQuickTileBottomLeft() +{ + if (!active_client) { + return; + } + active_client->setQuickTileMode(QuickTileBottomLeft, true); +} + +void Workspace::slotWindowQuickTileBottomRight() +{ + if (!active_client) { + return; + } + active_client->setQuickTileMode(QuickTileBottomRight, true); +} + int Workspace::packPositionLeft(const Client* cl, int oldx, bool left_edge) const { int newx = clientArea(MovementArea, cl).left(); diff --git a/workspace.h b/workspace.h index 34ca651f21..fe97c776c4 100644 --- a/workspace.h +++ b/workspace.h @@ -764,6 +764,10 @@ public slots: void slotWindowShrinkVertical(); void slotWindowQuickTileLeft(); void slotWindowQuickTileRight(); + void slotWindowQuickTileTopLeft(); + void slotWindowQuickTileTopRight(); + void slotWindowQuickTileBottomLeft(); + void slotWindowQuickTileBottomRight(); void slotWalkThroughDesktops(); void slotWalkBackThroughDesktops(); From 54a700ab05a4d091153a395620265cc6c09a3b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 7 Feb 2011 19:57:13 +0100 Subject: [PATCH 7/7] Update HACKING file to kdelibs coding style. The complete HACKING file needs a rewrite... --- HACKING | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/HACKING b/HACKING index fc9e97e94a..e2ea805889 100644 --- a/HACKING +++ b/HACKING @@ -168,35 +168,9 @@ there is e.g. an extensive section related to window management). Coding style: ============= -There are these rules for patches for KWin: +KWin follows the kdelibs coding style. See: http://techbase.kde.org/Policies/Kdelibs_Coding_Style -- the code should be relatively nice and clean. Seriously. Rationale: Any messy code can be hard to comprehend, -but if the code is in a window manager it will be twice as difficult. - -- unless the functionality of the code is obvious, there should be either at least a short comment explaining -what it does, or it should be obvious from the commit log. If there's a hack needed, if there's a potentional -problem, if something is just a temporary fix, say so. Comments like "this clever trick is necessary" -don't count. See above for rationale. I needed more than two years to understand all of KWin, -and there were parts I never got and had to rewrite in order to fix a problem with them. - -- indentation is 4 spaces, not tabs. Rationale: The code looks like a mess if this is not consistent. - -- { and } enclosing a block are aligned with the block, neither with the above level nor there is any -trailing { (i.e. { and } are indented in the same column like the code they surround). See above for rationale. -If this feel weird or whatever, put them wherever you want first and when the changes are done, check -"svn diff" and fix it. If I can handle about half a dozen different formatting styles when working -on various parts of KDE, this shouldn't be that much work for you (and yes, I've even done -the "fix-before-submit" thing). - -- there is not space before (, i.e. it's "foo(", not "foo (". Rationale: This makes it simpler to grep for functions. - -- a null pointer is NULL, not a zero. Not that I really insist on this one, but the only reason for using 0 -is being way too lazy to type. Rationale: NULL says it's a pointer, and with many compilers it actually is a pointer, -making it possible to detect some mistakes. - -That's all. Bonus points if you try to follow the existing coding style in general, but I don't think -I really care about the rest, as long as these rules are followed. If I find out I care about more, -I'll add them here. +The source repository was reformatted with git commit 4fd08556a1702462335f4f1307da663c2c54b2c2 Branches: