e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

edge: Refactor window creation

This commit is contained in:
Kim Woelders 2022-07-18 13:29:39 +02:00
parent ee3355669c
commit 032e0b3896
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/edge.c
View File

@ -182,10 +182,24 @@ EdgeCheckMotion(int x, int y)
EdgeEvent(dir); EdgeEvent(dir);
} }
static EObj *
EdgeWindowCreate(int which, int x, int y, int w, int h)
{
static const char *const names[] =
{ "Edge-L", "Edge-R", "Edge-T", "Edge-B" };
EObj *eo;
eo = EobjWindowCreate(EOBJ_TYPE_EVENT, x, y, w, h, 0, names[which & 3]);
ESelectInput(EobjGetWin(eo), EnterWindowMask | LeaveWindowMask);
EventCallbackRegister(EobjGetWin(eo), EdgeHandleEvents, INT2PTR(which));
return eo;
}
static void static void
EdgeWindowShow(int which, int on) EdgeWindowShow(int which, int on)
{ {
EObj *eo; EObj *eo, **peo;
int x, y, w, h; int x, y, w, h;
x = y = 0; x = y = 0;
@ -195,25 +209,33 @@ EdgeWindowShow(int which, int on)
{ {
default: default:
case EW_L: /* Left */ case EW_L: /* Left */
eo = w1; peo = &w1;
h = WinGetH(VROOT); h = WinGetH(VROOT);
break; break;
case EW_R: /* Right */ case EW_R: /* Right */
eo = w2; peo = &w2;
x = WinGetW(VROOT) - 1; x = WinGetW(VROOT) - 1;
h = WinGetH(VROOT); h = WinGetH(VROOT);
break; break;
case EW_T: /* Top */ case EW_T: /* Top */
eo = w3; peo = &w3;
w = WinGetW(VROOT); w = WinGetW(VROOT);
break; break;
case EW_B: /* Bottom */ case EW_B: /* Bottom */
eo = w4; peo = &w4;
y = WinGetH(VROOT) - 1; y = WinGetH(VROOT) - 1;
w = WinGetW(VROOT); w = WinGetW(VROOT);
break; break;
} }
eo = *peo;
if (!eo)
{
eo = *peo = EdgeWindowCreate(which, x, y, w, h);
if (!eo)
return;
}
if (on) if (on)
{ {
EobjMoveResize(eo, x, y, w, h); EobjMoveResize(eo, x, y, w, h);
@ -236,27 +258,6 @@ EdgeWindowsShow(void)
return; return;
} }
if (!w1)
{
w1 = EobjWindowCreate(EOBJ_TYPE_EVENT,
0, 0, 1, WinGetH(VROOT), 0, "Edge-L");
w2 = EobjWindowCreate(EOBJ_TYPE_EVENT,
WinGetW(VROOT) - 1, 0, 1, WinGetH(VROOT),
0, "Edge-R");
w3 = EobjWindowCreate(EOBJ_TYPE_EVENT,
0, 0, WinGetW(VROOT), 1, 0, "Edge-T");
w4 = EobjWindowCreate(EOBJ_TYPE_EVENT,
0, WinGetH(VROOT) - 1, WinGetW(VROOT), 1,
0, "Edge-B");
ESelectInput(EobjGetWin(w1), EnterWindowMask | LeaveWindowMask);
ESelectInput(EobjGetWin(w2), EnterWindowMask | LeaveWindowMask);
ESelectInput(EobjGetWin(w3), EnterWindowMask | LeaveWindowMask);
ESelectInput(EobjGetWin(w4), EnterWindowMask | LeaveWindowMask);
EventCallbackRegister(EobjGetWin(w1), EdgeHandleEvents, (void *)EW_L);
EventCallbackRegister(EobjGetWin(w2), EdgeHandleEvents, (void *)EW_R);
EventCallbackRegister(EobjGetWin(w3), EdgeHandleEvents, (void *)EW_T);
EventCallbackRegister(EobjGetWin(w4), EdgeHandleEvents, (void *)EW_B);
}
DeskCurrentGetArea(&cx, &cy); DeskCurrentGetArea(&cx, &cy);
DesksGetAreaSize(&ax, &ay); DesksGetAreaSize(&ax, &ay);