Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup the widget api some. Move initialization of evil stuff to the gfx

Browse Source 
end.  Dont leak the widget name.  Carry around Display* and friends in the
appshell.


git-svn-id: svn://10.0.0.236/trunk@38469 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ramiro%netscape.com
1999-07-06 23:28:58 +00:00
parent 63ffe66470
commit b356f4a9fd
8 changed files with 172 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/widget/src/xlib/nsAppShell.cpp
View File

@@ -150,23 +150,7 @@ NS_METHOD nsAppShell::Create(int* argc, char ** argv)
}
// get the depth for this display
gDepth = gVisualInfo->depth;
// set up the color info for this display
// set up the masks
gRedMask = gVisualInfo->red_mask;
gGreenMask = gVisualInfo->green_mask;
gBlueMask = gVisualInfo->blue_mask;
gAlphaMask = 0;
// set up the number of bits in each
gRedCount = convertMaskToCount(gVisualInfo->red_mask);
gGreenCount = convertMaskToCount(gVisualInfo->green_mask);
gBlueCount = convertMaskToCount(gVisualInfo->blue_mask);
gAlphaCount = 0;
// set up the number of bits that you need to shift to get to
// a specific mask
gRedShift = getShiftForMask(gVisualInfo->red_mask);
gGreenShift = getShiftForMask(gVisualInfo->green_mask);
gBlueShift = getShiftForMask(gVisualInfo->blue_mask);
gAlphaShift = 0;
return NS_OK;
}
@@ -316,7 +300,7 @@ void
nsAppShell::DispatchEvent(XEvent *event)
{
nsWidget *widget;
widget = nsWidget::getWidgetForWindow(event->xany.window);
widget = nsWidget::GetWidgetForWindow(event->xany.window);
// switch on the type of event
switch (event->type) {
case Expose:
@@ -448,31 +432,3 @@ nsAppShell::HandleConfigureNotifyEvent(XEvent *event, nsWidget *aWidget)
NS_RELEASE(aWidget);
delete sevent.windowSize;
}
static PRUint8 convertMaskToCount(unsigned long val)
{
PRUint8 retval = 0;
PRUint8 cur_bit = 0;
// walk through the number, incrementing the value if
// the bit in question is set.
while (cur_bit < (sizeof(unsigned long) * 8)) {
if ((val >> cur_bit) & 0x1) {
retval++;
}
cur_bit++;
}
return retval;
}
static PRUint8 getShiftForMask(unsigned long val)
{
PRUint8 cur_bit = 0;
// walk through the number, looking for the first 1
while (cur_bit < (sizeof(unsigned long) * 8)) {
if ((val >> cur_bit) & 0x1) {
return cur_bit;
}
cur_bit++;
}
return cur_bit;
}