isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-21 07:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Set up MetaSelection on MetaDisplay

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/320
This commit is contained in:
Carlos Garnacho 2018-11-19 18:15:24 +01:00
parent 09aa82db49
commit ab76576340
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/display-private.h
View File

@ -38,6 +38,7 @@
#include "clutter/clutter.h" #include "clutter/clutter.h"
#include "core/keybindings-private.h" #include "core/keybindings-private.h"
#include "core/meta-gesture-tracker-private.h" #include "core/meta-gesture-tracker-private.h"
#include "core/meta-selection.h"
#include "core/stack-tracker.h" #include "core/stack-tracker.h"
#include "core/startup-notification-private.h" #include "core/startup-notification-private.h"
#include "meta/barrier.h" #include "meta/barrier.h"
@ -246,6 +247,8 @@ struct _MetaDisplay
MetaWorkspaceManager *workspace_manager; MetaWorkspaceManager *workspace_manager;
MetaSoundPlayer *sound_player; MetaSoundPlayer *sound_player;
MetaSelection *selection;
}; };
struct _MetaDisplayClass struct _MetaDisplayClass
@ -440,4 +443,6 @@ MetaWindow *meta_display_get_window_from_id (MetaDisplay *display,
uint64_t window_id); uint64_t window_id);
uint64_t meta_display_generate_window_id (MetaDisplay *display); uint64_t meta_display_generate_window_id (MetaDisplay *display);
MetaSelection * meta_display_get_selection (MetaDisplay *display);
#endif #endif

8
src/core/display.c
View File

@ -724,6 +724,8 @@ meta_display_open (void)
display->bell = meta_bell_new (display); display->bell = meta_bell_new (display);
display->selection = meta_selection_new (display);
if (meta_should_autostart_x11_display ()) if (meta_should_autostart_x11_display ())
{ {
x11_display = meta_x11_display_new (display, &error); x11_display = meta_x11_display_new (display, &error);
@ -3682,3 +3684,9 @@ meta_display_get_sound_player (MetaDisplay *display)
{ {
return display->sound_player; return display->sound_player;
} }
MetaSelection *
meta_display_get_selection (MetaDisplay *display)
{
return display->selection;
}