[metacity] effects: remove unused code



commit d1deacacf6ebaf2768610967fb761b42f35fc584
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 2 17:21:23 2017 +0200

    effects: remove unused code

 src/core/display.c        |    3 --
 src/core/effects.c        |   56 ---------------------------------------------
 src/core/effects.h        |   44 -----------------------------------
 src/core/window-private.h |    1 -
 src/core/window.c         |   22 -----------------
 5 files changed, 0 insertions(+), 126 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 02fb328..2c71309 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2043,9 +2043,6 @@ event_callback (XEvent   *event,
                               "Window %s withdrawn\n",
                               window->desc);
 
-                  if (!window->override_redirect)
-                    meta_effect_run_close (window, NULL, NULL);
-
                   /* Unmanage withdrawn window */
                   window->withdrawn = TRUE;
                   meta_window_free (window, timestamp);
diff --git a/src/core/effects.c b/src/core/effects.c
index afe22b8..dadb807 100644
--- a/src/core/effects.c
+++ b/src/core/effects.c
@@ -161,20 +161,6 @@ effect_free (MetaEffect *effect)
 }
 
 void
-meta_effect_run_focus (MetaWindow          *window,
-                      MetaEffectFinished   finished,
-                      gpointer             data)
-{
-    MetaEffect *effect;
-
-    g_return_if_fail (window != NULL);
-
-    effect = create_effect (META_EFFECT_FOCUS, window, finished, data);
-
-    run_handler (effect);
-}
-
-void
 meta_effect_run_minimize (MetaWindow         *window,
                           MetaRectangle      *window_rect,
                           MetaRectangle      *icon_rect,
@@ -194,42 +180,6 @@ meta_effect_run_minimize (MetaWindow         *window,
     run_handler (effect);
 }
 
-void
-meta_effect_run_unminimize (MetaWindow         *window,
-                            MetaRectangle      *window_rect,
-                            MetaRectangle      *icon_rect,
-                            MetaEffectFinished  finished,
-                            gpointer            data)
-{
-    MetaEffect *effect;
-
-    g_return_if_fail (window != NULL);
-    g_return_if_fail (icon_rect != NULL);
-
-    effect = create_effect (META_EFFECT_UNMINIMIZE, window, finished, data);
-
-    effect->u.minimize.window_rect = *window_rect;
-    effect->u.minimize.icon_rect = *icon_rect;
-
-    run_handler (effect);
-}
-
-void
-meta_effect_run_close (MetaWindow         *window,
-                      MetaEffectFinished  finished,
-                      gpointer            data)
-{
-    MetaEffect *effect;
-
-    g_return_if_fail (window != NULL);
-
-    effect = create_effect (META_EFFECT_CLOSE, window,
-                            finished, data);
-
-    run_handler (effect);
-}
-
-
 /* old ugly minimization effect */
 
 static void
@@ -614,12 +564,6 @@ run_default_effect_handler (MetaEffect *effect)
                      META_MINIMIZE_ANIMATION_LENGTH);
        break;
 
-    case META_EFFECT_UNMINIMIZE:
-    case META_EFFECT_FOCUS:
-    case META_EFFECT_CLOSE:
-    case META_NUM_EFFECTS:
-      break;
-
     default:
        break;
     }
diff --git a/src/core/effects.h b/src/core/effects.h
index d0d0193..03fc282 100644
--- a/src/core/effects.h
+++ b/src/core/effects.h
@@ -49,10 +49,6 @@
 typedef enum
 {
   META_EFFECT_MINIMIZE,
-  META_EFFECT_UNMINIMIZE,
-  META_EFFECT_FOCUS,
-  META_EFFECT_CLOSE,
-  META_NUM_EFFECTS
 } MetaEffectType;
 
 /**
@@ -76,46 +72,6 @@ void        meta_effect_run_minimize     (MetaWindow         *window,
                                           gpointer            data);
 
 /**
- * Performs the unminimize effect.  There is no such effect.
- * FIXME: delete this.
- *
- * \param window       The window we're moving
- * \param icon_rect    Its current state
- * \param window_rect  Where it should end up
- * \param finished     Callback for when it's finished
- * \param data         Data for callback
- */
-void        meta_effect_run_unminimize (MetaWindow         *window,
-                                          MetaRectangle      *window_rect,
-                                          MetaRectangle      *icon_rect,
-                                          MetaEffectFinished  finished,
-                                          gpointer            data);
-
-/**
- * Performs the close effect.  There is no such effect.
- * FIXME: delete this.
- *
- * \param window       The window we're moving
- * \param finished     Callback for when it's finished
- * \param data         Data for callback
- */
-void        meta_effect_run_close        (MetaWindow         *window,
-                                          MetaEffectFinished  finished,
-                                          gpointer            data);
-
-/**
- * Performs the focus effect.  There is no such effect.
- * FIXME: delete this.
- *
- * \param window       The window we're moving
- * \param finished     Callback for when it's finished
- * \param data         Data for callback
- */
-void        meta_effect_run_focus        (MetaWindow         *window,
-                                          MetaEffectFinished  finished,
-                                          gpointer            data);
-
-/**
  * Grabs the server and paints a wireframe rectangle on the screen.
  * Since this involves starting a grab, please be considerate of other
  * users and don't keep the grab for long.  You may move the wireframe
diff --git a/src/core/window-private.h b/src/core/window-private.h
index fbb5c5b..4b13e8e 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -188,7 +188,6 @@ struct _MetaWindow
 
   /* Minimize is the state controlled by the minimize button */
   guint minimized : 1;
-  guint was_minimized : 1;
   guint tab_unminimized : 1;
 
   /* Whether the window is mapped; actual server-side state
diff --git a/src/core/window.c b/src/core/window.c
index 14a8cd4..0b279a6 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -464,7 +464,6 @@ meta_window_new (MetaDisplay *display,
   window->fullscreen = FALSE;
   window->initially_iconic = FALSE;
   window->minimized = FALSE;
-  window->was_minimized = FALSE;
   window->tab_unminimized = FALSE;
   window->iconic = FALSE;
   window->mapped = attrs.map_state != IsUnmapped;
@@ -2315,24 +2314,6 @@ meta_window_show (MetaWindow *window)
           XMapWindow (window->display->xdisplay, window->xwindow);
           meta_error_trap_pop (window->display);
           did_show = TRUE;
-
-          if (window->was_minimized)
-            {
-              MetaRectangle window_rect;
-              MetaRectangle icon_rect;
-
-              window->was_minimized = FALSE;
-
-              if (meta_window_get_icon_geometry (window, &icon_rect))
-                {
-                  meta_window_get_outer_rect (window, &window_rect);
-
-                  meta_effect_run_unminimize (window,
-                                              &window_rect,
-                                              &icon_rect,
-                                              NULL, NULL);
-                }
-            }
         }
 
       if (window->iconic)
@@ -2481,7 +2462,6 @@ meta_window_unminimize (MetaWindow  *window)
   if (window->minimized)
     {
       window->minimized = FALSE;
-      window->was_minimized = TRUE;
       meta_window_queue(window, META_QUEUE_CALC_SHOWING);
 
       meta_window_foreach_transient (window,
@@ -4483,8 +4463,6 @@ meta_window_focus (MetaWindow  *window,
 
   if (window->wm_state_demands_attention)
     meta_window_unset_demands_attention(window);
-
-  meta_effect_run_focus(window, NULL, NULL);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]