[Vm-dev] [commit][3710] JMM fix compile problem with
sqSqueakOSXOpenGLView. m using 32bit compiler
commits at squeakvm.org
commits at squeakvm.org
Wed May 11 17:26:48 UTC 2016
Revision: 3710
Author: johnmci
Date: 2016-05-11 10:26:46 -0700 (Wed, 11 May 2016)
Log Message:
-----------
JMM fix compile problem with sqSqueakOSXOpenGLView.m using 32bit compiler
Modified Paths:
--------------
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h 2016-05-10 18:35:52 UTC (rev 3709)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h 2016-05-11 17:26:46 UTC (rev 3710)
@@ -60,6 +60,9 @@
unsigned int* colorMap32;
BOOL clippyIsEmpty;
CGRect clippy;
+ NSRect lastFrameSize;
+ BOOL fullScreenInProgress;
+ void* fullScreendispBitsIndex;
}
@property (nonatomic,assign) NSTrackingRectTag squeakTrackingRectForCursor;
@property (nonatomic,strong) keyBoardStrokeDetails* lastSeenKeyBoardStrokeDetails;
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-10 18:35:52 UTC (rev 3709)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-11 17:26:46 UTC (rev 3710)
@@ -70,7 +70,7 @@
@implementation sqSqueakOSXOpenGLView
@synthesize squeakTrackingRectForCursor,lastSeenKeyBoardStrokeDetails,
-lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,fullScreenInProgress,fullScreendispBitsIndex;
+lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,lastFrameSize,fullScreenInProgress,fullScreendispBitsIndex;
+ (NSOpenGLPixelFormat *)defaultPixelFormat {
NSOpenGLPixelFormatAttribute attrs[] =
@@ -245,9 +245,9 @@
NSRect r = self.frame;
- if (!NSEqualRects(_lastFrameSize,r)) {
- //NSLog(@"old %f %f %f %f new %f %f %f %f",_lastFrameSize.origin.x,_lastFrameSize.origin.y,_lastFrameSize.size.width,_lastFrameSize.size.height,self.frame.origin.x,r.origin.y,r.size.width,r.size.height);
- _lastFrameSize = r;
+ if (!NSEqualRects(lastFrameSize,r)) {
+ //NSLog(@"old %f %f %f %f new %f %f %f %f",lastFrameSize.origin.x,lastFrameSize.origin.y,lastFrameSize.size.width,lastFrameSize.size.height,self.frame.origin.x,r.origin.y,r.size.width,r.size.height);
+ lastFrameSize = r;
glPixelStorei( GL_UNPACK_ROW_LENGTH, r.size.width );
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
More information about the Vm-dev
mailing list