nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-26 01:32:25 +00:00
Code Issues Projects Releases Wiki Activity

GTK 3.20 compatibility: switch to gdk_seat_grab.

Browse Source 
gdk_device_grab and all its preparatory faff are now deprecated, and
gdk_seat_grab is the new thing. Introduce yet another branch to all
the ifdefs for keyboard-grabbing. On the plus side, at least it's
slightly simpler than the GdkDevice business.
This commit is contained in:
Simon Tatham 2016-04-04 11:21:54 +01:00
parent ab433e8073
commit 169a3d2457
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
unix/gtkask.c
View File

@ -43,7 +43,9 @@ struct askpass_ctx {
#endif #endif
char *passphrase; char *passphrase;
int passlen, passsize; int passlen, passsize;
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,20,0)
GdkSeat *seat; /* for gdk_seat_grab */
#elif GTK_CHECK_VERSION(3,0,0)
GdkDevice *keyboard; /* for gdk_device_grab */ GdkDevice *keyboard; /* for gdk_device_grab */
#endif #endif
}; };
@ -218,9 +220,25 @@ static int try_grab_keyboard(struct askpass_ctx *ctx)
{ {
int ret; int ret;
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,20,0)
/* /*
* Grabbing the keyboard is quite complicated in GTK 3. * Grabbing the keyboard in GTK 3.20 requires the new notion of
* GdkSeat.
*/
GdkSeat *seat;
seat = gdk_display_get_default_seat
(gtk_widget_get_display(ctx->dialog));
if (!seat)
return FALSE;
ctx->seat = seat;
ret = gdk_seat_grab(seat, gtk_widget_get_window(ctx->dialog),
GDK_SEAT_CAPABILITY_KEYBOARD,
TRUE, NULL, NULL, NULL, NULL);
#elif GTK_CHECK_VERSION(3,0,0)
/*
* And it has to be done differently again prior to GTK 3.20.
*/ */
GdkDeviceManager *dm; GdkDeviceManager *dm;
GdkDevice *pointer, *keyboard; GdkDevice *pointer, *keyboard;
@ -409,7 +427,9 @@ static const char *gtk_askpass_setup(struct askpass_ctx *ctx,
static void gtk_askpass_cleanup(struct askpass_ctx *ctx) static void gtk_askpass_cleanup(struct askpass_ctx *ctx)
{ {
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,20,0)
gdk_seat_ungrab(ctx->seat);
#elif GTK_CHECK_VERSION(3,0,0)
gdk_device_ungrab(ctx->keyboard, GDK_CURRENT_TIME); gdk_device_ungrab(ctx->keyboard, GDK_CURRENT_TIME);
#else #else
gdk_keyboard_ungrab(GDK_CURRENT_TIME); gdk_keyboard_ungrab(GDK_CURRENT_TIME);