forked from colonelpanic/dotfiles
Merge branch 'master' of github.com:IvanMalison/dotfiles
This commit is contained in:
commit
fa4607b478
6
dotfiles/config/.gitignore
vendored
6
dotfiles/config/.gitignore
vendored
@ -1,3 +1,6 @@
|
|||||||
|
/.mono/keypairs/
|
||||||
|
/Atom/
|
||||||
|
/Code/
|
||||||
/Popcorn-Time/
|
/Popcorn-Time/
|
||||||
/QtProject.conf/
|
/QtProject.conf/
|
||||||
/Trolltech.conf
|
/Trolltech.conf
|
||||||
@ -16,6 +19,7 @@
|
|||||||
/gtk-3.0/bookmarks
|
/gtk-3.0/bookmarks
|
||||||
/hexchat
|
/hexchat
|
||||||
/hub
|
/hub
|
||||||
|
/libreoffice/
|
||||||
/linuxmint/
|
/linuxmint/
|
||||||
/menus/
|
/menus/
|
||||||
/menus/applications-merged/
|
/menus/applications-merged/
|
||||||
@ -31,6 +35,7 @@
|
|||||||
/sparkleshare/avatars/
|
/sparkleshare/avatars/
|
||||||
/sparkleshare/logs
|
/sparkleshare/logs
|
||||||
/spotify
|
/spotify
|
||||||
|
/sublime-text-3/
|
||||||
/systemd/user/*.target.wants/
|
/systemd/user/*.target.wants/
|
||||||
/totem/
|
/totem/
|
||||||
/transmission/dht.dat
|
/transmission/dht.dat
|
||||||
@ -42,4 +47,3 @@
|
|||||||
/user-dirs.locale
|
/user-dirs.locale
|
||||||
/vlc/
|
/vlc/
|
||||||
/xfce4/
|
/xfce4/
|
||||||
/.mono/keypairs/
|
|
||||||
|
@ -522,6 +522,16 @@ actOnWindowsInWorkspace :: (Window -> X ())
|
|||||||
actOnWindowsInWorkspace windowAction getWindowsAction = restoreFocus $
|
actOnWindowsInWorkspace windowAction getWindowsAction = restoreFocus $
|
||||||
withWorkspace (getWindowsAction >=> mapM_ windowAction)
|
withWorkspace (getWindowsAction >=> mapM_ windowAction)
|
||||||
|
|
||||||
|
-- XXX: The idea behind this was that the normal fullscreen can be annoying if a
|
||||||
|
-- new window opens, but this behavior is even more annoying than that, so
|
||||||
|
-- nevermind
|
||||||
|
goFullscreenDWIM =
|
||||||
|
withWorkspace $ \ws -> do
|
||||||
|
wins <- windowsWithFocusedClass ws
|
||||||
|
if length wins > 1
|
||||||
|
then goFullscreen
|
||||||
|
else minimizeOtherClassesInWorkspace
|
||||||
|
|
||||||
windowsWithUnfocusedClass ws = windowsWithOtherClasses (W.focus ws) ws
|
windowsWithUnfocusedClass ws = windowsWithOtherClasses (W.focus ws) ws
|
||||||
windowsWithFocusedClass ws = windowsWithSameClass (W.focus ws) ws
|
windowsWithFocusedClass ws = windowsWithSameClass (W.focus ws) ws
|
||||||
windowsWithOtherClasses = windowsMatchingClassPredicate (/=)
|
windowsWithOtherClasses = windowsMatchingClassPredicate (/=)
|
||||||
@ -754,7 +764,7 @@ addKeys conf@XConfig { modMask = modm } =
|
|||||||
, ((modm, xK_g), myGoToWindow)
|
, ((modm, xK_g), myGoToWindow)
|
||||||
, ((modm, xK_b), myBringWindow)
|
, ((modm, xK_b), myBringWindow)
|
||||||
, ((modm .|. shiftMask, xK_b), myReplaceWindow)
|
, ((modm .|. shiftMask, xK_b), myReplaceWindow)
|
||||||
, ((modm .|. controlMask, xK_space), goFullscreen)
|
, ((modm .|. controlMask, xK_space), deactivateFullOr goFullscreen)
|
||||||
, ((modm, xK_m), withFocused minimizeWindow)
|
, ((modm, xK_m), withFocused minimizeWindow)
|
||||||
, ((modm .|. shiftMask, xK_m),
|
, ((modm .|. shiftMask, xK_m),
|
||||||
deactivateFullOr $ withLastMinimized maximizeWindowAndFocus)
|
deactivateFullOr $ withLastMinimized maximizeWindowAndFocus)
|
||||||
|
Loading…
Reference in New Issue
Block a user