m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminated some alien tab characters in source file windows.c

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1294 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-02-01 23:17:51 +00:00
parent 59f2c45c43
commit 0125c15209
1 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
windows.c
View File

@ -1046,44 +1046,44 @@ byte Confirmation_box(char * message)
/// Window that allows you to enter a single value /// Window that allows you to enter a single value
int Requester_window(char* message, int initial_value) int Requester_window(char* message, int initial_value)
{ {
short clicked_button = 0; short clicked_button = 0;
word window_width; word window_width;
char str[10]; char str[10];
window_width=(strlen(message)<<3)+20; window_width=(strlen(message)<<3)+20;
if (window_width<120) if (window_width<120)
window_width = 120; window_width = 120;
Open_window(window_width, 60, "Request"); Open_window(window_width, 60, "Request");
Print_in_window((window_width>>1)-(strlen(message)<<2), 20, message, Print_in_window((window_width>>1)-(strlen(message)<<2), 20, message,
MC_Black, MC_Light); MC_Black, MC_Light);
sprintf(str, "%d", initial_value); sprintf(str, "%d", initial_value);
Window_set_input_button(10, 37, 4); // 1 Window_set_input_button(10, 37, 4); // 1
Print_in_window(11, 39, str, MC_Black, MC_Light); Print_in_window(11, 39, str, MC_Black, MC_Light);
Window_set_normal_button(60 ,37,40,14,"OK",1,1,SDLK_y); // 2 Window_set_normal_button(60 ,37,40,14,"OK",1,1,SDLK_y); // 2
Window_set_normal_button(130,37,60,14,"Cancel" ,1,1,SDLK_n); // 3 Window_set_normal_button(130,37,60,14,"Cancel" ,1,1,SDLK_n); // 3
Update_rect(Window_pos_X, Window_pos_Y, Menu_factor_X * window_width, Update_rect(Window_pos_X, Window_pos_Y, Menu_factor_X * window_width,
Menu_factor_Y * 60); Menu_factor_Y * 60);
Display_cursor(); Display_cursor();
do do
{ {
clicked_button = Window_clicked_button(); clicked_button = Window_clicked_button();
if (clicked_button == 1) if (clicked_button == 1)
Readline(11, 39, str, 4, 1); Readline(11, 39, str, 4, 1);
if (Key == SDLK_ESCAPE) clicked_button = 2; if (Key == SDLK_ESCAPE) clicked_button = 2;
} }
while (clicked_button <= 0); while (clicked_button <= 0);
Key = 0; Key = 0;
Close_window(); Close_window();
Display_cursor(); Display_cursor();
return clicked_button==2?-1:atoi(str); return clicked_button==2?-1:atoi(str);
} }
@ -1743,12 +1743,12 @@ void Change_magnifier_factor(byte factor_index)
// Values that need to be computed before switching to the new zoom factor // Values that need to be computed before switching to the new zoom factor
if (Cursor_in_menu || !Main_magnifier_mode) if (Cursor_in_menu || !Main_magnifier_mode)
{ {
center_x = Main_magnifier_offset_X + (Main_magnifier_width / 2); center_x = Main_magnifier_offset_X + (Main_magnifier_width / 2);
center_y = Main_magnifier_offset_Y + (Main_magnifier_height / 2); center_y = Main_magnifier_offset_Y + (Main_magnifier_height / 2);
} else { } else {
// Zoom to cursor // Zoom to cursor
center_x = (Paintbrush_X - Main_magnifier_offset_X) / (float)Main_magnifier_width; center_x = (Paintbrush_X - Main_magnifier_offset_X) / (float)Main_magnifier_width;
center_y = (Paintbrush_Y - Main_magnifier_offset_Y) / (float)Main_magnifier_height; center_y = (Paintbrush_Y - Main_magnifier_offset_Y) / (float)Main_magnifier_height;
} }
Main_magnifier_factor=ZOOM_FACTOR[factor_index]; Main_magnifier_factor=ZOOM_FACTOR[factor_index];
@ -1758,14 +1758,14 @@ void Change_magnifier_factor(byte factor_index)
{ {
// Recalculer le décalage de la loupe // Recalculer le décalage de la loupe
// Centrage "brut" de lécran par rapport à la loupe // Centrage "brut" de lécran par rapport à la loupe
if (Cursor_in_menu) if (Cursor_in_menu)
{ {
Main_magnifier_offset_X=center_x-(Main_magnifier_width>>1); Main_magnifier_offset_X=center_x-(Main_magnifier_width>>1);
Main_magnifier_offset_Y=center_y-(Main_magnifier_height>>1); Main_magnifier_offset_Y=center_y-(Main_magnifier_height>>1);
} else { } else {
Main_magnifier_offset_X = Paintbrush_X - center_x * Main_magnifier_width ; Main_magnifier_offset_X = Paintbrush_X - center_x * Main_magnifier_width ;
Main_magnifier_offset_Y = Paintbrush_Y - center_y * Main_magnifier_height ; Main_magnifier_offset_Y = Paintbrush_Y - center_y * Main_magnifier_height ;
} }
// Correction en cas de débordement de l'image // Correction en cas de débordement de l'image
if (Main_magnifier_offset_X+Main_magnifier_width>Main_image_width) if (Main_magnifier_offset_X+Main_magnifier_width>Main_image_width)
Main_magnifier_offset_X=Main_image_width-Main_magnifier_width; Main_magnifier_offset_X=Main_image_width-Main_magnifier_width;
@ -1930,17 +1930,17 @@ void Display_cursor(void)
start_y=Mouse_Y-Gfx->Cursor_offset_Y[temp]; start_y=Mouse_Y-Gfx->Cursor_offset_Y[temp];
for (y_pos=start_y,counter_y=0; counter_y<15 && y_pos < Screen_height; for (y_pos=start_y,counter_y=0; counter_y<15 && y_pos < Screen_height;
y_pos++,counter_y++) y_pos++,counter_y++)
{ {
if( y_pos < 0 ) continue; if( y_pos < 0 ) continue;
for (x_pos=start_x,counter_x=0; for (x_pos=start_x,counter_x=0;
counter_x<15 && x_pos < Screen_width; x_pos++,counter_x++) counter_x<15 && x_pos < Screen_width; x_pos++,counter_x++)
{ {
if( x_pos < 0 ) continue; if( x_pos < 0 ) continue;
color=Gfx->Cursor_sprite[temp][counter_y][counter_x]; color=Gfx->Cursor_sprite[temp][counter_y][counter_x];
Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos); Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos);
if (color!=MC_Trans) if (color!=MC_Trans)
Pixel(x_pos,y_pos,color); Pixel(x_pos,y_pos,color);
} }
} }
@ -2001,17 +2001,17 @@ void Display_cursor(void)
for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++) for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++)
{ {
if(y_pos<0) continue; if(y_pos<0) continue;
if(y_pos>=Screen_height) break; if(y_pos>=Screen_height) break;
for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++) for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++)
{ {
if(x_pos<0) continue; if(x_pos<0) continue;
if(x_pos>=Screen_width) break; if(x_pos>=Screen_width) break;
color=Gfx->Cursor_sprite[temp][counter_y][counter_x]; color=Gfx->Cursor_sprite[temp][counter_y][counter_x];
// On sauvegarde dans Cursor_background pour restaurer plus tard // On sauvegarde dans Cursor_background pour restaurer plus tard
Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos); Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos);
if (color!=MC_Trans) if (color!=MC_Trans)
Pixel(x_pos,y_pos,color); Pixel(x_pos,y_pos,color);
} }
} }
Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y); Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y);
@ -2030,16 +2030,16 @@ void Display_cursor(void)
start_y=Mouse_Y-Gfx->Cursor_offset_Y[shape]; start_y=Mouse_Y-Gfx->Cursor_offset_Y[shape];
for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++) for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++)
{ {
if(y_pos<0) continue; if(y_pos<0) continue;
if(y_pos>=Screen_height) break; if(y_pos>=Screen_height) break;
for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++) for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++)
{ {
if(x_pos<0) continue; if(x_pos<0) continue;
if(x_pos>=Screen_width) break; if(x_pos>=Screen_width) break;
color=Gfx->Cursor_sprite[shape][counter_y][counter_x]; color=Gfx->Cursor_sprite[shape][counter_y][counter_x];
// On sauvegarde dans Cursor_background pour restaurer plus tard // On sauvegarde dans Cursor_background pour restaurer plus tard
Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos); Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos);
if (color!=MC_Trans) if (color!=MC_Trans)
Pixel(x_pos,y_pos,color); Pixel(x_pos,y_pos,color);
} }
} }
@ -2235,7 +2235,7 @@ void Hide_cursor(void)
for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++) for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++)
{ {
if(y_pos < 0) continue; if(y_pos < 0) continue;
if(y_pos>=Screen_height) break; if(y_pos>=Screen_height) break;
for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++) for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++)
{ {
@ -2304,10 +2304,10 @@ void Hide_cursor(void)
for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++) for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++)
{ {
if(y_pos<0) continue; if(y_pos<0) continue;
if(y_pos>=Screen_height) break; if(y_pos>=Screen_height) break;
for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++) for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++)
{ {
if(x_pos<0) continue; if(x_pos<0) continue;
if(x_pos>=Screen_width) break; if(x_pos>=Screen_width) break;
Pixel(x_pos,y_pos,Cursor_background[counter_y][counter_x]); Pixel(x_pos,y_pos,Cursor_background[counter_y][counter_x]);
@ -2334,10 +2334,10 @@ void Hide_cursor(void)
{ {
if(y_pos<0) continue; if(y_pos<0) continue;
if(y_pos>=Screen_height) break; if(y_pos>=Screen_height) break;
for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++) for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++)
{ {
if(x_pos<0) continue; if(x_pos<0) continue;
if(x_pos>=Screen_width) break; if(x_pos>=Screen_width) break;
Pixel(x_pos,y_pos,Cursor_background[counter_y][counter_x]); Pixel(x_pos,y_pos,Cursor_background[counter_y][counter_x]);
} }
} }
@ -2918,10 +2918,10 @@ void Remap_menu_sprites()
for (i=0; i<ICON_SPRITE_WIDTH; i++) for (i=0; i<ICON_SPRITE_WIDTH; i++)
Remap_pixel(&Gfx->Icon_sprite[k][j][i]); Remap_pixel(&Gfx->Icon_sprite[k][j][i]);
// Skin preview // Skin preview
for (j = 0; j < 173; j++) for (j = 0; j < 173; j++)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
Remap_pixel(&Gfx->Preview[i][j]); Remap_pixel(&Gfx->Preview[i][j]);
} }
Clear_border(MC_Black); Clear_border(MC_Black);
} }