page up and page down

pages that move and reflow
next comes the gaffaw

widget/src/xlib/nsScrollBar.cpp

@@ -145,7 +145,18 @@ NS_METHOD nsScrollbar::SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
 PRBool nsScrollbar::OnScroll(PRUint32 scrollCode, int cPos)
 {
   printf("nsScrollbar::OnScroll\n");
-  return PR_FALSE;
+  PRBool result = PR_FALSE;
+  switch (scrollCode) {
+  case NS_SCROLLBAR_PAGE_NEXT:
+    result = NextPage();
+    break;
+  case NS_SCROLLBAR_PAGE_PREV:
+    result = PrevPage();
+    break;
+  default:
+    break;
+  }
+  return result;
 }
 
 PRBool nsScrollbar::OnResize(nsSizeEvent &event)
@@ -163,6 +174,29 @@ PRBool nsScrollbar::DispatchMouseEvent(nsMouseEvent &aEvent)
 {
   PRBool result;
   printf("nsScrollbar::DispatchMouseEvent\n");
+  // check to see if this was on the main window.
+  switch (aEvent.message) {
+  case NS_MOUSE_LEFT_BUTTON_DOWN:
+    if (mIsVertical == PR_TRUE) {
+      if (aEvent.point.y < mBarBounds.y) {
+        OnScroll(NS_SCROLLBAR_PAGE_PREV, 0);
+      }
+      else if (aEvent.point.y > mBarBounds.height) {
+        OnScroll(NS_SCROLLBAR_PAGE_NEXT, 0);
+      }
+    }
+    else {
+      if (aEvent.point.x < mBarBounds.x) {
+        OnScroll(NS_SCROLLBAR_PAGE_PREV, 0);
+      }
+      else if (aEvent.point.x > mBarBounds.width) {
+        OnScroll(NS_SCROLLBAR_PAGE_NEXT, 0);
+      }
+    }
+    break;
+  default:
+    break;
+  }
   result = PR_FALSE;
   return result;
 }
@@ -177,7 +211,7 @@ void nsScrollbar::CreateNative(Window aParent, nsRect aRect)
   // be discarded...
   attr.bit_gravity = SouthEastGravity;
   // make sure that we listen for events
-  attr.event_mask = StructureNotifyMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
+  attr.event_mask = StructureNotifyMask | ButtonPressMask | ButtonReleaseMask;
   // set the default background color and border to that awful gray
   attr.background_pixel = bg_pixel;
   attr.border_pixel = border_pixel;
@@ -192,6 +226,7 @@ void nsScrollbar::CreateNative(Window aParent, nsRect aRect)
   CreateNativeWindow(aParent, mBounds, attr, attr_mask);
   CreateGC();
   // set up the scrolling bar.
+  attr.event_mask = Button1MotionMask | ButtonPressMask | ButtonReleaseMask;
   attr.background_pixel = xlib_rgb_xpixel_from_rgb(NS_RGB(192,192,192));
   attr.border_pixel = xlib_rgb_xpixel_from_rgb(NS_RGB(100,100,100));
   // set up the size
@@ -242,6 +277,64 @@ NS_IMETHODIMP nsScrollbar::Resize(PRUint32 aX,
   return NS_OK;
 }
 
+nsresult nsScrollbar::NextPage(void)
+{
+  PRUint32 max;
+  nsresult result = PR_FALSE;
+
+  // change it locally.
+  max = mMaxRange - mThumbSize;
+  mPosition += mThumbSize;
+  if (mPosition > max)
+    mPosition = max;
+  
+  // send the event
+  if (mEventCallback) {
+    nsScrollbarEvent sevent;
+    sevent.message = NS_SCROLLBAR_POS;
+    sevent.widget = (nsWidget *)this;
+    sevent.eventStructType = NS_SCROLLBAR_EVENT;
+    sevent.position = (mPosition);
+    // send the event
+    result = ConvertStatus((*mEventCallback) (&sevent));
+    // the gtk code indicates that the callback can
+    // modify the position.  how odd.
+    mPosition = sevent.position;
+  }
+  CalcBarBounds();
+  LayoutBar();
+  return result;
+}
+
+nsresult nsScrollbar::PrevPage(void)
+{
+  nsresult result = PR_FALSE;
+  // check to make sure we don't go backwards
+  if (mThumbSize > mPosition) {
+    mPosition = 0;
+  }
+  else {
+    mPosition -= mThumbSize;
+  }
+  
+  // send the event
+  if (mEventCallback) {
+    nsScrollbarEvent sevent;
+    sevent.message = NS_SCROLLBAR_POS;
+    sevent.widget = (nsWidget *)this;
+    sevent.eventStructType = NS_SCROLLBAR_EVENT;
+    sevent.position = (mPosition);
+    // send the event
+    result = ConvertStatus((*mEventCallback) (&sevent));
+    // the gtk code indicates that the callback can
+    // modify the position.  how odd.
+    mPosition = sevent.position;
+  }
+  CalcBarBounds();
+  LayoutBar();
+  return result;
+}
+
 void nsScrollbar::CalcBarBounds(void)
 {
   float bar_start;

widget/src/xlib/nsScrollBar.h

@@ -66,6 +66,8 @@ public:
 private:
   void                 CalcBarBounds(void);
   void                 LayoutBar(void);
+  nsresult             NextPage(void);
+  nsresult             PrevPage(void);
   PRUint32             mMaxRange;
   PRUint32             mPosition;
   PRUint32             mThumbSize;

widget/src/xlib/nsWindow.cpp

@@ -125,6 +125,16 @@ NS_IMETHODIMP nsWindow::Update()
   return NS_OK;
 }
 
+NS_IMETHODIMP nsWindow::Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect)
+{
+  printf("nsWindow::Scroll()\n");
+  if (aClipRect)
+    Invalidate(*aClipRect, PR_TRUE);
+  else 
+    Invalidate(PR_TRUE);
+  return NS_OK;
+}
+
 ChildWindow::ChildWindow(): nsWindow()
 {
   name = "nsChildWindow";

widget/src/xlib/nsWindow.h

@@ -29,6 +29,7 @@ class nsWindow : public nsWidget
   NS_IMETHOD Invalidate(PRBool aIsSynchronous);
   NS_IMETHOD Invalidate(const nsRect & aRect, PRBool aIsSynchronous);
   NS_IMETHOD Update();
+  NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect);
 protected:
   void DestroyNative(void);
   void CreateNative(Window aParent, nsRect aRect);