[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[33] fvwm/components

[<dom...@us...>]

Revision: 33
          http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=33&view=rev
Author:   dominique_libre
Date:     2010-12-22 19:06:29 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
New Amiga focus policy, fixed Window-Remember-* functions to use new syntax

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Window-Remember-ClickToFocus
    fvwm/components/functions/Window-Remember-SloppyFocus
    fvwm/components/styles/FocusPolicy-Amiga
    fvwm/components/styles/FocusPolicy-MSWindows

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-12-22 01:01:24 UTC (rev 32)
+++ ChangeLog	2010-12-22 19:06:29 UTC (rev 33)
@@ -1,5 +1,12 @@
 ChangeLog for FVWM-Crystal
 
+Mercredi 23 décembre 2010 Dominique Michel
+  * New Amiga focus policy : click to focus without raise,
+    icons are move to focus :), its not AmigaOS behaviour but I like it that
+    way for now, may change in the future
+
+  * Fixed Window-Remember-*, State 2 initialisation was using old syntax
+
 Mardi 22 décembre 2010 Dominique Michel
 The commit list bounced here too !
   * New Maximize functions and associated bindings

Modified: fvwm/components/functions/Window-Remember-ClickToFocus
===================================================================
--- fvwm/components/functions/Window-Remember-ClickToFocus	2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/functions/Window-Remember-ClickToFocus	2010-12-22 19:06:29 UTC (rev 33)
@@ -2,18 +2,29 @@
 # Functions for Style * ClickToFocus
 # ---------------------------------------
 
+# Called when focus change, set state 2 for the focused window,
+# unset it for the other.
+###############################################################
 DestroyFunc Window-RememberFocused
 AddToFunc Window-RememberFocused
 + I None (CurrentPage, AcceptsFocus) Break
-+ I Current (!Iconified, !Sticky) All (CurrentPage) State 2 False
-+ I Current (!Iconified) State 2 True
++ I Current (!Iconified, !Sticky) All (CurrentPage) WindowStyle !State 2
++ I Current (!Iconified) WindowStyle State 2
 
+# Called when new page and destroy window, restore the focus to the
+# previouslx focused window.
+###################################################################
 DestroyFunc Window-FocusRemembered
 AddToFunc Window-FocusRemembered
+#+ I Any (FvwmMiniConsoleNeedsUniqueName, Visible) Break
+#+ I Any (QuakeConsoleNeedsUniqueName, Visible) Break
 + I None (CurrentPage, AcceptsFocus) Break
+#+ I Current (!Focused, Visible, Sticky) Break
 + I Current (Focused, Sticky, !CirculateHit) Break
 + I Next (CurrentPage, State 2) Focus
-+ I None (CurrentPage, Focused) Prev (CurrentPage, !Iconified) Focus
+#+ I None (CurrentPage, Focused, !Iconified, Visible) Prev (CurrentPage, !Iconified, Visible) Focus
+#+ I None (CurrentPage, Focused) Prev (CurrentPage, !Iconified) Focus
++ I None (CurrentPage, Focused, !Iconified) Prev (CurrentPage, !Iconified) Focus
 
 
 DestroyModuleConfig FvwmEvent-Window-Remember: *
@@ -21,12 +32,6 @@
 *FvwmEvent-Window-Remember: focus_change Window-RememberFocused
 *FvwmEvent-Window-Remember: destroy_window Window-FocusRemembered
 
-# OK, I know that it's stupid. It sucks. But, I don't know why, when I launch
-# FvwmEvent only once, it doesn't keep focus on the QuakeConsole while desktop
-# pages are changed. And when there are two FvwmEvent modules loaded, it does
-# do that. If you will find a solution how to keep that effect without two
-# copies of FvwmEvent, let me know.
 Module FvwmEvent FvwmEvent-Window-Remember
-Module FvwmEvent FvwmEvent-Window-Remember
 
 # vim:ft=fvwm

Modified: fvwm/components/functions/Window-Remember-SloppyFocus
===================================================================
--- fvwm/components/functions/Window-Remember-SloppyFocus	2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/functions/Window-Remember-SloppyFocus	2010-12-22 19:06:29 UTC (rev 33)
@@ -5,13 +5,15 @@
 DestroyFunc Window-RememberFocused
 AddToFunc Window-RememberFocused
 + I None (CurrentPage, AcceptsFocus) Break
-+ I Current (!Iconified, !Sticky) All (CurrentPage) State 2 False
-+ I Current (!Iconified, !Sticky) State 2 True
++ I Current (!Iconified, !Sticky) All (CurrentPage) WindowStyle !State 2
++ I Current (!Iconified, !Sticky) WindowStyle State 2
 
 DestroyFunc Window-FocusRemembered
 AddToFunc Window-FocusRemembered
+#+ I All (FvwmMiniConsoleNeedsUniqueName, Visible) Break
+#+ I All (QuakeConsoleNeedsUniqueName, Visible) Break
 + I None (CurrentPage, AcceptsFocus) Break
-+ I Current (Focused, Sticky) Break
++ I Current (Focused, Visible, Sticky) Break
 + I Next (CurrentPage, HasPointer) Focus
 + I TestRc (Match) Break
 + I Next (CurrentPage, State 2) Focus
@@ -23,12 +25,6 @@
 *FvwmEvent-Window-Remember: focus_change Window-RememberFocused
 *FvwmEvent-Window-Remember: destroy_window Window-FocusRemembered
 
-# OK, I know that it's stupid. It sucks. But, I don't know why, when I launch
-# FvwmEvent only once, it doesn't keep focus on the QuakeConsole while desktop
-# pages are changed. And when there are two FvwmEvent modules loaded, it does
-# do that. If you will find a solution how to keep that effect without two
-# copies of FvwmEvent, let me know.
 Module FvwmEvent FvwmEvent-Window-Remember
-Module FvwmEvent FvwmEvent-Window-Remember
 
 # vim:ft=fvwm

Modified: fvwm/components/styles/FocusPolicy-Amiga
===================================================================
--- fvwm/components/styles/FocusPolicy-Amiga	2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/styles/FocusPolicy-Amiga	2010-12-22 19:06:29 UTC (rev 33)
@@ -13,8 +13,6 @@
 Style * FPGrabFocus, FPGrabFocusTransient
 Style * FPReleaseFocus, FPReleaseFocusTransient
 
-#IgnoreModifiers L2
-
 # Focus style for icons
 # FPEnterToFocus
 DestroyFunc Focus-Iconic
@@ -33,7 +31,6 @@
 #Module FvwmEvent FvwmEvent-IconFocus
 
 # Functions for remembering last focused window on a desktop page
-#Include components/functions/Window-Remember-SloppyFocus
-#Include components/functions/Window-Remember-ClickToFocus
+Include components/functions/Window-Remember-ClickToFocus
 
 # vim:ft=fvwm

Modified: fvwm/components/styles/FocusPolicy-MSWindows
===================================================================
--- fvwm/components/styles/FocusPolicy-MSWindows	2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/styles/FocusPolicy-MSWindows	2010-12-22 19:06:29 UTC (rev 33)
@@ -1,7 +1,7 @@
 # Window focusing policy - MS Windows
 
 # - click to focus
-# - windows are automatically raised upon focus
+# - windows are automatically raised upon focus (raised by clicks)
 # - new windows are automatically being focused
 
 Style * !FPEnterToFocus, !FPLeaveToUnfocus, FPClickToFocus, FPClickDecorToFocus


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.