Diff for /np2/macosx/sysmng.cpp between versions 1.7 and 1.10

version 1.7, 2003/11/08 17:54:26 version 1.10, 2003/12/08 00:55:33
Line 1 Line 1
 #include        "compiler.h"  #include        "compiler.h"
 #include        "np2.h"  #include        "np2.h"
 #include        "dosio.h"  #include        "dosio.h"
 #include        "i286.h"  
 #include        "sysmng.h"  #include        "sysmng.h"
   #include        "cpucore.h"
 #include        "pccore.h"  #include        "pccore.h"
 #include        "fddfile.h"  #include        "fddfile.h"
 #include        "diskdrv.h"  #include        "diskdrv.h"
Line 24  static struct { Line 24  static struct {
 void sysmng_workclockreset(void) {  void sysmng_workclockreset(void) {
   
         workclock.tick = GETTICK();          workclock.tick = GETTICK();
         workclock.clock = I286_CLOCK;          workclock.clock = CPU_CLOCK;
         workclock.draws = drawcount;          workclock.draws = drawcount;
 }  }
   
Line 39  BOOL sysmng_workclockrenewal(void) { Line 39  BOOL sysmng_workclockrenewal(void) {
         workclock.tick += tick;          workclock.tick += tick;
         workclock.fps = ((drawcount - workclock.draws) * 10000) / tick;          workclock.fps = ((drawcount - workclock.draws) * 10000) / tick;
         workclock.draws = drawcount;          workclock.draws = drawcount;
         workclock.khz = (I286_CLOCK - workclock.clock) / tick;          workclock.khz = (CPU_CLOCK - workclock.clock) / tick;
         workclock.clock = I286_CLOCK;          workclock.clock = CPU_CLOCK;
         return(TRUE);          return(TRUE);
 }  }
   
Line 96  void sysmng_updatecaption(BYTE flag) { Line 96  void sysmng_updatecaption(BYTE flag) {
                 }                  }
         }          }
 #if defined(NP2GCC)  #if defined(NP2GCC)
         milstr_ncpy(work, "Neko Project IIx", sizeof(work));          milstr_ncpy(work, np2oscfg.titles, sizeof(work));
 #else  #else
         milstr_ncpy(work, "Neko Project II", sizeof(work));          milstr_ncpy(work, "Neko Project II", sizeof(work));
 #endif  #endif
Line 104  void sysmng_updatecaption(BYTE flag) { Line 104  void sysmng_updatecaption(BYTE flag) {
         milstr_ncat(work, strclock, sizeof(work));          milstr_ncat(work, strclock, sizeof(work));
   
 #if defined(NP2GCC)  #if defined(NP2GCC)
     SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, work, kCFStringEncodingUTF8));      SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, work, CFStringGetSystemEncoding()));
 #else  #else
         mkstr255(str, work);          mkstr255(str, work);
         SetWTitle(hWndMain, str);          SetWTitle(hWndMain, str);

Removed from v.1.7  
changed lines
  Added in v.1.10


RetroPC.NET-CVS <cvs@retropc.net>