From 281103ec7ec95909b37b8f193107e35657152dcb Mon Sep 17 00:00:00 2001 From: erikc Date: Tue, 19 Jan 2010 21:08:28 -0800 Subject: [PATCH] Move windows.dinput to windows.directx.dinput. --- basis/game/input/dinput/dinput.factor | 7 ++++--- basis/windows/dinput/constants/constants-tests.factor | 5 ----- basis/windows/{ => directx}/dinput/authors.txt | 0 .../directx/dinput/constants/constants-tests.factor | 5 +++++ .../{ => directx}/dinput/constants/constants.factor | 6 +++--- basis/windows/{ => directx}/dinput/constants/tags.txt | 0 basis/windows/{ => directx}/dinput/dinput.factor | 2 +- basis/windows/{ => directx}/dinput/summary.txt | 0 basis/windows/{ => directx}/dinput/tags.txt | 0 9 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 basis/windows/dinput/constants/constants-tests.factor rename basis/windows/{ => directx}/dinput/authors.txt (100%) mode change 100755 => 100644 create mode 100644 basis/windows/directx/dinput/constants/constants-tests.factor rename basis/windows/{ => directx}/dinput/constants/constants.factor (99%) mode change 100755 => 100644 rename basis/windows/{ => directx}/dinput/constants/tags.txt (100%) rename basis/windows/{ => directx}/dinput/dinput.factor (99%) rename basis/windows/{ => directx}/dinput/summary.txt (100%) mode change 100755 => 100644 rename basis/windows/{ => directx}/dinput/tags.txt (100%) mode change 100755 => 100644 diff --git a/basis/game/input/dinput/dinput.factor b/basis/game/input/dinput/dinput.factor index f03147205f..964b952cb8 100644 --- a/basis/game/input/dinput/dinput.factor +++ b/basis/game/input/dinput/dinput.factor @@ -4,9 +4,10 @@ continuations game.input game.input.dinput.keys-array io.encodings.utf16 io.encodings.utf16n kernel locals math math.bitwise math.rectangles namespaces parser sequences shuffle specialized-arrays ui.backend.windows vectors -windows.com windows.dinput windows.dinput.constants -windows.errors windows.kernel32 windows.messages -windows.ole32 windows.user32 classes.struct alien.data ; +windows.com windows.directx.dinput +windows.directx.dinput.constants .errors windows.kernel32 +windows.messages .ole32 windows.user32 classes.struct +alien.data ; SPECIALIZED-ARRAY: DIDEVICEOBJECTDATA IN: game.input.dinput diff --git a/basis/windows/dinput/constants/constants-tests.factor b/basis/windows/dinput/constants/constants-tests.factor deleted file mode 100644 index 67785844fa..0000000000 --- a/basis/windows/dinput/constants/constants-tests.factor +++ /dev/null @@ -1,5 +0,0 @@ -IN: windows.dinput.constants.tests -USING: tools.test windows.dinput.constants.private ; - -[ ] [ define-constants ] unit-test -[ ] [ free-dinput-constants ] unit-test \ No newline at end of file diff --git a/basis/windows/dinput/authors.txt b/basis/windows/directx/dinput/authors.txt old mode 100755 new mode 100644 similarity index 100% rename from basis/windows/dinput/authors.txt rename to basis/windows/directx/dinput/authors.txt diff --git a/basis/windows/directx/dinput/constants/constants-tests.factor b/basis/windows/directx/dinput/constants/constants-tests.factor new file mode 100644 index 0000000000..eceafeb2f0 --- /dev/null +++ b/basis/windows/directx/dinput/constants/constants-tests.factor @@ -0,0 +1,5 @@ +IN: windows.directx.dinput.constants.tests +USING: tools.test windows.directx.dinput.constants.private ; + +[ ] [ define-constants ] unit-test +[ ] [ free-dinput-constants ] unit-test diff --git a/basis/windows/dinput/constants/constants.factor b/basis/windows/directx/dinput/constants/constants.factor old mode 100755 new mode 100644 similarity index 99% rename from basis/windows/dinput/constants/constants.factor rename to basis/windows/directx/dinput/constants/constants.factor index 7e4ad39945..26f9da00ec --- a/basis/windows/dinput/constants/constants.factor +++ b/basis/windows/directx/dinput/constants/constants.factor @@ -1,11 +1,11 @@ -USING: windows.dinput windows.kernel32 windows.ole32 windows.com +USING: windows.directx.dinput windows.kernel32 windows.ole32 windows.com windows.com.syntax alien alien.c-types alien.data alien.syntax kernel system namespaces combinators sequences fry math accessors macros words quotations libc continuations generalizations splitting locals assocs init specialized-arrays memoize classes.struct strings arrays ; SPECIALIZED-ARRAY: DIOBJECTDATAFORMAT -IN: windows.dinput.constants +IN: windows.directx.dinput.constants ! Some global variables aren't provided by the DirectInput DLL (they're in the ! dinput8.lib import library), so we lovingly hand-craft equivalent values here @@ -831,7 +831,7 @@ M: array array-base-type first ; define-guid-constants define-format-constants ; -[ define-constants ] "windows.dinput.constants" add-startup-hook +[ define-constants ] "windows.directx.dinput.constants" add-startup-hook : uninitialize ( variable quot -- ) '[ _ when* f ] change-global ; inline diff --git a/basis/windows/dinput/constants/tags.txt b/basis/windows/directx/dinput/constants/tags.txt similarity index 100% rename from basis/windows/dinput/constants/tags.txt rename to basis/windows/directx/dinput/constants/tags.txt diff --git a/basis/windows/dinput/dinput.factor b/basis/windows/directx/dinput/dinput.factor similarity index 99% rename from basis/windows/dinput/dinput.factor rename to basis/windows/directx/dinput/dinput.factor index 70d9500a7b..2a7ae19ecc 100644 --- a/basis/windows/dinput/dinput.factor +++ b/basis/windows/directx/dinput/dinput.factor @@ -1,7 +1,7 @@ USING: windows.kernel32 windows.ole32 windows.com windows.com.syntax alien alien.c-types alien.syntax kernel system namespaces math classes.struct windows.types ; -IN: windows.dinput +IN: windows.directx.dinput LIBRARY: dinput diff --git a/basis/windows/dinput/summary.txt b/basis/windows/directx/dinput/summary.txt old mode 100755 new mode 100644 similarity index 100% rename from basis/windows/dinput/summary.txt rename to basis/windows/directx/dinput/summary.txt diff --git a/basis/windows/dinput/tags.txt b/basis/windows/directx/dinput/tags.txt old mode 100755 new mode 100644 similarity index 100% rename from basis/windows/dinput/tags.txt rename to basis/windows/directx/dinput/tags.txt