diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-wm/xmonad/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-wm/xmonad/files')
-rw-r--r-- | x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch | 14 | ||||
-rw-r--r-- | x11-wm/xmonad/files/xmonad-0.11-sample.patch | 74 | ||||
-rw-r--r-- | x11-wm/xmonad/files/xmonad-check-repeat.patch | 40 | ||||
-rw-r--r-- | x11-wm/xmonad/files/xmonad.desktop | 7 |
4 files changed, 135 insertions, 0 deletions
diff --git a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch new file mode 100644 index 000000000000..e92a31ec7044 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch @@ -0,0 +1,14 @@ +Fri May 2 06:57:43 BST 2014 Adam Vogt <vogt.adam@gmail.com> + * derive Applicative instance for Query +diff -rN -u old-xmonad/XMonad/Core.hs new-xmonad/XMonad/Core.hs +--- old-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.320979242 +0000 ++++ new-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.367979193 +0000 +@@ -155,7 +155,7 @@ + + type ManageHook = Query (Endo WindowSet) + newtype Query a = Query (ReaderT Window X a) +- deriving (Functor, Monad, MonadReader Window, MonadIO) ++ deriving (Functor, Applicative, Monad, MonadReader Window, MonadIO) + + runQuery :: Query a -> Window -> X a + runQuery (Query m) w = runReaderT m w diff --git a/x11-wm/xmonad/files/xmonad-0.11-sample.patch b/x11-wm/xmonad/files/xmonad-0.11-sample.patch new file mode 100644 index 000000000000..0780af8c18d4 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad-0.11-sample.patch @@ -0,0 +1,74 @@ +Sun Jan 6 17:42:54 GMT 2013 Daniel Wagner <daniel@wagner-home.com> + * define the "help" string in the sample configuration bundled with xmonad +diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs +--- old-xmonad/man/xmonad.hs 2015-02-27 08:38:26.993365307 +0000 ++++ new-xmonad/man/xmonad.hs 2015-02-27 08:38:27.046365303 +0000 +@@ -280,3 +280,54 @@ + logHook = myLogHook, + startupHook = myStartupHook + } ++ ++-- | Finally, a copy of the default bindings in simple textual tabular format. ++help :: String ++help = unlines ["The default modifier key is 'alt'. Default keybindings:", ++ "", ++ "-- launching and killing programs", ++ "mod-Shift-Enter Launch xterminal", ++ "mod-p Launch dmenu", ++ "mod-Shift-p Launch gmrun", ++ "mod-Shift-c Close/kill the focused window", ++ "mod-Space Rotate through the available layout algorithms", ++ "mod-Shift-Space Reset the layouts on the current workSpace to default", ++ "mod-n Resize/refresh viewed windows to the correct size", ++ "", ++ "-- move focus up or down the window stack", ++ "mod-Tab Move focus to the next window", ++ "mod-Shift-Tab Move focus to the previous window", ++ "mod-j Move focus to the next window", ++ "mod-k Move focus to the previous window", ++ "mod-m Move focus to the master window", ++ "", ++ "-- modifying the window order", ++ "mod-Return Swap the focused window and the master window", ++ "mod-Shift-j Swap the focused window with the next window", ++ "mod-Shift-k Swap the focused window with the previous window", ++ "", ++ "-- resizing the master/slave ratio", ++ "mod-h Shrink the master area", ++ "mod-l Expand the master area", ++ "", ++ "-- floating layer support", ++ "mod-t Push window back into tiling; unfloat and re-tile it", ++ "", ++ "-- increase or decrease number of windows in the master area", ++ "mod-comma (mod-,) Increment the number of windows in the master area", ++ "mod-period (mod-.) Deincrement the number of windows in the master area", ++ "", ++ "-- quit, or restart", ++ "mod-Shift-q Quit xmonad", ++ "mod-q Restart xmonad", ++ "mod-[1..9] Switch to workSpace N", ++ "", ++ "-- Workspaces & screens", ++ "mod-Shift-[1..9] Move client to workspace N", ++ "mod-{w,e,r} Switch to physical/Xinerama screens 1, 2, or 3", ++ "mod-Shift-{w,e,r} Move client to screen 1, 2, or 3", ++ "", ++ "-- Mouse bindings: default actions bound to mouse events", ++ "mod-button1 Set the window to floating mode and move by dragging", ++ "mod-button2 Raise the window to the top of the stack", ++ "mod-button3 Set the window to floating mode and resize by dragging"] +Sun Jan 6 17:44:14 GMT 2013 Daniel Wagner <daniel@wagner-home.com> + * use "modm" instead of "modMask" in the sample config +diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs +--- old-xmonad/man/xmonad.hs 2015-02-27 08:39:59.280358012 +0000 ++++ new-xmonad/man/xmonad.hs 2015-02-27 08:39:59.333358007 +0000 +@@ -129,7 +129,7 @@ + , ((modm , xK_q ), spawn "xmonad --recompile; xmonad --restart") + + -- Run xmessage with a summary of the default keybindings (useful for beginners) +- , ((modMask .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) ++ , ((modm .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) + ] + ++ + diff --git a/x11-wm/xmonad/files/xmonad-check-repeat.patch b/x11-wm/xmonad/files/xmonad-check-repeat.patch new file mode 100644 index 000000000000..9b30cb5ece31 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad-check-repeat.patch @@ -0,0 +1,40 @@ +--- xmonad//XMonad/Core.hs 2010-09-05 05:11:42.000000000 +0400 ++++ xmonad//XMonad/Core.hs 2010-09-18 07:59:14.000000000 +0400 +@@ -65,6 +65,7 @@ + , waitingUnmap :: !(M.Map Window Int) -- ^ the number of expected UnmapEvents + , dragging :: !(Maybe (Position -> Position -> X (), X ())) + , numberlockMask :: !KeyMask -- ^ The numlock modifier ++ , keyPressed :: !KeyCode -- ^ keycode of the key being pressed if any + , extensibleState :: !(M.Map String (Either String StateExtension)) + -- ^ stores custom state information. + -- +--- xmonad//XMonad/Main.hsc 2010-09-05 05:11:42.000000000 +0400 ++++ xmonad//XMonad/Main.hsc 2010-09-18 08:03:11.000000000 +0400 +@@ -129,6 +129,7 @@ + , mapped = S.empty + , waitingUnmap = M.empty + , dragging = Nothing ++ , keyPressed = 0 + , extensibleState = extState + } + allocaXEvent $ \e -> +@@ -190,10 +191,15 @@ + -- run window manager command + handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code}) + | t == keyPress = withDisplay $ \dpy -> do +- s <- io $ keycodeToKeysym dpy code 0 +- mClean <- cleanMask m +- ks <- asks keyActions +- userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id ++ kp <- gets keyPressed ++ if kp /= code then do ++ modify $ \s -> s { keyPressed = code } ++ s <- io $ keycodeToKeysym dpy code 0 ++ mClean <- cleanMask m ++ ks <- asks keyActions ++ userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id ++ else return () ++ | t == keyRelease = modify $ \s -> s { keyPressed = 0 } + + -- manage a new window + handle (MapRequestEvent {ev_window = w}) = withDisplay $ \dpy -> do diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop new file mode 100644 index 000000000000..d72fc71866a2 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=xmonad +Comment=A lightweight window manager +Exec=/etc/X11/Sessions/xmonad +TryExec=xmonad +Icon= +Type=Application |