summaryrefslogtreecommitdiffstats
path: root/src/plugins/gfxdrivers/directfb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0715-15/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| * Update copyright year to 2010Jason McDonald2010-01-0615-15/+15
| | | | | | | | Reviewed-by: Trust Me
* | Make stretchblit an opt-out option in DirectFBAnders Bakken2010-01-042-11/+28
| | | | | | | | | | | | | | | | Certain boards are not support StretchBlit very well. This patch enables them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster engine for stretchblits. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Set serial number in QDFBPixmapData::transformedAnders Bakken2010-01-041-0/+1
|/ | | | | | | QDirectFBPixmapData::transformed initializes a new QDirectFBPixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Read QWS_SIZE from layer rather than screenAnders Bakken2009-12-231-1/+8
| | | | | | | | | | | When running the X11 emulator of DirectFB IDirectFBScreen->GetSize returns the size of the entire X11 Display, not the actual DirectFB window. We can read this from the primary layer instead and this value is correct both on devices and on the desktop. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Get rid of no_cast_from_ascii warningAnders Bakken2009-12-231-1/+1
|
* Clean up debug message with DirectFBAnders Bakken2009-12-091-29/+29
| | | | | | Remove some superfluous spaces. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Enable customizing of DirectFB layer to useAnders Bakken2009-12-091-2/+5
| | | | | | | | | | | This patch enables you to use a different layer for Qt apps by specifying: E.g. QWS_DISPLAY=directfb:layerid=2 Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Set stacking class for stays-on-top windows in DFBAnders Bakken2009-12-091-1/+3
| | | | | | | | For better compatibility with non-QWS DirectFB apps running in the same session we should set the stacking class of Windows that have the StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-191-2/+2
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-2/+2
| | | | | | | | Over src/ tools/ examples/ and demos/
* | Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
|/ | | | | | | | This value seems to cause problems on various chipsets and we get a double buffered window regardless. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
* API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-092-4/+4
| | | | | | | QRegion::numRects() is marked obsolete. Removed all usage of the old function inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-062-4/+4
| | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* Support composition mode source for drawing in dfbAnders Bakken2009-11-061-19/+52
| | | | | | | | | | | Qt's/DirectFB's composition modes are not compatible for drawing operations. We only support SourceOver and handle whether or not to blend colors using DSDRAW_BLEND based on the alpha/opacity value. If drawing with Source and an opaque color we can still handle the operation using DirectFB. This has major impact since WebKit fills the background of web pages using Source. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Reset composition mode after drawing in dfbAnders Bakken2009-11-061-3/+8
| | | | | | | | When drawing primitives in DirectFB we always set composition mode to NONE and manually manage whether or not to blend. This patch makes sure we will reset the composition mode afterwards. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Store DirectFB winID as a dynamic propertyAnders Bakken2009-10-221-0/+13
| | | | | | | | | | Since QWS uses the winids for its own purposes I have to store this as a dynamic property. _q_DirectFBWindowID The _q_ is documented to be reserved so this won't break anyone's applications. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Remove declaration of QDirectFBScreen::scrollAnders Bakken2009-10-221-1/+0
| | | | | | | | This function has been declared since the initial commit but was never actually implemented. The function exists in QDirectFBWindowSurface. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Allow setting DFBDisplayLayer background colorAnders Bakken2009-10-151-7/+59
| | | | | | | | | | We already have an option for setting the background color of the primary surface when running with NO_WM. Reuse the same option for allowing users to set the background color of the primary layer. Also fix the regexp. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Don't trust layer when using window_as_cursorAnders Bakken2009-10-151-1/+1
| | | | | | | | | When using QT_DIRECTFB_WINDOW_AS_CURSOR it's likely that the layer doesn't properly support the mouse. Seeing as one might still very well have layer support for windows I can't tie the event parsing solely to NO_DIRECTFB_LAYER. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Make QT_DIRECTFB_SUBSURFACE an opt-in optionAnders Bakken2009-10-151-2/+2
| | | | | | | | | Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt from using subsurfaces for locked surfaces. Now make the default be QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define QT_DIRECTFB_SUBSURFACE to use this option. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a problem with QDirectFBScreen::instanceAnders Bakken2009-10-152-6/+12
| | | | | | | | If using a proxy screen QScreen::instance() will not return a QDirectFBScreen but rather a QProxyScreen. This patch lets QDirectFBScreen::instance hold its own pointer. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Don't create too many window surfaces in DFBAnders Bakken2009-10-131-1/+5
| | | | | | | | Since DirectFB handles the composition for us we don't need to invalidate anything when moving a window. Only on resize do we want another paint event. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Make sure we don't repaint when moving a windowAnders Bakken2009-10-131-0/+2
| | | | | | | | We need to make sure the QDirectFBWindowSurface returns true for isBuffered(). Otherwise QWSWindowSurface will force a repaint when moved. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a window opacity bug with DirectFBAnders Bakken2009-10-012-52/+60
| | | | | | | | | Initialize IDirectFBWindows with the correct capabilities/options when supporting top level transparency. Also, properly deal with runtime changes of top level transparency. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* Make sure gccaps is properly initialized for dfbpeAnders Bakken2009-10-011-0/+2
| | | | Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* Clean up releaseSurface in QDirectFBPaintDeviceAnders Bakken2009-10-012-7/+5
| | | | | | | | Instead of having to call unlockSurface/releaseSubSurface and releaseSurface to release the surface in QDirectFBWindowSurface make releaseSurface do all three things. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* QString(" => QString::fromLatin1("Anders Bakken2009-09-291-1/+1
| | | | | | Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a alpha issue with RGB32 and DirectFBAnders Bakken2009-09-291-1/+4
| | | | | | | | | | Since we can't use RGB32 format with DirectFB (issues regarding Qt's assumptions about the alpha byte) we need to explicitly convert images of this type to the preferred alphaPixmap format. This fixes an issue where RGB32 images get a curious gray alpha overlay. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* A pen/brush can be invalid and have a valid colorAnders Bakken2009-09-181-8/+12
| | | | | | | | | | | | | This code is wrong: if (brush != Qt::NoBrush) ... It should be: if (brush.style() != Qt::NoBrush) ... Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Implement QDirectFBPaintEngine::drawRoundedRectAnders Bakken2009-09-182-1/+10
| | | | | | We need to lock before falling back to QRasterPaintEngine Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Fix a bug in QDirectFBWindowSurface::scrollAnders Bakken2009-09-171-0/+2
| | | | | | | | | | | It seems that one cannot do multiple blits within a double-buffered surface in overlapping one another without doing a Flip in between. I find this a little odd and will check that it's the correct behavior but this fixes bugs in scroll(). To see a case that used to produce drawing errors check out the collidingmouse example and drag the viewport around. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Simplify QDirectFBPixmapData::fromDataBufferAnders Bakken2009-09-161-48/+3
| | | | | | | | There's no need for the intermediate surface creation. RenderTo will handle things like palette/transparency etc. Should also provide some speedup. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* Make QT_DIRECTFB_PALETTE an opt-in optionAnders Bakken2009-09-161-2/+2
| | | | | | | This seems not work correctly on quite a few boards so I'd rather have people turn it on explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* Export a function for getting a IDirectFBWindowAnders Bakken2009-09-154-6/+34
| | | | | | This function is only exported when DirectFB is built into QtGui. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Export two functions for getting a surface in dfbAnders Bakken2009-09-152-1/+14
| | | | | | | When building DirectFB as part of QtGui and not as a plugin this patch will export two global functions for getting a surface given a widget. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a bug in surfaceForWidgetAnders Bakken2009-09-151-1/+2
| | | | | | I had the logic of the assert wrong with the isAncestorOf call. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a bug with mouse events in DirectFBAnders Bakken2009-09-101-0/+14
| | | | | | | | Partially revert a974ce81d6324d8d85ade0153b5ce7c757ba4fdf. It seems odd to just ignore the actual data in the input event but when the layer and the event differs the layer is correct. Reviewed-by: TrustMe
* DWDESC_OPTIONS was added for DirectFB 1.1Anders Bakken2009-09-101-1/+4
| | | | Reviewed-by: TrustMe
* s/DIRECTFB_MINOR_VERION/DIRECTFB_MINOR_VERSION/Anders Bakken2009-09-101-1/+1
| | | | | | This will make DirectFB version tests work. Reviewed-by: TrustMe
* Use fromLatin1() in QDirectFBScreen::connect()Anders Bakken2009-09-091-1/+1
| | | | | | Avoid warning when building DirectFB as part of Qt. Reviewed-by: TrustMe
* Update license headers again.Jason McDonald2009-09-0915-60/+60
| | | | Reviewed-by: Trust Me
* Fix QDirectFBPixmapData::fromImageAnders Bakken2009-09-081-6/+30
| | | | | | | | | | | This fix should optimize pixmap loading on most platforms and also fixes a bug on a certain hardware where the alpha channel of an image was not retained upon loading it. This patch also takes care of handling dithering better in QDirectFBPixmapData::fromImage(). Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix define in QDirectFBScreenAnders Bakken2009-09-081-1/+1
| | | | | | It's QT_NO_DIRECTFB.*, not QT_DIRECTFB_NO.* Reviewed-by: TrustMe
* memset DFBWindowDescription to 0Anders Bakken2009-09-081-0/+2
| | | | | | This makes debugging easier. Reviewed-by: TrustMe
* Use the right type in DFBPaintEngineAnders Bakken2009-09-041-2/+2
| | | | Reviewed-by: TrustMe
* Remove unnecessary call to exposeRegion in DFBAnders Bakken2009-09-042-12/+8
| | | | | | | | | If we make sure to erase the background to background color in connect() we don't have to do it in setGeometry. Also clean up the code in QDBWindowSurface::flush Reviewed-by: Donald Carr <donald.carr@nokia.com>
* QDFBScreen bgcolor is only use in non_wm modeAnders Bakken2009-09-041-4/+4
| | | | | | | No need to carry those extra bytes around when QT_DIRECTFB_WM is defined. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Remove unused function in QDFBScreenAnders Bakken2009-09-042-6/+0
| | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>