ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/MacOSX/video_macosx.h
(Generate patch)

Comparing BasiliskII/src/MacOSX/video_macosx.h (file contents):
Revision 1.1 by nigel, 2002-03-16T04:00:32Z vs.
Revision 1.10 by gbeauche, 2005-01-30T21:42:13Z

# Line 3 | Line 3
3   *
4   *      $Id$
5   *
6 < *  Basilisk II (C) 1997-2001 Christian Bauer
6 > *  Basilisk II (C) 1997-2005 Christian Bauer
7   *
8   *  This program is free software; you can redistribute it and/or modify
9   *  it under the terms of the GNU General Public License as published by
# Line 23 | Line 23
23   #import <video.h>
24  
25   /* Set the strategy for drawing the bitmap in the Mac OS X window */
26 < //#define CGIMAGEREF            15.05fps
27 < //#define CGDRAWBITMAP          15.2fps
28 < #define NSBITMAP                        15.1fps
26 > //#define CGDRAWBITMAP
27 > #define CGIMAGEREF
28 > //#define NSBITMAP
29 >
30 > // Using Core Graphics is fastest when rendering 32bit data.
31 > // Using CGImageRefs allows us to use all the bitmaps that BasiliskII supports.
32 > // When both Basilisk II and OS X are set to 'Thousands', updating a 312x342
33 > // window happens at over 500fps under 10.2, and over 600fps on 10.3!
34 >
35 > /* When the BasiliskII video driver respects the alpha bits, set this to let us use */
36 > /* kCGImageAlphaPremultipliedFirst, and to have nice rounded corners on the screen. */
37 > //#define CG_USE_ALPHA
38 > /* At the moment, it writes in the full 32bits :-( */
39 >
40  
41   #define MIN_WIDTH       512
42 < #define MIN_HEIGHT      342
42 > #define MIN_HEIGHT      384
43 > #define MIN_HEIGHTC     342             // For classic emulation
44  
45   #define MAX_WIDTH       1240
46   #define MAX_HEIGHT      1024
# Line 46 | Line 58 | extern uint8   display_type,
58                                  frame_skip;
59   extern  uint16  init_width,
60                                  init_height,
61 <                                init_depth,
50 <                                screen_height;
61 >                                init_depth;
62  
52 extern  uint8   bits_from_depth         (const video_depth);
63   extern  bool    parse_screen_prefs      (const char *);
64   extern  void    resizeWinTo                     (const uint16, const uint16);
65  
# Line 58 | Line 68 | extern void    resizeWinTo                     (const uint16,
68  
69   extern  NSWindow                *the_win;
70   extern  EmulatorView    *output;
61
62 // These record changes we made in setting full screen mode
63 extern  CGDirectDisplayID       theDisplay;
64 extern  CFDictionaryRef         originalMode, newMode;
65
66 // Macro for checking if full screen mode has started
67 #define FULLSCREEN      ( theDisplay || originalMode || newMode )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines