More indentation!
See https://sourceforge.net/p/tuxpaint/mailman/message/36077409/
This commit is contained in:
Bill Kendrick
parent
cb8c885433
commit
a4d213178d
4 changed files with 1804 additions and 1797 deletions
1
osk/.indent.pro
vendored
Symbolic link
1
osk/.indent.pro
vendored
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../src/.indent.pro
|
||||
|
|
@ -1324,11 +1324,11 @@ SOFTWARE.
|
|||
|
||||
#ifdef XK_TECHNICAL
|
||||
#define XK_leftradical 0x08a1 /* U+23B7 RADICAL SYMBOL BOTTOM */
|
||||
#define XK_topleftradical 0x08a2 /*(U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT)*/
|
||||
#define XK_horizconnector 0x08a3 /*(U+2500 BOX DRAWINGS LIGHT HORIZONTAL)*/
|
||||
#define XK_topleftradical 0x08a2 /*(U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT) */
|
||||
#define XK_horizconnector 0x08a3 /*(U+2500 BOX DRAWINGS LIGHT HORIZONTAL) */
|
||||
#define XK_topintegral 0x08a4 /* U+2320 TOP HALF INTEGRAL */
|
||||
#define XK_botintegral 0x08a5 /* U+2321 BOTTOM HALF INTEGRAL */
|
||||
#define XK_vertconnector 0x08a6 /*(U+2502 BOX DRAWINGS LIGHT VERTICAL)*/
|
||||
#define XK_vertconnector 0x08a6 /*(U+2502 BOX DRAWINGS LIGHT VERTICAL) */
|
||||
#define XK_topleftsqbracket 0x08a7 /* U+23A1 LEFT SQUARE BRACKET UPPER CORNER */
|
||||
#define XK_botleftsqbracket 0x08a8 /* U+23A3 LEFT SQUARE BRACKET LOWER CORNER */
|
||||
#define XK_toprightsqbracket 0x08a9 /* U+23A4 RIGHT SQUARE BRACKET UPPER CORNER */
|
||||
|
|
@ -1425,7 +1425,7 @@ SOFTWARE.
|
|||
#define XK_hairspace 0x0aa8 /* U+200A HAIR SPACE */
|
||||
#define XK_emdash 0x0aa9 /* U+2014 EM DASH */
|
||||
#define XK_endash 0x0aaa /* U+2013 EN DASH */
|
||||
#define XK_signifblank 0x0aac /*(U+2423 OPEN BOX)*/
|
||||
#define XK_signifblank 0x0aac /*(U+2423 OPEN BOX) */
|
||||
#define XK_ellipsis 0x0aae /* U+2026 HORIZONTAL ELLIPSIS */
|
||||
#define XK_doubbaselinedot 0x0aaf /* U+2025 TWO DOT LEADER */
|
||||
#define XK_onethird 0x0ab0 /* U+2153 VULGAR FRACTION ONE THIRD */
|
||||
|
|
@ -1438,21 +1438,21 @@ SOFTWARE.
|
|||
#define XK_fivesixths 0x0ab7 /* U+215A VULGAR FRACTION FIVE SIXTHS */
|
||||
#define XK_careof 0x0ab8 /* U+2105 CARE OF */
|
||||
#define XK_figdash 0x0abb /* U+2012 FIGURE DASH */
|
||||
#define XK_leftanglebracket 0x0abc /*(U+27E8 MATHEMATICAL LEFT ANGLE BRACKET)*/
|
||||
#define XK_decimalpoint 0x0abd /*(U+002E FULL STOP)*/
|
||||
#define XK_rightanglebracket 0x0abe /*(U+27E9 MATHEMATICAL RIGHT ANGLE BRACKET)*/
|
||||
#define XK_leftanglebracket 0x0abc /*(U+27E8 MATHEMATICAL LEFT ANGLE BRACKET) */
|
||||
#define XK_decimalpoint 0x0abd /*(U+002E FULL STOP) */
|
||||
#define XK_rightanglebracket 0x0abe /*(U+27E9 MATHEMATICAL RIGHT ANGLE BRACKET) */
|
||||
#define XK_marker 0x0abf
|
||||
#define XK_oneeighth 0x0ac3 /* U+215B VULGAR FRACTION ONE EIGHTH */
|
||||
#define XK_threeeighths 0x0ac4 /* U+215C VULGAR FRACTION THREE EIGHTHS */
|
||||
#define XK_fiveeighths 0x0ac5 /* U+215D VULGAR FRACTION FIVE EIGHTHS */
|
||||
#define XK_seveneighths 0x0ac6 /* U+215E VULGAR FRACTION SEVEN EIGHTHS */
|
||||
#define XK_trademark 0x0ac9 /* U+2122 TRADE MARK SIGN */
|
||||
#define XK_signaturemark 0x0aca /*(U+2613 SALTIRE)*/
|
||||
#define XK_signaturemark 0x0aca /*(U+2613 SALTIRE) */
|
||||
#define XK_trademarkincircle 0x0acb
|
||||
#define XK_leftopentriangle 0x0acc /*(U+25C1 WHITE LEFT-POINTING TRIANGLE)*/
|
||||
#define XK_rightopentriangle 0x0acd /*(U+25B7 WHITE RIGHT-POINTING TRIANGLE)*/
|
||||
#define XK_emopencircle 0x0ace /*(U+25CB WHITE CIRCLE)*/
|
||||
#define XK_emopenrectangle 0x0acf /*(U+25AF WHITE VERTICAL RECTANGLE)*/
|
||||
#define XK_leftopentriangle 0x0acc /*(U+25C1 WHITE LEFT-POINTING TRIANGLE) */
|
||||
#define XK_rightopentriangle 0x0acd /*(U+25B7 WHITE RIGHT-POINTING TRIANGLE) */
|
||||
#define XK_emopencircle 0x0ace /*(U+25CB WHITE CIRCLE) */
|
||||
#define XK_emopenrectangle 0x0acf /*(U+25AF WHITE VERTICAL RECTANGLE) */
|
||||
#define XK_leftsinglequotemark 0x0ad0 /* U+2018 LEFT SINGLE QUOTATION MARK */
|
||||
#define XK_rightsinglequotemark 0x0ad1 /* U+2019 RIGHT SINGLE QUOTATION MARK */
|
||||
#define XK_leftdoublequotemark 0x0ad2 /* U+201C LEFT DOUBLE QUOTATION MARK */
|
||||
|
|
@ -1462,23 +1462,23 @@ SOFTWARE.
|
|||
#define XK_seconds 0x0ad7 /* U+2033 DOUBLE PRIME */
|
||||
#define XK_latincross 0x0ad9 /* U+271D LATIN CROSS */
|
||||
#define XK_hexagram 0x0ada
|
||||
#define XK_filledrectbullet 0x0adb /*(U+25AC BLACK RECTANGLE)*/
|
||||
#define XK_filledlefttribullet 0x0adc /*(U+25C0 BLACK LEFT-POINTING TRIANGLE)*/
|
||||
#define XK_filledrighttribullet 0x0add /*(U+25B6 BLACK RIGHT-POINTING TRIANGLE)*/
|
||||
#define XK_emfilledcircle 0x0ade /*(U+25CF BLACK CIRCLE)*/
|
||||
#define XK_emfilledrect 0x0adf /*(U+25AE BLACK VERTICAL RECTANGLE)*/
|
||||
#define XK_enopencircbullet 0x0ae0 /*(U+25E6 WHITE BULLET)*/
|
||||
#define XK_enopensquarebullet 0x0ae1 /*(U+25AB WHITE SMALL SQUARE)*/
|
||||
#define XK_openrectbullet 0x0ae2 /*(U+25AD WHITE RECTANGLE)*/
|
||||
#define XK_opentribulletup 0x0ae3 /*(U+25B3 WHITE UP-POINTING TRIANGLE)*/
|
||||
#define XK_opentribulletdown 0x0ae4 /*(U+25BD WHITE DOWN-POINTING TRIANGLE)*/
|
||||
#define XK_openstar 0x0ae5 /*(U+2606 WHITE STAR)*/
|
||||
#define XK_enfilledcircbullet 0x0ae6 /*(U+2022 BULLET)*/
|
||||
#define XK_enfilledsqbullet 0x0ae7 /*(U+25AA BLACK SMALL SQUARE)*/
|
||||
#define XK_filledtribulletup 0x0ae8 /*(U+25B2 BLACK UP-POINTING TRIANGLE)*/
|
||||
#define XK_filledtribulletdown 0x0ae9 /*(U+25BC BLACK DOWN-POINTING TRIANGLE)*/
|
||||
#define XK_leftpointer 0x0aea /*(U+261C WHITE LEFT POINTING INDEX)*/
|
||||
#define XK_rightpointer 0x0aeb /*(U+261E WHITE RIGHT POINTING INDEX)*/
|
||||
#define XK_filledrectbullet 0x0adb /*(U+25AC BLACK RECTANGLE) */
|
||||
#define XK_filledlefttribullet 0x0adc /*(U+25C0 BLACK LEFT-POINTING TRIANGLE) */
|
||||
#define XK_filledrighttribullet 0x0add /*(U+25B6 BLACK RIGHT-POINTING TRIANGLE) */
|
||||
#define XK_emfilledcircle 0x0ade /*(U+25CF BLACK CIRCLE) */
|
||||
#define XK_emfilledrect 0x0adf /*(U+25AE BLACK VERTICAL RECTANGLE) */
|
||||
#define XK_enopencircbullet 0x0ae0 /*(U+25E6 WHITE BULLET) */
|
||||
#define XK_enopensquarebullet 0x0ae1 /*(U+25AB WHITE SMALL SQUARE) */
|
||||
#define XK_openrectbullet 0x0ae2 /*(U+25AD WHITE RECTANGLE) */
|
||||
#define XK_opentribulletup 0x0ae3 /*(U+25B3 WHITE UP-POINTING TRIANGLE) */
|
||||
#define XK_opentribulletdown 0x0ae4 /*(U+25BD WHITE DOWN-POINTING TRIANGLE) */
|
||||
#define XK_openstar 0x0ae5 /*(U+2606 WHITE STAR) */
|
||||
#define XK_enfilledcircbullet 0x0ae6 /*(U+2022 BULLET) */
|
||||
#define XK_enfilledsqbullet 0x0ae7 /*(U+25AA BLACK SMALL SQUARE) */
|
||||
#define XK_filledtribulletup 0x0ae8 /*(U+25B2 BLACK UP-POINTING TRIANGLE) */
|
||||
#define XK_filledtribulletdown 0x0ae9 /*(U+25BC BLACK DOWN-POINTING TRIANGLE) */
|
||||
#define XK_leftpointer 0x0aea /*(U+261C WHITE LEFT POINTING INDEX) */
|
||||
#define XK_rightpointer 0x0aeb /*(U+261E WHITE RIGHT POINTING INDEX) */
|
||||
#define XK_club 0x0aec /* U+2663 BLACK CLUB SUIT */
|
||||
#define XK_diamond 0x0aed /* U+2666 BLACK DIAMOND SUIT */
|
||||
#define XK_heart 0x0aee /* U+2665 BLACK HEART SUIT */
|
||||
|
|
@ -1506,23 +1506,23 @@ SOFTWARE.
|
|||
*/
|
||||
|
||||
#ifdef XK_APL
|
||||
#define XK_leftcaret 0x0ba3 /*(U+003C LESS-THAN SIGN)*/
|
||||
#define XK_rightcaret 0x0ba6 /*(U+003E GREATER-THAN SIGN)*/
|
||||
#define XK_downcaret 0x0ba8 /*(U+2228 LOGICAL OR)*/
|
||||
#define XK_upcaret 0x0ba9 /*(U+2227 LOGICAL AND)*/
|
||||
#define XK_overbar 0x0bc0 /*(U+00AF MACRON)*/
|
||||
#define XK_leftcaret 0x0ba3 /*(U+003C LESS-THAN SIGN) */
|
||||
#define XK_rightcaret 0x0ba6 /*(U+003E GREATER-THAN SIGN) */
|
||||
#define XK_downcaret 0x0ba8 /*(U+2228 LOGICAL OR) */
|
||||
#define XK_upcaret 0x0ba9 /*(U+2227 LOGICAL AND) */
|
||||
#define XK_overbar 0x0bc0 /*(U+00AF MACRON) */
|
||||
#define XK_downtack 0x0bc2 /* U+22A4 DOWN TACK */
|
||||
#define XK_upshoe 0x0bc3 /*(U+2229 INTERSECTION)*/
|
||||
#define XK_upshoe 0x0bc3 /*(U+2229 INTERSECTION) */
|
||||
#define XK_downstile 0x0bc4 /* U+230A LEFT FLOOR */
|
||||
#define XK_underbar 0x0bc6 /*(U+005F LOW LINE)*/
|
||||
#define XK_underbar 0x0bc6 /*(U+005F LOW LINE) */
|
||||
#define XK_jot 0x0bca /* U+2218 RING OPERATOR */
|
||||
#define XK_quad 0x0bcc /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
|
||||
#define XK_uptack 0x0bce /* U+22A5 UP TACK */
|
||||
#define XK_circle 0x0bcf /* U+25CB WHITE CIRCLE */
|
||||
#define XK_upstile 0x0bd3 /* U+2308 LEFT CEILING */
|
||||
#define XK_downshoe 0x0bd6 /*(U+222A UNION)*/
|
||||
#define XK_rightshoe 0x0bd8 /*(U+2283 SUPERSET OF)*/
|
||||
#define XK_leftshoe 0x0bda /*(U+2282 SUBSET OF)*/
|
||||
#define XK_downshoe 0x0bd6 /*(U+222A UNION) */
|
||||
#define XK_rightshoe 0x0bd8 /*(U+2283 SUPERSET OF) */
|
||||
#define XK_leftshoe 0x0bda /*(U+2282 SUBSET OF) */
|
||||
#define XK_lefttack 0x0bdc /* U+22A3 LEFT TACK */
|
||||
#define XK_righttack 0x0bfc /* U+22A2 RIGHT TACK */
|
||||
#endif /* XK_APL */
|
||||
|
|
@ -1794,7 +1794,7 @@ SOFTWARE.
|
|||
#define XK_Hangul_J_YeorinHieuh 0x0efa
|
||||
|
||||
/* Korean currency symbol */
|
||||
#define XK_Korean_Won 0x0eff /*(U+20A9 WON SIGN)*/
|
||||
#define XK_Korean_Won 0x0eff /*(U+20A9 WON SIGN) */
|
||||
|
||||
#endif /* XK_KOREAN */
|
||||
|
||||
|
|
@ -2467,8 +2467,8 @@ SOFTWARE.
|
|||
#define XK_Sinh_e2 0x1000dd9 /* U+0DD9 SINHALA KOMBUVA */
|
||||
#define XK_Sinh_ee2 0x1000dda /* U+0DDA SINHALA DIGA KOMBUVA */
|
||||
#define XK_Sinh_ai2 0x1000ddb /* U+0DDB SINHALA KOMBU DEKA */
|
||||
#define XK_Sinh_o2 0x1000ddc /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA*/
|
||||
#define XK_Sinh_oo2 0x1000ddd /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA*/
|
||||
#define XK_Sinh_o2 0x1000ddc /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA */
|
||||
#define XK_Sinh_oo2 0x1000ddd /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA */
|
||||
#define XK_Sinh_au2 0x1000dde /* U+0DDE SINHALA KOMBUVA HAA GAYANUKITTA */
|
||||
#define XK_Sinh_lu2 0x1000ddf /* U+0DDF SINHALA GAYANUKITTA */
|
||||
#define XK_Sinh_ruu2 0x1000df2 /* U+0DF2 SINHALA DIGA GAETTA-PILLA */
|
||||
|
|
|
|||
|
|
@ -36,40 +36,40 @@
|
|||
#include "string.h"
|
||||
|
||||
|
||||
class PrintView : public BView
|
||||
class PrintView:public BView
|
||||
{
|
||||
public:
|
||||
PrintView( BBitmap *bitmap)
|
||||
: BView( bitmap->Bounds(), "TuxPaint Print", B_FOLLOW_NONE, B_WILL_DRAW)
|
||||
public:
|
||||
PrintView(BBitmap * bitmap):BView(bitmap->Bounds(), "TuxPaint Print", B_FOLLOW_NONE, B_WILL_DRAW)
|
||||
{
|
||||
b = bitmap;
|
||||
};
|
||||
|
||||
~PrintView()
|
||||
{
|
||||
delete b;
|
||||
};
|
||||
void Draw( BRect updateRect)
|
||||
void Draw(BRect updateRect)
|
||||
{
|
||||
DrawBitmap( b);
|
||||
DrawBitmap(b);
|
||||
}
|
||||
private:
|
||||
BBitmap *b;
|
||||
private:
|
||||
BBitmap * b;
|
||||
};
|
||||
|
||||
|
||||
BBitmap *SurfaceToBBitmap( SDL_Surface *surf)
|
||||
BBitmap *SurfaceToBBitmap(SDL_Surface * surf)
|
||||
{
|
||||
BBitmap *bitmap = new BBitmap( BRect( 0, 0, surf->w, surf->h), B_RGBA32);
|
||||
BBitmap *bitmap = new BBitmap(BRect(0, 0, surf->w, surf->h), B_RGBA32);
|
||||
SDL_PixelFormat pixfmt;
|
||||
SDL_Surface *surf32;
|
||||
Uint8 *src,*dst;
|
||||
Uint8 *src, *dst;
|
||||
Uint32 linesize;
|
||||
int i;
|
||||
|
||||
memset( &pixfmt, 0, sizeof(pixfmt) );
|
||||
memset(&pixfmt, 0, sizeof(pixfmt));
|
||||
pixfmt.palette = NULL;
|
||||
pixfmt.BitsPerPixel = 32;
|
||||
pixfmt.BytesPerPixel= 4;
|
||||
pixfmt.BytesPerPixel = 4;
|
||||
pixfmt.Rmask = 0x00FF0000;
|
||||
pixfmt.Gmask = 0x0000FF00;
|
||||
pixfmt.Bmask = 0x000000FF;
|
||||
|
|
@ -85,68 +85,73 @@ BBitmap *SurfaceToBBitmap( SDL_Surface *surf)
|
|||
pixfmt.colorkey = 0;
|
||||
pixfmt.alpha = 0;
|
||||
|
||||
surf32 = SDL_ConvertSurface( surf, &pixfmt, SDL_SWSURFACE );
|
||||
surf32 = SDL_ConvertSurface(surf, &pixfmt, SDL_SWSURFACE);
|
||||
|
||||
linesize = surf32->w*sizeof(Uint32);
|
||||
dst = (Uint8*)bitmap->Bits();
|
||||
src = (Uint8*)surf32->pixels;
|
||||
for ( i = 0; i < surf32->h; i++ )
|
||||
linesize = surf32->w * sizeof(Uint32);
|
||||
dst = (Uint8 *) bitmap->Bits();
|
||||
src = (Uint8 *) surf32->pixels;
|
||||
for (i = 0; i < surf32->h; i++)
|
||||
{
|
||||
memcpy( dst, src, linesize );
|
||||
src += surf32->pitch-4;
|
||||
memcpy(dst, src, linesize);
|
||||
src += surf32->pitch - 4;
|
||||
dst += linesize;
|
||||
}
|
||||
|
||||
SDL_FreeSurface( surf32 ); /* Free temp surface */
|
||||
SDL_FreeSurface(surf32); /* Free temp surface */
|
||||
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
|
||||
int IsPrinterAvailable( void )
|
||||
int IsPrinterAvailable(void)
|
||||
{
|
||||
// this code is a little hack, i don't like such hardcoded things
|
||||
// but i have no choice ;]
|
||||
DIR *d;
|
||||
struct dirent *f = NULL;
|
||||
int num_files = 0;
|
||||
|
||||
d = opendir("/boot/home/config/settings/printers");
|
||||
if( d != NULL)
|
||||
if (d != NULL)
|
||||
{
|
||||
while( (f = readdir(d)) != NULL)
|
||||
while ((f = readdir(d)) != NULL)
|
||||
num_files++;
|
||||
closedir( d);
|
||||
if( num_files > 2)
|
||||
closedir(d);
|
||||
if (num_files > 2)
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int SurfacePrint( SDL_Surface *surf )
|
||||
int SurfacePrint(SDL_Surface * surf)
|
||||
{
|
||||
BWindow *window = new BWindow( BRect( 0, 0, surf->w, surf->h), "TuxPaint Print", B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_MOVABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_AVOID_FRONT | B_AVOID_FOCUS);
|
||||
PrintView *view = new PrintView( SurfaceToBBitmap( surf));
|
||||
BWindow *window =
|
||||
new BWindow(BRect(0, 0, surf->w, surf->h), "TuxPaint Print", B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
|
||||
B_NOT_MOVABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_AVOID_FRONT | B_AVOID_FOCUS);
|
||||
PrintView *view = new PrintView(SurfaceToBBitmap(surf));
|
||||
|
||||
window->AddChild(view);
|
||||
window->Run();
|
||||
|
||||
BPrintJob job("TuxPaint");
|
||||
if( job.ConfigPage() == B_OK)
|
||||
|
||||
if (job.ConfigPage() == B_OK)
|
||||
{
|
||||
if( job.ConfigJob() == B_OK)
|
||||
if (job.ConfigJob() == B_OK)
|
||||
{
|
||||
job.BeginJob();
|
||||
if( job.CanContinue())
|
||||
if (job.CanContinue())
|
||||
{
|
||||
job.DrawView(view, BRect( 0, 0, surf->w, surf->h), BPoint( 0, 0));
|
||||
job.DrawView(view, BRect(0, 0, surf->w, surf->h), BPoint(0, 0));
|
||||
job.SpoolPage();
|
||||
}
|
||||
if( job.CanContinue())
|
||||
if (job.CanContinue())
|
||||
job.CommitJob();
|
||||
}
|
||||
}
|
||||
|
||||
BMessenger( window).SendMessage( B_QUIT_REQUESTED);
|
||||
BMessenger(window).SendMessage(B_QUIT_REQUESTED);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
1
win32/.indent.pro
vendored
Symbolic link
1
win32/.indent.pro
vendored
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../src/.indent.pro
|
||||
Loading…
Add table
Add a link
Reference in a new issue