Merge lp:~mc-return/compiz/compiz0.9.9.merge-plugin-dialog into lp:compiz/0.9.9

[MC Return]

Adds the plug-in "Dialog Dim" converted from git to bzr (including full history) to lp:compiz.

This plugin currently has quite a few problems and is not ready for merge yet:

* Although saturation seems to be correctly implemented, saturation always seems to be 1.0

* The speed setting has no effect whatsoever

* Parent windows sometimes get stuck in their faded state, which ofc is inacceptable

* Default settings could be better

Unmerged revisions

3293. By MC Return on 2013-01-09

Merged latest lp:compiz

3292. By MC Return on 2012-08-18

Reverted last commit and fixed the right typo this time

3291. By MC Return on 2012-08-18

Fixed typo

3290. By MC Return on 2012-08-18

Fixed a few of the tooltips

3289. By MC Return on 2012-08-18

Hopefully fixed indentation

3288. By MC Return on 2012-08-18

Removed plugins/dialog/VERSION

3287. By MC Return on 2012-07-22

Added the plug-in "Dialog Dim" converted from git to bzr (including full history) to lp:compiz

=== added directory 'plugins/dialog'
=== added file 'plugins/dialog/CMakeLists.txt'
--- plugins/dialog/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/dialog/CMakeLists.txt	2013-01-09 23:13:24 +0000
@@ -0,0 +1,5 @@
+find_package (Compiz REQUIRED)
+
+include (CompizPlugin)
+
+compiz_plugin (dialog PLUGINDEPS composite opengl)

=== added file 'plugins/dialog/dialog.xml.in'
--- plugins/dialog/dialog.xml.in	1970-01-01 00:00:00 +0000
+++ plugins/dialog/dialog.xml.in	2013-01-09 23:13:24 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<compiz>
+	<plugin name="dialog" useBcop="true">
+		<short>Dialog Dim</short>
+		<long>Fades windows with open dialogs</long>
+		<category>Extras</category>
+		<deps>
+		    <relation type="after">
+			<plugin>composite</plugin>
+			<plugin>opengl</plugin>
+			<plugin>decor</plugin>
+			<plugin>fade</plugin>
+		    </relation>
+		    <requirement>
+			<plugin>regex</plugin>
+			<plugin>fade</plugin>
+			<plugin>opengl</plugin>
+		    </requirement>
+		</deps>
+		<options>
+			<group>
+				<option name="fading_windows" type="match">
+					<_short>Fading Windows</_short>
+                                        <_long>Windows which are allowed to fade.</_long>
+				    <default>Normal | Dialog | ModalDialog</default>
+				</option>
+				<option name="dialogtypes" type="match">
+					<_short>Dialog Match</_short>
+                                        <_long>Dialogs which will trigger fading.</_long>
+				    <default>(override_redirect=0) &amp; !(type=Menu | class=Gimp | class=Inkscape | (class=Firefox &amp; type=Tooltip))</default>
+				</option>
+				<option name="speed" type="float">
+					<_short>Speed</_short>
+                                        <_long>The speed of the animation.</_long>
+					<default>16</default>
+					<min>1</min>
+					<max>100</max>
+					<precision>1</precision>
+				</option>
+				<option name="opacity" type="float">
+					<_short>Opacity</_short>
+                                        <_long>The opacity of windows with open dialogs.</_long>
+					<default>80</default>
+					<min>0</min>
+					<max>100</max>
+					<precision>1</precision>
+				</option>
+				<option name="saturation" type="float">
+					<_short>Saturation</_short>
+                                        <_long>The saturation of windows with open dialogs.</_long>
+					<default>18</default>
+					<min>0</min>
+					<max>100</max>
+					<precision>1</precision>
+				</option>
+                                <option name="brightness" type="float">
+                                        <_short>Brightness</_short>
+                                        <_long>The Brightness of windows with open dialogs.</_long>
+					<default>60</default>
+					<min>0</min>
+					<max>100</max>
+					<precision>1</precision>
+				</option>
+			</group>
+		</options>
+	</plugin>
+</compiz>
+

=== added directory 'plugins/dialog/src'
=== added file 'plugins/dialog/src/dialog.cpp'
--- plugins/dialog/src/dialog.cpp	1970-01-01 00:00:00 +0000
+++ plugins/dialog/src/dialog.cpp	2013-01-09 23:13:24 +0000
@@ -0,0 +1,158 @@
+/**
+ *
+ * dialog.cpp
+ *
+ * Copyright (c) 2008 Douglas Young <[e-mail]>
+ * Input shaping adapted from FreeWins plugin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ **/
+
+#include "dialog.h"
+#include <cmath>
+
+COMPIZ_PLUGIN_20090315 (dialog, DialogPluginVTable);
+
+bool
+DialogWindow::shouldFade ()
+{
+    if (window->overrideRedirect ())
+	return false;
+
+    if (!window->isViewable ())
+	return false;
+
+    if (!DialogScreen::get (screen)->optionGetFadingWindows ().evaluate (window))
+	return false;
+
+    return true;
+}
+
+bool
+DialogWindow::glPaint (const GLWindowPaintAttrib &attrib,
+		       const GLMatrix		 &transform,
+		       const CompRegion		 &region,
+		       unsigned int		 mask)
+{
+    if (mFaded)
+    {
+	DIALOG_SCREEN (screen);
+	GLWindowPaintAttrib wAttrib (attrib);
+	wAttrib.opacity  *= (ds->optionGetOpacity () / 100);
+	wAttrib.saturation *= (ds->optionGetSaturation () / 100);
+	wAttrib.brightness *= (ds->optionGetBrightness () / 100);
+
+	return gWindow->glPaint (wAttrib, transform, region, mask);
+    }
+
+    return gWindow->glPaint (attrib, transform, region, mask);
+}
+
+void
+DialogScreen::preparePaint (int ms)
+{
+    cScreen->preparePaint (ms);
+}
+
+void
+DialogScreen::handleEvent (XEvent *event)
+{
+    if (event->type == UnmapNotify)
+    {
+	CompWindow *w = screen->findWindow (event->xunmap.window);
+	if (w && w->transientFor ())
+	{
+	    CompWindow   *ww  = screen->findWindow (w->transientFor ());
+	    if (ww)
+	    {
+		DialogWindow *dww = DialogWindow::get (ww);
+		if (dww->mFaded)
+		{
+		    int othertrans = 0;
+		    foreach (CompWindow *www, screen->windows ())
+		    {
+			if (www->transientFor () == ww->id () && w->id () != www->id () &&
+			    optionGetDialogtypes ().evaluate (www))
+			    othertrans++;
+		    }
+		    if (!othertrans)
+		    {
+			dww->mFaded = false;
+			CompositeWindow::get (ww)->addDamage ();
+		    }
+		}
+	    }
+	}
+    }
+    if (event->type == MapNotify)
+    {
+	CompWindow *w = screen->findWindow (event->xmap.window);
+	if (w && w->transientFor () && optionGetDialogtypes ().evaluate (w))
+	{
+	    CompWindow   *ww  = screen->findWindow (w->transientFor ());
+	    DialogWindow *dww = DialogWindow::get (ww);
+	    if (!dww->mFaded && dww->shouldFade ())
+	    {
+		dww->mFaded = true;
+		dww->cWindow->addDamage ();
+	    }
+	}
+    }
+
+    screen->handleEvent (event);
+}
+
+void
+DialogScreen::optionChanged (CompOption             *option,
+			     DialogOptions::Options num)
+{
+    foreach (CompWindow *w, screen->windows ())
+    {
+	DIALOG_WINDOW (w);
+	dw->cWindow->addDamage ();
+    }
+}
+
+DialogScreen::DialogScreen (CompScreen *screen) :
+    PluginClassHandler <DialogScreen, CompScreen> (screen),
+    cScreen (CompositeScreen::get (screen)),
+    gScreen (GLScreen::get (screen))
+{
+    ScreenInterface::setHandler (screen);
+    CompositeScreenInterface::setHandler (cScreen);
+
+    optionSetOpacityNotify (boost::bind (&DialogScreen::optionChanged, this, _1, _2));
+    optionSetSaturationNotify (boost::bind (&DialogScreen::optionChanged, this, _1, _2));
+    optionSetBrightnessNotify (boost::bind (&DialogScreen::optionChanged, this, _1, _2));
+}
+
+DialogWindow::DialogWindow (CompWindow *w) :
+    PluginClassHandler <DialogWindow, CompWindow> (w),
+    window (w),
+    cWindow (CompositeWindow::get (w)),
+    gWindow (GLWindow::get (w)),
+    mFaded (false),
+    mOldTransient (None)
+{
+    GLWindowInterface::setHandler (gWindow);
+}
+
+bool
+DialogPluginVTable::init ()
+{
+    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
+	!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
+	!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
+	return false;
+
+    return true;
+}

=== added file 'plugins/dialog/src/dialog.h'
--- plugins/dialog/src/dialog.h	1970-01-01 00:00:00 +0000
+++ plugins/dialog/src/dialog.h	2013-01-09 23:13:24 +0000
@@ -0,0 +1,101 @@
+/**
+ *
+ * dialog.h
+ *
+ * Copyright (c) 2008 Douglas Young <[e-mail]>
+ * Input shaping adapted from FreeWins plugin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ **/
+
+#include <core/core.h>
+#include <composite/composite.h>
+#include <opengl/opengl.h>
+
+#include "dialog_options.h"
+
+#define ANIMATE_UP 1
+#define ANIMATE_DOWN 2
+#define ANIMATE_NONE 0
+
+class DialogScreen :
+	public PluginClassHandler <DialogScreen, CompScreen>,
+	public ScreenInterface,
+	public CompositeScreenInterface,
+	public DialogOptions
+{
+    public:
+
+	DialogScreen (CompScreen *s);
+
+    public:
+
+	CompositeScreen *cScreen;
+	GLScreen	*gScreen;
+
+	void
+	preparePaint (int);
+
+	void
+	handleEvent (XEvent *);
+
+	void
+	optionChanged (CompOption *opt,
+		       DialogOptions::Options);
+};
+
+class DialogWindow :
+	public PluginClassHandler <DialogWindow, CompWindow>,
+	public GLWindowInterface
+{
+    public:
+
+	DialogWindow (CompWindow *);
+
+    public:
+
+	CompWindow *window;
+	CompositeWindow *cWindow;
+	GLWindow	*gWindow;
+	bool		mFaded;
+
+	Window		mOldTransient;
+
+	bool		shouldFade ();
+
+	bool
+	glPaint (const GLWindowPaintAttrib &,
+		 const GLMatrix		   &,
+		 const CompRegion	   &,
+		 unsigned int		     );
+};
+
+#define DIALOG_SCREEN(s)						       \
+    DialogScreen *ds = DialogScreen::get (s);
+
+#define DIALOG_WINDOW(w)						       \
+    DialogWindow *dw = DialogWindow::get (w);
+
+#define WIN_X(w) ((w)->x () - (w)->border ().left)
+#define WIN_Y(w) ((w)->y () - (w)->border ().top)
+#define WIN_W(w) ((w)->width () + (w)->border ().left + (w)->border ().right)
+#define WIN_H(w) ((w)->height () + (w)->border ().top + (w)->border ().bottom)
+
+#define SPEED (optionGetSpeed () * 0.0005f)
+
+class DialogPluginVTable :
+	public CompPlugin::VTableForScreenAndWindow <DialogScreen, DialogWindow>
+{
+    public:
+
+	bool init ();
+};