29cafe6f6c
The following implicit definition for `transform()` did not correctly apply: ``` a * b = c c * invert(b) = a ``` Crucially the following did not apply for `FLIPPED-90` and `FLIPPED-270`: ``` a * invert(a) = identity ``` Fix this by applying the operations, first the flip, then the rotation, in this order and add tests to ensure correct results for the requirement above. Also drop `relative_transform()` as it only had a single user and can be replaced by `transform()`: ``` invert(a) * b = c a * c = b ``` As this is not very intuitive, ensure in tests as well. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2459>
156 lines
4.6 KiB
C
156 lines
4.6 KiB
C
/*
|
|
* Copyright (C) 2018 Robert Mader
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "backends/meta-monitor-transform.h"
|
|
|
|
MetaMonitorTransform
|
|
meta_monitor_transform_from_orientation (MetaOrientation orientation)
|
|
{
|
|
switch (orientation)
|
|
{
|
|
case META_ORIENTATION_BOTTOM_UP:
|
|
return META_MONITOR_TRANSFORM_180;
|
|
case META_ORIENTATION_LEFT_UP:
|
|
return META_MONITOR_TRANSFORM_90;
|
|
case META_ORIENTATION_RIGHT_UP:
|
|
return META_MONITOR_TRANSFORM_270;
|
|
case META_ORIENTATION_UNDEFINED:
|
|
case META_ORIENTATION_NORMAL:
|
|
default:
|
|
return META_MONITOR_TRANSFORM_NORMAL;
|
|
}
|
|
}
|
|
|
|
MetaMonitorTransform
|
|
meta_monitor_transform_invert (MetaMonitorTransform transform)
|
|
{
|
|
switch (transform)
|
|
{
|
|
case META_MONITOR_TRANSFORM_90:
|
|
return META_MONITOR_TRANSFORM_270;
|
|
case META_MONITOR_TRANSFORM_270:
|
|
return META_MONITOR_TRANSFORM_90;
|
|
case META_MONITOR_TRANSFORM_NORMAL:
|
|
case META_MONITOR_TRANSFORM_180:
|
|
case META_MONITOR_TRANSFORM_FLIPPED:
|
|
case META_MONITOR_TRANSFORM_FLIPPED_90:
|
|
case META_MONITOR_TRANSFORM_FLIPPED_180:
|
|
case META_MONITOR_TRANSFORM_FLIPPED_270:
|
|
return transform;
|
|
}
|
|
g_assert_not_reached ();
|
|
return 0;
|
|
}
|
|
|
|
static MetaMonitorTransform
|
|
meta_monitor_transform_flip (MetaMonitorTransform transform)
|
|
{
|
|
switch (transform)
|
|
{
|
|
case META_MONITOR_TRANSFORM_NORMAL:
|
|
return META_MONITOR_TRANSFORM_FLIPPED;
|
|
case META_MONITOR_TRANSFORM_90:
|
|
return META_MONITOR_TRANSFORM_FLIPPED_270;
|
|
case META_MONITOR_TRANSFORM_180:
|
|
return META_MONITOR_TRANSFORM_FLIPPED_180;
|
|
case META_MONITOR_TRANSFORM_270:
|
|
return META_MONITOR_TRANSFORM_FLIPPED_90;
|
|
case META_MONITOR_TRANSFORM_FLIPPED:
|
|
return META_MONITOR_TRANSFORM_NORMAL;
|
|
case META_MONITOR_TRANSFORM_FLIPPED_90:
|
|
return META_MONITOR_TRANSFORM_270;
|
|
case META_MONITOR_TRANSFORM_FLIPPED_180:
|
|
return META_MONITOR_TRANSFORM_180;
|
|
case META_MONITOR_TRANSFORM_FLIPPED_270:
|
|
return META_MONITOR_TRANSFORM_90;
|
|
}
|
|
g_assert_not_reached ();
|
|
return 0;
|
|
}
|
|
|
|
MetaMonitorTransform
|
|
meta_monitor_transform_transform (MetaMonitorTransform transform,
|
|
MetaMonitorTransform other)
|
|
{
|
|
MetaMonitorTransform new_transform;
|
|
gboolean needs_flip = FALSE;
|
|
|
|
if (meta_monitor_transform_is_flipped (other))
|
|
new_transform = meta_monitor_transform_flip (transform);
|
|
else
|
|
new_transform = transform;
|
|
|
|
if (meta_monitor_transform_is_flipped (new_transform))
|
|
needs_flip = TRUE;
|
|
|
|
new_transform += other;
|
|
new_transform %= META_MONITOR_TRANSFORM_FLIPPED;
|
|
|
|
if (needs_flip)
|
|
new_transform += META_MONITOR_TRANSFORM_FLIPPED;
|
|
|
|
return new_transform;
|
|
}
|
|
|
|
void
|
|
meta_monitor_transform_transform_point (MetaMonitorTransform transform,
|
|
int area_width,
|
|
int area_height,
|
|
int x,
|
|
int y,
|
|
int *out_x,
|
|
int *out_y)
|
|
{
|
|
switch (transform)
|
|
{
|
|
case META_MONITOR_TRANSFORM_NORMAL:
|
|
*out_x = x;
|
|
*out_y = y;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_90:
|
|
*out_x = area_width - y;
|
|
*out_y = x;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_180:
|
|
*out_x = area_width - x;
|
|
*out_y = area_height - y;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_270:
|
|
*out_x = y,
|
|
*out_y = area_height - x;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_FLIPPED:
|
|
*out_x = area_width - x;
|
|
*out_y = y;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_FLIPPED_90:
|
|
*out_x = area_width - y;
|
|
*out_y = area_height - x;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_FLIPPED_180:
|
|
*out_x = x;
|
|
*out_y = area_height - y;
|
|
break;
|
|
case META_MONITOR_TRANSFORM_FLIPPED_270:
|
|
*out_x = y;
|
|
*out_y = x;
|
|
break;
|
|
}
|
|
}
|