--- a/JavaVM.st Mon Oct 05 14:31:54 1998 +0000
+++ b/JavaVM.st Wed Oct 14 16:19:19 1998 +0000
@@ -1629,8 +1629,8 @@
jStream instVarNamed:'fd' put:0
].
- "Modified: / 28.1.1998 / 02:15:24 / cg"
"Created: / 4.2.1998 / 15:22:03 / cg"
+ "Modified: / 14.10.1998 / 15:10:07 / cg"
!
anyStream_readBytes:nativeContext
@@ -4630,39 +4630,49 @@
|f stream fileNo|
NoAudio ifTrue:[
- ^ -1
- ].
-
- f := '/dev/audio' asFilename.
-"/ stream := f readWriteStream.
+ Transcript showCR:'JAVA: audio disabled'.
+ ^ -1
+ ].
+
Stream streamErrorSignal handle:[:ex |
- Stream streamErrorSignal handle:[:ex |
- stream := nil.
- ex return.
- ] do:[
- stream := SoundStream writing.
- ].
+ Stream streamErrorSignal handle:[:ex |
+ stream := nil.
+ ex return.
+ ] do:[
+ stream := SoundStream writing.
+ ].
] do:[
- stream := SoundStream writing.
+ stream := SoundStream writing.
+ stream notNil ifTrue:[
+ stream setSampleRate:8000.
+ ]
].
stream isNil ifTrue:[
- f exists ifTrue:[
- ^ 0
- ].
- ^ -1
- ].
-
- stream setSampleRate:8000.
+"/ ^ -1.
+
+ f := '/dev/audio' asFilename.
+ f exists ifFalse:[
+ Transcript showCR:'JAVA: neither SoundStream nor /dev/audio available'.
+ ^ -1
+ ].
+ stream := f readWriteStream.
+ stream isNil ifTrue:[
+ Transcript showCR:'JAVA: /dev/audio exists, but cannot be opened'.
+ ^ -1
+ ].
+ fileNo := self addOpenFile:stream.
+ ].
+
fileNo := self addOpenFile:stream.
FileOpenTrace ifTrue:[
- ('JAVA: opened audioDevice as FD ' , fileNo printString) infoPrintCR.
+ ('JAVA: opened audioDevice as FD ' , fileNo printString) infoPrintCR.
].
^ fileNo
"Created: / 10.1.1998 / 15:45:30 / cg"
- "Modified: / 14.1.1998 / 14:57:16 / cg"
+ "Modified: / 14.10.1998 / 15:20:52 / cg"
!
_AudioDevice_audioWrite:nativeContext
@@ -6844,15 +6854,14 @@
min := nativeContext argAt:3.
max := nativeContext argAt:4.
- (min ~~ 0
- or:[max ~~ 100]) ifTrue:[
+ (min ~~ 0 or:[max ~~ 100]) ifTrue:[
scrollBar thumb start:min stop:max.
].
scrollBar thumbOrigin:value thumbHeight:visibleAmount.
"Created: / 13.1.1998 / 22:13:57 / cg"
- "Modified: / 25.1.1998 / 11:51:14 / cg"
+ "Modified: / 14.10.1998 / 14:53:00 / cg"
!
_WScrollbarPeer_create:nativeContext
@@ -6873,6 +6882,17 @@
min := jScrollbar instVarNamed:'minimum'.
max := jScrollbar instVarNamed:'maximum'.
+ scrollBar scrollDownAction:[
+ scrollBar thumbOrigin:(scrollBar thumbOrigin + ((max-min)/10) min:max).
+ jScrollbarPeer perform:#'dragAbsolute(I)V' with:scrollBar thumbOrigin rounded.
+ ].
+ scrollBar scrollUpAction:[
+ scrollBar thumbOrigin:(scrollBar thumbOrigin - ((max-min)/10) max:min).
+ jScrollbarPeer perform:#'dragAbsolute(I)V' with:scrollBar thumbOrigin rounded.
+ ].
+ scrollBar scrollAction:[:org |
+ jScrollbarPeer perform:#'dragAbsolute(I)V' with:org rounded.
+ ].
self createdWindowsView:scrollBar for:jScrollbarPeer.
WindowCreationTrace == true ifTrue:[
@@ -6880,29 +6900,35 @@
].
"Created: / 5.1.1998 / 01:53:30 / cg"
- "Modified: / 9.4.1998 / 17:25:14 / cg"
+ "Modified: / 14.10.1998 / 15:36:19 / cg"
!
_WScrollbarPeer_setLineIncrement:nativeContext
|scrollBar inc|
+Transcript showCR:'JavaVM: WScrollbarPeer_setLineIncrement unimplemented'.
+
scrollBar := self viewForWPeer:nativeContext.
inc := nativeContext argAt:1.
"/ scrollBar thumb lineIncrement:inc.
"Created: / 25.1.1998 / 11:52:19 / cg"
+ "Modified: / 14.10.1998 / 14:53:56 / cg"
!
_WScrollbarPeer_setPageIncrement:nativeContext
|scrollBar inc|
+Transcript showCR:'JavaVM: WScrollbarPeer_setPageIncrement unimplemented'.
+
scrollBar := self viewForWPeer:nativeContext.
inc := nativeContext argAt:1.
"/ scrollBar thumb pageIncrement:inc.
"Created: / 25.1.1998 / 11:52:01 / cg"
+ "Modified: / 14.10.1998 / 14:54:04 / cg"
!
_WTextAreaPeer_create:nativeContext
@@ -7848,6 +7874,6 @@
!JavaVM class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.38 1998/10/05 14:31:54 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.39 1998/10/14 16:19:19 cg Exp $'
! !
JavaVM initialize!