Changeset 83 for trunk/dll/newview.c

Timestamp:

May 21, 2004, 5:10:42 PM (21 years ago)

Author:

root

Message:

Correct WM_VSCROLL math

File:

• trunk/dll/newview.c (modified) (24 diffs)

trunk/dll/newview.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  New internal viewer
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2001, 2003 Steven H.Levine
+
+  Revisions     01 Dec 03 SHL - Comments
+                02 Dec 03 SHL - Correct WM_VSCROLL math
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
@@ -98 +113 @@
 
 
-MRESULT EXPENTRY UrlDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY UrlDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   URLDATA *urld;
 
@@ -231 +246 @@
 
 
-static ULONG NumLines (RECTL *rcl,VIEWDATA *ad) {
-
+static ULONG NumLines (RECTL *rcl,VIEWDATA *ad)
+{
   ULONG numlines;
 
@@ -244 +259 @@
 
 
-static CHAR **BuildAList (HWND hwnd) {
-
+static CHAR **BuildAList (HWND hwnd)
+{
   VIEWDATA      *ad = WinQueryWindowPtr(hwnd,0);
   register ULONG x,y,z = 0;
@@ -325 +340 @@
 
 
-static CHAR **BuildAList2 (HWND hwnd) {
-
+static CHAR **BuildAList2 (HWND hwnd)
+{
   VIEWDATA      *ad = WinQueryWindowPtr(hwnd,0);
   CHAR         **list = NULL,s[SEARCHSTRINGLEN];
@@ -351 +366 @@
 
 
-MRESULT EXPENTRY ViewStatusProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ViewStatusProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_CREATE:
@@ -531 +546 @@
 
 
-static VOID FreeViewerMem (HWND hwnd) {
-
+static VOID FreeViewerMem (HWND hwnd)
+{
   VIEWDATA *ad = WinQueryWindowPtr(hwnd,0);
 
@@ -551 +566 @@
 
 
-static HPS InitWindow (HWND hwnd) {
-
+static HPS InitWindow (HWND hwnd)
+{
   VIEWDATA     *ad = WinQueryWindowPtr(hwnd,0);
   HPS          hps = (HPS)0;
@@ -609 +624 @@
 
 static VOID PaintLine (HWND hwnd,HPS hps,ULONG whichline,ULONG topline,
-                       RECTL *Rectl) {
-
+                       RECTL *Rectl)
+{
   VIEWDATA       *ad = WinQueryWindowPtr(hwnd,0);
   POINTL          ptl;
@@ -799 +814 @@
 
 
-static VOID Search (VOID *args) {
-
+static VOID Search (VOID *args)
+{
   HWND           hwnd = (HWND)args;
   HAB            hab2;
@@ -952 +967 @@
 
 
-static VOID Clipboard (VOID *args) {
-
+static VOID Clipboard (VOID *args)
+{
   HWND hwnd = (HWND)args;
   HAB       hab2;
@@ -1050 +1065 @@
 
 
-static VOID ReLine (VOID *args) {
-
+static VOID ReLine (VOID *args)
+{
   HWND hwnd = (HWND)args;
   HAB       hab2;
@@ -1225 +1240 @@
 
 
-static VOID LoadFile (VOID *args) {
-
+static VOID LoadFile (VOID *args)
+{
   HWND      hwnd = (HWND)args;
   HAB       hab2;
@@ -1335 +1350 @@
 
 
-MRESULT EXPENTRY ViewFrameWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ViewFrameWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,0);
 
@@ -1498 +1513 @@
 
 
-MRESULT EXPENTRY FindStrDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY FindStrDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   VIEWDATA *ad;
 
@@ -1601 +1616 @@
 
 
-MRESULT EXPENTRY ViewWndProc (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) {
-
+MRESULT EXPENTRY ViewWndProc (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
   VIEWDATA *ad = WinQueryWindowPtr(hwnd,0);
 
@@ -2760 +2775 @@
                 ad->topline -= numlines;
                 if(ad->topline > ad->numlines ||
-                   ad->topline > (ad->numlines + 1) - numlines)
+                   ad->topline + numlines > (ad->numlines + 1))
                   ad->topline = 1;
                 if(ad->cursored > ad->topline + numlines)
@@ -2770 +2785 @@
               break;
             case SB_PAGEDOWN:
-              if(ad->topline <= ad->numlines - numlines) {
+              if(ad->topline + numlines <= ad->numlines) {
                 ad->topline += numlines;
-                if(ad->topline > (ad->numlines + 1) - numlines)
+                if (ad->topline + numlines > ad->numlines + 1)
                   ad->topline = (ad->numlines + 1) - numlines;
                 if(ad->cursored < ad->topline)
                   ad->cursored = ad->topline;
-                if(ad->cursored > (ad->topline + numlines) - 1)
+                if (ad->cursored + 1 > ad->topline + numlines)
                   ad->cursored = (ad->topline + numlines) - 1;
                 if(ad->cursored > ad->numlines)
@@ -2784 +2799 @@
               break;
             case SB_LINEDOWN:
-              if(ad->topline <= ad->numlines - numlines) {
+              if (ad->topline + numlines <= ad->numlines) {
 
                 RECTL Rectl,iRectl;
@@ -2791 +2806 @@
                 if(ad->cursored < ad->topline)
                   ad->cursored = ad->topline;
-                else if(ad->cursored > (ad->topline + numlines) - 1)
+                else if (ad->cursored + 1 > ad->topline + numlines)
                   ad->cursored = (ad->topline + numlines) - 1;
                 if(ad->cursored > ad->numlines)
@@ -2829 +2844 @@
                 if(ad->cursored < ad->topline)
                   ad->cursored = ad->topline;
-                else if(ad->cursored > (ad->topline + numlines) - 1)
+                else if (ad->cursored + 1 > ad->topline + numlines)
                   ad->cursored = (ad->topline + numlines) - 1;
                 if(ad->cursored > ad->numlines)
@@ -2867 +2882 @@
                  (SHORT1FROMMP(mp2)) <= ad->numlines) {
                 ad->topline = (ULONG)SHORT1FROMMP(mp2) * ad->multiplier;
-                if(ad->topline > (ad->numlines + 1) - numlines)
+                if (ad->topline + numlines > ad->numlines + 1)
                   ad->topline = (ad->numlines + 1) - numlines;
                 if(!ad->topline)
@@ -3881 +3896 @@
 
 HWND StartViewer (HWND hwndParent,USHORT flags,CHAR *filename,
-                  HWND hwndRestore) {
-
+                  HWND hwndRestore)
+{
   HWND          hwndFrame = (HWND)0,hwndClient;
   VIEWDATA     *ad;
@@ -4037 +4052 @@
   return hwndFrame;
 }
-