From 449b00905ca9d88a7ef9935723d1bd7cba454230 Mon Sep 17 00:00:00 2001 From: Camille Scholtz Date: Wed, 26 Dec 2018 01:49:13 +0100 Subject: [PATCH] Add cure font --- blocks.go | 93 +- main.go | 2 +- vendor/font/cure.0020-007E | Bin 0 -> 1226 bytes vendor/font/cure.0021-007E | Bin 0 -> 1209 bytes vendor/font/cure.00A1-00AC | Bin 0 -> 308 bytes vendor/font/cure.00AE-00FE | Bin 0 -> 1045 bytes vendor/font/cure.00FF-00FF | Bin 0 -> 165 bytes vendor/font/cure.bdf | 2677 ++++++++++++++++++++++++++++++ vendor/font/cure.font | 69 + vendor/font/icon/icon.00A2-00A2 | Bin 0 -> 165 bytes vendor/font/icon/icon.00BA-00BD | Bin 0 -> 206 bytes vendor/font/icon/icon.00BB-00BD | Bin 0 -> 193 bytes vendor/font/icon/icon.00BE-00BE | Bin 0 -> 165 bytes vendor/font/icon/icon.bdf | 95 ++ vendor/font/icon/icon.font | 4 + vendor/font/proggytiny.0000-00FE | Bin 2924 -> 0 bytes vendor/font/proggytiny.00FF-00FF | Bin 163 -> 0 bytes vendor/font/proggytiny.font | 64 - 18 files changed, 2892 insertions(+), 112 deletions(-) create mode 100755 vendor/font/cure.0020-007E create mode 100755 vendor/font/cure.0021-007E create mode 100755 vendor/font/cure.00A1-00AC create mode 100755 vendor/font/cure.00AE-00FE create mode 100755 vendor/font/cure.00FF-00FF create mode 100644 vendor/font/cure.bdf create mode 100644 vendor/font/cure.font create mode 100755 vendor/font/icon/icon.00A2-00A2 create mode 100755 vendor/font/icon/icon.00BA-00BD create mode 100755 vendor/font/icon/icon.00BB-00BD create mode 100755 vendor/font/icon/icon.00BE-00BE create mode 100644 vendor/font/icon/icon.bdf create mode 100644 vendor/font/icon/icon.font delete mode 100644 vendor/font/proggytiny.0000-00FE delete mode 100644 vendor/font/proggytiny.00FF-00FF delete mode 100644 vendor/font/proggytiny.font diff --git a/blocks.go b/blocks.go index a2db9a3..3c5f8ef 100644 --- a/blocks.go +++ b/blocks.go @@ -2,7 +2,6 @@ package main import ( "bufio" - "log" "os" "strconv" "time" @@ -37,7 +36,7 @@ func (bar *Bar) clockFun() { } func (bar *Bar) musicFun() { - block := bar.initBlock("music", "?", 660, 'r', -13, "#3C4F5B", "#CCCCCC") + block := bar.initBlock("music", "?", 660, 'r', -12, "#3C4F5B", "#CCCCCC") /*block.actions["button1"] = func() { if block.popup == nil { @@ -56,45 +55,45 @@ func (bar *Bar) musicFun() { block.actions["button3"] = func() { conn, err := mpd.Dial("tcp", ":6600") if err != nil { - log.Print(err) + panic(err) } defer conn.Close() status, err := conn.Status() if err != nil { - log.Print(err) + panic(err) } if err := conn.Pause(status["state"] != "pause"); err != nil { - log.Print(err) + panic(err) } } block.actions["button4"] = func() { conn, err := mpd.Dial("tcp", ":6600") if err != nil { - log.Print(err) + panic(err) } defer conn.Close() if err := conn.Previous(); err != nil { - log.Print(err) + panic(err) } } block.actions["button5"] = func() { conn, err := mpd.Dial("tcp", ":6600") if err != nil { - log.Print(err) + panic(err) } defer conn.Close() if err := conn.Next(); err != nil { - log.Print(err) + panic(err) } } watcher, err := mpd.NewWatcher("tcp", ":6600", "", "player") if err != nil { - log.Fatal(err) + panic(err) } var conn *mpd.Client init := true @@ -108,20 +107,17 @@ func (bar *Bar) musicFun() { // TODO: Is it maybe possible to not create a new connection each loop? conn, err = mpd.Dial("tcp", ":6600") if err != nil { - log.Print(err) - continue + panic(err) } cur, err := conn.CurrentSong() if err != nil { - log.Print(err) - continue + panic(err) } status, err := conn.Status() if err != nil { - log.Print(err) - continue + panic(err) } var state string @@ -129,7 +125,7 @@ func (bar *Bar) musicFun() { state = "[paused] " } - txt := state + cur["Artist"] + " - " + cur["Title"] + txt := "» " + state + cur["Artist"] + " - " + cur["Title"] if block.txt == txt { continue } @@ -144,14 +140,14 @@ func (bar *Bar) todoFun() { watcher, err := fsnotify.NewWatcher() if err != nil { - log.Fatal(err) + panic(err) } if err := watcher.Add("/home/onodera/.todo"); err != nil { - log.Fatal(err) + panic(err) } file, err := os.Open("/home/onodera/.todo") if err != nil { - log.Fatal(err) + panic(err) } init := true for { @@ -170,11 +166,10 @@ func (bar *Bar) todoFun() { c++ } if _, err := file.Seek(0, 0); err != nil { - log.Print(err) - continue + panic(err) } - txt := strconv.Itoa(c) + txt := "¢ " + strconv.Itoa(c) if block.txt == txt { continue } @@ -235,23 +230,26 @@ func (bar *Bar) weatherFun() { */ func (bar *Bar) windowFun() { - block := bar.initBlock("window", "?", 220, 'c', 0, "#37BF8D", "#FFFFFF") + blockIcon := bar.initBlock("window", "º", 21, 'l', 12, "#37BF8D", "#FFFFFF") + block := bar.initBlock("window", "?", 200, 'c', 0, "#37BF8D", "#FFFFFF") // TODO: I'm not sure how I can use init (to prevent a black bar) here? + // TODO: This doesn't check for window title changes. xevent.PropertyNotifyFun(func(_ *xgbutil.XUtil, ev xevent. PropertyNotifyEvent) { atom, err := xprop.Atm(bar.xu, "_NET_ACTIVE_WINDOW") - if ev.Atom != atom { - return - } if err != nil { - log.Print(err) + panic(err) + } + if ev.Atom != atom { return } id, err := ewmh.ActiveWindowGet(bar.xu) if err != nil { - log.Print(err) + panic(err) + } + if id == 0 { return } @@ -262,11 +260,9 @@ func (bar *Bar) windowFun() { txt = "?" } } - - if len(txt) > 30 { - txt = txt[0:30] + "..." + if len(txt) > 38 { + txt = txt[0:38] + "..." } - if block.txt == txt { return } @@ -274,27 +270,32 @@ func (bar *Bar) windowFun() { block.txt = txt bar.redraw <- block }).Connect(bar.xu, bar.xu.RootWin()) + + bar.redraw <- blockIcon } func (bar *Bar) workspaceFun() { - blockWWW := bar.initBlock("www", "www", 74, 'c', 0, "#5394C9", "#FFFFFF") + blockWWW := bar.initBlock("www", "¼ www", 74, 'l', 10, "#5394C9", + "#FFFFFF") blockWWW.actions["button1"] = func() { if err := ewmh.CurrentDesktopReq(bar.xu, 0); err != nil { - log.Println(err) + panic(err) } } - blockIRC := bar.initBlock("irc", "irc", 67, 'c', 0, "#5394C9", "#FFFFFF") + blockIRC := bar.initBlock("irc", "½ irc", 67, 'l', 10, "#5394C9", + "#FFFFFF") blockIRC.actions["button1"] = func() { if err := ewmh.CurrentDesktopReq(bar.xu, 1); err != nil { - log.Println(err) + panic(err) } } - blockSRC := bar.initBlock("src", "src", 70, 'c', 0, "#5394C9", "#FFFFFF") + blockSRC := bar.initBlock("src", "¾ src", 70, 'l', 10, "#5394C9", + "#FFFFFF") blockSRC.actions["button1"] = func() { if err := ewmh.CurrentDesktopReq(bar.xu, 2); err != nil { - log.Println(err) + panic(err) } } @@ -304,18 +305,16 @@ func (bar *Bar) workspaceFun() { xevent.PropertyNotifyFun(func(_ *xgbutil.XUtil, ev xevent. PropertyNotifyEvent) { atom, err := xprop.Atm(bar.xu, "_NET_CURRENT_DESKTOP") - if ev.Atom != atom { - return - } if err != nil { - log.Print(err) + panic(err) + } + if ev.Atom != atom { return } wsp, err := ewmh.CurrentDesktopGet(bar.xu) if err != nil { - log.Print(err) - return + panic(err) } switch wsp { @@ -354,12 +353,12 @@ func (bar *Bar) workspaceFun() { prevFun := func() { if err := ewmh.CurrentDesktopReq(bar.xu, pwsp); err != nil { - log.Println(err) + panic(err) } } nextFun := func() { if err := ewmh.CurrentDesktopReq(bar.xu, nwsp); err != nil { - log.Println(err) + panic(err) } } diff --git a/main.go b/main.go index cc51796..8f92a4d 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( ) func main() { - bar, err := initBar(0, 0, 1920, 29, "./vendor/font/proggytiny.font") + bar, err := initBar(0, 0, 1920, 29, "./vendor/font/cure.font") if err != nil { log.Fatal(err) } diff --git a/vendor/font/cure.0020-007E b/vendor/font/cure.0020-007E new file mode 100755 index 0000000000000000000000000000000000000000..c1bdede39f51d5f0138a7fbebc21982a562c645d GIT binary patch literal 1226 zcmZwGZ%i9y90%~nt-RK|?pAzG#fIpqWu-(wex0%r|?ZbJO@IG0XO1887x?&+|)&yx1kr zr{DWNzcy{}?nLDE=o`c1eGrMD7vYEI8BpKum%r*<}@^L=4aeKBfU&*Id@QvCqpwvI_I`}{4Pmxn@dG+ z_D2r&73XwXA)-A!IpM<5cD(23w6=?^wo7&uGEz+B#%-3OpVnOS}#)^K9@V# z=?R>NirIuS7g}jQ>r1IY+XwNX&B^w2^j1eIs!{(Hh?r>_Nn~6Uc}!gj7iVKAnqQwBudcR8#zebo-oW6!&TW#y4L zab5`J;O1A+pgIya974>#TGvn>PUH``isKvMwbXqhTv@07)mq&uID9*c-qOE;K4Y|M z$1{s7OK>wW*;6RJ^q~MI$nmy*0wqPB2Dl5d*$r}LS8rkc)+qpAPwkIw{gl4eTPXQM zNidTj(^_*?mCfH(`90-Oxop;}a_rcl;ti^sCOj1zFqXmmRJEHMY-p1WX@}WR2Rn(f zwaC`@Z2iMFRD*4_u#@9#CD_WdtG;!3o41mtZM#)8&8q=`1w;`*CR7Fx34M}hixstV zr9GId`L5^!P>AS8pTpgH+}($b7eFG?i@Xuot)&pjk2688*p1mhkD{-juc9O97#c+< zxWZfPb3mBF<{kEJi4?<}Ko`&ynnAPZ$LK}$b2N`$M!(_G?=W9QOXxMO)68m{VwmYgxkl3C>@_ W`~}Z6&lSGJ{59cM`CHP~5AX=pbLQCq literal 0 HcmV?d00001 diff --git a/vendor/font/cure.0021-007E b/vendor/font/cure.0021-007E new file mode 100755 index 0000000000000000000000000000000000000000..6e6ceab25bc54f1e1da93c60f13a4d40e83c6071 GIT binary patch literal 1209 zcmZwFZDF*JGKep9&x@I4EAEa8SMZ6fvztW_q>PedwP;Pmgvu3yTZ>BeGmO_u3I1ZuMaQUzbL;Ps@HQT%uvQ|Tx)_1 z*?l)kLrTeV$ge1^np44z`t2`j-l}CsPj+53^S*9&{9gUIZ)87s)>Lo9lT-Y{Mt8FMi^!0iFV2Rw7>rRwu<93B=5+i%P zP)vg{6z_;R>zeMmgSi3a`(X!+oa@(Cnib%$gCip)R&|Y2YuaU6(yk;%X5ODsx`yJK zH6Dvwke%rc&4O`O?f6@`T`>Y4^e1{7#OBGhPVlwD&!yYvtL7>foJ7ymXff#o({sN> z_E?WB@UMKDnr#8Y{RyPO1qVRxSEOvHKlL?{vYY!qSwp0p+mU)_!HGtXLwTmf0(VXg zx=&Tf(+3pEZBivSrApa}-RZr=`0Um|>YK4u;671b@Kl$s*VFZFbaHgg(fL7SdbA#G zKuz>bCTZrNgcIV}I845kHV|mTW-B)BOtBN2-Dn!W^#S@ZHZD5IBzerE=onL+#QX*B ZKaBY}%j6W5=g(liz|sF#xXiJq`(I2h^PvC$ literal 0 HcmV?d00001 diff --git a/vendor/font/cure.00A1-00AC b/vendor/font/cure.00A1-00AC new file mode 100755 index 0000000000000000000000000000000000000000..fe75a3eeb45ab375df8266008d2df0e9b898e017 GIT binary patch literal 308 zcmYe!&n+lQEiO(?;ZlHsY(p3eNE={hn;9X*4UyC%vn?$Z+FMcr1(&LxtZ0{++$F@& z7R1rMqNzog;owPz_LYbFSQ-@=7}{4fw}>oOKFH8MXNsS&zyY9$-~$#x2B!r;hJ$UJ zhyzeWSlm+I_)LO8JI7)F*t@X GFaQASXFH<+ literal 0 HcmV?d00001 diff --git a/vendor/font/cure.00AE-00FE b/vendor/font/cure.00AE-00FE new file mode 100755 index 0000000000000000000000000000000000000000..57f15e39e364186476e43dd2911552ff4b0bec3f GIT binary patch literal 1045 zcmZvZO-NKx7>3_-@40vGTqN%}6OG}}bRCzq(*S-n0O_%M~sC2BTDW7di9D+8sFz7UQEBMU|@&%Nf1rQu5a zE4H9;M~zvfP_@#W$&7G60_j2_3vYJUR9)v%u(d848&?dRO<@RP&S>tBSufV6R{E99 zsAgoxE0$u`} zj$DEVQcUv&H1Kk>Snu5(IE0jl>)4CGqip#9By~Mv_Z13UE`Twq4B$-i021SyiIv0v zAPAxzm6=ovxZv7t=LI1Ih>VAwjJS`I5yz1a0&d8y#7<&2-92t=CiM{G#6IF_y9Oqm zCth@t@}T_-lWx%I5OIV!N|{@Z=C_G=iT53!Puq7PKcwUn;&b90@dfb}y|74?F9Ry% zcjT`U-xEJk=CiFKuaWc3apWK5|004pHA_U5In|aEea!BLyp=h<+D4}}#5!V#GJ9+d zalhk;5l8a_wh!LuXt~YtrNhK-;&EaRF-|Y^(JyD1Q(=<)%fxF$lQK6MR3>HZ43ox~ HJ!kv|R=c{F literal 0 HcmV?d00001 diff --git a/vendor/font/cure.00FF-00FF b/vendor/font/cure.00FF-00FF new file mode 100755 index 0000000000000000000000000000000000000000..b80ba5b31b95b290d1a716caaacc55495963820b GIT binary patch literal 165 zcmYe!&n+lQEiO(?;ZlHsY(p3eNE_f_nfpnWA8+z`(%3&dAQrpkTzn0036&9gP40 literal 0 HcmV?d00001 diff --git a/vendor/font/icon/icon.00BA-00BD b/vendor/font/icon/icon.00BA-00BD new file mode 100755 index 0000000000000000000000000000000000000000..880244cc652e63e69c8c01cb23120451607dfa03 GIT binary patch literal 206 zcmYe!&n+lQEiO(?;ZlHsY(p3eNE={h8<`=*4UyC%vrSADntwRYKhWHfcK<+gU(ELd z&0Rj#2bzDKGjnKGJ{EtV*{*s1fd&Q!1{N?xm}r7vA{(e+sQ^^W&cx0RB$-)xz-(bK KDFu{ZU;qHL;3;V$awm=$7J?x=pTh8M= zpr!$1_Y&Kj)(lpkzO>24#;W*(;Q;g~LOk)g(1WB(E@Qi1?rrh2) zG3g(jKR)y1P2S{vpXYg>-~RCro!u|L_S(z)-0Gw6_vMeG?7!@X;_@wGq zmY=JpW0`gkcapH+&Pi@l{DxE{IioHTnM%))Xd1qd=S9Qm zWB%+?$aDo{avnE{g}83IiIZ+hVuFU5nkGSHq*GqVZxrdwZ*bzG^i&PSW2Cy6$|XDA zc~n_@tGbJZ&ydpdhH`5u)&G}_S(;jzQ67deiA_l!CY9`%MBI>7_6x2{l2pyB=z2_K zjUsi>sK+KoVu~|SV@>}g${AAyNzEA-Vw4D4MNVJSFK>{O#A97yxv7>Y>T8TDlHbtD zEH}p_zuCm7)sFjmf5P-I6Y7ThtxQGs8Y(fSMXk&r(=0x0mSz&6j20SAs7bw+ zWRK0M(&jbU^W~2TDkVua!|q0Tx22K5;u;gzQgK{wGy{~!g>qx?8P6fEd4jy2ZQzx3 z#|U~Qw{wR?>>_96r(d_&M|pMTJn0P<*{3XSHZv)qvCRwOhxO?MQ!PFc*-ti4ll^9M zk*wEqVWzNmMp=n?pLkAL`B!1L^DUm;YA%x^^hJg3(PX}S>m-ePS>4J#Hz_+rvnaZ`&dW`7nf)nQ~UX{do?2bCYj71 zJuzc9y&#?z6^hBfn$yIqLFU%QfFWqY*+_2b;Dqzl=-c9g1DTDW^PDqEK3B|9EwjFA~CSRFW@G21hm=CdqW)=3ol zxb)+`ct{Kv`kOB zQ$-U#>y0GYCxoTK-uXhy@MgK%bNoi$s?q(b>vrt@DWx;2IQxu+o7rb*^X?qKLGNb^wnV%8 zB#Nz}?2J(N6-g9Pa>utZW{BjT=iF0ns@c)A*37Ez#g;9PLRJ0#U{tGAB65?< z1wGIU1F#SVVF@gQPr|J*4C~>u@Oiikw!v3m2keGD@Cb~;1WdwHFag8Sfp*a=^UhoK2AH~>$=GcXO`f$zeL@MAazC*c)%6@CeC zz&W@G@4$QTAtVR-A9|n{24Eo!!V*{ppM+as7}mpQ;q!18Y=f`B4%iKQ;1L*w37CYZ zU