[Piglit] [PATCH 2/9] Fix deprecation warnings from XKeycodeToKeysym().

[Daniel Kurtz]

On Wed, Jan 29, 2014 at 10:52 AM, Eric Anholt <eric at anholt.net> wrote:
> ---
>  tests/egl/egl-util.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tests/egl/egl-util.c b/tests/egl/egl-util.c
> index 5f4fffe..226ba0e 100644
> --- a/tests/egl/egl-util.c
> +++ b/tests/egl/egl-util.c
> @@ -30,6 +30,7 @@
>   * \author Kristian Høgsberg <krh at bitplanet.net>
>   */
>
> +#include <X11/XKBlib.h>
>  #include "piglit-util-gl-common.h"
>  #include "egl-util.h"
>
> @@ -154,8 +155,9 @@ event_loop(struct egl_state *state, const struct egl_test *test)
>                 }
>
>                 if (event.type == KeyPress) {
> -                       KeySym sym = XKeycodeToKeysym (state->dpy,
> -                                                      event.xkey.keycode, 0);
> +                       KeySym sym = XkbKeycodeToKeysym (state->dpy,
> +                                                        event.xkey.keycode,
> +                                                        0, 0);

This pulls in an XKB dependency that wasn't there before.
>From this post [0], I think the recommend migration path is to use
XGetKeyboardMapping:

[0] http://lists.freedesktop.org/archives/xorg-devel/2011-October/026193.html

>
>                         if (sym == XK_Escape || sym == XK_q || sym == XK_Q)
>                                 break;
> --
> 1.8.5.3
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit