panels/display: Remove support for old config system
As mutter now has removed the legacy monitor config system and the associated property on org.gnome.Mutter.DisplayConfig, also remove the support from gnome-control-center. https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl
parent
148dbd1625
commit
ff30244c5c
6 changed files with 9 additions and 1123 deletions
|
|
@ -11,14 +11,10 @@ libdisplay_la_SOURCES = \
|
|||
$(BUILT_SOURCES) \
|
||||
cc-display-config.c \
|
||||
cc-display-config.h \
|
||||
cc-display-config-rr.c \
|
||||
cc-display-config-rr.h \
|
||||
cc-display-config-dbus.c \
|
||||
cc-display-config-dbus.h \
|
||||
cc-display-config-manager.c \
|
||||
cc-display-config-manager.h \
|
||||
cc-display-config-manager-rr.c \
|
||||
cc-display-config-manager-rr.h \
|
||||
cc-display-config-manager-dbus.c \
|
||||
cc-display-config-manager-dbus.h \
|
||||
cc-display-panel.c \
|
||||
|
|
|
|||
|
|
@ -1,116 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*
|
||||
* 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, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "cc-display-config-rr.h"
|
||||
#include "cc-display-config-manager-rr.h"
|
||||
|
||||
#define GNOME_DESKTOP_USE_UNSTABLE_API
|
||||
#include <libgnome-desktop/gnome-rr.h>
|
||||
|
||||
struct _CcDisplayConfigManagerRR
|
||||
{
|
||||
CcDisplayConfigManager parent_instance;
|
||||
|
||||
GnomeRRScreen *rr_screen;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (CcDisplayConfigManagerRR,
|
||||
cc_display_config_manager_rr,
|
||||
CC_TYPE_DISPLAY_CONFIG_MANAGER)
|
||||
|
||||
static CcDisplayConfig *
|
||||
cc_display_config_manager_rr_get_current (CcDisplayConfigManager *pself)
|
||||
{
|
||||
CcDisplayConfigManagerRR *self = CC_DISPLAY_CONFIG_MANAGER_RR (pself);
|
||||
|
||||
if (!self->rr_screen)
|
||||
return NULL;
|
||||
|
||||
return g_object_new (CC_TYPE_DISPLAY_CONFIG_RR,
|
||||
"gnome-rr-screen", self->rr_screen, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
screen_changed (CcDisplayConfigManagerRR *self)
|
||||
{
|
||||
gnome_rr_screen_refresh (self->rr_screen, NULL);
|
||||
_cc_display_config_manager_emit_changed (CC_DISPLAY_CONFIG_MANAGER (self));
|
||||
}
|
||||
|
||||
static void
|
||||
screen_ready (GObject *object,
|
||||
GAsyncResult *result,
|
||||
gpointer data)
|
||||
{
|
||||
CcDisplayConfigManagerRR *self = CC_DISPLAY_CONFIG_MANAGER_RR (data);
|
||||
GError *error = NULL;
|
||||
|
||||
self->rr_screen = gnome_rr_screen_new_finish (result, &error);
|
||||
if (!self->rr_screen)
|
||||
{
|
||||
g_warning ("Error obtaining GnomeRRScreen: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
else
|
||||
{
|
||||
g_signal_connect_object (self->rr_screen, "changed",
|
||||
G_CALLBACK (screen_changed),
|
||||
self,
|
||||
G_CONNECT_SWAPPED);
|
||||
gnome_rr_screen_refresh (self->rr_screen, NULL);
|
||||
}
|
||||
|
||||
_cc_display_config_manager_emit_changed (CC_DISPLAY_CONFIG_MANAGER (self));
|
||||
g_object_unref (self);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_manager_rr_init (CcDisplayConfigManagerRR *self)
|
||||
{
|
||||
gnome_rr_screen_new_async (gdk_screen_get_default (),
|
||||
screen_ready,
|
||||
g_object_ref (self));
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_manager_rr_finalize (GObject *object)
|
||||
{
|
||||
CcDisplayConfigManagerRR *self = CC_DISPLAY_CONFIG_MANAGER_RR (object);
|
||||
|
||||
g_clear_object (&self->rr_screen);
|
||||
|
||||
G_OBJECT_CLASS (cc_display_config_manager_rr_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_manager_rr_class_init (CcDisplayConfigManagerRRClass *klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
CcDisplayConfigManagerClass *parent_class = CC_DISPLAY_CONFIG_MANAGER_CLASS (klass);
|
||||
|
||||
gobject_class->finalize = cc_display_config_manager_rr_finalize;
|
||||
|
||||
parent_class->get_current = cc_display_config_manager_rr_get_current;
|
||||
}
|
||||
|
||||
CcDisplayConfigManager *
|
||||
cc_display_config_manager_rr_new (void)
|
||||
{
|
||||
return g_object_new (CC_TYPE_DISPLAY_CONFIG_MANAGER_RR, NULL);
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*
|
||||
* 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, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _CC_DISPLAY_CONFIG_MANAGER_RR_H
|
||||
#define _CC_DISPLAY_CONFIG_MANAGER_RR_H
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
#include "cc-display-config-manager.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define CC_TYPE_DISPLAY_CONFIG_MANAGER_RR (cc_display_config_manager_rr_get_type ())
|
||||
G_DECLARE_FINAL_TYPE (CcDisplayConfigManagerRR, cc_display_config_manager_rr,
|
||||
CC, DISPLAY_CONFIG_MANAGER_RR, CcDisplayConfigManager)
|
||||
|
||||
CcDisplayConfigManager * cc_display_config_manager_rr_new (void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* _CC_DISPLAY_CONFIG_MANAGER_RR_H */
|
||||
|
|
@ -1,715 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*
|
||||
* 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, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "cc-display-config-rr.h"
|
||||
|
||||
#define GNOME_DESKTOP_USE_UNSTABLE_API
|
||||
#include <libgnome-desktop/gnome-rr.h>
|
||||
#include <libgnome-desktop/gnome-rr-config.h>
|
||||
|
||||
struct _CcDisplayModeRR
|
||||
{
|
||||
CcDisplayMode parent_instance;
|
||||
|
||||
GnomeRRMode *rr_mode;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (CcDisplayModeRR,
|
||||
cc_display_mode_rr,
|
||||
CC_TYPE_DISPLAY_MODE)
|
||||
|
||||
static void
|
||||
cc_display_mode_rr_get_resolution (CcDisplayMode *pself,
|
||||
int *w, int *h)
|
||||
{
|
||||
CcDisplayModeRR *self = CC_DISPLAY_MODE_RR (pself);
|
||||
|
||||
if (w)
|
||||
*w = gnome_rr_mode_get_width (self->rr_mode);
|
||||
if (h)
|
||||
*h = gnome_rr_mode_get_height (self->rr_mode);
|
||||
}
|
||||
|
||||
static double rr_supported_scales[] = { 1.0, 0.0 };
|
||||
|
||||
static const double *
|
||||
cc_display_mode_rr_get_supported_scales (CcDisplayMode *pself)
|
||||
{
|
||||
return rr_supported_scales;
|
||||
}
|
||||
|
||||
static double
|
||||
cc_display_mode_rr_get_preferred_scale (CcDisplayMode *pself)
|
||||
{
|
||||
return rr_supported_scales[0];
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_mode_rr_is_interlaced (CcDisplayMode *pself)
|
||||
{
|
||||
CcDisplayModeRR *self = CC_DISPLAY_MODE_RR (pself);
|
||||
|
||||
return gnome_rr_mode_get_is_interlaced (self->rr_mode);
|
||||
}
|
||||
|
||||
static int
|
||||
cc_display_mode_rr_get_freq (CcDisplayMode *pself)
|
||||
{
|
||||
CcDisplayModeRR *self = CC_DISPLAY_MODE_RR (pself);
|
||||
|
||||
return gnome_rr_mode_get_freq (self->rr_mode);
|
||||
}
|
||||
|
||||
static double
|
||||
cc_display_mode_rr_get_freq_f (CcDisplayMode *pself)
|
||||
{
|
||||
CcDisplayModeRR *self = CC_DISPLAY_MODE_RR (pself);
|
||||
|
||||
return gnome_rr_mode_get_freq_f (self->rr_mode);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_mode_rr_init (CcDisplayModeRR *self)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_mode_rr_finalize (GObject *object)
|
||||
{
|
||||
G_OBJECT_CLASS (cc_display_mode_rr_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_mode_rr_class_init (CcDisplayModeRRClass *klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
CcDisplayModeClass *parent_class = CC_DISPLAY_MODE_CLASS (klass);
|
||||
|
||||
gobject_class->finalize = cc_display_mode_rr_finalize;
|
||||
|
||||
parent_class->get_resolution = cc_display_mode_rr_get_resolution;
|
||||
parent_class->get_supported_scales = cc_display_mode_rr_get_supported_scales;
|
||||
parent_class->get_preferred_scale = cc_display_mode_rr_get_preferred_scale;
|
||||
parent_class->is_interlaced = cc_display_mode_rr_is_interlaced;
|
||||
parent_class->get_freq = cc_display_mode_rr_get_freq;
|
||||
parent_class->get_freq_f = cc_display_mode_rr_get_freq_f;
|
||||
}
|
||||
|
||||
static CcDisplayMode *
|
||||
cc_display_mode_rr_new (GnomeRRMode *mode)
|
||||
{
|
||||
CcDisplayModeRR *self = g_object_new (CC_TYPE_DISPLAY_MODE_RR, NULL);
|
||||
self->rr_mode = mode;
|
||||
|
||||
return CC_DISPLAY_MODE (self);
|
||||
}
|
||||
|
||||
|
||||
static const GnomeRRRotation rotation_map[] =
|
||||
{
|
||||
GNOME_RR_ROTATION_0,
|
||||
GNOME_RR_ROTATION_90,
|
||||
GNOME_RR_ROTATION_180,
|
||||
GNOME_RR_ROTATION_270,
|
||||
GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_0,
|
||||
GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_90,
|
||||
GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_180,
|
||||
GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_270,
|
||||
};
|
||||
|
||||
struct _CcDisplayMonitorRR
|
||||
{
|
||||
CcDisplayMonitor parent_instance;
|
||||
CcDisplayConfigRR *config;
|
||||
|
||||
GnomeRROutput *output;
|
||||
GnomeRROutputInfo *output_info;
|
||||
|
||||
GList *modes;
|
||||
CcDisplayMode *current_mode;
|
||||
CcDisplayMode *preferred_mode;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (CcDisplayMonitorRR,
|
||||
cc_display_monitor_rr,
|
||||
CC_TYPE_DISPLAY_MONITOR)
|
||||
|
||||
static void
|
||||
cc_display_config_rr_set_primary (CcDisplayConfigRR *self,
|
||||
CcDisplayMonitorRR *new_primary);
|
||||
static void
|
||||
cc_display_config_rr_unset_primary (CcDisplayConfigRR *self,
|
||||
CcDisplayMonitorRR *old_primary);
|
||||
|
||||
static const char *
|
||||
cc_display_monitor_rr_get_display_name (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_get_display_name (self->output_info);
|
||||
}
|
||||
|
||||
static const char *
|
||||
cc_display_monitor_rr_get_connector_name (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_get_name (self->output);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_monitor_rr_is_builtin (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_is_builtin_display (self->output);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_monitor_rr_is_primary (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_get_primary (self->output_info);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_primary (CcDisplayMonitor *pself,
|
||||
gboolean primary)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
if (primary)
|
||||
cc_display_config_rr_set_primary (self->config, self);
|
||||
else
|
||||
cc_display_config_rr_unset_primary (self->config, self);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_monitor_rr_is_active (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_is_active (self->output_info);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_active (CcDisplayMonitor *pself,
|
||||
gboolean active)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
gnome_rr_output_info_set_active (self->output_info, active);
|
||||
g_signal_emit_by_name (self, "active");
|
||||
}
|
||||
|
||||
static CcDisplayRotation
|
||||
cc_display_monitor_rr_get_rotation (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS (rotation_map); ++i)
|
||||
if (rotation_map[i] == gnome_rr_output_info_get_rotation (self->output_info))
|
||||
return i;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_rotation (CcDisplayMonitor *pself,
|
||||
CcDisplayRotation rotation)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
gnome_rr_output_info_set_rotation (self->output_info,
|
||||
rotation_map[rotation]);
|
||||
g_signal_emit_by_name (self, "rotation");
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_monitor_rr_supports_rotation (CcDisplayMonitor *pself,
|
||||
CcDisplayRotation rotation)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_supports_rotation (self->output_info,
|
||||
rotation_map[rotation]);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_get_physical_size (CcDisplayMonitor *pself,
|
||||
int *w, int *h)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_get_physical_size (self->output, w, h);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_get_geometry (CcDisplayMonitor *pself,
|
||||
int *x, int *y, int *w, int *h)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_get_geometry (self->output_info, x, y, w, h);
|
||||
}
|
||||
|
||||
static CcDisplayMode *
|
||||
cc_display_monitor_rr_get_mode (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return self->current_mode;
|
||||
}
|
||||
|
||||
static CcDisplayMode *
|
||||
cc_display_monitor_rr_get_preferred_mode (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return self->preferred_mode;
|
||||
}
|
||||
|
||||
static guint32
|
||||
cc_display_monitor_rr_get_id (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_get_id (self->output);
|
||||
}
|
||||
|
||||
static GList *
|
||||
cc_display_monitor_rr_get_modes (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return self->modes;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_monitor_rr_supports_underscanning (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_supports_underscanning (self->output);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_monitor_rr_get_underscanning (CcDisplayMonitor *pself)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_get_underscanning (self->output_info);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_underscanning (CcDisplayMonitor *pself,
|
||||
gboolean underscanning)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
|
||||
return gnome_rr_output_info_set_underscanning (self->output_info, underscanning);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_mode (CcDisplayMonitor *pself,
|
||||
CcDisplayMode *mode)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
int x, y, w, h;
|
||||
|
||||
gnome_rr_output_info_get_geometry (self->output_info, &x, &y, NULL, NULL);
|
||||
cc_display_mode_get_resolution (mode, &w, &h);
|
||||
gnome_rr_output_info_set_geometry (self->output_info, x, y, w, h);
|
||||
|
||||
gnome_rr_output_info_set_refresh_rate (self->output_info,
|
||||
cc_display_mode_get_freq (mode));
|
||||
g_signal_emit_by_name (self, "mode");
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_position (CcDisplayMonitor *pself,
|
||||
int x, int y)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (pself);
|
||||
int w, h;
|
||||
|
||||
gnome_rr_output_info_get_geometry (self->output_info, NULL, NULL, &w, &h);
|
||||
gnome_rr_output_info_set_geometry (self->output_info, x, y, w, h);
|
||||
}
|
||||
|
||||
static double
|
||||
cc_display_monitor_rr_get_scale (CcDisplayMonitor *pself)
|
||||
{
|
||||
return rr_supported_scales[0];
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_set_scale (CcDisplayMonitor *pself,
|
||||
double scale)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_init (CcDisplayMonitorRR *self)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_finalize (GObject *object)
|
||||
{
|
||||
CcDisplayMonitorRR *self = CC_DISPLAY_MONITOR_RR (object);
|
||||
|
||||
g_list_foreach (self->modes, (GFunc) g_object_unref, NULL);
|
||||
g_clear_pointer (&self->modes, g_list_free);
|
||||
|
||||
G_OBJECT_CLASS (cc_display_monitor_rr_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_monitor_rr_class_init (CcDisplayMonitorRRClass *klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
CcDisplayMonitorClass *parent_class = CC_DISPLAY_MONITOR_CLASS (klass);
|
||||
|
||||
gobject_class->finalize = cc_display_monitor_rr_finalize;
|
||||
|
||||
parent_class->get_display_name = cc_display_monitor_rr_get_display_name;
|
||||
parent_class->get_connector_name = cc_display_monitor_rr_get_connector_name;
|
||||
parent_class->is_builtin = cc_display_monitor_rr_is_builtin;
|
||||
parent_class->is_primary = cc_display_monitor_rr_is_primary;
|
||||
parent_class->set_primary = cc_display_monitor_rr_set_primary;
|
||||
parent_class->is_active = cc_display_monitor_rr_is_active;
|
||||
parent_class->set_active = cc_display_monitor_rr_set_active;
|
||||
parent_class->get_rotation = cc_display_monitor_rr_get_rotation;
|
||||
parent_class->set_rotation = cc_display_monitor_rr_set_rotation;
|
||||
parent_class->supports_rotation = cc_display_monitor_rr_supports_rotation;
|
||||
parent_class->get_physical_size = cc_display_monitor_rr_get_physical_size;
|
||||
parent_class->get_geometry = cc_display_monitor_rr_get_geometry;
|
||||
parent_class->get_mode = cc_display_monitor_rr_get_mode;
|
||||
parent_class->get_preferred_mode = cc_display_monitor_rr_get_preferred_mode;
|
||||
parent_class->get_id = cc_display_monitor_rr_get_id;
|
||||
parent_class->get_modes = cc_display_monitor_rr_get_modes;
|
||||
parent_class->supports_underscanning = cc_display_monitor_rr_supports_underscanning;
|
||||
parent_class->get_underscanning = cc_display_monitor_rr_get_underscanning;
|
||||
parent_class->set_underscanning = cc_display_monitor_rr_set_underscanning;
|
||||
parent_class->set_mode = cc_display_monitor_rr_set_mode;
|
||||
parent_class->set_position = cc_display_monitor_rr_set_position;
|
||||
parent_class->get_scale = cc_display_monitor_rr_get_scale;
|
||||
parent_class->set_scale = cc_display_monitor_rr_set_scale;
|
||||
}
|
||||
|
||||
static CcDisplayMonitor *
|
||||
cc_display_monitor_rr_new (GnomeRROutput *output,
|
||||
GnomeRROutputInfo *output_info,
|
||||
CcDisplayConfigRR *config)
|
||||
{
|
||||
CcDisplayMonitorRR *self = g_object_new (CC_TYPE_DISPLAY_MONITOR_RR, NULL);
|
||||
GnomeRRMode **modes = gnome_rr_output_list_modes (output);
|
||||
GnomeRRMode *preferred_mode = gnome_rr_output_get_preferred_mode (output);
|
||||
GnomeRRMode *current_mode = gnome_rr_output_get_current_mode (output);
|
||||
gint i;
|
||||
|
||||
self->config = config;
|
||||
self->output = output;
|
||||
self->output_info = output_info;
|
||||
|
||||
for (i = 0; modes[i] != NULL; ++i)
|
||||
{
|
||||
CcDisplayMode *mode = cc_display_mode_rr_new (modes[i]);
|
||||
self->modes = g_list_prepend (self->modes, mode);
|
||||
|
||||
if (current_mode &&
|
||||
gnome_rr_mode_get_id (current_mode) == gnome_rr_mode_get_id (modes[i]))
|
||||
self->current_mode = mode;
|
||||
|
||||
if (preferred_mode &&
|
||||
gnome_rr_mode_get_id (preferred_mode) == gnome_rr_mode_get_id (modes[i]))
|
||||
self->preferred_mode = mode;
|
||||
}
|
||||
|
||||
return CC_DISPLAY_MONITOR (self);
|
||||
}
|
||||
|
||||
struct _CcDisplayConfigRR
|
||||
{
|
||||
CcDisplayConfig parent_instance;
|
||||
|
||||
GnomeRRScreen *rr_screen;
|
||||
GnomeRRConfig *rr_config;
|
||||
|
||||
GList *monitors;
|
||||
CcDisplayMonitorRR *primary;
|
||||
GList *clone_modes;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (CcDisplayConfigRR,
|
||||
cc_display_config_rr,
|
||||
CC_TYPE_DISPLAY_CONFIG)
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
PROP_GNOME_RR_SCREEN,
|
||||
};
|
||||
|
||||
static void
|
||||
cc_display_config_rr_set_primary (CcDisplayConfigRR *self,
|
||||
CcDisplayMonitorRR *new_primary)
|
||||
{
|
||||
if (self->primary == new_primary)
|
||||
return;
|
||||
|
||||
gnome_rr_output_info_set_primary (self->primary->output_info, FALSE);
|
||||
g_signal_emit_by_name (self->primary, "primary");
|
||||
|
||||
self->primary = new_primary;
|
||||
gnome_rr_output_info_set_primary (self->primary->output_info, TRUE);
|
||||
g_signal_emit_by_name (self->primary, "primary");
|
||||
|
||||
g_signal_emit_by_name (self, "primary");
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_unset_primary (CcDisplayConfigRR *self,
|
||||
CcDisplayMonitorRR *old_primary)
|
||||
{
|
||||
GList *l;
|
||||
|
||||
if (self->primary != old_primary)
|
||||
return;
|
||||
|
||||
for (l = self->monitors; l != NULL; l = l->next)
|
||||
{
|
||||
CcDisplayMonitorRR *monitor = l->data;
|
||||
if (gnome_rr_output_info_is_active (monitor->output_info) &&
|
||||
monitor != old_primary)
|
||||
{
|
||||
cc_display_config_rr_set_primary (self, monitor);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static GList *
|
||||
cc_display_config_rr_get_monitors (CcDisplayConfig *pself)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
|
||||
return self->monitors;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_config_rr_is_applicable (CcDisplayConfig *pself)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
|
||||
return gnome_rr_config_applicable (self->rr_config, self->rr_screen, NULL);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_config_rr_equal (CcDisplayConfig *pself,
|
||||
CcDisplayConfig *pother)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
CcDisplayConfigRR *other = CC_DISPLAY_CONFIG_RR (pother);
|
||||
gboolean same_modes, same_primary, same_cloning;
|
||||
|
||||
same_modes = gnome_rr_config_equal (self->rr_config, other->rr_config);
|
||||
same_primary = (gnome_rr_output_get_id (self->primary->output) ==
|
||||
gnome_rr_output_get_id (other->primary->output));
|
||||
same_cloning = (gnome_rr_config_get_clone (self->rr_config) ==
|
||||
gnome_rr_config_get_clone (other->rr_config));
|
||||
return same_modes && same_primary && same_cloning;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_config_rr_apply (CcDisplayConfig *pself,
|
||||
GError **error)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
|
||||
gnome_rr_config_sanitize (self->rr_config);
|
||||
gnome_rr_config_ensure_primary (self->rr_config);
|
||||
|
||||
return gnome_rr_config_apply_persistent (self->rr_config, self->rr_screen, error);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_config_rr_is_cloning (CcDisplayConfig *pself)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
|
||||
return gnome_rr_config_get_clone (self->rr_config);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_set_cloning (CcDisplayConfig *pself,
|
||||
gboolean clone)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
|
||||
return gnome_rr_config_set_clone (self->rr_config, clone);
|
||||
}
|
||||
|
||||
static GList *
|
||||
cc_display_config_rr_get_cloning_modes (CcDisplayConfig *pself)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (pself);
|
||||
|
||||
return self->clone_modes;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cc_display_config_rr_is_layout_logical (CcDisplayConfig *pself)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_init (CcDisplayConfigRR *self)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_constructed (GObject *object)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (object);
|
||||
GnomeRROutputInfo **output_infos;
|
||||
GnomeRRMode **clone_modes;
|
||||
gint i;
|
||||
|
||||
self->rr_config = gnome_rr_config_new_current (self->rr_screen, NULL);
|
||||
gnome_rr_config_ensure_primary (self->rr_config);
|
||||
|
||||
output_infos = gnome_rr_config_get_outputs (self->rr_config);
|
||||
|
||||
for (i = 0; output_infos[i] != NULL; ++i)
|
||||
{
|
||||
GnomeRROutput *output;
|
||||
CcDisplayMonitor *monitor;
|
||||
|
||||
if (!gnome_rr_output_info_is_primary_tile (output_infos[i]))
|
||||
continue;
|
||||
|
||||
output = gnome_rr_screen_get_output_by_name (self->rr_screen,
|
||||
gnome_rr_output_info_get_name (output_infos[i]));
|
||||
|
||||
monitor = cc_display_monitor_rr_new (output, output_infos[i], self);
|
||||
self->monitors = g_list_prepend (self->monitors, monitor);
|
||||
|
||||
if (cc_display_monitor_is_primary (monitor))
|
||||
self->primary = CC_DISPLAY_MONITOR_RR (monitor);
|
||||
}
|
||||
|
||||
clone_modes = gnome_rr_screen_list_clone_modes (self->rr_screen);
|
||||
|
||||
for (i = 0; clone_modes[i] != NULL; ++i)
|
||||
{
|
||||
CcDisplayMode *mode = cc_display_mode_rr_new (clone_modes[i]);
|
||||
self->clone_modes = g_list_prepend (self->clone_modes, mode);
|
||||
}
|
||||
|
||||
G_OBJECT_CLASS (cc_display_config_rr_parent_class)->constructed (object);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (object);
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_GNOME_RR_SCREEN:
|
||||
self->rr_screen = g_value_dup_object (value);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (object);
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_GNOME_RR_SCREEN:
|
||||
g_value_set_object (value, self->rr_screen);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_finalize (GObject *object)
|
||||
{
|
||||
CcDisplayConfigRR *self = CC_DISPLAY_CONFIG_RR (object);
|
||||
|
||||
g_clear_object (&self->rr_screen);
|
||||
g_clear_object (&self->rr_config);
|
||||
|
||||
g_list_foreach (self->monitors, (GFunc) g_object_unref, NULL);
|
||||
g_clear_pointer (&self->monitors, g_list_free);
|
||||
|
||||
g_list_foreach (self->clone_modes, (GFunc) g_object_unref, NULL);
|
||||
g_clear_pointer (&self->clone_modes, g_list_free);
|
||||
|
||||
G_OBJECT_CLASS (cc_display_config_rr_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_rr_class_init (CcDisplayConfigRRClass *klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
CcDisplayConfigClass *parent_class = CC_DISPLAY_CONFIG_CLASS (klass);
|
||||
GParamSpec *pspec;
|
||||
|
||||
gobject_class->constructed = cc_display_config_rr_constructed;
|
||||
gobject_class->set_property = cc_display_config_rr_set_property;
|
||||
gobject_class->get_property = cc_display_config_rr_get_property;
|
||||
gobject_class->finalize = cc_display_config_rr_finalize;
|
||||
|
||||
parent_class->get_monitors = cc_display_config_rr_get_monitors;
|
||||
parent_class->is_applicable = cc_display_config_rr_is_applicable;
|
||||
parent_class->equal = cc_display_config_rr_equal;
|
||||
parent_class->apply = cc_display_config_rr_apply;
|
||||
parent_class->is_cloning = cc_display_config_rr_is_cloning;
|
||||
parent_class->set_cloning = cc_display_config_rr_set_cloning;
|
||||
parent_class->get_cloning_modes = cc_display_config_rr_get_cloning_modes;
|
||||
parent_class->is_layout_logical = cc_display_config_rr_is_layout_logical;
|
||||
|
||||
pspec = g_param_spec_object ("gnome-rr-screen",
|
||||
"GnomeRRScreen",
|
||||
"GnomeRRScreen",
|
||||
GNOME_TYPE_RR_SCREEN,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_STATIC_STRINGS |
|
||||
G_PARAM_CONSTRUCT_ONLY);
|
||||
g_object_class_install_property (gobject_class, PROP_GNOME_RR_SCREEN, pspec);
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*
|
||||
* 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, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _CC_DISPLAY_CONFIG_RR_H
|
||||
#define _CC_DISPLAY_CONFIG_RR_H
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
#include "cc-display-config.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define CC_TYPE_DISPLAY_MODE_RR (cc_display_mode_rr_get_type ())
|
||||
G_DECLARE_FINAL_TYPE (CcDisplayModeRR, cc_display_mode_rr,
|
||||
CC, DISPLAY_MODE_RR, CcDisplayMode)
|
||||
|
||||
#define CC_TYPE_DISPLAY_MONITOR_RR (cc_display_monitor_rr_get_type ())
|
||||
G_DECLARE_FINAL_TYPE (CcDisplayMonitorRR, cc_display_monitor_rr,
|
||||
CC, DISPLAY_MONITOR_RR, CcDisplayMonitor)
|
||||
|
||||
#define CC_TYPE_DISPLAY_CONFIG_RR (cc_display_config_rr_get_type ())
|
||||
G_DECLARE_FINAL_TYPE (CcDisplayConfigRR, cc_display_config_rr,
|
||||
CC, DISPLAY_CONFIG_RR, CcDisplayConfig)
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* _CC_DISPLAY_CONFIG_RR_H */
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
#include "shell/list-box-helper.h"
|
||||
#include <libupower-glib/upower.h>
|
||||
|
||||
#include "cc-display-config-manager-rr.h"
|
||||
#include "cc-display-config-manager-dbus.h"
|
||||
#include "cc-display-config.h"
|
||||
#include "cc-night-light-dialog.h"
|
||||
|
|
@ -60,7 +59,6 @@ enum
|
|||
|
||||
struct _CcDisplayPanelPrivate
|
||||
{
|
||||
gboolean have_new_dbus_api;
|
||||
CcDisplayConfigManager *manager;
|
||||
CcDisplayConfig *current_config;
|
||||
CcDisplayMonitor *current_output;
|
||||
|
|
@ -126,14 +124,6 @@ on_area_paint (FooScrollArea *area,
|
|||
static char *
|
||||
make_display_size_string (int width_mm,
|
||||
int height_mm);
|
||||
static void
|
||||
realign_outputs_after_resolution_change (CcDisplayPanel *self,
|
||||
CcDisplayMonitor *output_that_changed,
|
||||
int old_width,
|
||||
int old_height,
|
||||
CcDisplayRotation old_rotation);
|
||||
static void
|
||||
lay_out_outputs_horizontally (CcDisplayPanel *self);
|
||||
|
||||
static char *
|
||||
make_output_ui_name (CcDisplayMonitor *output)
|
||||
|
|
@ -225,14 +215,9 @@ monitor_labeler_show (CcDisplayPanel *self)
|
|||
if (number == 0)
|
||||
continue;
|
||||
|
||||
if (priv->have_new_dbus_api)
|
||||
g_variant_builder_add (&builder, "{sv}",
|
||||
cc_display_monitor_get_connector_name (output),
|
||||
g_variant_new_int32 (number));
|
||||
else
|
||||
g_variant_builder_add (&builder, "{uv}",
|
||||
cc_display_monitor_get_id (output),
|
||||
g_variant_new_int32 (number));
|
||||
g_variant_builder_add (&builder, "{sv}",
|
||||
cc_display_monitor_get_connector_name (output),
|
||||
g_variant_new_int32 (number));
|
||||
}
|
||||
|
||||
g_variant_builder_close (&builder);
|
||||
|
|
@ -241,7 +226,7 @@ monitor_labeler_show (CcDisplayPanel *self)
|
|||
return monitor_labeler_hide (self);
|
||||
|
||||
g_dbus_proxy_call (priv->shell_proxy,
|
||||
priv->have_new_dbus_api ? "ShowMonitorLabels2" : "ShowMonitorLabels",
|
||||
"ShowMonitorLabels2",
|
||||
g_variant_builder_end (&builder),
|
||||
G_DBUS_CALL_FLAGS_NONE,
|
||||
-1, NULL, NULL, NULL);
|
||||
|
|
@ -769,13 +754,11 @@ orientation_row_activated (CcDisplayPanel *panel,
|
|||
{
|
||||
CcDisplayPanelPrivate *priv = panel->priv;
|
||||
CcDisplayRotation rotation = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (row), "rotation"));
|
||||
CcDisplayRotation old_rotation = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (priv->current_output), "old-rotation"));
|
||||
int width, height;
|
||||
|
||||
cc_display_monitor_get_geometry (priv->current_output, NULL, NULL, &width, &height);
|
||||
|
||||
cc_display_monitor_set_rotation (priv->current_output, rotation);
|
||||
realign_outputs_after_resolution_change (panel, priv->current_output, width, height, old_rotation);
|
||||
update_apply_button (panel);
|
||||
}
|
||||
|
||||
|
|
@ -868,12 +851,8 @@ resolution_row_activated (CcDisplayPanel *panel,
|
|||
{
|
||||
CcDisplayPanelPrivate *priv = panel->priv;
|
||||
CcDisplayMode *mode = g_object_get_data (G_OBJECT (row), "mode");
|
||||
int old_width = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (priv->current_output), "old-width"));
|
||||
int old_height = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (priv->current_output), "old-height"));
|
||||
|
||||
cc_display_monitor_set_mode (priv->current_output, mode);
|
||||
realign_outputs_after_resolution_change (panel, priv->current_output, old_width, old_height,
|
||||
cc_display_monitor_get_rotation (priv->current_output));
|
||||
update_apply_button (panel);
|
||||
}
|
||||
|
||||
|
|
@ -1870,7 +1849,6 @@ two_output_visible_child_changed (CcDisplayPanel *panel,
|
|||
if (cc_display_config_is_cloning (priv->current_config))
|
||||
{
|
||||
cc_display_config_set_cloning (priv->current_config, FALSE);
|
||||
lay_out_outputs_horizontally (panel);
|
||||
}
|
||||
single = g_str_equal (gtk_stack_get_visible_child_name (GTK_STACK (stack)), "single");
|
||||
outputs = cc_display_config_get_monitors (priv->current_config);
|
||||
|
|
@ -2168,133 +2146,6 @@ on_screen_changed (CcDisplayPanel *panel)
|
|||
gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), "error");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
realign_outputs_after_resolution_change (CcDisplayPanel *self, CcDisplayMonitor *output_that_changed, int old_width, int old_height, CcDisplayRotation old_rotation)
|
||||
{
|
||||
/* We find the outputs that were below or to the right of the output that
|
||||
* changed, and realign them; we also do that for outputs that shared the
|
||||
* right/bottom edges with the output that changed. The outputs that are
|
||||
* above or to the left of that output don't need to change.
|
||||
*/
|
||||
|
||||
int old_right_edge, old_bottom_edge;
|
||||
int dx, dy;
|
||||
int x, y, width, height;
|
||||
GList *outputs, *l;
|
||||
CcDisplayRotation rotation;
|
||||
|
||||
if (self->priv->have_new_dbus_api)
|
||||
return;
|
||||
|
||||
g_assert (self->priv->current_config != NULL);
|
||||
|
||||
cc_display_monitor_get_geometry (output_that_changed, &x, &y, &width, &height);
|
||||
rotation = cc_display_monitor_get_rotation (output_that_changed);
|
||||
|
||||
if (width == old_width && height == old_height && rotation == old_rotation)
|
||||
{
|
||||
g_debug ("Not realigning outputs, configuration is the same for %s", cc_display_monitor_get_display_name (output_that_changed));
|
||||
return;
|
||||
}
|
||||
|
||||
g_debug ("Realigning outputs, configuration changed for %s", cc_display_monitor_get_display_name (output_that_changed));
|
||||
|
||||
/* Apply rotation to the geometry of the newly changed output,
|
||||
* as well as to its old configuration */
|
||||
apply_rotation_to_geometry (output_that_changed, &width, &height);
|
||||
if ((old_rotation == CC_DISPLAY_ROTATION_90) || (old_rotation == CC_DISPLAY_ROTATION_270))
|
||||
{
|
||||
int tmp;
|
||||
tmp = old_height;
|
||||
old_height = old_width;
|
||||
old_width = tmp;
|
||||
}
|
||||
|
||||
old_right_edge = x + old_width;
|
||||
old_bottom_edge = y + old_height;
|
||||
|
||||
dx = width - old_width;
|
||||
dy = height - old_height;
|
||||
|
||||
outputs = cc_display_config_get_monitors (self->priv->current_config);
|
||||
|
||||
for (l = outputs; l != NULL; l = l->next)
|
||||
{
|
||||
CcDisplayMonitor *output = l->data;
|
||||
int output_x, output_y;
|
||||
int output_width, output_height;
|
||||
|
||||
if (output == output_that_changed)
|
||||
continue;
|
||||
|
||||
cc_display_monitor_get_geometry (output, &output_x, &output_y, &output_width, &output_height);
|
||||
|
||||
if (output_x >= old_right_edge)
|
||||
output_x += dx;
|
||||
else if (output_x + output_width == old_right_edge)
|
||||
output_x = x + width - output_width;
|
||||
|
||||
if (output_y >= old_bottom_edge)
|
||||
output_y += dy;
|
||||
else if (output_y + output_height == old_bottom_edge)
|
||||
output_y = y + height - output_height;
|
||||
|
||||
g_debug ("Setting geometry for %s: %dx%d+%d+%d", cc_display_monitor_get_display_name (output), output_width, output_height, output_x, output_y);
|
||||
cc_display_monitor_set_position (output, output_x, output_y);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
lay_out_outputs_horizontally (CcDisplayPanel *self)
|
||||
{
|
||||
int x;
|
||||
GList *outputs, *l;
|
||||
|
||||
if (self->priv->have_new_dbus_api)
|
||||
return;
|
||||
|
||||
/* Lay out all the monitors horizontally when "mirror screens" is turned
|
||||
* off, to avoid having all of them overlapped initially. We put the
|
||||
* outputs turned off on the right-hand side.
|
||||
*/
|
||||
|
||||
x = 0;
|
||||
|
||||
/* First pass, all "on" outputs */
|
||||
outputs = cc_display_config_get_monitors (self->priv->current_config);
|
||||
|
||||
for (l = outputs; l != NULL; l = l->next)
|
||||
{
|
||||
CcDisplayMonitor *output = l->data;
|
||||
int width;
|
||||
if (cc_display_monitor_is_active (output))
|
||||
{
|
||||
cc_display_mode_get_resolution (cc_display_monitor_get_mode (output),
|
||||
&width, NULL);
|
||||
cc_display_monitor_set_position (output, x, 0);
|
||||
x += width;
|
||||
}
|
||||
}
|
||||
|
||||
/* Second pass, all the black screens */
|
||||
|
||||
for (l = outputs; l != NULL; l = l->next)
|
||||
{
|
||||
CcDisplayMonitor *output = l->data;
|
||||
int width;
|
||||
if (!cc_display_monitor_is_active (output))
|
||||
{
|
||||
cc_display_mode_get_resolution (cc_display_monitor_get_mode (output),
|
||||
&width, NULL);
|
||||
cc_display_monitor_set_position (output, x, 0);
|
||||
x += width;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#define SPACE 15
|
||||
#define MARGIN 15
|
||||
|
||||
|
|
@ -3362,47 +3213,6 @@ make_night_light_widget (CcDisplayPanel *self)
|
|||
return frame;
|
||||
}
|
||||
|
||||
static void
|
||||
init_config_manager (GObject *source,
|
||||
GAsyncResult *res,
|
||||
CcDisplayPanel *self)
|
||||
{
|
||||
GVariant *variant;
|
||||
GDBusConnection *bus = G_DBUS_CONNECTION (source);
|
||||
GError *error = NULL;
|
||||
|
||||
variant = g_dbus_connection_call_finish (bus, res, &error);
|
||||
if (!variant)
|
||||
{
|
||||
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
||||
goto out;
|
||||
}
|
||||
else
|
||||
{
|
||||
GVariant *value = NULL;
|
||||
|
||||
g_variant_get_child (variant, 0, "v", &value);
|
||||
g_variant_get (value, "b", &self->priv->have_new_dbus_api);
|
||||
|
||||
g_variant_unref (value);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
|
||||
if (self->priv->have_new_dbus_api)
|
||||
self->priv->manager = cc_display_config_manager_dbus_new ();
|
||||
else
|
||||
self->priv->manager = cc_display_config_manager_rr_new ();
|
||||
|
||||
g_signal_connect_object (self->priv->manager, "changed",
|
||||
G_CALLBACK (on_screen_changed),
|
||||
self,
|
||||
G_CONNECT_SWAPPED);
|
||||
|
||||
out:
|
||||
g_clear_error (&error);
|
||||
g_object_unref (bus);
|
||||
}
|
||||
|
||||
static void
|
||||
session_bus_ready (GObject *source,
|
||||
GAsyncResult *res,
|
||||
|
|
@ -3423,20 +3233,11 @@ session_bus_ready (GObject *source,
|
|||
return;
|
||||
}
|
||||
|
||||
g_dbus_connection_call (bus,
|
||||
"org.gnome.Mutter.DisplayConfig",
|
||||
"/org/gnome/Mutter/DisplayConfig",
|
||||
"org.freedesktop.DBus.Properties",
|
||||
"Get",
|
||||
g_variant_new ("(ss)",
|
||||
"org.gnome.Mutter.DisplayConfig",
|
||||
"IsExperimentalApiEnabled"),
|
||||
NULL,
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
-1,
|
||||
self->priv->shell_cancellable,
|
||||
(GAsyncReadyCallback) init_config_manager,
|
||||
self);
|
||||
self->priv->manager = cc_display_config_manager_dbus_new ();
|
||||
g_signal_connect_object (self->priv->manager, "changed",
|
||||
G_CALLBACK (on_screen_changed),
|
||||
self,
|
||||
G_CONNECT_SWAPPED);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue