projects / packages / crossmingw32-allegro.git / blame
| Commit | Line | Data |
|---|---|---|
| fb54762f JB |
1 | --- allegro-4.3.0/src/win/wgdi.c.orig 2006-07-24 14:10:51.000000000 +0200 |
| 2 | +++ allegro-4.3.0/src/win/wgdi.c 2007-04-03 22:50:52.616018674 +0200 | |
| 3 | @@ -118,7 +118,7 @@ | |
| 4 | /* hardware mouse cursor emulation */ | |
| 5 | static int mouse_on = FALSE; | |
| 6 | static int mouse_was_on = FALSE; | |
| 7 | -static BITMAP *mouse_sprite = NULL; | |
| 8 | +static BITMAP *wmouse_sprite = NULL; | |
| 9 | static BITMAP *mouse_frontbuffer = NULL; | |
| 10 | static BITMAP *mouse_backbuffer = NULL; | |
| 11 | static int mouse_xfocus, mouse_yfocus; | |
| 12 | @@ -130,9 +130,9 @@ | |
| 13 | */ | |
| 14 | static int gfx_gdi_set_mouse_sprite(struct BITMAP *sprite, int xfocus, int yfocus) | |
| 15 | { | |
| 16 | - if (mouse_sprite) { | |
| 17 | - destroy_bitmap(mouse_sprite); | |
| 18 | - mouse_sprite = NULL; | |
| 19 | + if (wmouse_sprite) { | |
| 20 | + destroy_bitmap(wmouse_sprite); | |
| 21 | + wmouse_sprite = NULL; | |
| 22 | ||
| 23 | destroy_bitmap(mouse_frontbuffer); | |
| 24 | mouse_frontbuffer = NULL; | |
| 25 | @@ -141,8 +141,8 @@ | |
| 26 | mouse_backbuffer = NULL; | |
| 27 | } | |
| 28 | ||
| 29 | - mouse_sprite = create_bitmap(sprite->w, sprite->h); | |
| 30 | - blit(sprite, mouse_sprite, 0, 0, 0, 0, sprite->w, sprite->h); | |
| 31 | + wmouse_sprite = create_bitmap(sprite->w, sprite->h); | |
| 32 | + blit(sprite, wmouse_sprite, 0, 0, 0, 0, sprite->w, sprite->h); | |
| 33 | ||
| 34 | mouse_xfocus = xfocus; | |
| 35 | mouse_yfocus = yfocus; | |
| 36 | @@ -167,7 +167,7 @@ | |
| 37 | blit(gdi_screen, mouse_frontbuffer, x, y, 0, 0, mouse_frontbuffer->w, mouse_frontbuffer->h); | |
| 38 | ||
| 39 | /* draw the mouse pointer onto the frontbuffer */ | |
| 40 | - draw_sprite(mouse_frontbuffer, mouse_sprite, 0, 0); | |
| 41 | + draw_sprite(mouse_frontbuffer, wmouse_sprite, 0, 0); | |
| 42 | ||
| 43 | hdc = GetDC(allegro_wnd); | |
| 44 | ||
| 45 | @@ -312,7 +312,7 @@ | |
| 46 | ||
| 47 | /* update mouse pointer if needed */ | |
| 48 | if (mouse_on) { | |
| 49 | - if ((mouse_ypos+mouse_sprite->h > top_line) && (mouse_ypos <= bottom_line)) { | |
| 50 | + if ((mouse_ypos+wmouse_sprite->h > top_line) && (mouse_ypos <= bottom_line)) { | |
| 51 | blit(gdi_screen, mouse_backbuffer, mouse_xpos, mouse_ypos, 0, 0, | |
| 52 | mouse_backbuffer->w, mouse_backbuffer->h); | |
| 53 | ||
| 54 | @@ -540,9 +540,9 @@ | |
| 55 | gdi_screen = NULL; | |
| 56 | ||
| 57 | /* destroy mouse bitmaps */ | |
| 58 | - if (mouse_sprite) { | |
| 59 | - destroy_bitmap(mouse_sprite); | |
| 60 | - mouse_sprite = NULL; | |
| 61 | + if (wmouse_sprite) { | |
| 62 | + destroy_bitmap(wmouse_sprite); | |
| 63 | + wmouse_sprite = NULL; | |
| 64 | ||
| 65 | destroy_bitmap(mouse_frontbuffer); | |
| 66 | mouse_frontbuffer = NULL; |