libwnck3/trunk/0004-xutils-use-WnckScreen-in-_wnck_get_pid.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
   3 Date: Fri, 30 Sep 2022 18:39:00 +0300
   4 Subject: [PATCH] xutils: use WnckScreen in _wnck_get_pid
   5
   6 ---
   7  libwnck/application.c         |  2 +-
   8  libwnck/window.c              |  2 +-
   9  libwnck/wnck-resource-usage.c | 26 +++++++++++++-------------
  10  libwnck/xutils.c              | 16 ++++++++++------
  11  libwnck/xutils.h              |  4 ++--
  12  5 files changed, 27 insertions(+), 23 deletions(-)
  13
  14 diff --git a/libwnck/application.c b/libwnck/application.c
  15 index 9ab7f4892fbf..31005ba40dfc 100644
  16 --- a/libwnck/application.c
  17 +++ b/libwnck/application.c
  18 @@ -524,7 +524,7 @@ _wnck_application_create (Window      xwindow,
  19    if (application->priv->name)
  20      application->priv->name_from_leader = TRUE;
  21
  22 -  application->priv->pid = _wnck_get_pid (xscreen,
  23 +  application->priv->pid = _wnck_get_pid (screen,
  24                                            application->priv->xwindow);
  25
  26    application->priv->startup_id = _wnck_get_utf8_property (xscreen,
  27 diff --git a/libwnck/window.c b/libwnck/window.c
  28 index 35bb37c1adaa..229b4cb1debc 100644
  29 --- a/libwnck/window.c
  30 +++ b/libwnck/window.c
  31 @@ -510,7 +510,7 @@ _wnck_window_create (Window      xwindow,
  32      _wnck_get_session_id (xscreen, window->priv->xwindow);
  33
  34    window->priv->pid =
  35 -    _wnck_get_pid (xscreen, window->priv->xwindow);
  36 +    _wnck_get_pid (screen, window->priv->xwindow);
  37
  38    window->priv->x = 0;
  39    window->priv->y = 0;
  40 diff --git a/libwnck/wnck-resource-usage.c b/libwnck/wnck-resource-usage.c
  41 index a845d82bc99e..1d81c283a5ae 100644
  42 --- a/libwnck/wnck-resource-usage.c
  43 +++ b/libwnck/wnck-resource-usage.c
  44 @@ -126,25 +126,25 @@ wnck_gulong_equal (gconstpointer a,
  45  }
  46
  47  static gulong
  48 -wnck_check_window_for_pid (Screen *screen,
  49 -                           Window  win,
  50 -                           XID     match_xid,
  51 -                           XID     mask)
  52 +wnck_check_window_for_pid (WnckScreen *screen,
  53 +                           Window      win,
  54 +                           XID         match_xid,
  55 +                           XID         mask)
  56  {
  57    if ((win & ~mask) == match_xid)
  58      return _wnck_get_pid (screen, win);
  59
  60    return 0;
  61  }
  62
  63  static void
  64 -wnck_find_pid_for_resource_r (Display *xdisplay,
  65 -                              Screen  *screen,
  66 -                              Window   win_top,
  67 -                              XID      match_xid,
  68 -                              XID      mask,
  69 -                              gulong  *xid,
  70 -                              gulong  *pid)
  71 +wnck_find_pid_for_resource_r (Display    *xdisplay,
  72 +                              WnckScreen *screen,
  73 +                              Window      win_top,
  74 +                              XID         match_xid,
  75 +                              XID         mask,
  76 +                              gulong     *xid,
  77 +                              gulong     *pid)
  78  {
  79    Status   qtres;
  80    int      err;
  81 @@ -250,10 +250,10 @@ wnck_pid_read_resource_usage_fill_cache (struct xresclient_state *state)
  82
  83    for (i = 0; i < ScreenCount (state->xdisplay); i++)
  84      {
  85 -      Screen *screen;
  86 +      WnckScreen *screen;
  87        Window  root;
  88
  89 -      screen = ScreenOfDisplay (state->xdisplay, i);
  90 +      screen = wnck_handle_get_screen (_wnck_get_handle (), i);
  91        root = RootWindow (state->xdisplay, i);
  92
  93        if (root == None)
  94 diff --git a/libwnck/xutils.c b/libwnck/xutils.c
  95 index d120ff16c0da..08be8aa96f1a 100644
  96 --- a/libwnck/xutils.c
  97 +++ b/libwnck/xutils.c
  98 @@ -1147,50 +1147,54 @@ _wnck_get_session_id (Screen *screen,
  99
 100  #ifdef HAVE_XRES
 101  static int
 102 -xres_get_pid (Screen *screen,
 103 -              Window  xwindow)
 104 +xres_get_pid (WnckScreen *screen,
 105 +              Window      xwindow)
 106  {
 107    int pid = -1;
 108 +  Screen *xscreen;
 109    XResClientIdSpec client_spec;
 110    long client_id_count = 0;
 111    XResClientIdValue *client_ids = NULL;
 112
 113 +  xscreen = _wnck_screen_get_xscreen (screen);
 114 +
 115    client_spec.client = xwindow;
 116    client_spec.mask = XRES_CLIENT_ID_PID_MASK;
 117
 118 -  if (XResQueryClientIds (DisplayOfScreen (screen), 1, &client_spec,
 119 +  if (XResQueryClientIds (DisplayOfScreen (xscreen), 1, &client_spec,
 120                            &client_id_count, &client_ids) == Success)
 121      {
 122        long i;
 123
 124        for (i = 0; i < client_id_count; i++)
 125          {
 126            pid = XResGetClientPid (&client_ids[i]);
 127            if (pid != -1)
 128              break;
 129          }
 130
 131        XResClientIdsDestroy (client_id_count, client_ids);
 132      }
 133
 134    return pid;
 135  }
 136  #endif
 137
 138  int
 139 -_wnck_get_pid (Screen *screen,
 140 -               Window  xwindow)
 141 +_wnck_get_pid (WnckScreen *screen,
 142 +               Window      xwindow)
 143  {
 144    int pid = -1;
 145
 146  #ifdef HAVE_XRES
 147    pid = xres_get_pid (screen, xwindow);
 148
 149    if (pid != -1)
 150      return pid;
 151  #endif
 152
 153 -  if (!_wnck_get_cardinal (screen, xwindow,
 154 +  if (!_wnck_get_cardinal (_wnck_screen_get_xscreen (screen),
 155 +                           xwindow,
 156                             _wnck_atom_get ("_NET_WM_PID"),
 157                             &pid))
 158      return 0;
 159 diff --git a/libwnck/xutils.h b/libwnck/xutils.h
 160 index 4e5c62049c1e..700832a4832b 100644
 161 --- a/libwnck/xutils.h
 162 +++ b/libwnck/xutils.h
 163 @@ -123,8 +123,8 @@ void _wnck_change_viewport (Screen *screen,
 164
 165  char*  _wnck_get_session_id     (Screen *screen,
 166                                   Window xwindow);
 167 -int    _wnck_get_pid            (Screen *screen,
 168 -                                 Window  xwindow);
 169 +int    _wnck_get_pid            (WnckScreen *screen,
 170 +                                 Window      xwindow);
 171  char*  _wnck_get_name           (Screen *screen,
 172                                   Window  xwindow);
 173  char*  _wnck_get_icon_name      (Screen *screen,