diff -r dosrescue2/dos_rescue.ew dosrescue2for4.0//dos_rescue.ew
3c3
< -- Windows GDI equivalent routines 
---
> -- Windows GDI equivalent routines for EUPHORIA 4 
6,11c6,17
< -- include std/dll.e
< -- include std/machine.e
< include graphics.e as graphics
< include machine.e as machine
< include misc.e
< include dll.e
---
> include std/graphics.e as graphics
> include std/machine.e as machine
> include std/dll.e as dll
> public include std/os.e
> include std/text.e
> include std/error.e
> ifdef WINDOWS then
> 	include std/win32/sounds.e
> end ifdef
> public include std/graphcst.e
> public include std/console.e
> include std/math.e
12a19
> constant DOS32 = 1
17c24
< -- global constant 
---
> -- public constant 
39,49d45
< global function or_all(sequence s)
< -- or together all elements of a sequence
<     atom result
<     
<     result = 0
<     for i = 1 to length(s) do
<         result = or_bits(result, s[i])
<     end for
<     return result
< end function
< 
53c49
< global constant SW_SHOWNORMAL = 1
---
> public constant SW_SHOWNORMAL = 1
103c99
< global boolean freeze_the_game
---
> public boolean freeze_the_game
106c102
< global integer window_exists
---
> public integer window_exists
118c114
< global integer ShellExecute
---
> public integer ShellExecute
131c127
< global integer PlaySound, Sleep, Beep
---
> public integer PlaySound, Sleep, Beep
137,139c133
<     puts(1, "Couldn't find " & name & '\n')
<     ?1/0
<     abort(1)
---
>     crash("%s",{"Couldn't find " & name & '\n'})
282c276
< global
---
> public
287c281
< global
---
> public
310c304
< -- global constant VC_COLOR = 1,
---
> -- public constant VC_COLOR = 1,
319c313
< global function video_config()
---
> public function video_config()
330c324
< global integer last_text_color
---
> public integer last_text_color
332c326
< global integer last_bk_color
---
> public integer last_bk_color
380c374
< global procedure set_color(integer color)
---
> public procedure set_color(integer color)
385c379
< global procedure set_bk_color(integer color)
---
> public procedure set_bk_color(integer color)
390c384
< global procedure text_color(integer color)
---
> public procedure text_color(integer color)
400c394
< global procedure clear_region(integer x1, integer y1, integer x2, integer y2)
---
> public procedure clear_region(integer x1, integer y1, integer x2, integer y2)
406,408c400,401
< procedure eu_clear_screen()
<     clear_screen()
< end procedure
---
> 
> 
416c409
< global procedure clear_screen()
---
> public procedure clear_screen()
419c412
<         eu_clear_screen()
---
>         eu:clear_screen()
428c421
< global procedure bk_color(integer color)
---
> public procedure bk_color(integer color)
444c437
< global sequence custom_handlers
---
> public sequence custom_handlers
447c440
< global integer repaint
---
> public integer repaint
578c571
< global object AppName
---
> public object AppName
709,712c702,706
< global function graphics_mode(integer m)
<     if platform() != WIN32 then
<         return graphics:graphics_mode(m)
<     elsif m = -1 then
---
> public function graphics_mode(integer m)
>     ifdef not WINDOWS then
>     	return graphics:graphics_mode(m)
>     end ifdef
>     if m = -1 then
727c721
< global procedure simplepixel(object c, sequence s)
---
> public procedure simplepixel(object c, sequence s)
743,745d736
< procedure eu_pixel(object c, sequence s)
<     pixel(c,s)
< end procedure
747c738
< global procedure pixel(object c, sequence s)
---
> public procedure pixel(object c, sequence s)
752c743
<         eu_pixel(c,s)
---
>         -- eu:pixel(c,s)
787,789d777
< function eu_get_pixel(sequence s)
<     return get_pixel(s)
< end function
791c779
< global function get_pixel(sequence s)
---
> public function get_pixel(sequence s)
796,797c784,785
<     if not window_exists or length(s)<2 or length(s)>3 then
<         return eu_get_pixel(s)
---
>     if length(s)<2 or length(s)>3 then
>         crash("get_pixel must be supplied a sequence of length 2 or 3.")
812c800
< global procedure ellipse(integer color, integer fill, sequence coord1, sequence coord2)
---
> public procedure ellipse(integer color, integer fill, sequence coord1, sequence coord2)
814c802
<         graphics:ellipse(color,fill,coord1,coord2)
---
> --        graphics:ellipse(color,fill,coord1,coord2)
833c821
< global procedure draw_line(integer c, sequence xyarray)
---
> public procedure draw_line(integer c, sequence xyarray)
835c823
<         graphics:draw_line(c,xyarray)
---
> --        graphics:draw_line(c,xyarray)
864c852
< global procedure polygon(integer c, integer fill, sequence xyarray)
---
> public procedure polygon(integer c, integer fill, sequence xyarray)
866c854
<         graphics:polygon(c,fill,xyarray)
---
>         --graphics:polygon(c,fill,xyarray)
894,896d881
< function eu_get_key()
<     return get_key()
< end function
898c883
< global function get_key()
---
> public function get_key()
903c888
<         return eu_get_key()
---
>         return eu:get_key()
916c901
< global function wait_key()
---
> public function wait_key()
925c910
< global procedure pass_key(integer key)
---
> public procedure pass_key(integer key)
936c921
< -- global
---
> -- public
955,959c940
< procedure eu_position(integer line, integer column)
<     position(line,column)
< end procedure
< 
< global procedure position(integer line, integer column)
---
> public procedure position(integer line, integer column)
962c943
<         eu_position(line,column)
---
>         eu:position(line,column)
970c951
< global function get_position()
---
> public function get_position()
975,979c956
< procedure eu_puts(integer fn, object str)
<     puts(fn,str)
< end procedure
< 
< global procedure puts(integer fn, object str)
---
> public procedure puts(integer fn, object str)
984c961
<         eu_puts(fn,str)
---
>         eu:puts(fn,str)
1019,1024c996
< -- global
< procedure eu_printf(integer fn, sequence format, object x)
<     printf(fn,format,x)
< end procedure
< 
< global procedure printf(integer fn, sequence format, object x)
---
> public procedure printf(integer fn, sequence format, object x)
1028c1000
<         eu_printf(fn,format,x)
---
>         eu:printf(fn,format,x)
1035,1039c1007
< procedure eu_print(integer fn, object x)
<     print(fn,x)
< end procedure
< 
< global procedure print(integer fn, object x)
---
> public procedure print(integer fn, object x)
1043c1011
<         eu_print(fn,x)
---
>         eu:print(fn,x)
1055,1060c1023
< -- global
< function eu_gets(integer fn)
<     return gets(fn)
< end function
< 
< global function gets(integer fn)
---
> public function gets(integer fn)
1068c1031
<         return eu_gets(fn)
---
>         return eu:gets(fn)
1129,1134c1092
< global
< function eu_getc(integer fn)
<     return getc(fn)
< end function
< 
< global function getc(integer fn)
---
> public function getc(integer fn)
1138c1096
<         return eu_getc(fn)
---
>         return eu:getc(fn)
1150c1108
< global procedure sound(integer freq)
---
> public procedure sound(integer freq)
1154,1155c1112,1113
< global procedure use_vesa(integer i)
<     if platform() = DOS32 then
---
> public procedure use_vesa(integer i)
>     ifdef DOS32 then
1157,1158c1115,1116
<     end if
<     -- else do nothing
---
>     end ifdef
>     -- do nothing
diff -r dosrescue2/mouse_rescue.ew dosrescue2for4.0//mouse_rescue.ew
0a1,2
> include dos_rescue.ew
> public include std/math.e
diff -r dosrescue2/release-notes.txt dosrescue2for4.0//release-notes.txt
0a1,22
> Public interfaces implemented in 3.1's DOS version of graphics.e:
> 
> X - represents present in dosrescue.
> n - represents not yet implemented.
> 
> X global color names
> X global constant BLINKING = 16  -- add to color to get blinking text
> X global function graphics_mode(mode m)
> X global constant VC_COLOR = 1, and other VC constants
> X global function video_config()
> X global function get_position()
> X global function text_rows(positive_int rows)
> X global procedure wrap(boolean on)
> X global procedure scroll(...)
> X global procedure text_color(color c)
> X global procedure bk_color(color c)
> X global cursor styles
> X global procedure cursor(integer style)
> 
> Bugs:  Programs will die if you attempt to try to use a color depth mode other
> than 16-color.
> 
diff -r dosrescue2/sb.exw dosrescue2for4.0//sb.exw
9d8
< include machine.e
11c10
< -- use_vesa(1) -- for modes 256...261
---
> use_vesa(1) -- for modes 256...261
14c13
< -- constant GRAPHICS_MODE = 258 -- SVGA
---
> --constant GRAPHICS_MODE = 259 -- SVGA
diff -r dosrescue2/select.e dosrescue2for4.0//select.e
16,18c16
<     -- vc = dos_rescue:video_config()
<     vc = dos_rescue:video_config()
<     if vc[VC_COLOR] then
---
>     if not find(choice,nice_mono_modes) then
29c27
< 	    return 1    
---
> 	    return 1