[Scummvm-cvs-logs] CVS: scummvm/backends/x11 x11.cpp,1.37,1.38
Eugene Sandulenko
sev at users.sourceforge.net
Sat Jul 30 14:14:57 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/missing assert.h,1.4,1.5 missing.cpp,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/ps2 DmaPipe.cpp,1.3,1.4 Gs2dScreen.cpp,1.4,1.5 Gs2dScreen.h,1.4,1.5 GsDefs.h,1.3,1.4 asyncfio.cpp,1.4,1.5 fileio.cpp,1.3,1.4 fileio.h,1.4,1.5 icon.cpp,1.2,1.3 ps2input.cpp,1.3,1.4 ps2pad.cpp,1.4,1.5 savefile.cpp,1.5,1.6 sdlkeys.h,1.1,1.2 smushio.cpp,1.1,1.2 systemps2.cpp,1.7,1.8 systemps2.h,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/backends/x11
Modified Files:
x11.cpp
Log Message:
Remove trailing whitespaces.
Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/x11/x11.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- x11.cpp 9 Mar 2005 23:07:29 -0000 1.37
+++ x11.cpp 30 Jul 2005 21:10:57 -0000 1.38
@@ -117,10 +117,10 @@
void delayMillis(uint msecs);
// Get the next event.
- // Returns true if an event was retrieved.
+ // Returns true if an event was retrieved.
bool pollEvent(Event &event);
- // Set function that generates samples
+ // Set function that generates samples
bool setSoundCallback(SoundProc proc, void *param);
void clearSoundCallback();
@@ -369,7 +369,7 @@
cur_state.hot_y = 0;
cur_state.w = 0;
cur_state.h = 0;
-
+
/* For the window title */
sprintf(buf, "ScummVM");
@@ -381,7 +381,7 @@
if (XShmQueryExtension(display)!=True)
error("No Shared Memory Extension present");
-
+
screen = DefaultScreen(display);
depth = DefaultDepth(display,screen);
if (depth != 16)
@@ -484,15 +484,15 @@
XConfigureWindow(display, window, CWWidth | CWHeight, &new_values);
}
-
+
image = XShmCreateImage(display, DefaultVisual(display, screen), depth, ZPixmap, NULL, &shminfo, fb_width, fb_height);
if (!image)
error("Couldn't get image by XShmCreateImage()");
-
+
shminfo.shmid = shmget(IPC_PRIVATE, image->bytes_per_line * image->height, IPC_CREAT | 0700);
if (shminfo.shmid < 0)
error("Couldn't allocate image data by shmget()");
-
+
image->data = shminfo.shmaddr = (char *)shmat(shminfo.shmid, 0, 0);
shminfo.readOnly = False;
if (XShmAttach(display, &shminfo) == 0) {
@@ -596,12 +596,12 @@
uint16 *ptr_src = local_fb_overlay + (fb_width * d->y) + d->x;
uint16 *ptr_dst = ((uint16 *)image->data) + (fb_width * d->y) + d->x;
int y;
-
+
for (y = 0; y < d->h; y++) {
memcpy(ptr_dst, ptr_src, d->w * sizeof(uint16));
ptr_dst += fb_width;
ptr_src += fb_width;
- }
+ }
}
if (d->x < dout->x)
dout->x = d->x;
@@ -618,7 +618,7 @@
bool need_redraw = false;
static const dirty_square ds_full = { 0, 0, fb_width, fb_height };
dirty_square dout = { fb_width, fb_height, 0, 0 };
-
+
if (_palette_changed) {
full_redraw = true;
num_of_dirty_square = 0;
@@ -724,7 +724,7 @@
return;
}
-
+
if (xdraw < dout->x)
dout->x = xdraw;
if (ydraw < dout->y)
@@ -908,7 +908,7 @@
case 132:
report_presses = 0;
break;
-
+
case 133:
fake_right_mouse = 1;
break;
@@ -1083,7 +1083,7 @@
void OSystem_X11::grabOverlay(int16 *dest, int pitch) {
if (_overlay_visible == false)
return;
-
+
dirty_square d = { 0, 0, fb_width, fb_height };
blit_convert(&d, (uint16 *) dest, pitch);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/missing assert.h,1.4,1.5 missing.cpp,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/ps2 DmaPipe.cpp,1.3,1.4 Gs2dScreen.cpp,1.4,1.5 Gs2dScreen.h,1.4,1.5 GsDefs.h,1.3,1.4 asyncfio.cpp,1.4,1.5 fileio.cpp,1.3,1.4 fileio.h,1.4,1.5 icon.cpp,1.2,1.3 ps2input.cpp,1.3,1.4 ps2pad.cpp,1.4,1.5 savefile.cpp,1.5,1.6 sdlkeys.h,1.1,1.2 smushio.cpp,1.1,1.2 systemps2.cpp,1.7,1.8 systemps2.h,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list