mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

These changes fix a draw problem when a top-level window was Move'd 

Bug=16325 r=Michael.Kedl@Nexwarecorp.com
This commit is contained in:
Jerry.Kirk%Nexwarecorp.com 1999-10-14 00:33:49 +00:00
Родитель 6df53d78e8
Коммит b1319b4798
2 изменённых файлов: 96 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

30
widget/src/photon/nsWidget.cpp
Просмотреть файл

@ -391,6 +391,14 @@ NS_METHOD nsWidget::Move(PRInt32 aX, PRInt32 aY)
return NS_OK;
}
#if 0
if(( 10 == aX ) && ( 10 == aY ))
{
printf("HACK: ignore move to 10 10\n");
return NS_OK;
}
#endif
PR_LOG(PhWidLog, PR_LOG_DEBUG, (" was at (%i,%i)\n", mBounds.x, mBounds.y ));
mBounds.x = aX;
@ -409,8 +417,13 @@ NS_METHOD nsWidget::Move(PRInt32 aX, PRInt32 aY)
{
if(( oldpos->x != pos.x ) || ( oldpos->y != pos.y ))
{
int err;
PtSetArg( &arg, Pt_ARG_POS, &pos, 0 );
PtSetResources( mWidget, 1, &arg );
err=PtSetResources( mWidget, 1, &arg );
if (err==-1)
{
printf("nsWidget::Move ERROR in PtSetRes (%p) to (%ld,%ld)\n", this, aX, aY );
}
}
}
@ -504,6 +517,7 @@ PRBool nsWidget::OnResize(nsRect &aRect)
NS_ADDREF_THIS();
result = DispatchWindowEvent(&event);
NS_RELEASE_THIS();
delete foo;
#else
InitEvent(event, NS_SIZE);
event.windowSize = &aRect;
@ -529,7 +543,7 @@ PRBool nsWidget::OnResize(nsRect &aRect)
//------
PRBool nsWidget::OnMove(PRInt32 aX, PRInt32 aY)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::OnMove\n" ));
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::OnMove to (%d,%d)\n", aX, aY));
nsGUIEvent event;
@ -579,6 +593,8 @@ NS_METHOD nsWidget::Enable(PRBool bState)
//-------------------------------------------------------------------------
NS_METHOD nsWidget::SetFocus(void)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFocus - mWidget=<%p>!\n", mWidget));
if (mWidget)
{
if (!PtIsFocused(mWidget))
@ -1269,7 +1285,6 @@ void nsWidget::ConvertToDeviceCoordinates(nscoord &aX, nscoord &aY)
void nsWidget::InitEvent(nsGUIEvent& event, PRUint32 aEventType, nsPoint* aPoint)
{
event.widget = this;
// NS_IF_ADDREF(event.widget);
if (aPoint == nsnull)
{
@ -2124,7 +2139,7 @@ void nsWidget::UpdateWidgetDamage()
if( !PtWidgetIsRealized( mWidget ))
{
NS_ASSERTION(0, "nsWidget::UpdateWidgetDamaged skipping update because widget is not Realized");
//NS_ASSERTION(0, "nsWidget::UpdateWidgetDamaged skipping update because widget is not Realized");
return;
}
@ -2246,6 +2261,12 @@ int nsWidget::WorkProc( void *data )
nsRect temp_rect;
PtWidgetArea( dqe->widget, &area ); // parent coords
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::WorkProc damaging widget=<%p> area=<%d,%d,%d,%d>\n", dqe->widget, area.pos.x, area.pos.y, area.size.w, area.size.h));
if (PtWidgetIsClass(dqe->widget, PtWindow))
{
printf("nsWidget::WorkProc got PtWindow set area to 0\n");
area.pos.x = area.pos.y = 0;
}
dqe->inst->mUpdateArea->GetRects(&regionRectSet);
@ -2276,7 +2297,6 @@ int nsWidget::WorkProc( void *data )
mDmgQueueInited = PR_FALSE;
int Global_Widget_Hold_Count;
PR_LOG(PhWidLog, PR_LOG_DEBUG,("nsWidget::WorkProc before release Global_Widget_Hold_Count=<%d>\n", Global_Widget_Hold_Count));
Global_Widget_Hold_Count = PtRelease();
PR_LOG(PhWidLog, PR_LOG_DEBUG,("nsWidget::WorkProc end, PtHold/PtRelease Global_Widget_Hold_Count=<%d>\n", Global_Widget_Hold_Count));

86
widget/src/photon/nsWindow.cpp
Просмотреть файл

@ -1010,7 +1010,7 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
if ( !pWin )
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, (" aborted because instance is NULL!\n"));
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc aborted because instance is NULL!\n"));
return;
}
@ -1020,7 +1020,7 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
if ( /*pWin->mCreateHold || pWin->mHold ||*/ pWin->mIsResizing )
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, (" aborted due to hold-off!\n"));
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc aborted due to hold-off!\n"));
return;
}
@ -1037,20 +1037,55 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
// the widgets canvas. Mozilla wants the paint coords relative to the parent widget, not the window.
PtWidgetArea( pWidget, &area );
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc area=<%d,%d,%d,%d>\n", area.pos.x, area.pos.y, area.size.w, area.size.h));
PtWidgetOffset( pWidget, &offset );
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc offset=<%d,%d>\n", offset.x, offset.y));
offset.x += area.pos.x;
offset.y += area.pos.y;
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc area+offset=<%d,%d,%d,%d>\n", area.pos.x, area.pos.y, area.size.w, area.size.h));
// Convert damage rect to widget's coordinates...
#if 1
{
PhTile_t *top = damage;
do {
PhRect_t rect = top->rect;
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc damage rect=<%d,%d,%d,%d> next=<%p>\n", rect.ul.x,rect.ul.y,rect.lr.x,rect.lr.y, top->next));
top=top->next;
} while (top);
}
#endif
#if 0
rect = damage->rect;
#else
PhTile_t *top = damage->next;
rect = top->rect;
top=top->next;
while (top)
{
PhRect_t tmp_rect = top->rect;
rect.ul.x = PR_MIN(rect.ul.x, tmp_rect.ul.x);
rect.ul.y = PR_MIN(rect.ul.y, tmp_rect.ul.y);
rect.lr.x = PR_MAX(rect.lr.x, tmp_rect.lr.x);
rect.lr.y = PR_MAX(rect.lr.y, tmp_rect.lr.y);
top=top->next;
}
#endif
rect.ul.x -= offset.x;
rect.ul.y -= offset.y;
rect.lr.x -= offset.x;
rect.lr.y -= offset.y;
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc damage rect + offset <%d,%d,%d,%d> next=<%p>\n", rect.ul.x,rect.ul.y,rect.lr.x,rect.lr.y, damage->next));
// If the damage tile is not within our bounds, do nothing
if(( rect.ul.x >= area.size.w ) || ( rect.ul.y >= area.size.h ) || ( rect.lr.x < 0 ) || ( rect.lr.y < 0 ))
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc damage tile is not within our bounds, do nothing\n"));
return;
}
// clip damage to widgets bounds...
if( rect.ul.x < 0 ) rect.ul.x = 0;
@ -1058,11 +1093,15 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
if( rect.lr.x >= area.size.w ) rect.lr.x = area.size.w - 1;
if( rect.lr.y >= area.size.h ) rect.lr.y = area.size.h - 1;
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc clipped damage <%d,%d,%d,%d>\n", rect.ul.x,rect.ul.y,rect.lr.x,rect.lr.y));
nsDmg.x = rect.ul.x;
nsDmg.y = rect.ul.y;
nsDmg.width = rect.lr.x - rect.ul.x + 1;
nsDmg.height = rect.lr.y - rect.ul.y + 1;
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc nsDmg <%d,%d,%d,%d>\n", nsDmg.x, nsDmg.y, nsDmg.width, nsDmg.height));
if(( nsDmg.width <= 0 ) || ( nsDmg.height <= 0 ))
return;
@ -1071,12 +1110,20 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
pev.rect = &nsDmg;
pev.eventStructType = NS_PAINT_EVENT;
// int Global_Widget_Hold_Count;
// Global_Widget_Hold_Count = PtHold();
// PR_LOG(PhWidLog, PR_LOG_DEBUG,("nsWindow::RawDrawFunc PtHold Global_Widget_Hold_Count=<%d> this=<%p>\n", Global_Widget_Hold_Count, pWin));
#if 1
pev.point.x = nsDmg.x;
pev.point.y = nsDmg.y;
PRInt32 x,y,w,h;
pWin->mUpdateArea->GetBoundingBox(&x,&y,&w,&h);
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::RawDrawFunc MUpdateArea BoundingBox <%d,%d,%d,%d>\n", x,y,w,h));
pev.rect = new nsRect(nsDmg.x, nsDmg.y, nsDmg.width, nsDmg.height);
// pev.rect = new nsRect(x,y,w,h);
//#endif
//#if 0
// call the event callback
if (pWin->mEventCallback)
{
@ -1093,7 +1140,9 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
NS_RELEASE(pev.renderingContext);
}
}
#else
#endif
#if 0
if (NS_OK == nsComponentManager::CreateInstance(kRenderingContextCID, nsnull, kRenderingContextIID, (void **)&pev.renderingContext))
{
@ -1109,12 +1158,6 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
NS_RELEASE(pev.renderingContext);
}
#endif
// Global_Widget_Hold_Count = PtRelease();
// PR_LOG(PhWidLog, PR_LOG_DEBUG,(" nsWindow::RawDrawFunc PtHold/PtRelease Global_Widget_Hold_Count=<%d> this=<%p>\n", Global_Widget_Hold_Count, pWin));
//Kirk took this out look at OnDrawSignal in GTK
//NS_RELEASE(pev.widget);
}
else
{
@ -1603,6 +1646,19 @@ NS_METHOD nsWindow::GetClientBounds( nsRect &aRect )
NS_METHOD nsWindow::Move(PRInt32 aX, PRInt32 aY)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWindow::Move (%p) to (%ld,%ld) mClipChildren=<%d> mClipSiblings=<%d> mBorderStyle=<%d> mWindowType=<%d>\n", this, aX, aY, mClipChildren, mClipSiblings, mBorderStyle, mWindowType));
return this->nsWidget::Move(aX, aY);
/* Call my base class */
nsresult res = nsWidget::Move(aX, aY);
/* If I am a top-level window my origin shoudl always be 0,0 */
if ( (mWindowType == eWindowType_dialog) ||
(mWindowType == eWindowType_popup) ||
(mWindowType == eWindowType_toplevel) )
{
printf("HACK HACK: forcing bounds to 0,0 for toplevel window\n");
mBounds.x = mBounds.y = 0;
}
return res;
}