[sawfish] Renamed animation related modules.



commit a557d1a26aa6af45e4fbde9eabd9f38ab54c2f86
Author: Teika kazura <teika lavabit com>
Date:   Tue Feb 1 14:20:33 2011 +0900

    Renamed animation related modules.
    
    All are collected under wm/animation/. Imports are also updated.
    window-anim.jl         -> animation/setup.jl
    animation/outline.jl   -> animation/main.jl
    util/window-outline.jl -> animation/modes.jl

 lisp/sawfish/wm.jl                                 |    4 ++--
 lisp/sawfish/wm/animation/{outline.jl => main.jl}  |   11 ++++++-----
 .../{util/window-outline.jl => animation/modes.jl} |    7 ++++---
 .../wm/{window-anim.jl => animation/setup.jl}      |    8 ++++----
 lisp/sawfish/wm/autoload.jl                        |   10 +++++-----
 lisp/sawfish/wm/commands/move-resize.jl            |    2 +-
 man/news.texi                                      |    5 +++++
 7 files changed, 27 insertions(+), 20 deletions(-)
---
diff --git a/lisp/sawfish/wm.jl b/lisp/sawfish/wm.jl
index 9c0046c..f787206 100644
--- a/lisp/sawfish/wm.jl
+++ b/lisp/sawfish/wm.jl
@@ -69,7 +69,7 @@
 (require 'sawfish.wm.custom)
 (require 'sawfish.wm.focus)
 (require 'sawfish.wm.placement)
-(require 'sawfish.wm.window-anim)
+(require 'sawfish.wm.animation.setup)
 
 ;; load standard libraries (but don't import them)
 (mapc intern-structure '(sawfish.wm.keymaps
@@ -108,7 +108,7 @@
 	      sawfish.wm.server
 	      sawfish.wm.stacking
 	      sawfish.wm.viewport
-	      sawfish.wm.window-anim
+	      sawfish.wm.animation.setup
 	      sawfish.wm.windows
 	      sawfish.wm.workspace
 	      sawfish.wm.state.iconify
diff --git a/lisp/sawfish/wm/animation/outline.jl b/lisp/sawfish/wm/animation/main.jl
similarity index 94%
rename from lisp/sawfish/wm/animation/outline.jl
rename to lisp/sawfish/wm/animation/main.jl
index 604eeba..e81ffed 100644
--- a/lisp/sawfish/wm/animation/outline.jl
+++ b/lisp/sawfish/wm/animation/main.jl
@@ -1,4 +1,4 @@
-;; anim-outline.jl -- simple window animations
+;; main.jl -- animation definition interface
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
@@ -18,7 +18,7 @@
 ;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(define-structure sawfish.wm.animation.outline
+(define-structure sawfish.wm.animation.main
 
     (export make-outline-animator)
 
@@ -26,13 +26,14 @@
 	  sawfish.wm.misc
 	  sawfish.wm.events
 	  sawfish.wm.windows
-	  sawfish.wm.window-anim
+	  sawfish.wm.animation.setup
 	  sawfish.wm.custom
-	  sawfish.wm.util.window-outline
+	  sawfish.wm.animation.modes
 	  sawfish.wm.gaol
 	  rep.io.timers)
 
-  (define-structure-alias anim-outline sawfish.wm.animation.outline)
+  ;; For backward compatibility.
+  (define-structure-alias anim-outline sawfish.wm.animation.main)
 
   (defcustom anim-outline-icon-coords (cons (screen-width) (screen-height))
     "Animation Outline Coordinates"
diff --git a/lisp/sawfish/wm/util/window-outline.jl b/lisp/sawfish/wm/animation/modes.jl
similarity index 97%
rename from lisp/sawfish/wm/util/window-outline.jl
rename to lisp/sawfish/wm/animation/modes.jl
index 67b87a7..46158e9 100644
--- a/lisp/sawfish/wm/util/window-outline.jl
+++ b/lisp/sawfish/wm/animation/modes.jl
@@ -1,4 +1,4 @@
-;; window-outline.jl -- drawing window `rubber-band' outlines
+;; modes.jl -- Define animators.
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
@@ -18,7 +18,7 @@
 ;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(define-structure sawfish.wm.util.window-outline
+(define-structure sawfish.wm.animation.modes
 
     (export draw-window-outline
 	    erase-window-outline
@@ -29,7 +29,8 @@
 	  rep.util.autoloader
 	  sawfish.wm.misc)
 
-  (define-structure-alias window-outline sawfish.wm.util.window-outline)
+  ;; For backward compatibility.
+  (define-structure-alias window-outline sawfish.wm.animation.modes)
 
 ;;; mechanics
 
diff --git a/lisp/sawfish/wm/window-anim.jl b/lisp/sawfish/wm/animation/setup.jl
similarity index 93%
rename from lisp/sawfish/wm/window-anim.jl
rename to lisp/sawfish/wm/animation/setup.jl
index c478b7b..d014873 100644
--- a/lisp/sawfish/wm/window-anim.jl
+++ b/lisp/sawfish/wm/animation/setup.jl
@@ -1,4 +1,4 @@
-;; window-anim.jl -- visual feedback for window actions
+;; animation/setup.jl -- Set up animation feature.
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
@@ -18,7 +18,7 @@
 ;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(define-structure sawfish.wm.ext.window-anim
+(define-structure sawfish.wm.animation.setup
 
     (export define-window-animator
 	    autoload-window-animator
@@ -30,8 +30,8 @@
 	  sawfish.wm.windows
 	  sawfish.wm.custom
 	  rep.util.autoloader)
-
-  (define-structure-alias window-anim sawfish.wm.ext.window-anim)
+  ;; For backward compatibility.
+  (define-structure-alias window-anim sawfish.wm.animation.setup)
 
   (define window-animators nil
     "List of all possible window animation types.")
diff --git a/lisp/sawfish/wm/autoload.jl b/lisp/sawfish/wm/autoload.jl
index 066fc3b..d5a537b 100644
--- a/lisp/sawfish/wm/autoload.jl
+++ b/lisp/sawfish/wm/autoload.jl
@@ -31,11 +31,11 @@
 (autoload-command 'popup-root-menu 'sawfish.wm.menus)
 (autoload-command 'popup-apps-menu 'sawfish.wm.menus)
 (autoload-command 'popup-window-list-menu 'sawfish.wm.menus)
-(autoload-window-animator 'wireframe 'sawfish.wm.animation.outline)
-(autoload-window-animator 'solid 'sawfish.wm.animation.outline)
-(autoload-window-animator 'cross 'sawfish.wm.animation.outline)
-(autoload-window-animator 'elliptical 'sawfish.wm.animation.outline)
-(autoload-window-animator 'draft 'sawfish.wm.animation.outline)
+(autoload-window-animator 'wireframe 'sawfish.wm.animation.main)
+(autoload-window-animator 'solid 'sawfish.wm.animation.main)
+(autoload-window-animator 'cross 'sawfish.wm.animation.main)
+(autoload-window-animator 'elliptical 'sawfish.wm.animation.main)
+(autoload-window-animator 'draft 'sawfish.wm.animation.main)
 (autoload-command 'next-workspace-window 'sawfish.wm.commands.cycle)
 (autoload-command 'previous-workspace-window 'sawfish.wm.commands.cycle)
 (autoload-command 'next-window 'sawfish.wm.commands.cycle)
diff --git a/lisp/sawfish/wm/commands/move-resize.jl b/lisp/sawfish/wm/commands/move-resize.jl
index b594906..389337c 100644
--- a/lisp/sawfish/wm/commands/move-resize.jl
+++ b/lisp/sawfish/wm/commands/move-resize.jl
@@ -221,7 +221,7 @@ its edges with an edge of another window.")
 
       (update-edges)
       (unless (eq move-resize-mode 'opaque)
-	(require 'sawfish.wm.util.window-outline)
+	(require 'sawfish.wm.animation.modes)
 	;; prevent any other programs drawing on the display
 	(grab-server)
 	(setq server-grabbed t))
diff --git a/man/news.texi b/man/news.texi
index b35db6d..faa3700 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -69,6 +69,11 @@ more detailed examples.
 
 @item User option @code{focus-ignore-pointer-events} is deleted. [Teika kazura] *
 In fact, it's for internal use, and should not have been a user option. Use your favorite focus mode instead.
+
+ item Animation related modules are renamed [Teika kazura]
+
+All are collected under @file{sawfish/wm/animation}. @code{window-anim.jl} -> @code{setup.jl}, @code{outline.jl} -> @code{main.jl}, @code{util/window-outline.jl} -> @code{modes.jl}.
+
 @end itemize
 @item Build and Installation
 @itemize @minus



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