aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/internal.c4
-rw-r--r--src/internal.h2
-rw-r--r--src/mac.m16
-rw-r--r--src/types.h4
-rw-r--r--src/win.c10
-rw-r--r--src/x11.c22
-rw-r--r--src/x11_cairo.c14
7 files changed, 36 insertions, 36 deletions
diff --git a/src/internal.c b/src/internal.c
index dfea0ca..1a7b61f 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -13,7 +13,7 @@
#include <string.h>
bool
-puglIsValidSize(const PuglViewSize size)
+puglIsValidArea(const PuglArea size)
{
return size.width && size.height;
}
@@ -175,7 +175,7 @@ puglPreRealize(PuglView* const view)
}
// Ensure that the default size is set to a valid size
- if (!puglIsValidSize(view->sizeHints[PUGL_DEFAULT_SIZE])) {
+ if (!puglIsValidArea(view->sizeHints[PUGL_DEFAULT_SIZE])) {
return PUGL_BAD_CONFIGURATION;
}
diff --git a/src/internal.h b/src/internal.h
index f978074..e4296c8 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -20,7 +20,7 @@ PUGL_BEGIN_DECLS
/// Return true if `size` is a valid view size
bool
-puglIsValidSize(PuglViewSize size);
+puglIsValidArea(PuglArea size);
/// Set hint to a default value if it is unset (PUGL_DONT_CARE)
void
diff --git a/src/mac.m b/src/mac.m
index 26048a8..368b137 100644
--- a/src/mac.m
+++ b/src/mac.m
@@ -345,9 +345,9 @@ dispatchCurrentChildViewConfiguration(PuglView* const view)
- (NSSize)intrinsicContentSize
{
- const PuglViewSize defaultSize = puglview->sizeHints[PUGL_DEFAULT_SIZE];
+ const PuglArea defaultSize = puglview->sizeHints[PUGL_DEFAULT_SIZE];
- return puglIsValidSize(defaultSize)
+ return puglIsValidArea(defaultSize)
? sizePoints(puglview, defaultSize.width, defaultSize.height)
: NSMakeSize(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric);
}
@@ -1117,7 +1117,7 @@ updateSizeHint(PuglView* const view, const PuglSizeHint hint)
{
const PuglSpan width = view->sizeHints[hint].width;
const PuglSpan height = view->sizeHints[hint].height;
- if (!puglIsValidSize(view->sizeHints[hint])) {
+ if (!puglIsValidArea(view->sizeHints[hint])) {
return PUGL_FAILURE;
}
@@ -1185,10 +1185,10 @@ getInitialFrame(PuglView* const view)
: [screen frame]);
// Center the frame around the center of the bounding rectangle
- const PuglViewSize defaultSize = view->sizeHints[PUGL_DEFAULT_SIZE];
- const NSRect boundsPx = nsRectFromPoints(view, boundsPt);
- const double centerX = boundsPx.origin.x + boundsPx.size.width / 2;
- const double centerY = boundsPx.origin.y + boundsPx.size.height / 2;
+ const PuglArea defaultSize = view->sizeHints[PUGL_DEFAULT_SIZE];
+ const NSRect boundsPx = nsRectFromPoints(view, boundsPt);
+ const double centerX = boundsPx.origin.x + boundsPx.size.width / 2;
+ const double centerY = boundsPx.origin.y + boundsPx.size.height / 2;
const PuglRect frame = {(PuglCoord)(centerX - (defaultSize.width / 2U)),
(PuglCoord)(centerY - (defaultSize.height / 2U)),
@@ -1272,7 +1272,7 @@ puglRealize(PuglView* view)
NSLayoutRelationGreaterThanOrEqual,
view->sizeHints[PUGL_MIN_SIZE].height)];
- if (puglIsValidSize(view->sizeHints[PUGL_MAX_SIZE])) {
+ if (puglIsValidArea(view->sizeHints[PUGL_MAX_SIZE])) {
[impl->wrapperView
addConstraint:puglConstraint(impl->wrapperView,
NSLayoutAttributeWidth,
diff --git a/src/types.h b/src/types.h
index 9817474..bbebbb7 100644
--- a/src/types.h
+++ b/src/types.h
@@ -31,7 +31,7 @@ typedef struct {
typedef struct {
PuglSpan width;
PuglSpan height;
-} PuglViewSize;
+} PuglArea;
/// Blob of arbitrary data
typedef struct {
@@ -57,7 +57,7 @@ struct PuglViewImpl {
uintptr_t transientParent;
PuglConfigureEvent lastConfigure;
PuglHints hints;
- PuglViewSize sizeHints[PUGL_NUM_SIZE_HINTS];
+ PuglArea sizeHints[PUGL_NUM_SIZE_HINTS];
char* strings[PUGL_NUM_STRING_HINTS];
int defaultX;
int defaultY;
diff --git a/src/win.c b/src/win.c
index de648c7..0f5644e 100644
--- a/src/win.c
+++ b/src/win.c
@@ -712,8 +712,8 @@ constrainAspect(const PuglView* const view,
RECT* const size,
const WPARAM wParam)
{
- const PuglViewSize minAspect = view->sizeHints[PUGL_MIN_ASPECT];
- const PuglViewSize maxAspect = view->sizeHints[PUGL_MAX_ASPECT];
+ const PuglArea minAspect = view->sizeHints[PUGL_MIN_ASPECT];
+ const PuglArea maxAspect = view->sizeHints[PUGL_MAX_ASPECT];
const float minA = (float)minAspect.width / (float)minAspect.height;
const float maxA = (float)maxAspect.width / (float)maxAspect.height;
@@ -798,8 +798,8 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
handleConfigure(view, &event);
break;
case WM_SIZING:
- if (puglIsValidSize(view->sizeHints[PUGL_MIN_ASPECT]) &&
- puglIsValidSize(view->sizeHints[PUGL_MAX_ASPECT])) {
+ if (puglIsValidArea(view->sizeHints[PUGL_MIN_ASPECT]) &&
+ puglIsValidArea(view->sizeHints[PUGL_MAX_ASPECT])) {
constrainAspect(view, (RECT*)lParam, wParam);
return TRUE;
}
@@ -831,7 +831,7 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
mmi = (MINMAXINFO*)lParam;
mmi->ptMinTrackSize.x = view->sizeHints[PUGL_MIN_SIZE].width;
mmi->ptMinTrackSize.y = view->sizeHints[PUGL_MIN_SIZE].height;
- if (puglIsValidSize(view->sizeHints[PUGL_MAX_SIZE])) {
+ if (puglIsValidArea(view->sizeHints[PUGL_MAX_SIZE])) {
mmi->ptMaxTrackSize.x = view->sizeHints[PUGL_MAX_SIZE].width;
mmi->ptMaxTrackSize.y = view->sizeHints[PUGL_MAX_SIZE].height;
}
diff --git a/src/x11.c b/src/x11.c
index eabb715..ba0f840 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -414,30 +414,30 @@ updateSizeHints(const PuglView* const view)
sizeHints.max_height = (int)frame.height;
} else {
// Avoid setting PBaseSize for top level views to avoid window manager bugs
- const PuglViewSize defaultSize = view->sizeHints[PUGL_DEFAULT_SIZE];
- if (puglIsValidSize(defaultSize) && view->parent) {
+ const PuglArea defaultSize = view->sizeHints[PUGL_DEFAULT_SIZE];
+ if (puglIsValidArea(defaultSize) && view->parent) {
sizeHints.flags |= PBaseSize;
sizeHints.base_width = defaultSize.width;
sizeHints.base_height = defaultSize.height;
}
- const PuglViewSize minSize = view->sizeHints[PUGL_MIN_SIZE];
- if (puglIsValidSize(minSize)) {
+ const PuglArea minSize = view->sizeHints[PUGL_MIN_SIZE];
+ if (puglIsValidArea(minSize)) {
sizeHints.flags |= PMinSize;
sizeHints.min_width = minSize.width;
sizeHints.min_height = minSize.height;
}
- const PuglViewSize maxSize = view->sizeHints[PUGL_MAX_SIZE];
- if (puglIsValidSize(maxSize)) {
+ const PuglArea maxSize = view->sizeHints[PUGL_MAX_SIZE];
+ if (puglIsValidArea(maxSize)) {
sizeHints.flags |= PMaxSize;
sizeHints.max_width = maxSize.width;
sizeHints.max_height = maxSize.height;
}
- const PuglViewSize minAspect = view->sizeHints[PUGL_MIN_ASPECT];
- const PuglViewSize maxAspect = view->sizeHints[PUGL_MAX_ASPECT];
- if (puglIsValidSize(minAspect) && puglIsValidSize(maxAspect)) {
+ const PuglArea minAspect = view->sizeHints[PUGL_MIN_ASPECT];
+ const PuglArea maxAspect = view->sizeHints[PUGL_MAX_ASPECT];
+ if (puglIsValidArea(minAspect) && puglIsValidArea(maxAspect)) {
sizeHints.flags |= PAspect;
sizeHints.min_aspect.x = minAspect.width;
sizeHints.min_aspect.y = minAspect.height;
@@ -445,8 +445,8 @@ updateSizeHints(const PuglView* const view)
sizeHints.max_aspect.y = maxAspect.height;
}
- const PuglViewSize fixedAspect = view->sizeHints[PUGL_FIXED_ASPECT];
- if (puglIsValidSize(fixedAspect)) {
+ const PuglArea fixedAspect = view->sizeHints[PUGL_FIXED_ASPECT];
+ if (puglIsValidArea(fixedAspect)) {
sizeHints.flags |= PAspect;
sizeHints.min_aspect.x = fixedAspect.width;
sizeHints.min_aspect.y = fixedAspect.height;
diff --git a/src/x11_cairo.c b/src/x11_cairo.c
index d6fbaec..ff0b154 100644
--- a/src/x11_cairo.c
+++ b/src/x11_cairo.c
@@ -19,10 +19,10 @@ typedef struct {
cairo_t* cr;
} PuglX11CairoSurface;
-static PuglViewSize
+static PuglArea
puglX11CairoGetViewSize(const PuglView* const view)
{
- PuglViewSize size = {0U, 0U};
+ PuglArea size = {0U, 0U};
if (view->lastConfigure.type == PUGL_CONFIGURE) {
// Use the size of the last configured frame
@@ -97,11 +97,11 @@ puglX11CairoEnter(PuglView* view, const PuglExposeEvent* expose)
PuglStatus st = PUGL_SUCCESS;
if (expose) {
- const PuglViewSize viewSize = puglX11CairoGetViewSize(view);
- const PuglSpan right = (PuglSpan)(expose->x + expose->width);
- const PuglSpan bottom = (PuglSpan)(expose->y + expose->height);
- const PuglSpan surfaceWidth = MAX(right, viewSize.width);
- const PuglSpan surfaceHeight = MAX(bottom, viewSize.height);
+ const PuglArea viewSize = puglX11CairoGetViewSize(view);
+ const PuglSpan right = (PuglSpan)(expose->x + expose->width);
+ const PuglSpan bottom = (PuglSpan)(expose->y + expose->height);
+ const PuglSpan surfaceWidth = MAX(right, viewSize.width);
+ const PuglSpan surfaceHeight = MAX(bottom, viewSize.height);
if (!(st = puglX11CairoOpen(view, surfaceWidth, surfaceHeight))) {
surface->cr = cairo_create(surface->front);
if (cairo_status(surface->cr)) {
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-09 17:14:04 +0000