1 files changed, 88 insertions, 9 deletions

diff --git a/nexgb/xgbgen/go_event.go b/nexgb/xgbgen/go_event.go
index d91fd7a..e6d40b0 100644
--- a/nexgb/xgbgen/go_event.go
+++ b/nexgb/xgbgen/go_event.go
@@ -3,14 +3,75 @@ package main
 // Event types
 func (e *Event) Define(c *Context) {
 	c.Putln("// Event definition %s (%d)", e.SrcName(), e.Number)
+	c.Putln("// Size: %s", e.Size())
+	c.Putln("type %s struct {", e.EvType())
+	c.Putln("Sequence uint16")
+	for _, field := range e.Fields {
+		field.Define(c)
+	}
+	c.Putln("}")
+	c.Putln("")
+
+	// Read defines a function that transforms a byte slice into this
+	// event struct.
+	e.Read(c)
+
+	// Write defines a function that transoforms this event struct into
+	// a byte slice.
+	e.Write(c)
+
+	// Makes sure that this event type is an Event interface.
+	c.Putln("func (v %s) ImplementsEvent() { }", e.EvType())
+	c.Putln("")
+
+	// Let's the XGB event loop read this event.
+	c.Putln("func init() {")
+	c.Putln("newEventFuncs[%d] = New%s", e.Number, e.SrcName())
+	c.Putln("}")
+	c.Putln("")
 }
 
-func (e *Event) Read(c *Context, prefix string) {
+func (e *Event) Read(c *Context) {
 	c.Putln("// Event read %s", e.SrcName())
+	c.Putln("func New%s(buf []byte) %s {", e.SrcName(), e.EvType())
+	c.Putln("v := %s{}", e.EvType())
+	c.Putln("b := 1 // don't read event number")
+	c.Putln("")
+	for i, field := range e.Fields {
+		if i == 1 && !e.NoSequence {
+			c.Putln("v.Sequence = get16(buf[b:])")
+			c.Putln("b += 2")
+			c.Putln("")
+		}
+		field.Read(c)
+		c.Putln("")
+	}
+	c.Putln("return v")
+	c.Putln("}")
+	c.Putln("")
 }
 
-func (e *Event) Write(c *Context, prefix string) {
+func (e *Event) Write(c *Context) {
 	c.Putln("// Event write %s", e.SrcName())
+	c.Putln("func (v %s) Bytes() []byte {", e.EvType())
+	c.Putln("buf := make([]byte, %s)", e.Size())
+	c.Putln("b := 0")
+	c.Putln("")
+	c.Putln("// write event number")
+	c.Putln("buf[b] = %d", e.Number)
+	c.Putln("b += 1")
+	c.Putln("")
+	for i, field := range e.Fields {
+		if i == 1 && !e.NoSequence {
+			c.Putln("b += 2 // skip sequence number")
+			c.Putln("")
+		}
+		field.Write(c)
+		c.Putln("")
+	}
+	c.Putln("return buf")
+	c.Putln("}")
+	c.Putln("")
 }
 
 // EventCopy types
@@ -21,18 +82,36 @@ func (e *EventCopy) Define(c *Context) {
 	c.Putln("")
 	c.Putln("type %s %s", e.EvType(), e.Old.(*Event).EvType())
 	c.Putln("")
+
+	// Read defines a function that transforms a byte slice into this
+	// event struct.
+	e.Read(c)
+
+	// Write defines a function that transoforms this event struct into
+	// a byte slice.
+	e.Write(c)
+
+	// Makes sure that this event type is an Event interface.
+	c.Putln("func (v %s) ImplementsEvent() { }", e.EvType())
+	c.Putln("")
+
+	// Let's the XGB event loop read this event.
+	c.Putln("func init() {")
+	c.Putln("newEventFuncs[%d] = New%s", e.Number, e.SrcName())
+	c.Putln("}")
+	c.Putln("")
+}
+
+func (e *EventCopy) Read(c *Context) {
 	c.Putln("func New%s(buf []byte) %s {", e.SrcName(), e.EvType())
 	c.Putln("return (%s)(New%s(buf))", e.EvType(), e.Old.SrcName())
 	c.Putln("}")
 	c.Putln("")
-	c.Putln("func (ev %s) ImplementsEvent() { }", e.EvType())
-	c.Putln("")
-	c.Putln("func (ev %s) Bytes() []byte {", e.EvType())
+}
+
+func (e *EventCopy) Write(c *Context) {
+	c.Putln("func (v %s) Bytes() []byte {", e.EvType())
 	c.Putln("return (%s)(ev).Bytes()", e.Old.(*Event).EvType())
 	c.Putln("}")
 	c.Putln("")
-	c.Putln("func init() {")
-	c.Putln("newEventFuncs[%d] = New%s", e.Number, e.SrcName())
-	c.Putln("}")
-	c.Putln("")
 }