Check-in [b5c83311ad]
Not logged in

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

Overview
Comment:Work on album viewer
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b5c83311adfc9c7c01de02cfc33e424408a96d18
User & Date: bernd 2019-12-02 23:31:19.176
Context
2019-12-03
23:01
Use presentation-support.fs check-in: 73766584da user: bernd tags: trunk
2019-12-02
23:31
Work on album viewer check-in: b5c83311ad user: bernd tags: trunk
22:24
Start album viewer check-in: a28a0f2c63 user: bernd tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to gui-night.fs.
34
35
36
37
38
39
40

41
42
43
44
45
46
47
$222222FF re-color posting-bg-col#
$FFFFBBFF re-text-color link-blue
$88FF88FF re-text-color re-green
$FF8888FF re-text-color obj-red
$444444FF re-color edit-bg
$408040FF re-color send-color
$333333FF re-color users-color#


8 0 [DO]
    imports#rgb-bg [I] sfloats + sf@ floor f>s to color,#
    $222222FF new-color, fdrop
[LOOP]
$FF0000FF
$FF6600FF







>







34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
$222222FF re-color posting-bg-col#
$FFFFBBFF re-text-color link-blue
$88FF88FF re-text-color re-green
$FF8888FF re-text-color obj-red
$444444FF re-color edit-bg
$408040FF re-color send-color
$333333FF re-color users-color#
$000000CC re-color album-bg-col#

8 0 [DO]
    imports#rgb-bg [I] sfloats + sf@ floor f>s to color,#
    $222222FF new-color, fdrop
[LOOP]
$FF0000FF
$FF6600FF
Changes to gui.fs.
212
213
214
215
216
217
218

219
220
221
222
223
224
225
$FFFFFFFF new-color, FValue login-bg-col#
$FF000000 $FF0000FF fade-color, FValue pw-err-col#
$000000FF dup text-emoji-color: black-emoji
$000000FF new-color, FValue otr-col#
$FFFFFFFF new-color, FValue chat-col#
$80FFFFFF new-color, FValue chat-bg-col#
$FFFFFFFF new-color, FValue posting-bg-col#


: entropy-colorize ( -- )
    prev-text$ erase  addr prev-text$ $free
    edit-w .text$ passphrase-entropy 1e fmin pw-bg-col# f+
    pw-back >o to w-color o> ;
: size-limit ( -- )
    edit-w .text$ nip #800 u> IF







>







212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
$FFFFFFFF new-color, FValue login-bg-col#
$FF000000 $FF0000FF fade-color, FValue pw-err-col#
$000000FF dup text-emoji-color: black-emoji
$000000FF new-color, FValue otr-col#
$FFFFFFFF new-color, FValue chat-col#
$80FFFFFF new-color, FValue chat-bg-col#
$FFFFFFFF new-color, FValue posting-bg-col#
$FFFFFFCC new-color, FValue album-bg-col#

: entropy-colorize ( -- )
    prev-text$ erase  addr prev-text$ $free
    edit-w .text$ passphrase-entropy 1e fmin pw-bg-col# f+
    pw-back >o to w-color o> ;
: size-limit ( -- )
    edit-w .text$ nip #800 u> IF
438
439
440
441
442
443
444



445
446
447
448
449
450
451
452
453
454
455
456
457

: read-avatar ( addr u -- addr' u' )
    ?read-enc-hashed mem>thumb atlas-region ;
Variable user-avatar#
Variable dummy-thumb#
Variable user.png$
Variable thumb.png$



: read-user.png ( -- )
    "net2o/doc/user.png" open-fpath-file throw 2drop
    dup >r user.png$ $slurp r> close-file throw ;
: read-thumb.png ( -- )
    "net2o/doc/thumb.png" open-fpath-file throw 2drop
    dup >r thumb.png$ $slurp r> close-file throw ;
: user-avatar ( -- addr )
    user-avatar# @ 0= IF
	read-user.png user.png$ $@ mem>thumb atlas-region
	user-avatar# $!
    THEN   user-avatar# $@ drop ;
: dummy-thumb ( -- addr )
    dummy-thumb# @ 0= IF







>
>
>

<
|

<
|







439
440
441
442
443
444
445
446
447
448
449

450
451

452
453
454
455
456
457
458
459

: read-avatar ( addr u -- addr' u' )
    ?read-enc-hashed mem>thumb atlas-region ;
Variable user-avatar#
Variable dummy-thumb#
Variable user.png$
Variable thumb.png$
: ]path ( addr u -- )
    open-fpath-file throw rot close-file throw ]] SLiteral [[
    ] ;
: read-user.png ( -- )

    [ "doc/user.png" ]path user.png$ $slurp-file ;
: read-thumb.png ( -- )

    [ "doc/thumb.png" ]path thumb.png$ $slurp-file ;
: user-avatar ( -- addr )
    user-avatar# @ 0= IF
	read-user.png user.png$ $@ mem>thumb atlas-region
	user-avatar# $!
    THEN   user-avatar# $@ drop ;
: dummy-thumb ( -- addr )
    dummy-thumb# @ 0= IF
1057
1058
1059
1060
1061
1062
1063

























1064
1065
1066
1067
1068
1069
1070
	128 128 glue*thumb dummy-thumb }}thumb >r
	r@ [n:h update-thumb ;] { w^ xt } xt cell hash key| fetch-finish# #!
	hash key| ?fetch
    THEN  {{ glue*ll }}glue r> }}v 40%bv box[] ;

hash: imgs# \ hash of tables of


























: .imgs ( -- )
    imgs# [: dup $. ." :" cr
	cell+ $@ bounds ?DO
	    I $@ over be-64@ .ticks space
	    1 64s /string 85type cr
	cell +LOOP ;] #map ;
: +imgs ( addr$ -- )







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
	128 128 glue*thumb dummy-thumb }}thumb >r
	r@ [n:h update-thumb ;] { w^ xt } xt cell hash key| fetch-finish# #!
	hash key| ?fetch
    THEN  {{ glue*ll }}glue r> }}v 40%bv box[] ;

hash: imgs# \ hash of tables of

: prev-img ;
: next-img ;

: /mid ( o -- o' )
    >r {{ glue*l }}glue r> /center glue*l }}glue }}v box[] >bl ;

{{
    glue*wh album-bg-col# slide-frame dup .button1
    {{
	tex: img0 ' img0 "doc/thumb.png" 0.666e }}image-file drop /mid
	tex: img1 ' img1 "doc/thumb.png" 0.666e }}image-file drop /mid /hflip
	tex: img2 ' img2 "doc/thumb.png" 0.666e }}image-file drop /mid /hflip
	tex: img3 ' img3 "doc/thumb.png" 0.666e }}image-file drop /mid /hflip
    }}h
    {{
	glue*ll }}glue
	{{  \large
	    "" }}text ' prev-img 0 click[]
	    glue*ll }}glue
	    "" }}text ' next-img 0 click[]
	}}h box[]
	glue*ll }}glue
    }}v box[]
}}z box[] Constant album-viewer

: .imgs ( -- )
    imgs# [: dup $. ." :" cr
	cell+ $@ bounds ?DO
	    I $@ over be-64@ .ticks space
	    1 64s /string 85type cr
	cell +LOOP ;] #map ;
: +imgs ( addr$ -- )