brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtual-monitor: Split out mode info into separate struct

Browse Source 
Will help when changing virtual monitor modes.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2270>
This commit is contained in:
Jonas Ådahl 2021-12-01 23:24:33 +01:00 committed by Marge Bot
parent a09b99261f
commit 46a4a080b7
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backends/meta-backend-types.h
View File

@ -61,6 +61,7 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
typedef struct _MetaVirtualMonitor MetaVirtualMonitor; typedef struct _MetaVirtualMonitor MetaVirtualMonitor;
typedef struct _MetaVirtualMonitorInfo MetaVirtualMonitorInfo; typedef struct _MetaVirtualMonitorInfo MetaVirtualMonitorInfo;
typedef struct _MetaVirtualModeInfo MetaVirtualModeInfo;
typedef struct _MetaIdleManager MetaIdleManager; typedef struct _MetaIdleManager MetaIdleManager;

8
src/backends/meta-virtual-monitor.c
View File

@ -71,9 +71,11 @@ meta_virtual_monitor_info_new (int width,
MetaVirtualMonitorInfo *info; MetaVirtualMonitorInfo *info;
info = g_new0 (MetaVirtualMonitorInfo, 1); info = g_new0 (MetaVirtualMonitorInfo, 1);
info->width = width; info->mode_info = (MetaVirtualModeInfo) {
info->height = height; .width = width,
info->refresh_rate = refresh_rate; .height = height,
.refresh_rate = refresh_rate,
};
info->vendor = g_strdup (vendor); info->vendor = g_strdup (vendor);
info->product = g_strdup (product); info->product = g_strdup (product);
info->serial = g_strdup (serial); info->serial = g_strdup (serial);

9
src/backends/meta-virtual-monitor.h
View File

@ -26,16 +26,21 @@
#include "backends/meta-backend-types.h" #include "backends/meta-backend-types.h"
#include "core/util-private.h" #include "core/util-private.h"
typedef struct _MetaVirtualMonitorInfo struct _MetaVirtualModeInfo
{ {
int width; int width;
int height; int height;
float refresh_rate; float refresh_rate;
};
struct _MetaVirtualMonitorInfo
{
MetaVirtualModeInfo mode_info;
char *vendor; char *vendor;
char *product; char *product;
char *serial; char *serial;
} MetaVirtualMonitorInfo; };
#define META_TYPE_VIRTUAL_MONITOR (meta_virtual_monitor_get_type ()) #define META_TYPE_VIRTUAL_MONITOR (meta_virtual_monitor_get_type ())
G_DECLARE_DERIVABLE_TYPE (MetaVirtualMonitor, meta_virtual_monitor, G_DECLARE_DERIVABLE_TYPE (MetaVirtualMonitor, meta_virtual_monitor,

4
src/backends/native/meta-crtc-mode-virtual.c
View File

@ -34,8 +34,8 @@ G_DEFINE_TYPE (MetaCrtcModeVirtual, meta_crtc_mode_virtual,
META_TYPE_CRTC_MODE) META_TYPE_CRTC_MODE)
MetaCrtcModeVirtual * MetaCrtcModeVirtual *
meta_crtc_mode_virtual_new (uint64_t id, meta_crtc_mode_virtual_new (uint64_t id,
const MetaVirtualMonitorInfo *info) const MetaVirtualModeInfo *info)
{ {
g_autoptr (MetaCrtcModeInfo) crtc_mode_info = NULL; g_autoptr (MetaCrtcModeInfo) crtc_mode_info = NULL;
g_autofree char *crtc_mode_name = NULL; g_autofree char *crtc_mode_name = NULL;

4
src/backends/native/meta-crtc-mode-virtual.h
View File

@ -28,7 +28,7 @@ G_DECLARE_FINAL_TYPE (MetaCrtcModeVirtual, meta_crtc_mode_virtual,
META, CRTC_MODE_VIRTUAL, META, CRTC_MODE_VIRTUAL,
MetaCrtcMode) MetaCrtcMode)
MetaCrtcModeVirtual * meta_crtc_mode_virtual_new (uint64_t id, MetaCrtcModeVirtual * meta_crtc_mode_virtual_new (uint64_t id,
const MetaVirtualMonitorInfo *info); const MetaVirtualModeInfo *info);
#endif /* META_CRTC_MODE_VIRTUAL_H */ #endif /* META_CRTC_MODE_VIRTUAL_H */

2
src/backends/native/meta-virtual-monitor-native.c
View File

@ -54,7 +54,7 @@ meta_virtual_monitor_native_new (uint64_t id,
MetaOutputVirtual *output_virtual; MetaOutputVirtual *output_virtual;
crtc_virtual = meta_crtc_virtual_new (id); crtc_virtual = meta_crtc_virtual_new (id);
crtc_mode_virtual = meta_crtc_mode_virtual_new (id, info); crtc_mode_virtual = meta_crtc_mode_virtual_new (id, &info->mode_info);
output_virtual = meta_output_virtual_new (id, info, output_virtual = meta_output_virtual_new (id, info,
crtc_virtual, crtc_virtual,
crtc_mode_virtual); crtc_mode_virtual);