pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OCD fixes: Adds a space after /* (glory to regular expressions!)

Browse source
This commit is contained in:
Gabriel Jacobo 2013-08-21 09:47:10 -03:00
parent 271e0d67c4
commit 298ce1c1a7
83 changed files with 459 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/video/SDL_bmp.c
View file

@ -97,23 +97,23 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* The Win32 BMP file header (14 bytes) */
char magic[2];
/*Uint32 bfSize = 0; */
/*Uint16 bfReserved1 = 0; */
/*Uint16 bfReserved2 = 0; */
/* Uint32 bfSize = 0; */
/* Uint16 bfReserved1 = 0; */
/* Uint16 bfReserved2 = 0; */
Uint32 bfOffBits = 0;
/* The Win32 BITMAPINFOHEADER struct (40 bytes) */
Uint32 biSize = 0;
Sint32 biWidth = 0;
Sint32 biHeight = 0;
/*Uint16 biPlanes = 0; */
/* Uint16 biPlanes = 0; */
Uint16 biBitCount = 0;
Uint32 biCompression = 0;
/*Uint32 biSizeImage = 0; */
/*Sint32 biXPelsPerMeter = 0; */
/*Sint32 biYPelsPerMeter = 0; */
/* Uint32 biSizeImage = 0; */
/* Sint32 biXPelsPerMeter = 0; */
/* Sint32 biYPelsPerMeter = 0; */
Uint32 biClrUsed = 0;
/*Uint32 biClrImportant = 0; */
/* Uint32 biClrImportant = 0; */
/* Make sure we are passed a valid data source */
surface = NULL;
@ -136,9 +136,9 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
was_error = SDL_TRUE;
goto done;
}
/*bfSize = */ SDL_ReadLE32(src);
/*bfReserved1 = */ SDL_ReadLE16(src);
/*bfReserved2 = */ SDL_ReadLE16(src);
/* bfSize = */ SDL_ReadLE32(src);
/* bfReserved1 = */ SDL_ReadLE16(src);
/* bfReserved2 = */ SDL_ReadLE16(src);
bfOffBits = SDL_ReadLE32(src);
/* Read the Win32 BITMAPINFOHEADER */
@ -146,20 +146,20 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (biSize == 12) {
biWidth = (Uint32) SDL_ReadLE16(src);
biHeight = (Uint32) SDL_ReadLE16(src);
/*biPlanes = */ SDL_ReadLE16(src);
/* biPlanes = */ SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src);
biCompression = BI_RGB;
} else {
biWidth = SDL_ReadLE32(src);
biHeight = SDL_ReadLE32(src);
/*biPlanes = */ SDL_ReadLE16(src);
/* biPlanes = */ SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src);
biCompression = SDL_ReadLE32(src);
/*biSizeImage = */ SDL_ReadLE32(src);
/*biXPelsPerMeter = */ SDL_ReadLE32(src);
/*biYPelsPerMeter = */ SDL_ReadLE32(src);
/* biSizeImage = */ SDL_ReadLE32(src);
/* biXPelsPerMeter = */ SDL_ReadLE32(src);
/* biYPelsPerMeter = */ SDL_ReadLE32(src);
biClrUsed = SDL_ReadLE32(src);
/*biClrImportant = */ SDL_ReadLE32(src);
/* biClrImportant = */ SDL_ReadLE32(src);
}
if (biHeight < 0) {
topDown = SDL_TRUE;

4
src/video/SDL_fillrect.c
View file

@ -119,7 +119,7 @@ SDL_FillRect1SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
SSE_END;
}
/*DEFINE_SSE_FILLRECT(1, Uint8) */
/* DEFINE_SSE_FILLRECT(1, Uint8) */
DEFINE_SSE_FILLRECT(2, Uint16)
DEFINE_SSE_FILLRECT(4, Uint32)
@ -212,7 +212,7 @@ SDL_FillRect1MMX(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
MMX_END;
}
/*DEFINE_MMX_FILLRECT(1, Uint8) */
/* DEFINE_MMX_FILLRECT(1, Uint8) */
DEFINE_MMX_FILLRECT(2, Uint16)
DEFINE_MMX_FILLRECT(4, Uint32)

2
src/video/SDL_shape.c
View file

@ -33,7 +33,7 @@ SDL_Window*
SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags)
{
SDL_Window *result = NULL;
result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /*& (~SDL_WINDOW_SHOWN) */);
result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /* & (~SDL_WINDOW_SHOWN) */);
if(result != NULL) {
result->shaper = SDL_GetVideoDevice()->shape_driver.CreateShaper(result);
if(result->shaper != NULL) {

2
src/video/SDL_stretch.c
View file

@ -38,7 +38,7 @@
(defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
/* There's a bug with gcc 4.4.1 and -O2 where srcp doesn't get the correct
* value after the first scanline. FIXME? */
/*#define USE_ASM_STRETCH */
/* #define USE_ASM_STRETCH */
#endif
#ifdef USE_ASM_STRETCH

2
src/video/SDL_surface.c
View file

@ -963,7 +963,7 @@ SDL_CreateSurfaceOnStack(int width, int height, Uint32 pixel_format,
surface->h = height;
surface->pitch = pitch;
/* We don't actually need to set up the clip rect for our purposes */
/*SDL_SetClipRect(surface, NULL); */
/* SDL_SetClipRect(surface, NULL); */
/* Allocate an empty mapping */
SDL_zerop(blitmap);

4
src/video/bwindow/SDL_BWin.h
View file

@ -353,7 +353,7 @@ class SDL_BWin:public BDirectWindow
- CTRL+Q to close window (and other shortcuts)
- PrintScreen to make screenshot into /boot/home
- etc.. */
/*BDirectWindow::DispatchMessage(msg, target); */
/* BDirectWindow::DispatchMessage(msg, target); */
break;
}
@ -461,7 +461,7 @@ private:
msg.AddBool("focusGained", focusGained);
_PostWindowEvent(msg);
/*FIXME: Why were these here?
/* FIXME: Why were these here?
if false: be_app->SetCursor(B_HAND_CURSOR);
if true: SDL_SetCursor(NULL); */
}

10
src/video/bwindow/SDL_bopengl.h
View file

@ -29,13 +29,13 @@ extern "C" {
#include "../SDL_sysvideo.h"
extern int BE_GL_LoadLibrary(_THIS, const char *path); /*FIXME */
extern void *BE_GL_GetProcAddress(_THIS, const char *proc); /*FIXME */
extern void BE_GL_UnloadLibrary(_THIS); /*TODO */
extern int BE_GL_LoadLibrary(_THIS, const char *path); /* FIXME */
extern void *BE_GL_GetProcAddress(_THIS, const char *proc); /* FIXME */
extern void BE_GL_UnloadLibrary(_THIS); /* TODO */
extern int BE_GL_MakeCurrent(_THIS, SDL_Window * window,
SDL_GLContext context);
extern int BE_GL_SetSwapInterval(_THIS, int interval); /*TODO */
extern int BE_GL_GetSwapInterval(_THIS); /*TODO */
extern int BE_GL_SetSwapInterval(_THIS, int interval); /* TODO */
extern int BE_GL_GetSwapInterval(_THIS); /* TODO */
extern void BE_GL_SwapWindow(_THIS, SDL_Window * window);
extern SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window);
extern void BE_GL_DeleteContext(_THIS, SDL_GLContext context);

4
src/video/directfb/SDL_DirectFB_WM.c
View file

@ -131,7 +131,7 @@ DirectFB_WM_RedrawLayout(_THIS, SDL_Window * window)
SDL_DFB_CHECK(s->SetBlittingFlags(s, DSBLIT_NOFX));
LoadFont(_this, window);
/*s->SetDrawingFlags(s, DSDRAW_BLEND); */
/* s->SetDrawingFlags(s, DSDRAW_BLEND); */
s->SetColor(s, COLOR_EXPAND(t->frame_color));
/* top */
for (i = 0; i < t->top_size; i++)
@ -203,7 +203,7 @@ DirectFB_WM_AdjustWindowLayout(SDL_Window * window, int flags, int w, int h)
if (!windata->is_managed)
windata->theme = theme_none;
else if (flags & SDL_WINDOW_BORDERLESS)
/*desc.caps |= DWCAPS_NODECORATION;) */
/* desc.caps |= DWCAPS_NODECORATION;) */
windata->theme = theme_none;
else if (flags & SDL_WINDOW_FULLSCREEN) {
windata->theme = theme_none;

8
src/video/directfb/SDL_DirectFB_events.c
View file

@ -132,7 +132,7 @@ MotionAllMice(_THIS, int x, int y)
SDL_Mouse *mouse = SDL_GetMouse(index);
mouse->x = mouse->last_x = x;
mouse->y = mouse->last_y = y;
/*SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0); */
/* SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0); */
}
#endif
}
@ -233,7 +233,7 @@ ProcessWindowEvent(_THIS, SDL_Window *sdlwin, DFBWindowEvent * evt)
case DWET_KEYDOWN:
if (!devdata->use_linux_input) {
DirectFB_TranslateKey(_this, evt, &keysym, &unicode);
/*printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
/* printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
SDL_SendKeyboardKey_ex(0, SDL_PRESSED, keysym.scancode);
if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
SDL_zero(text);
@ -369,7 +369,7 @@ ProcessInputEvent(_THIS, DFBInputEvent * ievt)
case DIET_KEYPRESS:
kbd_idx = KbdIndex(_this, ievt->device_id);
DirectFB_TranslateKeyInputEvent(_this, ievt, &keysym, &unicode);
/*printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
/* printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
SDL_SendKeyboardKey_ex(kbd_idx, SDL_PRESSED, keysym.scancode);
if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
SDL_zero(text);
@ -742,7 +742,7 @@ DirectFB_InitKeyboard(_THIS)
void
DirectFB_QuitKeyboard(_THIS)
{
/*SDL_DFB_DEVICEDATA(_this); */
/* SDL_DFB_DEVICEDATA(_this); */
SDL_KeyboardQuit();

14
src/video/directfb/SDL_DirectFB_render.c
View file

@ -326,8 +326,8 @@ DirectFB_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
/* Rebind the context to the window area and update matrices */
/*SDL_CurrentContext = NULL; */
/*data->updateSize = SDL_TRUE; */
/* SDL_CurrentContext = NULL; */
/* data->updateSize = SDL_TRUE; */
renddata->size_changed = SDL_TRUE;
}
}
@ -379,7 +379,7 @@ DirectFB_CreateRenderer(SDL_Window * window, Uint32 flags)
/* FIXME: Yet to be tested */
renderer->RenderReadPixels = DirectFB_RenderReadPixels;
/*renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
/* renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
renderer->DestroyTexture = DirectFB_DestroyTexture;
renderer->DestroyRenderer = DirectFB_DestroyRenderer;
@ -450,7 +450,7 @@ DirectFB_ActivateRenderer(SDL_Renderer * renderer)
SDL_Window *window = renderer->window;
SDL_DFB_WINDOWDATA(window);
if (renddata->size_changed /*|| windata->wm_needs_redraw */) {
if (renddata->size_changed /* || windata->wm_needs_redraw */) {
renddata->size_changed = SDL_FALSE;
}
}
@ -701,7 +701,7 @@ DirectFB_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
{
switch (texture->blendMode) {
case SDL_BLENDMODE_NONE:
/*case SDL_BLENDMODE_MASK: */
/* case SDL_BLENDMODE_MASK: */
case SDL_BLENDMODE_BLEND:
case SDL_BLENDMODE_ADD:
case SDL_BLENDMODE_MOD:
@ -717,7 +717,7 @@ DirectFB_SetDrawBlendMode(SDL_Renderer * renderer)
{
switch (renderer->blendMode) {
case SDL_BLENDMODE_NONE:
/*case SDL_BLENDMODE_MASK: */
/* case SDL_BLENDMODE_MASK: */
case SDL_BLENDMODE_BLEND:
case SDL_BLENDMODE_ADD:
case SDL_BLENDMODE_MOD:
@ -916,7 +916,7 @@ PrepareDraw(SDL_Renderer * renderer)
switch (renderer->blendMode) {
case SDL_BLENDMODE_NONE:
/*case SDL_BLENDMODE_MASK: */
/* case SDL_BLENDMODE_MASK: */
case SDL_BLENDMODE_BLEND:
break;
case SDL_BLENDMODE_ADD:

2
src/video/directfb/SDL_DirectFB_shape.c
View file

@ -31,7 +31,7 @@
SDL_Window*
DirectFB_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
return SDL_CreateWindow(title,x,y,w,h,flags /*| SDL_DFB_WINDOW_SHAPED */);
return SDL_CreateWindow(title,x,y,w,h,flags /* | SDL_DFB_WINDOW_SHAPED */);
}
SDL_WindowShaper*

2
src/video/directfb/SDL_DirectFB_video.c
View file

@ -258,7 +258,7 @@ DirectFB_VideoInit(_THIS)
&devdata->events));
} else {
SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_AXES
/*DICAPS_ALL */ ,
/* DICAPS_ALL */ ,
DFB_TRUE,
&devdata->events));
}

2
src/video/directfb/SDL_DirectFB_window.c
View file

@ -155,7 +155,7 @@ DirectFB_CreateWindow(_THIS, SDL_Window * window)
SDL_DFB_CHECK(windata->dfbwin->RaiseToTop(windata->dfbwin));
/* remember parent */
/*windata->sdlwin = window; */
/* windata->sdlwin = window; */
/* Add to list ... */

2
src/video/directfb/SDL_DirectFB_window.h
View file

@ -34,7 +34,7 @@ struct _DFB_WindowData
IDirectFBSurface *surface; /* client drawing surface */
IDirectFBWindow *dfbwin;
IDirectFBEventBuffer *eventbuffer;
/*SDL_Window *sdlwin; */
/* SDL_Window *sdlwin; */
SDL_Window *next;
Uint8 opacity;
DFBRectangle client;

2
src/video/psp/SDL_pspevents.c
View file

@ -119,7 +119,7 @@ void PSP_PumpEvents(_THIS)
sym.scancode = raw;
sym.sym = keymap[raw];
/* not tested */
/*SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
/* SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
SDL_SendKeyboardKey((keys & keymap_psp[i].id) ?
SDL_PRESSED : SDL_RELEASED, SDL_GetScancodeFromKey(keymap[raw]);

2
src/video/psp/SDL_pspvideo.h
View file

@ -91,7 +91,7 @@ int PSP_GL_GetSwapInterval(_THIS);
void PSP_GL_SwapWindow(_THIS, SDL_Window * window);
void PSP_GL_DeleteContext(_THIS, SDL_GLContext context);
/*PSP on screen keyboard */
/* PSP on screen keyboard */
SDL_bool PSP_HasScreenKeyboardSupport(_THIS);
void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);

2
src/video/windows/SDL_windowsevents.c
View file

@ -36,7 +36,7 @@
/* For GET_X_LPARAM, GET_Y_LPARAM. */
#include <windowsx.h>
/*#define WMMSG_DEBUG */
/* #define WMMSG_DEBUG */
#ifdef WMMSG_DEBUG
#include <stdio.h>
#include "wmmsg.h"

4
src/video/x11/SDL_x11events.c
View file

@ -97,7 +97,7 @@ static Atom X11_PickTargetFromAtoms(Display *disp, Atom a0, Atom a1, Atom a2)
if (a2 != None) atom[count++] = a2;
return X11_PickTarget(disp, atom, count);
}
/*#define DEBUG_XEVENTS */
/* #define DEBUG_XEVENTS */
struct KeyRepeatCheckData
{
@ -384,7 +384,7 @@ X11_DispatchEvent(_THIS)
I think it's better to think the ALT key is held down
when it's not, then always lose the ALT modifier on Unity.
*/
/*SDL_ResetKeyboard(); */
/* SDL_ResetKeyboard(); */
}
data->pending_focus = PENDING_FOCUS_IN;
data->pending_focus_time = SDL_GetTicks() + PENDING_FOCUS_IN_TIME;

4
src/video/x11/SDL_x11modes.c
View file

@ -26,7 +26,7 @@
#include "SDL_x11video.h"
#include "edid.h"
/*#define X11MODES_DEBUG */
/* #define X11MODES_DEBUG */
/* I'm becoming more and more convinced that the application should never
* use XRandR, and it's the window manager's responsibility to track and
@ -38,7 +38,7 @@
*
* However, many people swear by it, so let them swear at it. :)
*/
/*#define XRANDR_DISABLED_BY_DEFAULT */
/* #define XRANDR_DISABLED_BY_DEFAULT */
static int

4
src/video/x11/SDL_x11sym.h
View file

@ -176,9 +176,9 @@ SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,KeyCode b,int c),(a,b,c),return)
SDL_X11_MODULE(UTF8)
SDL_X11_SYM(int,Xutf8TextListToTextProperty,(Display* a,char** b,int c,XICCEncodingStyle d,XTextProperty* e),(a,b,c,d,e),return)
SDL_X11_SYM(int,Xutf8LookupString,(XIC a,XKeyPressedEvent* b,char* c,int d,KeySym* e,Status* f),(a,b,c,d,e,f),return)
/*SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return) !!! ARGH! */
/* SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return) !!! ARGH! */
SDL_X11_SYM(void,XDestroyIC,(XIC a),(a),)
/*SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return) !!! ARGH! */
/* SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return) !!! ARGH! */
SDL_X11_SYM(void,XSetICFocus,(XIC a),(a),)
SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),)
SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return)

4
src/video/x11/SDL_x11window.c
View file

@ -131,7 +131,7 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
Display *display = videodata->display;
Atom _NET_WM_STATE = videodata->_NET_WM_STATE;
/*Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */
/* Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */
Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED;
Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
@ -213,7 +213,7 @@ X11_GetNetWMState(_THIS, Window xwindow)
}
/* FIXME, check the size hints for resizable */
/*flags |= SDL_WINDOW_RESIZABLE; */
/* flags |= SDL_WINDOW_RESIZABLE; */
return flags;
}

10
src/video/x11/SDL_x11xinput2.c
View file

@ -95,20 +95,20 @@ X11_InitXinput2(_THIS)
return;
}
/*Check supported version */
/* Check supported version */
if(outmajor * 1000 + outminor < major * 1000 + minor) {
/*X server does not support the version we want */
/* X server does not support the version we want */
return;
}
xinput2_initialized = 1;
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
/*XInput 2.2 */
/* XInput 2.2 */
if(outmajor * 1000 + outminor >= major * 1000 + minor) {
xinput2_multitouch_supported = 1;
}
#endif
/*Enable Raw motion events for this display */
/* Enable Raw motion events for this display */
eventmask.deviceid = XIAllMasterDevices;
eventmask.mask_len = sizeof(mask);
eventmask.mask = mask;
@ -188,7 +188,7 @@ X11_InitXinput2Multitouch(_THIS)
XIAnyClassInfo *class = dev->classes[j];
XITouchClassInfo *t = (XITouchClassInfo*)class;
/*Only touch devices */
/* Only touch devices */
if (class->type != XITouchClass)
continue;

2
src/video/x11/SDL_x11xinput2.h
View file

@ -24,7 +24,7 @@
#define _SDL_x11xinput2_h
#ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
/*Define XGenericEventCookie as forward declaration when
/* Define XGenericEventCookie as forward declaration when
*xinput2 is not available in order to compile */
struct XGenericEventCookie;
typedef struct XGenericEventCookie XGenericEventCookie;

2
src/video/x11/imKStoUCS.h
View file

@ -28,4 +28,4 @@ Project.
extern unsigned int X11_KeySymToUcs4(KeySym keysym);
#endif /*_imKStoUCS_h */
#endif /* _imKStoUCS_h */