diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 21 | ||||
-rw-r--r-- | src/Window.hh | 16 |
2 files changed, 18 insertions, 19 deletions
diff --git a/src/Window.cc b/src/Window.cc index 9b4f555..2fcc31b 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.48 2002/04/28 20:09:31 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.49 2002/05/07 13:31:11 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -862,36 +862,35 @@ void FluxboxWindow::createButton(int type, ButtonEventProc pressed, ButtonEventP | |||
862 | 862 | ||
863 | #ifdef GNOME | 863 | #ifdef GNOME |
864 | //TODO | 864 | //TODO |
865 | void FluxboxWindow::updateGnomeAtoms() { | 865 | void FluxboxWindow::updateGnomeAtoms() const { |
866 | updateGnomeWorkspaceAtom(); | ||
867 | updateGnomeStateAtom(); | 866 | updateGnomeStateAtom(); |
868 | updateGnomeLayerAtom(); | 867 | updateGnomeLayerAtom(); |
869 | updateGnomeWorkspaceAtom(); | 868 | updateGnomeWorkspaceAtom(); |
870 | } | 869 | } |
871 | 870 | ||
872 | void FluxboxWindow::updateGnomeStateAtom() { | 871 | void FluxboxWindow::updateGnomeStateAtom() const { |
873 | BaseDisplay *bd = screen->getBaseDisplay(); | 872 | const BaseDisplay *bd = screen->getBaseDisplay(); |
874 | int val = getGnomeWindowState(); | 873 | int val = getGnomeWindowState(); |
875 | XChangeProperty(display, client.window, bd->getGnomeStateAtom(), | 874 | XChangeProperty(display, client.window, bd->getGnomeStateAtom(), |
876 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&val, 1); | 875 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&val, 1); |
877 | } | 876 | } |
878 | 877 | ||
879 | void FluxboxWindow::updateGnomeLayerAtom() { | 878 | void FluxboxWindow::updateGnomeLayerAtom() const { |
880 | BaseDisplay *bd = screen->getBaseDisplay(); | 879 | const BaseDisplay *bd = screen->getBaseDisplay(); |
881 | int val = getGnomeLayer(); | 880 | int val = getGnomeLayer(); |
882 | XChangeProperty(display, client.window, bd->getGnomeLayerAtom(), | 881 | XChangeProperty(display, client.window, bd->getGnomeLayerAtom(), |
883 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&val, 1); | 882 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&val, 1); |
884 | } | 883 | } |
885 | 884 | ||
886 | void FluxboxWindow::updateGnomeWorkspaceAtom() { | 885 | void FluxboxWindow::updateGnomeWorkspaceAtom() const { |
887 | BaseDisplay *bd = screen->getBaseDisplay(); | 886 | const BaseDisplay *bd = screen->getBaseDisplay(); |
888 | int val = workspace_number; | 887 | int val = workspace_number; |
889 | XChangeProperty(display, client.window, bd->getGnomeWorkspaceAtom(), | 888 | XChangeProperty(display, client.window, bd->getGnomeWorkspaceAtom(), |
890 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&val, 1); | 889 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&val, 1); |
891 | } | 890 | } |
892 | 891 | ||
893 | //TODO | 892 | //TODO |
894 | int FluxboxWindow::getGnomeWindowState() { | 893 | int FluxboxWindow::getGnomeWindowState() const { |
895 | int state=0; | 894 | int state=0; |
896 | if (isStuck()) | 895 | if (isStuck()) |
897 | state |= WIN_STATE_STICKY; | 896 | state |= WIN_STATE_STICKY; |
@@ -912,7 +911,7 @@ int FluxboxWindow::getGnomeWindowState() { | |||
912 | } | 911 | } |
913 | 912 | ||
914 | //TODO | 913 | //TODO |
915 | int FluxboxWindow::getGnomeLayer() { | 914 | int FluxboxWindow::getGnomeLayer() const { |
916 | switch (m_layer) { | 915 | switch (m_layer) { |
917 | case LAYER_NORMAL: | 916 | case LAYER_NORMAL: |
918 | return WIN_LAYER_NORMAL; | 917 | return WIN_LAYER_NORMAL; |
diff --git a/src/Window.hh b/src/Window.hh index 0dc1e91..ae2d739 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.hh,v 1.18 2002/04/04 22:39:52 fluxgen Exp $ | 25 | // $Id: Window.hh,v 1.19 2002/05/07 13:31:11 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef WINDOW_HH | 27 | #ifndef WINDOW_HH |
28 | #define WINDOW_HH | 28 | #define WINDOW_HH |
@@ -321,17 +321,17 @@ private: | |||
321 | 321 | ||
322 | #ifdef GNOME | 322 | #ifdef GNOME |
323 | 323 | ||
324 | void updateGnomeAtoms(); | 324 | void updateGnomeAtoms() const; |
325 | void updateGnomeStateAtom(); | 325 | void updateGnomeStateAtom() const; |
326 | void updateGnomeHintsAtom(); | 326 | void updateGnomeHintsAtom() const; |
327 | void updateGnomeLayerAtom(); | 327 | void updateGnomeLayerAtom() const; |
328 | void updateGnomeWorkspaceAtom(); | 328 | void updateGnomeWorkspaceAtom() const; |
329 | 329 | ||
330 | void setGnomeLayer(int layer); | 330 | void setGnomeLayer(int layer); |
331 | 331 | ||
332 | int getGnomeWindowState(); | 332 | int getGnomeWindowState() const; |
333 | bool handleGnomePropertyNotify(Atom atom); | 333 | bool handleGnomePropertyNotify(Atom atom); |
334 | int getGnomeLayer(); | 334 | int getGnomeLayer() const; |
335 | void loadGnomeAtoms(); | 335 | void loadGnomeAtoms(); |
336 | void loadGnomeStateAtom(); | 336 | void loadGnomeStateAtom(); |
337 | void loadGnomeHintsAtom(); | 337 | void loadGnomeHintsAtom(); |