#include "game.h"
#include "gui.h"
#include "text.h"
+#include "syswm.h"
#include "st_conf.h"
#include "st_all.h"
static int shot(void)
{
static char filename[MAXSTR];
- static int num = 0;
- sprintf(filename, "screen%02d.png", num++);
-
- image_snap(filename);
+ sprintf(filename, "screen%05d.png", config_screenshot());
+ image_snap(config_user(filename));
return 1;
}
-
/*---------------------------------------------------------------------------*/
static void toggle_wire(void)
case SDL_ACTIVEEVENT:
if (e.active.state == SDL_APPINPUTFOCUS)
- {
- if (e.active.gain == 0)
+ if (e.active.gain == 0 && config_get_grab())
goto_pause(&st_over, 0);
- }
break;
case SDL_JOYAXISMOTION:
int main(int argc, char *argv[])
{
int camera = 0;
- SDL_Surface *icon;
SDL_Joystick *joy = NULL;
srand((int) time(NULL));
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-#ifndef __APPLE__
- if ((icon = load_surface("icon/neverputt.png")))
- {
- SDL_WM_SetIcon(icon, NULL);
- free(icon->pixels);
- SDL_FreeSurface(icon);
- }
-#endif /* __APPLE__ */
+ /* This has to happen before mode setting... */
+
+ set_SDL_icon("icon/neverputt.png");
/* Initialize the video. */
{
int t1, t0 = SDL_GetTicks();
+ /* ... and this has to happen after it. */
+
+ set_EWMH_icon("icon/neverputt.png");
+
SDL_WM_SetCaption(TITLE, TITLE);
/* Run the main game loop. */
if ((t1 = SDL_GetTicks()) > t0)
{
st_timer((t1 - t0) / 1000.f);
- st_paint();
+ st_paint(0.001f * t1);
SDL_GL_SwapBuffers();
t0 = t1;