[Scummvm-cvs-logs] CVS: scummvm/backends/x11 x11.cpp,1.31,1.32
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 3 18:32:09 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10785/backends/x11
Modified Files:
x11.cpp
Log Message:
Got rid of OSystem::move_screen
Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/x11/x11.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- x11.cpp 22 Jun 2004 10:43:00 -0000 1.31
+++ x11.cpp 4 Sep 2004 01:31:03 -0000 1.32
@@ -90,8 +90,6 @@
// The screen will not be updated to reflect the new bitmap
void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
- void move_screen(int dx, int dy, int height);
-
// Update the dirty areas of the screen
void updateScreen();
@@ -577,43 +575,6 @@
}
}
-void OSystem_X11::move_screen(int dx, int dy, int height) {
-
- if ((dx == 0) && (dy == 0))
- return;
-
- if (dx == 0) {
- // vertical movement
- if (dy > 0) {
- // move down
- // copy from bottom to top
- for (int y = height - 1; y >= dy; y--)
- copyRectToScreen(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
- } else {
- // move up
- // copy from top to bottom
- for (int y = 0; y < height + dx; y++)
- copyRectToScreen(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
- }
- } else if (dy == 0) {
- // horizontal movement
- if (dx > 0) {
- // move right
- // copy from right to left
- for (int x = fb_width - 1; x >= dx; x--)
- copyRectToScreen(local_fb + x - dx, fb_width, x, 0, 1, height);
- } else {
- // move left
- // copy from left to right
- for (int x = 0; x < fb_width; x++)
- copyRectToScreen(local_fb + x - dx, fb_width, x, 0, 1, height);
- }
- } else {
- // free movement
- // not necessary for now
- }
-}
-
void OSystem_X11::blit_convert(const dirty_square * d, uint16 *dst, int pitch) {
uint8 *ptr_src = local_fb + (fb_width * d->y) + d->x;
uint16 *ptr_dst = dst + (fb_width * d->y) + d->x;
More information about the Scummvm-git-logs
mailing list