monitor-manager: Rename *Info structs to *Assignment
MetaCrtcInfo and MetaOutputInfo did not represent information about MetaCrtc and MetaOutput, but the result of the monitor configuration assignment algorithm, thus rename it to MetaCrtcAssignment and MetaOutputAssignment. The purpose for this is to be able to introduce a struct that actually carries information about the CRTCs and outputs, as retrieved from the backend implementations. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1287
This commit is contained in:

committed by
Georges Basile Stavracas Neto

parent
f71316c850
commit
b69111d8e6
@ -63,12 +63,12 @@ typedef enum _MetaLogicalMonitorLayoutMode
|
||||
} MetaLogicalMonitorLayoutMode;
|
||||
|
||||
/*
|
||||
* MetaCrtcInfo:
|
||||
* MetaCrtcAssignment:
|
||||
*
|
||||
* A representation of a CRTC configuration, generated by
|
||||
* MetaMonitorConfigManager.
|
||||
*/
|
||||
struct _MetaCrtcInfo
|
||||
struct _MetaCrtcAssignment
|
||||
{
|
||||
MetaCrtc *crtc;
|
||||
MetaCrtcMode *mode;
|
||||
@ -78,12 +78,12 @@ struct _MetaCrtcInfo
|
||||
};
|
||||
|
||||
/*
|
||||
* MetaOutputInfo:
|
||||
* MetaOutputAssignment:
|
||||
*
|
||||
* A representation of a connector configuration, generated by
|
||||
* MetaMonitorConfigManager.
|
||||
*/
|
||||
struct _MetaOutputInfo
|
||||
struct _MetaOutputAssignment
|
||||
{
|
||||
MetaOutput *output;
|
||||
gboolean is_primary;
|
||||
@ -387,19 +387,19 @@ gboolean meta_monitor_has_aspect_as_size (MetaMonitor *monitor);
|
||||
char * meta_monitor_manager_get_vendor_name (MetaMonitorManager *manager,
|
||||
const char *vendor);
|
||||
|
||||
static inline MetaOutputInfo *
|
||||
meta_find_output_info (MetaOutputInfo **outputs,
|
||||
unsigned int n_outputs,
|
||||
MetaOutput *output)
|
||||
static inline MetaOutputAssignment *
|
||||
meta_find_output_assignment (MetaOutputAssignment **outputs,
|
||||
unsigned int n_outputs,
|
||||
MetaOutput *output)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < n_outputs; i++)
|
||||
{
|
||||
MetaOutputInfo *output_info = outputs[i];
|
||||
MetaOutputAssignment *output_assignment = outputs[i];
|
||||
|
||||
if (output == output_info->output)
|
||||
return output_info;
|
||||
if (output == output_assignment->output)
|
||||
return output_assignment;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
Reference in New Issue
Block a user