Skip to content

Add new event types and a field containing the data from i3 in Event #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add new event types and a field containing the data from i3 in Event #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbee284
Add event types for window and barconfig_update.
samuelotter Aug 15, 2014
5c6552c
Add Payload field to Event
samuelotter Aug 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions subscribe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
package i3ipc

import (
"bytes"
"encoding/json"
"log"
)
Expand All @@ -22,6 +23,8 @@ const (
I3WorkspaceEvent EventType = iota
I3OutputEvent
I3ModeEvent
I3WindowEvent
I3BarConfigEvent
// private value used for setting up internal stuff in init()
// The idea is that if there's a new type of event added to i3, it only
// needs to be added here and in the payloads slice below, and the rest of
Expand All @@ -30,7 +33,13 @@ const (
)

// This slice is used to map event types to their string representation.
var payloads []string = []string{"workspace", "output", "mode"}
var payloads []string = []string{
"workspace",
"output",
"mode",
"window",
"barconfig_update",
}

// Dynamically add an event type by defining a name for it. Just in case i3 adds
// a new one and this library hasn't been updated yet. Returns the EventType
Expand All @@ -46,10 +55,12 @@ func AddEventType(name string) (type_ EventType) {

// Event describes an event reply from i3.
type Event struct {
Type EventType
Type EventType
// "change" is the name of the single field of the JSON map that i3 sends
// when an event occurs, describing what happened.
Change string
Change string
// Payload contains the message sent from I3.
Payload map[string]interface{}
}

// Struct for replies from subscribe messages.
Expand Down Expand Up @@ -116,7 +127,12 @@ func (self *IPCSocket) listen() {

var event Event
event.Type = EventType(msg.Type)
err = json.Unmarshal(msg.Payload, &event)
decoder := json.NewDecoder(bytes.NewReader(msg.Payload))
// Important to enable UseNumber, otherwise window ids
// and integers will be interpreted as floats.
decoder.UseNumber()
err = decoder.Decode(&event.Payload)
event.Change = event.Payload["change"].(string)

// Send each subscriber the event in a nonblocking manner.
for _, subscriber := range self.subscribers {
Expand Down