wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

[qt] Use Qt for double buffering; let Qt handle events that Gecko doesn't want

Browse Source 
In particular, the Update event needs to be passed to QWidget::event so that
a Paint event is generated and we can actually do the painting.
This commit is contained in:
Vladimir Vukicevic 2008-04-20 01:37:07 -07:00
parent a144ca692a
commit a8b0f696f7
3 changed files with 61 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
widget/src/qt/mozqwidget.cpp
View File

@ -13,6 +13,7 @@ MozQWidget::MozQWidget(nsWindow *receiver, QWidget *parent,
bool MozQWidget::event(QEvent *e)
{
nsEventStatus status = nsEventStatus_eIgnore;
bool handled = true;
if (!mReceiver)
return false;
@ -176,11 +177,24 @@ bool MozQWidget::event(QEvent *e)
QDropEvent *dev = (QDropEvent*)(e);
status = mReceiver->OnDragDropEvent(dev);
}
case QEvent::GrabMouse:
fprintf (stderr, "[%p] %p GrabMouse\n", this, mReceiver);
break;
case QEvent::UngrabMouse:
fprintf (stderr, "[%p] %p GrabMouse\n", this, mReceiver);
break;
break;
default:
handled = false;
break;
}
if (handled)
return true;
return QWidget::event(e);
#if 0
// If we were going to ignore this event, pass it up to the parent
// and return its value
if (status == nsEventStatus_eIgnore)
@ -192,6 +206,7 @@ bool MozQWidget::event(QEvent *e)
QWidget::event(e);
return true;
#endif
}
bool

192
widget/src/qt/nsWindow.cpp
View File

@ -175,8 +175,6 @@ nsWindow::nsWindow()
{
mDrawingarea = nsnull;
mIsVisible = PR_FALSE;
mRetryPointerGrab = PR_FALSE;
mRetryKeyboardGrab = PR_FALSE;
mActivatePending = PR_FALSE;
mWindowType = eWindowType_child;
mSizeState = nsSizeMode_Normal;
@ -690,7 +688,7 @@ nsWindow::Invalidate(PRBool aIsSynchronous)
if (!mDrawingarea)
return NS_OK;
if (aIsSynchronous)
if (aIsSynchronous && !mDrawingarea->paintingActive())
mDrawingarea->repaint();
else
mDrawingarea->update();
@ -734,7 +732,7 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
// (void *)this,
// rect.x, rect.y, rect.width, rect.height, aIsSynchronous));
if (aIsSynchronous)
if (aIsSynchronous && !mDrawingarea->paintingActive())
mDrawingarea->repaint(*region);
else
mDrawingarea->update(*region);
@ -923,8 +921,6 @@ nsWindow::WidgetToScreen(const nsRect& aOldRect, nsRect& aNewRect)
aNewRect.width = aOldRect.width;
aNewRect.height = aOldRect.height;
LOG(("WidgetToScreen %d %d -> %d %d\n", aOldRect.x, aOldRect.y, aNewRect.x, aNewRect.y));
return NS_OK;
}
@ -941,8 +937,6 @@ nsWindow::ScreenToWidget(const nsRect& aOldRect, nsRect& aNewRect)
aNewRect.width = aOldRect.width;
aNewRect.height = aOldRect.height;
LOG(("ScreenToWidget %d %d -> %d %d\n", aOldRect.x, aOldRect.y, aNewRect.x, aNewRect.y));
return NS_OK;
}
@ -990,14 +984,10 @@ nsWindow::CaptureMouse(PRBool aCapture)
if (!mDrawingarea)
return NS_OK;
/*
if (aCapture) {
GrabPointer();
}
else {
ReleaseGrabs();
}
*/
if (aCapture)
mDrawingarea->grabMouse();
else
mDrawingarea->releaseMouse();
return NS_OK;
}
@ -1078,7 +1068,7 @@ nsWindow::OnExposeEvent(QPaintEvent *aEvent)
QVector<QRect> rects = aEvent->region().rects();
LOGDRAW(("sending expose event [%p] %p 0x%lx (rects follow):\n",
LOGDRAW(("[%p] sending expose event %p 0x%lx (rects follow):\n",
(void *)this, (void *)aEvent, 0));
for (int i = 0; i < rects.size(); ++i) {
@ -1088,7 +1078,12 @@ nsWindow::OnExposeEvent(QPaintEvent *aEvent)
}
#ifndef QT_XLIB_SURFACE
QPainter painter(mDrawingarea);
QPainter painter;
if (!painter.begin(mDrawingarea)) {
fprintf (stderr, "*********** Failed to begin painting!\n");
return nsEventStatus_eConsumeNoDefault;
}
nsRefPtr<gfxQPainterSurface> targetSurface = new gfxQPainterSurface(&painter);
nsRefPtr<gfxContext> ctx = new gfxContext(targetSurface);
@ -1100,47 +1095,11 @@ nsWindow::OnExposeEvent(QPaintEvent *aEvent)
rc->Init(GetDeviceContext(), ctx);
PRBool translucent;
GetHasTransparentBackground(translucent);
nsIntRect boundsRect;
updateRegion->GetBoundingBox(&boundsRect.x, &boundsRect.y,
&boundsRect.width, &boundsRect.height);
// do double-buffering and clipping here
ctx->Save();
ctx->NewPath();
if (translucent) {
// Collapse update area to the bounding box. This is so we only have to
// call UpdateTranslucentWindowAlpha once. After we have dropped
// support for non-Thebes graphics, UpdateTranslucentWindowAlpha will be
// our private interface so we can rework things to avoid this.
ctx->Rectangle(gfxRect(boundsRect.x, boundsRect.y,
boundsRect.width, boundsRect.height));
} else {
for (int i = 0; i < rects.size(); ++i) {
QRect r = rects.at(i);
ctx->Rectangle(gfxRect(r.x(), r.y(), r.width(), r.height()));
}
}
ctx->Clip();
// double buffer
if (translucent) {
ctx->PushGroup(gfxASurface::CONTENT_COLOR_ALPHA);
} else if (gDoubleBuffering) {
ctx->PushGroup(gfxASurface::CONTENT_COLOR);
}
#if 0
// NOTE: Paint flashing region would be wrong for cairo, since
// cairo inflates the update region, etc. So don't paint flash
// for cairo.
#ifdef DEBUG
if (WANT_PAINT_FLASHING && aEvent->window)
gdk_window_flash(aEvent->window, 1, 100, aEvent->region);
#endif
#endif
#else /* QT_XLIB_SURFACE */
nsCOMPtr<nsIRenderingContext> rc = getter_AddRefs(GetRenderingContext());
if (NS_UNLIKELY(!rc)) {
@ -1158,7 +1117,7 @@ nsWindow::OnExposeEvent(QPaintEvent *aEvent)
// do double-buffering and clipping here
nsRefPtr<gfxContext> ctx = rc->ThebesContext();
ctx->Save();
ctx->NewPath();
if (translucent) {
// Collapse update area to the bounding box. This is so we only have to
@ -1223,17 +1182,17 @@ nsWindow::OnExposeEvent(QPaintEvent *aEvent)
event.renderingContext = rc;
nsEventStatus status = DispatchEvent(&event);
//nsEventStatus status = nsEventStatus_eConsumeNoDefault;
// DispatchEvent can Destroy us (bug 378273), avoid doing any paint
// operations below if that happened - it will lead to XError and exit().
if (NS_UNLIKELY(mIsDestroyed))
return status;
if (status == nsEventStatus_eIgnore) {
ctx->Restore();
if (status == nsEventStatus_eIgnore)
return status;
}
#ifdef QT_XLIB_SURFACE
if (translucent) {
nsRefPtr<gfxPattern> pattern = ctx->PopGroup();
ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
@ -1258,18 +1217,17 @@ nsWindow::OnExposeEvent(QPaintEvent *aEvent)
img->Data(), img->Stride());
}
} else if (gDoubleBuffering) {
#ifndef QT_XLIB_SURFACE
ctx->PopGroupToSource();
ctx->Paint();
#else
if (bufferPixmapSurface) {
ctx->SetSource(bufferPixmapSurface);
ctx->Paint();
}
#endif
}
#endif
ctx->Restore();
LOGDRAW(("[%p] draw done\n", this));
ctx = nsnull;
targetSurface = nsnull;
// check the return value!
return status;
@ -1408,7 +1366,11 @@ nsWindow::OnMotionNotifyEvent(QMouseEvent *aEvent)
event.isMeta = aEvent->modifiers() & Qt::MetaModifier;
event.clickCount = 0;
return DispatchEvent(&event);
nsEventStatus status = DispatchEvent(&event);
//fprintf (stderr, "[%p] %p MotionNotify -> %d\n", this, mDrawingarea, status);
return status;
}
void
@ -1445,6 +1407,8 @@ nsWindow::OnButtonPressEvent(QMouseEvent *aEvent)
event.button = domButton;
InitButtonEvent(event, aEvent, 1);
LOG(("%s [%p] button: %d\n", __PRETTY_FUNCTION__, (void*)this, domButton));
nsEventStatus status = DispatchEvent(&event);
// right menu click on linux should also pop up a context menu
@ -1456,6 +1420,8 @@ nsWindow::OnButtonPressEvent(QMouseEvent *aEvent)
DispatchEvent(&contextMenuEvent, status);
}
//fprintf (stderr, "[%p] %p ButtonPress -> %d\n", this, mDrawingarea, status);
return status;
}
@ -1477,11 +1443,17 @@ nsWindow::OnButtonReleaseEvent(QMouseEvent *aEvent)
break;
}
LOG(("%s [%p] button: %d\n", __PRETTY_FUNCTION__, (void*)this, domButton));
nsMouseEvent event(PR_TRUE, NS_MOUSE_BUTTON_UP, this, nsMouseEvent::eReal);
event.button = domButton;
InitButtonEvent(event, aEvent, 1);
return DispatchEvent(&event);
nsEventStatus status = DispatchEvent(&event);
//fprintf (stderr, "[%p] %p ButtonRelease -> %d\n", this, mDrawingarea, status);
return status;
}
nsEventStatus
@ -1959,10 +1931,8 @@ nsWindow::NativeResize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
mDrawingarea->resize( aWidth, aHeight);
if (aRepaint) {
if (mDrawingarea->isVisible())
mDrawingarea->repaint();
}
if (aRepaint)
mDrawingarea->update();
}
void
@ -2001,10 +1971,8 @@ nsWindow::NativeResize(PRInt32 aX, PRInt32 aY,
mDrawingarea->setGeometry(pos.x(), pos.y(), aWidth, aHeight);
if (aRepaint) {
if (mDrawingarea->isVisible())
mDrawingarea->repaint();
}
if (aRepaint)
mDrawingarea->update();
}
void
@ -2035,15 +2003,6 @@ nsWindow::NativeShow (PRBool aAction)
mDrawingarea->setShown(aAction);
}
void
nsWindow::EnsureGrabs(void)
{
if (mRetryPointerGrab)
GrabPointer();
if (mRetryKeyboardGrab)
GrabKeyboard();
}
NS_IMETHODIMP
nsWindow::SetHasTransparentBackground(PRBool aTransparent)
{
@ -2246,66 +2205,6 @@ nsWindow::UpdateTranslucentWindowAlphaInternal(const nsRect& aRect,
return NS_OK;
}
void
nsWindow::GrabPointer(void)
{
LOG(("GrabPointer %d\n", mRetryPointerGrab));
mRetryPointerGrab = PR_FALSE;
// If the window isn't visible, just set the flag to retry the
// grab. When this window becomes visible, the grab will be
// retried.
PRBool visibility = PR_TRUE;
IsVisible(visibility);
if (!visibility) {
LOG(("GrabPointer: window not visible\n"));
mRetryPointerGrab = PR_TRUE;
return;
}
if (!mDrawingarea)
return;
mDrawingarea->grabMouse();
}
void
nsWindow::GrabKeyboard(void)
{
LOG(("GrabKeyboard %d\n", mRetryKeyboardGrab));
mRetryKeyboardGrab = PR_FALSE;
// If the window isn't visible, just set the flag to retry the
// grab. When this window becomes visible, the grab will be
// retried.
PRBool visibility = PR_TRUE;
IsVisible(visibility);
if (!visibility) {
LOG(("GrabKeyboard: window not visible\n"));
mRetryKeyboardGrab = PR_TRUE;
return;
}
if (!mDrawingarea)
return;
mDrawingarea->grabKeyboard();
}
void
nsWindow::ReleaseGrabs(void)
{
LOG(("ReleaseGrabs\n"));
mRetryPointerGrab = PR_FALSE;
mRetryKeyboardGrab = PR_FALSE;
// gdk_pointer_ungrab(Qt::Key_CURRENT_TIME);
// gdk_keyboard_ungrab(Qt::Key_CURRENT_TIME);
}
void
nsWindow::GetToplevelWidget(QWidget **aWidget)
{
@ -2734,12 +2633,11 @@ nsWindow::createQWidget(QWidget *parent, nsWidgetInitData *aInitData)
mMozQWidget->setAttribute(Qt::WA_StaticContents);
mMozQWidget->setAttribute(Qt::WA_OpaquePaintEvent); // Transparent Widget Background
// Disable the double buffer because it will make the caret crazy
// For bug#153805 (Gtk2 double buffer makes carets misbehave)
mMozQWidget->setAttribute(Qt::WA_NoSystemBackground);
mMozQWidget->setAttribute(Qt::WA_PaintOnScreen);
if (!gDoubleBuffering)
mMozQWidget->setAttribute(Qt::WA_PaintOnScreen);
return mDrawingarea;
}

9
widget/src/qt/nsWindow.h
View File

@ -211,11 +211,6 @@ protected:
void NativeShow (PRBool aAction);
void EnsureGrabs (void);
void GrabKeyboard (void);
void ReleaseGrabs (void);
void GrabPointer(void);
enum PluginType {
PluginType_NONE = 0, /* do not have any plugin */
PluginType_XEMBED, /* the plugin support xembed */
@ -253,9 +248,7 @@ private:
MozQWidget *mMozQWidget;
PRUint32 mIsVisible : 1,
mRetryPointerGrab : 1,
mActivatePending : 1,
mRetryKeyboardGrab : 1;
mActivatePending : 1;
PRInt32 mSizeState;
PluginType mPluginType;