isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 05:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved atomnames.h to includes so can be included from display.h.

Browse Source 
meta_display_get_atom: allow common atom retrieval via enum (to avoid interning
identical atoms at different places).
This commit is contained in:
Tomas Frydrych 2008-08-18 15:10:13 +01:00
parent 5ebaa15333
commit f7f696c310
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/display.c
View File

@ -5183,3 +5183,10 @@ meta_display_get_shape_event_base (MetaDisplay *display)
} }
#endif #endif
#endif #endif
Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
{
Atom *atoms = & display->atom_WM_PROTOCOLS;
return atoms[meta_atom - 1];
}

11
src/core/atomnames.h → src/include/atomnames.h
View File

@ -1,12 +1,12 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* /*
* Copyright (C) 2001 Havoc Pennington * Copyright (C) 2001 Havoc Pennington
* Copyright (C) 2002, 2003, 2004 Red Hat, Inc. * Copyright (C) 2002, 2003, 2004 Red Hat, Inc.
* Copyright (C) 2003, 2004 Rob Adams * Copyright (C) 2003, 2004 Rob Adams
* Copyright (C) 2004-2006 Elijah Newren * Copyright (C) 2004-2006 Elijah Newren
* Copyright (C) 2008 Thomas Thurman * Copyright (C) 2008 Thomas Thurman
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the * published by the Free Software Foundation; either version 2 of the
@ -16,7 +16,7 @@
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@ -42,7 +42,7 @@
#ifndef EWMH_ATOMS_ONLY #ifndef EWMH_ATOMS_ONLY
item(WM_PROTOCOLS) item(WM_PROTOCOLS) /* MUST BE FIRST */
item(WM_TAKE_FOCUS) item(WM_TAKE_FOCUS)
item(WM_DELETE_WINDOW) item(WM_DELETE_WINDOW)
item(WM_STATE) item(WM_STATE)
@ -54,7 +54,7 @@ item(WM_WINDOW_ROLE)
item(UTF8_STRING) item(UTF8_STRING)
item(WM_ICON_SIZE) item(WM_ICON_SIZE)
item(_KWM_WIN_ICON) item(_KWM_WIN_ICON)
item(_METACITY_RESTART_MESSAGE) item(_METACITY_RESTART_MESSAGE)
item(_METACITY_RELOAD_THEME_MESSAGE) item(_METACITY_RELOAD_THEME_MESSAGE)
item(_METACITY_SET_KEYBINDINGS_MESSAGE) item(_METACITY_SET_KEYBINDINGS_MESSAGE)
item(_METACITY_TOGGLE_VERBOSE) item(_METACITY_TOGGLE_VERBOSE)
@ -122,6 +122,7 @@ item(_NET_WM_STRUT)
item(_NET_WM_STATE_HIDDEN) item(_NET_WM_STATE_HIDDEN)
item(_NET_WM_WINDOW_TYPE_UTILITY) item(_NET_WM_WINDOW_TYPE_UTILITY)
item(_NET_WM_WINDOW_TYPE_SPLASH) item(_NET_WM_WINDOW_TYPE_SPLASH)
item(_NET_WM_WINDOW_TYPE_DND)
item(_NET_WM_STATE_FULLSCREEN) item(_NET_WM_STATE_FULLSCREEN)
item(_NET_WM_PING) item(_NET_WM_PING)
item(_NET_WM_PID) item(_NET_WM_PID)

9
src/include/display.h
View File

@ -29,6 +29,14 @@
#define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0) #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;
void meta_display_get_compositor_version (MetaDisplay *display, void meta_display_get_compositor_version (MetaDisplay *display,
int *major, int *major,
int *minor); int *minor);
@ -44,5 +52,6 @@ MetaWindow *meta_display_get_focus_window (MetaDisplay *display);
int meta_display_get_damage_event_base (MetaDisplay *display); int meta_display_get_damage_event_base (MetaDisplay *display);
int meta_display_get_shape_event_base (MetaDisplay *display); int meta_display_get_shape_event_base (MetaDisplay *display);
Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom);
#endif #endif