Check-in [378ea8426f]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More version depending stuff, color done right
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 378ea8426f6fc4f5be797aad09ec83d65417b3b3
User & Date: bernd 2014-07-01 22:58:21
Context
2014-07-01
23:49
Added gl-slideshow.fs link to gles2 directory check-in: 6785b2f715 user: bernd tags: trunk
22:58
More version depending stuff, color done right check-in: 378ea8426f user: bernd tags: trunk
19:14
Clipboard+color stuff check-in: 1929277a70 user: bernd tags: trunk
Changes

Changes to gl-terminal.fs.

125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

: >extra-colors-bg ( -- ) >bg
    err-color  $F0F and over or to err-color
    info-color $F0F and over or to info-color
    warn-color $F0F and over or to warn-color drop ;

: >white White std-bg! White err-bg! Black fg! Red err-fg!
    White >extra-colors-bg ;
: >black Black std-bg! Black err-bg! White fg! Red err-fg!
    Black >extra-colors-bg ;
>black \ make black default

128 Value videocols
0   Value videorows

2Variable gl-xy  0 0 gl-xy 2!
2Variable gl-wh 24 80 gl-wh 2!







|

|







125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

: >extra-colors-bg ( -- ) >bg
    err-color  $F0F and over or to err-color
    info-color $F0F and over or to info-color
    warn-color $F0F and over or to warn-color drop ;

: >white White std-bg! White err-bg! Black fg! Red err-fg!
    White >extra-colors-bg White >bg Black >fg or to default-color ;
: >black Black std-bg! Black err-bg! White fg! Red err-fg!
    Black >extra-colors-bg Black >bg White >fg or to default-color ;
>black \ make black default

128 Value videocols
0   Value videorows

2Variable gl-xy  0 0 gl-xy 2!
2Variable gl-wh 24 80 gl-wh 2!

Changes to gles2/android.fs.

311
312
313
314
315
316
317

318
319
320
321
322
323
324
...
330
331
332
333
334
335
336

337
338
339
340
341
342
343
344
    >o  app window off  gref> ;
: android-global-layout ( 0 -- ) drop config-changed ;
: android-log# ( n -- ) ." log: " . cr ;
: android-log$ ( string -- )  jstring>sstring ." log: " type cr jfree ;
Defer android-w! ( n -- ) ' drop is recurse
Defer android-h! ( n -- ) ' drop is recurse
Defer clipboard! ( 0 -- ) ' drop is recurse


Create aevents
' android-key ,
' android-touch ,
' android-location ,
' android-sensor ,
' android-surface-created ,
................................................................................
' android-log# ,
' android-log$ ,
' android-commit ,
' android-setstring ,
' android-w! ,
' android-h! ,
' clipboard! , \ primary clipboard changed

here aevents - cell/
' drop ,
Constant max-event#

:noname ( event type -- )
    max-event# umin cells aevents + perform ; is akey

previous previous set-current







>







 







>








311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
...
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
    >o  app window off  gref> ;
: android-global-layout ( 0 -- ) drop config-changed ;
: android-log# ( n -- ) ." log: " . cr ;
: android-log$ ( string -- )  jstring>sstring ." log: " type cr jfree ;
Defer android-w! ( n -- ) ' drop is recurse
Defer android-h! ( n -- ) ' drop is recurse
Defer clipboard! ( 0 -- ) ' drop is recurse
: android-config! ( n -- ) to screen-orientation config-changed ;

Create aevents
' android-key ,
' android-touch ,
' android-location ,
' android-sensor ,
' android-surface-created ,
................................................................................
' android-log# ,
' android-log$ ,
' android-commit ,
' android-setstring ,
' android-w! ,
' android-h! ,
' clipboard! , \ primary clipboard changed
' android-config! ,
here aevents - cell/
' drop ,
Constant max-event#

:noname ( event type -- )
    max-event# umin cells aevents + perform ; is akey

previous previous set-current

Changes to gles2/gl-terminal.fs.

125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

: >extra-colors-bg ( -- ) >bg
    err-color  $F0F and over or to err-color
    info-color $F0F and over or to info-color
    warn-color $F0F and over or to warn-color drop ;

: >white White std-bg! White err-bg! Black fg! Red err-fg!
    White >extra-colors-bg ;
: >black Black std-bg! Black err-bg! White fg! Red err-fg!
    Black >extra-colors-bg ;
>black \ make black default

128 Value videocols
0   Value videorows

2Variable gl-xy  0 0 gl-xy 2!
2Variable gl-wh 24 80 gl-wh 2!







|

|







125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

: >extra-colors-bg ( -- ) >bg
    err-color  $F0F and over or to err-color
    info-color $F0F and over or to info-color
    warn-color $F0F and over or to warn-color drop ;

: >white White std-bg! White err-bg! Black fg! Red err-fg!
    White >extra-colors-bg White >bg Black >fg or to default-color ;
: >black Black std-bg! Black err-bg! White fg! Red err-fg!
    Black >extra-colors-bg Black >bg White >fg or to default-color ;
>black \ make black default

128 Value videocols
0   Value videorows

2Variable gl-xy  0 0 gl-xy 2!
2Variable gl-wh 24 80 gl-wh 2!

Changes to gles2/jni-media.fs.

100
101
102
103
104
105
106

107
108
109
110
111
112
113
...
140
141
142
143
144
145
146

147
148
149
150
151
152
153
jni-static: cp-get(id) get (II)Landroid/media/CamcorderProfile;

jni-class: android/hardware/Camera$Size

jni-field: height height I
jni-field: width width I


jni-class: android/media/MediaCodec

jni-static: createByCodecName createByCodecName (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createDecoderByType createDecoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createEncoderByType createEncoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;

jni-method: configure configure (Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V
................................................................................

jni-class: android/media/MediaFormat

jni-static: createAudioFormat createAudioFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;
\ jni-static: createSubtitleFormat createSubtitleFormat (Ljava/lang/String;Ljava/lang/String;)Landroid/media/MediaFormat;
\ only API 19
jni-static: createVideoFormat createVideoFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;


JValue media-sft

previous

: create-sft ( -- )
    media-tex current-tex new-SurfaceTexture to media-sft ;







>







 







>







100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
...
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
jni-static: cp-get(id) get (II)Landroid/media/CamcorderProfile;

jni-class: android/hardware/Camera$Size

jni-field: height height I
jni-field: width width I

SDK_INT 16 u>= [IF]
jni-class: android/media/MediaCodec

jni-static: createByCodecName createByCodecName (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createDecoderByType createDecoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createEncoderByType createEncoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;

jni-method: configure configure (Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V
................................................................................

jni-class: android/media/MediaFormat

jni-static: createAudioFormat createAudioFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;
\ jni-static: createSubtitleFormat createSubtitleFormat (Ljava/lang/String;Ljava/lang/String;)Landroid/media/MediaFormat;
\ only API 19
jni-static: createVideoFormat createVideoFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;
[THEN]

JValue media-sft

previous

: create-sft ( -- )
    media-tex current-tex new-SurfaceTexture to media-sft ;

Changes to jni-media.fs.

100
101
102
103
104
105
106

107
108
109
110
111
112
113
...
140
141
142
143
144
145
146

147
148
149
150
151
152
153
jni-static: cp-get(id) get (II)Landroid/media/CamcorderProfile;

jni-class: android/hardware/Camera$Size

jni-field: height height I
jni-field: width width I


jni-class: android/media/MediaCodec

jni-static: createByCodecName createByCodecName (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createDecoderByType createDecoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createEncoderByType createEncoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;

jni-method: configure configure (Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V
................................................................................

jni-class: android/media/MediaFormat

jni-static: createAudioFormat createAudioFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;
\ jni-static: createSubtitleFormat createSubtitleFormat (Ljava/lang/String;Ljava/lang/String;)Landroid/media/MediaFormat;
\ only API 19
jni-static: createVideoFormat createVideoFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;


JValue media-sft

previous

: create-sft ( -- )
    media-tex current-tex new-SurfaceTexture to media-sft ;







>







 







>







100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
...
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
jni-static: cp-get(id) get (II)Landroid/media/CamcorderProfile;

jni-class: android/hardware/Camera$Size

jni-field: height height I
jni-field: width width I

SDK_INT 16 u>= [IF]
jni-class: android/media/MediaCodec

jni-static: createByCodecName createByCodecName (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createDecoderByType createDecoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;
jni-static: createEncoderByType createEncoderByType (Ljava/lang/String;)Landroid/media/MediaCodec;

jni-method: configure configure (Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V
................................................................................

jni-class: android/media/MediaFormat

jni-static: createAudioFormat createAudioFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;
\ jni-static: createSubtitleFormat createSubtitleFormat (Ljava/lang/String;Ljava/lang/String;)Landroid/media/MediaFormat;
\ only API 19
jni-static: createVideoFormat createVideoFormat (Ljava/lang/String;II)Landroid/media/MediaFormat;
[THEN]

JValue media-sft

previous

: create-sft ( -- )
    media-tex current-tex new-SurfaceTexture to media-sft ;