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

Rename monitor => meta-monitor-manager

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-31 22:04:10 -04:00
parent 28b9160c01
commit ccced506ed
14 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -141,10 +141,10 @@ libmutter_wayland_la_SOURCES = \
core/meta-idle-monitor-native.c \ core/meta-idle-monitor-native.c \
core/meta-idle-monitor-native.h \ core/meta-idle-monitor-native.h \
core/meta-xrandr-shared.h \ core/meta-xrandr-shared.h \
core/monitor.c \
core/monitor-private.h \
core/meta-monitor-config.c \ core/meta-monitor-config.c \
core/meta-monitor-config.h \ core/meta-monitor-config.h \
core/meta-monitor-manager.c \
core/meta-monitor-manager.h \
core/meta-monitor-manager-dummy.c \ core/meta-monitor-manager-dummy.c \
core/meta-monitor-manager-dummy.h \ core/meta-monitor-manager-dummy.h \
core/meta-monitor-manager-kms.c \ core/meta-monitor-manager-kms.c \

2
src/compositor/meta-plugin.c
View File

@ -40,7 +40,7 @@
#include "compositor-private.h" #include "compositor-private.h"
#include "meta-window-actor-private.h" #include "meta-window-actor-private.h"
#include "monitor-private.h" #include "meta-monitor-manager.h"
G_DEFINE_ABSTRACT_TYPE (MetaPlugin, meta_plugin, G_TYPE_OBJECT); G_DEFINE_ABSTRACT_TYPE (MetaPlugin, meta_plugin, G_TYPE_OBJECT);

2
src/compositor/meta-window-actor.c
View File

@ -27,7 +27,7 @@
#include "meta-window-actor-private.h" #include "meta-window-actor-private.h"
#include "meta-texture-rectangle.h" #include "meta-texture-rectangle.h"
#include "region-utils.h" #include "region-utils.h"
#include "monitor-private.h" #include "meta-monitor-manager.h"
#include "meta-cullable.h" #include "meta-cullable.h"
#include "meta-surface-actor.h" #include "meta-surface-actor.h"

2
src/core/meta-cursor-tracker.c
View File

@ -44,7 +44,7 @@
#include "meta-cursor-private.h" #include "meta-cursor-private.h"
#include "meta-cursor-tracker-private.h" #include "meta-cursor-tracker-private.h"
#include "screen-private.h" #include "screen-private.h"
#include "monitor-private.h" #include "meta-monitor-manager.h"
#include "wayland/meta-wayland-private.h" #include "wayland/meta-wayland-private.h"

1
src/core/meta-monitor-config.c
View File

@ -42,7 +42,6 @@
#include <meta/main.h> #include <meta/main.h>
#include <meta/errors.h> #include <meta/errors.h>
#include "monitor-private.h"
/* These structures represent the intended/persistent configuration, /* These structures represent the intended/persistent configuration,
as stored in the monitors.xml file. as stored in the monitors.xml file.

2
src/core/meta-monitor-config.h
View File

@ -23,7 +23,7 @@
#ifndef META_MONITOR_CONFIG_H #ifndef META_MONITOR_CONFIG_H
#define META_MONITOR_CONFIG_H #define META_MONITOR_CONFIG_H
#include "monitor-private.h" #include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_CONFIG (meta_monitor_config_get_type ()) #define META_TYPE_MONITOR_CONFIG (meta_monitor_config_get_type ())
#define META_MONITOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig)) #define META_MONITOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))

2
src/core/meta-monitor-manager-dummy.h
View File

@ -23,7 +23,7 @@
#ifndef META_MONITOR_MANAGER_DUMMY_H #ifndef META_MONITOR_MANAGER_DUMMY_H
#define META_MONITOR_MANAGER_DUMMY_H #define META_MONITOR_MANAGER_DUMMY_H
#include "monitor-private.h" #include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ()) #define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
#define META_MONITOR_MANAGER_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy)) #define META_MONITOR_MANAGER_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))

2
src/core/meta-monitor-manager-kms.h
View File

@ -23,7 +23,7 @@
#ifndef META_MONITOR_MANAGER_KMS_H #ifndef META_MONITOR_MANAGER_KMS_H
#define META_MONITOR_MANAGER_KMS_H #define META_MONITOR_MANAGER_KMS_H
#include "monitor-private.h" #include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_MANAGER_KMS (meta_monitor_manager_kms_get_type ()) #define META_TYPE_MONITOR_MANAGER_KMS (meta_monitor_manager_kms_get_type ())
#define META_MONITOR_MANAGER_KMS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKms)) #define META_MONITOR_MANAGER_KMS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKms))

2
src/core/meta-monitor-manager-xrandr.h
View File

@ -23,7 +23,7 @@
#ifndef META_MONITOR_MANAGER_XRANDR_H #ifndef META_MONITOR_MANAGER_XRANDR_H
#define META_MONITOR_MANAGER_XRANDR_H #define META_MONITOR_MANAGER_XRANDR_H
#include "monitor-private.h" #include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_MANAGER_XRANDR (meta_monitor_manager_xrandr_get_type ()) #define META_TYPE_MONITOR_MANAGER_XRANDR (meta_monitor_manager_xrandr_get_type ())
#define META_MONITOR_MANAGER_XRANDR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandr)) #define META_MONITOR_MANAGER_XRANDR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandr))

3
src/core/monitor.c → src/core/meta-monitor-manager.c
View File

@ -25,6 +25,8 @@
#include "config.h" #include "config.h"
#include "meta-monitor-manager.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
@ -33,7 +35,6 @@
#include <meta/main.h> #include <meta/main.h>
#include "util-private.h" #include "util-private.h"
#include <meta/errors.h> #include <meta/errors.h>
#include "monitor-private.h"
#include "meta-monitor-config.h" #include "meta-monitor-config.h"
#include "meta-monitor-manager-kms.h" #include "meta-monitor-manager-kms.h"
#include "meta-monitor-manager-xrandr.h" #include "meta-monitor-manager-xrandr.h"

2
src/core/monitor-private.h → src/core/meta-monitor-manager.h
View File

@ -227,8 +227,6 @@ struct _MetaMonitorManager
CRTCs refer to stuff that can drive outputs CRTCs refer to stuff that can drive outputs
(like encoders, but less tied to the HW), (like encoders, but less tied to the HW),
while monitor_infos refer to logical ones. while monitor_infos refer to logical ones.
See also the comment in monitor-private.h
*/ */
MetaOutput *outputs; MetaOutput *outputs;
unsigned int n_outputs; unsigned int n_outputs;

2
src/core/screen-private.h
View File

@ -36,7 +36,7 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "stack-tracker.h" #include "stack-tracker.h"
#include "ui.h" #include "ui.h"
#include "monitor-private.h" #include "meta-monitor-manager.h"
typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window, typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window,
gpointer user_data); gpointer user_data);

1
src/wayland/meta-wayland-surface.c
View File

@ -55,7 +55,6 @@
#include <meta/types.h> #include <meta/types.h>
#include <meta/main.h> #include <meta/main.h>
#include "frame.h" #include "frame.h"
#include "monitor-private.h"
#include "meta-surface-actor.h" #include "meta-surface-actor.h"
#include "meta-surface-actor-wayland.h" #include "meta-surface-actor-wayland.h"

2
src/wayland/meta-wayland.c
View File

@ -52,7 +52,7 @@
#include <meta/main.h> #include <meta/main.h>
#include "frame.h" #include "frame.h"
#include "meta-weston-launch.h" #include "meta-weston-launch.h"
#include "monitor-private.h" #include "meta-monitor-manager.h"
static MetaWaylandCompositor _meta_wayland_compositor; static MetaWaylandCompositor _meta_wayland_compositor;