commit e10d27901789facc6288f82afe9f95617146f063
author Juan Zhao <juan.j.zhao@intel.com> Wed Apr 25 19:09:52 2012 +0800
committer Kristian Høgsberg <krh@bitplanet.net> Wed Apr 25 10:38:19 2012 -0400
tree 2d58461da48eae83370238b1518216a9e7743570
parent 2abd07b2006fbedcd77005b5c50b3bc6fb7d9321

shell-animation: add conf option in shell

Now we can choose zoom or fade in weston.ini
to fulfill and customize the user experence easier.

Signed-off-by: Juan Zhao <juan.j.zhao@intel.com>

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index fd66462..9c844b5 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -36,6 +36,13 @@
 #include "desktop-shell-server-protocol.h"
 #include "../shared/config-parser.h"
 
+enum animation_type {
+	ANIMATION_NONE,
+
+	ANIMATION_ZOOM,
+	ANIMATION_FADE
+};
+
 struct desktop_shell {
 	struct weston_compositor *compositor;
 
@@ -76,6 +83,7 @@
 	} screensaver;
 
 	uint32_t binding_modifier;
+	enum animation_type win_animation_type;
 	struct weston_surface *debug_repaint_surface;
 };
 
@@ -242,6 +250,20 @@
 		return MODIFIER_SUPER;
 }
 
+static enum animation_type
+get_animation_type(char *animation)
+{
+	if (!animation)
+		return ANIMATION_NONE;
+
+	if (!strcmp("zoom", animation))
+		return ANIMATION_ZOOM;
+	else if (!strcmp("fade", animation))
+		return ANIMATION_FADE;
+	else
+		return ANIMATION_NONE;
+}
+
 static void
 shell_configuration(struct desktop_shell *shell)
 {
@@ -249,9 +271,11 @@
 	char *path = NULL;
 	int duration = 60;
 	char *modifier = NULL;
+	char *win_animation = NULL;
 
 	struct config_key shell_keys[] = {
 		{ "binding-modifier",   CONFIG_KEY_STRING, &modifier },
+		{ "animation",          CONFIG_KEY_STRING, &win_animation},
 	};
 
 	struct config_key saver_keys[] = {
@@ -271,6 +295,7 @@
 	shell->screensaver.path = path;
 	shell->screensaver.duration = duration;
 	shell->binding_modifier = get_modifier(modifier);
+	shell->win_animation_type = get_animation_type(win_animation);
 }
 
 static void
@@ -2020,7 +2045,18 @@
 	}
 
 	if (surface_type == SHELL_SURFACE_TOPLEVEL)
-		weston_zoom_run(surface, 0.8, 1.0, NULL, NULL);
+	{
+		switch (shell->win_animation_type) {
+		case ANIMATION_FADE:
+			weston_fade_run(surface, NULL, NULL);
+			break;
+		case ANIMATION_ZOOM:
+			weston_zoom_run(surface, 0.8, 1.0, NULL, NULL);
+			break;
+		default:
+			break;
+		}
+	}
 }
 
 static void