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

Removed debug printf's #if 0 code + moved resize code 

from nsXtEventHandler.cpp nsWindow.cpp.
This commit is contained in:
kmcclusk%netscape.com 1998-08-10 22:37:46 +00:00
Родитель 232404cd73
Коммит 11e69778ed
3 изменённых файлов: 43 добавлений и 230 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1432,12 +1432,50 @@ PRUint32 nsWindow::GetYCoord(PRUint32 aNewY)
return(aNewY);
}
//
//-----------------------------------------------------
// Resize handler code for child and main windows.
//-----------------------------------------------------
//
void nsWindow_ResetResize_Callback(XtPointer call_data)
{
nsWindow* widgetWindow = (nsWindow*)call_data;
widgetWindow->SetResized(PR_FALSE);
}
void nsWindow_Refresh_Callback(XtPointer call_data)
{
nsWindow* widgetWindow = (nsWindow*)call_data;
nsRect bounds;
widgetWindow->GetResizeRect(&bounds);
nsSizeEvent event;
event.message = NS_SIZE;
event.widget = widgetWindow;
event.time = 0; //TBD
event.windowSize = &bounds;
widgetWindow->SetBounds(bounds);
widgetWindow->OnResize(event);
nsPaintEvent pevent;
pevent.message = NS_PAINT;
pevent.widget = widgetWindow;
pevent.time = 0;
pevent.rect = (nsRect *)&bounds;
widgetWindow->OnPaint(pevent);
XtAppAddTimeOut(gAppContext, 50, (XtTimerCallbackProc)nsWindow_ResetResize_Callback, widgetWindow);
}
//
// Resize a child window widget. All nsManageWidget's use
// this to resize. The nsManageWidget passes all resize
// request's directly to this function.
extern "C" void ResizeWidget(Widget w)
extern "C" void nsWindow_ResizeWidget(Widget w)
{
int width = 0;
int height = 0;
@ -1457,14 +1495,14 @@ extern "C" void ResizeWidget(Widget w)
if (! win->GetResized()) {
if (win->IsChild()) {
// Call refresh directly. Don't filter resize events.
nsXtWidget_Refresh_Callback(win);
nsWindow_Refresh_Callback(win);
}
else {
// KLUDGE: Do actual resize later. This lets most
// of the resize events come through before actually
// resizing. This is only needed for main (shell)
// windows.
XtAppAddTimeOut(gAppContext, 250, (XtTimerCallbackProc)nsXtWidget_Refresh_Callback, win);
XtAppAddTimeOut(gAppContext, 250, (XtTimerCallbackProc)nsWindow_Refresh_Callback, win);
}
}

225
widget/src/motif/nsXtEventHandler.cpp
Просмотреть файл

@ -281,74 +281,9 @@ void nsXtWidget_ExposureMask_EventHandler(Widget w, XtPointer p, XEvent * event,
//fe_expose_eh(drawing_area, (XtPointer)context, &xev);
}
#if 0
int count = 0;
while (XPeekEvent(XtDisplay(w), &xev))
{
if ((xev.type == Expose || xev.type == GraphicsExpose || xev.type == 14) &&
(xev.xexpose.window == XtWindow(w))) {
XNextEvent(XtDisplay(w), &xev);
count++;
} else {
// if (DBG)
printf("Ate %d events\n", count);
break;
}
}
#endif
if (DBG) printf("Calling OnPaint (%d %d %d %d)\n", rect.x, rect.y, rect.width, rect.height);
widgetWindow->OnPaint(pevent);
#if 0
nsPaintEvent pevent;
nsRect rect;
nsXtWidget_InitNSEvent(event, p, pevent, NS_PAINT);
pevent.rect = (nsRect *)▭
printf("Count %d\n", event->xexpose.count);
if (event->xexpose.count != 0)
return ;
/* Only post Expose/Repaint if we know others arn't following
* directly in the queue.
*/
if (event->xexpose.count == 0) {
Boolean debug = PR_TRUE;
int count = 0;
CollapseInfo cinfo;
cinfo.win = XtWindow(w);
cinfo.r = pevent.rect;
rect.x = event->xexpose.x;
rect.y = event->xexpose.y;
rect.width = event->xexpose.width;
rect.height = event->xexpose.height;
printf("Before %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height);
/* Do a little more inspecting and collapse further if there
* are additional expose events pending on this window where
* the damage rects intersect with the current exposeRect.
*/
while (1) {
XEvent xev;
if (XCheckIfEvent(XtDisplay(w), &xev, checkForExpose, (XtPointer)&cinfo)) {
printf("]]]]]]]]]]]]]]]]]]]]]]]]]]]]]\n");
count = xev.xexpose.count;
expandDamageRect(&rect, &xev, debug, "2");
} else /* XCheckIfEvent Failed. */
break;
}
printf("After %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height);
}
widgetWindow->OnPaint(pevent);
if (DBG) fprintf(stderr, "Out nsXtWidget_ExposureMask_EventHandler\n");
#endif
}
//==============================================================
@ -586,45 +521,7 @@ void nsXtWidget_Expose_Callback(Widget w, XtPointer p, XtPointer call_data)
nsXtWidget_InitNSEvent(event, p, pevent, NS_PAINT);
pevent.rect = (nsRect *)▭
#if 0
printf("Count %d\n", event->xexpose.count);
if (event->xexpose.count != 0)
return ;
/* Only post Expose/Repaint if we know others arn't following
* directly in the queue.
*/
if (event->xexpose.count == 0) {
Boolean debug = PR_TRUE;
int count = 0;
CollapseInfo cinfo;
cinfo.win = XtWindow(w);
cinfo.r = pevent.rect;
rect.x = event->xexpose.x;
rect.y = event->xexpose.y;
rect.width = event->xexpose.width;
rect.height = event->xexpose.height;
printf("Before %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height);
/* Do a little more inspecting and collapse further if there
* are additional expose events pending on this window where
* the damage rects intersect with the current exposeRect.
*/
while (1) {
XEvent xev;
if (XCheckIfEvent(XtDisplay(w), &xev, checkForExpose, (XtPointer)&cinfo)) {
printf("]]]]]]]]]]]]]]]]]]]]]]]]]]]]]\n");
count = xev.xexpose.count;
expandDamageRect(&rect, &xev, debug, "2");
} else /* XCheckIfEvent Failed. */
break;
}
printf("After %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height);
}
#endif
widgetWindow->OnPaint(pevent);
if (DBG) fprintf(stderr, "Out nsXtWidget_ExposureMask_EventHandler\n");
@ -635,101 +532,6 @@ printf("After %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height);
//==============================================================
void nsXtWidget_Resize_Callback(Widget w, XtPointer p, XtPointer call_data)
{
printf("XXXXXXX RESIZE CALLBACK\n");
//if (DBG)
//fprintf(stderr, "In nsXtWidget_Resize_Callback 0x%x", p);
nsWindow * widgetWindow = (nsWindow *) p ;
if (widgetWindow == nsnull) {
return;
}
XmDrawingAreaCallbackStruct * cbs = (XmDrawingAreaCallbackStruct *)call_data;
//fprintf(stderr, " %s ** %s\n", widgetWindow->gInstanceClassName,
//cbs->reason == XmCR_RESIZE?"XmCR_RESIZE":"XmCR_EXPOSE");
/*XEvent * xev = cbs->event;
if (xev != nsnull) {
//printf("Width %d Height %d\n", xev->xresizerequest.width,
//xev->xresizerequest.height);
} else {
//printf("Jumping out ##################################\n");
//return;
}*/
/*if (cbs->reason == XmCR_EXPOSE && widgetWindow->IgnoreResize()) {
cbs->reason = XmCR_RESIZE;
widgetWindow->SetIgnoreResize(PR_FALSE);
printf("Got Expose doing resize!\n");
} else if (widgetWindow->IgnoreResize() ||
(!widgetWindow->IgnoreResize() && cbs->reason == XmCR_RESIZE)) {
printf("Skipping resize!\n");
widgetWindow->SetIgnoreResize(PR_TRUE);
return;
}*/
if (cbs->reason == XmCR_RESIZE) {
nsSizeEvent event;
nsRect rect;
event.message = NS_SIZE;
event.widget = (nsWindow *) p;
if (cbs->event != NULL) {
event.point.x = cbs->event->xbutton.x;
event.point.y = cbs->event->xbutton.y;
}
event.time = 0; //TBD
event.windowSize = (nsRect *)▭
widgetWindow->GetBounds(rect);
Window win = nsnull;
if (widgetWindow) {
win = XtWindow(w);
}
if (widgetWindow && win) {
XWindowAttributes attrs ;
Display * d = XtDisplay(w);
XGetWindowAttributes(d, win, &attrs);
PRBool doResize = PR_FALSE;
if (attrs.width > 0 &&
rect.width != attrs.width) {
rect.width = attrs.width;
doResize = PR_TRUE;
}
if (attrs.height > 0 &&
rect.height != attrs.height) {
rect.height = attrs.height;
doResize = PR_TRUE;
}
//printf("doResize %s %d %d %d %d rect %d %d\n", (doResize ?"true":"false"),
//attrs.x, attrs.y, attrs.width, attrs.height, rect.width, rect.height);
// NOTE: THIS May not be needed when embedded in chrome
if (! widgetWindow->GetResized()) {
//printf("Adding timeout for %d\n", widgetWindow);
XtAppAddTimeOut(gAppContext, 250, (XtTimerCallbackProc)nsXtWidget_Refresh_Callback, widgetWindow);
}
widgetWindow->SetResizeRect(rect);
// widgetWindow->SetBounds(rect);
widgetWindow->SetResized(PR_TRUE);
#if 0
//doResize = PR_TRUE;
if (doResize) {
//printf("??????????????????????????????? Doing Resize\n");
widgetWindow->SetBounds(rect); // This needs to be done inside OnResize
widgetWindow->OnResize(event);
}
#endif
}
}
}
//==============================================================
@ -846,30 +648,3 @@ void nsXtWidget_ResetResize_Callback(XtPointer call_data)
widgetWindow->SetResized(PR_FALSE);
}
void nsXtWidget_Refresh_Callback(XtPointer call_data)
{
nsWindow* widgetWindow = (nsWindow*)call_data;
nsRect bounds;
widgetWindow->GetResizeRect(&bounds);
nsSizeEvent event;
event.message = NS_SIZE;
event.widget = widgetWindow;
event.time = 0; //TBD
event.windowSize = &bounds;
widgetWindow->SetBounds(bounds);
printf("this %d REFRESH w %d h %d\n",widgetWindow,bounds.width, bounds.height);
widgetWindow->OnResize(event);
// widgetWindow->SetResized(PR_FALSE);
nsPaintEvent pevent;
pevent.message = NS_PAINT;
pevent.widget = widgetWindow;
pevent.time = 0;
pevent.rect = (nsRect *)&bounds;
widgetWindow->OnPaint(pevent);
XtAppAddTimeOut(gAppContext, 50, (XtTimerCallbackProc)nsXtWidget_ResetResize_Callback, widgetWindow);
}

4
widget/src/motif/nsXtManageWidget.c
Просмотреть файл

@ -43,7 +43,7 @@ static void
ChangeManaged(Widget w);
extern void ResizeWidget(Widget w);
extern void nsWindow_ResizeWidget(Widget w);
NewManageClassRec newManageClassRec =
@ -69,7 +69,7 @@ NewManageClassRec newManageClassRec =
/* compress_enterleave*/ TRUE,
/* visible_interest */ FALSE,
/* destroy */ NULL,
/* resize */ ResizeWidget,
/* resize */ nsWindow_ResizeWidget,
/* expose */ XtInheritExpose /* (XtExposeProc) Redisplay */,
/* set_values */ NULL /* (XtSetValuesFunc )SetValues */,
/* set values hook */ NULL,