Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
net2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Bernd Paysan
net2o
Commits
509a1bf4
Verified
Commit
509a1bf4
authored
Oct 01, 2018
by
Bernd Paysan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix chat groups problem in GUI
parent
f2d52304
Pipeline
#269
canceled with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
11 deletions
+16
-11
gui.fs
gui.fs
+6
-3
keys.fs
keys.fs
+9
-7
n2o.fs
n2o.fs
+1
-1
No files found.
gui.fs
View file @
509a1bf4
...
...
@@ -311,7 +311,7 @@ $00FFFFFF ,
:
gui
-
chat
-
connects
(
--
)
[:
up
@
wait
-
task
!
;]
IS
do
-
connect
[:
chat
-
keys
[:
key
>
group
[:
chat
-
keys
[:
key
|
\
key
>
group
2
dup
search
-
connect
?
dup
-
IF
>
o
+
group
greet
o
>
2
drop
EXIT
THEN
2
dup
pk
-
peek
?
IF
chat
-
connect
true
!!
connected
!!
ELSE
2
drop
THEN
;]
$[]
map
;]
catch
...
...
@@ -552,7 +552,7 @@ wmsg-o >o msg-table @ token-table ! o>
#
128
Value
gui
-
msgs
#
\
display
last
128
messages
0
Value
chat
-
edit
\
chat
edit
field
:
gui
-
msgs
(
gaddr
u
--
)
:
(
gui
-
msgs
)
(
gaddr
u
--
)
reset
-
time
msgs
-
box
.
dispose
-
childs
glue
*
lll
}}
glue
msgs
-
box
.
child
+
...
...
@@ -566,9 +566,12 @@ wmsg-o >o msg-table @ token-table ! o>
log
free
throw
msgs
-
box
>
o
resized
vp
-
bottom
o
>
chat
-
edit
engage
;
:
gui
-
msgs
(
gaddr
u
--
)
2
dup
msg
-
group
$
$!
(
gui
-
msgs
)
;
:
msg
-
wredisplay
(
n
--
)
drop
0
otr
-
mode
[:
last
#
$@
gui
-
msgs
;]
!
wrapper
[:
msg
-
group
$
$@
(
gui
-
msgs
)
;]
!
wrapper
msgs
-
box
>
o
[:
+
sync
+
config
+
resize
;]
vp
-
needed
vp
-
bottom
+
sync
+
config
o
>
;
'
msg
-
wredisplay
wmsg
-
class
is
msg
:
redisplay
...
...
keys.fs
View file @
509a1bf4
...
...
@@ -179,8 +179,8 @@ Variable sim-nick!
:
#
split
(
addr
u
--
addr
u
n
)
[:
2
dup
'
#
'
-
scan
nip
>
r
r
@
0
=
IF
rdrop
0
EXIT
THEN
#
0
.
2
over
r
@
/
string
>
number
0
=
IF
nip
drop
nip
r
>
1
-
swap
ELSE
#
0
.
2
over
r
@
1
+
/
string
>
number
0
=
IF
nip
drop
nip
r
>
swap
ELSE
rdrop
drop
2
drop
0
THEN
;]
#
10
base
-
execute
;
:
nick
-
key
(
addr
u
--
o
/
0
)
\
search
for
key
nickname
...
...
@@ -436,14 +436,14 @@ Variable secret-nicks#
:
.
keys
(
--
)
key
#
[:
.
" index: "
dup
$@
85
type
cr
cell
+
$@
.
key
;]
#
map
;
:
dumpkeys
(
--
)
key
#
[:
cell
+
$@
dumpkey
;]
#
map
;
:
key
>
o
(
addrkey
u1
--
o
/
0
)
key
|
key
#
#@
0
=
IF
drop
0
EXIT
THEN
cell
+
;
:
key
>
nick
(
addrkey
u1
--
nick
u2
)
\
G
convert
key
to
nick
key
|
key
#
#@
0
=
IF
drop
#
0
.
EXIT
THEN
cell
+
.
ke
-
nick
$@
;
key
>
o
dup
IF
.
ke
-
nick
$@
ELSE
0
THEN
;
:
key
>
key
(
addrkey
u1
--
key
u2
)
\
G
expand
key
to
full
size
and
check
if
we
know
it
key
|
key
#
#@
0
=
IF
drop
#
0
.
EXIT
THEN
cell
+
.
ke
-
pk
$@
;
key
>
o
dup
IF
.
ke
-
pk
$@
ELSE
0
THEN
;
:
.
key
#
(
addr
u
--
)
key
|
.
" Key '"
key
#
#@
0
=
IF
drop
EXIT
THEN
...
...
@@ -468,7 +468,9 @@ event: :>search-key ( $addr -- )
:
.
con
-
id
(
o
:
connection
--
)
pubkey
$@
.
key
-
id
;
:
.
simple
-
id
(
addr
u
--
)
last
#
>
r
key
>
nick
type
r
>
to
last
#
;
:
.
simple
-
id
(
addr
u
--
)
last
#
>
r
key
>
o
dup
IF
..
nick
-
base
ELSE
drop
.
" unknown"
THEN
r
>
to
last
#
;
:
check
-
key
(
addr
u
--
)
o
IF
pubkey
@
IF
...
...
n2o.fs
View file @
509a1bf4
...
...
@@ -515,7 +515,7 @@ warnings !
over c@ '+' = IF 2drop ?nextarg drop
s>unumber? drop d>64 to groups:perms#
THEN
save-chatgroups ;
save-chatgroups
.chatgroups
;
: chatgroups ( -- )
\
U chatgroups
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment