mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-18 21:10:00 +00:00
Add gdk_dihedral_get_name
And use it everywhere we want to print out debug spew about dihedral transforms.
This commit is contained in:
parent
8c988a7b07
commit
b5b58ced2a
@ -70,3 +70,13 @@ gdk_dihedral_swaps_xy (GdkDihedral self)
|
||||
{
|
||||
return (self & 1) ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
const char *
|
||||
gdk_dihedral_get_name (GdkDihedral self)
|
||||
{
|
||||
const char *name[] = {
|
||||
"normal", "90", "180", "270", "flipped", "flipped-90", "flipped-180", "flipped-270"
|
||||
};
|
||||
|
||||
return name[self];
|
||||
}
|
||||
|
@ -43,5 +43,7 @@ GdkDihedral gdk_dihedral_combine (GdkDihedral
|
||||
GdkDihedral gdk_dihedral_invert (GdkDihedral self);
|
||||
gboolean gdk_dihedral_swaps_xy (GdkDihedral self);
|
||||
|
||||
const char * gdk_dihedral_get_name (GdkDihedral self);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
@ -50,6 +50,7 @@
|
||||
#include "gdkvulkancontext-wayland.h"
|
||||
#include "gdkwaylandmonitor.h"
|
||||
#include "gdkprofilerprivate.h"
|
||||
#include "gdkdihedralprivate.h"
|
||||
#include "gdktoplevel-wayland-private.h"
|
||||
#include <wayland/pointer-gestures-unstable-v1-client-protocol.h>
|
||||
#include "tablet-unstable-v2-client-protocol.h"
|
||||
@ -2307,30 +2308,6 @@ subpixel_to_string (int layout)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const char *
|
||||
transform_to_string (int transform)
|
||||
{
|
||||
int i;
|
||||
struct { int transform; const char *name; } transforms[] = {
|
||||
{ WL_OUTPUT_TRANSFORM_NORMAL, "normal" },
|
||||
{ WL_OUTPUT_TRANSFORM_90, "90" },
|
||||
{ WL_OUTPUT_TRANSFORM_180, "180" },
|
||||
{ WL_OUTPUT_TRANSFORM_270, "270" },
|
||||
{ WL_OUTPUT_TRANSFORM_FLIPPED, "flipped" },
|
||||
{ WL_OUTPUT_TRANSFORM_FLIPPED_90, "flipped 90" },
|
||||
{ WL_OUTPUT_TRANSFORM_FLIPPED_180, "flipped 180" },
|
||||
{ WL_OUTPUT_TRANSFORM_FLIPPED_270, "flipped 270" },
|
||||
{ 0xffffffff, NULL }
|
||||
};
|
||||
|
||||
for (i = 0; transforms[i].name; i++)
|
||||
{
|
||||
if (transforms[i].transform == transform)
|
||||
return transforms[i].name;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
update_scale (GdkDisplay *display)
|
||||
{
|
||||
@ -2561,7 +2538,7 @@ output_handle_geometry (void *data,
|
||||
physical_width, physical_height,
|
||||
subpixel_to_string (subpixel),
|
||||
make, model,
|
||||
transform_to_string (transform));
|
||||
gdk_dihedral_get_name ((GdkDihedral) transform));
|
||||
|
||||
monitor->output_geometry.x = x;
|
||||
monitor->output_geometry.y = y;
|
||||
|
@ -247,14 +247,6 @@ gdk_texture_transform_to_wl (GdkDihedral transform)
|
||||
return (enum wl_output_transform) transform;
|
||||
}
|
||||
|
||||
static inline const char *
|
||||
transform_name (GdkDihedral transform)
|
||||
{
|
||||
const char *name[] = { "normal", "90", "180", "270", "flipped", "flipped 90", "flipped 180", "flipped 270" };
|
||||
|
||||
return name[transform];
|
||||
}
|
||||
|
||||
static inline GdkDihedral
|
||||
wl_output_transform_to_gdk (enum wl_output_transform transform)
|
||||
{
|
||||
@ -521,7 +513,7 @@ gdk_wayland_subsurface_attach (GdkSubsurface *sub,
|
||||
self->dest.x, self->dest.y,
|
||||
self->dest.width, self->dest.height,
|
||||
transform != GDK_DIHEDRAL_NORMAL ? " (" : "",
|
||||
transform != GDK_DIHEDRAL_NORMAL ? transform_name (transform): "",
|
||||
transform != GDK_DIHEDRAL_NORMAL ? gdk_dihedral_get_name (transform) : "",
|
||||
transform != GDK_DIHEDRAL_NORMAL ? " )" : ""
|
||||
);
|
||||
result = TRUE;
|
||||
|
@ -893,13 +893,10 @@ surface_preferred_buffer_transform (void *data,
|
||||
uint32_t transform)
|
||||
{
|
||||
GdkSurface *surface = GDK_SURFACE (data);
|
||||
const char *transform_name[] = {
|
||||
"normal", "90", "180", "270", "flipped", "flipped-90", "flipped-180", "flipped-270"
|
||||
};
|
||||
|
||||
GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
|
||||
"preferred buffer transform, surface %p transform %s",
|
||||
surface, transform_name[transform]);
|
||||
surface, gdk_dihedral_get_name ((GdkDihedral) transform));
|
||||
}
|
||||
|
||||
static const struct wl_surface_listener surface_listener = {
|
||||
|
Loading…
Reference in New Issue
Block a user