On Wed, Oct 31, 2012 at 04:51:04PM +0100, Marc-André Lureau wrote:
> We need current window handle for the global keyboard hook. It is not
> enough to rely on focus-in event to set it, so do it also in
> key-event. This avoids extra warnings on Windows.
Not really important, but I'm not sure why this causes warnings.
> ---
> gtk/spice-widget.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
> index 0df610b..023ec5e 100644
> --- a/gtk/spice-widget.c
> +++ b/gtk/spice-widget.c
> @@ -116,7 +116,7 @@ enum {
> static guint signals[SPICE_DISPLAY_LAST_SIGNAL];
>
> #ifdef WIN32
> -static HWND focus_window = NULL;
> +static HWND win32_window = NULL;
> #endif
>
> static void update_keyboard_grab(SpiceDisplay *display);
> @@ -481,13 +481,13 @@ void spice_display_set_grab_keys(SpiceDisplay *display, SpiceGrabSequence *seq)
> #ifdef WIN32
> static LRESULT CALLBACK keyboard_hook_cb(int code, WPARAM wparam, LPARAM lparam)
> {
> - if (focus_window && code == HC_ACTION) {
> + if (win32_window && code == HC_ACTION) {
> KBDLLHOOKSTRUCT *hooked = (KBDLLHOOKSTRUCT*)lparam;
> DWORD dwmsg = (hooked->flags << 24) | (hooked->scanCode << 16) | 1;
>
> if (hooked->vkCode == VK_NUMLOCK || hooked->vkCode == VK_RSHIFT) {
> dwmsg &= ~(1 << 24);
> - SendMessage(focus_window, wparam, hooked->vkCode, dwmsg);
> + SendMessage(win32_window, wparam, hooked->vkCode, dwmsg);
> }
> switch (hooked->vkCode) {
> case VK_CAPITAL:
> @@ -501,7 +501,7 @@ static LRESULT CALLBACK keyboard_hook_cb(int code, WPARAM wparam, LPARAM lparam)
> case VK_RMENU:
> break;
> default:
> - SendMessage(focus_window, wparam, hooked->vkCode, dwmsg);
> + SendMessage(win32_window, wparam, hooked->vkCode, dwmsg);
> return 1;
> }
> }
> @@ -970,6 +970,13 @@ static gboolean check_for_grab_key(SpiceDisplay *display, int type, int keyval)
> return FALSE;
> }
>
> +static void update_display(SpiceDisplay *display)
> +{
> +#ifdef WIN32
> + win32_window = display ? GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(display))) : NULL;
> +#endif
> +}
> +
> static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
> {
> SpiceDisplay *display = SPICE_DISPLAY(widget);
> @@ -1066,8 +1073,11 @@ static gboolean enter_event(GtkWidget *widget, GdkEventCrossing *crossing G_GNUC
> SpiceDisplayPrivate *d = SPICE_DISPLAY_GET_PRIVATE(display);
>
> SPICE_DEBUG("%s", __FUNCTION__);
> +
> d->mouse_have_pointer = true;
> try_keyboard_grab(display);
> + update_display(display);
> +
> return true;
> }
>
> @@ -1105,10 +1115,8 @@ static gboolean focus_in_event(GtkWidget *widget, GdkEventFocus *focus G_GNUC_UN
> sync_keyboard_lock_modifiers(display);
> update_keyboard_focus(display, true);
> try_keyboard_grab(display);
> -#ifdef WIN32
> - focus_window = GDK_WINDOW_HWND(gtk_widget_get_window(widget));
> - g_return_val_if_fail(focus_window != NULL, true);
> -#endif
> + update_display(display);
you lost the g_return_val_if_fail here, dunno if this is a big deal?
Looks good otherwise,
Christophe
> +
> return true;
> }
>
> @@ -1118,6 +1126,7 @@ static gboolean focus_out_event(GtkWidget *widget, GdkEventFocus *focus G_GNUC_U
> SpiceDisplayPrivate *d = SPICE_DISPLAY_GET_PRIVATE(display);
>
> SPICE_DEBUG("%s", __FUNCTION__);
> + update_display(NULL);
>
> /*
> * Ignore focus out after a keyboard grab
> --
> 1.7.11.7
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
pgpG77UoFdcXX.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel