diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2016-10-30 22:24:04 -0700 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2016-11-16 19:54:41 -0600 |
| commit | 27e7b242d65a78d40d68f20ac375929914c3b7a8 (patch) | |
| tree | 588384dbabd2627ff1cc9257c9f8bad17269f0ca | |
| parent | 66ac36c66a420f497262e37f5553d6fea5635454 (diff) | |
| download | at-spi2-core-27e7b242d65a78d40d68f20ac375929914c3b7a8.tar.gz | |
Block out X11 API with #ifdefs
We should not include any X11 headers when building with --disable-x11,
so put them inside #ifdef guards, and don't use X symbols.
https://bugzilla.gnome.org/show_bug.cgi?id=773710
| -rw-r--r-- | registryd/deviceeventcontroller.c | 4 | ||||
| -rw-r--r-- | registryd/display.h | 2 | ||||
| -rw-r--r-- | registryd/event-source.h | 4 | ||||
| -rw-r--r-- | registryd/ucs2keysym.c | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 8fefbd75..fabab781 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -634,7 +634,7 @@ handle_keygrab (SpiDEController *controller, grab_mask.mod_mask = key_listener->mask; if (g_slist_length (key_listener->keys) == 0) /* special case means AnyKey/AllKeys */ { - grab_mask.key_val = AnyKey; + grab_mask.key_val = 0L; /* AnyKey */ #ifdef SPI_DEBUG fprintf (stderr, "AnyKey grab!"); #endif @@ -1751,7 +1751,7 @@ impl_generate_keyboard_event (DBusConnection *bus, DBusMessage *message, void *u * in our arg list; it can contain either * a keycode or a keysym. */ - spi_dec_synth_keysym (controller, (KeySym) keycode); + spi_dec_synth_keysym (controller, keycode); break; case Accessibility_KEY_STRING: if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring)) diff --git a/registryd/display.h b/registryd/display.h index 2238a55d..5aa44702 100644 --- a/registryd/display.h +++ b/registryd/display.h @@ -23,12 +23,14 @@ #ifndef SPI_DISPLAY_H_ #define SPI_DISPLAY_H_ +#if HAVE_X11 #include <X11/Xlib.h> Display *spi_set_display (const char *display_name); Display *spi_get_display (); Window spi_get_root_window (); +#endif /* HAVE_X11 */ void spi_x_error_trap (void); int spi_x_error_release (void); diff --git a/registryd/event-source.h b/registryd/event-source.h index 55ab663e..a8bbefe4 100644 --- a/registryd/event-source.h +++ b/registryd/event-source.h @@ -23,11 +23,13 @@ #ifndef SPI_EVENT_SOURCE_H_ #define SPI_EVENT_SOURCE_H_ +#ifdef HAVE_X11 #include <X11/Xlib.h> void spi_events_init (Display *display); +void spi_set_filter (void (*filter) (XEvent*, void*), void* data); +#endif /* HAVE_X11 */ void spi_events_uninit (); void spi_set_events (long event_mask); -void spi_set_filter (void (*filter) (XEvent*, void*), void* data); #endif /* SPI_EVENT_SOURCE_H_ */ diff --git a/registryd/ucs2keysym.c b/registryd/ucs2keysym.c index b4967bef..2d0a5129 100644 --- a/registryd/ucs2keysym.c +++ b/registryd/ucs2keysym.c @@ -31,7 +31,6 @@ * */ -#include <X11/X.h> #include "deviceeventcontroller.h" /* for prototype */ struct codepair { |