Changeset 261

Timestamp:

06/11/08 19:50:03 (5 months ago)

Author:

mbensi

Message:

BAL:

2008-06-11 Mario Bensi <mbensi@pleyo.com>

Reviewed by NOBODY (OOPS!).

remove printf, fix drawPattern and add first implementation of popup

• Base/SDL/BALTypeSDL.h:
  
• OWBAL/Concretizations/Types/CMakeLists.txt:
  
• OWBAL/Skeletons/Types/StrHash.t: Removed.
  
• WKAL/Concretizations/Graphics/SDL/BCImageSDL.cpp:
  (WKAL::Image::drawPattern):
  
• WKAL/Concretizations/Graphics/SDL/BCPathSDL.cpp:
  (WKAL::Path::Path):
  (WKAL::Path::~Path):
  (WKAL::Path:perator=):
  (WKAL::Path::clear):
  (WKAL::Path::isEmpty):
  (WKAL::Path::translate):
  (WKAL::Path::moveTo):
  (WKAL::Path::addLineTo):
  (WKAL::Path::addRect):
  (WKAL::Path::addQuadCurveTo):
  (WKAL::Path::addBezierCurveTo):
  (WKAL::Path::addArc):
  (WKAL::Path::addArcTo):
  (WKAL::Path::addEllipse):
  (WKAL::Path::closeSubpath):
  (WKAL::Path::boundingRect):
  (WKAL::Path::contains):
  (WKAL::Path::apply):
  (WKAL::Path::transform):
  (WKAL::Path::debugString):
  
• WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.cpp:
  (WKAL::isASCIIPrintable):
  (WKAL::PopupMenu::PopupMenu):
  (WKAL::PopupMenu::~PopupMenu):
  (WKAL::PopupMenu::show):
  (WKAL::PopupMenu::focusedIndex):
  (WKAL::PopupMenu::setFocusedIndex):
  (WKAL::PopupMenu::scrollToRevealSelection):
  (WKAL::PopupMenu::itemWritingDirectionIsNatural):
  (WKAL::PopupMenu::calculatePositionAndSize):
  (WKAL::PopupMenu::invalidateItem):
  (WKAL::PopupMenu::clientRect):
  (WKAL::PopupMenu::visibleItems):
  (WKAL::PopupMenu::windowClipRect):
  (WKAL::PopupMenu::valueChanged):
  
• WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.h:
  (WKAL::PopupMenu::isActive):
  

WebKit:

2008-06-11 Mario Bensi <mbensi@pleyo.com>

Reviewed by NOBODY (OOPS!).

add custom user agent in webview

• OrigynWebBrowser/Api/WebView.cpp:
  (WebView::userAgentForKURL):
  

WebKitTools:

2008-06-11 Mario Bensi <mbensi@pleyo.com>

Reviewed by NOBODY (OOPS!).

add return 0 to finish the main

• OWBLauncher/SDL/main.cpp:
  (main):
  
• OWBLauncher/gtk/main.cpp:
  (main):
  

Files:

• branches/Doduo/BAL/Base/SDL/BALTypeSDL.h (modified) (2 diffs)
• branches/Doduo/BAL/ChangeLogOWB (modified) (1 diff)
• branches/Doduo/BAL/OWBAL/Concretizations/Types/CMakeLists.txt (modified) (1 diff)
• branches/Doduo/BAL/OWBAL/Skeletons/Types/StrHash.t (deleted)
• branches/Doduo/BAL/WKAL/Concretizations/Graphics/SDL/BCImageSDL.cpp (modified) (3 diffs)
• branches/Doduo/BAL/WKAL/Concretizations/Graphics/SDL/BCPathSDL.cpp (modified) (9 diffs)
• branches/Doduo/BAL/WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.cpp (modified) (5 diffs)
• branches/Doduo/BAL/WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.h (modified) (4 diffs)
• branches/Doduo/WebKit/ChangeLogOWB (modified) (1 diff)
• branches/Doduo/WebKit/OrigynWebBrowser/Api/WebView.cpp (modified) (1 diff)
• branches/Doduo/WebKitTools/ChangeLogOWB (modified) (1 diff)
• branches/Doduo/WebKitTools/OWBLauncher/SDL/main.cpp (modified) (1 diff)
• branches/Doduo/WebKitTools/OWBLauncher/gtk/main.cpp (modified) (1 diff)

branches/Doduo/BAL/Base/SDL/BALTypeSDL.h

@@ -65 +65 @@
-typedef SDL_Rect BalRectangle;
-typedef void BalMenuItem;
-void
+SDL_Surface
-typedef void BalClipboard;
-typedef void BalTargetList;
@@ -85 +85 @@
-    typedef void* DragImageRef;
-    typedef void* DragDataRef;
-    typedef void* PlatformMenuDescription;
-    typedef unsigned short GlyphBufferGlyph;
-    typedef WKAL::FloatSize GlyphBufferAdvance;

branches/Doduo/BAL/ChangeLogOWB

@@ +1 @@
+2008-06-11  Mario Bensi  <mbensi@pleyo.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        remove printf, fix drawPattern and add first implementation of popup
+
+        * Base/SDL/BALTypeSDL.h:
+        * OWBAL/Concretizations/Types/CMakeLists.txt:
+        * OWBAL/Skeletons/Types/StrHash.t: Removed.
+        * WKAL/Concretizations/Graphics/SDL/BCImageSDL.cpp:
+        (WKAL::Image::drawPattern):
+        * WKAL/Concretizations/Graphics/SDL/BCPathSDL.cpp:
+        (WKAL::Path::Path):
+        (WKAL::Path::~Path):
+        (WKAL::Path::operator=):
+        (WKAL::Path::clear):
+        (WKAL::Path::isEmpty):
+        (WKAL::Path::translate):
+        (WKAL::Path::moveTo):
+        (WKAL::Path::addLineTo):
+        (WKAL::Path::addRect):
+        (WKAL::Path::addQuadCurveTo):
+        (WKAL::Path::addBezierCurveTo):
+        (WKAL::Path::addArc):
+        (WKAL::Path::addArcTo):
+        (WKAL::Path::addEllipse):
+        (WKAL::Path::closeSubpath):
+        (WKAL::Path::boundingRect):
+        (WKAL::Path::contains):
+        (WKAL::Path::apply):
+        (WKAL::Path::transform):
+        (WKAL::Path::debugString):
+        * WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.cpp:
+        (WKAL::isASCIIPrintable):
+        (WKAL::PopupMenu::PopupMenu):
+        (WKAL::PopupMenu::~PopupMenu):
+        (WKAL::PopupMenu::show):
+        (WKAL::PopupMenu::focusedIndex):
+        (WKAL::PopupMenu::setFocusedIndex):
+        (WKAL::PopupMenu::scrollToRevealSelection):
+        (WKAL::PopupMenu::itemWritingDirectionIsNatural):
+        (WKAL::PopupMenu::calculatePositionAndSize):
+        (WKAL::PopupMenu::invalidateItem):
+        (WKAL::PopupMenu::clientRect):
+        (WKAL::PopupMenu::visibleItems):
+        (WKAL::PopupMenu::windowClipRect):
+        (WKAL::PopupMenu::valueChanged):
+        * WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.h:
+        (WKAL::PopupMenu::isActive):
+
-2008-06-11  Fred  <fmarmond@pleyo.com>
-

branches/Doduo/BAL/OWBAL/Concretizations/Types/CMakeLists.txt

@@ -71 +71 @@
-OWBLN (WK/BCVectorTraitsWK.h OWBAL/wtf 0 0)
-OWBLN (WK/BCbalValuePrivateWK.h OWBAL 0 0)
-OWBLN (WK/BCStrHashWK.h OWBAL/wtf 0 0)
-OWBLN (WK/BCAVLTreeWK.h OWBAL/wtf 0 0)
-

branches/Doduo/BAL/WKAL/Concretizations/Graphics/SDL/BCImageSDL.cpp

@@ -201 +201 @@
-}
-
+
+
+
-void Image::drawPattern(GraphicsContext* context, const FloatRect& tileRect, const AffineTransform& patternTransform,
-                        const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect)
-{
-//     printf("BitmapImage::drawPattern tileRect %f %f %f %f\n", tileRect.x(), tileRect.y(), tileRect.width(), tileRect.height());
-//     printf("BitmapImage::drawPattern destRect %f %f %f %f\n", destRect.x(), destRect.y(), destRect.width(), destRect.height());
-//     printf("BitmapImage::drawPattern phase %f %f\n", phase.x(), phase.y());
-//     printf("patternTransform a=%f b=%f c=%f d=%f dx=%f dy=%f \n", patternTransform.a(), patternTransform.b() , patternTransform.c(), patternTransform.d(), patternTransform.e(), patternTransform.f());
-
-    if (destRect.isEmpty())
-        return;
@@ -216 +214 @@
-        return;
-
-    //printf("image %d %d\n", image->w, image->h);
-    SDL_Surface* cr = context->platformContext();
-    context->save();
@@ -222 +219 @@
-    context->setCompositeOperation(op);
-
+    printf("CompositeOperator = %d\n", op);
-    // Check and see if a single draw of the image can cover the entire area we are supposed to tile.
-    // save context info
-    context->clip(IntRect(destRect)); // don't draw outside this
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    int xMax = static_cast<int>(destRect.x() + destRect.width());
-    int yMax = static_cast<int>(destRect.y() + destRect.height());
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    context->restore();

branches/Doduo/BAL/WKAL/Concretizations/Graphics/SDL/BCPathSDL.cpp

@@ -42 +42 @@
-//    : m_path(new CairoPath())
-{
-
+//
-}
-
-Path::~Path()
-{
-
+//
-    //delete m_path;
-}
@@ -54 +54 @@
-//    : m_path(new CairoPath())
-{
-
+//
-}
-
-Path& Path::operator=(const Path& other)
-{
-
+//
-    if (&other == this)
-        return *this;
@@ -70 +70 @@
-void Path::clear()
-{
-
+//
-}
-
-bool Path::isEmpty() const
-{
-
+//
-    return true;
-}
@@ -81 +81 @@
-void Path::translate(const FloatSize& p)
-{
-
+//
-}
-
-void Path::moveTo(const FloatPoint& p)
-{
-
+//
-}
-
-void Path::addLineTo(const FloatPoint& p)
-{
-
+//
-}
-
-void Path::addRect(const FloatRect& rect)
-{
-
+//
-}
-
@@ -104 +104 @@
-void Path::addQuadCurveTo(const FloatPoint& controlPoint, const FloatPoint& point)
-{
-
+//
-}
-
-void Path::addBezierCurveTo(const FloatPoint& controlPoint1, const FloatPoint& controlPoint2, const FloatPoint& controlPoint3)
-{
-
+//
-
-}
@@ -115 +115 @@
-void Path::addArc(const FloatPoint& p, float r, float sa, float ea, bool anticlockwise)
-{
-
+//
-}
-
-void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)
-{
-
+//
-    // FIXME: cairo_arc_to not yet in cairo see cairo.h
-    // cairo_arc_to(m_cr, p1.x(), p1.y(), p2.x(), p2.y());
@@ -128 +128 @@
-void Path::addEllipse(const FloatRect& rect)
-{
-
+//
-}
-
-void Path::closeSubpath()
-{
-
+//
-}
-
-FloatRect Path::boundingRect() const
-{
-
+//
-    return FloatRect();
-}
@@ -144 +144 @@
-bool Path::contains(const FloatPoint& point, WindRule rule) const
-{
-
+//
-    return false;
-}
@@ -150 +150 @@
-void Path::apply(void* info, PathApplierFunction function) const
-{
-
+//
-}
-
-void Path::transform(const AffineTransform& trans)
-{
-
+//
-}
-
-String Path::debugString() const
-{
-
+//
-    String string = "";
-    

branches/Doduo/BAL/WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.cpp

@@ -33 +33 @@
-#include "CString.h"
-#include "FrameView.h"
+#include "Font.h"
+#include "FontDescription.h"
+#include "FloatRect.h"
+#include "FontSelector.h"
+#include "PlatformScrollBar.h"
+#include "PlatformScreen.h"
-#include "PlatformString.h"
+#include "RenderStyle.h"
+#include "SDL.h"
+
+using std::min;
-
-namespace WKAL {
+
+// Default Window animation duration in milliseconds
+static const int defaultAnimationDuration = 200;
+// Maximum height of a popup window
+static const int maxPopupHeight = 320;
+
+static const int popupWindowAlphaPercent = 95;
+
+const int optionSpacingMiddle = 1;
+const int popupWindowBorderWidth = 1;
+
+// FIXME: Remove this as soon as practical.
+static inline bool isASCIIPrintable(unsigned c)
+{
+    return c >= 0x20 && c <= 0x7E;
+}
-
-PopupMenu::PopupMenu(PopupMenuClient* client)
@@ -41 +67 @@
-    , m_popupClient(client)
-    , m_popup(0)
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -48 +80 @@
-{
-    printf("PopupMenu::~PopupMenu\n");
-
-
-
+
+
+
+
+
-{
-    ASSERT(client());
+    
+    calculatePositionAndSize(r, v);
+    if (clientRect().isEmpty())
+        return;
+
-    printf("PopupMenu::show\n");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -71 +211 @@
-{
-    //printf("PopupMenu::itemWritingDirectionIsNatural\n");
-tru
+fals
-}
-
@@ -103 +243 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/Doduo/BAL/WKAL/Concretizations/Widgets/SDL/BCPopupMenuSDL.h

@@ -35 +35 @@
-#include "IntRect.h"
-#include "PopupMenuClient.h"
+#include "ScrollBar.h"
-#include <wtf/PassRefPtr.h>
-#include "BALBase.h"
@@ -45 +46 @@
-class PlatformScrollbar;
-
-
+, private ScrollbarClient
-{
-public:
@@ -66 +67 @@
-    PopupMenu(PopupMenuClient* client);
-
+    //ScrollBarClient
+    virtual void valueChanged(Scrollbar*);
+    virtual IntRect windowClipRect() const;
+    virtual bool isActive() const { return true; }
-private:
-    PopupMenuClient* m_popupClient;
@@ -76 +81 @@
-    static void menuPositionFunction(BalMenu*, int*, int*, bool*, PopupMenu*);
-    static void menuRemoveItem(BalWidget*, PopupMenu*);
+    void calculatePositionAndSize(const IntRect&, FrameView*);
+    void invalidateItem(int index);
+    bool setFocusedIndex(int i, bool hotTracking = false);
+    int focusedIndex() const;
+    IntRect clientRect() const;
+    int visibleItems() const;
+    bool scrollToRevealSelection();
-
+    RefPtr<PlatformScrollbar> m_scrollBar;
+    bool m_wasClicked;
+    IntRect m_windowRect;
+    int m_itemHeight;
+    int m_scrollOffset;
+    int m_wheelDelta;
+    int m_focusedIndex;
+    bool m_scrollbarCapturingMouse;
-};
-

branches/Doduo/WebKit/ChangeLogOWB

@@ +1 @@
+2008-06-11  Mario Bensi  <mbensi@pleyo.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        add custom user agent in webview
+
+        * OrigynWebBrowser/Api/WebView.cpp:
+        (WebView::userAgentForKURL):
+
-2008-06-11  Olivier DOLE  <odole@pleyo.com>
-

branches/Doduo/WebKit/OrigynWebBrowser/Api/WebView.cpp

@@ -826 +826 @@
-        return m_userAgentCustom;
-
+    m_userAgentStandard = getenv("OWB_USER_AGENT");
+
-    if (!m_userAgentStandard.length())
-#ifdef __OWBAL_PLATFORM_MACPORT__

branches/Doduo/WebKitTools/ChangeLogOWB

@@ +1 @@
+2008-06-11  Mario Bensi  <mbensi@pleyo.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        add return 0 to finish the main
+
+        * OWBLauncher/SDL/main.cpp:
+        (main):
+        * OWBLauncher/gtk/main.cpp:
+        (main):
+
-2008-06-09  Olivier DOLE  <odole@pleyo.com>
-

branches/Doduo/WebKitTools/OWBLauncher/SDL/main.cpp

@@ -208 +208 @@
-    DS_INST_DUMP_CURRENT(IOcout);
-    DS_CLEAN_DEEPSEE_FRAMEWORK();
+    return 0;
-}

branches/Doduo/WebKitTools/OWBLauncher/gtk/main.cpp

@@ -100 +100 @@
-    DS_INST_DUMP_CURRENT(IOcout);
-    DS_CLEAN_DEEPSEE_FRAMEWORK();
+    return 0;
-}