/***********************************************************
-* 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 "misc.h"
+
#if defined(TARGET_X11)
-#include "main_TMP.h"
+static void X11InitDisplay();
+static DrawWindow X11InitWindow();
+
+inline void X11InitVideoDisplay(void)
+{
+ /* initialize X11 video */
+ X11InitDisplay();
+
+ /* set default X11 depth */
+ video.default_depth = XDefaultDepth(display, screen);
+}
-struct IconFileInfo
+inline void X11InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window)
{
- char *picture_filename;
- char *picturemask_filename;
-};
+ *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()
{
static DrawWindow X11InitWindow()
{
- Window window;
+ DrawWindow new_window = CreateBitmapStruct();
unsigned int border_width = 4;
XGCValues gc_values;
unsigned long gc_valuemask;
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;
+#if 0
#if !defined(PLATFORM_MSDOS)
static struct IconFileInfo icon_pic =
{
"rocks_icon.xbm",
"rocks_iconmask.xbm"
};
+#endif
#endif
screen_width = XDisplayWidth(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);
+ 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);
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);
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) */
gc_values.foreground = pen_bg;
gc_values.background = pen_bg;
gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground;
- gc = XCreateGC(display, window, gc_valuemask, &gc_values);
-
- return window;
-}
-
-inline void X11InitBufferedDisplay(DrawBuffer *backbuffer, DrawWindow *window)
-{
- X11InitDisplay();
- *window = X11InitWindow();
-
- XMapWindow(display, *window);
- FlushDisplay();
+ new_window->gc =
+ XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values);
- /* 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_window;
}
#endif /* TARGET_X11 */
projects / rocksndiamonds.git / blobdiff