patches/gtk2/Revert-gdk-deactivation-activate-window-on-keyboard-grabs.patch

   1 From: Samuel Thibault <samuel.thibault@ens-lyon.org>
   2 Date: Fri, 4 Jan 2019 16:52:15 +0100
   3 Subject: Revert "gdk: deactivation/activate window on keyboard grabs"
   4
   5 This reverts commits 853f786727a954d10ed78405adc18e0772ccd1cb and
   6 00b17063ac8e58d436b7ee5e79da83e74cbbbb30.
   7
   8 This reintroduces #85, but see discussion in
   9 https://gitlab.gnome.org/GNOME/gtk/merge_requests/433 for the unforeseen
  10 invasive consequences of these commits.
  11
  12 Origin: upstream, 2.24.33, commit:75a4eeb2f8a2a479298f68a022a72277cbe9f607
  13 ---
  14  gdk/x11/gdkevents-x11.c | 20 ++++++++++----------
  15  1 file changed, 10 insertions(+), 10 deletions(-)
  16
  17 diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
  18 index bef77b5..186a8f5 100644
  19 --- a/gdk/x11/gdkevents-x11.c
  20 +++ b/gdk/x11/gdkevents-x11.c
  21 @@ -621,8 +621,8 @@ gdk_check_wm_state_changed (GdkWindow *window)
  22      do_net_wm_state_changes (window);
  23  }
  24
  25 -#define APPEARS_FOCUSED(toplevel)                           \
  26 -  ((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
  27 +#define HAS_FOCUS(toplevel)                           \
  28 +  ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
  29
  30  static void
  31  generate_focus_event (GdkWindow *window,
  32 @@ -1344,11 +1344,11 @@ gdk_event_translate (GdkDisplay *display,
  33
  34           if (xevent->xcrossing.focus && !toplevel->has_focus_window)
  35             {
  36 -             gboolean had_focus = APPEARS_FOCUSED (toplevel);
  37 +             gboolean had_focus = HAS_FOCUS (toplevel);
  38
  39               toplevel->has_pointer_focus = TRUE;
  40
  41 -             if (APPEARS_FOCUSED (toplevel) != had_focus)
  42 +             if (HAS_FOCUS (toplevel) != had_focus)
  43                 generate_focus_event (window, TRUE);
  44             }
  45         }
  46 @@ -1441,11 +1441,11 @@ gdk_event_translate (GdkDisplay *display,
  47
  48           if (xevent->xcrossing.focus && !toplevel->has_focus_window)
  49             {
  50 -             gboolean had_focus = APPEARS_FOCUSED (toplevel);
  51 +             gboolean had_focus = HAS_FOCUS (toplevel);
  52
  53               toplevel->has_pointer_focus = FALSE;
  54
  55 -             if (APPEARS_FOCUSED (toplevel) != had_focus)
  56 +             if (HAS_FOCUS (toplevel) != had_focus)
  57                 generate_focus_event (window, FALSE);
  58             }
  59         }
  60 @@ -1523,7 +1523,7 @@ gdk_event_translate (GdkDisplay *display,
  61
  62        if (toplevel)
  63         {
  64 -         gboolean had_focus = APPEARS_FOCUSED (toplevel);
  65 +         gboolean had_focus = HAS_FOCUS (toplevel);
  66
  67           switch (xevent->xfocus.detail)
  68             {
  69 @@ -1569,7 +1569,7 @@ gdk_event_translate (GdkDisplay *display,
  70               break;
  71             }
  72
  73 -         if (APPEARS_FOCUSED (toplevel) != had_focus)
  74 +         if (HAS_FOCUS (toplevel) != had_focus)
  75             generate_focus_event (window, TRUE);
  76         }
  77        break;
  78 @@ -1582,7 +1582,7 @@ gdk_event_translate (GdkDisplay *display,
  79
  80        if (toplevel)
  81         {
  82 -         gboolean had_focus = APPEARS_FOCUSED (toplevel);
  83 +         gboolean had_focus = HAS_FOCUS (toplevel);
  84
  85           switch (xevent->xfocus.detail)
  86             {
  87 @@ -1620,7 +1620,7 @@ gdk_event_translate (GdkDisplay *display,
  88               break;
  89             }
  90
  91 -         if (APPEARS_FOCUSED (toplevel) != had_focus)
  92 +         if (HAS_FOCUS (toplevel) != had_focus)
  93             generate_focus_event (window, FALSE);
  94         }
  95        break;