Check-in [da769b84bb]
Not logged in

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

Overview
Comment:Bump version number
Timelines: family | ancestors | descendants | both | trunk | 0.8.3-20181115
Files: files | file ages | folders
SHA1: da769b84bbd984b361c327dd04e24a39b317b676
User & Date: bernd 2018-11-15 11:55:23
Context
2018-11-15
23:25
Notification+Otrify problems fixed (Otrify only partly) check-in: 9de6150452 user: bernd tags: trunk
11:55
Bump version number check-in: da769b84bb user: bernd tags: trunk, 0.8.3-20181115
2018-11-07
22:11
Bump version number check-in: ccdccc9a2f user: bernd tags: trunk, 0.8.3-20181107
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to classes.fs.

   145    145       method id
   146    146       method action
   147    147       method coord
   148    148       method otrify
   149    149       method payment
   150    150       method url
   151    151       method like
          152  +    method away
   152    153       method end
   153    154       method display   \ display one message
   154    155       method redisplay \ display full set
   155    156   }class
   156    157   
   157    158   cmd-class class{ pay
   158    159       field: sources[]    \ all the sources stored here, an array
................................................................................
   526    527        (("net2o:" "+net2o:") definition-starter (font-lock-keyword-face . 1)
   527    528         "[ \t\n]" t name (font-lock-function-name-face . 3))
   528    529        (("64value:")
   529    530          non-immediate (font-lock-type-face . 2)
   530    531          "[ \t\n]" t name (font-lock-variable-name-face . 3))
   531    532        ("[a-z0-9]+(" immediate (font-lock-comment-face . 1)
   532    533         ")" nil comment (font-lock-comment-face . 1))
          534  +     (("class{") definition-starter (font-lock-keyword-face . 1)
          535  +      "[ \t\n]" t name (font-lock-function-name-face . 3))
          536  +     (("}class") definition-ender (font-lock-keyword-face . 1))
   533    537       )
   534    538   forth-local-indent-words:
   535    539       (
   536    540        (("net2o:" "+net2o:") (0 . 2) (0 . 2) non-immediate)
          541  +     (("class{") (0 . 2) (0 . 2))
          542  +     (("}class") (-2 . 0) (0 . -2))
   537    543       )
   538    544   End:
   539    545   [THEN]

Changes to configure.ac.

    11     11   # but WITHOUT ANY WARRANTY; without even the implied warranty of
    12     12   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    13     13   # GNU Affero General Public License for more details.
    14     14   
    15     15   # You should have received a copy of the GNU Affero General Public License
    16     16   # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    17     17   
    18         -AC_INIT([net2o], [0.8.3-20181107], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist])
           18  +AC_INIT([net2o], [0.8.3-20181115], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist])
    19     19   AC_PREREQ([2.59])
    20     20   AC_CONFIG_MACRO_DIR([m4])
    21     21   AC_USE_SYSTEM_EXTENSIONS
    22     22   LT_INIT
    23     23   
    24     24   AC_MSG_CHECKING([for gforth])
    25     25   

Changes to do.

     1      1   #!/bin/bash
     2      2   
     3      3   echo "This script builds net2o from scratch"
     4      4   
     5         -GFORTH=gforth-0.7.9_20181107
            5  +GFORTH=gforth-0.7.9_20181115
     6      6   
     7      7   if [ "$(uname -o)" = "Cygwin" ]
     8      8   then
     9      9       CONFOPT="--prefix=/usr $*"
    10     10   else
    11     11       CONFOPT="$*"
    12     12   fi

Changes to doc/ef2018-presentation.fs.

    73     73       over slide# !
    74     74       slides[] $[] @ /flip drop
    75     75       slides[] $[] @ /flop drop glue0 ;
    76     76   : fade-img ( r0..1 img1 img2 -- ) >r >r
    77     77       $FF fm* f>s $FFFFFF00 or dup
    78     78       r> >o to frame-color parent-w .parent-w /flop drop o> invert $FFFFFF00 or
    79     79       r> >o to frame-color parent-w .parent-w /flop drop o> ;
    80         -: fade!slides ( r0..1 n -- )
           80  +: fade!slides ( r0..1 n -- r0..1 n )
    81     81       dup m/$-switch = IF
    82     82   	fdup $q-img m2-img fade-img
    83     83       THEN
    84     84       dup n/m-switch = IF
    85     85   	fdup m2-img n2-img fade-img
    86     86       THEN ;
    87     87   : anim!slides ( r0..1 n -- )

Changes to gui.fs.

   116    116       anims@ 0 ?DO
   117    117   	>o action-of animate ['] err-fade = flag or to flag
   118    118   	o anims[] >stack o>
   119    119       LOOP  flag ;
   120    120   
   121    121   forward show-nicks
   122    122   forward gui-msgs
          123  +0 Value title-vp
   123    124   
   124    125   : pw-done ( max span addr pos -- max span addr pos flag )
   125    126       err-fade? IF  false  EXIT  THEN
   126    127       over 3 pick >passphrase +key
   127    128       read-keys secret-keys# 0= IF
   128    129   	\ ." Wrong passphrase" cr
   129    130   	1 tries# +! tries# @ 0 <# #s #> pw-num >o to text$ o>
................................................................................
   164    165       $cc6600FF Value pw-text-col#
   165    166       $00FF0020 Value chbs-col#
   166    167       $000020FF Value login-bg-col#
   167    168       $FFFFFFFF Value show-sign-color#
   168    169   [THEN]
   169    170   
   170    171   glue new Constant glue*lll±
   171         -glue*lll± >o 1Mglue hglue-c glue! 0glue fnip 1filll fswap dglue-c glue! 1glue vglue-c glue! o>
          172  +glue*lll± >o 1Mglue fnip 1000e fswap hglue-c glue! 0glue fnip 1filll fswap dglue-c glue! 1glue vglue-c glue! o>
   172    173   
   173    174   glue new Constant glue*shrink
   174    175   glue*shrink >o 0e 1filll 0e hglue-c glue! 1glue dglue-c glue! 1glue vglue-c glue! o>
   175    176   
   176    177   {{ login-bg-col# pres-frame dark-blue# ' dark-blue >body !
   177    178       {{
   178    179   	glue*lll± }}glue
................................................................................
   356    357       cell +LOOP ;
   357    358   
   358    359   : }}button-lit { d: text color -- o }
   359    360       {{
   360    361           glue*l color font-size# 40% f* }}frame dup .button2
   361    362           text }}text 25%b /center
   362    363       }}z box[] ;
          364  +
          365  +also [ifdef] android android [then]
          366  +
          367  +tex: vp-title
   363    368   
   364    369   : nicks-title ( -- )
   365    370       {{ glue*l $000000FF slide-frame dup .button1
   366    371   	{{
   367         -	    {{ \large \bold \sans whitish
   368         -	    l" Nick+Pet" }}i18n-text 25%b glue*l }}glue }}h name-tab
   369    372   	    {{
   370         -		{{ \script \mono \bold l" Pubkey"   }}i18n-text 20%bt glue*l }}glue }}h
   371         -		{{ \script \sans \bold l" Key date" }}i18n-text glue*l }}glue }}h
   372         -	    }}v pk-tab
   373         -	    glue*lll }}glue
          373  +		{{
          374  +		    {{ \large \bold \sans whitish
          375  +		    l" Nick+Pet" }}i18n-text 25%b glue*l }}glue }}h name-tab
          376  +		    {{
          377  +			{{ \script \mono \bold l" Pubkey"   }}i18n-text 20%bt glue*l }}glue }}h
          378  +			{{ \script \sans \bold l" Key date" }}i18n-text glue*l }}glue }}h
          379  +		    }}v pk-tab
          380  +		    glue*lll± }}glue
          381  +		}}h box[]
          382  +	    vp-title glue*lll ['] vp-title }}vp vp[] dup to title-vp
   374    383   	    \large s" ❌" $444444FF }}button-lit [: -1 data +! ;] level# click[]
   375    384   	}}h box[]
   376    385       }}z box[] ;
          386  +
          387  +previous
   377    388   
   378    389   {{ $FFFF80FF pres-frame
   379    390       {{
   380    391   	{{
   381    392   	    nicks-title
   382    393   	    glue*shrink }}glue
   383    394   	}}h box[]
................................................................................
   399    410   	    font-size# 33% f* to slider-border
   400    411   	dup font-size# 66% f* fdup vslider }}h box[]
   401    412       }}v box[]
   402    413   }}z box[] to id-frame
   403    414   
   404    415   : show-nicks ( -- )
   405    416       fill-nicks fill-groups next-slide
   406         -    0.01e peers-box [: .vp-top fdrop ;] >animate ;
          417  +    0.01e peers-box [: .vp-top fdrop title-vp .vp-top ;] >animate ;
   407    418   
   408    419   \ messages
   409    420   
   410    421   msg-class class
   411    422   end-class wmsg-class
   412    423   
   413    424   $88FF88FF Value my-signal#
................................................................................
   696    707       n2o-frame to top-widget
   697    708       "PASSPHRASE" getenv 2dup d0= IF  2drop
   698    709       ELSE
   699    710   	>passphrase +key  read-keys
   700    711   	"PASSPHRASE" getenv erase \ erase passphrase after use!
   701    712       THEN
   702    713       secret-keys# IF  show-nicks  THEN
   703         -    1config  !widgets  widgets-loop ;
          714  +    1config  !widgets
          715  +    get-order n>r ['] /chat >body 1 set-order
          716  +    ['] widgets-loop catch
          717  +    nr> set-order throw ;
   704    718   
   705    719   ' net2o-gui is run-gui
   706    720   
   707    721   previous
   708    722   
   709    723   \ localization
   710    724   

Changes to msg.fs.

   405    405   :noname ( addr u -- ) "#" notify+ $utf8> notify+
   406    406   ; msg-notify-class is msg:tag
   407    407   :noname ( addr u -- )
   408    408       2dup [: ." @" .simple-id ;] $tmp notify+ ; msg-notify-class is msg:signal
   409    409   :noname ( addr u -- ) $utf8> notify+ ; msg-notify-class is msg:text
   410    410   :noname ( addr u -- ) $utf8> notify+ ; msg-notify-class is msg:url
   411    411   :noname ( addr u -- ) $utf8> notify+ ; msg-notify-class is msg:action
   412         -:noname ( xchar -- ) drop ; msg-notify-class is msg:like
          412  +' drop  msg-notify-class is msg:like
          413  +' drop  msg-notify-class is msg:away
   413    414   ' 2drop msg-notify-class is msg:coord
   414    415   :noname 2drop 2drop ; msg-notify-class is msg:otrify
   415    416   :noname ( -- ) msg-notify ; msg-notify-class is msg:end
   416    417   
   417    418   :noname ( addr u -- )
   418    419       last# >r  2dup key| to msg:id$
   419    420       .log-num
................................................................................
   438    439   :noname ( addr u -- )
   439    440       space <warn> ." [" 85type ." ]:" <default> ; msg-class is msg:id
   440    441   :noname ( addr u -- ) $utf8> forth:type ; msg-class is msg:text
   441    442   :noname ( addr u -- ) $utf8>
   442    443       <warn> forth:type <default> ; msg-class is msg:url
   443    444   :noname ( xchar -- )
   444    445       <info> utf8emit <default> ; msg-class is msg:like
          446  +' drop msg-class is msg:away
   445    447   :noname ( addr u type -- )
   446    448       space <warn> 0 .r ." :[" 85type ." ]" <default> ;
   447    449   msg-class is msg:object
   448    450   :noname ( addr u -- ) $utf8>
   449    451       <warn> forth:type <default> ; msg-class is msg:action
   450    452   :noname ( addr u -- )
   451    453       <warn> ."  GPS: " .coords <default> ; msg-class is msg:coord
................................................................................
  1196   1198   	1 of ." itc-" endof
  1197   1199   	2 of ." ditc-" endof
  1198   1200       endcase
  1199   1201       version-string forth:type '-' forth:emit
  1200   1202       machine forth:type ;
  1201   1203   
  1202   1204   forward avalanche-text
         1205  +
         1206  +false value away?
  1203   1207   
  1204   1208   also net2o-base scope: /chat
  1205   1209   
  1206   1210   : /me ( addr u -- )
  1207   1211       \U me <action>          send string as action
  1208   1212       \G me: send remaining string as action
  1209   1213       [: $, msg-action ;] send-avalanche ;
  1210   1214   
         1215  +: /away ( addr u -- )
         1216  +    \U away [<action>]      send string or "away from keyboard" as action
         1217  +    \G away: send string or "away from keyboard" as action
         1218  +    dup 0= IF  2drop
         1219  +	away? IF  "I'm back"  ELSE  "Away from keyboard"  THEN
         1220  +	away? 0= to away?
         1221  +    THEN
         1222  +    [: $, msg-action ;] send-avalanche ;
         1223  +
  1211   1224   : /otr ( addr u -- )
  1212   1225       \U otr on|off|message   turn otr mode on/off (or one-shot)
  1213   1226       2dup s" on" str= >r
  1214   1227       2dup s" off" str= r@ or IF   2drop r> otr-mode !
  1215   1228   	<info> ." === " otr-mode @ IF  ." enter"  ELSE  ." leave"  THEN
  1216   1229   	."  otr mode ===" <default> forth:cr
  1217   1230       ELSE  rdrop

Changes to wiki/commands.md.

     1      1   # Commands #
     2      2   
     3         -Version 0.8.3-20181107.
            3  +Version 0.8.3-20181115.
     4      4   
     5      5   net2o separates data and commands.  Data is passed through to higher
     6      6   layers, commands are interpreted when they arrive.  For connection
     7      7   requests, a special bit is set, and the address then isn't used as
     8      8   address, but as IV for the opportunistic encoding.
     9      9   
    10     10   The command interpreter is a stack machine with two data types: 64