X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=196bd8e71c1aee17c67aaf12cf3f2c959715b8f3;hb=ae32fd8a4316c5d7f18fe6966f999ebf5509df94;hp=9de89c95eddf6b825d0db6fba7ec3925287e1e98;hpb=da14f69fd95c7bd5a0d70cdf4935af06f1f20a04;p=rocksndiamonds.git diff --git a/src/libgame/x11.c b/src/libgame/x11.c index 9de89c95..196bd8e7 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -1,28 +1,45 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Artsoft Retro-Game Library * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1994-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* x11.c * +* x11.c * ***********************************************************/ -#include "libgame.h" +#include "system.h" +#include "pcx.h" +#include "misc.h" + #if defined(TARGET_X11) -#include "main_TMP.h" +static void X11InitDisplay(); +static DrawWindow *X11InitWindow(); -struct IconFileInfo +inline void X11InitVideoDisplay(void) { - char *picture_filename; - char *picturemask_filename; -}; + /* initialize X11 video */ + X11InitDisplay(); + + /* set default X11 depth */ + video.default_depth = XDefaultDepth(display, screen); +} + +inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window) +{ + *window = X11InitWindow(); + + XMapWindow(display, (*window)->drawable); + FlushDisplay(); + + /* create additional (off-screen) buffer for double-buffering */ + *backbuffer = CreateBitmap(video.width, video.height, video.depth); +} static void X11InitDisplay() { @@ -70,9 +87,9 @@ static void X11InitDisplay() #endif /* !PLATFORM_MSDOS */ } -static DrawWindow X11InitWindow() +static DrawWindow *X11InitWindow() { - Window window; + DrawWindow *new_window = CreateBitmapStruct(); unsigned int border_width = 4; XGCValues gc_values; unsigned long gc_valuemask; @@ -85,23 +102,26 @@ static DrawWindow X11InitWindow() XSizeHints size_hints; XWMHints wm_hints; XClassHint class_hints; - char *window_name = WINDOW_TITLE_STRING; - char *icon_name = WINDOW_TITLE_STRING; + char *window_name = program.window_title; + char *icon_name = program.window_title; 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; + int win_xpos, win_ypos; unsigned long pen_fg = WhitePixel(display,screen); unsigned long pen_bg = BlackPixel(display,screen); - const int width = WIN_XSIZE, height = WIN_YSIZE; + const int width = video.width, height = video.height; + int i; +#if 0 #if !defined(PLATFORM_MSDOS) static struct IconFileInfo icon_pic = { "rocks_icon.xbm", "rocks_iconmask.xbm" }; +#endif #endif screen_width = XDisplayWidth(display, screen); @@ -110,32 +130,38 @@ static DrawWindow X11InitWindow() 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); + new_window->drawable = XCreateSimpleWindow(display, + RootWindow(display, screen), + win_xpos, win_ypos, + width, height, border_width, + pen_fg, pen_bg); #if !defined(PLATFORM_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, + XChangeProperty(display, new_window->drawable, proto_atom, XA_ATOM, 32, PropModePrepend, (unsigned char *) &delete_atom, 1); +#if 0 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); +#endif + XReadBitmapFile(display, new_window->drawable, program.x11_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); +#if 0 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); +#endif + XReadBitmapFile(display, new_window->drawable, program.x11_iconmask_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); @@ -162,10 +188,10 @@ static DrawWindow X11InitWindow() 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"; + class_hints.res_name = program.command_basename; + class_hints.res_class = program.program_title; - XSetWMProperties(display, window, &windowName, &iconName, + XSetWMProperties(display, new_window->drawable, &windowName, &iconName, NULL, 0, &size_hints, &wm_hints, &class_hints); @@ -178,7 +204,7 @@ static DrawWindow X11InitWindow() ButtonPressMask | ButtonReleaseMask | PointerMotionMask | PointerMotionHintMask | KeyPressMask | KeyReleaseMask; - XSelectInput(display, window, window_event_mask); + XSelectInput(display, new_window->drawable, window_event_mask); #endif /* create GC for drawing with window depth and background color (black) */ @@ -186,22 +212,68 @@ static DrawWindow X11InitWindow() gc_values.foreground = pen_bg; gc_values.background = pen_bg; gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground; - gc = XCreateGC(display, window, gc_valuemask, &gc_values); + new_window->gc = + XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values); - return window; + /* create GCs for line drawing (black and white) */ + for(i=0; i<2; i++) + { + gc_values.graphics_exposures = False; + gc_values.foreground = (i ? pen_fg : pen_bg); + gc_values.background = pen_bg; + gc_values.line_width = 4; + gc_values.line_style = LineSolid; + gc_values.cap_style = CapRound; + gc_values.join_style = JoinRound; + + gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground | + GCLineWidth | GCLineStyle | GCCapStyle | GCJoinStyle; + new_window->line_gc[i] = + XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values); + } + + return new_window; } -inline void X11InitBufferedDisplay(DrawBuffer *backbuffer, DrawWindow *window) +Bitmap *X11LoadImage(char *filename) { - X11InitDisplay(); - *window = X11InitWindow(); + Bitmap *new_bitmap = CreateBitmapStruct(); + int pcx_err; - XMapWindow(display, *window); - FlushDisplay(); +#if defined(PLATFORM_MSDOS) + rest(100); +#endif + + pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc, filename, + &new_bitmap->drawable, &new_bitmap->clip_mask); + switch(pcx_err) + { + case PCX_Success: + break; + case PCX_OpenFailed: + Error(ERR_EXIT, "cannot open PCX file '%s'", filename); + case PCX_ReadFailed: + Error(ERR_EXIT, "cannot read PCX file '%s'", filename); + case PCX_FileInvalid: + Error(ERR_EXIT, "invalid PCX file '%s'", filename); + case PCX_NoMemory: + Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename); + case PCX_ColorFailed: + Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename); + default: + break; + } + + if (!new_bitmap->drawable) + Error(ERR_EXIT, "cannot get graphics for '%s'", filename); + + if (!new_bitmap->clip_mask) + Error(ERR_EXIT, "cannot get clipmask for '%s'", filename); + + /* set GraphicContext inheritated from Window */ + new_bitmap->gc = window->gc; - /* create additional buffer for double-buffering */ - *backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); - pix[PIX_DB_BACK] = *backbuffer; /* 'backbuffer' is off-screen buffer */ + return new_bitmap; } #endif /* TARGET_X11 */