From c03689b9fcc26a401998fa481c4d71d0ecf08365 Mon Sep 17 00:00:00 2001 From: Leonardo Domingues Date: Thu, 2 Dec 2021 18:35:00 -0300 Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20nas=20vari=C3=A1veis=20de?= =?UTF-8?q?=20retorno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/wingui/cli.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/api/wingui/cli.go b/api/wingui/cli.go index ecb4376..7a22e5f 100644 --- a/api/wingui/cli.go +++ b/api/wingui/cli.go @@ -304,14 +304,14 @@ func (c *Cli) NotifyBeep(msg, title string) error { /***************** Window Functions *****************/ -func (c *Cli) WindowList(s string) error { - err := c.HttpCli().JsonGet("/ipc/window/list?s="+s, nil) - return err +func (c *Cli) WindowList(s string) (ret []map[string]interface{}, err error) { + err = c.HttpCli().JsonGet("/ipc/window/list?s="+s, &ret) + return ret, err } -func (c *Cli) WindowHwnd(s string) error { - err := c.HttpCli().JsonGet("/ipc/window/hwnd?s="+s, nil) - return err +func (c *Cli) WindowHwnd(s string) (ret []int, err error) { + err = c.HttpCli().JsonGet("/ipc/window/hwnd?s="+s, &ret) + return ret, err } func (c *Cli) WindowActivate(Hwnd string) error { @@ -334,23 +334,23 @@ func (c *Cli) WindowMin(Hwnd string) error { return err } -func (c *Cli) WindowActiveHwnd() (ret interface{}, err error) { +func (c *Cli) WindowActiveHwnd() (ret int, err error) { err = c.HttpCli().JsonGet("/ipc/window/activehwnd", &ret) return ret, err } -func (c *Cli) WindowWaitActiveTitle(t string, m int) (ret interface{}, err error) { +func (c *Cli) WindowWaitActiveTitle(t string, m int) (ret map[string]interface{}, err error) { err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/window/waitactivetitle?t=%s&m=%d", t, m), &ret) return ret, err } -func (c *Cli) WindowActiveTitle() (ret interface{}, err error) { +func (c *Cli) WindowActiveTitle() (ret string, err error) { err = c.HttpCli().JsonGet("/ipc/window/activetitle", &ret) return ret, err } -func (c *Cli) WindowWinfo(w string) (ret interface{}, err error) { - err = c.HttpCli().JsonGet("/ipc/window/winfo?w="+w, &ret) +/*func (c *Cli) WindowWinfo(w int) (ret interface{}, err error) { + err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/window/winfo?w=%d", w), &ret) return ret, err } @@ -362,7 +362,7 @@ func (c *Cli) WindowSendMsg(w, m string) error { func (c *Cli) WindowPostMsg(w, m string) error { err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/window/postmsg?w=%s&m=%s", w, m), nil) return err -} +}*/ func NewCli() *Cli { ret := &Cli{ApiCli: api.NewApiCli()}