Update of /cvsroot/squeak/squeak/platforms/unix/vm-display-Quartz
In directory sc8-pr-cvs1:/tmp/cvs-serv32184
Modified Files:
sqUnixQuartz.m
Log Message:
Correct modifier behaviour for mouse scroll wheel.
Disable remaining debug messages.
Index: sqUnixQuartz.m
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm-display-Quartz/sqUnixQuartz.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sqUnixQuartz.m 1 Sep 2003 08:11:14 -0000 1.7
--- sqUnixQuartz.m 3 Sep 2003 18:12:22 -0000 1.8
***************
*** 36,40 ****
* directory `platforms/unix/doc' before proceeding with any such use.
*
! * Last edited: 2003-08-31 19:40:14 by piumarta on emilia.inria.fr
*/
--- 36,40 ----
* directory `platforms/unix/doc' before proceeding with any such use.
*
! * Last edited: 2003-09-02 15:34:38 by piumarta on emilia.inria.fr
*/
***************
*** 819,823 ****
pixBase= 0;
}
! printf("pixBase %p, width %d, height %d, depth %d, pitch %d\n", pixBase, pixWidth, pixHeight, pixDepth, pixPitch);
return pixBase;
}
--- 819,824 ----
pixBase= 0;
}
! dprintf(("pixBase %p, width %d, height %d, depth %d, pitch %d\n",
! pixBase, pixWidth, pixHeight, pixDepth, pixPitch));
return pixBase;
}
***************
*** 838,842 ****
|| (![view lockFocusIfCanDraw]))
{
! printf("ioShowDisplay squashed\n");
return 0;
}
--- 839,843 ----
|| (![view lockFocusIfCanDraw]))
{
! dprintf(("ioShowDisplay squashed\n"));
return 0;
}
***************
*** 1167,1170 ****
--- 1168,1172 ----
}
# undef try
+ # if defined(DEBUG_APP)
{
CPSProcessInfoRec info;
***************
*** 1198,1201 ****
--- 1200,1204 ----
printf("\n");
}
+ #endif
}
***************
*** 1238,1242 ****
dpyPitch = CGDisplayBytesPerRow(dpy);
! printf("display is %dx%dx%d at %p pitch %d\n", dpyWidth, dpyHeight, dpyDepth, dpyPixels, dpyPitch);
}
--- 1241,1245 ----
dpyPitch = CGDisplayBytesPerRow(dpy);
! dprintf(("display is %dx%dx%d at %p pitch %d\n", dpyWidth, dpyHeight, dpyDepth, dpyPixels, dpyPitch));
}
***************
*** 1443,1447 ****
SqueakWindow *old;
! printf("ioSetFullScreen(%d)\n", flag);
if (headless || (fullscreen == flag))
--- 1446,1450 ----
SqueakWindow *old;
! dprintf(("ioSetFullScreen(%d)\n", flag));
if (headless || (fullscreen == flag))
***************
*** 1466,1470 ****
static int originalWindowSize= (800 << 16) | 600;
! printf("ioSetFullScreen(%d)\n", flag);
if (headless || (fullscreen == flag) || glActive)
--- 1469,1473 ----
static int originalWindowSize= (800 << 16) | 600;
! dprintf(("ioSetFullScreen(%d)\n", flag));
if (headless || (fullscreen == flag) || glActive)
***************
*** 1883,1890 ****
case NSScrollWheel:
{
! int keyCode= ([event deltaY] >= 0.0) ? 30 : 31;
! noteKeyboardEvent(keyCode, EventKeyDown, modifierState);
! noteKeyboardEvent(keyCode, EventKeyChar, modifierState);
! noteKeyboardEvent(keyCode, EventKeyUp, modifierState);
}
break;
--- 1886,1896 ----
case NSScrollWheel:
{
! int keyCode, modifiers;
! keyCode= ([event deltaY] >= 0.0) ? 30 : 31;
! modifierState= qz2sqModifiers([event modifierFlags]);
! modifiers= modifierState ^ CtrlKeyBit;
! noteKeyboardEvent(keyCode, EventKeyDown, modifiers);
! noteKeyboardEvent(keyCode, EventKeyChar, modifiers);
! noteKeyboardEvent(keyCode, EventKeyUp, modifiers);
}
break;
|
