← Back to branch summary

~ubuntu-branches/debian/sid/mutter/sid

« back to all changes in this revision

Viewing changes to src/core/stack.c

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-10-09 13:23:25 UTC
  • mfrom: (1.1.1 upstream) (0.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091009132325-szsy1fm6qy9jmnpk
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/stack.c
224
224
}
225
225
 
226
226
static gboolean
227
 
windows_on_different_xinerama (MetaWindow *a,
228
 
                               MetaWindow *b)
 
227
windows_on_different_monitor (MetaWindow *a,
 
228
                              MetaWindow *b)
229
229
{
230
230
  if (a->screen != b->screen)
231
231
    return TRUE;
232
232
 
233
 
  return meta_screen_get_xinerama_for_window (a->screen, a) !=
234
 
    meta_screen_get_xinerama_for_window (b->screen, b);
 
233
  return meta_screen_get_monitor_for_window (a->screen, a) !=
 
234
    meta_screen_get_monitor_for_window (b->screen, b);
235
235
}
236
236
 
237
237
/* Get layer ignoring any transient or group relationships */
275
275
                window == window->display->expected_focus_window ||
276
276
                window->display->expected_focus_window == NULL ||
277
277
                (window->display->expected_focus_window != NULL &&
278
 
                 windows_on_different_xinerama (window,
279
 
                                                window->display->expected_focus_window))))
 
278
                 windows_on_different_monitor (window,
 
279
                                               window->display->expected_focus_window))))
280
280
        layer = META_LAYER_FULLSCREEN;
281
281
      else if (window->wm_state_above)
282
282
        layer = META_LAYER_TOP;