diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2016-08-08 23:57:01 +0000 |
|---|---|---|
| committer | Alex Henrie <alexhenrie24@gmail.com> | 2016-08-08 23:57:01 +0000 |
| commit | d975ffe7b06db18ba418207270f58ec79eb07ae1 (patch) | |
| tree | 79298575c0aa422d90fd87bde6a307c860796e4f /src | |
| parent | Remove deprecated Autotools and btool files. Please use CMake instead (diff) | |
| download | inkscape-d975ffe7b06db18ba418207270f58ec79eb07ae1.tar.gz inkscape-d975ffe7b06db18ba418207270f58ec79eb07ae1.zip | |
Use Gdk::Seat instead of Gdk::DeviceManager
(bzr r15046.1.1)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop-events.cpp | 12 | ||||
| -rw-r--r-- | src/device-manager.cpp | 20 | ||||
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.cpp | 12 |
3 files changed, 39 insertions, 5 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 1932a9864..5fef8cbfc 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -21,7 +21,12 @@ #include "ui/dialog/guides.h" #include "desktop-events.h" -#include <gdkmm/devicemanager.h> +#include <gdkmm/display.h> +#if GTK_CHECK_VERSION(3, 20, 0) +# include <gdkmm/seat.h> +#else +# include <gdkmm/devicemanager.h> +#endif #include <2geom/line.h> #include <2geom/angle.h> @@ -596,8 +601,13 @@ static void init_extended() Glib::ustring avoidName("pad"); auto display = Gdk::Display::get_default(); +#if GTK_CHECK_VERSION(3, 20, 0) + auto seat = display->get_default_seat(); + auto const devices = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL); +#else auto dm = display->get_device_manager(); auto const devices = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE); +#endif if ( !devices.empty() ) { for (auto const dev : devices) { diff --git a/src/device-manager.cpp b/src/device-manager.cpp index 68444fe66..6c8d4514c 100644 --- a/src/device-manager.cpp +++ b/src/device-manager.cpp @@ -15,13 +15,17 @@ #include <glibmm/regex.h> -#include <gdkmm/devicemanager.h> +#include <gtk/gtk.h> + #include <gdkmm/display.h> +#if GTK_CHECK_VERSION(3, 20, 0) +# include <gdkmm/seat.h> +#else +# include <gdkmm/devicemanager.h> +#endif #include <gtkmm/accelkey.h> -#include <gtk/gtk.h> - #define noDEBUG_VERBOSE 1 @@ -317,8 +321,13 @@ DeviceManagerImpl::DeviceManagerImpl() : { Glib::RefPtr<Gdk::Display> display = Gdk::Display::get_default(); +#if GTK_CHECK_VERSION(3, 20, 0) + auto seat = display->get_default_seat(); + auto devList = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL); +#else auto dm = display->get_device_manager(); auto devList = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE); +#endif if (fakeList.empty()) { createFakeList(); @@ -649,8 +658,13 @@ static void createFakeList() { // try to find the first *real* core pointer Glib::RefPtr<Gdk::Display> display = Gdk::Display::get_default(); +#if GTK_CHECK_VERSION(3, 20, 0) + auto seat = display->get_default_seat(); + auto devList = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL); +#else auto dm = display->get_device_manager(); auto devList = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE); +#endif // Set iterator to point at beginning of device list std::vector< Glib::RefPtr<Gdk::Device> >::iterator dev = devList.begin(); diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 97fa47f2f..676dcf31f 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -22,7 +22,12 @@ #include "dialog-manager.h" #include <gtkmm/imagemenuitem.h> -#include <gdkmm/devicemanager.h> +#include <gdkmm/display.h> +#if GTK_CHECK_VERSION(3, 20, 0) +# include <gdkmm/seat.h> +#else +# include <gdkmm/devicemanager.h> +#endif #include "ui/widget/spinbutton.h" @@ -1970,8 +1975,13 @@ bool FilterEffectsDialog::PrimitiveList::on_draw_signal(const Cairo::RefPtr<Cair Gdk::ModifierType mask; auto display = get_bin_window()->get_display(); +#if GTK_CHECK_VERSION(3, 20, 0) + auto seat = display->get_default_seat(); + auto device = seat->get_pointer(); +#else auto dm = display->get_device_manager(); auto device = dm->get_client_pointer(); +#endif get_bin_window()->get_device_position(device, mx, my, mask); // Outline the bottom of the connection area |