From 1ce26e8cd23c2f0053945bdc3c02f2f1505d3770 Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Mon, 21 Dec 2015 13:15:00 -0600 Subject: [PATCH 1/9] .cabal: make testing flag manual --- xmonad-contrib.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index fa588e95..20a58a40 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -50,6 +50,7 @@ flag use_xft flag testing description: Testing mode + manual: True default: False library From ae6b8db29bc7cba53346b0aa253c6d1ea471ffce Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Tue, 22 Dec 2015 07:31:36 -0600 Subject: [PATCH 2/9] Update lower bounds for containers and base Closes #28. --- xmonad-contrib.cabal | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 20a58a40..9066f12b 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -54,20 +54,20 @@ flag testing default: False library - build-depends: base >= 3 && < 5, - containers, - directory, - extensible-exceptions, - filepath, - old-locale, - old-time, - process, - random, - mtl >= 1 && < 3, - unix, - X11>=1.6.1 && < 1.7, - xmonad>=0.12 && < 0.13, - utf8-string + build-depends: base >= 4.5 && < 5, + containers >= 0.5 && < 0.6, + directory, + extensible-exceptions, + filepath, + old-locale, + old-time, + process, + random, + mtl >= 1 && < 3, + unix, + X11>=1.6.1 && < 1.7, + xmonad>=0.12 && < 0.13, + utf8-string if flag(use_xft) build-depends: X11-xft >= 0.2 From 723494f01e4b0f76e17b809a2a2922a7f003cbcf Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Tue, 22 Dec 2015 07:35:05 -0600 Subject: [PATCH 3/9] travis: build xmonad from HEAD --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 104e687c..e4b3afee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,9 @@ before_install: - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH install: + # build xmonad from HEAD + - git clone https://github.com/xmonad/xmonad.git + - cabal --version - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ]; @@ -66,6 +69,8 @@ install: cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/; fi + - cabal install xmonad/ + # Here starts the actual work to be performed for the package under test; # any command which exits with a non-zero exit code causes the build to fail. script: From 9f68077c6ce27e547cc166dbb569cf7954462ac3 Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Tue, 22 Dec 2015 07:39:06 -0600 Subject: [PATCH 4/9] .cabal: remove outdated flag xmonad no longer supports GHC 6.10, and the -O0 was causing cabal to generate a warning. --- xmonad-contrib.cabal | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 9066f12b..e0b41338 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -82,9 +82,6 @@ library if impl(ghc >= 6.12.1) ghc-options: -fno-warn-unused-do-bind - if impl (ghc == 6.10.1) && arch (x86_64) - ghc-options: -O0 - exposed-modules: XMonad.Doc XMonad.Doc.Configuring XMonad.Doc.Extending From c3b05ceb7fa3009ebb31d530fe17f0ec3bd80d44 Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Tue, 22 Dec 2015 07:51:37 -0600 Subject: [PATCH 5/9] travis: comment out cabal check for now It complains about the -Werror enabled by the 'testing' flag, even though the testing flag is set to manual: True, default: False --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e4b3afee..6b918cf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,8 @@ script: - cabal configure --enable-tests --enable-benchmarks -v2 # -v2 provides useful information for debugging - cabal build # this builds all libraries and executables (including tests/benchmarks) - cabal test - - cabal check +# - cabal check # complains about -Werror even though it is + # hidden behind a manual flag with default false - cabal sdist # tests that a source-distribution can be generated # Check that the resulting source distribution can be built & installed. From b23f56d65dfc9fa8491da02581a5628ec9125728 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Tue, 22 Dec 2015 16:40:43 -0500 Subject: [PATCH 6/9] clean up `git shortlog' output --- .authorspellings | 80 ------------------------------------- .mailmap | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 80 deletions(-) delete mode 100644 .authorspellings create mode 100644 .mailmap diff --git a/.authorspellings b/.authorspellings deleted file mode 100644 index 5a328a84..00000000 --- a/.authorspellings +++ /dev/null @@ -1,80 +0,0 @@ -Alejandro Serrano Mena , trupill@gmail.com -Alexandre Buisse , buisse@cs.chalmers.se -Audun Skaugen , Audun Skaugen , audunskaugen@gmail.com -Bas van Dijk , v.dijk.bas@gmail.com -Ben Boeckel , mathstuf@gmail.com -Brandon S Allbery KF8NH , allbery@ece.cmu.edu -Brent Yorgey , Brent Yorgey -Carlos Lopez-Camey , c.lopez@kmels.net -Carsten Otto , xmonad@c-otto.de -Christian Dietrich , stettberger@dokucode.de -Daniel Neri , Daniel Neri -Daniel Schoepe , Daniel Schoepe , Daniel Schoepe -Daniel Wagner , daniel@wagner-home.com -Dave Harrison , dave@nullcube.com -David Glasser , glasser@mit.edu -David McLean , gopsychonauts@gmail.com -Dominik Bruhn , dominik@dbruhn.de -Don Stewart , Don Stewart , Don Stewart -Gwern Branwen , gwern0@gmail.com -Henrique Abreu , `Henrique Abreu ' -Ilya Portnov , portnov84@rambler.ru -intrigeri , intrigeri@boum.org -Ivan Miljenovic , Ivan.Miljenovic@gmail.com -Jan-David Quesel , quesel@informatik.uni-oldenburg.de -Jeremy Apthorp , nornagon@gmail.com -Joachim Breitner , mail@joachim-breitner.de -Joachim Fasting , joachim.fasting@gmail.com -Joel Suovaniemi , joel.suovaniemi@iki.fi -Joe Thornber , joe.thornber@gmail.com -Johann Giwer , johanngiwer@web.de -Jussi Maki , joamaki@gmail.com -kedals0 , kedals0@gmail.com -Konstantin Sobolev , konstantin.sobolev@gmail.com -Lanny Ripple , lan3ny@gmail.com -Leonardo Serra , leoserra@minaslivre.org -lithis , xmonad@selg.hethrael.org, xmonad@s001.hethrael.com -Luis Cabellos , zhen.sydow@gmail.com -Lukas Mai , l.mai@web.de -Mario Pastorelli , pastorelli.mario@gmail.com -Mathias Stearn , redbeard0531@gmail.com -Matt Brown , deadguysfrom@gmail.com -Nelson Elhage , nelhage@mit.edu -Nicolas Dudebout , nicolas.dudebout@gatech.edu -Nicolas Pouillard , nicolas.pouillard@gmail.com -Nils Schweinsberg , mail@n-sch.de -Norbert Zeh , nzeh@cs.dal.ca -Quentin Moser , moserq@gmail.com -Quentin Moser , quentin.moser@unifr.ch -Rickard Gustafsson , acura@allyourbase.se -Robert Marlow , bobstopper@bobturf.org, robreim@bobturf.org -Rohan Jain , crodjer@gmail.com -Sean Escriva , sean.escriva@gmail.com -Spencer Janssen , sjanssen@cse.unl.edu -Tomohiro Matsuyama , matsuyama3@ariel-networks.com -Tom Rauchenwald , -Tony Morris , haskell@tmorris.net -Valery V. Vorotyntsev , valery.vv@gmail.com -Will Farrington , wcfarrington@gmail.com -Wirt Wolff , wirtwolff@gmail.com -Yaakov Nemoy , loupgaroublond@gmail.com -timthelion , tim.thelion@gmail.com -seanmce33 , seanmce33@gmail.com -rupa , rupa@lrrr.us -perlkat , perlkat@katspace.org -longpoke , longpoke@gmail.com -cardboard42 , cardboard42@gmail.com -daedalusinfinity , daedalusinfinity@gmail.com -Jens Petersen , Jens Petersen - -Neil Mitchell , Neil Mitchell -Nick Burlett , nickburlett@mac.com -Sam Hughes , hughes@rpi.edu -Shae Erisson , shae@ScannedInAvian.com -Conrad Irwin , conrad.irwin@gmail.com - --- unknown: --- xmonad-contrib@hexago.nl --- brian@lorf.org --- jakob@pipefour.org - diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..c11f2812 --- /dev/null +++ b/.mailmap @@ -0,0 +1,100 @@ +Alejandro Serrano Mena +Alexandre Buisse +Anders Engstrom +Antoine R. Dumont +Anton Pirogov +Anton Pirogov anton.pirogov at gmail . com +Arjun Comar +Audun Skaugen +Bas van Dijk +Ben Boeckel +Ben Weitzman +Brandon S Allbery KF8NH +Brandon S Allbery KF8NH +Brent Yorgey +Carlos Lopez-Camey +Carsten Otto +Christian Dietrich +Christian Wills +Daniel Neri +Daniel Schoepe +Daniel Schoepe +Daniel Wagner +Dave Harrison +David Glasser +David McLean +Devin Mullins +Dominik Bruhn +Don Stewart +Don Stewart +Edward Z. Yang +Gwern Branwen +Gwern Branwen +Henrique Abreu +Ilya Portnov +intrigeri +Ivan Miljenovic +Jan-David Quesel +Jens Petersen +Jeremy Apthorp +Joachim Breitner +Joachim Fasting +Joel Suovaniemi +Joe Thornber +Johann Giwer +Jussi Maki +Konstantin Sobolev +Lanny Ripple +Lei Chen +Leonardo Serra +Luis Cabellos +Lukas Mai +Mario Pastorelli +Mathias Stearn +Matt Brown +Matthew Hague +Nathaniel Filardo +Nelson Elhage +Nicolas Dudebout +Nicolas Pouillard +Nils Schweinsberg +Norbert Zeh +Peter Olson +Quentin Moser +Quentin Moser +Rickard Gustafsson +Robert Marlow +Robert Marlow +Rohan Jain +Sean Escriva +Sean McEligot +Spencer Janssen +Tomohiro Matsuyama +Tom Rauchenwald +Tony Morris +Valery V. Vorotyntsev +Will Farrington +Wirt Wolff +Yaakov Nemoy + +brian +cardboard42 +daedalusinfinity +hexago.nl +intrigeri +jakob +kedals0 +lithis +lithis +longpoke +md143rbh7f +perlkat +rupa +timthelion + +# for core only +Neil Mitchell , Neil Mitchell +Nick Burlett +Sam Hughes +Shae Erisson +Conrad Irwin From 727e21419569ecf39f352f4ab86a8f8810bcd4ec Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sun, 13 Dec 2015 10:46:05 +0530 Subject: [PATCH 7/9] Add multiple key support for completion key This patch enables support for key binding like Ctrl + i which was not previously possible. Technically, this changes the type of completionKey from KeySym to (KeyMask, KeySym). --- XMonad/Prompt.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 93dc1712..05193555 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -4,6 +4,7 @@ -- | -- Module : XMonad.Prompt -- Copyright : (C) 2007 Andrea Rossato, 2015 Evgeny Kurnevsky +-- 2015 Sibi Prabakaran -- License : BSD3 -- -- Maintainer : Spencer Janssen @@ -144,7 +145,7 @@ data XPConfig = -- history entries to remember , promptKeymap :: M.Map (KeyMask,KeySym) (XP ()) -- ^ Mapping from key combinations to actions - , completionKey :: KeySym -- ^ Key that should trigger completion + , completionKey :: (KeyMask, KeySym) -- ^ Key that should trigger completion , changeModeKey :: KeySym -- ^ Key to change mode (when the prompt has multiple modes) , defaultText :: String -- ^ The text by default in the prompt line , autoComplete :: Maybe Int -- ^ Just x: if only one completion remains, auto-select it, @@ -242,7 +243,7 @@ instance Default XPConfig where , borderColor = "white" , promptBorderWidth = 1 , promptKeymap = defaultXPKeymap - , completionKey = xK_Tab + , completionKey = (0,xK_Tab) , changeModeKey = xK_grave , position = Bottom , height = 18 @@ -489,7 +490,7 @@ handle ks@(sym,_) e@(KeyEvent {ev_event_type = t, ev_state = m}) = do chgModeKey <- gets $ changeModeKey . config c <- getCompletions when (length c > 1) $ modify (\s -> s { showComplWin = True }) - if complKey == sym + if complKey == (m,sym) then completionHandle c ks e else if (sym == chgModeKey) then do @@ -507,7 +508,7 @@ completionHandle c ks@(sym,_) (KeyEvent { ev_event_type = t, ev_state = m }) = d complKey <- gets $ completionKey . config alwaysHlight <- gets $ alwaysHighlight . config case () of - () | t == keyPress && sym == complKey -> + () | t == keyPress && (m,sym) == complKey -> do st <- get let updateState l = case alwaysHlight of @@ -523,7 +524,7 @@ completionHandle c ks@(sym,_) (KeyEvent { ev_event_type = t, ev_state = m }) = d [] -> updateWindows >> eventLoop handle [x] -> updateState [x] >> getCompletions >>= updateWins l -> updateState l >> updateWins l - | t == keyRelease && sym == complKey -> eventLoop (completionHandle c) + | t == keyRelease && (m,sym) == complKey -> eventLoop (completionHandle c) | otherwise -> keyPressHandle m ks -- some other key, handle it normally -- some other event: go back to main loop completionHandle _ k e = handle k e From 93b2620ad387e7b0a31c490eb2a6ffde4593894d Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sun, 10 Jan 2016 23:14:42 +0530 Subject: [PATCH 8/9] Add myself in mailmap --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index c11f2812..50a5b1c2 100644 --- a/.mailmap +++ b/.mailmap @@ -66,6 +66,7 @@ Rickard Gustafsson Robert Marlow Robert Marlow Rohan Jain +Sibi Prabakaran Sean Escriva Sean McEligot Spencer Janssen From 0510da76599db3df84e6d965163e107234e4b0e1 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sun, 10 Jan 2016 23:14:57 +0530 Subject: [PATCH 9/9] Add changelog for the patch. --- CHANGES.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index b2672ebb..b4f809fc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,13 @@ # Change Log / Release Notes +## 0.13 + +### Breaking Changes + + * The type of `completionKey` (of `XPConfig` record) has been + changed from `KeySym` to `(KeyMask, KeySym)`. The default value + for this is still binded to `Tab` key. + ## 0.12 (December 14, 2015) ### Breaking Changes