* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
@ 2018-08-02 19:42 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2018-08-02 19:42 UTC (permalink / raw
To: gentoo-commits
commit: f5f6797eaa74d00812095d4056f64d49fb63083b
Author: A. D <dakotaclemenceplaza <AT> protonmail <DOT> com>
AuthorDate: Wed Aug 1 02:06:12 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 2 19:42:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f6797e
x11-wm/xmonad: Remove NoDisplay
Newer versions of sddm display manager do not add entries from /usr/share/xsessions/ files with "NoDisplay=true".
https://github.com/sddm/sddm/commit/cf4c3caf058ea81d0e61c2087493623faac56a3f
After updating to new sddm the entry for xmonad session is missing.
Closes: https://github.com/gentoo/gentoo/pull/9403
x11-wm/xmonad/files/xmonad.desktop | 1 -
1 file changed, 1 deletion(-)
diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop
index 9c0bf6e44f5..0198fb18026 100644
--- a/x11-wm/xmonad/files/xmonad.desktop
+++ b/x11-wm/xmonad/files/xmonad.desktop
@@ -5,7 +5,6 @@ Name=xmonad
Comment=A lightweight window manager
Exec=/etc/X11/Sessions/xmonad
TryExec=xmonad
-NoDisplay=true
Icon=
X-GNOME-WMName=Xmonad
X-GNOME-Autostart-Phase=WindowManager
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
@ 2019-11-11 22:34 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2019-11-11 22:34 UTC (permalink / raw
To: gentoo-commits
commit: b751dbba1e6ef386bc5b2eab9e425475b6ae5f58
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 22:34:08 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 22:34:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b751dbba
x11-wm/xmonad: add missing xmonad-0.14-check-repeat.patch
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/699810
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch | 56 ++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
new file mode 100644
index 00000000000..5fb25660158
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
@@ -0,0 +1,56 @@
+diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
+index c79b992..29c7f77 100644
+--- a/src/XMonad/Core.hs
++++ b/src/XMonad/Core.hs
+@@ -68,6 +68,7 @@ data XState = XState
+ , 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.
+ --
+diff --git a/src/XMonad/Main.hs b/src/XMonad/Main.hs
+index 3b6ace1..bdcab3a 100644
+--- a/src/XMonad/Main.hs
++++ b/src/XMonad/Main.hs
+@@ -219,6 +219,7 @@ launch initxmc = do
+ , mapped = S.empty
+ , waitingUnmap = M.empty
+ , dragging = Nothing
++ , keyPressed = 0
+ , extensibleState = M.empty
+ }
+
+@@ -291,10 +292,15 @@ handle :: Event -> X ()
+ -- 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/src/XMonad/Operations.hs b/src/XMonad/Operations.hs
+index aa44dcd..747cbf7 100644
+--- a/src/XMonad/Operations.hs
++++ b/src/XMonad/Operations.hs
+@@ -482,6 +482,7 @@ readStateFile xmc = do
+ , mapped = S.empty
+ , waitingUnmap = M.empty
+ , dragging = Nothing
++ , keyPressed = 0
+ , extensibleState = extState
+ }
+ where
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
@ 2020-08-20 6:37 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-08-20 6:37 UTC (permalink / raw
To: gentoo-commits
commit: be39bb5a578867782266ae3cfb6cc604d3458fa9
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 17:39:09 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 06:37:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be39bb5a
x11-wm/xmonad: remove unused patches
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17173
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch | 14 ----
x11-wm/xmonad/files/xmonad-0.11-sample.patch | 74 ----------------------
x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 ------------
x11-wm/xmonad/files/xmonad-check-repeat.patch | 40 ------------
4 files changed, 168 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
deleted file mode 100644
index e92a31ec704..00000000000
--- a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 0780af8c18d..00000000000
--- a/x11-wm/xmonad/files/xmonad-0.11-sample.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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-0.12-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
deleted file mode 100644
index 79bd2c2d21f..00000000000
--- a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- xmonad/src/XMonad/Core.hs 2010-09-05 05:11:42.000000000 +0400
-+++ xmonad/src/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/src/XMonad/Main.hs 2010-09-05 05:11:42.000000000 +0400
-+++ xmonad/src/XMonad/Main.hs 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-check-repeat.patch b/x11-wm/xmonad/files/xmonad-check-repeat.patch
deleted file mode 100644
index 9b30cb5ece3..00000000000
--- a/x11-wm/xmonad/files/xmonad-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
@ 2022-07-27 4:14 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-07-27 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 7ab41be7bf6cd60125443735148049be9f6c384e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 25 17:20:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 03:49:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab41be7
x11-wm/xmonad: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
deleted file mode 100644
index 79bd2c2d21fa..000000000000
--- a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- xmonad/src/XMonad/Core.hs 2010-09-05 05:11:42.000000000 +0400
-+++ xmonad/src/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/src/XMonad/Main.hs 2010-09-05 05:11:42.000000000 +0400
-+++ xmonad/src/XMonad/Main.hs 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-27 4:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-11 22:34 [gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2022-07-27 4:14 Sam James
2020-08-20 6:37 Sergei Trofimovich
2018-08-02 19:42 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox