Rename grf -> graphics.

Full names are better.
This commit is contained in:
Brad Nelson
2022-03-07 14:51:15 -08:00
parent c3939327eb
commit 83e57c2c42
13 changed files with 23 additions and 23 deletions

View File

@ -191,13 +191,13 @@ COMMON_PHASE2 = common/tasks.fs common/utils.fs common/locals.fs \
common/streams.fs common/blocks.fs common/streams.fs common/blocks.fs
COMMON_DESKTOP = common/ansi.fs common/desktop.fs \ COMMON_DESKTOP = common/ansi.fs common/desktop.fs \
common/grf.fs common/grf_utils.fs common/heart.fs common/graphics.fs common/graphics_utils.fs common/heart.fs
POSIX_BOOT = $(COMMON_PHASE1) \ POSIX_BOOT = $(COMMON_PHASE1) \
posix/posix.fs posix/allocation.fs posix/termios.fs \ posix/posix.fs posix/allocation.fs posix/termios.fs \
$(COMMON_PHASE2) $(COMMON_DESKTOP) \ $(COMMON_PHASE2) $(COMMON_DESKTOP) \
posix/x11.fs \ posix/x11.fs \
posix/grf.fs \ posix/graphics.fs \
posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \ posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
posix/autoboot.fs \ posix/autoboot.fs \
common/fini.fs common/fini.fs
@ -213,7 +213,7 @@ WINDOWS_BOOT = $(COMMON_PHASE1) \
windows/windows_messages.fs \ windows/windows_messages.fs \
windows/allocation.fs \ windows/allocation.fs \
$(COMMON_PHASE2) $(COMMON_DESKTOP) \ $(COMMON_PHASE2) $(COMMON_DESKTOP) \
windows/grf.fs \ windows/graphics.fs \
posix/autoboot.fs \ posix/autoboot.fs \
common/fini.fs common/fini.fs
$(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN) $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)

View File

@ -453,7 +453,7 @@ e: check-opcodes
;e ;e
e: check-desktop e: check-desktop
out: grf out: graphics
check-args check-args
check-ansi check-ansi
;e ;e
@ -474,7 +474,7 @@ DEFINED? windows [IF]
e: test-windows-forth-namespace e: test-windows-forth-namespace
internals voclist internals voclist
out: internals out: internals
out: grf out: graphics
out: ansi out: ansi
out: editor out: editor
out: streams out: streams
@ -513,7 +513,7 @@ e: test-posix-forth-namespace
internals voclist internals voclist
out: sockets out: sockets
out: internals out: internals
out: grf out: graphics
out: ansi out: ansi
out: editor out: editor
out: streams out: streams

View File

@ -36,7 +36,7 @@
\ Key/Button constants: \ Key/Button constants:
\ LEFT-BUTTON MIDDLE-BUTTON RIGHT-BUTTON \ LEFT-BUTTON MIDDLE-BUTTON RIGHT-BUTTON
vocabulary grf grf definitions vocabulary graphics graphics definitions
vocabulary internals vocabulary internals
0 constant IDLE 0 constant IDLE
@ -70,7 +70,7 @@ key-state key-count erase
: key-state! ( f k ) key-count mod key-state + c! ; : key-state! ( f k ) key-count mod key-state + c! ;
grf definitions also internals graphics definitions also internals
: pixel ( w h -- a ) width * + 4* backbuffer + ; : pixel ( w h -- a ) width * + 4* backbuffer + ;

View File

@ -28,7 +28,7 @@
\ screen>g ( x y -- x' y' ) Transform screen to viewport \ screen>g ( x y -- x' y' ) Transform screen to viewport
also internals also internals
grf definitions graphics definitions
0 value color 0 value color
@ -62,7 +62,7 @@ gstack value gp
top h 1- for left over w hline 1+ next drop top h 1- for left over w hline 1+ next drop
; ;
grf definitions also internals graphics definitions also internals
: box { left top w h } : box { left top w h }
left sx * tx + 16 rshift left sx * tx + 16 rshift

View File

@ -13,7 +13,7 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
grf graphics
-1 -1 window -1 -1 window

View File

@ -16,7 +16,7 @@
\ Drawing: \ Drawing:
\ heart ( x y h -- ) \ heart ( x y h -- )
grf internals definitions graphics internals definitions
\ For t = 0 to 2pi \ For t = 0 to 2pi
\ x = -16 to 16 \ x = -16 to 16
@ -79,7 +79,7 @@ heart-end heart-size 0 fill
loop loop
; ;
grf definitions also internals graphics definitions also internals
: heart 0 { x y s r } : heart 0 { x y s r }
x sx * tx + 16 rshift x sx * tx + 16 rshift

View File

@ -14,7 +14,7 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
also grf also graphics
also structures also structures
struct ScanSpan struct ScanSpan

View File

@ -13,7 +13,7 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
grf graphics
-1 -1 window -1 -1 window

View File

@ -14,7 +14,7 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
grf also structures graphics also structures
640 480 window 640 480 window
1 31 lshift 1- constant max-random 1 31 lshift 1- constant max-random

View File

@ -14,7 +14,7 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
grf graphics
640 480 window 640 480 window
: run : run

View File

@ -13,7 +13,7 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
grf graphics
-1 -1 window -1 -1 window

View File

@ -14,12 +14,12 @@
( Lazy load expand Graphics for Xlib ) ( Lazy load expand Graphics for Xlib )
grf definitions graphics definitions
: window r| : window r|
also x11 also x11
forth grf internals definitions forth graphics internals definitions
also posix also x11 also posix also x11
0 value display 0 value display
@ -129,7 +129,7 @@ StructureNotifyMask or constant EVENT-MASK
then then
; ;
also grf definitions also graphics definitions
: window { w h } : window { w h }
w 0< if 640 to w 480 to h then w 0< if 640 to w 480 to h then

View File

@ -14,7 +14,7 @@
( Expand Graphics for Windows ) ( Expand Graphics for Windows )
grf internals definitions graphics internals definitions
also windows also windows
z" GrfClass" constant GrfClassName z" GrfClass" constant GrfClassName
@ -116,7 +116,7 @@ cell allocate throw to backbuffer
hwnd msg w l DefWindowProcA hwnd msg w l DefWindowProcA
; ;
grf definitions graphics definitions
also internals also internals
also windows also windows