diff options
Diffstat (limited to 'graphics.c')
| -rw-r--r-- | graphics.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -8,8 +8,8 @@ #include "guifs.h" Point mousexy; -Mousectl *mouse; -Keyboardctl *keyboard; +Mousectl *mousectl; +Keyboardctl *keyboardctl; Channel *updatechan; Channel *mkcolourchan; Channel *newcolourchan; @@ -122,9 +122,9 @@ guiproc(void *) if(initdraw(nil, nil, "guifs") < 0) sysfatal("initdraw failed"); - if((mouse = initmouse(nil, screen)) == nil) + if((mousectl = initmouse(nil, screen)) == nil) sysfatal("initmouse failed"); - if((keyboard = initkeyboard(nil)) == nil) + if((keyboardctl = initkeyboard(nil)) == nil) sysfatal("initkeyboard failed"); enum { @@ -139,13 +139,13 @@ guiproc(void *) [Aupdategui] = {updatechan, &i, CHANRCV}, [Aresize] = - {mouse->resizec, nil, CHANRCV}, + {mousectl->resizec, nil, CHANRCV}, [Amkcolour] = {mkcolourchan, &c, CHANRCV}, [Amouse] = - {mouse->c, &mouse->Mouse, CHANRCV}, + {mousectl->c, &mousectl->Mouse, CHANRCV}, [Akeyboard] = - {keyboard->c, &r, CHANRCV}, + {keyboardctl->c, &r, CHANRCV}, [Aaltend] = {nil, nil, CHANEND}, }; @@ -169,10 +169,10 @@ guiproc(void *) } break; case Amouse: - mousexy = mouse->Mouse.xy; + mousexy = mousectl->Mouse.xy; if(!root) break; - if(mouseevent(mouse->Mouse)) + if(mouseevent(mousectl->Mouse)) resized(0); break; case Akeyboard: |