diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-01-05 13:47:32 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-01-05 13:47:32 +0000 |
| commit | a3d015ae6502076ae53f43b71429080465e5e1d8 (patch) | |
| tree | 7e2556b239fb570c0c6efd5b855f4556d563805c /src | |
| parent | More GSEAL fixes (diff) | |
| download | inkscape-a3d015ae6502076ae53f43b71429080465e5e1d8.tar.gz inkscape-a3d015ae6502076ae53f43b71429080465e5e1d8.zip | |
Fix desktop-events backward compat
(bzr r10846)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop-events.cpp | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 3c340d41f..85ba08547 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -526,6 +526,7 @@ static void init_extended() if ( devices ) { for ( GList* curr = devices; curr; curr = g_list_next(curr) ) { GdkDevice* dev = reinterpret_cast<GdkDevice*>(curr->data); +#if GTK_CHECK_VERSION (2, 22, 0) if ( gdk_device_get_name (dev) && (avoidName != gdk_device_get_name (dev)) && (gdk_device_get_source (dev) != GDK_SOURCE_MOUSE) ) { @@ -533,14 +534,35 @@ static void init_extended() // Set the initial tool for the device switch ( gdk_device_get_source (dev)) { +#else + if ( dev->name + && (avoidName != dev->name) + && (dev->source != GDK_SOURCE_MOUSE) ) { +// g_message("Adding '%s' as [%d]", dev->name, dev->source); + + // Set the initial tool for the device + switch ( dev->source) { +#endif case GDK_SOURCE_PEN: +#if GTK_CHECK_VERSION (2, 22, 0) toolToUse[gdk_device_get_name (dev)] = TOOLS_CALLIGRAPHIC; +#else + toolToUse[dev->name] = TOOLS_CALLIGRAPHIC; +#endif break; case GDK_SOURCE_ERASER: +#if GTK_CHECK_VERSION (2, 22, 0) toolToUse[gdk_device_get_name (dev)] = TOOLS_ERASER; +#else + toolToUse[dev->name] = TOOLS_ERASER; +#endif break; case GDK_SOURCE_CURSOR: +#if GTK_CHECK_VERSION (2, 22, 0) toolToUse[gdk_device_get_name (dev)] = TOOLS_SELECT; +#else + toolToUse[dev->name] = TOOLS_SELECT; +#endif break; default: ; // do not add @@ -563,8 +585,13 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop) { GdkEventMotion* event2 = reinterpret_cast<GdkEventMotion*>(event); if ( event2->device ) { +#if GTK_CHECK_VERSION (2, 22, 0) source = gdk_device_get_source (event2->device); name = gdk_device_get_name (event2->device); +#else + source = event2->device->source; + name = event2->device->name; +#endif } } break; @@ -576,8 +603,13 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop) { GdkEventButton* event2 = reinterpret_cast<GdkEventButton*>(event); if ( event2->device ) { +#if GTK_CHECK_VERSION (2, 22, 0) source = gdk_device_get_source (event2->device); name = gdk_device_get_name (event2->device); +#else + source = event2->device->source; + name = event2->device->name; +#endif } } break; @@ -586,8 +618,13 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop) { GdkEventScroll* event2 = reinterpret_cast<GdkEventScroll*>(event); if ( event2->device ) { +#if GTK_CHECK_VERSION (2, 22, 0) source = gdk_device_get_source (event2->device); name = gdk_device_get_name (event2->device); +#else + source = event2->device->source; + name = event2->device->name; +#endif } } break; @@ -597,8 +634,13 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop) { GdkEventProximity* event2 = reinterpret_cast<GdkEventProximity*>(event); if ( event2->device ) { +#if GTK_CHECK_VERSION (2, 22, 0) source = gdk_device_get_source (event2->device); name = gdk_device_get_name (event2->device); +#else + source = event2->device->source; + name = event2->device->source; +#endif } } break; |