Re-ran indent on all .c & .h source code files
Like so --
find . -name "*.c" -or -name "*.h" -exec indent -nbfda -npcs -npsl -bli0 --no-tabs {} \;
The `indent` invocation differs from the last one noted in
CHANGES.txt (from 2006!?), in that I've added "--no-tabs",
to ensure indents are all space-based.
This commit is contained in:
Bill Kendrick
parent
09f332367f
commit
cc05925d9e
99 changed files with 31659 additions and 27102 deletions
|
|
@ -68,17 +68,18 @@ static SDL_Surface *make24bitDIB(SDL_Surface * surf)
|
|||
|
||||
surf24 = SDL_ConvertSurface(surf, &pixfmt, SDL_SWSURFACE);
|
||||
surfDIB = SDL_CreateRGBSurface(SDL_SWSURFACE, surf24->w, surf24->h, 24,
|
||||
pixfmt.Rmask, pixfmt.Gmask, pixfmt.Bmask, pixfmt.Amask);
|
||||
pixfmt.Rmask, pixfmt.Gmask, pixfmt.Bmask,
|
||||
pixfmt.Amask);
|
||||
|
||||
linesize = surf24->w * 3; // Flip top2bottom
|
||||
dst = surfDIB->pixels;
|
||||
src = ((Uint8 *) surf24->pixels) + ((surf24->h - 1) * surf24->pitch);
|
||||
for (i = 0; i < surf24->h; ++i)
|
||||
{
|
||||
memcpy(dst, src, linesize);
|
||||
src -= surf24->pitch;
|
||||
dst += surfDIB->pitch;
|
||||
}
|
||||
{
|
||||
memcpy(dst, src, linesize);
|
||||
src -= surf24->pitch;
|
||||
dst += surfDIB->pitch;
|
||||
}
|
||||
|
||||
SDL_FreeSurface(surf24); // Free temp surface
|
||||
|
||||
|
|
@ -104,16 +105,17 @@ static int GetDefaultPrinterStrings(char *device, char *driver, char *output)
|
|||
return 0;
|
||||
|
||||
if (((dev = strtok(buff, ",")) != NULL) &&
|
||||
((drv = strtok(NULL, ", ")) != NULL) && ((out = strtok(NULL, ", ")) != NULL))
|
||||
{
|
||||
if (device)
|
||||
strcpy(device, dev);
|
||||
if (driver)
|
||||
strcpy(driver, drv);
|
||||
if (output)
|
||||
strcpy(output, out);
|
||||
return 1;
|
||||
}
|
||||
((drv = strtok(NULL, ", ")) != NULL)
|
||||
&& ((out = strtok(NULL, ", ")) != NULL))
|
||||
{
|
||||
if (device)
|
||||
strcpy(device, dev);
|
||||
if (driver)
|
||||
strcpy(driver, drv);
|
||||
if (output)
|
||||
strcpy(output, out);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +145,8 @@ static HANDLE LoadCustomPrinterHDEVMODE(HWND hWnd, const char *filepath)
|
|||
if (!OpenPrinter(device, &hPrinter, NULL))
|
||||
goto err_exit;
|
||||
|
||||
sizeof_devmode = (int)DocumentProperties(hWnd, hPrinter, device, NULL, NULL, 0);
|
||||
sizeof_devmode =
|
||||
(int) DocumentProperties(hWnd, hPrinter, device, NULL, NULL, 0);
|
||||
|
||||
if (!sizeof_devmode)
|
||||
goto err_exit;
|
||||
|
|
@ -156,7 +159,8 @@ static HANDLE LoadCustomPrinterHDEVMODE(HWND hWnd, const char *filepath)
|
|||
if (!devmode)
|
||||
goto err_exit;
|
||||
|
||||
res = DocumentProperties(hWnd, hPrinter, device, devmode, NULL, DM_OUT_BUFFER);
|
||||
res =
|
||||
DocumentProperties(hWnd, hPrinter, device, devmode, NULL, DM_OUT_BUFFER);
|
||||
if (res != IDOK)
|
||||
goto err_exit;
|
||||
|
||||
|
|
@ -166,7 +170,9 @@ static HANDLE LoadCustomPrinterHDEVMODE(HWND hWnd, const char *filepath)
|
|||
goto err_exit;
|
||||
fclose(fp);
|
||||
|
||||
res = DocumentProperties(hWnd, hPrinter, device, devmode, devmode, DM_IN_BUFFER | DM_OUT_BUFFER);
|
||||
res =
|
||||
DocumentProperties(hWnd, hPrinter, device, devmode, devmode,
|
||||
DM_IN_BUFFER | DM_OUT_BUFFER);
|
||||
if (res != IDOK)
|
||||
goto err_exit;
|
||||
|
||||
|
|
@ -189,25 +195,26 @@ err_exit:
|
|||
/**
|
||||
* FIXME
|
||||
*/
|
||||
static int SaveCustomPrinterHDEVMODE(HWND hWnd, const char *filepath, HANDLE hDevMode)
|
||||
static int SaveCustomPrinterHDEVMODE(HWND hWnd, const char *filepath,
|
||||
HANDLE hDevMode)
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
|
||||
NOREF(hWnd);
|
||||
if ((fp = fopen(filepath, "wb")) != NULL)
|
||||
{
|
||||
DEVMODE *devmode = (DEVMODE *) GlobalLock(hDevMode);
|
||||
int block_size = devmode->dmSize + devmode->dmDriverExtra;
|
||||
int block_written;
|
||||
char devname[dmDeviceNameSize];
|
||||
{
|
||||
DEVMODE *devmode = (DEVMODE *) GlobalLock(hDevMode);
|
||||
int block_size = devmode->dmSize + devmode->dmDriverExtra;
|
||||
int block_written;
|
||||
char devname[dmDeviceNameSize];
|
||||
|
||||
strcpy(devname, (const char *)devmode->dmDeviceName);
|
||||
fwrite(devname, 1, sizeof(devname), fp);
|
||||
block_written = fwrite(devmode, 1, block_size, fp);
|
||||
GlobalUnlock(hDevMode);
|
||||
fclose(fp);
|
||||
return block_size == block_written;
|
||||
}
|
||||
strcpy(devname, (const char *) devmode->dmDeviceName);
|
||||
fwrite(devname, 1, sizeof(devname), fp);
|
||||
block_written = fwrite(devmode, 1, block_size, fp);
|
||||
GlobalUnlock(hDevMode);
|
||||
fclose(fp);
|
||||
return block_size == block_written;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -222,10 +229,10 @@ static int FileExists(const char *filepath)
|
|||
FILE *fp;
|
||||
|
||||
if ((fp = fopen(filepath, "rb")) != NULL)
|
||||
{
|
||||
fclose(fp);
|
||||
return 1;
|
||||
}
|
||||
{
|
||||
fclose(fp);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -250,22 +257,23 @@ static int GetCustomPrinterDC(HWND hWnd, const char *printcfg, int show)
|
|||
pd.hDevMode = LoadCustomPrinterHDEVMODE(hWnd, printcfg);
|
||||
|
||||
if (show || !FileExists(printcfg))
|
||||
{
|
||||
if (PrintDlg(&pd))
|
||||
{
|
||||
if (PrintDlg(&pd))
|
||||
{
|
||||
hDCprinter = pd.hDC;
|
||||
SaveCustomPrinterHDEVMODE(hWnd, printcfg, pd.hDevMode);
|
||||
GlobalFree(pd.hDevMode);
|
||||
return 1;
|
||||
}
|
||||
hDCprinter = pd.hDC;
|
||||
SaveCustomPrinterHDEVMODE(hWnd, printcfg, pd.hDevMode);
|
||||
GlobalFree(pd.hDevMode);
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
GlobalFree(pd.hDevMode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
{
|
||||
DEVMODE *devmode = (DEVMODE *) GlobalLock(pd.hDevMode);
|
||||
|
||||
hDCprinter = CreateDC(NULL, (const char *)devmode->dmDeviceName, NULL, devmode);
|
||||
hDCprinter =
|
||||
CreateDC(NULL, (const char *) devmode->dmDeviceName, NULL, devmode);
|
||||
GlobalUnlock(pd.hDevMode);
|
||||
GlobalFree(pd.hDevMode);
|
||||
}
|
||||
|
|
@ -295,9 +303,9 @@ static int GetPrinterDC(HWND hWnd, const char *printcfg, int show)
|
|||
hDCprinter = NULL;
|
||||
|
||||
if (printcfg)
|
||||
{
|
||||
return GetCustomPrinterDC(hWnd, printcfg, show);
|
||||
}
|
||||
{
|
||||
return GetCustomPrinterDC(hWnd, printcfg, show);
|
||||
}
|
||||
hDCprinter = GetDefaultPrinterDC();
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -318,7 +326,8 @@ int IsPrinterAvailable(void)
|
|||
/**
|
||||
* FIXME
|
||||
*/
|
||||
const char *SurfacePrint(SDL_Window * window, SDL_Surface * surf, const char *printcfg, int showdialog)
|
||||
const char *SurfacePrint(SDL_Window * window, SDL_Surface * surf,
|
||||
const char *printcfg, int showdialog)
|
||||
{
|
||||
const char *res = NULL;
|
||||
HWND hWnd;
|
||||
|
|
@ -342,10 +351,10 @@ const char *SurfacePrint(SDL_Window * window, SDL_Surface * surf, const char *pr
|
|||
|
||||
hWnd = wminfo.info.win.window;
|
||||
if (!GetPrinterDC(hWnd, printcfg, showdialog))
|
||||
{
|
||||
ShowWindow(hWnd, SW_SHOWNORMAL);
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
ShowWindow(hWnd, SW_SHOWNORMAL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!hDCprinter)
|
||||
return "win32_print: GetPrinterDC() failed.";
|
||||
|
|
@ -360,26 +369,26 @@ const char *SurfacePrint(SDL_Window * window, SDL_Surface * surf, const char *pr
|
|||
|
||||
nError = StartDoc(hDCprinter, &di);
|
||||
if (nError == SP_ERROR)
|
||||
{
|
||||
res = "win32_print: StartDoc() failed.";
|
||||
goto error;
|
||||
}
|
||||
{
|
||||
res = "win32_print: StartDoc() failed.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
nError = StartPage(hDCprinter);
|
||||
if (nError <= 0)
|
||||
{
|
||||
res = "win32_print: StartPage() failed.";
|
||||
goto error;
|
||||
}
|
||||
{
|
||||
res = "win32_print: StartPage() failed.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
surf24 = make24bitDIB(surf);
|
||||
if (!surf24)
|
||||
{
|
||||
res = "win32_print: make24bitDIB() failed.";
|
||||
goto error;
|
||||
}
|
||||
{
|
||||
res = "win32_print: make24bitDIB() failed.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
memset(&bmih, 0, sizeof(bmih));
|
||||
bmih.biSize = sizeof(bmih);
|
||||
|
|
@ -395,100 +404,100 @@ const char *SurfacePrint(SDL_Window * window, SDL_Surface * surf, const char *pr
|
|||
sY = GetDeviceCaps(hDCprinter, LOGPIXELSY);
|
||||
|
||||
switch (scaling)
|
||||
{
|
||||
case STRETCH_TO_FIT:
|
||||
{
|
||||
case STRETCH_TO_FIT:
|
||||
{
|
||||
/* stretches x and y dimensions independently to fit the page */
|
||||
/* doesn't preserve image aspect-ratio */
|
||||
rcDst.top = 0;
|
||||
rcDst.left = 0;
|
||||
rcDst.bottom = pageHeight;
|
||||
rcDst.right = pageWidth;
|
||||
break;
|
||||
}
|
||||
case SCALE_TO_FIT:
|
||||
{
|
||||
/* maximises image size on the page */
|
||||
/* preserves aspect-ratio, alignment is top and center */
|
||||
int width = bmih.biWidth;
|
||||
int height = bmih.biHeight;
|
||||
|
||||
if (width < pageWidth && height < pageHeight)
|
||||
{
|
||||
float dW = (float)pageWidth / width;
|
||||
float dH = (float)pageHeight / height;
|
||||
|
||||
if (dW < dH)
|
||||
{
|
||||
width = pageWidth;
|
||||
height = (int)((height * dW * (sY / sX)) + 0.5f);
|
||||
}
|
||||
else
|
||||
{
|
||||
width = (int)((width * dH * (sX / sY)) + 0.5f);
|
||||
height = pageHeight;
|
||||
}
|
||||
}
|
||||
if (width > pageWidth)
|
||||
{
|
||||
height = height * width / pageWidth;
|
||||
width = pageWidth;
|
||||
}
|
||||
if (height > pageHeight)
|
||||
{
|
||||
width = width * height / pageHeight;
|
||||
height = pageHeight;
|
||||
}
|
||||
|
||||
rcDst.top = 0;
|
||||
rcDst.left = (pageWidth - width) / 2;
|
||||
rcDst.bottom = rcDst.top + height;
|
||||
rcDst.right = rcDst.left + width;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
res = "win32_print: invalid scaling option.";
|
||||
goto error;
|
||||
/* stretches x and y dimensions independently to fit the page */
|
||||
/* doesn't preserve image aspect-ratio */
|
||||
rcDst.top = 0;
|
||||
rcDst.left = 0;
|
||||
rcDst.bottom = pageHeight;
|
||||
rcDst.right = pageWidth;
|
||||
break;
|
||||
}
|
||||
case SCALE_TO_FIT:
|
||||
{
|
||||
/* maximises image size on the page */
|
||||
/* preserves aspect-ratio, alignment is top and center */
|
||||
int width = bmih.biWidth;
|
||||
int height = bmih.biHeight;
|
||||
|
||||
if (width < pageWidth && height < pageHeight)
|
||||
{
|
||||
float dW = (float) pageWidth / width;
|
||||
float dH = (float) pageHeight / height;
|
||||
|
||||
if (dW < dH)
|
||||
{
|
||||
width = pageWidth;
|
||||
height = (int) ((height * dW * (sY / sX)) + 0.5f);
|
||||
}
|
||||
else
|
||||
{
|
||||
width = (int) ((width * dH * (sX / sY)) + 0.5f);
|
||||
height = pageHeight;
|
||||
}
|
||||
}
|
||||
if (width > pageWidth)
|
||||
{
|
||||
height = height * width / pageWidth;
|
||||
width = pageWidth;
|
||||
}
|
||||
if (height > pageHeight)
|
||||
{
|
||||
width = width * height / pageHeight;
|
||||
height = pageHeight;
|
||||
}
|
||||
|
||||
rcDst.top = 0;
|
||||
rcDst.left = (pageWidth - width) / 2;
|
||||
rcDst.bottom = rcDst.top + height;
|
||||
rcDst.right = rcDst.left + width;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
res = "win32_print: invalid scaling option.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
hDCCaps = GetDeviceCaps(hDCprinter, RASTERCAPS);
|
||||
|
||||
if (hDCCaps & RC_PALETTE)
|
||||
{
|
||||
res = "win32_print: printer context requires palette.";
|
||||
goto error;
|
||||
}
|
||||
{
|
||||
res = "win32_print: printer context requires palette.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (hDCCaps & RC_STRETCHDIB)
|
||||
{
|
||||
SetStretchBltMode(hDCprinter, COLORONCOLOR);
|
||||
{
|
||||
SetStretchBltMode(hDCprinter, COLORONCOLOR);
|
||||
|
||||
bmi.bmiHeader = bmih;
|
||||
nError = StretchDIBits(hDCprinter, rcDst.left, rcDst.top,
|
||||
rcDst.right - rcDst.left,
|
||||
rcDst.bottom - rcDst.top,
|
||||
0, 0, bmih.biWidth, bmih.biHeight,
|
||||
surf24->pixels, &bmi, DIB_RGB_COLORS, SRCCOPY);
|
||||
if (nError == (int) GDI_ERROR)
|
||||
{
|
||||
res = "win32_print: StretchDIBits() failed.";
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
else
|
||||
bmi.bmiHeader = bmih;
|
||||
nError = StretchDIBits(hDCprinter, rcDst.left, rcDst.top,
|
||||
rcDst.right - rcDst.left,
|
||||
rcDst.bottom - rcDst.top,
|
||||
0, 0, bmih.biWidth, bmih.biHeight,
|
||||
surf24->pixels, &bmi, DIB_RGB_COLORS, SRCCOPY);
|
||||
if (nError == (int) GDI_ERROR)
|
||||
{
|
||||
res = "win32_print: StretchDIBits() not available.";
|
||||
res = "win32_print: StretchDIBits() failed.";
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
res = "win32_print: StretchDIBits() not available.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
nError = EndPage(hDCprinter);
|
||||
if (nError <= 0)
|
||||
{
|
||||
res = "win32_print: EndPage() failed.";
|
||||
goto error;
|
||||
}
|
||||
{
|
||||
res = "win32_print: EndPage() failed.";
|
||||
goto error;
|
||||
}
|
||||
|
||||
EndDoc(hDCprinter);
|
||||
|
||||
|
|
@ -514,7 +523,8 @@ error:
|
|||
/*
|
||||
Read access to Windows Registry
|
||||
*/
|
||||
static HRESULT ReadRegistry(const char *key, const char *option, char *value, int size)
|
||||
static HRESULT ReadRegistry(const char *key, const char *option, char *value,
|
||||
int size)
|
||||
{
|
||||
LONG res;
|
||||
HKEY hKey = NULL;
|
||||
|
|
@ -563,17 +573,18 @@ char *GetDefaultSaveDir(const char *suffix)
|
|||
{
|
||||
char prefix[MAX_PATH];
|
||||
char path[2 * MAX_PATH];
|
||||
const char *key = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
|
||||
const char *key =
|
||||
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
|
||||
const char *option = "AppData";
|
||||
HRESULT hr = S_OK;
|
||||
|
||||
if (SUCCEEDED(hr = ReadRegistry(key, option, prefix, sizeof(prefix))))
|
||||
{
|
||||
remove_slash(prefix);
|
||||
snprintf(path, sizeof(path), "%s/%s", prefix, suffix);
|
||||
_mkdir(path);
|
||||
return strdup(path);
|
||||
}
|
||||
{
|
||||
remove_slash(prefix);
|
||||
snprintf(path, sizeof(path), "%s/%s", prefix, suffix);
|
||||
_mkdir(path);
|
||||
return strdup(path);
|
||||
}
|
||||
return strdup("userdata");
|
||||
}
|
||||
|
||||
|
|
@ -587,15 +598,16 @@ char *GetDefaultSaveDir(const char *suffix)
|
|||
char *GetSystemFontDir(void)
|
||||
{
|
||||
char path[MAX_PATH];
|
||||
const char *key = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
|
||||
const char *key =
|
||||
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
|
||||
const char *option = "Fonts";
|
||||
HRESULT hr = S_OK;
|
||||
|
||||
if (SUCCEEDED(hr = ReadRegistry(key, option, path, sizeof(path))))
|
||||
{
|
||||
remove_slash(path);
|
||||
return strdup(path);
|
||||
}
|
||||
{
|
||||
remove_slash(path);
|
||||
return strdup(path);
|
||||
}
|
||||
return strdup("C:\\WINDOWS\\FONTS");
|
||||
}
|
||||
|
||||
|
|
@ -609,15 +621,16 @@ char *GetUserImageDir(void);
|
|||
char *GetUserImageDir(void)
|
||||
{
|
||||
char path[MAX_PATH];
|
||||
const char *key = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
|
||||
const char *key =
|
||||
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
|
||||
const char *option = "My Pictures";
|
||||
HRESULT hr = S_OK;
|
||||
|
||||
|
||||
if (SUCCEEDED(hr = ReadRegistry(key, option, path, sizeof(path))))
|
||||
{
|
||||
remove_slash(path);
|
||||
return strdup(path);
|
||||
}
|
||||
{
|
||||
remove_slash(path);
|
||||
return strdup(path);
|
||||
}
|
||||
return strdup("C:\\Pictures");
|
||||
}
|
||||
|
||||
|
|
@ -630,9 +643,9 @@ static char *GetUserTempDir(void)
|
|||
const char *temp = getenv("TEMP");
|
||||
|
||||
if (!temp)
|
||||
{
|
||||
temp = "userdata";
|
||||
}
|
||||
{
|
||||
temp = "userdata";
|
||||
}
|
||||
return strdup(temp);
|
||||
}
|
||||
|
||||
|
|
@ -662,7 +675,8 @@ static int g_bWindowActive = 0;
|
|||
/**
|
||||
* FIXME
|
||||
*/
|
||||
LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam,
|
||||
LPARAM lParam);
|
||||
LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
int bEatKeystroke = 0;
|
||||
|
|
@ -672,14 +686,15 @@ LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
|
|||
return CallNextHookEx(g_hKeyboardHook, nCode, wParam, lParam);
|
||||
|
||||
switch (wParam)
|
||||
{
|
||||
case WM_KEYDOWN:
|
||||
case WM_KEYUP:
|
||||
{
|
||||
case WM_KEYDOWN:
|
||||
case WM_KEYUP:
|
||||
{
|
||||
bEatKeystroke = g_bWindowActive && ((p->vkCode == VK_LWIN) || (p->vkCode == VK_RWIN));
|
||||
break;
|
||||
}
|
||||
bEatKeystroke = g_bWindowActive && ((p->vkCode == VK_LWIN)
|
||||
|| (p->vkCode == VK_RWIN));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (bEatKeystroke)
|
||||
return 1;
|
||||
|
|
@ -693,7 +708,9 @@ int InstallKeyboardHook(void)
|
|||
{
|
||||
if (g_hKeyboardHook)
|
||||
return -1;
|
||||
g_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, GetModuleHandle(NULL), 0);
|
||||
g_hKeyboardHook =
|
||||
SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc,
|
||||
GetModuleHandle(NULL), 0);
|
||||
return g_hKeyboardHook ? 0 : -2;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue