Refactor NewWindow by using struct

Author: odknt

lib/bindings/window/window.go

@@ -29,6 +29,15 @@ type Window struct {
 	SendChannel      *connection.In `json:"-"`
 }
 
+type Options struct {
+	RootUrl  string
+	Size     SizeHW
+	Title    string
+	IconPath string
+	HasFrame bool
+	Session  *session.Session
+}
+
 func checkUrl(s string) (string, error) {
 	u, err := url.Parse(s)
 	if err != nil {
@@ -47,39 +56,40 @@ func checkUrl(s string) (string, error) {
 	return u.String(), err
 }
 
-func NewWindow(s string, sess *session.Session) *Window {
-	u, _ := checkUrl(s)
-
+func NewWindow(options Options) *Window {
 	w := Window{}
-	w.Url = u
-	if len(w.Url) == 0 {
-		w.Url = "http://google.com"
-	}
+	w.setOptions(options)
 	_, sendChannel := connection.GetCommunicationChannels()
 
+	size := options.Size
+	if options.Size == (SizeHW{}) {
+		size = SizeHW{
+			Width:  1024,
+			Height: 768,
+		}
+	}
+
 	windowCreate := Command{
 		Action:     "create",
 		ObjectType: "window",
 		Args: CommandArguments{
-			RootUrl: w.Url,
-			Title:   spawn.ApplicationName,
-			Size: SizeHW{
-				Width:  1024,
-				Height: 768,
-			},
+			RootUrl:  w.Url,
+			Title:    spawn.ApplicationName,
+			Size:     size,
+			HasFrame: options.HasFrame,
 		},
 	}
 	dispatcher.RegisterHandler(w.DispatchResponse)
-	if sess == nil {
+	if options.Session == nil {
 		w.SetSendChannel(sendChannel)
 		w.WaitingResponses = append(w.WaitingResponses, &windowCreate)
 		w.Send(&windowCreate)
 	} else {
 		go func() {
 			for {
-				if sess.TargetID != 0 {
-					fmt.Println("sess", sess.TargetID)
-					windowCreate.Args.SessionID = sess.TargetID
+				if options.Session.TargetID != 0 {
+					fmt.Println("sess", options.Session.TargetID)
+					windowCreate.Args.SessionID = options.Session.TargetID
 					w.SetSendChannel(sendChannel)
 					w.WaitingResponses = append(w.WaitingResponses, &windowCreate)
 					w.Send(&windowCreate)
@@ -92,6 +102,19 @@ func NewWindow(s string, sess *session.Session) *Window {
 	return &w
 }
 
+func (w *Window) setOptions(options Options) {
+	u, _ := checkUrl(options.RootUrl)
+	w.Url = u
+	if len(w.Url) == 0 {
+		w.Url = "http://google.com"
+	}
+
+	w.Title = options.Title
+	if len(w.Title) == 0 {
+		w.Title = spawn.ApplicationName
+	}
+}
+
 func (w *Window) SetSendChannel(sendChannel *connection.In) {
 	w.SendChannel = sendChannel
 }

lib/commands/commands.go

@@ -46,6 +46,7 @@ type CommandArguments struct {
 	Fullscreen   bool          `json:"fullscreen"`
 	Kiosk        bool          `json:"kiosk"`
 	Focus        bool          `json:"focus"`
+	HasFrame     bool          `json:"has_frame"`
 	Path         string        `json:"path,omitempty"`
 	Message      RemoteMessage `json:"message,omitempty"`
 }

thrust/thrust.go

@@ -21,9 +21,11 @@ Begin Generic Access and Binding Management Section.
 Bindings
 */
 
+type WindowOptions window.Options
+
 /* NewWindow creates a new Window Binding */
-func NewWindow(url string, sess *session.Session) *window.Window {
-	return window.NewWindow(url, sess)
+func NewWindow(options WindowOptions) *window.Window {
+	return window.NewWindow(window.Options(options))
 }
 
 /* NewSession creates a new Session Binding */