added tests

3 files changed, 296 insertions, 0 deletions

diff --git a/src/tests/Makefile b/src/tests/Makefile
index e39ab0b..8d1c482 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -24,6 +24,9 @@ testKeys:  testKeys.o
 testResource: Resourcetest.o Resource.o
         ${CXX} ${LIBS} ${XLIBS} Resourcetest.o Resource.o -o testResource
 
+testTitle: titletest.cc
+        ${CXX} ${CXXFLAGS} ${LIBS} ${XLIBS} titletest.cc ../FbTk/libFbTk.a -o testTitle
+
 signaltest:
         ${COMPILE} ../FbTk/SignalHandler.o signaltest.cc -o signaltest
 
@@ -48,6 +51,9 @@ testTexture: texturetest.cc
 testDemandAttention: testDemandAttention.cc
         ${COMPILE} testDemandAttention.cc ../FbTk/libFbTk.a -lXpm -o testDemandAttention
 
+testFullscreen: fullscreentest.cc
+        ${COMPILE} fullscreentest.cc ../FbTk/libFbTk.a -o testFullscreen
+
 Parser.o: ../Parser.hh ../Parser.cc
         ${COMPILE} ${CXXFLAGS} -c ../Parser.cc
 
diff --git a/src/tests/fullscreentest.cc b/src/tests/fullscreentest.cc
new file mode 100644
index 0000000..13d7325
--- /dev/null
+++ b/src/tests/fullscreentest.cc
@@ -0,0 +1,170 @@
+// fullscreentest.cc for EWMH test suite
+// Copyright (c) 2007 Fluxbox TEam (fluxgen at fluxbox dot org)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// $Id$
+
+#include "App.hh"
+#include "FbWindow.hh"
+#include "Font.hh"
+#include "EventHandler.hh"
+#include "EventManager.hh"
+#include "GContext.hh"
+#include "Color.hh"
+
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+#include <X11/Xatom.h>
+
+#include <string>
+#include <iostream>
+using namespace std;
+/// Motif wm Hints
+enum {
+    MwmHintsFunctions   = (1l << 0), ///< use motif wm functions
+    MwmHintsDecorations = (1l << 1) ///< use motif wm decorations
+};
+/// Motif wm functions
+enum MwmFunc{
+    MwmFuncAll          = (1l << 0), ///< all motif wm functions
+    MwmFuncResize       = (1l << 1), ///< resize
+    MwmFuncMove         = (1l << 2), ///< move
+    MwmFuncIconify      = (1l << 3), ///< iconify
+    MwmFuncMaximize     = (1l << 4), ///< maximize
+    MwmFuncClose        = (1l << 5)  ///< close
+};
+
+typedef struct MwmHints {
+    unsigned long flags;       // Motif wm flags
+    unsigned long functions;   // Motif wm functions
+    unsigned long decorations; // Motif wm decorations
+} MwmHints;
+
+class App:public FbTk::App, public FbTk::EventHandler {
+public:
+    App(const char *displayname, bool fullscreen):
+        FbTk::App(displayname),
+        m_win(DefaultScreen(display()),
+              0, 0, 100, 100, KeyPressMask | ExposureMask ),
+        m_fullscreen(fullscreen) { 
+
+        if (fullscreen) {
+            
+            // setup fullscreen as initial state
+            Atom net_wm_state = XInternAtom(display(), "_NET_WM_STATE", False);
+            Atom state_fullscreen = XInternAtom(display(), "_NET_WM_STATE_FULLSCREEN", False);
+            m_win.changeProperty(net_wm_state, XA_ATOM, 32, PropModeReplace,
+                                 reinterpret_cast<unsigned char*>(&state_fullscreen),
+                                 1 );
+            MwmHints hints;
+            hints.flags = MwmHintsFunctions;
+            hints.functions = MwmFuncIconify | MwmFuncClose;
+
+            // disable resize
+            Atom mwm_hints = XInternAtom(display(), "_MOTIF_WM_HINTS", False);
+            
+            m_win.changeProperty(mwm_hints, mwm_hints, 32, PropModeReplace,
+                                 reinterpret_cast<unsigned char*>(&hints), 3);
+                                 
+        }
+
+        m_win.show();
+
+        m_win.setBackgroundColor(FbTk::Color("white", m_win.screenNumber()));
+        FbTk::EventManager::instance()->add(*this, m_win);
+        m_win.setName("Fullscreen test.");
+    }
+
+    ~App() {
+    }
+
+    void keyPressEvent(XKeyEvent &ke) {
+        KeySym ks;
+        char keychar[1];
+        XLookupString(&ke, keychar, 1, &ks, 0);
+        if (ks == XK_Escape)
+            end();
+        else
+            toggleFullscreen();
+    }
+    void exposeEvent(XExposeEvent &event) {
+        redraw();
+    }
+
+    void redraw() {
+        m_win.clear();
+    }
+
+    void toggleFullscreen() {
+        setFullscreen(!m_fullscreen);
+    }
+    void setFullscreen( bool state ) {
+        m_fullscreen = state;
+        Atom net_wm_state = XInternAtom(display(), "_NET_WM_STATE", False);
+        Atom net_wm_state_fullscreen = XInternAtom(display(), "_NET_WM_STATE_FULLSCREEN", False);
+        XEvent event;
+        event.type = ClientMessage;
+        event.xclient.message_type = net_wm_state;
+        event.xclient.display = m_win.display();
+        event.xclient.format = 32;
+        event.xclient.window = m_win.window();
+        event.xclient.data.l[0] = state; 
+        event.xclient.data.l[1] = net_wm_state_fullscreen;
+        event.xclient.data.l[2] = 0;
+        event.xclient.data.l[3] = 0;
+        event.xclient.data.l[4] = 0;
+        XSendEvent(display(), DefaultRootWindow(display()), False, 
+                   SubstructureRedirectMask | SubstructureNotifyMask, 
+                   &event);
+        if ( ! state ) { 
+            // if no fullscreen then
+            // enable all functions
+            MwmHints hints;
+            hints.flags = MwmHintsFunctions;
+            hints.functions = MwmFuncAll;
+
+            // disable resize
+            Atom mwm_hints = XInternAtom(display(), "_MOTIF_WM_HINTS", False);
+            
+            m_win.changeProperty(mwm_hints, mwm_hints, 32, PropModeReplace,
+                                 reinterpret_cast<unsigned char*>(&hints), 3);
+        }
+    }
+private:
+    FbTk::FbWindow m_win;
+    bool m_fullscreen;
+};
+
+int main(int argc, char **argv) {
+    string displayname("");
+    bool fullscreen = false;
+    for (int a=1; a<argc; ++a) {
+        if (strcmp("-display", argv[a]) == 0 && a + 1 < argc) {
+            displayname = argv[++a];
+        } else if (strcmp("-f", argv[a]) == 0) {
+            fullscreen = true;
+        }
+    }
+
+    App app(displayname.c_str(), fullscreen);
+
+    app.eventLoop();
+        
+}
diff --git a/src/tests/titletest.cc b/src/tests/titletest.cc
new file mode 100644
index 0000000..fadcc9b
--- /dev/null
+++ b/src/tests/titletest.cc
@@ -0,0 +1,120 @@
+// titletest.cc for fbtk test suite
+// Copyright (c) 2007 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// $Id$
+
+#include "App.hh"
+#include "FbWindow.hh"
+#include "Font.hh"
+#include "EventHandler.hh"
+#include "EventManager.hh"
+#include "Timer.hh"
+#include "SimpleCommand.hh"
+#include "stringstream.hh"
+#include "GContext.hh"
+#include "Color.hh"
+
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+
+#include <string>
+#include <iostream>
+using namespace std;
+
+class App:public FbTk::App, public FbTk::EventHandler {
+public:
+    App(const char *displayname):
+        FbTk::App(displayname),
+        m_win(DefaultScreen(display()),
+              0, 0, 640, 100, KeyPressMask | ExposureMask | 
+              ButtonPressMask | ButtonReleaseMask | ButtonMotionMask),
+        m_tick( 0 ) { 
+
+        m_win.show();
+        m_win.setBackgroundColor(FbTk::Color("white", m_win.screenNumber()));
+        FbTk::EventManager::instance()->add(*this, m_win);
+        FbTk::RefCount<FbTk::Command> cmd(new FbTk::SimpleCommand<App>
+                                          (*this,
+                                           &App::updateTitle));
+        timeval t;
+        t.tv_sec = 0;
+        t.tv_usec = 15000;
+        m_timer.setTimeout(t);
+        m_timer.setCommand(cmd);
+        m_timer.fireOnce(false);
+        m_timer.start();
+
+        updateTitle();
+        m_win.clear();
+        srand( time( 0 ) );
+    }
+
+    ~App() {
+    }
+    void eventLoop() {
+        XEvent ev;
+        while (!done()) {
+            if (XPending(display())) {
+                XNextEvent(display(), &ev);
+                FbTk::EventManager::instance()->handleEvent(ev);
+            } else {
+                FbTk::Timer::updateTimers(ConnectionNumber(display()));
+            }
+        }
+    }
+
+    void updateTitle() {
+        FbTk_ostringstream str;
+        ++m_tick;
+        for (int i = 0, n = rand( ) % 10; i < max( 1, n ); ++i) {
+            str << " Tick #" << m_tick;            
+        }
+
+        m_win.setName( str.str().c_str() );
+        // set _NET_WM_NAME
+        Atom net_wm_name = XInternAtom(display(), "_NET_WM_NAME", False);
+        Atom utf8_string = XInternAtom(display(), "UTF8_STRING", False);
+        XChangeProperty(display(), m_win.window(), 
+                        net_wm_name, utf8_string, 8,
+                        PropModeReplace, 
+                        (unsigned char*)str.str().c_str(), str.str().size() );
+    }
+
+
+private:
+    FbTk::FbWindow m_win;
+    FbTk::Timer m_timer;
+    unsigned int m_tick;
+};
+
+int main(int argc, char **argv) {
+    string displayname("");
+    for (int a=1; a<argc; ++a) {
+        if (strcmp("-display", argv[a]) == 0 && a + 1 < argc) {
+            displayname = argv[++a];
+        }
+    }
+
+    App app(displayname.c_str());
+
+    app.eventLoop();
+        
+}