aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-07-05 11:22:54 +0200
committerDavid Robillard <d@drobilla.net>2020-07-05 15:00:27 +0200
commit02f230d5e6849552daedcb75f4655c66fe8f57df (patch)
tree84166be64827cbb79f25ac820328c72085c0fcbe
parent72ffadb20144304b376cc7fef267aeb9db8171de (diff)
Remove count field from PuglEventExpose
This was never particularly useful, and it makes no sense with the new drawing model, even on X11, so its presence just adds confusion. So, remove it, which also conveniently fixes a padding warning in PuglEventExpose.
-rw-r--r--pugl/detail/implementation.c4
-rw-r--r--pugl/detail/mac.m1
-rw-r--r--pugl/detail/win.c1
-rw-r--r--pugl/detail/x11.c4
-rw-r--r--pugl/pugl.h1
5 files changed, 3 insertions, 8 deletions
diff --git a/pugl/detail/implementation.c b/pugl/detail/implementation.c
index 1ff1c60..055e917 100644
--- a/pugl/detail/implementation.c
+++ b/pugl/detail/implementation.c
@@ -311,7 +311,7 @@ PuglStatus
puglEnterContext(PuglView* view, bool drawing)
{
const PuglEventExpose expose = {
- PUGL_EXPOSE, 0, 0, 0, view->frame.width, view->frame.height, 0};
+ PUGL_EXPOSE, 0, 0.0, 0.0, view->frame.width, view->frame.height};
view->backend->enter(view, drawing ? &expose : NULL);
@@ -322,7 +322,7 @@ PuglStatus
puglLeaveContext(PuglView* view, bool drawing)
{
const PuglEventExpose expose = {
- PUGL_EXPOSE, 0, 0, 0, view->frame.width, view->frame.height, 0};
+ PUGL_EXPOSE, 0, 0.0, 0.0, view->frame.width, view->frame.height};
view->backend->leave(view, drawing ? &expose : NULL);
diff --git a/pugl/detail/mac.m b/pugl/detail/mac.m
index 774cae1..6ede4f8 100644
--- a/pugl/detail/mac.m
+++ b/pugl/detail/mac.m
@@ -225,7 +225,6 @@ updateViewRect(PuglView* view)
rect.origin.y * scaleFactor,
rect.size.width * scaleFactor,
rect.size.height * scaleFactor,
- 0
};
puglDispatchEvent(puglview, (const PuglEvent*)&ev);
diff --git a/pugl/detail/win.c b/pugl/detail/win.c
index e06f021..38f2615 100644
--- a/pugl/detail/win.c
+++ b/pugl/detail/win.c
@@ -612,7 +612,6 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
event.expose.y = rect.top;
event.expose.width = rect.right - rect.left;
event.expose.height = rect.bottom - rect.top;
- event.expose.count = 0;
break;
case WM_ERASEBKGND:
return true;
diff --git a/pugl/detail/x11.c b/pugl/detail/x11.c
index 707b2d8..12efc43 100644
--- a/pugl/detail/x11.c
+++ b/pugl/detail/x11.c
@@ -564,7 +564,6 @@ translateEvent(PuglView* view, XEvent xevent)
event.expose.y = xevent.xexpose.y;
event.expose.width = xevent.xexpose.width;
event.expose.height = xevent.xexpose.height;
- event.expose.count = xevent.xexpose.count;
break;
case MotionNotify:
event.type = PUGL_MOTION;
@@ -856,7 +855,6 @@ mergeExposeEvents(PuglEvent* dst, const PuglEvent* src)
dst->expose.y = MIN(dst->expose.y, src->expose.y);
dst->expose.width = max_x - dst->expose.x;
dst->expose.height = max_y - dst->expose.y;
- dst->expose.count = MIN(dst->expose.count, src->expose.count);
}
}
@@ -1116,7 +1114,7 @@ PuglStatus
puglPostRedisplayRect(PuglView* view, PuglRect rect)
{
const PuglEventExpose event = {
- PUGL_EXPOSE, 0, rect.x, rect.y, rect.width, rect.height, 0
+ PUGL_EXPOSE, 0, rect.x, rect.y, rect.width, rect.height
};
if (view->world->impl->dispatchingEvents) {
diff --git a/pugl/pugl.h b/pugl/pugl.h
index 3d80d6e..3e1926a 100644
--- a/pugl/pugl.h
+++ b/pugl/pugl.h
@@ -333,7 +333,6 @@ typedef struct {
double y; ///< View-relative Y coordinate
double width; ///< Width of exposed region
double height; ///< Height of exposed region
- int count; ///< Number of expose events to follow
} PuglEventExpose;
/**