aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_cairo.c2
-rw-r--r--test/test_cursor.c2
-rw-r--r--test/test_gl.c2
-rw-r--r--test/test_gl_free_unrealized.c2
-rw-r--r--test/test_gl_hints.c2
-rw-r--r--test/test_local_copy_paste.c2
-rw-r--r--test/test_realize.c2
-rw-r--r--test/test_redisplay.c2
-rw-r--r--test/test_remote_copy_paste.c4
-rw-r--r--test/test_show_hide.c2
-rw-r--r--test/test_size.c21
-rw-r--r--test/test_stub.c2
-rw-r--r--test/test_stub_hints.c2
-rw-r--r--test/test_timer.c2
-rw-r--r--test/test_update.c2
-rw-r--r--test/test_view.c2
-rw-r--r--test/test_vulkan.c2
17 files changed, 28 insertions, 27 deletions
diff --git a/test/test_cairo.c b/test/test_cairo.c
index 043edce..3259399 100644
--- a/test/test_cairo.c
+++ b/test/test_cairo.c
@@ -66,7 +66,7 @@ main(int argc, char** argv)
puglSetBackend(test.view, puglCairoBackend());
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 128, 896);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 128, 896);
puglShow(test.view, PUGL_SHOW_RAISE);
// Drive event loop until the view gets exposed
diff --git a/test/test_cursor.c b/test/test_cursor.c
index f3a9e5f..4696a1a 100644
--- a/test/test_cursor.c
+++ b/test/test_cursor.c
@@ -52,7 +52,7 @@ main(int argc, char** argv)
puglSetBackend(test.view, puglStubBackend());
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 896, 640);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 896, 640);
puglShow(test.view, PUGL_SHOW_RAISE);
// Drive event loop until the view gets exposed
diff --git a/test/test_gl.c b/test/test_gl.c
index ce85fa5..12f6017 100644
--- a/test/test_gl.c
+++ b/test/test_gl.c
@@ -85,7 +85,7 @@ main(int argc, char** argv)
puglSetBackend(test.view, puglGlBackend());
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 384, 896);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 384, 896);
puglShow(test.view, PUGL_SHOW_RAISE);
// Enter OpenGL context as if setting things up
diff --git a/test/test_gl_free_unrealized.c b/test/test_gl_free_unrealized.c
index cdb94d6..7ff8913 100644
--- a/test/test_gl_free_unrealized.c
+++ b/test/test_gl_free_unrealized.c
@@ -32,7 +32,7 @@ main(void)
puglSetBackend(test.view, puglGlBackend());
puglSetHandle(test.view, &test);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 640, 896);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 640, 896);
assert(!puglGetVisible(test.view));
diff --git a/test/test_gl_hints.c b/test/test_gl_hints.c
index 5ca5902..3533a0c 100644
--- a/test/test_gl_hints.c
+++ b/test/test_gl_hints.c
@@ -33,7 +33,7 @@ main(void)
puglSetBackend(view, puglGlBackend());
puglSetEventFunc(view, onEvent);
puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(view, 128, 128);
+ puglSetPositionHint(view, PUGL_DEFAULT_POSITION, 128, 128);
// Check invalid cases
assert(puglSetViewHint(view, PUGL_CONTEXT_API, PUGL_DONT_CARE) ==
diff --git a/test/test_local_copy_paste.c b/test/test_local_copy_paste.c
index 606b2cf..ea4856b 100644
--- a/test/test_local_copy_paste.c
+++ b/test/test_local_copy_paste.c
@@ -133,7 +133,7 @@ main(int argc, char** argv)
puglSetHandle(app.view, &app);
puglSetEventFunc(app.view, onEvent);
puglSetSizeHint(app.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(app.view, 384, 128);
+ puglSetPositionHint(app.view, PUGL_DEFAULT_POSITION, 384, 128);
// Create and show window
assert(!puglRealize(app.view));
diff --git a/test/test_realize.c b/test/test_realize.c
index f15d1df..e34f925 100644
--- a/test/test_realize.c
+++ b/test/test_realize.c
@@ -75,7 +75,7 @@ main(int argc, char** argv)
assert(puglRealize(test.view) == PUGL_BAD_CONFIGURATION);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 640, 128);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 640, 128);
// Create initially invisible window
assert(!puglRealize(test.view));
diff --git a/test/test_redisplay.c b/test/test_redisplay.c
index 05f7e06..10d918e 100644
--- a/test/test_redisplay.c
+++ b/test/test_redisplay.c
@@ -119,7 +119,7 @@ main(int argc, char** argv)
puglSetHandle(test.view, &test);
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 896, 128);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 896, 128);
// Create and show window
assert(!puglRealize(test.view));
diff --git a/test/test_remote_copy_paste.c b/test/test_remote_copy_paste.c
index 46eefe9..5b6a852 100644
--- a/test/test_remote_copy_paste.c
+++ b/test/test_remote_copy_paste.c
@@ -148,7 +148,7 @@ main(int argc, char** argv)
puglSetHandle(app.copierView, &app);
puglSetEventFunc(app.copierView, onCopierEvent);
puglSetSizeHint(app.copierView, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(app.copierView, 640, 896);
+ puglSetPositionHint(app.copierView, PUGL_DEFAULT_POSITION, 640, 896);
// Set up paster view
app.pasterView = puglNewView(app.world);
@@ -158,7 +158,7 @@ main(int argc, char** argv)
puglSetHandle(app.pasterView, &app);
puglSetEventFunc(app.pasterView, onPasterEvent);
puglSetSizeHint(app.pasterView, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(app.pasterView, 896, 896);
+ puglSetPositionHint(app.pasterView, PUGL_DEFAULT_POSITION, 896, 896);
// Create and show both views
assert(!puglShow(app.copierView, PUGL_SHOW_RAISE));
diff --git a/test/test_show_hide.c b/test/test_show_hide.c
index 6cc2f1b..8d67303 100644
--- a/test/test_show_hide.c
+++ b/test/test_show_hide.c
@@ -115,7 +115,7 @@ main(int argc, char** argv)
puglSetHandle(test.view, &test);
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 128, 384);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 128, 384);
// Create initially invisible window
assert(!puglRealize(test.view));
diff --git a/test/test_size.c b/test/test_size.c
index 5c8eb04..386933c 100644
--- a/test/test_size.c
+++ b/test/test_size.c
@@ -87,7 +87,7 @@ main(int argc, char** argv)
puglSetSizeHint(test.view, PUGL_MIN_SIZE, minSize, minSize);
puglSetSizeHint(test.view, PUGL_MAX_SIZE, maxSize, maxSize);
puglSetSizeHint(test.view, PUGL_FIXED_ASPECT, 1, 1);
- puglSetPosition(test.view, 384, 384);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 384, 384);
// Create and show window
assert(!puglRealize(test.view));
@@ -97,21 +97,22 @@ main(int argc, char** argv)
}
// Check that the frame matches the last configure event
- const PuglRect frame = puglGetFrame(test.view);
- assert(frame.x == test.configuredFrame.x);
- assert(frame.y == test.configuredFrame.y);
- assert(frame.width == test.configuredFrame.width);
- assert(frame.height == test.configuredFrame.height);
+ const PuglPoint pos = puglGetPositionHint(test.view, PUGL_CURRENT_POSITION);
+ const PuglArea size = puglGetSizeHint(test.view, PUGL_CURRENT_SIZE);
+ assert(pos.x == test.configuredFrame.x);
+ assert(pos.y == test.configuredFrame.y);
+ assert(size.width == test.configuredFrame.width);
+ assert(size.height == test.configuredFrame.height);
#if defined(_WIN32) || defined(__APPLE__)
/* Some window managers on Linux (particularly tiling ones) just disregard
these hints entirely, so we only check that the size is in bounds on MacOS
and Windows where this is more or less universally supported. */
- assert(frame.width >= minSize);
- assert(frame.height >= minSize);
- assert(frame.width <= maxSize);
- assert(frame.height <= maxSize);
+ assert(size.width >= minSize);
+ assert(size.height >= minSize);
+ assert(size.width <= maxSize);
+ assert(size.height <= maxSize);
#endif
// Tear down
diff --git a/test/test_stub.c b/test/test_stub.c
index 947cbd7..df0d6b2 100644
--- a/test/test_stub.c
+++ b/test/test_stub.c
@@ -52,7 +52,7 @@ main(int argc, char** argv)
puglSetBackend(test.view, puglStubBackend());
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 384, 896);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 384, 896);
puglShow(test.view, PUGL_SHOW_RAISE);
// Drive event loop until the view gets exposed
diff --git a/test/test_stub_hints.c b/test/test_stub_hints.c
index a84577d..5c84dec 100644
--- a/test/test_stub_hints.c
+++ b/test/test_stub_hints.c
@@ -35,7 +35,7 @@ main(void)
puglSetBackend(view, puglStubBackend());
puglSetEventFunc(view, onEvent);
puglSetSizeHint(view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(view, 640, 384);
+ puglSetPositionHint(view, PUGL_DEFAULT_POSITION, 640, 384);
// Check invalid cases
assert(puglSetViewHint(view, (PuglViewHint)-1, 0) == PUGL_BAD_PARAMETER);
diff --git a/test/test_timer.c b/test/test_timer.c
index 96aa50c..ae7660f 100644
--- a/test/test_timer.c
+++ b/test/test_timer.c
@@ -157,7 +157,7 @@ main(int argc, char** argv)
puglSetHandle(test.view, &test);
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 896, 384);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 896, 384);
// Create and show window
assert(!puglRealize(test.view));
diff --git a/test/test_update.c b/test/test_update.c
index 520d4d6..99971a0 100644
--- a/test/test_update.c
+++ b/test/test_update.c
@@ -90,7 +90,7 @@ main(int argc, char** argv)
puglSetHandle(test.view, &test);
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 128, 640);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 128, 640);
// Create and show window
assert(!puglRealize(test.view));
diff --git a/test/test_view.c b/test/test_view.c
index 48ace6f..a8f8117 100644
--- a/test/test_view.c
+++ b/test/test_view.c
@@ -73,7 +73,7 @@ main(int argc, char** argv)
puglSetHandle(test.view, &test);
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 384, 640);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 384, 640);
// Check basic accessors
assert(puglGetBackend(test.view) == puglStubBackend());
diff --git a/test/test_vulkan.c b/test/test_vulkan.c
index aed6684..deed14d 100644
--- a/test/test_vulkan.c
+++ b/test/test_vulkan.c
@@ -172,7 +172,7 @@ main(int argc, char** argv)
puglSetBackend(test.view, puglVulkanBackend());
puglSetEventFunc(test.view, onEvent);
puglSetSizeHint(test.view, PUGL_DEFAULT_SIZE, 256, 256);
- puglSetPosition(test.view, 640, 640);
+ puglSetPositionHint(test.view, PUGL_DEFAULT_POSITION, 640, 640);
assert(!puglRealize(test.view));
// Create Vulkan surface for window