MetzNet
/
pnyx
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making client GUI with fake data

live
noah metz 2024-04-24 19:09:17 -06:00
parent 15a24c7d05
commit 108bc44411
3 changed files with 307 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
cmd/client/main.go
Unescape Escape View File

@ -33,7 +33,7 @@ func set_sample_rate(audio_data chan []int16, new_sample_rate int) error {
return err
}
for peer_id, decoder_chan := range(decoders) {
for peer_id, decoder_chan := range decoders {
if decoder_chan != nil {
decoder_chan <- nil
}
@ -92,7 +92,7 @@ func mixer(data_chan chan []int16, speaker_chan chan []int16) {
} else {
select {
case new_samples := <-data_chan:
for i, sample := range(new_samples) {
for i, sample := range new_samples {
samples[i] += sample
}
case speaker_chan <- samples:
@ -278,7 +278,7 @@ func print_decoration(window, title, channels, body ncurses.Window, top_left str
ncurses.WResize(window, max_y, max_x)
ncurses.WResize(title, 1, max_x/4-2)
ncurses.MvWin(title, 1, 1)
ncurses.WResize(channels, max_y - 4, (max_x / 4) - 2)
ncurses.WResize(channels, max_y-4, (max_x/4)-1)
ncurses.MvWin(channels, 3, 1)
ncurses.WResize(body, max_y-2, max_x-(max_x/4)-2)
ncurses.MvWin(body, 1, (max_x/4)+1)
@ -324,12 +324,231 @@ func print_decoration(window, title, channels, body ncurses.Window, top_left str
ncurses.WRefresh(body)
}
type ChannelState struct {
ID pnyx.ChannelID
Name string
Members []pnyx.PeerID
Modes []pnyx.ModeID
}
type PeerState struct {
Name string
}
type UIState struct {
SelectedBody int
SelectedPeer int
SelectedChannel int
SelectedArea int
Channels []ChannelState
Peers map[pnyx.PeerID]PeerState
}
const (
AREA_CHANNELS = 0
AREA_BODY = 1
BODY_CHANNEL = 0
BODY_DETAIL = 1
BODY_QUIT = 2
)
func handle_back(state *UIState) {
if state.SelectedArea == AREA_BODY {
if state.SelectedBody == BODY_QUIT {
state.SelectedBody = BODY_CHANNEL
} else if state.SelectedBody == BODY_DETAIL {
state.SelectedBody = BODY_CHANNEL
}
state.SelectedArea = AREA_CHANNELS
}
}
func handle_up(state *UIState) {
if state.SelectedArea == AREA_CHANNELS {
if state.SelectedPeer > 0 {
state.SelectedPeer -= 1
} else if state.SelectedChannel > 0 {
state.SelectedChannel -= 1
state.SelectedPeer = len(state.Channels[state.SelectedChannel].Members)
}
}
}
func handle_down(state *UIState) {
if state.SelectedArea == AREA_CHANNELS {
if state.SelectedPeer < len(state.Channels[state.SelectedChannel].Members) {
state.SelectedPeer += 1
} else if state.SelectedChannel < len(state.Channels) - 1 {
state.SelectedChannel += 1
state.SelectedPeer = 0
}
}
}
func handle_select(state *UIState) {
if state.SelectedArea == AREA_CHANNELS {
state.SelectedArea = AREA_BODY
state.SelectedBody = BODY_CHANNEL
}
}
func handle_edit(state *UIState) {
if state.SelectedArea == AREA_CHANNELS {
state.SelectedArea = AREA_BODY
state.SelectedBody = BODY_DETAIL
}
}
func handle_quit(state *UIState) {
state.SelectedArea = AREA_BODY
state.SelectedBody = BODY_QUIT
}
func handle_input(state *UIState, char []byte) {
switch char[0] {
case 'q':
handle_quit(state)
case 'e':
handle_edit(state)
case '\r':
handle_select(state)
case 0x1B:
if len(char) == 1 {
handle_back(state)
} else {
switch char[1] {
case '[':
if len(char) == 2 {
} else {
switch char[2] {
case 'A': // Up
handle_up(state)
case 'B': // Down
handle_down(state)
case 'C': // Right
handle_select(state)
case 'D': // Left
handle_back(state)
}
}
}
}
}
}
func draw_channels(state *UIState, channels ncurses.Window) {
channel_highlight_color := 2
if state.SelectedArea == AREA_CHANNELS {
channel_highlight_color = 1
}
ncurses.WErase(channels)
ncurses.WMove(channels, 0, 0)
for i, channel_state := range(state.Channels) {
if i == state.SelectedChannel && state.SelectedPeer == 0 {
ncurses.WAttrOn(channels, ncurses.COLOR_PAIR(channel_highlight_color))
}
ncurses.WAddStr(channels, channel_state.Name)
ncurses.WAddCh(channels, '\n')
for j, peer_id := range(channel_state.Members) {
ncurses.WAddStr(channels, " ↳")
peer_state, found := state.Peers[peer_id]
if state.SelectedChannel == i && state.SelectedPeer == (j+1) {
ncurses.WAttrOn(channels, ncurses.COLOR_PAIR(channel_highlight_color))
}
if found {
ncurses.WAddStr(channels, peer_state.Name)
} else {
ncurses.WAddStr(channels, fmt.Sprintf("%s", peer_id))
}
if state.SelectedChannel == i && state.SelectedPeer == (j+1) {
ncurses.WAttrOff(channels, ncurses.COLOR_PAIR(channel_highlight_color))
}
ncurses.WAddCh(channels, '\n')
}
if i == state.SelectedChannel && state.SelectedPeer == 0 {
ncurses.WAttrOff(channels, ncurses.COLOR_PAIR(channel_highlight_color))
}
}
ncurses.WRefresh(channels)
}
func draw_body_channel(state *UIState, body ncurses.Window) {
ncurses.WErase(body)
ncurses.MvWAddStr(body, 0, 0, "channel")
ncurses.WRefresh(body)
}
func draw_body_detail(state *UIState, body ncurses.Window) {
ncurses.WErase(body)
ncurses.MvWAddStr(body, 0, 0, "detail")
ncurses.WRefresh(body)
}
func draw_body_quit(state *UIState, body ncurses.Window) {
ncurses.WErase(body)
ncurses.MvWAddStr(body, 0, 0, "quit")
ncurses.WRefresh(body)
}
func draw_gui(state *UIState, channels, body ncurses.Window) {
draw_channels(state, channels)
switch state.SelectedBody {
case BODY_CHANNEL:
draw_body_channel(state, body)
case BODY_DETAIL:
draw_body_detail(state, body)
case BODY_QUIT:
draw_body_quit(state, body)
}
}
func main_loop(client *pnyx.Client, audio_data chan []int16, window ncurses.Window, packet_chan chan pnyx.Payload, user_chan chan []byte, sigwinch_channel chan os.Signal) {
channels := ncurses.NewWin(0, 0, 0, 0)
body := ncurses.NewWin(0, 0, 0, 0)
title := ncurses.NewWin(0, 0, 0, 0)
state := &UIState{
Peers: map[pnyx.PeerID]PeerState{
[32]byte{}: {
Name: "Test User 0",
},
[32]byte{0x01}: {
Name: "Test User 1",
},
[32]byte{0x02}: {
Name: "Test User 2",
},
},
Channels: []ChannelState{
{
ID: 0,
Name: "Channel 0",
Members: []pnyx.PeerID{[32]byte{}, [32]byte{0x01}},
},
{
ID: 1,
Name: "Channel 1",
Members: []pnyx.PeerID{[32]byte{0x02}},
},
},
}
ncurses.InitColor(1, 1000, 1000, 1000)
ncurses.InitColor(2, 300, 300, 300)
ncurses.InitColor(3, 150, 150, 150)
ncurses.InitColor(4, 150, 150, 300)
ncurses.InitPair(1, 1, 2)
ncurses.InitPair(2, 1, 3)
ncurses.InitPair(3, 1, 4)
ncurses.ScrollOk(body, true)
print_decoration(window, title, channels, body, client.Remote())
draw_gui(state, channels, body)
for client.Active() {
select {
@ -338,6 +557,7 @@ func main_loop(client *pnyx.Client, audio_data chan []int16, window ncurses.Wind
ncurses.WRefresh(window)
ncurses.WClear(window)
print_decoration(window, title, channels, body, client.Remote())
draw_gui(state, channels, body)
case packet := <-packet_chan:
switch packet := packet.(type) {
case pnyx.ChannelCommandPacket:
@ -379,8 +599,8 @@ func main_loop(client *pnyx.Client, audio_data chan []int16, window ncurses.Wind
}
}
case char := <-user_chan:
ncurses.WAddStr(body, string(char))
ncurses.WRefresh(body)
handle_input(state, char)
draw_gui(state, channels, body)
}
}
}
@ -415,7 +635,6 @@ func main() {
defer inDevice.Uninit()
defer inDevice.Stop()
user_chan := make(chan []byte, 1024)
packet_chan := make(chan pnyx.Payload, 1024)
@ -446,11 +665,11 @@ func main() {
go process_mic(client, mic)
locale := ncurses.SetLocale(0, "")
fmt.Printf("locale: %s\n", locale)
ncurses.SetLocale(0, "")
user_chan, stdin_active := ncurses.UTF8Listener(100, os.Stdin)
window := ncurses.InitScr()
ncurses.CursSet(0)
ret := ncurses.StartColor()
if ret != 0 {
panic(ret)

2
go-ncurses

@ -1 +1 @@
Subproject commit 6b121ac061f1182cf5adf8d540cf3d5d6aae8c0b
Subproject commit 14b1c310e749554c5e290108e50190cbe71b2d23

16
server.go
Unescape Escape View File

@ -36,11 +36,16 @@ func(session *ServerSession) Send(payload Payload) {
}
}
type SessionPayload struct {
Session *ServerSession
Payload Payload
}
type Server struct {
key ed25519.PrivateKey
active atomic.Bool
connection *net.UDPConn
commands chan Payload
commands chan SessionPayload
threads sync.WaitGroup
@ -80,7 +85,7 @@ func NewServer(listen string, key ed25519.PrivateKey, channels map[ChannelID]*Ch
key: key,
connection: connection,
active: atomic.Bool{},
commands: make(chan Payload, SERVER_COMMAND_BUFFER_SIZE),
commands: make(chan SessionPayload, SERVER_COMMAND_BUFFER_SIZE),
sessions: map[SessionID]*ServerSession{},
channels: atomic.Value{},
@ -198,7 +203,10 @@ func handle_session_incoming(session *ServerSession, server *Server) {
switch packet := packet.(type) {
case CommandPacket:
server.commands<-packet
server.commands<-SessionPayload{
Session: session,
Payload: packet,
}
case ChannelCommandPacket:
channels := server.channels.Load().(map[ChannelID]*Channel)
channel, exists := channels[packet.Channel]
@ -380,7 +388,7 @@ func(server *Server) update_state() {
for server.active.Load() {
select {
case command := <-server.commands:
if command == nil {
if command.Payload == nil {
break
}
server.Log("Incoming server command %+v", command)