X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=60e0bcd3c22fd6135785dca3291bcc050e787e2f;hb=1150bdce04915bf329bd816307fb2507eba80e15;hp=66f4d178bbbed0d40c7e698e7eb47def71eb87db;hpb=4cc378525f493292a995869afcf0c45f1f38f951;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 66f4d178..60e0bcd3 100644 --- a/src/init.c +++ b/src/init.c @@ -35,23 +35,11 @@ struct PictureFileInfo boolean picture_with_mask; }; -struct IconFileInfo -{ - char *picture_filename; - char *picturemask_filename; -}; - -#ifndef USE_SDL_LIBRARY -static int sound_process_id = 0; -#endif - static void InitPlayerInfo(void); static void InitLevelInfo(void); static void InitNetworkServer(void); -static void InitDisplay(void); static void InitSound(void); static void InitSoundServer(void); -static void InitWindow(int, char **); static void InitGfx(void); static void InitGfxBackground(void); static void LoadGfx(int, struct PictureFileInfo *); @@ -60,16 +48,16 @@ static void InitElementProperties(void); void OpenAll(int argc, char *argv[]) { -#if defined(MSDOS) || defined(WIN32) +#if !defined(PLATFORM_UNIX) initErrorFile(); #endif if (options.serveronly) { -#ifdef WIN32 - Error(ERR_WARN, "networking not supported in Windows version"); -#else +#if defined(PLATFORM_UNIX) NetworkServer(options.server_port, options.serveronly); +#else + Error(ERR_WARN, "networking not supported in Windows version"); #endif /* never reached */ @@ -87,13 +75,8 @@ void OpenAll(int argc, char *argv[]) signal(SIGINT, CloseAllAndExit); signal(SIGTERM, CloseAllAndExit); - InitDisplay(); - InitWindow(argc, argv); - -#ifndef USE_SDL_LIBRARY - XMapWindow(display, window); - FlushDisplay(); -#endif + InitBufferedDisplay(&backbuffer, &window); + InitEventFilter(FilterMouseMotionEvents); InitGfx(); InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ @@ -134,14 +117,14 @@ void InitLevelInfo() void InitNetworkServer() { -#if !defined(MSDOS) && !defined(WIN32) +#if defined(PLATFORM_UNIX) int nr_wanted; #endif if (!options.network) return; -#if !defined(MSDOS) && !defined(WIN32) +#if defined(PLATFORM_UNIX) nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED); if (!ConnectToServer(options.server_host, options.server_port)) @@ -159,69 +142,35 @@ void InitSound() { int i; - if (sound_status == SOUND_OFF) + /* REMOVE THIS! (gone to system.c:InitAudio) */ + if (!sysinfo.audio_available) return; -#ifdef USE_SDL_LIBRARY - /* initialize SDL audio */ - - if (SDL_Init(SDL_INIT_AUDIO) < 0) +#if defined(TARGET_SDL) + if (InitAudio()) { - Error(ERR_WARN, "SDL_Init() failed: %s", SDL_GetError()); - sound_status = SOUND_OFF; - return; + sysinfo.audio_available = TRUE; + sysinfo.audio_loops_available = TRUE; } - - if (Mix_OpenAudio(22050, AUDIO_S16, 2, 512) < 0) - { - Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError()); - sound_status = SOUND_OFF; - return; - } - - Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4); - Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4); - - sound_status = SOUND_AVAILABLE; - sound_loops_allowed = TRUE; - -#else /* !USE_SDL_LIBRARY */ - -#if !defined(MSDOS) && !defined(WIN32) - if (access(sound_device_name, W_OK) != 0) + else { - Error(ERR_WARN, "cannot access sound device - no sounds"); - sound_status = SOUND_OFF; - return; + sysinfo.audio_available = FALSE; } +#else /* !TARGET_SDL */ - if ((sound_device = OpenAudio(sound_device_name)) < 0) - { - Error(ERR_WARN, "cannot open sound device - no sounds"); - sound_status = SOUND_OFF; +#if defined(PLATFORM_UNIX) + if (!(sysinfo.audio_available = CheckAudio(sound_device_name))) return; - } - - close(sound_device); - sound_status = SOUND_AVAILABLE; #ifdef VOXWARE - sound_loops_allowed = TRUE; - - /* - setup.sound_loops_on = TRUE; - */ - + sysinfo.audio_loops_available = TRUE; #endif -#else /* MSDOS || WIN32 */ - sound_loops_allowed = TRUE; - /* - setup.sound_loops_on = TRUE; - */ +#else /* !PLATFORM_UNIX */ + sysinfo.audio_loops_available = TRUE; -#endif /* MSDOS || WIN32 */ -#endif /* !USE_SDL_LIBRARY */ +#endif /* !PLATFORM_UNIX */ +#endif /* !TARGET_SDL */ for(i=0; ivisual; - XFree((void *)vinfo); - } - - /* got appropriate visual? */ - if (depth < 8) - { - printf("Sorry, displays with less than 8 bits per pixel not supported.\n"); - exit(-1); - } - else if ((depth ==8 && visual->class != PseudoColor) || - (depth > 8 && visual->class != TrueColor && - visual->class != DirectColor)) - { - printf("Sorry, cannot get appropriate visual.\n"); - exit(-1); - } -#endif /* !MSDOS */ -#endif /* !USE_SDL_LIBRARY */ -} - -void InitWindow(int argc, char *argv[]) -{ -#ifdef USE_SDL_LIBRARY - /* open SDL video output device (window or fullscreen mode) */ -#if 0 - if ((backbuffer = SDL_SetVideoMode(WIN_XSIZE, WIN_YSIZE, WIN_SDL_DEPTH, - SDL_HWSURFACE)) - == NULL) - Error(ERR_EXIT, "SDL_SetVideoMode() failed: %s", SDL_GetError()); -#else - if (!SetVideoMode()) - Error(ERR_EXIT, "setting video mode failed"); -#endif - - /* set window and icon title */ - SDL_WM_SetCaption(WINDOW_TITLE_STRING, WINDOW_TITLE_STRING); - - /* set event filter to filter out certain mouse motion events */ - SDL_SetEventFilter(EventFilter); - -#else /* !USE_SDL_LIBRARY */ - - unsigned int border_width = 4; - XGCValues gc_values; - unsigned long gc_valuemask; -#ifndef MSDOS - XTextProperty windowName, iconName; - Pixmap icon_pixmap, iconmask_pixmap; - unsigned int icon_width, icon_height; - int icon_hot_x, icon_hot_y; - char icon_filename[256]; - XSizeHints size_hints; - XWMHints wm_hints; - XClassHint class_hints; - char *window_name = WINDOW_TITLE_STRING; - char *icon_name = WINDOW_TITLE_STRING; - long window_event_mask; - Atom proto_atom = None, delete_atom = None; -#endif - int screen_width, screen_height; - int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS; - unsigned long pen_fg = WhitePixel(display,screen); - unsigned long pen_bg = BlackPixel(display,screen); - const int width = WIN_XSIZE, height = WIN_YSIZE; - -#ifndef MSDOS - static struct IconFileInfo icon_pic = - { - "rocks_icon.xbm", - "rocks_iconmask.xbm" - }; -#endif - - screen_width = XDisplayWidth(display, screen); - screen_height = XDisplayHeight(display, screen); - - win_xpos = (screen_width - width) / 2; - win_ypos = (screen_height - height) / 2; - - window = XCreateSimpleWindow(display, RootWindow(display, screen), - win_xpos, win_ypos, width, height, border_width, - pen_fg, pen_bg); - -#ifndef MSDOS - proto_atom = XInternAtom(display, "WM_PROTOCOLS", FALSE); - delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", FALSE); - if ((proto_atom != None) && (delete_atom != None)) - XChangeProperty(display, window, proto_atom, XA_ATOM, 32, - PropModePrepend, (unsigned char *) &delete_atom, 1); - - sprintf(icon_filename, "%s/%s/%s", - options.ro_base_directory, GRAPHICS_DIRECTORY, - icon_pic.picture_filename); - XReadBitmapFile(display,window,icon_filename, - &icon_width,&icon_height, - &icon_pixmap,&icon_hot_x,&icon_hot_y); - if (!icon_pixmap) - Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename); - - sprintf(icon_filename, "%s/%s/%s", - options.ro_base_directory, GRAPHICS_DIRECTORY, - icon_pic.picturemask_filename); - XReadBitmapFile(display,window,icon_filename, - &icon_width,&icon_height, - &iconmask_pixmap,&icon_hot_x,&icon_hot_y); - if (!iconmask_pixmap) - Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename); - - size_hints.width = size_hints.min_width = size_hints.max_width = width; - size_hints.height = size_hints.min_height = size_hints.max_height = height; - size_hints.flags = PSize | PMinSize | PMaxSize; - - if (win_xpos || win_ypos) - { - size_hints.x = win_xpos; - size_hints.y = win_ypos; - size_hints.flags |= PPosition; - } - - if (!XStringListToTextProperty(&window_name, 1, &windowName)) - Error(ERR_EXIT, "structure allocation for windowName failed"); - - if (!XStringListToTextProperty(&icon_name, 1, &iconName)) - Error(ERR_EXIT, "structure allocation for iconName failed"); - - wm_hints.initial_state = NormalState; - wm_hints.input = True; - wm_hints.icon_pixmap = icon_pixmap; - wm_hints.icon_mask = iconmask_pixmap; - wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint; - - class_hints.res_name = program_name; - class_hints.res_class = "Rocks'n'Diamonds"; - - XSetWMProperties(display, window, &windowName, &iconName, - argv, argc, &size_hints, &wm_hints, - &class_hints); - - XFree(windowName.value); - XFree(iconName.value); - - /* Select event types wanted */ - window_event_mask = - ExposureMask | StructureNotifyMask | FocusChangeMask | - ButtonPressMask | ButtonReleaseMask | PointerMotionMask | - PointerMotionHintMask | KeyPressMask | KeyReleaseMask; - - XSelectInput(display, window, window_event_mask); -#endif - - /* create GC for drawing with window depth and background color (black) */ - gc_values.graphics_exposures = False; - gc_values.foreground = pen_bg; - gc_values.background = pen_bg; - gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground; - gc = XCreateGC(display, window, gc_valuemask, &gc_values); -#endif /* !USE_SDL_LIBRARY */ +#endif /* !TARGET_SDL */ } void InitGfx() { int i, j; -#ifdef USE_SDL_LIBRARY +#if defined(TARGET_SDL) SDL_Surface *sdl_image_tmp; #else GC copy_clipmask_gc; @@ -603,21 +349,7 @@ void InitGfx() unsigned long clip_gc_valuemask; #endif -#ifdef MSDOS - static struct PictureFileInfo pic[NUM_PICTURES] = - { - { "Screen", TRUE }, - { "Door", TRUE }, - { "Heroes", TRUE }, - { "Toons", TRUE }, - { "SP", TRUE }, - { "DC", TRUE }, - { "More", TRUE }, - { "Font", FALSE }, - { "Font2", FALSE }, - { "Font3", FALSE } - }; -#else +#if !defined(PLATFORM_MSDOS) static struct PictureFileInfo pic[NUM_PICTURES] = { { "RocksScreen", TRUE }, @@ -631,21 +363,20 @@ void InitGfx() { "RocksFont2", FALSE }, { "RocksFont3", FALSE } }; -#endif - -#ifdef DEBUG -#if 0 - static struct PictureFileInfo test_pic1 = - { - "RocksFont2", - FALSE - }; - static struct PictureFileInfo test_pic2 = +#else + static struct PictureFileInfo pic[NUM_PICTURES] = { - "mouse", - FALSE - }; -#endif + { "Screen", TRUE }, + { "Door", TRUE }, + { "Heroes", TRUE }, + { "Toons", TRUE }, + { "SP", TRUE }, + { "DC", TRUE }, + { "More", TRUE }, + { "Font", FALSE }, + { "Font2", FALSE }, + { "Font3", FALSE } + }; #endif static struct @@ -702,114 +433,25 @@ void InitGfx() /* create additional image buffers for double-buffering */ -#ifdef USE_SDL_LIBRARY - - /* create some native image surfaces for double-buffer purposes */ - - /* create double-buffer surface for background image */ - if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, - WIN_XSIZE, WIN_YSIZE, - WIN_SDL_DEPTH, 0, 0, 0, 0)) - == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - if ((pix[PIX_DB_BACK] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - SDL_FreeSurface(sdl_image_tmp); - - /* create double-buffer surface for door image */ - if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, - 3 * DXSIZE, DYSIZE + VYSIZE, - WIN_SDL_DEPTH, 0, 0, 0, 0)) - == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - if ((pix[PIX_DB_DOOR] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - SDL_FreeSurface(sdl_image_tmp); - - /* create double-buffer surface for field image */ - if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, - FXSIZE, FYSIZE, - WIN_SDL_DEPTH, 0, 0, 0, 0)) - == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - if ((pix[PIX_DB_FIELD] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - SDL_FreeSurface(sdl_image_tmp); - - /* SDL cannot directly draw to the visible video framebuffer like X11, - but always uses a backbuffer, which is then blitted to the visible - video framebuffer with 'SDL_UpdateRect' (or replaced with the current - visible video framebuffer with 'SDL_Flip', if the hardware supports - this). Therefore do not use an additional backbuffer for drawing, but - use a symbolic buffer (distinguishable from the SDL backbuffer) called - 'window', which indicates that the SDL backbuffer should be updated to - the visible video framebuffer when attempting to blit to it. - - For convenience, it seems to be a good idea to create this symbolic - buffer 'window' at the same size as the SDL backbuffer. Although it - should never be drawn to directly, it would do no harm nevertheless. */ - - window = pix[PIX_DB_BACK]; /* 'window' is only symbolic buffer */ - pix[PIX_DB_BACK] = backbuffer; /* 'backbuffer' is SDL screen buffer */ - -#else /* !USE_SDL_LIBRARY */ - - pix[PIX_DB_BACK] = XCreatePixmap(display, window, - WIN_XSIZE,WIN_YSIZE, - XDefaultDepth(display,screen)); - pix[PIX_DB_DOOR] = XCreatePixmap(display, window, - 3*DXSIZE,DYSIZE+VYSIZE, - XDefaultDepth(display,screen)); - pix[PIX_DB_FIELD] = XCreatePixmap(display, window, - FXSIZE,FYSIZE, - XDefaultDepth(display,screen)); - - if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR] || !pix[PIX_DB_FIELD]) - Error(ERR_EXIT, "cannot create additional pixmaps"); - -#endif /* !USE_SDL_LIBRARY */ - -#if DEBUG_TIMING - debug_print_timestamp(0, NULL); /* initialize timestamp function */ -#endif - -#ifdef DEBUG -#if 0 - printf("Test: Loading RocksFont2.pcx ...\n"); - LoadGfx(PIX_SMALLFONT,&test_pic1); - printf("Test: Done.\n"); - printf("Test: Loading mouse.pcx ...\n"); - LoadGfx(PIX_SMALLFONT,&test_pic2); - printf("Test: Done.\n"); -#endif -#endif + pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); + pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); LoadGfx(PIX_SMALLFONT, &pic[PIX_SMALLFONT]); DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW); DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED); -#ifdef MSDOS +#if defined(PLATFORM_MSDOS) DrawInitText(PROGRAM_DOS_PORT_STRING, 210, FC_BLUE); rest(200); -#endif /* MSDOS */ +#endif DrawInitText("Loading graphics:",120,FC_GREEN); for(i=0; ipicture_filename) { @@ -949,15 +580,11 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) sprintf(filename, "%s/%s/%s", options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename); -#ifdef MSDOS +#if defined(PLATFORM_MSDOS) rest(100); -#endif /* MSDOS */ - -#if DEBUG_TIMING - debug_print_timestamp(1, NULL); /* initialize timestamp function */ #endif -#ifdef USE_SDL_LIBRARY +#if defined(TARGET_SDL) /* load image to temporary surface */ if ((sdl_image_tmp = IMG_Load(filename)) == NULL) Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError()); @@ -975,34 +602,7 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) /* free temporary surface */ SDL_FreeSurface(sdl_image_tmp); -#else /* !USE_SDL_LIBRARY */ - -#ifdef USE_XPM_LIBRARY - - xpm_att[pos].valuemask = XpmCloseness; - xpm_att[pos].closeness = 20000; - xpm_err = XpmReadFileToPixmap(display,window,filename, - &pix[pos],&shapemask,&xpm_att[pos]); - switch(xpm_err) - { - case XpmOpenFailed: - Error(ERR_EXIT, "cannot open XPM file '%s'", filename); - case XpmFileInvalid: - Error(ERR_EXIT, "invalid XPM file '%s'", filename); - case XpmNoMemory: - Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename); - case XpmColorFailed: - Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename); - default: - break; - } - -#if DEBUG_TIMING - printf("LOADING XPM FILE %s:", filename); - debug_print_timestamp(1, ""); -#endif - -#else /* !USE_XPM_LIBRARY */ +#else /* !TARGET_SDL */ pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename, &pix[pos], &clipmask[pos]); @@ -1024,13 +624,6 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) break; } -#if DEBUG_TIMING - printf("SUMMARY LOADING PCX FILE %s:", filename); - debug_print_timestamp(1, ""); -#endif - -#endif /* !USE_XPM_LIBRARY */ - if (!pix[pos]) Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename); @@ -1038,52 +631,14 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) use pix_masked[], although they are the same when not using SDL */ pix_masked[pos] = pix[pos]; -#endif /* !USE_SDL_LIBRARY */ +#endif /* !TARGET_SDL */ } -#ifndef USE_SDL_LIBRARY - /* zugehörige Maske laden (wenn vorhanden) */ - if (pic->picture_with_mask) - { -#ifdef USE_XPM_LIBRARY - - sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext); - DrawInitText(basefilename, 150, FC_YELLOW); - sprintf(filename, "%s/%s/%s", - options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename); - -#if DEBUG_TIMING - debug_print_timestamp(1, NULL); /* initialize timestamp function */ +#if defined(TARGET_X11) + /* check if clip mask was correctly created */ + if (pic->picture_with_mask && !clipmask[pos]) + Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename); #endif - - xbm_err = XReadBitmapFile(display,window,filename, - &width,&height,&clipmask[pos],&hot_x,&hot_y); - switch(xbm_err) - { - case BitmapSuccess: - break; - case BitmapOpenFailed: - Error(ERR_EXIT, "cannot open XBM file '%s'", filename); - case BitmapFileInvalid: - Error(ERR_EXIT, "invalid XBM file '%s'", filename); - case BitmapNoMemory: - Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename); - break; - default: - break; - } - -#if DEBUG_TIMING - printf("LOADING XBM FILE %s:", filename); - debug_print_timestamp(1, ""); -#endif - -#endif /* USE_XPM_LIBRARY */ - - if (!clipmask[pos]) - Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename); - } -#endif /* !USE_SDL_LIBRARY */ } void InitGadgets() @@ -2247,14 +1802,14 @@ void CloseAllAndExit(int exit_value) { int i; -#ifdef USE_SDL_LIBRARY +#if defined(TARGET_SDL) StopSounds(); FreeSounds(NUM_SOUNDS); #else - if (sound_process_id) + if (sysinfo.audio_process_id) { StopSounds(); - kill(sound_process_id, SIGTERM); + kill(sysinfo.audio_process_id, SIGTERM); FreeSounds(NUM_SOUNDS); } #endif @@ -2262,34 +1817,19 @@ void CloseAllAndExit(int exit_value) for(i=0; i