[Trainsched-commit] trainsched selectform.c, 1.2.2.1, 1.2.2.2 trainsched.c, 1.25.2.1, 1.25.2.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/trainsched/trainsched
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12728

Modified Files:
      Tag: PDB_VER2
	selectform.c trainsched.c 
Log Message:
Fix bug: PageUp / PageDown not working on all 5-way navigation rocker buttons.  Remove debug code (HostTrace).

Index: trainsched.c
===================================================================
RCS file: /cvsroot/trainsched/trainsched/trainsched.c,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -C2 -d -r1.25.2.1 -r1.25.2.2
*** trainsched.c	2 May 2009 16:21:08 -0000	1.25.2.1
--- trainsched.c	4 May 2009 17:28:36 -0000	1.25.2.2
***************
*** 87,91 ****
  }
  
! static Err StartApplication() 
  {
    RGBColorType customColors[2];
--- 87,91 ----
  }
  
! static Err StartApplication()
  {
    RGBColorType customColors[2];
***************
*** 161,166 ****
        DmDatabaseInfo(CardNo,pdbid,DBName,NULL,&dbVersion,NULL,NULL,NULL,
                        NULL,NULL,NULL,NULL,NULL);
- HostTraceOutputTL(0, "Version of current PDB: %hu", dbVersion);
- 
        FrmGotoForm(resFormMain);
      } else {
--- 161,164 ----
***************
*** 182,186 ****
  }
  
! static void StopApplication() 
  {
    prefType prefs;
--- 180,184 ----
  }
  
! static void StopApplication()
  {
    prefType prefs;
***************
*** 202,209 ****
  }
  
! Boolean MainFormEventHandler(EventPtr event) 
  {
    Boolean handled = false;
    Int16 val, min, max, page;
  
    switch (event->eType) {
--- 200,208 ----
  }
  
! Boolean MainFormEventHandler(EventPtr event)
  {
    Boolean handled = false;
    Int16 val, min, max, page;
+   WChar c;
  
    switch (event->eType) {
***************
*** 256,260 ****
      }
      break;
!    
    case sclRepeatEvent:
      ScrollValue = event->data.sclRepeat.newValue;
--- 255,259 ----
      }
      break;
! 
    case sclRepeatEvent:
      ScrollValue = event->data.sclRepeat.newValue;
***************
*** 263,274 ****
  
    case keyDownEvent:
!     /* Make the physical up/down button scroll the list */
!     if (event->data.keyDown.modifiers & commandKeyMask) { /* physical key */
!       if (event->data.keyDown.chr == chrPageUp) {
!         SclGetScrollBar(FrmGetObjectPtr(gpForm, 
                          FrmGetObjectIndex(gpForm, resTableScrollBar)),
                                            &val, &min, &max, &page);
          if ( val >= min ) {
!           if ((val - min) < page) 
              ScrollValue -= val - min;
            else
--- 262,273 ----
  
    case keyDownEvent:
!     c = event->data.keyDown.chr;
!     if (TxtGlueCharIsVirtual(event->data.keyDown.modifiers, c)) {
!       if ((c == vchrPageUp) || (c == vchrRockerUp)) {
!         SclGetScrollBar(FrmGetObjectPtr(gpForm,
                          FrmGetObjectIndex(gpForm, resTableScrollBar)),
                                            &val, &min, &max, &page);
          if ( val >= min ) {
!           if ((val - min) < page)
              ScrollValue -= val - min;
            else
***************
*** 277,281 ****
          }
          handled = true;
!       } else if (event->data.keyDown.chr == chrPageDown) {
          SclGetScrollBar(FrmGetObjectPtr(gpForm,
                          FrmGetObjectIndex(gpForm, resTableScrollBar)),
--- 276,280 ----
          }
          handled = true;
!       } else if ((c == vchrPageDown) || (c == vchrRockerDown)) {
          SclGetScrollBar(FrmGetObjectPtr(gpForm,
                          FrmGetObjectIndex(gpForm, resTableScrollBar)),
***************
*** 292,296 ****
      }
      break;
!     
    case ctlSelectEvent: {
        Int16 temp = 0;
--- 291,295 ----
      }
      break;
! 
    case ctlSelectEvent: {
        Int16 temp = 0;
***************
*** 300,304 ****
          FromStation = temp;
          LoadMainForm(gpForm);
!         LoadMainFormTable(gpForm);        
          handled=true;
        } else if (event->data.ctlSelect.controlID == resNotesBtn) {
--- 299,303 ----
          FromStation = temp;
          LoadMainForm(gpForm);
!         LoadMainFormTable(gpForm);
          handled=true;
        } else if (event->data.ctlSelect.controlID == resNotesBtn) {
***************
*** 316,323 ****
  }
  
! static Boolean ApplicationEventHandler(EventPtr event) 
  {
    Boolean handled = false;
!   
    switch (event->eType) {
      case frmLoadEvent: {
--- 315,322 ----
  }
  
! static Boolean ApplicationEventHandler(EventPtr event)
  {
    Boolean handled = false;
! 
    switch (event->eType) {
      case frmLoadEvent: {
***************
*** 366,370 ****
  }
  
! static void EventLoop() 
  {
    EventType event;
--- 365,369 ----
  }
  
! static void EventLoop()
  {
    EventType event;
***************
*** 384,392 ****
  }
  
! UInt32 PilotMain(UInt16 launchCode, MemPtr cmdPBP, UInt16 launchFlags) 
  {
    Err err = 0;
!   
! HostTraceInit();
    if (launchCode == sysAppLaunchCmdNormalLaunch) {
      if ((err = StartApplication()) == 0) {
--- 383,390 ----
  }
  
! UInt32 PilotMain(UInt16 launchCode, MemPtr cmdPBP, UInt16 launchFlags)
  {
    Err err = 0;
! 
    if (launchCode == sysAppLaunchCmdNormalLaunch) {
      if ((err = StartApplication()) == 0) {
***************
*** 395,399 ****
      }
    }
- HostTraceClose();
    return err;
  }
--- 393,396 ----
***************
*** 513,517 ****
    for (i=0; i<numRows;i++) {
      TblSetItemStyle(tableP, i, FROMCOL, customTableItem);
!     TblSetItemStyle(tableP, i, TOCOL, customTableItem); 
      TblSetItemInt(tableP,i,FROMCOL, -1 );
      TblSetItemInt(tableP,i,TOCOL, -1 );
--- 510,514 ----
    for (i=0; i<numRows;i++) {
      TblSetItemStyle(tableP, i, FROMCOL, customTableItem);
!     TblSetItemStyle(tableP, i, TOCOL, customTableItem);
      TblSetItemInt(tableP,i,FROMCOL, -1 );
      TblSetItemInt(tableP,i,TOCOL, -1 );
***************
*** 571,582 ****
  
      // Nothing displayed yet, so no scrolling required.
!     SclSetScrollBar(FrmGetObjectPtr(pForm, 
!                      FrmGetObjectIndex(pForm, 
!                      resTableScrollBar )), 
                       0,       /* current value */
                       0,       /* min */
                       0,       /* max */
                       1 );         /* page size */
!    
      return;
    }
--- 568,579 ----
  
      // Nothing displayed yet, so no scrolling required.
!     SclSetScrollBar(FrmGetObjectPtr(pForm,
!                      FrmGetObjectIndex(pForm,
!                      resTableScrollBar )),
                       0,       /* current value */
                       0,       /* min */
                       0,       /* max */
                       1 );         /* page size */
! 
      return;
    }
***************
*** 586,590 ****
      toStn = numstations - ToStation - 1;
      fromStn = numstations - FromStation - 1;
!     if (Day != (numdays-1)) 
        maxoffset = OffsetList[Day+numdays+1] - 1;
      else
--- 583,587 ----
      toStn = numstations - ToStation - 1;
      fromStn = numstations - FromStation - 1;
!     if (Day != (numdays-1))
        maxoffset = OffsetList[Day+numdays+1] - 1;
      else
***************
*** 609,613 ****
      ScrollMax++;
    }
!   
    ScrollMax = ScrollMax-(numRows);   // We always want to fill the screen if possible.
    if (ScrollMax < 0)
--- 606,610 ----
      ScrollMax++;
    }
! 
    ScrollMax = ScrollMax-(numRows);   // We always want to fill the screen if possible.
    if (ScrollMax < 0)
***************
*** 636,640 ****
        if(frTime != -1) n++;
        TblSetItemInt(tableP, i, FROMCOL, frTime);
!     
        toTime = getTime(pdbfd, k, toStn);
        if(toTime != -1) n++;
--- 633,637 ----
        if(frTime != -1) n++;
        TblSetItemInt(tableP, i, FROMCOL, frTime);
! 
        toTime = getTime(pdbfd, k, toStn);
        if(toTime != -1) n++;
***************
*** 646,650 ****
          TblSetItemInt(tableP, i, INFOCOL, getAbbrev(pdbfd, k, toStn));
        }
!       
        // The train must stop at both station to be shown.
        if (n==2) {
--- 643,647 ----
          TblSetItemInt(tableP, i, INFOCOL, getAbbrev(pdbfd, k, toStn));
        }
! 
        // The train must stop at both station to be shown.
        if (n==2) {
***************
*** 663,667 ****
        i++;
      }
!     
      k++;
    }
--- 660,664 ----
        i++;
      }
! 
      k++;
    }
***************
*** 683,689 ****
  
    /* Update the scroll bar */
!   SclSetScrollBar(FrmGetObjectPtr(pForm, 
!                   FrmGetObjectIndex(pForm, 
!                     resTableScrollBar )), 
                      ScrollValue,   /* current value */
                      0,             /* min */
--- 680,686 ----
  
    /* Update the scroll bar */
!   SclSetScrollBar(FrmGetObjectPtr(pForm,
!                   FrmGetObjectIndex(pForm,
!                     resTableScrollBar )),
                      ScrollValue,   /* current value */
                      0,             /* min */
***************
*** 711,715 ****
            StrCopy(str, Abbreviations[data-1]);
        else
!           StrCopy(str, ""); 
      }
      else
--- 708,712 ----
            StrCopy(str, Abbreviations[data-1]);
        else
!           StrCopy(str, "");
      }
      else
***************
*** 742,746 ****
    }
    /* Erase previous label */
!   rect = *bounds; 
    WinEraseRectangle( &rect, 0 );
  
--- 739,743 ----
    }
    /* Erase previous label */
!   rect = *bounds;
    WinEraseRectangle( &rect, 0 );
  

Index: selectform.c
===================================================================
RCS file: /cvsroot/trainsched/trainsched/selectform.c,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** selectform.c	2 May 2009 16:21:08 -0000	1.2.2.1
--- selectform.c	4 May 2009 17:28:36 -0000	1.2.2.2
***************
*** 44,47 ****
--- 44,48 ----
    TablePtr tableP;
    Int16 rowP, columnP;
+   WChar c;
    dbrowType *data;
    MemHandle TextH;
***************
*** 155,162 ****
            break;
        }
!     break;
      case keyDownEvent:
!       if (event->data.keyDown.modifiers & commandKeyMask) { /* physical key */
!         if (event->data.keyDown.chr == chrPageUp) {
            SclGetScrollBar(FrmGetObjectPtr(pForm, 
                            FrmGetObjectIndex(pForm, selectFrmTableScrollBar)),
--- 156,164 ----
            break;
        }
!       break;
      case keyDownEvent:
!       c = event->data.keyDown.chr;
!       if (TxtGlueCharIsVirtual(event->data.keyDown.modifiers, c)) {
!         if ((c == vchrPageUp) || (c == vchrRockerUp)) {
            SclGetScrollBar(FrmGetObjectPtr(pForm, 
                            FrmGetObjectIndex(pForm, selectFrmTableScrollBar)),
***************
*** 170,174 ****
            }
            handled = true;
!         } else if (event->data.keyDown.chr == chrPageDown) {
            SclGetScrollBar(FrmGetObjectPtr(pForm,
                            FrmGetObjectIndex(pForm, selectFrmTableScrollBar)),
--- 172,176 ----
            }
            handled = true;
!         } else if ((c == vchrPageDown) || (c == vchrRockerDown)) {
            SclGetScrollBar(FrmGetObjectPtr(pForm,
                            FrmGetObjectIndex(pForm, selectFrmTableScrollBar)),