From 584ff43a5cb82236957e7d0a21e2152feee024ae Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sat, 7 Feb 2009 12:16:13 +0000 Subject: [PATCH] Add _NET_WM_ACTION_ABOVE/BELOW. SVN revision: 38962 --- legacy/ecore/src/lib/ecore_x/Ecore_X.h | 4 +++- legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h | 2 ++ legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h | 2 ++ legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atom.c | 4 ++++ legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c | 4 ++++ legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h | 2 +- legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c | 2 ++ legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c | 4 ++++ 8 files changed, 22 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h index a5f3a8c184..0ffe78d961 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h @@ -979,7 +979,9 @@ typedef enum _Ecore_X_Action { ECORE_X_ACTION_MAXIMIZE_VERT, ECORE_X_ACTION_FULLSCREEN, ECORE_X_ACTION_CHANGE_DESKTOP, - ECORE_X_ACTION_CLOSE + ECORE_X_ACTION_CLOSE, + ECORE_X_ACTION_ABOVE, + ECORE_X_ACTION_BELOW } Ecore_X_Action; typedef enum _Ecore_X_Window_Configure_Mask { diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h b/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h index 4d1253d9b7..ae05b63f0e 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h @@ -154,6 +154,8 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT; EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN; EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP; EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CLOSE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_ABOVE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_BELOW; EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT; EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL; diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h b/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h index 08e9b2f50c..e17ccf6307 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h @@ -160,6 +160,8 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CLOSE = 0; +EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_ABOVE = 0; +EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_BELOW = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL = 0; diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atom.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atom.c index deece9c454..0813d45e9f 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atom.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atom.c @@ -153,6 +153,8 @@ _ecore_x_atom_init(xcb_intern_atom_cookie_t *atom_cookies) FETCH_ATOM("_NET_WM_ACTION_FULLSCREEN"); FETCH_ATOM("_NET_WM_ACTION_CHANGE_DESKTOP"); FETCH_ATOM("_NET_WM_ACTION_CLOSE"); + FETCH_ATOM("_NET_WM_ACTION_ABOVE"); + FETCH_ATOM("_NET_WM_ACTION_BELOW"); FETCH_ATOM("_NET_WM_STRUT"); FETCH_ATOM("_NET_WM_STRUT_PARTIAL"); @@ -330,6 +332,8 @@ _ecore_x_atom_init_finalize(xcb_intern_atom_cookie_t *atom_cookies) FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN); FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP); FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_ACTION_CLOSE); + FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_ACTION_ABOVE); + FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_ACTION_BELOW); FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_STRUT); FETCH_ATOM_FINALIZE(ECORE_X_ATOM_NET_WM_STRUT_PARTIAL); diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c index e49104364d..90affc7cd9 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c @@ -2196,6 +2196,10 @@ _ecore_x_netwm_action_atom_get(Ecore_X_Action action) return ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP; case ECORE_X_ACTION_CLOSE: return ECORE_X_ATOM_NET_WM_ACTION_CLOSE; + case ECORE_X_ACTION_ABOVE: + return ECORE_X_ATOM_NET_WM_ACTION_ABOVE; + case ECORE_X_ACTION_BELOW: + return ECORE_X_ATOM_NET_WM_ACTION_BELOW; default: return 0; } diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h index ef8dc2cbad..605bb986b6 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h @@ -235,7 +235,7 @@ extern Ecore_X_Atom ECORE_X_ATOM_WINDOW; extern Ecore_X_Atom ECORE_X_ATOM_E_FRAME_SIZE; extern Ecore_X_Atom ECORE_X_ATOM_WM_SIZE_HINTS; -#define ECORE_X_ATOMS_COUNT 115 +#define ECORE_X_ATOMS_COUNT 117 void _ecore_x_atom_init (xcb_intern_atom_cookie_t *); void _ecore_x_atom_init_finalize (xcb_intern_atom_cookie_t *); diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c index 845368f8a1..0176029c0b 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -171,6 +171,8 @@ _ecore_x_atoms_init(void) { "_NET_WM_ACTION_FULLSCREEN", &ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN }, { "_NET_WM_ACTION_CHANGE_DESKTOP", &ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP }, { "_NET_WM_ACTION_CLOSE", &ECORE_X_ATOM_NET_WM_ACTION_CLOSE }, + { "_NET_WM_ACTION_ABOVE", &ECORE_X_ATOM_NET_WM_ACTION_ABOVE }, + { "_NET_WM_ACTION_BELOW", &ECORE_X_ATOM_NET_WM_ACTION_BELOW }, { "_NET_WM_STRUT", &ECORE_X_ATOM_NET_WM_STRUT }, { "_NET_WM_STRUT_PARTIAL", &ECORE_X_ATOM_NET_WM_STRUT_PARTIAL }, diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c index 232df2019f..8009577b19 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c @@ -898,6 +898,10 @@ _ecore_x_netwm_action_atom_get(Ecore_X_Action action) return ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP; case ECORE_X_ACTION_CLOSE: return ECORE_X_ATOM_NET_WM_ACTION_CLOSE; + case ECORE_X_ACTION_ABOVE: + return ECORE_X_ATOM_NET_WM_ACTION_ABOVE; + case ECORE_X_ACTION_BELOW: + return ECORE_X_ATOM_NET_WM_ACTION_BELOW; default: return 0; }