[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:45:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2e61fab4974e7d232a3c01e3f79495b9a5db81f0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 19 21:12:28 2001 +0000
C?\004?\004?\004?\001?\016?\016?\014?\014
VS: ----------------------------------------------------------------------
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/tests/draw/Makefile b/WebCore/kwq/tests/draw/Makefile
index 796e5d9..a835803 100644
--- a/WebCore/kwq/tests/draw/Makefile
+++ b/WebCore/kwq/tests/draw/Makefile
@@ -1,10 +1,10 @@
-drawdemo.o: drawdemo.cpp
- c++ -c -I$(QTDIR)/include -fno-exceptions -pipe -g -o drawdemo.o drawdemo.cpp
+draw.o: draw.mm
+ cc -c -I$(QTDIR)/include -fno-exceptions -pipe -g -o draw.o draw.mm
-drawdemo: drawdemo.o
- c++ -L$(QTDIR)/lib -o ./drawdemo drawdemo.o -lqt -L/usr/X11R6/lib -lz -ljpeg -lXext -lX11
+draw: draw.o
+ cc -L$(QTDIR)/lib -o ./draw draw.o -lqt -L/usr/X11R6/lib -lz -ljpeg -lXext -lX11 -framework Cocoa
clean:
- rm *.o drawdemo
+ rm *.o draw
-all: drawdemo
+all: draw
diff --git a/WebCore/kwq/tests/draw/draw.mm b/WebCore/kwq/tests/draw/draw.mm
new file mode 100644
index 0000000..87a9f47
--- /dev/null
+++ b/WebCore/kwq/tests/draw/draw.mm
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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.
+ */
+
+/*
+ * This program tests the subset of the Qt drawing API implemented in the
+ * KWQ emulation package. Only the API in the emulation package should
+ * be used.
+ *
+ *
+*/
+
+#include <qwidget.h>
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qapplication.h>
+#include <math.h>
+
+// Voodoo required to get compiler to compile correctly.
+#undef DEBUG
+#import <Cocoa/Cocoa.h>
+
+//
+// This function draws a color wheel.
+// The coordinate system x=(0..500), y=(0..500) spans the paint device.
+//
+
+#define SLICE_WIDTH 68
+#define SLICE_HEIGHT 10
+
+void drawColors( QPainter *p )
+{
+ int x = 0, y = 0, height, r = 0, g = 255, b = 125;
+ p->save();
+
+ QFont f( "helvetica", 10, QFont::Bold );
+ p->setFont( f );
+ p->setPen( Qt::black );
+
+ QFontMetrics fm = p->fontMetrics();
+ height = fm.height();
+
+ for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles
+ QColor c;
+ c.setRgb( r, g, b );
+ r += 255/36;
+ g -= 255/36;
+ p->setBrush( c ); // solid fill with color c
+ x += SLICE_WIDTH + 5;
+ if (i % 6 == 0) {
+ y += SLICE_HEIGHT + height + 2;
+ x = 10;
+ }
+ p->drawRect( x, y, SLICE_WIDTH, SLICE_HEIGHT ); // draw the rectangle
+
+ QString n;
+ n.sprintf( "%d,%d,%d", r,g,b );
+ p->drawText( x, y + SLICE_HEIGHT + height, n ); // draw the hue number
+ }
+ p->restore();
+}
+
+
+void drawImages( QPainter *p)
+{
+ QByteArray *byteArray;
+ QPixmap *pixmap;
+ NSString *files[] = { @"powermac.jpg", @"qt.png", @"yahoo.gif" };
+ NSData *data;
+ const QPoint point (10, 200);
+ int i;
+
+ for (i = 0; i < 3; i++){
+ const QPoint point (10 + 60*i, 200);
+ data = [[NSData alloc] initWithContentsOfFile: files[i]];
+ byteArray = new QByteArray();
+ byteArray->setRawData ((const char *)[data bytes], (unsigned int)[data length]);
+ pixmap = new QPixmap (*byteArray);
+ if (i == 2){
+ QWMatrix matrix;
+ matrix.scale((double)0.5, (double)0.5);
+ QPixmap rp = pixmap->xForm (matrix);
+ p->drawPixmap (point,rp);
+ }
+ else
+ p->drawPixmap (point,*pixmap);
+ }
+}
+
+
+//
+// This function draws a few lines of text using different fonts.
+//
+
+#define DRAW_FONT_OFFSET 270.0F
+
+void drawFonts( QPainter *p )
+{
+ static const char *fonts[] = { "Helvetica", "Courier", "Times", 0 };
+ static int sizes[] = { 10, 12, 18, 24, 36, 0 };
+ int f = 0;
+ int y = 0;
+
+ p->save();
+
+#ifdef USE_TRANSLATION
+ QWMatrix matrix;
+ matrix.translate( 0.0F, DRAW_FONT_OFFSET ); // move to center
+ p->setWorldMatrix( matrix ); // use this world matrix
+#else
+ y += (int)DRAW_FONT_OFFSET;
+#endif
+
+ while ( fonts[f] ) {
+ int s = 0;
+ while ( sizes[s] ) {
+ QFont font( fonts[f], sizes[s] );
+ p->setFont( font );
+ QFontMetrics fm = p->fontMetrics();
+ y += fm.ascent();
+ p->drawText( 10, y, fonts[f] );
+ p->drawText( 10 + p->fontMetrics().width(fonts[f]), y, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz" );
+ y += fm.descent();
+ s++;
+ }
+ f++;
+ }
+ p->restore();
+}
+
+
+//
+// This function draws some shapes
+//
+
+#define DRAW_SHAPES_OFFSET 600.0F
+
+void drawShapes( QPainter *p )
+{
+ QBrush b1( Qt::blue );
+ QBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill
+ QBrush b3( Qt::NoBrush ); // void brush
+ QBrush b4( Qt::CrossPattern ); // black cross pattern
+
+ int y = 10;
+
+ p->save();
+
+#ifdef USE_TRANSLATION
+ QWMatrix matrix;
+ matrix.translate( 0.0F, DRAW_SHAPES_OFFSET ); // move to center
+ p->setWorldMatrix( matrix ); // use this world matrix
+#else
+ y += (int)DRAW_SHAPES_OFFSET;
+#endif
+ p->setPen( Qt::red );
+ p->setBrush( b1 );
+ p->drawRect( 10, y, 200, 100 );
+ p->setBrush( b2 );
+ p->drawRoundRect( 10, y+140, 200, 100, 20, 20 );
+ p->setBrush( b3 );
+ p->drawEllipse( 250, y, 200, 100 );
+ p->setBrush( b4 );
+ p->drawPie( 250, y+140, 200, 100, 45*16, 90*16 );
+
+ p->restore();
+}
+
+
+class DrawView : public QWidget
+{
+public:
+ DrawView();
+ ~DrawView();
+protected:
+ void paintEvent( QPaintEvent * );
+private:
+};
+
+
+//
+// Construct the DrawView with buttons.
+//
+
+DrawView::DrawView()
+{
+ setCaption( "Qt Draw Demo Application" );
+ setBackgroundColor( white );
+ resize( 640,900 );
+}
+
+//
+// Clean up
+//
+DrawView::~DrawView()
+{
+}
+
+//
+// Called when the widget needs to be updated.
+//
+
+void DrawView::paintEvent( QPaintEvent * )
+{
+ QPainter paint( this );
+
+ drawColors (&paint);
+ drawImages (&paint);
+ drawFonts (&paint);
+ drawShapes (&paint);
+}
+
+
+//
+// Create and display our widget.
+//
+
+int main( int argc, char **argv )
+{
+ QApplication app( argc, argv );
+ DrawView draw;
+ app.setMainWidget( &draw );
+ draw.show();
+ return app.exec();
+}
diff --git a/WebCore/kwq/tests/draw/drawdemo.cpp b/WebCore/kwq/tests/draw/drawdemo.cpp
deleted file mode 100644
index 9f09c8e..0000000
--- a/WebCore/kwq/tests/draw/drawdemo.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************************
-** $Id$
-**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
-**
-** This file is part of an example program for Qt. This example
-** program may be used, distributed and modified without limitation.
-**
-*****************************************************************************/
-
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qapplication.h>
-#include <math.h>
-
-
-//
-// This function draws a color wheel.
-// The coordinate system x=(0..500), y=(0..500) spans the paint device.
-//
-
-#define SLICE_LENGTH 15
-
-void drawColorWheel( QPainter *p )
-{
- p->save();
-
- QFont f( "times", 18, QFont::Bold );
- p->setFont( f );
- p->setPen( Qt::black );
- //p->setWindow( 0, 0, 500, 500 ); // defines coordinate system
-
- for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles
-
- QWMatrix matrix;
- matrix.translate( 390.0F, 140.0F ); // move to center
- matrix.shear( 0.0F, 0.3F ); // twist it
- matrix.rotate( (float)i*10 ); // rotate 0,10,20,.. degrees
- p->setWorldMatrix( matrix ); // use this world matrix
-
- QColor c;
- c.setHsv( i*10, 255, 255 ); // rainbow effect
- p->setBrush( c ); // solid fill with color c
- p->drawRect( 70, -10, SLICE_LENGTH, 10 ); // draw the rectangle
-
- QString n;
- n.sprintf( "H=%d", i*10 );
- p->drawText( SLICE_LENGTH+70+5, 0, n ); // draw the hue number
- }
- p->restore();
-}
-
-
-//
-// This function draws a few lines of text using different fonts.
-//
-
-#define DRAW_FONT_OFFSET 270.0F
-
-void drawFonts( QPainter *p )
-{
- static const char *fonts[] = { "Helvetica", "Courier", "Times", 0 };
- static int sizes[] = { 10, 12, 18, 24, 36, 0 };
- int f = 0;
- int y = 0;
-
- p->save();
-
- QWMatrix matrix;
- matrix.translate( 0.0F, DRAW_FONT_OFFSET ); // move to center
- p->setWorldMatrix( matrix ); // use this world matrix
- while ( fonts[f] ) {
- int s = 0;
- while ( sizes[s] ) {
- QFont font( fonts[f], sizes[s] );
- p->setFont( font );
- QFontMetrics fm = p->fontMetrics();
- y += fm.ascent();
- p->drawText( 10, y, fonts[f] );
- p->drawText( 10 + p->fontMetrics().width(fonts[f]), y, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz" );
- y += fm.descent();
- s++;
- }
- f++;
- }
- p->restore();
-}
-
-
-//
-// This function draws some shapes
-//
-
-#define DRAW_SHAPES_OFFSET 600.0F
-
-void drawShapes( QPainter *p )
-{
- QBrush b1( Qt::blue );
- QBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill
- QBrush b3( Qt::NoBrush ); // void brush
- QBrush b4( Qt::CrossPattern ); // black cross pattern
-
- p->save();
-
- QWMatrix matrix;
- matrix.translate( 0.0F, DRAW_SHAPES_OFFSET ); // move to center
- p->setWorldMatrix( matrix ); // use this world matrix
-
- p->setPen( Qt::red );
- p->setBrush( b1 );
- p->drawRect( 10, 10, 200, 100 );
- p->setBrush( b2 );
- p->drawRoundRect( 10, 150, 200, 100, 20, 20 );
- p->setBrush( b3 );
- p->drawEllipse( 250, 10, 200, 100 );
- p->setBrush( b4 );
- p->drawPie( 250, 150, 200, 100, 45*16, 90*16 );
-
- p->restore();
-}
-
-
-class DrawView : public QWidget
-{
-public:
- DrawView();
- ~DrawView();
-protected:
- void paintEvent( QPaintEvent * );
-private:
-};
-
-
-//
-// Construct the DrawView with buttons.
-//
-
-DrawView::DrawView()
-{
- setCaption( "Qt Draw Demo Application" );
- setBackgroundColor( white );
- resize( 640,900 );
-}
-
-//
-// Clean up
-//
-DrawView::~DrawView()
-{
-}
-
-//
-// Called when the widget needs to be updated.
-//
-
-void DrawView::paintEvent( QPaintEvent * )
-{
- QPainter paint( this );
-
- drawColorWheel (&paint);
- drawFonts (&paint);
- drawShapes (&paint);
-}
-
-
-//
-// Create and display our widget.
-//
-
-int main( int argc, char **argv )
-{
- QApplication app( argc, argv );
- DrawView draw;
- app.setMainWidget( &draw );
- draw.show();
- return app.exec();
-}
diff --git a/WebCore/kwq/tests/draw/powermac.jpg b/WebCore/kwq/tests/draw/powermac.jpg
new file mode 100644
index 0000000..e9d1995
Binary files /dev/null and b/WebCore/kwq/tests/draw/powermac.jpg differ
diff --git a/WebCore/kwq/tests/draw/qt.png b/WebCore/kwq/tests/draw/qt.png
new file mode 100644
index 0000000..1f619c1
Binary files /dev/null and b/WebCore/kwq/tests/draw/qt.png differ
diff --git a/WebCore/kwq/tests/draw/yahoo.gif b/WebCore/kwq/tests/draw/yahoo.gif
new file mode 100644
index 0000000..7a79228
Binary files /dev/null and b/WebCore/kwq/tests/draw/yahoo.gif differ
diff --git a/WebCore/src/kwq/tests/draw/Makefile b/WebCore/src/kwq/tests/draw/Makefile
index 796e5d9..a835803 100644
--- a/WebCore/src/kwq/tests/draw/Makefile
+++ b/WebCore/src/kwq/tests/draw/Makefile
@@ -1,10 +1,10 @@
-drawdemo.o: drawdemo.cpp
- c++ -c -I$(QTDIR)/include -fno-exceptions -pipe -g -o drawdemo.o drawdemo.cpp
+draw.o: draw.mm
+ cc -c -I$(QTDIR)/include -fno-exceptions -pipe -g -o draw.o draw.mm
-drawdemo: drawdemo.o
- c++ -L$(QTDIR)/lib -o ./drawdemo drawdemo.o -lqt -L/usr/X11R6/lib -lz -ljpeg -lXext -lX11
+draw: draw.o
+ cc -L$(QTDIR)/lib -o ./draw draw.o -lqt -L/usr/X11R6/lib -lz -ljpeg -lXext -lX11 -framework Cocoa
clean:
- rm *.o drawdemo
+ rm *.o draw
-all: drawdemo
+all: draw
diff --git a/WebCore/src/kwq/tests/draw/draw.mm b/WebCore/src/kwq/tests/draw/draw.mm
new file mode 100644
index 0000000..87a9f47
--- /dev/null
+++ b/WebCore/src/kwq/tests/draw/draw.mm
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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.
+ */
+
+/*
+ * This program tests the subset of the Qt drawing API implemented in the
+ * KWQ emulation package. Only the API in the emulation package should
+ * be used.
+ *
+ *
+*/
+
+#include <qwidget.h>
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qapplication.h>
+#include <math.h>
+
+// Voodoo required to get compiler to compile correctly.
+#undef DEBUG
+#import <Cocoa/Cocoa.h>
+
+//
+// This function draws a color wheel.
+// The coordinate system x=(0..500), y=(0..500) spans the paint device.
+//
+
+#define SLICE_WIDTH 68
+#define SLICE_HEIGHT 10
+
+void drawColors( QPainter *p )
+{
+ int x = 0, y = 0, height, r = 0, g = 255, b = 125;
+ p->save();
+
+ QFont f( "helvetica", 10, QFont::Bold );
+ p->setFont( f );
+ p->setPen( Qt::black );
+
+ QFontMetrics fm = p->fontMetrics();
+ height = fm.height();
+
+ for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles
+ QColor c;
+ c.setRgb( r, g, b );
+ r += 255/36;
+ g -= 255/36;
+ p->setBrush( c ); // solid fill with color c
+ x += SLICE_WIDTH + 5;
+ if (i % 6 == 0) {
+ y += SLICE_HEIGHT + height + 2;
+ x = 10;
+ }
+ p->drawRect( x, y, SLICE_WIDTH, SLICE_HEIGHT ); // draw the rectangle
+
+ QString n;
+ n.sprintf( "%d,%d,%d", r,g,b );
+ p->drawText( x, y + SLICE_HEIGHT + height, n ); // draw the hue number
+ }
+ p->restore();
+}
+
+
+void drawImages( QPainter *p)
+{
+ QByteArray *byteArray;
+ QPixmap *pixmap;
+ NSString *files[] = { @"powermac.jpg", @"qt.png", @"yahoo.gif" };
+ NSData *data;
+ const QPoint point (10, 200);
+ int i;
+
+ for (i = 0; i < 3; i++){
+ const QPoint point (10 + 60*i, 200);
+ data = [[NSData alloc] initWithContentsOfFile: files[i]];
+ byteArray = new QByteArray();
+ byteArray->setRawData ((const char *)[data bytes], (unsigned int)[data length]);
+ pixmap = new QPixmap (*byteArray);
+ if (i == 2){
+ QWMatrix matrix;
+ matrix.scale((double)0.5, (double)0.5);
+ QPixmap rp = pixmap->xForm (matrix);
+ p->drawPixmap (point,rp);
+ }
+ else
+ p->drawPixmap (point,*pixmap);
+ }
+}
+
+
+//
+// This function draws a few lines of text using different fonts.
+//
+
+#define DRAW_FONT_OFFSET 270.0F
+
+void drawFonts( QPainter *p )
+{
+ static const char *fonts[] = { "Helvetica", "Courier", "Times", 0 };
+ static int sizes[] = { 10, 12, 18, 24, 36, 0 };
+ int f = 0;
+ int y = 0;
+
+ p->save();
+
+#ifdef USE_TRANSLATION
+ QWMatrix matrix;
+ matrix.translate( 0.0F, DRAW_FONT_OFFSET ); // move to center
+ p->setWorldMatrix( matrix ); // use this world matrix
+#else
+ y += (int)DRAW_FONT_OFFSET;
+#endif
+
+ while ( fonts[f] ) {
+ int s = 0;
+ while ( sizes[s] ) {
+ QFont font( fonts[f], sizes[s] );
+ p->setFont( font );
+ QFontMetrics fm = p->fontMetrics();
+ y += fm.ascent();
+ p->drawText( 10, y, fonts[f] );
+ p->drawText( 10 + p->fontMetrics().width(fonts[f]), y, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz" );
+ y += fm.descent();
+ s++;
+ }
+ f++;
+ }
+ p->restore();
+}
+
+
+//
+// This function draws some shapes
+//
+
+#define DRAW_SHAPES_OFFSET 600.0F
+
+void drawShapes( QPainter *p )
+{
+ QBrush b1( Qt::blue );
+ QBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill
+ QBrush b3( Qt::NoBrush ); // void brush
+ QBrush b4( Qt::CrossPattern ); // black cross pattern
+
+ int y = 10;
+
+ p->save();
+
+#ifdef USE_TRANSLATION
+ QWMatrix matrix;
+ matrix.translate( 0.0F, DRAW_SHAPES_OFFSET ); // move to center
+ p->setWorldMatrix( matrix ); // use this world matrix
+#else
+ y += (int)DRAW_SHAPES_OFFSET;
+#endif
+ p->setPen( Qt::red );
+ p->setBrush( b1 );
+ p->drawRect( 10, y, 200, 100 );
+ p->setBrush( b2 );
+ p->drawRoundRect( 10, y+140, 200, 100, 20, 20 );
+ p->setBrush( b3 );
+ p->drawEllipse( 250, y, 200, 100 );
+ p->setBrush( b4 );
+ p->drawPie( 250, y+140, 200, 100, 45*16, 90*16 );
+
+ p->restore();
+}
+
+
+class DrawView : public QWidget
+{
+public:
+ DrawView();
+ ~DrawView();
+protected:
+ void paintEvent( QPaintEvent * );
+private:
+};
+
+
+//
+// Construct the DrawView with buttons.
+//
+
+DrawView::DrawView()
+{
+ setCaption( "Qt Draw Demo Application" );
+ setBackgroundColor( white );
+ resize( 640,900 );
+}
+
+//
+// Clean up
+//
+DrawView::~DrawView()
+{
+}
+
+//
+// Called when the widget needs to be updated.
+//
+
+void DrawView::paintEvent( QPaintEvent * )
+{
+ QPainter paint( this );
+
+ drawColors (&paint);
+ drawImages (&paint);
+ drawFonts (&paint);
+ drawShapes (&paint);
+}
+
+
+//
+// Create and display our widget.
+//
+
+int main( int argc, char **argv )
+{
+ QApplication app( argc, argv );
+ DrawView draw;
+ app.setMainWidget( &draw );
+ draw.show();
+ return app.exec();
+}
diff --git a/WebCore/src/kwq/tests/draw/drawdemo.cpp b/WebCore/src/kwq/tests/draw/drawdemo.cpp
deleted file mode 100644
index 9f09c8e..0000000
--- a/WebCore/src/kwq/tests/draw/drawdemo.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************************
-** $Id$
-**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
-**
-** This file is part of an example program for Qt. This example
-** program may be used, distributed and modified without limitation.
-**
-*****************************************************************************/
-
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qapplication.h>
-#include <math.h>
-
-
-//
-// This function draws a color wheel.
-// The coordinate system x=(0..500), y=(0..500) spans the paint device.
-//
-
-#define SLICE_LENGTH 15
-
-void drawColorWheel( QPainter *p )
-{
- p->save();
-
- QFont f( "times", 18, QFont::Bold );
- p->setFont( f );
- p->setPen( Qt::black );
- //p->setWindow( 0, 0, 500, 500 ); // defines coordinate system
-
- for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles
-
- QWMatrix matrix;
- matrix.translate( 390.0F, 140.0F ); // move to center
- matrix.shear( 0.0F, 0.3F ); // twist it
- matrix.rotate( (float)i*10 ); // rotate 0,10,20,.. degrees
- p->setWorldMatrix( matrix ); // use this world matrix
-
- QColor c;
- c.setHsv( i*10, 255, 255 ); // rainbow effect
- p->setBrush( c ); // solid fill with color c
- p->drawRect( 70, -10, SLICE_LENGTH, 10 ); // draw the rectangle
-
- QString n;
- n.sprintf( "H=%d", i*10 );
- p->drawText( SLICE_LENGTH+70+5, 0, n ); // draw the hue number
- }
- p->restore();
-}
-
-
-//
-// This function draws a few lines of text using different fonts.
-//
-
-#define DRAW_FONT_OFFSET 270.0F
-
-void drawFonts( QPainter *p )
-{
- static const char *fonts[] = { "Helvetica", "Courier", "Times", 0 };
- static int sizes[] = { 10, 12, 18, 24, 36, 0 };
- int f = 0;
- int y = 0;
-
- p->save();
-
- QWMatrix matrix;
- matrix.translate( 0.0F, DRAW_FONT_OFFSET ); // move to center
- p->setWorldMatrix( matrix ); // use this world matrix
- while ( fonts[f] ) {
- int s = 0;
- while ( sizes[s] ) {
- QFont font( fonts[f], sizes[s] );
- p->setFont( font );
- QFontMetrics fm = p->fontMetrics();
- y += fm.ascent();
- p->drawText( 10, y, fonts[f] );
- p->drawText( 10 + p->fontMetrics().width(fonts[f]), y, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz" );
- y += fm.descent();
- s++;
- }
- f++;
- }
- p->restore();
-}
-
-
-//
-// This function draws some shapes
-//
-
-#define DRAW_SHAPES_OFFSET 600.0F
-
-void drawShapes( QPainter *p )
-{
- QBrush b1( Qt::blue );
- QBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill
- QBrush b3( Qt::NoBrush ); // void brush
- QBrush b4( Qt::CrossPattern ); // black cross pattern
-
- p->save();
-
- QWMatrix matrix;
- matrix.translate( 0.0F, DRAW_SHAPES_OFFSET ); // move to center
- p->setWorldMatrix( matrix ); // use this world matrix
-
- p->setPen( Qt::red );
- p->setBrush( b1 );
- p->drawRect( 10, 10, 200, 100 );
- p->setBrush( b2 );
- p->drawRoundRect( 10, 150, 200, 100, 20, 20 );
- p->setBrush( b3 );
- p->drawEllipse( 250, 10, 200, 100 );
- p->setBrush( b4 );
- p->drawPie( 250, 150, 200, 100, 45*16, 90*16 );
-
- p->restore();
-}
-
-
-class DrawView : public QWidget
-{
-public:
- DrawView();
- ~DrawView();
-protected:
- void paintEvent( QPaintEvent * );
-private:
-};
-
-
-//
-// Construct the DrawView with buttons.
-//
-
-DrawView::DrawView()
-{
- setCaption( "Qt Draw Demo Application" );
- setBackgroundColor( white );
- resize( 640,900 );
-}
-
-//
-// Clean up
-//
-DrawView::~DrawView()
-{
-}
-
-//
-// Called when the widget needs to be updated.
-//
-
-void DrawView::paintEvent( QPaintEvent * )
-{
- QPainter paint( this );
-
- drawColorWheel (&paint);
- drawFonts (&paint);
- drawShapes (&paint);
-}
-
-
-//
-// Create and display our widget.
-//
-
-int main( int argc, char **argv )
-{
- QApplication app( argc, argv );
- DrawView draw;
- app.setMainWidget( &draw );
- draw.show();
- return app.exec();
-}
diff --git a/WebCore/src/kwq/tests/draw/powermac.jpg b/WebCore/src/kwq/tests/draw/powermac.jpg
new file mode 100644
index 0000000..e9d1995
Binary files /dev/null and b/WebCore/src/kwq/tests/draw/powermac.jpg differ
diff --git a/WebCore/src/kwq/tests/draw/qt.png b/WebCore/src/kwq/tests/draw/qt.png
new file mode 100644
index 0000000..1f619c1
Binary files /dev/null and b/WebCore/src/kwq/tests/draw/qt.png differ
diff --git a/WebCore/src/kwq/tests/draw/yahoo.gif b/WebCore/src/kwq/tests/draw/yahoo.gif
new file mode 100644
index 0000000..7a79228
Binary files /dev/null and b/WebCore/src/kwq/tests/draw/yahoo.gif differ
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list