From 9c79dc1fa75d089a1560174ac717aab93dcc2f09 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 4 Dec 2007 15:47:26 -0600 Subject: [PATCH 01/24] Better error handling for safe_sigaction --- vm/os-unix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vm/os-unix.c b/vm/os-unix.c index 437a528fb8..b33c879d88 100644 --- a/vm/os-unix.c +++ b/vm/os-unix.c @@ -219,6 +219,9 @@ static void sigaction_safe(int signum, const struct sigaction *act, struct sigac ret = sigaction(signum, act, oldact); } while(ret == -1 && errno == EINTR); + + if(ret == -1) + fatal_error("sigaction failed", 0); } void unix_init_signals(void) From b967f7747d5a32911c054ced2f655aef519f647a Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 6 Dec 2007 02:18:56 -0600 Subject: [PATCH 02/24] Change stat to be more forgiving --- vm/os-windows.c | 59 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/vm/os-windows.c b/vm/os-windows.c index aa0e0ed8c1..9d7bd85465 100755 --- a/vm/os-windows.c +++ b/vm/os-windows.c @@ -98,21 +98,22 @@ const F_CHAR *vm_executable_path(void) return safe_strdup(full_path); } -DEFINE_PRIMITIVE(stat) +void stat_not_found(void) { + dpush(F); + dpush(F); + dpush(F); + dpush(F); +} + +void find_file_stat(F_CHAR *path) +{ + // FindFirstFile is the only call that can stat c:\pagefile.sys WIN32_FIND_DATA st; HANDLE h; - F_CHAR *path = unbox_u16_string(); - if(INVALID_HANDLE_VALUE == (h = FindFirstFile( - path, - &st))) - { - dpush(F); - dpush(F); - dpush(F); - dpush(F); - } + if(INVALID_HANDLE_VALUE == (h = FindFirstFile(path, &st))) + stat_not_found(); else { box_boolean(st.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); @@ -129,6 +130,42 @@ DEFINE_PRIMITIVE(stat) } } +DEFINE_PRIMITIVE(stat) +{ + HANDLE h; + BY_HANDLE_FILE_INFORMATION bhfi; + + F_CHAR *path = unbox_u16_string(); + //wprintf(L"path = %s\n", path); + h = CreateFileW(path, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, + NULL); + if(h == INVALID_HANDLE_VALUE) + { + find_file_stat(path); + return; + } + + if(!GetFileInformationByHandle(h, &bhfi)) + stat_not_found(); + else { + box_boolean(bhfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + dpush(tag_fixnum(0)); + box_unsigned_8( + (u64)bhfi.nFileSizeLow | (u64)bhfi.nFileSizeHigh << 32); + u64 lo = bhfi.ftLastWriteTime.dwLowDateTime; + u64 hi = bhfi.ftLastWriteTime.dwHighDateTime; + u64 modTime = (hi << 32) + lo; + + box_unsigned_8((modTime - EPOCH_OFFSET) / 10000000); + } + CloseHandle(h); +} + DEFINE_PRIMITIVE(read_dir) { HANDLE dir; From 0f8164842ac95341bf51447e0212bb1bbea96c77 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 6 Dec 2007 02:21:54 -0600 Subject: [PATCH 03/24] stat likes paths with trailing \\ for root directories. \\\\?\\k:\\ instead of \\\\?\\k: --- extra/io/windows/nt/backend/backend.factor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extra/io/windows/nt/backend/backend.factor b/extra/io/windows/nt/backend/backend.factor index c475771b5c..0d1f2cec0b 100755 --- a/extra/io/windows/nt/backend/backend.factor +++ b/extra/io/windows/nt/backend/backend.factor @@ -27,7 +27,7 @@ M: windows-nt-io normalize-pathname ( string -- string ) { [ dup ".\\" head? ] [ >r unicode-prefix cwd r> 1 tail 3append ] } - ! c:\\ + ! c:\\foo { [ dup 1 tail ":" head? ] [ >r unicode-prefix r> append ] } ! \\\\?\\c:\\foo { [ dup unicode-prefix head? ] [ ] } @@ -38,7 +38,8 @@ M: windows-nt-io normalize-pathname ( string -- string ) dup first CHAR: \\ = [ CHAR: \\ , ] unless % ] "" make ] } - } cond [ "/\\." member? ] right-trim ; + } cond [ "/\\." member? ] right-trim + dup peek CHAR: : = [ "\\" append ] when ; SYMBOL: io-hash From c92a8a4f73a44d82da491858a9ab5decce3d3b59 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 6 Dec 2007 13:40:35 -0600 Subject: [PATCH 04/24] Remove seq>stack as it does not compile --- extra/combinators/lib/lib.factor | 3 --- 1 file changed, 3 deletions(-) diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor index fe11fd1338..047887bcc8 100644 --- a/extra/combinators/lib/lib.factor +++ b/extra/combinators/lib/lib.factor @@ -70,9 +70,6 @@ MACRO: napply ( n -- ) MACRO: nfirst ( n -- ) [ [ swap nth ] curry [ keep ] curry ] map concat [ drop ] compose ; -: seq>stack ( seq -- ) - dup length nfirst ; inline - ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : sigma ( seq quot -- n ) [ rot slip + ] curry 0 swap reduce ; From 0334cfba029b4811816c9928b09010c1746b89c2 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 7 Dec 2007 13:35:47 -0600 Subject: [PATCH 05/24] Add two undocumented windows message names --- extra/windows/messages/messages.factor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extra/windows/messages/messages.factor b/extra/windows/messages/messages.factor index bc8fe0f0ce..5e19f3bf0d 100644 --- a/extra/windows/messages/messages.factor +++ b/extra/windows/messages/messages.factor @@ -13,7 +13,7 @@ SYMBOL: windows-messages word [ word-name ] keep execute maybe-create-windows-messages windows-messages get set-at ; parsing -: get-windows-message-name ( n -- name ) +: windows-message-name ( n -- name ) windows-messages get at* [ drop "unknown message" ] unless ; : WM_NULL HEX: 0000 ; inline add-windows-message @@ -107,6 +107,8 @@ SYMBOL: windows-messages : WM_NCXBUTTONDOWN HEX: 00AB ; inline add-windows-message : WM_NCXBUTTONUP HEX: 00AC ; inline add-windows-message : WM_NCXBUTTONDBLCLK HEX: 00AD ; inline add-windows-message +: WM_NCUAHDRAWCAPTION HEX: 00AE ; inline add-windows-message ! undocumented +: WM_NCUAHDRAWFRAME HEX: 00AF ; inline add-windows-message ! undocumented : WM_INPUT HEX: 00FF ; inline add-windows-message : WM_KEYFIRST HEX: 0100 ; inline add-windows-message : WM_KEYDOWN HEX: 0100 ; inline add-windows-message From f26713182f2f7b9b2d3893107dece3e0ce097a89 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:29:46 -0600 Subject: [PATCH 06/24] Change ui tabs to alt+12345 --- extra/ui/tools/tools.factor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extra/ui/tools/tools.factor b/extra/ui/tools/tools.factor index 48d341b4b8..8e2eeaa0ba 100755 --- a/extra/ui/tools/tools.factor +++ b/extra/ui/tools/tools.factor @@ -67,11 +67,11 @@ M: workspace model-changed : com-profiler profiler-gadget select-tool ; workspace "tool-switching" f { - { T{ key-down f { C+ } "1" } com-listener } - { T{ key-down f { C+ } "2" } com-browser } - { T{ key-down f { C+ } "3" } com-inspector } - { T{ key-down f { C+ } "4" } com-walker } - { T{ key-down f { C+ } "5" } com-profiler } + { T{ key-down f { A+ } "1" } com-listener } + { T{ key-down f { A+ } "2" } com-browser } + { T{ key-down f { A+ } "3" } com-inspector } + { T{ key-down f { A+ } "4" } com-walker } + { T{ key-down f { A+ } "5" } com-profiler } } define-command-map \ workspace-window From 4085ee278d955d7fb63813d41cb024e92b8a3ce6 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:48:01 -0600 Subject: [PATCH 07/24] EditPlus automatically detects path --- extra/editors/editplus/editplus.factor | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) mode change 100644 => 100755 extra/editors/editplus/editplus.factor diff --git a/extra/editors/editplus/editplus.factor b/extra/editors/editplus/editplus.factor old mode 100644 new mode 100755 index e47ca257ca..bff523b50d --- a/extra/editors/editplus/editplus.factor +++ b/extra/editors/editplus/editplus.factor @@ -1,12 +1,15 @@ -USING: editors io.launcher math.parser namespaces ; +USING: editors io.files io.launcher kernel math.parser +namespaces sequences windows.shell32 ; IN: editors.editplus +: editplus-path ( -- path ) + \ editplus-path get-global [ + program-files "\\EditPlus 2\\editplus.exe" append + ] unless* ; + : editplus ( file line -- ) [ - \ editplus get-global % " -cursor " % # " " % % + editplus-path % " -cursor " % # " " % % ] "" make run-detached ; -! Put in your .factor-boot-rc -! "c:\\Program Files\\EditPlus\\editplus.exe" \ editplus set-global - [ editplus ] edit-hook set-global From ef70996128c22396d98285fd4bef41b9cb71a0c4 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:48:47 -0600 Subject: [PATCH 08/24] EditPadPro automatically configures path --- extra/editors/editpadpro/editpadpro.factor | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extra/editors/editpadpro/editpadpro.factor b/extra/editors/editpadpro/editpadpro.factor index b79ac6a594..6882a00e45 100644 --- a/extra/editors/editpadpro/editpadpro.factor +++ b/extra/editors/editpadpro/editpadpro.factor @@ -1,8 +1,15 @@ USING: definitions kernel parser words sequences math.parser -namespaces editors io.launcher ; +namespaces editors io.launcher windows.shell32 io.files +strings ; IN: editors.editpadpro +: editpadpro-path + \ editpadpro-path get-global [ + program-files "JGsoft" path+ walk-dir + [ >lower "editpadpro.exe" tail? ] find nip + ] unless* ; + : editpadpro ( file line -- ) - [ "editpadpro.exe /l" % # " \"" % % "\"" % ] "" make run-process ; + [ editpadpro-path % " /l" % # " \"" % % "\"" % ] "" make run-detached ; [ editpadpro ] edit-hook set-global From 451f9b430f1daa150b6b0b5032fb19e38b307890 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:49:39 -0600 Subject: [PATCH 09/24] Wordpad - automatic path --- extra/editors/wordpad/wordpad.factor | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/extra/editors/wordpad/wordpad.factor b/extra/editors/wordpad/wordpad.factor index e1646a0855..eb882a9e38 100644 --- a/extra/editors/wordpad/wordpad.factor +++ b/extra/editors/wordpad/wordpad.factor @@ -2,12 +2,14 @@ USING: editors hardware-info.windows io.launcher kernel math.parser namespaces sequences windows.shell32 ; IN: editors.wordpad +: wordpad-path ( -- path ) + \ wordpad-path get [ + program-files "\\Windows NT\\Accessories\\wordpad.exe" append + ] unless* ; + : wordpad ( file line -- ) [ - \ wordpad get-global % drop " " % "\"" % % "\"" % + wordpad-path % drop " " % "\"" % % "\"" % ] "" make run-detached ; -program-files "\\Windows NT\\Accessories\\wordpad.exe" append -\ wordpad set-global - [ wordpad ] edit-hook set-global From 537c008a207c2ceffa882d29b31e645382f13775 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:56:47 -0600 Subject: [PATCH 10/24] emeditor autopath --- extra/editors/emeditor/emeditor.factor | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 extra/editors/emeditor/emeditor.factor diff --git a/extra/editors/emeditor/emeditor.factor b/extra/editors/emeditor/emeditor.factor old mode 100644 new mode 100755 index 6df4a3619d..2caa42b480 --- a/extra/editors/emeditor/emeditor.factor +++ b/extra/editors/emeditor/emeditor.factor @@ -1,9 +1,15 @@ -USING: editors io.launcher kernel math.parser namespaces ; +USING: editors hardware-info.windows io.files io.launcher +kernel math.parser namespaces sequences windows.shell32 ; IN: editors.emeditor +: emeditor-path ( -- path ) + \ emeditor-path get-global [ + program-files "\\EmEditor\\EmEditor.exe" path+ + ] unless* ; + : emeditor ( file line -- ) [ - \ emeditor get-global % " /l " % # + emeditor-path % " /l " % # " " % "\"" % % "\"" % ] "" make run-detached ; From 3277b67b50b0dfab807520cf5bad4403d50c85f4 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:57:03 -0600 Subject: [PATCH 11/24] ultraedit autopath --- extra/editors/ultraedit/ultraedit.factor | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/extra/editors/ultraedit/ultraedit.factor b/extra/editors/ultraedit/ultraedit.factor index d7a1a18132..50c241daea 100644 --- a/extra/editors/ultraedit/ultraedit.factor +++ b/extra/editors/ultraedit/ultraedit.factor @@ -1,12 +1,17 @@ -USING: editors io.launcher kernel math.parser namespaces ; +USING: editors io.files io.launcher kernel math.parser +namespaces sequences windows.shell32 ; IN: editors.ultraedit +: ultraedit-path ( -- path ) + \ ultraedit-path get-global [ + program-files + "\\IDM Computer Solutions\\UltraEdit-32\\uedit32.exe" path+ + ] unless* ; + : ultraedit ( file line -- ) [ - \ ultraedit get-global % " " % swap % "/" % # "/1" % + ultraedit-path % " " % swap % "/" % # "/1" % ] "" make run-detached ; -! Put the path in your .factor-boot-rc -! "K:\\Program Files (x86)\\IDM Computer Solutions\\UltraEdit-32\\uedit32.exe" \ ultraedit set-global [ ultraedit ] edit-hook set-global From 9cbd4a61d50d54569f2c1815cb98677ab8ae9ea3 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 10:57:35 -0600 Subject: [PATCH 12/24] ted-notepad autopath --- extra/editors/ted-notepad/ted-notepad.factor | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/extra/editors/ted-notepad/ted-notepad.factor b/extra/editors/ted-notepad/ted-notepad.factor index 945233ff9b..b56ee0a08b 100644 --- a/extra/editors/ted-notepad/ted-notepad.factor +++ b/extra/editors/ted-notepad/ted-notepad.factor @@ -1,9 +1,15 @@ -USING: editors io.launcher kernel math.parser namespaces ; +USING: editors io.files io.launcher kernel math.parser +namespaces sequences windows.shell32 ; IN: editors.ted-notepad +: ted-notepad-path + \ ted-notepad-path get-global [ + program-files "\\TED Notepad\\TedNPad.exe" path+ + ] unless* ; + : ted-notepad ( file line -- ) [ - \ ted-notepad get-global % " /l" % # + ted-notepad-path % " /l" % # " " % % ] "" make run-detached ; From 43c82592ad42ed0b5a0a7e5f2e8d043a6f06fbf8 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 11:40:47 -0600 Subject: [PATCH 13/24] Move walk-dir from id3 to io.paths --- extra/id3/id3.factor | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor index f1ef5b7fab..1d76bb0a5b 100644 --- a/extra/id3/id3.factor +++ b/extra/id3/id3.factor @@ -2,7 +2,9 @@ ! See http://factorcode.org/license.txt for BSD license. ! -USING: arrays combinators io io.binary io.files io.utf16 kernel math math.parser namespaces sequences splitting strings assocs ; +USING: arrays combinators io io.binary io.files io.paths +io.utf16 kernel math math.parser namespaces sequences +splitting strings assocs ; IN: id3 @@ -121,18 +123,6 @@ C: extended-header : id3v2 ( filename -- tag/f ) [ read-tag ] with-stream ; -: append-path ( path files -- paths ) - [ path+ ] curry* map ; - -: get-paths ( dir -- paths ) - dup directory keys append-path ; - -: (walk-dir) ( path -- ) - dup directory? [ get-paths dup % [ (walk-dir) ] each ] [ drop ] if ; - -: walk-dir ( path -- seq ) - [ (walk-dir) ] { } make ; - : file? ( path -- ? ) stat 3drop not ; From dff6194aad4ee4d75942d155dd26871ae1aeea61 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 11:42:35 -0600 Subject: [PATCH 14/24] Remove library/binary-roots, add walk-dir and find-file to io.paths --- extra/io/paths/paths.factor | 24 ++++++++++++++++++++++++ extra/io/unix/files/files.factor | 18 ------------------ extra/io/windows/windows.factor | 10 ---------- 3 files changed, 24 insertions(+), 28 deletions(-) create mode 100644 extra/io/paths/paths.factor diff --git a/extra/io/paths/paths.factor b/extra/io/paths/paths.factor new file mode 100644 index 0000000000..3afb110687 --- /dev/null +++ b/extra/io/paths/paths.factor @@ -0,0 +1,24 @@ +USING: assocs io.files kernel namespaces sequences ; +IN: io.paths + +: find-file ( seq str -- path/f ) + [ + [ path+ exists? ] curry find nip + ] keep over [ path+ ] [ drop ] if ; + + + +: walk-dir ( path -- seq ) [ (walk-dir) ] { } make ; diff --git a/extra/io/unix/files/files.factor b/extra/io/unix/files/files.factor index 8f1d05876d..f9d642d661 100755 --- a/extra/io/unix/files/files.factor +++ b/extra/io/unix/files/files.factor @@ -38,21 +38,3 @@ M: unix-io make-directory ( path -- ) M: unix-io delete-directory ( path -- ) rmdir io-error ; - -M: unix-io binary-roots ( -- seq ) - { - "/bin" "/sbin" - "/usr/bin" "/usr/sbin" - "/usr/local/bin" "/usr/local/sbin" - "/opt/local/bin" "/opt/local/sbin" - "~/bin" - } ; - -M: unix-io library-roots ( -- seq ) - { - "/lib" - "/usr/lib" - "/usr/local/lib" - "/opt/local/lib" - "/lib64" - } ; diff --git a/extra/io/windows/windows.factor b/extra/io/windows/windows.factor index 2defa48298..8dcb138999 100755 --- a/extra/io/windows/windows.factor +++ b/extra/io/windows/windows.factor @@ -11,16 +11,6 @@ TUPLE: windows-nt-io ; TUPLE: windows-ce-io ; UNION: windows-io windows-nt-io windows-ce-io ; -M: windows-io library-roots ( -- seq ) - [ - windows , - ] { } make ; - -M: windows-io binary-roots ( -- seq ) - [ - windows , - ] { } make ; - M: windows-io destruct-handle CloseHandle drop ; M: windows-io destruct-socket closesocket drop ; From 0cc666a87bde3a2afe1eb58caa41252940a087bd Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 11:43:00 -0600 Subject: [PATCH 15/24] Remove binary/library roots from core/files --- core/io/files/files.factor | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 03bcb77731..3a01cc7d82 100755 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. IN: io.files USING: io.backend io.files.private io hashtables kernel math -memory namespaces sequences strings arrays definitions system -combinators splitting ; +memory namespaces sequences strings assocs arrays definitions +system combinators splitting ; HOOK: io-backend ( path -- stream ) @@ -140,3 +140,20 @@ HOOK: binary-roots io-backend ( -- seq ) : find-binary ( str -- path/f ) binary-roots swap find-file ; + + + +: walk-dir ( path -- seq ) [ (walk-dir) ] { } make ; From c5c2854107561ef687ce8c896dee10565454db82 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 11:43:17 -0600 Subject: [PATCH 16/24] Fix USE: issue --- extra/editors/editpadpro/editpadpro.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/editors/editpadpro/editpadpro.factor b/extra/editors/editpadpro/editpadpro.factor index 6882a00e45..69a9e2badd 100644 --- a/extra/editors/editpadpro/editpadpro.factor +++ b/extra/editors/editpadpro/editpadpro.factor @@ -1,6 +1,6 @@ USING: definitions kernel parser words sequences math.parser namespaces editors io.launcher windows.shell32 io.files -strings ; +io.paths strings ; IN: editors.editpadpro : editpadpro-path From e590fc8b796a042f6b174ea20a477392a020a598 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 11:51:25 -0600 Subject: [PATCH 17/24] notepad++ autopath --- extra/editors/notepadpp/notepadpp.factor | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/extra/editors/notepadpp/notepadpp.factor b/extra/editors/notepadpp/notepadpp.factor index 42f0568c3a..4f3fde917d 100644 --- a/extra/editors/notepadpp/notepadpp.factor +++ b/extra/editors/notepadpp/notepadpp.factor @@ -1,13 +1,15 @@ -USING: editors io.launcher math.parser namespaces ; +USING: editors io.files io.launcher kernel math.parser +namespaces windows.shell32 ; IN: editors.notepadpp +: notepadpp-path + \ notepadpp-path get-global [ + program-files "notepad++\\notepad++.exe" path+ + ] unless* ; + : notepadpp ( file line -- ) [ - \ notepadpp get-global % " -n" % # " " % % + notepadpp-path % " -n" % # " " % % ] "" make run-detached ; -! Put in your .factor-boot-rc -! "c:\\Program Files\\notepad++\\notepad++.exe" \ notepadpp set-global -! "k:\\Program Files (x86)\\notepad++\\notepad++.exe" \ notepadpp set-global - [ notepadpp ] edit-hook set-global From cd574fdf8e3531a89b3fa7251c6de335fd25afb1 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 17:44:49 -0600 Subject: [PATCH 18/24] Add struct def --- extra/windows/types/types.factor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extra/windows/types/types.factor b/extra/windows/types/types.factor index 6702dd6e79..7be8d98e61 100644 --- a/extra/windows/types/types.factor +++ b/extra/windows/types/types.factor @@ -333,4 +333,8 @@ C-STRUCT: LVFINDINFO { "POINT" "pt" } { "uint" "vkDirection" } ; - +C-STRUCT: ACCEL + { "BYTE" "fVirt" } + { "WORD" "key" } + { "WORD" "cmd" } ; +TYPEDEF: ACCEL* LPACCEL From 85be4fbf3e98fe994e7e491e40dfb6b7c8ef4a5d Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 17:45:27 -0600 Subject: [PATCH 19/24] Add definitions for accel functions --- extra/windows/user32/user32.factor | 361 +++++++++++++++++------------ 1 file changed, 207 insertions(+), 154 deletions(-) diff --git a/extra/windows/user32/user32.factor b/extra/windows/user32/user32.factor index 59378c79ed..c8f6a82fb5 100644 --- a/extra/windows/user32/user32.factor +++ b/extra/windows/user32/user32.factor @@ -5,43 +5,43 @@ windows.types shuffle ; IN: windows.user32 ! HKL for ActivateKeyboardLayout -: HKL_PREV 0 ; -: HKL_NEXT 1 ; +: HKL_PREV 0 ; inline +: HKL_NEXT 1 ; inline -: CW_USEDEFAULT HEX: 80000000 ; +: CW_USEDEFAULT HEX: 80000000 ; inline -: WS_OVERLAPPED HEX: 00000000 ; -: WS_POPUP HEX: 80000000 ; -: WS_CHILD HEX: 40000000 ; -: WS_MINIMIZE HEX: 20000000 ; -: WS_VISIBLE HEX: 10000000 ; -: WS_DISABLED HEX: 08000000 ; -: WS_CLIPSIBLINGS HEX: 04000000 ; -: WS_CLIPCHILDREN HEX: 02000000 ; -: WS_MAXIMIZE HEX: 01000000 ; -: WS_CAPTION HEX: 00C00000 ; ! /* WS_BORDER | WS_DLGFRAME */ -: WS_BORDER HEX: 00800000 ; -: WS_DLGFRAME HEX: 00400000 ; -: WS_VSCROLL HEX: 00200000 ; -: WS_HSCROLL HEX: 00100000 ; -: WS_SYSMENU HEX: 00080000 ; -: WS_THICKFRAME HEX: 00040000 ; -: WS_GROUP HEX: 00020000 ; -: WS_TABSTOP HEX: 00010000 ; -: WS_MINIMIZEBOX HEX: 00020000 ; -: WS_MAXIMIZEBOX HEX: 00010000 ; +: WS_OVERLAPPED HEX: 00000000 ; inline +: WS_POPUP HEX: 80000000 ; inline +: WS_CHILD HEX: 40000000 ; inline +: WS_MINIMIZE HEX: 20000000 ; inline +: WS_VISIBLE HEX: 10000000 ; inline +: WS_DISABLED HEX: 08000000 ; inline +: WS_CLIPSIBLINGS HEX: 04000000 ; inline +: WS_CLIPCHILDREN HEX: 02000000 ; inline +: WS_MAXIMIZE HEX: 01000000 ; inline +: WS_CAPTION HEX: 00C00000 ; inline +: WS_BORDER HEX: 00800000 ; inline +: WS_DLGFRAME HEX: 00400000 ; inline +: WS_VSCROLL HEX: 00200000 ; inline +: WS_HSCROLL HEX: 00100000 ; inline +: WS_SYSMENU HEX: 00080000 ; inline +: WS_THICKFRAME HEX: 00040000 ; inline +: WS_GROUP HEX: 00020000 ; inline +: WS_TABSTOP HEX: 00010000 ; inline +: WS_MINIMIZEBOX HEX: 00020000 ; inline +: WS_MAXIMIZEBOX HEX: 00010000 ; inline ! Common window styles -: WS_OVERLAPPEDWINDOW WS_OVERLAPPED WS_CAPTION WS_SYSMENU WS_THICKFRAME WS_MINIMIZEBOX WS_MAXIMIZEBOX bitor bitor bitor bitor bitor ; +: WS_OVERLAPPEDWINDOW WS_OVERLAPPED WS_CAPTION WS_SYSMENU WS_THICKFRAME WS_MINIMIZEBOX WS_MAXIMIZEBOX bitor bitor bitor bitor bitor ; foldable inline -: WS_POPUPWINDOW WS_POPUP WS_BORDER WS_SYSMENU bitor bitor ; +: WS_POPUPWINDOW WS_POPUP WS_BORDER WS_SYSMENU bitor bitor ; foldable inline -: WS_CHILDWINDOW WS_CHILD ; +: WS_CHILDWINDOW WS_CHILD ; inline -: WS_TILED WS_OVERLAPPED ; -: WS_ICONIC WS_MINIMIZE ; -: WS_SIZEBOX WS_THICKFRAME ; -: WS_TILEDWINDOW WS_OVERLAPPEDWINDOW ; +: WS_TILED WS_OVERLAPPED ; inline +: WS_ICONIC WS_MINIMIZE ; inline +: WS_SIZEBOX WS_THICKFRAME ; inline +: WS_TILEDWINDOW WS_OVERLAPPEDWINDOW ; inline ! Extended window styles @@ -65,72 +65,74 @@ IN: windows.user32 : WS_EX_CONTROLPARENT HEX: 00010000 ; inline : WS_EX_STATICEDGE HEX: 00020000 ; inline : WS_EX_APPWINDOW HEX: 00040000 ; inline -: WS_EX_OVERLAPPEDWINDOW WS_EX_WINDOWEDGE WS_EX_CLIENTEDGE bitor ; inline -: WS_EX_PALETTEWINDOW - WS_EX_WINDOWEDGE WS_EX_TOOLWINDOW bitor WS_EX_TOPMOST bitor ; inline +: WS_EX_OVERLAPPEDWINDOW ( -- n ) + WS_EX_WINDOWEDGE WS_EX_CLIENTEDGE bitor ; foldable inline +: WS_EX_PALETTEWINDOW ( -- n ) + WS_EX_WINDOWEDGE WS_EX_TOOLWINDOW bitor + WS_EX_TOPMOST bitor ; foldable inline -: CS_VREDRAW HEX: 0001 ; -: CS_HREDRAW HEX: 0002 ; -: CS_DBLCLKS HEX: 0008 ; -: CS_OWNDC HEX: 0020 ; -: CS_CLASSDC HEX: 0040 ; -: CS_PARENTDC HEX: 0080 ; -: CS_NOCLOSE HEX: 0200 ; -: CS_SAVEBITS HEX: 0800 ; -: CS_BYTEALIGNCLIENT HEX: 1000 ; -: CS_BYTEALIGNWINDOW HEX: 2000 ; -: CS_GLOBALCLASS HEX: 4000 ; +: CS_VREDRAW HEX: 0001 ; inline +: CS_HREDRAW HEX: 0002 ; inline +: CS_DBLCLKS HEX: 0008 ; inline +: CS_OWNDC HEX: 0020 ; inline +: CS_CLASSDC HEX: 0040 ; inline +: CS_PARENTDC HEX: 0080 ; inline +: CS_NOCLOSE HEX: 0200 ; inline +: CS_SAVEBITS HEX: 0800 ; inline +: CS_BYTEALIGNCLIENT HEX: 1000 ; inline +: CS_BYTEALIGNWINDOW HEX: 2000 ; inline +: CS_GLOBALCLASS HEX: 4000 ; inline -: COLOR_SCROLLBAR 0 ; -: COLOR_BACKGROUND 1 ; -: COLOR_ACTIVECAPTION 2 ; -: COLOR_INACTIVECAPTION 3 ; -: COLOR_MENU 4 ; -: COLOR_WINDOW 5 ; -: COLOR_WINDOWFRAME 6 ; -: COLOR_MENUTEXT 7 ; -: COLOR_WINDOWTEXT 8 ; -: COLOR_CAPTIONTEXT 9 ; -: COLOR_ACTIVEBORDER 10 ; -: COLOR_INACTIVEBORDER 11 ; -: COLOR_APPWORKSPACE 12 ; -: COLOR_HIGHLIGHT 13 ; -: COLOR_HIGHLIGHTTEXT 14 ; -: COLOR_BTNFACE 15 ; -: COLOR_BTNSHADOW 16 ; -: COLOR_GRAYTEXT 17 ; -: COLOR_BTNTEXT 18 ; -: COLOR_INACTIVECAPTIONTEXT 19 ; -: COLOR_BTNHIGHLIGHT 20 ; +: COLOR_SCROLLBAR 0 ; inline +: COLOR_BACKGROUND 1 ; inline +: COLOR_ACTIVECAPTION 2 ; inline +: COLOR_INACTIVECAPTION 3 ; inline +: COLOR_MENU 4 ; inline +: COLOR_WINDOW 5 ; inline +: COLOR_WINDOWFRAME 6 ; inline +: COLOR_MENUTEXT 7 ; inline +: COLOR_WINDOWTEXT 8 ; inline +: COLOR_CAPTIONTEXT 9 ; inline +: COLOR_ACTIVEBORDER 10 ; inline +: COLOR_INACTIVEBORDER 11 ; inline +: COLOR_APPWORKSPACE 12 ; inline +: COLOR_HIGHLIGHT 13 ; inline +: COLOR_HIGHLIGHTTEXT 14 ; inline +: COLOR_BTNFACE 15 ; inline +: COLOR_BTNSHADOW 16 ; inline +: COLOR_GRAYTEXT 17 ; inline +: COLOR_BTNTEXT 18 ; inline +: COLOR_INACTIVECAPTIONTEXT 19 ; inline +: COLOR_BTNHIGHLIGHT 20 ; inline -: IDI_APPLICATION 32512 ; -: IDI_HAND 32513 ; -: IDI_QUESTION 32514 ; -: IDI_EXCLAMATION 32515 ; -: IDI_ASTERISK 32516 ; -: IDI_WINLOGO 32517 ; +: IDI_APPLICATION 32512 ; inline +: IDI_HAND 32513 ; inline +: IDI_QUESTION 32514 ; inline +: IDI_EXCLAMATION 32515 ; inline +: IDI_ASTERISK 32516 ; inline +: IDI_WINLOGO 32517 ; inline ! ShowWindow() Commands -: SW_HIDE 0 ; -: SW_SHOWNORMAL 1 ; -: SW_NORMAL 1 ; -: SW_SHOWMINIMIZED 2 ; -: SW_SHOWMAXIMIZED 3 ; -: SW_MAXIMIZE 3 ; -: SW_SHOWNOACTIVATE 4 ; -: SW_SHOW 5 ; -: SW_MINIMIZE 6 ; -: SW_SHOWMINNOACTIVE 7 ; -: SW_SHOWNA 8 ; -: SW_RESTORE 9 ; -: SW_SHOWDEFAULT 10 ; -: SW_FORCEMINIMIZE 11 ; -: SW_MAX 11 ; +: SW_HIDE 0 ; inline +: SW_SHOWNORMAL 1 ; inline +: SW_NORMAL 1 ; inline +: SW_SHOWMINIMIZED 2 ; inline +: SW_SHOWMAXIMIZED 3 ; inline +: SW_MAXIMIZE 3 ; inline +: SW_SHOWNOACTIVATE 4 ; inline +: SW_SHOW 5 ; inline +: SW_MINIMIZE 6 ; inline +: SW_SHOWMINNOACTIVE 7 ; inline +: SW_SHOWNA 8 ; inline +: SW_RESTORE 9 ; inline +: SW_SHOWDEFAULT 10 ; inline +: SW_FORCEMINIMIZE 11 ; inline +: SW_MAX 11 ; inline ! PeekMessage -: PM_NOREMOVE 0 ; -: PM_REMOVE 1 ; -: PM_NOYIELD 2 ; +: PM_NOREMOVE 0 ; inline +: PM_REMOVE 1 ; inline +: PM_NOYIELD 2 ; inline ! : PM_QS_INPUT (QS_INPUT << 16) ; ! : PM_QS_POSTMESSAGE ((QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER) << 16) ; ! : PM_QS_PAINT (QS_PAINT << 16) ; @@ -140,22 +142,22 @@ IN: windows.user32 ! ! Standard Cursor IDs ! -: IDC_ARROW 32512 ; -: IDC_IBEAM 32513 ; -: IDC_WAIT 32514 ; -: IDC_CROSS 32515 ; -: IDC_UPARROW 32516 ; -: IDC_SIZE 32640 ; ! OBSOLETE: use IDC_SIZEALL -: IDC_ICON 32641 ; ! OBSOLETE: use IDC_ARROW -: IDC_SIZENWSE 32642 ; -: IDC_SIZENESW 32643 ; -: IDC_SIZEWE 32644 ; -: IDC_SIZENS 32645 ; -: IDC_SIZEALL 32646 ; -: IDC_NO 32648 ; ! not in win3.1 -: IDC_HAND 32649 ; -: IDC_APPSTARTING 32650 ; ! not in win3.1 -: IDC_HELP 32651 ; +: IDC_ARROW 32512 ; inline +: IDC_IBEAM 32513 ; inline +: IDC_WAIT 32514 ; inline +: IDC_CROSS 32515 ; inline +: IDC_UPARROW 32516 ; inline +: IDC_SIZE 32640 ; inline ! OBSOLETE: use IDC_SIZEALL +: IDC_ICON 32641 ; inline ! OBSOLETE: use IDC_ARROW +: IDC_SIZENWSE 32642 ; inline +: IDC_SIZENESW 32643 ; inline +: IDC_SIZEWE 32644 ; inline +: IDC_SIZENS 32645 ; inline +: IDC_SIZEALL 32646 ; inline +: IDC_NO 32648 ; inline ! not in win3.1 +: IDC_HAND 32649 ; inline +: IDC_APPSTARTING 32650 ; inline ! not in win3.1 +: IDC_HELP 32651 ; inline ! Predefined Clipboard Formats : CF_TEXT 1 ; inline @@ -244,9 +246,43 @@ IN: windows.user32 : VK_DELETE HEX: 2E ; inline : VK_HELP HEX: 2F ; inline -! VK_0 - VK_9 are the same as ASCII '0' - '9' (0x30 - 0x39) -! 0x40 : unassigned -! VK_A - VK_Z are the same as ASCII 'A' - 'Z' (0x41 - 0x5A) +: VK_0 CHAR: 0 ; inline +: VK_1 CHAR: 1 ; inline +: VK_2 CHAR: 2 ; inline +: VK_3 CHAR: 3 ; inline +: VK_4 CHAR: 4 ; inline +: VK_5 CHAR: 5 ; inline +: VK_6 CHAR: 6 ; inline +: VK_7 CHAR: 7 ; inline +: VK_8 CHAR: 8 ; inline +: VK_9 CHAR: 9 ; inline + +: VK_A CHAR: A ; inline +: VK_B CHAR: B ; inline +: VK_C CHAR: C ; inline +: VK_D CHAR: D ; inline +: VK_E CHAR: E ; inline +: VK_F CHAR: F ; inline +: VK_G CHAR: G ; inline +: VK_H CHAR: H ; inline +: VK_I CHAR: I ; inline +: VK_J CHAR: J ; inline +: VK_K CHAR: K ; inline +: VK_L CHAR: L ; inline +: VK_M CHAR: M ; inline +: VK_N CHAR: N ; inline +: VK_O CHAR: O ; inline +: VK_P CHAR: P ; inline +: VK_Q CHAR: Q ; inline +: VK_R CHAR: R ; inline +: VK_S CHAR: S ; inline +: VK_T CHAR: T ; inline +: VK_U CHAR: U ; inline +: VK_V CHAR: V ; inline +: VK_W CHAR: W ; inline +: VK_X CHAR: X ; inline +: VK_Y CHAR: Y ; inline +: VK_Z CHAR: Z ; inline : VK_LWIN HEX: 5B ; inline : VK_RWIN HEX: 5C ; inline @@ -417,47 +453,59 @@ IN: windows.user32 ! Some fields are not defined for win64 ! Window field offsets for GetWindowLong() -: GWL_WNDPROC -4 ; -: GWL_HINSTANCE -6 ; -: GWL_HWNDPARENT -8 ; -: GWL_USERDATA -21 ; -: GWL_ID -12 ; +: GWL_WNDPROC -4 ; inline +: GWL_HINSTANCE -6 ; inline +: GWL_HWNDPARENT -8 ; inline +: GWL_USERDATA -21 ; inline +: GWL_ID -12 ; inline -: GWL_STYLE -16 ; -: GWL_EXSTYLE -20 ; +: GWL_STYLE -16 ; inline +: GWL_EXSTYLE -20 ; inline -: GWLP_WNDPROC -4 ; -: GWLP_HINSTANCE -6 ; -: GWLP_HWNDPARENT -8 ; -: GWLP_USERDATA -21 ; -: GWLP_ID -12 ; +: GWLP_WNDPROC -4 ; inline +: GWLP_HINSTANCE -6 ; inline +: GWLP_HWNDPARENT -8 ; inline +: GWLP_USERDATA -21 ; inline +: GWLP_ID -12 ; inline ! Class field offsets for GetClassLong() -: GCL_MENUNAME -8 ; -: GCL_HBRBACKGROUND -10 ; -: GCL_HCURSOR -12 ; -: GCL_HICON -14 ; -: GCL_HMODULE -16 ; -: GCL_WNDPROC -24 ; -: GCL_HICONSM -34 ; -: GCL_CBWNDEXTRA -18 ; -: GCL_CBCLSEXTRA -20 ; -: GCL_STYLE -26 ; -: GCW_ATOM -32 ; +: GCL_MENUNAME -8 ; inline +: GCL_HBRBACKGROUND -10 ; inline +: GCL_HCURSOR -12 ; inline +: GCL_HICON -14 ; inline +: GCL_HMODULE -16 ; inline +: GCL_WNDPROC -24 ; inline +: GCL_HICONSM -34 ; inline +: GCL_CBWNDEXTRA -18 ; inline +: GCL_CBCLSEXTRA -20 ; inline +: GCL_STYLE -26 ; inline +: GCW_ATOM -32 ; inline -: GCLP_MENUNAME -8 ; -: GCLP_HBRBACKGROUND -10 ; -: GCLP_HCURSOR -12 ; -: GCLP_HICON -14 ; -: GCLP_HMODULE -16 ; -: GCLP_WNDPROC -24 ; -: GCLP_HICONSM -34 ; +: GCLP_MENUNAME -8 ; inline +: GCLP_HBRBACKGROUND -10 ; inline +: GCLP_HCURSOR -12 ; inline +: GCLP_HICON -14 ; inline +: GCLP_HMODULE -16 ; inline +: GCLP_WNDPROC -24 ; inline +: GCLP_HICONSM -34 ; inline -: MB_ICONASTERISK HEX: 00000040 ; -: MB_ICONEXCLAMATION HEX: 00000030 ; -: MB_ICONHAND HEX: 00000010 ; -: MB_ICONQUESTION HEX: 00000020 ; -: MB_OK HEX: 00000000 ; +: MB_ICONASTERISK HEX: 00000040 ; inline +: MB_ICONEXCLAMATION HEX: 00000030 ; inline +: MB_ICONHAND HEX: 00000010 ; inline +: MB_ICONQUESTION HEX: 00000020 ; inline +: MB_OK HEX: 00000000 ; inline + +: FVIRTKEY TRUE ; inline +: FNOINVERT 2 ; inline +: FSHIFT 4 ; inline +: FCONTROL 8 ; inline +: FALT 16 ; inline + +: MAPVK_VK_TO_VSC 0 ; inline +: MAPVK_VSC_TO_VK 1 ; inline +: MAPVK_VK_TO_CHAR 2 ; inline +: MAPVK_VSC_TO_VK_EX 3 ; inline +: MAPVK_VK_TO_VSC_EX 3 ; inline : TME_HOVER 1 ; inline : TME_LEAVE 2 ; inline @@ -549,13 +597,15 @@ FUNCTION: BOOL CloseClipboard ( ) ; ! FUNCTION: CloseWindow ! FUNCTION: CloseWindowStation ! FUNCTION: CopyAcceleratorTableA -! FUNCTION: CopyAcceleratorTableW +FUNCTION: int CopyAcceleratorTableW ( HACCEL hAccelSrc, LPACCEL lpAccelDst, int cAccelEntries ) ; +: CopyAcceleratorTable CopyAcceleratorTableW ; inline ! FUNCTION: CopyIcon ! FUNCTION: CopyImage ! FUNCTION: CopyRect ! FUNCTION: CountClipboardFormats ! FUNCTION: CreateAcceleratorTableA -! FUNCTION: CreateAcceleratorTableW +FUNCTION: HACCEL CreateAcceleratorTableW ( LPACCEL lpaccl, int cEntries ) ; +: CreateAcceleratorTable CreateAcceleratorTableW ; inline ! FUNCTION: CreateCaret ! FUNCTION: CreateCursor ! FUNCTION: CreateDesktopA @@ -643,7 +693,7 @@ FUNCTION: LRESULT DefWindowProcW ( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lP : DefWindowProc DefWindowProcW ; inline ! FUNCTION: DeleteMenu ! FUNCTION: DeregisterShellHookWindow -! FUNCTION: DestroyAcceleratorTable +FUNCTION: BOOL DestroyAcceleratorTable ( HACCEL hAccel ) ; ! FUNCTION: DestroyCaret ! FUNCTION: DestroyCursor ! FUNCTION: DestroyIcon @@ -953,7 +1003,7 @@ FUNCTION: BOOL IsZoomed ( HWND hWnd ) ; ! FUNCTION: KillSystemTimer ! FUNCTION: KillTimer ! FUNCTION: LoadAcceleratorsA -! FUNCTION: LoadAcceleratorsW +FUNCTION: HACCEL LoadAcceleratorsW ( HINSTANCE hInstance, LPCTSTR lpTableName ) ; ! FUNCTION: LoadBitmapA ! FUNCTION: LoadBitmapW ! FUNCTION: LoadCursorFromFileA @@ -988,10 +1038,13 @@ FUNCTION: HICON LoadIconW ( HINSTANCE hInstance, LPCTSTR lpIconName ) ; ! FUNCTION: LookupIconIdFromDirectory ! FUNCTION: LookupIconIdFromDirectoryEx ! FUNCTION: MapDialogRect -! FUNCTION: MapVirtualKeyA -! FUNCTION: MapVirtualKeyExA -! FUNCTION: MapVirtualKeyExW -! FUNCTION: MapVirtualKeyW + +FUNCTION: UINT MapVirtualKeyW ( UINT uCode, UINT uMapType ) ; +: MapVirtualKey MapVirtualKeyW ; inline + +FUNCTION: UINT MapVirtualKeyExW ( UINT uCode, UINT uMapType, HKL dwhkl ) ; +: MapVirtualKeyEx MapVirtualKeyExW ; inline + ! FUNCTION: MapWindowPoints ! FUNCTION: MB_GetString ! FUNCTION: MBToWCSEx @@ -1050,7 +1103,6 @@ FUNCTION: int MessageBoxExW ( ! FUNCTION: mouse_event - FUNCTION: BOOL MoveWindow ( HWND hWnd, int X, @@ -1059,7 +1111,6 @@ FUNCTION: BOOL MoveWindow ( int nHeight, BOOL bRepaint ) ; - ! FUNCTION: MsgWaitForMultipleObjects ! FUNCTION: MsgWaitForMultipleObjectsEx ! FUNCTION: NotifyWinEvent @@ -1264,7 +1315,9 @@ FUNCTION: BOOL TrackMouseEvent ( LPTRACKMOUSEEVENT lpEventTrack ) ; ! FUNCTION: TrackPopupMenuEx ! FUNCTION: TranslateAccelerator ! FUNCTION: TranslateAcceleratorA -! FUNCTION: TranslateAcceleratorW +FUNCTION: int TranslateAcceleratorW ( HWND hWnd, HACCEL hAccTable, LPMSG lpMsg ) ; +: TranslateAccelerator TranslateAcceleratorW ; inline + ! FUNCTION: TranslateMDISysAccel FUNCTION: BOOL TranslateMessage ( MSG* lpMsg ) ; From 7b10e2941ff7623a0c6aa755700d0a50c10b5b6b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 17:45:49 -0600 Subject: [PATCH 20/24] Handle WM_SYSCOMMAND -- don't beep on alpha keys --- extra/ui/windows/windows.factor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extra/ui/windows/windows.factor b/extra/ui/windows/windows.factor index 0146deed98..de9ad130fe 100755 --- a/extra/ui/windows/windows.factor +++ b/extra/ui/windows/windows.factor @@ -210,6 +210,9 @@ SYMBOL: hWnd hWnd get window-focus send-gesture drop ; +: handle-wm-syscommand ( hWnd uMsg wParam lParam -- n ) + dup alpha? [ 3drop drop 0 ] [ DefWindowProc ] if ; + : cleanup-window ( handle -- ) dup win-title [ free ] when* dup win-hRC wglDeleteContext win32-error=0/f @@ -305,7 +308,7 @@ M: windows-ui-backend (close-window) : ui-wndproc ( -- object ) "uint" { "void*" "uint" "long" "long" } "stdcall" [ [ - pick + pick ! global [ dup windows-message-name . ] bind { { [ dup WM_CLOSE = ] [ drop handle-wm-close 0 ] } { [ dup WM_PAINT = ] @@ -320,6 +323,7 @@ M: windows-ui-backend (close-window) { [ dup WM_KEYUP = over WM_SYSKEYUP = or ] [ drop 4dup handle-wm-keyup DefWindowProc ] } + { [ dup WM_SYSCOMMAND = ] [ drop handle-wm-syscommand ] } { [ dup WM_SETFOCUS = ] [ drop handle-wm-set-focus 0 ] } { [ dup WM_KILLFOCUS = ] [ drop handle-wm-kill-focus 0 ] } From c5567f3a04d6e8b31e5f55f89efad88afac38f46 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 17:49:33 -0600 Subject: [PATCH 21/24] add 4drop to extra shuffle --- extra/shuffle/shuffle.factor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extra/shuffle/shuffle.factor b/extra/shuffle/shuffle.factor index b2523eddd2..b0fdd952d5 100644 --- a/extra/shuffle/shuffle.factor +++ b/extra/shuffle/shuffle.factor @@ -29,4 +29,6 @@ MACRO: ntuck ( n -- ) 2 + [ dup , -nrot ] bake ; : 4dup ( a b c d -- a b c d a b c d ) 4 ndup ; inline +: 4drop ( a b c d -- ) 3drop drop ; inline + : tuckd ( x y z -- z x y z ) 2 ntuck ; inline From 4cde2561e20d3def79acfa305526c8ebf46f9609 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 17:50:37 -0600 Subject: [PATCH 22/24] 3drop drop -> 4drop --- extra/ui/windows/windows.factor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/ui/windows/windows.factor b/extra/ui/windows/windows.factor index de9ad130fe..9311a1b2a6 100755 --- a/extra/ui/windows/windows.factor +++ b/extra/ui/windows/windows.factor @@ -211,7 +211,7 @@ SYMBOL: hWnd drop ; : handle-wm-syscommand ( hWnd uMsg wParam lParam -- n ) - dup alpha? [ 3drop drop 0 ] [ DefWindowProc ] if ; + dup alpha? [ 4drop 0 ] [ DefWindowProc ] if ; : cleanup-window ( handle -- ) dup win-title [ free ] when* @@ -298,11 +298,11 @@ M: windows-ui-backend (close-window) : handle-wm-cancelmode ( hWnd uMsg wParam lParam -- ) #! message sent if windows needs application to stop dragging - 3drop drop release-capture ; + 4drop release-capture ; : handle-wm-mouseleave ( hWnd uMsg wParam lParam -- ) #! message sent if mouse leaves main application - 3drop drop forget-rollover ; + 4drop forget-rollover ; ! return 0 if you handle the message, else just let DefWindowProc return its val : ui-wndproc ( -- object ) From b475180d8ed5606a1269ed5223811ae76a8f6ea5 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 18:16:24 -0600 Subject: [PATCH 23/24] autofind the path for gvim on unix and windows --- extra/editors/gvim/gvim.factor | 14 +++++++++++--- extra/editors/gvim/unix/unix.factor | 7 +++++++ extra/editors/gvim/windows/windows.factor | 8 ++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 extra/editors/gvim/unix/unix.factor create mode 100644 extra/editors/gvim/windows/windows.factor diff --git a/extra/editors/gvim/gvim.factor b/extra/editors/gvim/gvim.factor index 024f5cfffa..802ab51c7a 100644 --- a/extra/editors/gvim/gvim.factor +++ b/extra/editors/gvim/gvim.factor @@ -1,10 +1,18 @@ -USING: kernel math math.parser namespaces editors.vim ; +USING: io.backend io.files kernel math math.parser +namespaces editors.vim sequences system windows.shell32 ; IN: editors.gvim TUPLE: gvim ; +HOOK: gvim-path io-backend ( -- path ) + + M: gvim vim-command ( file line -- string ) - [ "\"" % vim-path get % "\" \"" % swap % "\" +" % # ] "" make ; + [ "\"" % gvim-path % "\" \"" % swap % "\" +" % # ] "" make ; + +t vim-detach set-global ! don't block the ui T{ gvim } vim-editor set-global -"gvim" vim-path set-global + +USE-IF: unix? editors.gvim.unix +USE-IF: windows? editors.gvim.windows diff --git a/extra/editors/gvim/unix/unix.factor b/extra/editors/gvim/unix/unix.factor new file mode 100644 index 0000000000..fd295cc9e9 --- /dev/null +++ b/extra/editors/gvim/unix/unix.factor @@ -0,0 +1,7 @@ +USING: editors.gvim io.unix.backend kernel namespaces ; +IN: editors.gvim.unix + +M: unix-io gvim-path + \ gvim-path get-global [ + "gvim" + ] unless* ; diff --git a/extra/editors/gvim/windows/windows.factor b/extra/editors/gvim/windows/windows.factor new file mode 100644 index 0000000000..5a3ea6b67a --- /dev/null +++ b/extra/editors/gvim/windows/windows.factor @@ -0,0 +1,8 @@ +USING: editors.gvim io.files io.windows kernel namespaces +sequences windows.shell32 ; +IN: editors.gvim.windows + +M: windows-io gvim-path + \ gvim-path get-global [ + program-files walk-dir [ "gvim.exe" tail? ] find nip + ] unless* ; From 537963ce24db4d3782352564c2e6edb9eb3d5a7d Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 9 Dec 2007 18:35:19 -0600 Subject: [PATCH 24/24] Don't pull in windows.shell32 on linux.. --- extra/editors/gvim/gvim.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/editors/gvim/gvim.factor b/extra/editors/gvim/gvim.factor index 802ab51c7a..7a1f939b5c 100644 --- a/extra/editors/gvim/gvim.factor +++ b/extra/editors/gvim/gvim.factor @@ -1,5 +1,5 @@ USING: io.backend io.files kernel math math.parser -namespaces editors.vim sequences system windows.shell32 ; +namespaces editors.vim sequences system ; IN: editors.gvim TUPLE: gvim ;