Skip to content

Commit d4a6b6e

Browse files
authored
Fixed issue #13: Corrected misnamed keycodes and deprecated old ones (#14)
1 parent 28d12c5 commit d4a6b6e

1 file changed

Lines changed: 39 additions & 16 deletions

File tree

src/SDL3/Keycode.hsc

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module SDL3.Keycode
2828
, sdlScancodeMask
2929
, sdlScancodeToKeycode
3030

31-
-- * Keycode constants
31+
-- * Keycode constants
3232
, pattern SDLKUnknown
3333
, pattern SDLKReturn
3434
, pattern SDLKEscape
@@ -40,7 +40,7 @@ module SDL3.Keycode
4040
, pattern SDLKHash
4141
, pattern SDLKDollar
4242
, pattern SDLKPercent
43-
, pattern SDLAmpersand
43+
, pattern SDLKAmpersand
4444
, pattern SDLKApostrophe
4545
, pattern SDLKLeftparen
4646
, pattern SDLKRightparen
@@ -61,7 +61,7 @@ module SDL3.Keycode
6161
, pattern SDLK8
6262
, pattern SDLK9
6363
, pattern SDLKColon
64-
, pattern SDKSemicolon
64+
, pattern SDLKSemicolon
6565
, pattern SDLKLess
6666
, pattern SDLKEequals
6767
, pattern SDLKGreater
@@ -72,7 +72,7 @@ module SDL3.Keycode
7272
, pattern SDLKRightbracket
7373
, pattern SDLKCaret
7474
, pattern SDLKUnderscore
75-
, pattern SDLGrave
75+
, pattern SDLKGrave
7676
, pattern SDLKA
7777
, pattern SDLKB
7878
, pattern SDLKC
@@ -125,7 +125,7 @@ module SDL3.Keycode
125125
, pattern SDLKHome
126126
, pattern SDLKPageup
127127
, pattern SDLKEnd
128-
, pattern SDLPagedown
128+
, pattern SDLKPagedown
129129
, pattern SDLKRight
130130
, pattern SDLKLeft
131131
, pattern SDLKDown
@@ -167,13 +167,13 @@ module SDL3.Keycode
167167
, pattern SDLKMenu
168168
, pattern SDLKSelect
169169
, pattern SDLKStop
170-
, pattern SDLAgain
170+
, pattern SDLKAgain
171171
, pattern SDLKUndo
172172
, pattern SDLKCut
173173
, pattern SDLKCopy
174-
, pattern SDLPaste
174+
, pattern SDLKPaste
175175
, pattern SDLKFind
176-
, pattern SDLMute
176+
, pattern SDLKMute
177177
, pattern SDLKVolumeup
178178
, pattern SDLKVolumedown
179179
, pattern SDLKKPComma
@@ -285,8 +285,16 @@ module SDL3.Keycode
285285
, pattern SDLKRmeta
286286
, pattern SDLKLhyper
287287
, pattern SDLKRhyper
288+
-- Deprecated
289+
, pattern SDLAmpersand
290+
, pattern SDKSemicolon
291+
, pattern SDLGrave
292+
, pattern SDLPagedown
293+
, pattern SDLAgain
294+
, pattern SDLPaste
295+
, pattern SDLMute
288296

289-
-- Keymod constants
297+
-- Keymod constants
290298
, pattern SDLKMODNone
291299
, pattern SDLKMODLshift
292300
, pattern SDLKMODRshift
@@ -355,7 +363,7 @@ pattern SDLKDoubleApostrophe = (#const SDLK_DBLAPOSTROPHE) :: SDLKeycode
355363
pattern SDLKHash = (#const SDLK_HASH) :: SDLKeycode
356364
pattern SDLKDollar = (#const SDLK_DOLLAR) :: SDLKeycode
357365
pattern SDLKPercent = (#const SDLK_PERCENT) :: SDLKeycode
358-
pattern SDLAmpersand = (#const SDLK_AMPERSAND) :: SDLKeycode
366+
pattern SDLKAmpersand = (#const SDLK_AMPERSAND) :: SDLKeycode
359367
pattern SDLKApostrophe = (#const SDLK_APOSTROPHE) :: SDLKeycode
360368
pattern SDLKLeftparen = (#const SDLK_LEFTPAREN) :: SDLKeycode
361369
pattern SDLKRightparen = (#const SDLK_RIGHTPAREN) :: SDLKeycode
@@ -376,7 +384,7 @@ pattern SDLK7 = (#const SDLK_7) :: SDLKeycode
376384
pattern SDLK8 = (#const SDLK_8) :: SDLKeycode
377385
pattern SDLK9 = (#const SDLK_9) :: SDLKeycode
378386
pattern SDLKColon = (#const SDLK_COLON) :: SDLKeycode
379-
pattern SDKSemicolon = (#const SDLK_SEMICOLON) :: SDLKeycode
387+
pattern SDLKSemicolon = (#const SDLK_SEMICOLON) :: SDLKeycode
380388
pattern SDLKLess = (#const SDLK_LESS) :: SDLKeycode
381389
pattern SDLKEequals = (#const SDLK_EQUALS) :: SDLKeycode
382390
pattern SDLKGreater = (#const SDLK_GREATER) :: SDLKeycode
@@ -387,7 +395,7 @@ pattern SDLKBackslash = (#const SDLK_BACKSLASH) :: SDLKeycode
387395
pattern SDLKRightbracket = (#const SDLK_RIGHTBRACKET) :: SDLKeycode
388396
pattern SDLKCaret = (#const SDLK_CARET) :: SDLKeycode
389397
pattern SDLKUnderscore = (#const SDLK_UNDERSCORE) :: SDLKeycode
390-
pattern SDLGrave = (#const SDLK_GRAVE) :: SDLKeycode
398+
pattern SDLKGrave = (#const SDLK_GRAVE) :: SDLKeycode
391399
pattern SDLKA = (#const SDLK_A) :: SDLKeycode
392400
pattern SDLKB = (#const SDLK_B) :: SDLKeycode
393401
pattern SDLKC = (#const SDLK_C) :: SDLKeycode
@@ -440,7 +448,7 @@ pattern SDLKInsert = (#const SDLK_INSERT) :: SDLKeycode
440448
pattern SDLKHome = (#const SDLK_HOME) :: SDLKeycode
441449
pattern SDLKPageup = (#const SDLK_PAGEUP) :: SDLKeycode
442450
pattern SDLKEnd = (#const SDLK_END) :: SDLKeycode
443-
pattern SDLPagedown = (#const SDLK_PAGEDOWN) :: SDLKeycode
451+
pattern SDLKPagedown = (#const SDLK_PAGEDOWN) :: SDLKeycode
444452
pattern SDLKRight = (#const SDLK_RIGHT) :: SDLKeycode
445453
pattern SDLKLeft = (#const SDLK_LEFT) :: SDLKeycode
446454
pattern SDLKDown = (#const SDLK_DOWN) :: SDLKeycode
@@ -482,13 +490,13 @@ pattern SDLKHelp = (#const SDLK_HELP) :: SDLKeycode
482490
pattern SDLKMenu = (#const SDLK_MENU) :: SDLKeycode
483491
pattern SDLKSelect = (#const SDLK_SELECT) :: SDLKeycode
484492
pattern SDLKStop = (#const SDLK_STOP) :: SDLKeycode
485-
pattern SDLAgain = (#const SDLK_AGAIN) :: SDLKeycode
493+
pattern SDLKAgain = (#const SDLK_AGAIN) :: SDLKeycode
486494
pattern SDLKUndo = (#const SDLK_UNDO) :: SDLKeycode
487495
pattern SDLKCut = (#const SDLK_CUT) :: SDLKeycode
488496
pattern SDLKCopy = (#const SDLK_COPY) :: SDLKeycode
489-
pattern SDLPaste = (#const SDLK_PASTE) :: SDLKeycode
497+
pattern SDLKPaste = (#const SDLK_PASTE) :: SDLKeycode
490498
pattern SDLKFind = (#const SDLK_FIND) :: SDLKeycode
491-
pattern SDLMute = (#const SDLK_MUTE) :: SDLKeycode
499+
pattern SDLKMute = (#const SDLK_MUTE) :: SDLKeycode
492500
pattern SDLKVolumeup = (#const SDLK_VOLUMEUP) :: SDLKeycode
493501
pattern SDLKVolumedown = (#const SDLK_VOLUMEDOWN) :: SDLKeycode
494502
pattern SDLKKPComma = (#const SDLK_KP_COMMA) :: SDLKeycode
@@ -600,6 +608,21 @@ pattern SDLKLmeta = (#const SDLK_LMETA) :: SDLKeycode
600608
pattern SDLKRmeta = (#const SDLK_RMETA) :: SDLKeycode
601609
pattern SDLKLhyper = (#const SDLK_LHYPER) :: SDLKeycode
602610
pattern SDLKRhyper = (#const SDLK_RHYPER) :: SDLKeycode
611+
-- Deprecated
612+
{-# DEPRECATED SDLAmpersand "Use SDLKAmpersand" #-}
613+
pattern SDLAmpersand = SDLKAmpersand
614+
{-# DEPRECATED SDKSemicolon "Use SDLKSemicolon" #-}
615+
pattern SDKSemicolon = SDLKSemicolon
616+
{-# DEPRECATED SDLGrave "Use SDLKGrave" #-}
617+
pattern SDLGrave = SDLKGrave
618+
{-# DEPRECATED SDLPagedown "Use SDLKPagedown" #-}
619+
pattern SDLPagedown = SDLKPagedown
620+
{-# DEPRECATED SDLAgain "Use SDLKAgain" #-}
621+
pattern SDLAgain = SDLKAgain
622+
{-# DEPRECATED SDLPaste "Use SDLKPaste" #-}
623+
pattern SDLPaste = SDLKPaste
624+
{-# DEPRECATED SDLMute "Use SDLKMute" #-}
625+
pattern SDLMute = SDLKMute
603626

604627
-- Keymod constants
605628
pattern SDLKMODNone = (#const SDL_KMOD_NONE) :: SDLKeymod

0 commit comments

Comments
 (0)