Permalink
Browse files

Add thumbnailing and bug fixes. See Changelog

  • Loading branch information...
1 parent 30ec629 commit 49ec896f65c1d3beacd5cdb7e88c5b882fe1a8f4 @ThomasFunk ThomasFunk committed Sep 21, 2012
View
@@ -1,5 +1,16 @@
History:
+09/22/2012 V 0.5.5
+- add thumbnailing as a replacement for iconify/deiconify
+- change Makefile back to install scripts into $[PREFIX]/share/fvwm
+ because FvwmForm files only called from within $[PREFIX]/share/fvwm
+ or $[FVWM_USERDIR]
+- move fvwm-nightshade/scripts to fvwm/
+- change third searchpath for FvwmScript in config from $FNS_SYSTEMDIR
+ to $FVWM_USERDIR for user owned FvwmScripts
+- README updated with new entries for mailing list
+
+
09/15/2012 v 0.5.4
- add UrgencyFunc with other behaviour to config
- add the third searchpath for FvwmScript to config
View
21 INSTALL
@@ -5,13 +5,13 @@ Requirements
============
Required: Fvwm >= 2.6.6 (compiled with all features), python-xdg,
- xterm, conky, xscreensaver, eterm, imagemagick,
- stalonetray, wm-icons
+ xterm, conky, xscreensaver, eterm, imagemagick, xwd,
+ stalonetray, wm-icons
-Recommended: gnomes network manager, Volume Icon
+Recommended: gnomes network manager, Volume Icon
Useful: fdpowermon, bluetooth-applet, pm-utils, LxApearance,
- qtconfig for qt3, qtconfig for qt4, xneurs
+ qtconfig for qt3, qtconfig for qt4, xneurs
@@ -95,21 +95,32 @@ Installation
make prefix=<other_dir> install
+ If Fvwm is installed in another directory then /usr/share/fvwm you have
+ to told make where because there are some scripts which have to be installed
+ into Fvwm.
+
+ make fvwm_path=<path_to_fvwm> install
+
Now Fvwm-Nightshade is installed and you can login, change the base settings and enjoy.
Deinstallation
==============
-To remove Fvwm-Nightshade completely run as root
+To remove Fvwm-Nightshade expect ~/.fvwm-nightshade run as root
make uninstall
If you have installed Fvwm-Nightshade to another directory you have to change the prefix:
make prefix=<other_dir> install
+Also, if Fvwm is installed in another directory then /usr/share/fvwm you have
+to told make where Fvwm is located
+
+ make fvwm_path=<path_to_fvwm> uninstall
+
Tips
====
View
@@ -1,14 +1,14 @@
#-----------------------------------------------------------------------
# File: Makefile
-# Version: 1.0.0
+# Version: 1.0.2
# Licence: GPL 2
#
# Description: Makefile to install, uninstall Fvwm-Nightshade and create
# a dist package
#
# Author: Thomas Funk <t.funk@web.de>
# Created: 09/08/2012
-# Changed:
+# Changed: 09/22/2012
#-----------------------------------------------------------------------
package = fvwm-nightshade
@@ -31,6 +31,7 @@ fns_executables = $(shell ls -1 bin)
fns_manpages = $(shell ls -1 man)
fns_fvwmscripts = $(shell ls -1 fvwm)
+fvwm_path ?= /usr/share/fvwm
all:
@echo "There is nothing to compile."
@@ -75,6 +76,15 @@ install:
install -m 644 AUTHORS ChangeLog COPYING README INSTALL $(pkgdocdir)
cp -r templates $(pkgdocdir)
+ echo "-> install fvwm scripts"
+ if test -d "$(fvwm_path)"; then \
+ install -m 644 fvwm/* $(fvwm_path); \
+ else \
+ echo "Fvwm isn't installed in $(fvwm_path)"; \
+ echo "Please set fvwm_path=<path_to_fvwm> and rerun make install."; \
+ exit 2; \
+ fi
+
echo "-> install manpages"
#install -d -m 644 man/* $(man1dir)
@@ -96,6 +106,17 @@ uninstall:
echo "-> uninstall documentation"
-rm -r $(pkgdocdir)
+ echo "-> uninstall fvwm scripts"
+ if test -d "$(fvwm_path)"; then \
+ for file in $(fns_fvwmscripts) ; do \
+ rm -f $(fvwm_path)/$$file; \
+ done; \
+ else \
+ echo "Fvwm isn't installed in $(fvwm_path)"; \
+ echo "Please set fvwm_path=<path_to_fvwm> and rerun make uninstall."; \
+ exit 2; \
+ fi
+
echo "-> uninstall manpages"
#for file in $(fns_manpages) ; do \
# -rm $(man1dir)/$$file; done
View
22 README
@@ -249,6 +249,28 @@ them but nobody is perfect ... So, if you find one or have ideas, submit
them under https://github.com/Fvwm-Nightshade/Fvwm-Nightshade/issues
+Mailinglist
+===========
+There exists a mailing list under
+https://groups.google.com/forum/?hl=en#!forum/fvwmnightshade
+
+To post to this group, you have to do the following:
+
+1. Register your email at google by clicking on the "Sign in" button
+ (upper right side).
+2. After successful email verification login to your new account.
+3. Go to
+ https://groups.google.com/forum/?hl=en#!forum/fvwmnightshade
+ and click on button "Apply to join group".
+4. Fill out the join form and click on "Apply to this group" button.
+5. After your request is approved you get an email from us.
+6. Now you can send email to fvwmnightshade@googlegroups.com to post to
+ the mailing list.
+
+To unsubscribe from this group, send email to
+fvwmnightshade+unsubscribe@googlegroups.com
+
+
Enjoy our work and hopefully you love Fvwm-Nightshade as we do :-)
View
@@ -15,7 +15,7 @@
#
#
# Fvwm Nightshade Configuration
-InfoStoreAdd ns_version 0.5.4
+InfoStoreAdd ns_version 0.5.5
# Copyright (C) 2012
#
# Authors:
@@ -359,7 +359,7 @@ EdgeThickness 1
#-----------------------------------------------------------------------
Style * IconBox 20 80 -100 -20, \
IconGrid 40 40, \
- IconFill top left, \
+ IconFill left bottom, \
StaysOnBottom
#-----------------------------------------------------------------------
@@ -473,6 +473,10 @@ Style * DecorateTransient
#-----------------------------------------------------------------------
#Style * DontRaiseTransient
+#-----------------------------------------------------------------------
+# Remove the relief around an iconified apps
+#-----------------------------------------------------------------------
+Style * IconBackgroundRelief 0
########################################################################
# 4. A P P L I C A T I O N S L O O K
@@ -1122,6 +1126,7 @@ DestroyModuleConfig FvwmBanner: *
#***********************************************************************
DestroyModuleConfig FvwmEventCommon: *
*FvwmEventCommon: enter_window FE-EnterWindow
+*FvwmEventCommon: deiconify DeThumbnail
#***********************************************************************
# 7.4.1 Sound FvwmEvents
@@ -1241,7 +1246,7 @@ DestroyModuleConfig FvwmIdent: *
#=======================================================================
# Add the third path to search for FvwmScript scripts
DestroyModuleConfig FvwmScript: *
-*FvwmScript: Path $[FNS_SYSTEMDIR]/scripts
+*FvwmScript: Path $[FVWM_USERDIR]/scripts
#=======================================================================
@@ -1610,6 +1615,39 @@ AddToFunc FuncDelWallpaperlink
#-----------------------------------------------------------------------
+# replacement for iconify. Creates a small thumb with little app icon
+# on the upper right and the name of the app at the bottom
+#-----------------------------------------------------------------------
+DestroyFunc Thumbnail
+AddToFunc Thumbnail
++ I Raise
++ I ThisWindow (!Iconic) PipeRead "echo SetEnv app_name `xprop -id $[w.id] WM_CLASS |cut -d',' -f2 |cut -d'\"' -f2`"
++ I PipeRead "echo SetEnv Icon-$[w.id] `grep -i -m1 \"$[app_name]\" ${FVWM_USERDIR}/.menu |cut -d'%' -f2`"
++ I PipeRead 'test ! -d "${FVWM_USERDIR}/temp" && mkdir "${FVWM_USERDIR}/temp"'
++ I ThisWindow (!Shaded, Iconifiable, !Iconic) PipeRead \
+ "xwd -silent -id $[w.id] | convert -scale 128x72! -frame 1x1 \
+ -mattecolor black -quality 0 xwd:- png:$[FVWM_USERDIR]/temp/icon.tmp.$[w.id].png \
+ && echo WindowStyle IconOverride, Icon $[FVWM_USERDIR]/temp/icon.tmp.$[w.id].png \
+ || echo Nop"
++ I TestRc (Match) Test (f $[Icon-$[w.id]], f $[FVWM_USERDIR]/temp/icon.tmp.$[w.id].png) PipeRead \
+ "convert $[FVWM_USERDIR]/temp/icon.tmp.$[w.id].png \\\( $[Icon-$[w.id]] -scale 24x24 \\\) \
+ -gravity northeast -geometry +10+10 -compose multiply -composite \
+ -fill white -undercolor '#00000080' -gravity south -annotate +0+5 \" $[app_name] \" \
+ $[FVWM_USERDIR]/temp/icon.tmp.$[w.id].png; echo Nop"
++ I Iconify
+
+#-----------------------------------------------------------------------
+# replacement for deiconify.
+#-----------------------------------------------------------------------
+DestroyFunc DeThumbnail
+AddToFunc DeThumbnail
++ I Test (i $[Icon-$[w.id]]) WindowStyle Icon $[Icon-$[w.id]]
++ I TestRc (NoMatch) WindowStyle NoIconOverride, Icon
++ I Exec rm -f $[FVWM_USERDIR]/temp/icon.tmp.$[w.id].png
++ I All (Iconic, CurrentPage) PlaceAgain icon
++ I UnsetEnv Icon-$[w.id]
+
+#-----------------------------------------------------------------------
# Suspend the machine
#-----------------------------------------------------------------------
DestroyFunc FuncSuspend
@@ -1786,17 +1824,20 @@ AddToFunc FuncSimpleMaximizePartially
+ I Maximize $0 0 95
#-----------------------------------------------------------------------
+# Iconify/deiconify all apps with the same resource
#-----------------------------------------------------------------------
DestroyFunc FuncIconifySameResource
AddToFunc FuncIconifySameResource
-+ I All ($[w.resource]) Iconify $0
+#+ I All ($[w.resource]) Iconify $0
++ I All ($[w.resource]) Thumbnail
#-----------------------------------------------------------------------
# Iconify a window
#-----------------------------------------------------------------------
DestroyFunc FuncIconify
AddToFunc FuncIconify
-+ C Iconify
+#+ C Iconify
++ C Thumbnail
#-----------------------------------------------------------------------
# Shade or unshade the window when the Mouse wheel is rolled up or

0 comments on commit 49ec896

Please sign in to comment.