diff options
| author | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-05-20 16:31:56 +0300 |
|---|---|---|
| committer | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-05-21 17:26:20 +0300 |
| commit | e21b998bc77ee66dfdf5fd4382b5d6c4a31fd237 (patch) | |
| tree | ae67e87c9babdf508779e0fe4311eb1a20304c5d /src/mcompositewindow.cpp | |
| parent | 74b77270caba324ca9252c03cfe6d9cd01791229 (diff) | |
Fixes: NB#
New:
Changes:
- add support for _MEEGO_STACKING_LAYER
- rename intValueProperty to cardValueProperty because cardinal is not int
- remove unused 'arranged' and 'damage_cache'
Diffstat (limited to 'src/mcompositewindow.cpp')
| -rw-r--r-- | src/mcompositewindow.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/mcompositewindow.cpp b/src/mcompositewindow.cpp index b83ceb9..c5a4e25 100644 --- a/src/mcompositewindow.cpp +++ b/src/mcompositewindow.cpp @@ -51,6 +51,7 @@ MCompositeWindow::MCompositeWindow(Qt::HANDLE window, QGraphicsItem *p) wm_protocols_valid(false), window_obscured(false), wmhints(0), + meego_layer(-1), win_id(window), window_state(NormalState) { @@ -282,6 +283,15 @@ Window MCompositeWindow::transientFor() return transient_for; } +unsigned int MCompositeWindow::meegoStackingLayer() +{ + if (meego_layer < 0) + meego_layer = MCompAtoms::instance()->cardValueProperty(window(), + ATOM(_MEEGO_STACKING_LAYER)); + if (meego_layer > 6) meego_layer = 6; + return (unsigned)meego_layer; +} + bool MCompositeWindow::wantsFocus() { bool val = true; @@ -334,13 +344,16 @@ bool MCompositeWindow::propertyEvent(XPropertyEvent *e) ATOM(WM_STATE), 0, 2, False, AnyPropertyType, &type, &format, &length, &after, &data); - int w_state = 0; if (r == Success && data && format == 32) { unsigned long *wstate = (unsigned long *) data; window_state = *wstate; XFree((char *)data); return true; } + } else if (e->atom == ATOM(_MEEGO_STACKING_LAYER)) { + meego_layer = MCompAtoms::instance()->cardValueProperty(window(), + ATOM(_MEEGO_STACKING_LAYER)); + return true; } return false; } |