remove pixegl.Do from monitor stuff (unnecessary)

monitor.go

@@ -1,9 +1,6 @@
 package pixel
 
-import (
-	"github.com/faiface/pixel/pixelgl"
-	"github.com/go-gl/glfw/v3.2/glfw"
-)
+import "github.com/go-gl/glfw/v3.2/glfw"
 
 // Monitor represents a physical display attached to your computer.
 type Monitor struct {
@@ -12,81 +9,61 @@ type Monitor struct {
 
 // PrimaryMonitor returns the main monitor (usually the one with the taskbar and stuff).
 func PrimaryMonitor() *Monitor {
-	m := &Monitor{}
-	pixelgl.Do(func() {
-		m.monitor = glfw.GetPrimaryMonitor()
-	})
-	return m
+	return &Monitor{
+		monitor: glfw.GetPrimaryMonitor(),
+	}
 }
 
 // Monitors returns a slice of all currently attached monitors.
 func Monitors() []*Monitor {
 	var monitors []*Monitor
-	pixelgl.Do(func() {
-		for _, monitor := range glfw.GetMonitors() {
-			monitors = append(monitors, &Monitor{monitor: monitor})
-		}
-	})
+	for _, monitor := range glfw.GetMonitors() {
+		monitors = append(monitors, &Monitor{monitor: monitor})
+	}
 	return monitors
 }
 
 // Name returns a human-readable name of a monitor.
 func (m *Monitor) Name() string {
-	return pixelgl.DoVal(func() interface{} {
-		return m.monitor.GetName()
-	}).(string)
+	return m.monitor.GetName()
 }
 
 // PhysicalSize returns the size of the display are of a monitor in millimeters.
 func (m *Monitor) PhysicalSize() (width, height float64) {
-	var w, h float64
-	pixelgl.Do(func() {
-		wi, hi := m.monitor.GetPhysicalSize()
-		w = float64(wi)
-		h = float64(hi)
-	})
-	return w, h
+	wi, hi := m.monitor.GetPhysicalSize()
+	width = float64(wi)
+	height = float64(hi)
+	return
 }
 
 // Position returns the position of the upper-left corner of a monitor in screen coordinates.
 func (m *Monitor) Position() (x, y float64) {
-	pixelgl.Do(func() {
-		xi, yi := m.monitor.GetPos()
-		x = float64(xi)
-		y = float64(yi)
-	})
-	return x, y
+	xi, yi := m.monitor.GetPos()
+	x = float64(xi)
+	y = float64(yi)
+	return
 }
 
 // Size returns the resolution of a monitor in pixels.
 func (m *Monitor) Size() (width, height float64) {
-	var w, h float64
-	pixelgl.Do(func() {
-		mode := m.monitor.GetVideoMode()
-		w = float64(mode.Width)
-		h = float64(mode.Height)
-	})
-	return w, h
+	mode := m.monitor.GetVideoMode()
+	width = float64(mode.Width)
+	height = float64(mode.Height)
+	return
 }
 
 // BitDepth returns the number of bits per color of a monitor.
 func (m *Monitor) BitDepth() (red, green, blue int) {
-	var r, g, b int
-	pixelgl.Do(func() {
-		mode := m.monitor.GetVideoMode()
-		r = mode.RedBits
-		g = mode.GreenBits
-		b = mode.BlueBits
-	})
-	return r, g, b
+	mode := m.monitor.GetVideoMode()
+	red = mode.RedBits
+	green = mode.GreenBits
+	blue = mode.BlueBits
+	return
 }
 
 // RefreshRate returns the refresh frequency of a monitor in Hz (refreshes/second).
-func (m *Monitor) RefreshRate() float64 {
-	var rate float64
-	pixelgl.Do(func() {
-		mode := m.monitor.GetVideoMode()
-		rate = float64(mode.RefreshRate)
-	})
-	return rate
+func (m *Monitor) RefreshRate() (rate float64) {
+	mode := m.monitor.GetVideoMode()
+	rate = float64(mode.RefreshRate)
+	return
 }