diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 44 |
1 files changed, 26 insertions, 18 deletions
@@ -33,22 +33,30 @@ type Client struct { Tags BitMask } -var keys []Key -var clients = make(map[xproto.Window]*Client) -var focused xproto.Window +var ( + keys []Key + clients = make(map[xproto.Window]*Client) + focused xproto.Window +) // bar -var barWindow xproto.Window -var barGC xproto.Gcontext -var barHeight uint16 = config.BarHeight +var ( + barWindow xproto.Window + barGC xproto.Gcontext + barHeight uint16 = config.BarHeight +) // layout -var layout string = "tileWithMaster" -var gapSize = config.GapSize +var ( + layout string = "tileWithMaster" + gapSize = config.GapSize +) // tags -var GlobalTags BitMask = 1 -var ActiveClients []*Client +var ( + GlobalTags BitMask = 1 + ActiveClients []*Client +) func main() { conn, err := xgb.NewConn() @@ -69,7 +77,7 @@ func main() { manageWindow(conn, e.Window) case xproto.DestroyNotifyEvent: unmanageWindow(conn, e.Window) - //case xproto.UnmapNotifyEvent: + // case xproto.UnmapNotifyEvent: // unmanageWindow(conn, e.Window) case xproto.EnterNotifyEvent: // change focused window event focused = e.Event @@ -118,7 +126,7 @@ func setup(conn *xgb.Conn) { for _, cmd := range config.Startup { exec.Command(cmd) - log.Println(cmd) + log.Println("Running startup command: " + cmd) } } @@ -186,7 +194,7 @@ func setupKeys(conn *xgb.Conn) { Mod: mod, Sym: keysym.XK_Return, Fn: func(conn *xgb.Conn) { - spawn("st") + spawn("st", "-Z", "32") }, }, { @@ -207,7 +215,7 @@ func setupKeys(conn *xgb.Conn) { Mod: mod, Sym: keysym.XK_d, Fn: func(conn *xgb.Conn) { - spawn("dmenu_launch") + spawn("dmenu_run") }, }, { @@ -466,8 +474,8 @@ func switchTags(conn *xgb.Conn, tags BitMask) { } // update windows updateWindows(conn) - } + func tileVertical(conn *xgb.Conn) { screen := xproto.Setup(conn).DefaultScreen(conn) screenWidth := int(screen.WidthInPixels) @@ -616,9 +624,10 @@ func createBar(conn *xgb.Conn) { root := screen.Root // create the window + // TODO: make this actually black and not green for some reason :D cw := []uint32{ xproto.EventMaskExposure, // redraw on expose - uint32(0xFFFFFF), // white background + uint32(0x00000000), // "black" background (its green) } barWindow, _ = xproto.NewWindowId(conn) @@ -641,7 +650,7 @@ func createBar(conn *xgb.Conn) { // create bar gc barGC, _ = xproto.NewGcontextId(conn) - xproto.CreateGC(conn, barGC, xproto.Drawable(barWindow), xproto.GcForeground|xproto.GcBackground, []uint32{0x000000, 0xFF0000}) + xproto.CreateGC(conn, barGC, xproto.Drawable(barWindow), xproto.GcForeground|xproto.GcBackground, []uint32{0xFFFFFFFF, 0xFFFFFFFF}) } func drawBarText(conn *xgb.Conn, text string) { @@ -681,7 +690,6 @@ func getWindowTitle(conn *xgb.Conn, win xproto.Window) string { } prop, err := xproto.GetProperty(conn, false, focused, xproto.AtomWmName, xproto.AtomString, 0, 100).Reply() - if err != nil { log.Println("failed to get window title:", err) return "Unknown" |