1fe3143e4c
The swcursor used a 32x32 image for saving/restoring screen contents for no reason. Add a doflush argument to swcursorhide(), so that disabling software cursor with a double buffered softscreen is properly hidden. The doflush parameter should be set to 0 in all other cases as swcursordraw() will flushes both (current and previours) locations. Make sure swcursorinit() and swcursorhide() clear the visibility flag, even when gscreen is nil. Remove the cursor locking and just do everything within the drawlock. All cursor functions such as curson(), cursoff() and setcursor() will be called drawlock locked. This also means &cursor can be read. Fix devmouse cursor reads and writes. We now have the global cursor variable that is only modified under the drawlock. So copy under drawlock. Move the pc software cursor implementation into vgasoft driver, so screen.c does not need to handle it as a special case. Remove unused functions such as drawhasclients().
97 lines
2.3 KiB
C
97 lines
2.3 KiB
C
typedef struct Cursor Cursor;
|
|
typedef struct OScreen OScreen;
|
|
typedef struct Omap3fb Omap3fb;
|
|
typedef struct Settings Settings;
|
|
|
|
/* devmouse.c */
|
|
extern Cursor cursor;
|
|
extern void mousetrack(int, int, int, ulong);
|
|
extern void absmousetrack(int, int, int, ulong);
|
|
extern Point mousexy(void);
|
|
|
|
extern void mouseaccelerate(int);
|
|
extern void mouseresize(void);
|
|
extern void mouseredraw(void);
|
|
|
|
/* screen.c */
|
|
extern Memdata* attachscreen(Rectangle*, ulong*, int*, int*, int*);
|
|
extern void flushmemscreen(Rectangle);
|
|
extern void cursoron(void);
|
|
extern void cursoroff(void);
|
|
extern void setcursor(Cursor*);
|
|
extern int screensize(int, int, int, ulong);
|
|
extern int screenaperture(int, int);
|
|
extern Rectangle physgscreenr; /* actual monitor size */
|
|
extern void blankscreen(int);
|
|
|
|
/* devdraw.c */
|
|
extern void deletescreenimage(void);
|
|
extern void resetscreenimage(void);
|
|
extern void setscreenimageclipr(Rectangle);
|
|
extern void drawflush(void);
|
|
extern QLock drawlock;
|
|
|
|
#define ishwimage(i) 0 /* for ../port/devdraw.c */
|
|
|
|
/* swcursor.c */
|
|
void swcursorhide(int);
|
|
void swcursoravoid(Rectangle);
|
|
void swcursordraw(Point);
|
|
void swcursorload(Cursor *);
|
|
void swcursorinit(void);
|
|
|
|
/* for communication between devdss.c and screen.c */
|
|
|
|
enum {
|
|
/* maxima */
|
|
Wid = 1280,
|
|
Ht = 1024,
|
|
Depth = 16, /* bits per pixel */
|
|
|
|
Pcolours = 256, /* Palette */
|
|
Pred = 0,
|
|
Pgreen = 1,
|
|
Pblue = 2,
|
|
|
|
Pblack = 0x00,
|
|
Pwhite = 0xFF,
|
|
|
|
/* settings indices */
|
|
Res800x600 = 0,
|
|
Res1024x768,
|
|
Res1280x1024,
|
|
Res1400x1050,
|
|
};
|
|
|
|
struct Settings {
|
|
uint wid; /* width in pixels */
|
|
uint ht; /* height in pixels */
|
|
uint freq; /* refresh frequency; only printed */
|
|
uint chan; /* draw chan */
|
|
|
|
/* shouldn't be needed? */
|
|
uint pixelclock;
|
|
|
|
/* horizontal timing */
|
|
uint hbp; /* back porch: pixel clocks before scan line */
|
|
uint hfp; /* front porch: pixel clocks after scan line */
|
|
uint hsw; /* sync pulse width: more hfp */
|
|
|
|
/* vertical timing */
|
|
uint vbp; /* back porch: line clocks before frame */
|
|
uint vfp; /* front porch: line clocks after frame */
|
|
uint vsw; /* sync pulse width: more vfp */
|
|
};
|
|
|
|
struct OScreen {
|
|
Cursor;
|
|
Settings *settings;
|
|
int open;
|
|
};
|
|
|
|
struct Omap3fb { /* frame buffer for 24-bit active color */
|
|
// short palette[256];
|
|
/* pixel data, even; base type's width must match Depth */
|
|
ushort pixel[Wid*Ht];
|
|
};
|