summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am13
-rw-r--r--src/guichan/defaultfont.cpp94
-rw-r--r--src/guichan/defaultfont.hpp95
-rw-r--r--src/guichan/inputevent.cpp96
-rw-r--r--src/guichan/inputevent.hpp159
-rw-r--r--src/guichan/key.cpp91
-rw-r--r--src/guichan/keyevent.cpp91
-rw-r--r--src/guichan/keyevent.hpp138
-rw-r--r--src/guichan/keyinput.cpp134
-rw-r--r--src/guichan/sdl/sdlgraphics.cpp694
-rw-r--r--src/guichan/sdl/sdlgraphics.hpp156
-rw-r--r--src/guichan/sdl/sdlimage.cpp185
-rw-r--r--src/guichan/sdl/sdlimage.hpp107
-rw-r--r--src/guichan/sdl/sdlpixel.hpp260
14 files changed, 2313 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 711c803ae..a5894458d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ manaplus_SOURCES += guichan/actionevent.hpp \
guichan/basiccontainer.hpp \
guichan/cliprectangle.hpp \
guichan/color.hpp \
+ guichan/defaultfont.hpp \
guichan/event.hpp \
guichan/exception.hpp \
guichan/focushandler.hpp \
@@ -36,7 +37,9 @@ manaplus_SOURCES += guichan/actionevent.hpp \
guichan/image.hpp \
guichan/imageloader.hpp \
guichan/input.hpp \
+ guichan/inputevent.hpp \
guichan/key.hpp \
+ guichan/keyevent.hpp \
guichan/keyinput.hpp \
guichan/keylistener.hpp \
guichan/listmodel.hpp \
@@ -46,6 +49,9 @@ manaplus_SOURCES += guichan/actionevent.hpp \
guichan/platform.hpp \
guichan/rectangle.hpp \
guichan/selectionevent.hpp \
+ guichan/sdl/sdlgraphics.hpp \
+ guichan/sdl/sdlimage.hpp \
+ guichan/sdl/sdlpixel.hpp \
guichan/widget.hpp \
guichan/widgetlistener.hpp \
guichan/widgets/button.hpp \
@@ -69,6 +75,7 @@ manaplus_SOURCES += guichan/actionevent.cpp \
guichan/basiccontainer.cpp \
guichan/cliprectangle.cpp \
guichan/color.cpp \
+ guichan/defaultfont.cpp \
guichan/event.cpp \
guichan/exception.cpp \
guichan/focushandler.cpp \
@@ -76,11 +83,17 @@ manaplus_SOURCES += guichan/actionevent.cpp \
guichan/graphics.cpp \
guichan/gui.cpp \
guichan/image.cpp \
+ guichan/inputevent.cpp \
+ guichan/key.cpp \
+ guichan/keyevent.cpp \
+ guichan/keyinput.cpp \
guichan/mouseevent.cpp \
guichan/mouseinput.cpp \
guichan/rectangle.cpp \
guichan/selectionevent.cpp \
guichan/widget.cpp \
+ guichan/sdl/sdlgraphics.cpp \
+ guichan/sdl/sdlimage.cpp \
guichan/widgets/button.cpp \
guichan/widgets/checkbox.cpp \
guichan/widgets/container.cpp \
diff --git a/src/guichan/defaultfont.cpp b/src/guichan/defaultfont.cpp
new file mode 100644
index 000000000..d792e727d
--- /dev/null
+++ b/src/guichan/defaultfont.cpp
@@ -0,0 +1,94 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/defaultfont.hpp"
+
+#include <string>
+
+#include "guichan/graphics.hpp"
+#include "guichan/rectangle.hpp"
+
+namespace gcn
+{
+ int DefaultFont::getHeight() const
+ {
+ return 8;
+ }
+
+ int DefaultFont::getWidth(const std::string& text) const
+ {
+ return 8*text.size();
+ }
+
+ int DefaultFont::drawGlyph(Graphics* graphics, unsigned char glyph, int x, int y)
+ {
+ graphics->drawRectangle( Rectangle(x, y, 8, 8));
+
+ return 8;
+ }
+
+ void DefaultFont::drawString(Graphics* graphics, const std::string& text, int x, int y)
+ {
+ unsigned int i;
+
+ for (i = 0; i< text.size(); ++i)
+ {
+ drawGlyph(graphics, text.at(i), x, y);
+ x += getWidth(text);
+ }
+ }
+
+ int DefaultFont::getStringIndexAt(const std::string& text, int x) const
+ {
+ if (x > (int)text.size() * 8)
+ {
+ return text.size();
+ }
+
+ return x / 8;
+ }
+}
diff --git a/src/guichan/defaultfont.hpp b/src/guichan/defaultfont.hpp
new file mode 100644
index 000000000..430911ca3
--- /dev/null
+++ b/src/guichan/defaultfont.hpp
@@ -0,0 +1,95 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_DEFAULTFONT_HPP
+#define GCN_DEFAULTFONT_HPP
+
+#include "guichan/font.hpp"
+#include "guichan/platform.hpp"
+
+namespace gcn
+{
+ /**
+ * A font only capable of drawing rectangles. It is used by default
+ * in Guichan if no font has been set merely to show that no font has
+ * been set.
+ */
+ class GCN_CORE_DECLSPEC DefaultFont : public Font
+ {
+ public:
+
+ /**
+ * Destructor.
+ */
+ virtual ~DefaultFont(){}
+
+ /**
+ * Draws a glyph as a rectangle. The glyphs will always be drawn as
+ * rectangles no matter the glyph.
+ *
+ * NOTE: You normally won't use this function to draw text since
+ * the Graphics class contains better functions for drawing
+ * text.
+ *
+ * @param graphics A Graphics object to be used for drawing.
+ * @param glyph The glyph to draw.
+ * @param x The x coordinate where to draw the glyph.
+ * @param y The y coordinate where to draw the glyph.
+ * @return The width of the drawn glyph in pixels.
+ */
+ virtual int drawGlyph(Graphics* graphics, unsigned char glyph, int x, int y);
+
+
+ // Inherited from Font
+
+ virtual void drawString(Graphics* graphics, const std::string& text, int x, int y);
+
+ virtual int getWidth(const std::string& text) const;
+
+ virtual int getHeight() const;
+
+ virtual int getStringIndexAt(const std::string& text, int x) const;
+ };
+}
+
+#endif // end GCN_DEFAULTFONT_HPP
diff --git a/src/guichan/inputevent.cpp b/src/guichan/inputevent.cpp
new file mode 100644
index 000000000..d10b16823
--- /dev/null
+++ b/src/guichan/inputevent.cpp
@@ -0,0 +1,96 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/inputevent.hpp"
+
+namespace gcn
+{
+ InputEvent::InputEvent(Widget* source,
+ bool isShiftPressed,
+ bool isControlPressed,
+ bool isAltPressed,
+ bool isMetaPressed)
+ :Event(source),
+ mShiftPressed(isShiftPressed),
+ mControlPressed(isControlPressed),
+ mAltPressed(isAltPressed),
+ mMetaPressed(isMetaPressed),
+ mIsConsumed(false)
+ {
+
+ }
+
+ bool InputEvent::isShiftPressed() const
+ {
+ return mShiftPressed;
+ }
+
+ bool InputEvent::isControlPressed() const
+ {
+ return mControlPressed;
+ }
+
+ bool InputEvent::isAltPressed() const
+ {
+ return mAltPressed;
+ }
+
+ bool InputEvent::isMetaPressed() const
+ {
+ return mMetaPressed;
+ }
+
+ void InputEvent::consume()
+ {
+ mIsConsumed = true;
+ }
+
+ bool InputEvent::isConsumed() const
+ {
+ return mIsConsumed;
+ }
+}
diff --git a/src/guichan/inputevent.hpp b/src/guichan/inputevent.hpp
new file mode 100644
index 000000000..8594d3dae
--- /dev/null
+++ b/src/guichan/inputevent.hpp
@@ -0,0 +1,159 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_INPUTEVENT_HPP
+#define GCN_INPUTEVENT_HPP
+
+#include "guichan/event.hpp"
+#include "guichan/platform.hpp"
+
+namespace gcn
+{
+ /**
+ * Base class for all events concerning input.
+ *
+ * @author Olof Naess�n
+ * @since 0.6.0
+ */
+ class GCN_CORE_DECLSPEC InputEvent: public Event
+ {
+ public:
+
+ /**
+ * Constructor.
+ *
+ * @param source The source widget of the event.
+ * @param isShiftPressed True if shift is pressed, false otherwise.
+ * @param isControlPressed True if control is pressed, false otherwise.
+ * @param isAltPressed True if alt is pressed, false otherwise.
+ * @param isMetaPressed True if meta is pressed, false otherwise.
+ */
+ InputEvent(Widget* source,
+ bool isShiftPressed,
+ bool isControlPressed,
+ bool isAltPressed,
+ bool isMetaPressed);
+
+ /**
+ * Checks if shift is pressed.
+ *
+ * @return True if shift was pressed at the same time as the key,
+ * false otherwise.
+ */
+ bool isShiftPressed() const;
+
+ /**
+ * Checks if control is pressed.
+ *
+ * @return True if control was pressed at the same time as the key,
+ * false otherwise.
+ */
+ bool isControlPressed() const;
+
+ /**
+ * Checks if alt is pressed.
+ *
+ * @return True if alt was pressed at the same time as the key,
+ * false otherwise.
+ */
+ bool isAltPressed() const;
+
+ /**
+ * Checks whether meta is pressed.
+ *
+ * @return True if meta was pressed at the same time as the key,
+ * false otherwise.
+ */
+ bool isMetaPressed() const;
+
+ /**
+ * Marks the event as consumed. Input event listeners may discard
+ * consumed input or act on consumed input. An example of a widget
+ * that discards consumed input is the ScrollArea widget that
+ * discards consumed mouse wheel events so the ScrollArea will not
+ * scroll if for instance a Slider's value inside the ScrollArea was
+ * changed with the mouse wheel.
+ *
+ * @see isConsumed
+ */
+ void consume();
+
+ /**
+ * Checks if the input event is consumed.
+ *
+ * @return True if the input event is consumed,
+ * false otherwise.
+ * @see consume
+ */
+ bool isConsumed() const;
+
+ protected:
+ /**
+ * True if shift is pressed, false otherwise.
+ */
+ bool mShiftPressed;
+
+ /**
+ * True if control is pressed, false otherwise.
+ */
+ bool mControlPressed;
+
+ /**
+ * True if alt is pressed, false otherwise.
+ */
+ bool mAltPressed;
+
+ /**
+ * True if meta is pressed, false otherwise.
+ */
+ bool mMetaPressed;
+
+ /**
+ * True if the input event is consumed,
+ * false otherwise.
+ */
+ bool mIsConsumed;
+ };
+}
+
+#endif // end GCN_INPUTEVENT_HPP
diff --git a/src/guichan/key.cpp b/src/guichan/key.cpp
new file mode 100644
index 000000000..70e965209
--- /dev/null
+++ b/src/guichan/key.cpp
@@ -0,0 +1,91 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/key.hpp"
+
+namespace gcn
+{
+ Key::Key(int value)
+ :mValue(value)
+ {
+ }
+
+ bool Key::isCharacter() const
+ {
+ return (mValue >= 32 && mValue <= 126)
+ || (mValue >= 162 && mValue <= 255)
+ || (mValue == 9);
+ }
+
+ bool Key::isNumber() const
+ {
+ return mValue >= 48 && mValue <= 57;
+ }
+
+ bool Key::isLetter() const
+ {
+ return (((mValue >= 65 && mValue <= 90)
+ || (mValue >= 97 && mValue <= 122)
+ || (mValue >= 192 && mValue <= 255))
+ && (mValue != 215) && (mValue != 247));
+ }
+
+ int Key::getValue() const
+ {
+ return mValue;
+ }
+
+ bool Key::operator==(const Key& key) const
+ {
+ return mValue == key.mValue;
+ }
+
+ bool Key::operator!=(const Key& key) const
+ {
+ return (mValue != key.mValue);
+ }
+}
diff --git a/src/guichan/keyevent.cpp b/src/guichan/keyevent.cpp
new file mode 100644
index 000000000..74c6a7983
--- /dev/null
+++ b/src/guichan/keyevent.cpp
@@ -0,0 +1,91 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/keyevent.hpp"
+
+namespace gcn
+{
+ KeyEvent::KeyEvent(Widget* source,
+ bool isShiftPressed,
+ bool isControlPressed,
+ bool isAltPressed,
+ bool isMetaPressed,
+ unsigned int type,
+ bool isNumericPad,
+ const Key& key)
+ :InputEvent(source,
+ isShiftPressed,
+ isControlPressed,
+ isAltPressed,
+ isMetaPressed),
+ mType(type),
+ mIsNumericPad(isNumericPad),
+ mKey(key)
+ {
+
+ }
+
+ KeyEvent::~KeyEvent()
+ {
+
+ }
+
+ unsigned int KeyEvent::getType() const
+ {
+ return mType;
+ }
+
+ bool KeyEvent::isNumericPad() const
+ {
+ return mIsNumericPad;
+ }
+
+ const Key& KeyEvent::getKey() const
+ {
+ return mKey;
+ }
+}
diff --git a/src/guichan/keyevent.hpp b/src/guichan/keyevent.hpp
new file mode 100644
index 000000000..f42601235
--- /dev/null
+++ b/src/guichan/keyevent.hpp
@@ -0,0 +1,138 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_KEYEVENT_HPP
+#define GCN_KEYEVENT_HPP
+
+#include "guichan/inputevent.hpp"
+#include "guichan/key.hpp"
+#include "guichan/platform.hpp"
+
+namespace gcn
+{
+ class Widget;
+
+ /**
+ * Represents a key event.
+ */
+ class GCN_CORE_DECLSPEC KeyEvent: public InputEvent
+ {
+ public:
+ /**
+ * Key event types.
+ */
+ enum
+ {
+ PRESSED = 0,
+ RELEASED
+ };
+
+ /**
+ * Constructor.
+ *
+ * @param source The source widget of the event.
+ * @param isShiftPressed True if shift is pressed, false otherwise.
+ * @param isControlPressed True if control is pressed, false otherwise.
+ * @param isAltPressed True if alt is pressed, false otherwise.
+ * @param isMetaPressed True if meta is pressed, false otherwise.
+ * @param type The type of the event. A value from KeyEventType.
+ * @param isNumericPad True if the event occured on the numeric pad,
+ * false otherwise.
+ * @param key The key of the event.
+ */
+ KeyEvent(Widget* source,
+ bool isShiftPressed,
+ bool isControlPressed,
+ bool isAltPressed,
+ bool isMetaPressed,
+ unsigned int type,
+ bool isNumericPad,
+ const Key& key);
+
+ /**
+ * Destructor.
+ */
+ virtual ~KeyEvent();
+
+ /**
+ * Gets the type of the event.
+ *
+ * @return The type of the event.
+ */
+ unsigned int getType() const;
+
+ /**
+ * Checks if the key event occured on the numeric pad.
+ *
+ * @return True if key event occured on the numeric pad,
+ * false otherwise.
+ *
+ */
+ bool isNumericPad() const;
+
+ /**
+ * Gets the key of the event.
+ *
+ * @return The key of the event.
+ */
+ const Key& getKey() const;
+
+ protected:
+ /**
+ * Holds the type of the key event.
+ */
+ unsigned int mType;
+
+ /**
+ * True if the numeric pad was used, false otherwise.
+ */
+ bool mIsNumericPad;
+
+ /**
+ * Holds the key of the key event.
+ */
+ Key mKey;
+ };
+}
+
+#endif // end GCN_KEYEVENT_HPP
diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp
new file mode 100644
index 000000000..d0a3a1f7a
--- /dev/null
+++ b/src/guichan/keyinput.cpp
@@ -0,0 +1,134 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/keyinput.hpp"
+
+namespace gcn
+{
+ KeyInput::KeyInput(const Key& key, unsigned int type)
+ :mKey(key),
+ mType(type),
+ mShiftPressed(false),
+ mControlPressed(false),
+ mAltPressed(false),
+ mMetaPressed(false),
+ mNumericPad(false)
+ {
+
+ }
+
+ void KeyInput::setType(unsigned int type)
+ {
+ mType = type;
+ }
+
+ int KeyInput::getType() const
+ {
+ return mType;
+ }
+
+ void KeyInput::setKey(const Key& key)
+ {
+ mKey = key;
+ }
+
+ const Key& KeyInput::getKey() const
+ {
+ return mKey;
+ }
+
+ bool KeyInput::isShiftPressed() const
+ {
+ return mShiftPressed;
+ }
+
+ void KeyInput::setShiftPressed(bool pressed)
+ {
+ mShiftPressed = pressed;
+ }
+
+ bool KeyInput::isControlPressed() const
+ {
+ return mControlPressed;
+ }
+
+ void KeyInput::setControlPressed(bool pressed)
+ {
+ mControlPressed = pressed;
+ }
+
+ bool KeyInput::isAltPressed() const
+ {
+ return mAltPressed;
+ }
+
+ void KeyInput::setAltPressed(bool pressed)
+ {
+ mAltPressed = pressed;
+ }
+
+ bool KeyInput::isMetaPressed() const
+ {
+ return mMetaPressed;
+ }
+
+ void KeyInput::setMetaPressed(bool pressed)
+ {
+ mMetaPressed = pressed;
+ }
+
+ bool KeyInput::isNumericPad() const
+ {
+ return mNumericPad;
+ }
+
+ void KeyInput::setNumericPad(bool numpad)
+ {
+ mNumericPad = numpad;
+ }
+}
+
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
new file mode 100644
index 000000000..8c4504a59
--- /dev/null
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -0,0 +1,694 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/sdl/sdlgraphics.hpp"
+
+#include "guichan/exception.hpp"
+#include "guichan/font.hpp"
+#include "guichan/image.hpp"
+#include "guichan/sdl/sdlimage.hpp"
+#include "guichan/sdl/sdlpixel.hpp"
+
+// For some reason an old version of MSVC did not like std::abs,
+// so we added this macro.
+#ifndef ABS
+#define ABS(x) ((x)<0?-(x):(x))
+#endif
+
+namespace gcn
+{
+
+ SDLGraphics::SDLGraphics()
+ {
+ mAlpha = false;
+ }
+
+ void SDLGraphics::_beginDraw()
+ {
+ Rectangle area;
+ area.x = 0;
+ area.y = 0;
+ area.width = mTarget->w;
+ area.height = mTarget->h;
+ pushClipArea(area);
+ }
+
+ void SDLGraphics::_endDraw()
+ {
+ popClipArea();
+ }
+
+ void SDLGraphics::setTarget(SDL_Surface* target)
+ {
+ mTarget = target;
+ }
+
+ bool SDLGraphics::pushClipArea(Rectangle area)
+ {
+ SDL_Rect rect;
+ bool result = Graphics::pushClipArea(area);
+
+ const ClipRectangle& carea = mClipStack.top();
+ rect.x = carea.x;
+ rect.y = carea.y;
+ rect.w = carea.width;
+ rect.h = carea.height;
+
+ SDL_SetClipRect(mTarget, &rect);
+
+ return result;
+ }
+
+ void SDLGraphics::popClipArea()
+ {
+ Graphics::popClipArea();
+
+ if (mClipStack.empty())
+ {
+ return;
+ }
+
+ const ClipRectangle& carea = mClipStack.top();
+ SDL_Rect rect;
+ rect.x = carea.x;
+ rect.y = carea.y;
+ rect.w = carea.width;
+ rect.h = carea.height;
+
+ SDL_SetClipRect(mTarget, &rect);
+ }
+
+ SDL_Surface* SDLGraphics::getTarget() const
+ {
+ return mTarget;
+ }
+
+ void SDLGraphics::drawImage(const Image* image,
+ int srcX,
+ int srcY,
+ int dstX,
+ int dstY,
+ int width,
+ int height)
+ {
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ SDL_Rect src;
+ SDL_Rect dst;
+ src.x = srcX;
+ src.y = srcY;
+ src.w = width;
+ src.h = height;
+ dst.x = dstX + top.xOffset;
+ dst.y = dstY + top.yOffset;
+
+ const SDLImage* srcImage = dynamic_cast<const SDLImage*>(image);
+
+ if (srcImage == NULL)
+ {
+ throw GCN_EXCEPTION("Trying to draw an image of unknown format, must be an SDLImage.");
+ }
+
+ SDL_BlitSurface(srcImage->getSurface(), &src, mTarget, &dst);
+ }
+
+ void SDLGraphics::fillRectangle(const Rectangle& rectangle)
+ {
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ Rectangle area = rectangle;
+ area.x += top.xOffset;
+ area.y += top.yOffset;
+
+ if(!area.isIntersecting(top))
+ {
+ return;
+ }
+
+ if (mAlpha)
+ {
+ int x1 = area.x > top.x ? area.x : top.x;
+ int y1 = area.y > top.y ? area.y : top.y;
+ int x2 = area.x + area.width < top.x + top.width ? area.x + area.width : top.x + top.width;
+ int y2 = area.y + area.height < top.y + top.height ? area.y + area.height : top.y + top.height;
+ int x, y;
+
+ SDL_LockSurface(mTarget);
+ for (y = y1; y < y2; y++)
+ {
+ for (x = x1; x < x2; x++)
+ {
+ SDLputPixelAlpha(mTarget, x, y, mColor);
+ }
+ }
+ SDL_UnlockSurface(mTarget);
+
+ }
+ else
+ {
+ SDL_Rect rect;
+ rect.x = area.x;
+ rect.y = area.y;
+ rect.w = area.width;
+ rect.h = area.height;
+
+ Uint32 color = SDL_MapRGBA(mTarget->format,
+ mColor.r,
+ mColor.g,
+ mColor.b,
+ mColor.a);
+ SDL_FillRect(mTarget, &rect, color);
+ }
+ }
+
+ void SDLGraphics::drawPoint(int x, int y)
+ {
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ x += top.xOffset;
+ y += top.yOffset;
+
+ if(!top.isPointInRect(x,y))
+ return;
+
+ if (mAlpha)
+ {
+ SDLputPixelAlpha(mTarget, x, y, mColor);
+ }
+ else
+ {
+ SDLputPixel(mTarget, x, y, mColor);
+ }
+ }
+
+ void SDLGraphics::drawHLine(int x1, int y, int x2)
+ {
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ x1 += top.xOffset;
+ y += top.yOffset;
+ x2 += top.xOffset;
+
+ if (y < top.y || y >= top.y + top.height)
+ {
+ return;
+ }
+
+ if (x1 > x2)
+ {
+ x1 ^= x2;
+ x2 ^= x1;
+ x1 ^= x2;
+ }
+
+ if (top.x > x1)
+ {
+ if (top.x > x2)
+ {
+ return;
+ }
+
+ x1 = top.x;
+ }
+
+ if (top.x + top.width <= x2)
+ {
+ if (top.x + top.width <= x1)
+ {
+ return;
+ }
+
+ x2 = top.x + top.width -1;
+ }
+
+ int bpp = mTarget->format->BytesPerPixel;
+
+ SDL_LockSurface(mTarget);
+
+ Uint8 *p = (Uint8 *)mTarget->pixels + y * mTarget->pitch + x1 * bpp;
+
+ Uint32 pixel = SDL_MapRGB(mTarget->format,
+ mColor.r,
+ mColor.g,
+ mColor.b);
+ switch(bpp)
+ {
+ case 1:
+ for (;x1 <= x2; ++x1)
+ {
+ *(p++) = pixel;
+ }
+ break;
+
+ case 2:
+ {
+ Uint16* q = (Uint16*)p;
+ for (;x1 <= x2; ++x1)
+ {
+ *(q++) = pixel;
+ }
+ break;
+ }
+ case 3:
+ if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+ {
+ for (;x1 <= x2; ++x1)
+ {
+ p[0] = (pixel >> 16) & 0xff;
+ p[1] = (pixel >> 8) & 0xff;
+ p[2] = pixel & 0xff;
+ p += 3;
+ }
+ }
+ else
+ {
+ for (;x1 <= x2; ++x1)
+ {
+ p[0] = pixel & 0xff;
+ p[1] = (pixel >> 8) & 0xff;
+ p[2] = (pixel >> 16) & 0xff;
+ p += 3;
+ }
+ }
+ break;
+
+ case 4:
+ {
+ Uint32* q = (Uint32*)p;
+ for (;x1 <= x2; ++x1)
+ {
+ if (mAlpha)
+ {
+ *q = SDLAlpha32(pixel,*q,mColor.a);
+ q++;
+ }
+ else
+ {
+ *(q++) = pixel;
+ }
+ }
+ break;
+ }
+
+ } // end switch
+
+ SDL_UnlockSurface(mTarget);
+ }
+
+ void SDLGraphics::drawVLine(int x, int y1, int y2)
+ {
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ x += top.xOffset;
+ y1 += top.yOffset;
+ y2 += top.yOffset;
+
+ if (x < top.x || x >= top.x + top.width)
+ {
+ return;
+ }
+
+ if (y1 > y2)
+ {
+ y1 ^= y2;
+ y2 ^= y1;
+ y1 ^= y2;
+ }
+
+ if (top.y > y1)
+ {
+ if (top.y > y2)
+ {
+ return;
+ }
+
+ y1 = top.y;
+ }
+
+ if (top.y + top.height <= y2)
+ {
+ if (top.y + top.height <= y1)
+ {
+ return;
+ }
+
+ y2 = top.y + top.height - 1;
+ }
+
+ int bpp = mTarget->format->BytesPerPixel;
+
+ SDL_LockSurface(mTarget);
+
+ Uint8 *p = (Uint8 *)mTarget->pixels + y1 * mTarget->pitch + x * bpp;
+
+ Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r, mColor.g, mColor.b);
+
+ switch(bpp)
+ {
+ case 1:
+ for (;y1 <= y2; ++y1)
+ {
+ *p = pixel;
+ p += mTarget->pitch;
+ }
+ break;
+
+ case 2:
+ for (;y1 <= y2; ++y1)
+ {
+ *(Uint16*)p = pixel;
+ p += mTarget->pitch;
+ }
+ break;
+
+ case 3:
+ if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+ {
+ for (;y1 <= y2; ++y1)
+ {
+ p[0] = (pixel >> 16) & 0xff;
+ p[1] = (pixel >> 8) & 0xff;
+ p[2] = pixel & 0xff;
+ p += mTarget->pitch;
+ }
+ }
+ else
+ {
+ for (;y1 <= y2; ++y1)
+ {
+ p[0] = pixel & 0xff;
+ p[1] = (pixel >> 8) & 0xff;
+ p[2] = (pixel >> 16) & 0xff;
+ p += mTarget->pitch;
+ }
+ }
+ break;
+
+ case 4:
+ for (;y1 <= y2; ++y1)
+ {
+ if (mAlpha)
+ {
+ *(Uint32*)p = SDLAlpha32(pixel,*(Uint32*)p,mColor.a);
+ }
+ else
+ {
+ *(Uint32*)p = pixel;
+ }
+ p += mTarget->pitch;
+ }
+ break;
+
+ } // end switch
+
+ SDL_UnlockSurface(mTarget);
+ }
+
+ void SDLGraphics::drawRectangle(const Rectangle& rectangle)
+ {
+ int x1 = rectangle.x;
+ int x2 = rectangle.x + rectangle.width - 1;
+ int y1 = rectangle.y;
+ int y2 = rectangle.y + rectangle.height - 1;
+
+ drawHLine(x1, y1, x2);
+ drawHLine(x1, y2, x2);
+
+ drawVLine(x1, y1, y2);
+ drawVLine(x2, y1, y2);
+ }
+
+ void SDLGraphics::drawLine(int x1, int y1, int x2, int y2)
+ {
+ if (x1 == x2)
+ {
+ drawVLine(x1, y1, y2);
+ return;
+ }
+ if (y1 == y2)
+ {
+ drawHLine(x1, y1, x2);
+ return;
+ }
+
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ x1 += top.xOffset;
+ y1 += top.yOffset;
+ x2 += top.xOffset;
+ y2 += top.yOffset;
+
+ // Draw a line with Bresenham
+
+ int dx = ABS(x2 - x1);
+ int dy = ABS(y2 - y1);
+
+ if (dx > dy)
+ {
+ if (x1 > x2)
+ {
+ // swap x1, x2
+ x1 ^= x2;
+ x2 ^= x1;
+ x1 ^= x2;
+
+ // swap y1, y2
+ y1 ^= y2;
+ y2 ^= y1;
+ y1 ^= y2;
+ }
+
+ if (y1 < y2)
+ {
+ int y = y1;
+ int p = 0;
+
+ for (int x = x1; x <= x2; x++)
+ {
+ if (top.isPointInRect(x, y))
+ {
+ if (mAlpha)
+ {
+ SDLputPixelAlpha(mTarget, x, y, mColor);
+ }
+ else
+ {
+ SDLputPixel(mTarget, x, y, mColor);
+ }
+ }
+
+ p += dy;
+
+ if (p * 2 >= dx)
+ {
+ y++;
+ p -= dx;
+ }
+ }
+ }
+ else
+ {
+ int y = y1;
+ int p = 0;
+
+ for (int x = x1; x <= x2; x++)
+ {
+ if (top.isPointInRect(x, y))
+ {
+ if (mAlpha)
+ {
+ SDLputPixelAlpha(mTarget, x, y, mColor);
+ }
+ else
+ {
+ SDLputPixel(mTarget, x, y, mColor);
+ }
+ }
+
+ p += dy;
+
+ if (p * 2 >= dx)
+ {
+ y--;
+ p -= dx;
+ }
+ }
+ }
+ }
+ else
+ {
+ if (y1 > y2)
+ {
+ // swap y1, y2
+ y1 ^= y2;
+ y2 ^= y1;
+ y1 ^= y2;
+
+ // swap x1, x2
+ x1 ^= x2;
+ x2 ^= x1;
+ x1 ^= x2;
+ }
+
+ if (x1 < x2)
+ {
+ int x = x1;
+ int p = 0;
+
+ for (int y = y1; y <= y2; y++)
+ {
+ if (top.isPointInRect(x, y))
+ {
+ if (mAlpha)
+ {
+ SDLputPixelAlpha(mTarget, x, y, mColor);
+ }
+ else
+ {
+ SDLputPixel(mTarget, x, y, mColor);
+ }
+ }
+
+ p += dx;
+
+ if (p * 2 >= dy)
+ {
+ x++;
+ p -= dy;
+ }
+ }
+ }
+ else
+ {
+ int x = x1;
+ int p = 0;
+
+ for (int y = y1; y <= y2; y++)
+ {
+ if (top.isPointInRect(x, y))
+ {
+ if (mAlpha)
+ {
+ SDLputPixelAlpha(mTarget, x, y, mColor);
+ }
+ else
+ {
+ SDLputPixel(mTarget, x, y, mColor);
+ }
+ }
+
+ p += dx;
+
+ if (p * 2 >= dy)
+ {
+ x--;
+ p -= dy;
+ }
+ }
+ }
+ }
+ }
+
+ void SDLGraphics::setColor(const Color& color)
+ {
+ mColor = color;
+
+ mAlpha = color.a != 255;
+ }
+
+ const Color& SDLGraphics::getColor() const
+ {
+ return mColor;
+ }
+
+ void SDLGraphics::drawSDLSurface(SDL_Surface* surface,
+ SDL_Rect source,
+ SDL_Rect destination)
+ {
+ if (mClipStack.empty())
+ {
+ throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
+ }
+
+ const ClipRectangle& top = mClipStack.top();
+
+ destination.x += top.xOffset;
+ destination.y += top.yOffset;
+
+ SDL_BlitSurface(surface, &source, mTarget, &destination);
+ }
+}
diff --git a/src/guichan/sdl/sdlgraphics.hpp b/src/guichan/sdl/sdlgraphics.hpp
new file mode 100644
index 000000000..70a234d33
--- /dev/null
+++ b/src/guichan/sdl/sdlgraphics.hpp
@@ -0,0 +1,156 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_SDLGRAPHICS_HPP
+#define GCN_SDLGRAPHICS_HPP
+
+#include "SDL.h"
+
+#include "guichan/color.hpp"
+#include "guichan/graphics.hpp"
+#include "guichan/platform.hpp"
+
+namespace gcn
+{
+ class Image;
+ class Rectangle;
+
+ /**
+ * SDL implementation of the Graphics.
+ */
+ class GCN_EXTENSION_DECLSPEC SDLGraphics : public Graphics
+ {
+ public:
+
+ // Needed so that drawImage(gcn::Image *, int, int) is visible.
+ using Graphics::drawImage;
+
+ /**
+ * Constructor.
+ */
+ SDLGraphics();
+
+ /**
+ * Sets the target SDL_Surface to draw to. The target can be any
+ * SDL_Surface. This funtion also pushes a clip areas corresponding to
+ * the dimension of the target.
+ *
+ * @param target the target to draw to.
+ */
+ virtual void setTarget(SDL_Surface* target);
+
+ /**
+ * Gets the target SDL_Surface.
+ *
+ * @return the target SDL_Surface.
+ */
+ virtual SDL_Surface* getTarget() const;
+
+ /**
+ * Draws an SDL_Surface on the target surface. Normaly you'll
+ * use drawImage, but if you want to write SDL specific code
+ * this function might come in handy.
+ *
+ * NOTE: The clip areas will be taken into account.
+ */
+ virtual void drawSDLSurface(SDL_Surface* surface,
+ SDL_Rect source,
+ SDL_Rect destination);
+
+
+ // Inherited from Graphics
+
+ virtual void _beginDraw();
+
+ virtual void _endDraw();
+
+ virtual bool pushClipArea(Rectangle area);
+
+ virtual void popClipArea();
+
+ virtual void drawImage(const Image* image,
+ int srcX,
+ int srcY,
+ int dstX,
+ int dstY,
+ int width,
+ int height);
+
+ virtual void drawPoint(int x, int y);
+
+ virtual void drawLine(int x1, int y1, int x2, int y2);
+
+ virtual void drawRectangle(const Rectangle& rectangle);
+
+ virtual void fillRectangle(const Rectangle& rectangle);
+
+ virtual void setColor(const Color& color);
+
+ virtual const Color& getColor() const;
+
+ protected:
+ /**
+ * Draws a horizontal line.
+ *
+ * @param x1 the start coordinate of the line.
+ * @param y the y coordinate of the line.
+ * @param x2 the end coordinate of the line.
+ */
+ virtual void drawHLine(int x1, int y, int x2);
+
+ /**
+ * Draws a vertical line.
+ *
+ * @param x the x coordinate of the line.
+ * @param y1 the start coordinate of the line.
+ * @param y2 the end coordinate of the line.
+ */
+ virtual void drawVLine(int x, int y1, int y2);
+
+ SDL_Surface* mTarget;
+ Color mColor;
+ bool mAlpha;
+ };
+}
+
+#endif // end GCN_SDLGRAPHICS_HPP
diff --git a/src/guichan/sdl/sdlimage.cpp b/src/guichan/sdl/sdlimage.cpp
new file mode 100644
index 000000000..cab5effdb
--- /dev/null
+++ b/src/guichan/sdl/sdlimage.cpp
@@ -0,0 +1,185 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "guichan/sdl/sdlimage.hpp"
+
+#include "guichan/exception.hpp"
+#include "guichan/sdl/sdlpixel.hpp"
+
+namespace gcn
+{
+ SDLImage::SDLImage(SDL_Surface* surface, bool autoFree)
+ {
+ mAutoFree = autoFree;
+ mSurface = surface;
+ }
+
+ SDLImage::~SDLImage()
+ {
+ if (mAutoFree)
+ {
+ free();
+ }
+ }
+
+ SDL_Surface* SDLImage::getSurface() const
+ {
+ return mSurface;
+ }
+
+ int SDLImage::getWidth() const
+ {
+ if (mSurface == NULL)
+ {
+ throw GCN_EXCEPTION("Trying to get the width of a non loaded image.");
+ }
+
+ return mSurface->w;
+ }
+
+ int SDLImage::getHeight() const
+ {
+ if (mSurface == NULL)
+ {
+ throw GCN_EXCEPTION("Trying to get the height of a non loaded image.");
+ }
+
+ return mSurface->h;
+ }
+
+ Color SDLImage::getPixel(int x, int y)
+ {
+ if (mSurface == NULL)
+ {
+ throw GCN_EXCEPTION("Trying to get a pixel from a non loaded image.");
+ }
+
+ return SDLgetPixel(mSurface, x, y);
+ }
+
+ void SDLImage::putPixel(int x, int y, const Color& color)
+ {
+ if (mSurface == NULL)
+ {
+ throw GCN_EXCEPTION("Trying to put a pixel in a non loaded image.");
+ }
+
+ SDLputPixel(mSurface, x, y, color);
+ }
+
+ void SDLImage::convertToDisplayFormat()
+ {
+ if (mSurface == NULL)
+ {
+ throw GCN_EXCEPTION("Trying to convert a non loaded image to display format.");
+ }
+
+ int i;
+ bool hasPink = false;
+ bool hasAlpha = false;
+
+ for (i = 0; i < mSurface->w * mSurface->h; ++i)
+ {
+ if (((unsigned int*)mSurface->pixels)[i] == SDL_MapRGB(mSurface->format,255,0,255))
+ {
+ hasPink = true;
+ break;
+ }
+ }
+
+ for (i = 0; i < mSurface->w * mSurface->h; ++i)
+ {
+ Uint8 r, g, b, a;
+
+ SDL_GetRGBA(((unsigned int*)mSurface->pixels)[i], mSurface->format,
+ &r, &g, &b, &a);
+
+ if (a != 255)
+ {
+ hasAlpha = true;
+ break;
+ }
+ }
+
+ SDL_Surface *tmp;
+
+ if (hasAlpha)
+ {
+ tmp = SDL_DisplayFormatAlpha(mSurface);
+ SDL_FreeSurface(mSurface);
+ mSurface = NULL;
+ }
+ else
+ {
+ tmp = SDL_DisplayFormat(mSurface);
+ SDL_FreeSurface(mSurface);
+ mSurface = NULL;
+ }
+
+ if (tmp == NULL)
+ {
+ throw GCN_EXCEPTION("Unable to convert image to display format.");
+ }
+
+ if (hasPink)
+ {
+ SDL_SetColorKey(tmp, SDL_SRCCOLORKEY,
+ SDL_MapRGB(tmp->format,255,0,255));
+ }
+ if (hasAlpha)
+ {
+ SDL_SetAlpha(tmp, SDL_SRCALPHA, 255);
+ }
+
+ mSurface = tmp;
+ }
+
+ void SDLImage::free()
+ {
+ SDL_FreeSurface(mSurface);
+ }
+}
diff --git a/src/guichan/sdl/sdlimage.hpp b/src/guichan/sdl/sdlimage.hpp
new file mode 100644
index 000000000..4d226177e
--- /dev/null
+++ b/src/guichan/sdl/sdlimage.hpp
@@ -0,0 +1,107 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_SDLIMAGE_HPP
+#define GCN_SDLIMAGE_HPP
+
+#include "SDL.h"
+
+#include <string>
+
+#include "guichan/color.hpp"
+#include "guichan/platform.hpp"
+#include "guichan/image.hpp"
+
+namespace gcn
+{
+ /**
+ * SDL implementation of Image.
+ */
+ class GCN_EXTENSION_DECLSPEC SDLImage : public Image
+ {
+ public:
+ /**
+ * Constructor. Load an image from an SDL surface.
+ *
+ * NOTE: The functions getPixel and putPixel are only guaranteed to work
+ * before an image has been converted to display format.
+ *
+ * @param surface the surface from which to load.
+ * @param autoFree true if the surface should automatically be deleted.
+ */
+ SDLImage(SDL_Surface* surface, bool autoFree);
+
+ /**
+ * Destructor.
+ */
+ virtual ~SDLImage();
+
+ /**
+ * Gets the SDL surface for the image.
+ *
+ * @return the SDL surface for the image.
+ */
+ virtual SDL_Surface* getSurface() const;
+
+
+ // Inherited from Image
+
+ virtual void free();
+
+ virtual int getWidth() const;
+
+ virtual int getHeight() const;
+
+ virtual Color getPixel(int x, int y);
+
+ virtual void putPixel(int x, int y, const Color& color);
+
+ virtual void convertToDisplayFormat();
+
+ protected:
+ SDL_Surface* mSurface;
+ bool mAutoFree;
+ };
+}
+
+#endif // end GCN_SDLIMAGE_HPP
diff --git a/src/guichan/sdl/sdlpixel.hpp b/src/guichan/sdl/sdlpixel.hpp
new file mode 100644
index 000000000..49686ebc1
--- /dev/null
+++ b/src/guichan/sdl/sdlpixel.hpp
@@ -0,0 +1,260 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_SDLPIXEL_HPP
+#define GCN_SDLPIXEL_HPP
+
+#include "SDL.h"
+#include "guichan/color.hpp"
+
+namespace gcn
+{
+
+ /**
+ * Checks a pixels color of an SDL_Surface.
+ *
+ * @param surface an SDL_Surface where to check for a pixel color.
+ * @param x the x coordinate on the surface.
+ * @param y the y coordinate on the surface.
+ * @return a color of a pixel.
+ */
+ inline const Color SDLgetPixel(SDL_Surface* surface, int x, int y)
+ {
+ int bpp = surface->format->BytesPerPixel;
+
+ SDL_LockSurface(surface);
+
+ Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+
+ unsigned int color = 0;
+
+ switch(bpp)
+ {
+ case 1:
+ color = *p;
+ break;
+
+ case 2:
+ color = *(Uint16 *)p;
+ break;
+
+ case 3:
+ if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+ {
+ color = p[0] << 16 | p[1] << 8 | p[2];
+ }
+ else
+ {
+ color = p[0] | p[1] << 8 | p[2] << 16;
+ }
+ break;
+
+ case 4:
+ color = *(Uint32 *)p;
+ break;
+
+ }
+
+ unsigned char r,g,b,a;
+
+ SDL_GetRGBA(color, surface->format, &r, &g, &b, &a);
+ SDL_UnlockSurface(surface);
+
+ return Color(r,g,b,a);
+ }
+
+ /**
+ * Puts a pixel on an SDL_Surface.
+ *
+ * @param x the x coordinate on the surface.
+ * @param y the y coordinate on the surface.
+ * @param color the color the pixel should be in.
+ */
+ inline void SDLputPixel(SDL_Surface* surface, int x, int y, const Color& color)
+ {
+ int bpp = surface->format->BytesPerPixel;
+
+ SDL_LockSurface(surface);
+
+ Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+
+ Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b);
+
+ switch(bpp)
+ {
+ case 1:
+ *p = pixel;
+ break;
+
+ case 2:
+ *(Uint16 *)p = pixel;
+ break;
+
+ case 3:
+ if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+ {
+ p[0] = (pixel >> 16) & 0xff;
+ p[1] = (pixel >> 8) & 0xff;
+ p[2] = pixel & 0xff;
+ }
+ else
+ {
+ p[0] = pixel & 0xff;
+ p[1] = (pixel >> 8) & 0xff;
+ p[2] = (pixel >> 16) & 0xff;
+ }
+ break;
+
+ case 4:
+ *(Uint32 *)p = pixel;
+ break;
+ }
+
+ SDL_UnlockSurface(surface);
+ }
+
+ /**
+ * Blends two 32 bit colors together.
+ *
+ * @param src the source color.
+ * @param dst the destination color.
+ * @param a alpha.
+ */
+ inline unsigned int SDLAlpha32(unsigned int src, unsigned int dst, unsigned char a)
+ {
+ unsigned int b = ((src & 0xff) * a + (dst & 0xff) * (255 - a)) >> 8;
+ unsigned int g = ((src & 0xff00) * a + (dst & 0xff00) * (255 - a)) >> 8;
+ unsigned int r = ((src & 0xff0000) * a + (dst & 0xff0000) * (255 - a)) >> 8;
+
+ return (b & 0xff) | (g & 0xff00) | (r & 0xff0000);
+ }
+
+ /**
+ * Blends two 16 bit colors together.
+ *
+ * @param src the source color.
+ * @param dst the destination color.
+ * @param a alpha.
+ */
+ inline unsigned short SDLAlpha16(unsigned short src, unsigned short dst, unsigned char a, const SDL_PixelFormat *f)
+ {
+ unsigned int b = ((src & f->Rmask) * a + (dst & f->Rmask) * (255 - a)) >> 8;
+ unsigned int g = ((src & f->Gmask) * a + (dst & f->Gmask) * (255 - a)) >> 8;
+ unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask) * (255 - a)) >> 8;
+
+ return (unsigned short)((b & f->Rmask) | (g & f->Gmask) | (r & f->Bmask));
+ }
+
+ /*
+ typedef struct{
+ SDL_Palette *palette;
+ Uint8 BitsPerPixel;
+ Uint8 BytesPerPixel;
+ Uint32 Rmask, Gmask, Bmask, Amask;
+ Uint8 Rshift, Gshift, Bshift, Ashift;
+ Uint8 Rloss, Gloss, Bloss, Aloss;
+ Uint32 colorkey;
+ Uint8 alpha;
+ } SDL_PixelFormat;
+ */
+
+ /**
+ * Puts a pixel on an SDL_Surface with alpha
+ *
+ * @param x the x coordinate on the surface.
+ * @param y the y coordinate on the surface.
+ * @param color the color the pixel should be in.
+ */
+ inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y, const Color& color)
+ {
+ int bpp = surface->format->BytesPerPixel;
+
+ SDL_LockSurface(surface);
+
+ Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+
+ Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b);
+
+ switch(bpp)
+ {
+ case 1:
+ *p = pixel;
+ break;
+
+ case 2:
+ *(Uint16 *)p = SDLAlpha16(pixel, *(Uint32 *)p, color.a, surface->format);
+ break;
+
+ case 3:
+ if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+ {
+ unsigned int r = (p[0] * (255 - color.a) + color.r * color.a) >> 8;
+ unsigned int g = (p[1] * (255 - color.a) + color.g * color.a) >> 8;
+ unsigned int b = (p[2] * (255 - color.a) + color.b * color.a) >> 8;
+
+ p[2] = b;
+ p[1] = g;
+ p[0] = r;
+ }
+ else
+ {
+ unsigned int r = (p[2] * (255 - color.a) + color.r * color.a) >> 8;
+ unsigned int g = (p[1] * (255 - color.a) + color.g * color.a) >> 8;
+ unsigned int b = (p[0] * (255 - color.a) + color.b * color.a) >> 8;
+
+ p[0] = b;
+ p[1] = g;
+ p[2] = r;
+ }
+ break;
+
+ case 4:
+ *(Uint32 *)p = SDLAlpha32(pixel, *(Uint32 *)p, color.a);
+ break;
+ }
+
+ SDL_UnlockSurface(surface);
+ }
+}
+
+#endif // end GCN_SDLPIXEL_HPP