Attachment #635412 for bug #704532




}
#endif

/**
 * meta_display_get_atom: (skip)
 *
 * Gets up an X atom that Muffin prefetched at startup.
 *
 * Return value: the X atom corresponding to the given atom enumeration
 */
Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
{
  Atom *atoms = & display->atom_WM_PROTOCOLS;

  return atoms[meta_atom - 1];
}

/**
 * meta_display_get_leader_window:
 * @display: a #MetaDisplay





#define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)

typedef enum
{
  META_ATOM_FIRST = 0,
#define item(x) META_ATOM_##x,
#include "atomnames.h"
#undef item
}MetaAtom;

typedef enum {
  META_LIST_DEFAULT                   = 0,      /* normal windows */
  META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */


int meta_display_get_damage_event_base (MetaDisplay *display);
int meta_display_get_shape_event_base (MetaDisplay *display);
Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom);

gboolean meta_display_xserver_time_is_before (MetaDisplay *display,
                                              guint32      time1,

Return to bug 704532

Lines 5640-5659 meta_display_get_shape_event_base (MetaDisplay *display) Link Here

(-)a/src/core/display.c (-14 lines)
5640	}	5640	}
5641	#endif	5641	#endif
5642		5642
5643	/**
5644	* meta_display_get_atom: (skip)
5645	*
5646	* Gets up an X atom that Muffin prefetched at startup.
5647	*
5648	* Return value: the X atom corresponding to the given atom enumeration
5649	*/
5650	Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
5651	{
5652	Atom *atoms = & display->atom_WM_PROTOCOLS;
5653
5654	return atoms[meta_atom - 1];
5655	}
5656
5657	/**	5643	/**
5658	* meta_display_get_leader_window:	5644	* meta_display_get_leader_window:
5659	* @display: a #MetaDisplay	5645	* @display: a #MetaDisplay

Lines 56-69 GType meta_display_get_type (void) G_GNUC_CONST; Link Here

(-)a/src/meta/display.h (-9 lines)
56		56
57	#define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)	57	#define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)
58		58
59	typedef enum
60	{
61	META_ATOM_FIRST = 0,
62	#define item(x) META_ATOM_##x,
63	#include "atomnames.h"
64	#undef item
65	}MetaAtom;
66
67	typedef enum {	59	typedef enum {
68	META_LIST_DEFAULT = 0, /* normal windows */	60	META_LIST_DEFAULT = 0, /* normal windows */
69	META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */	61	META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */
Lines 90-96 gboolean meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display, Link Here
90		82
91	int meta_display_get_damage_event_base (MetaDisplay *display);	83	int meta_display_get_damage_event_base (MetaDisplay *display);
92	int meta_display_get_shape_event_base (MetaDisplay *display);	84	int meta_display_get_shape_event_base (MetaDisplay *display);
93	Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom);
94		85
95	gboolean meta_display_xserver_time_is_before (MetaDisplay *display,	86	gboolean meta_display_xserver_time_is_before (MetaDisplay *display,
96	guint32 time1,	87	guint32 time1,