From 7321981f8541a917c41080a83e3961efefd74eec Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Wed, 15 Oct 2003 23:06:37 +0000
Subject: [PATCH] Removed svgalib
---
Rules.make.orig | 14 -
configure.in | 5 +-
setup | 39 -
src/include/stratagus.h | 1 -
src/stratagus/script.cpp | 3 -
src/stratagus/stratagus.cpp | 3 -
src/video/Module.make | 4 +-
src/video/svgalib.cpp | 1344 -----------------------------------
src/video/video.cpp | 27 +-
9 files changed, 6 insertions(+), 1434 deletions(-)
delete mode 100644 src/video/svgalib.cpp
diff --git a/Rules.make.orig b/Rules.make.orig
index a70efdd22..615484b91 100644
--- a/Rules.make.orig
+++ b/Rules.make.orig
@@ -61,12 +61,6 @@ SDL = -DUSE_SDL -DUSE_SDLA $(SDL_CFLAGS)
VIDEO = -DUSE_X11
VIDEOLIB = -lXext -lX11 -ldl
-#------------------------------------------------------------------------------
-# Uncomment th next to get svgalib support.
-
-#VIDEO = -DUSE_SVGALIB
-#VIDEOLIB = -lvga -lm -ldl
-
#------------------------------------------------------------------------------
# Uncomment one of the next for the SDL support.
@@ -75,11 +69,6 @@ VIDEOLIB = -lXext -lX11 -ldl
#VIDEO = $(SDL)
#VIDEOLIB = $(SDLLIB)
-# Uncomment the next for the SDL X11/SVGALIB support.
-
-#VIDEO = $(SDL)
-#VIDEOLIB = $(SDLLIB) -lXext -lX11 -lXxf86dga -lXxf86vm -lvga -lvgagl -ldl -lesd -lm -lslang -lgpm
-
# Uncomment the next for the win32/cygwin support. (not working?)
#VIDEO = -DUSE_WIN32 $(SDL)
@@ -196,9 +185,6 @@ OBJDIR=.
#EXE=.exe
#OBJDIR=.
-## architecture-dependant objects
-#ARCHOBJS=stdmman.$(OE) svgalib.$(OE) unix_lib.$(OE) bitm_lnx.$(OE)
-
## include flags
IFLAGS= -I$(TOPDIR)/src/include $(XIFLAGS) -I$(TOPDIR)/src/movie/vp31/include
## define flags
diff --git a/configure.in b/configure.in
index 72bace0ea..99919e1f5 100644
--- a/configure.in
+++ b/configure.in
@@ -105,7 +105,7 @@ dnl [ --enable-optimization [Enable detection of optimization flags (defau
dnl FIXME: todo
AC_ARG_WITH(client,
- [ --with-client=sdl,x11,svgalib
+ [ --with-client=sdl,x11
[Select which client (default: sdl)]])
THREAD_LIBS=
if test "$with_client" = "x11"; then
@@ -117,9 +117,6 @@ if test "$with_client" = "x11"; then
else
THREAD_LIBS="-lpthread"
fi
-elif test "$with_client" = "svgalib"; then
- VIDEO_CFLAGS="-DUSE_SVGALIB"
- VIDEO_LIBS="-lvga"
else
AC_CHECK_HEADERS(SDL/SDL.h,, AC_MSG_ERROR(could not find SDL/SDL.h))
VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `sdl-config --cflags`"
diff --git a/setup b/setup
index d851fb666..fff29d718 100755
--- a/setup
+++ b/setup
@@ -433,17 +433,6 @@ fi
if [ "$BEOS" != "1" ] ; then
-if [ "$DARWIN" != "1" ] && [ "$WIN32" != "1" ] ; then
- # Check for SVGALIB
- LIBCHECK="-lvga -lvgagl"
- check_for_libs
- if test "$?" = 0 ; then
- HAVESVGA=1
- else
- echo "...You do not appear to have SVGALIB installed"
- fi
-fi
-
if test "$WIN32" = 0 ; then
echo
echo "VIDEO DRIVER OPTIONS"
@@ -452,12 +441,6 @@ if test "$WIN32" = 0 ; then
if test "$HAVESDL" = 1 ; then
echo " S - SDL Support"
fi
- if test "$HAVESVGA" = 1 ; then
- echo " V - SVGALIB Support"
- fi
- if (test "$HAVESVGA" = 1 && test "$HAVESDL" = 1) ; then
- echo " B - SDL/SVGALIB Support"
- fi
echo
echo -n "Please enter selection: (s) "
read $N VIDSEL
@@ -480,25 +463,6 @@ fi
echo "# Video support" >> $RULESFILE
case $VIDSEL in
- [vV])
- echo "-> Using SVGALIB"
- echo "VIDEO = -DUSE_SVGALIB" >> $RULESFILE
- echo "VIDEOLIB = -lvga $DL" >> $RULESFILE
- ;;
-
- [bB])
- echo "-> Using SDL/SVGALIB"
- USESDL=1
- SDLLIB="\$(shell $SDL_CONFIG --libs)"
- echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
- echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
- echo "SDLLIB = $SDLLIB" >> $RULESFILE
- echo >> $RULESFILE
- echo "VIDEO = \$(SDL)" >> $RULESFILE
- echo "VIDEOLIB = \$(SDLLIB) -lvga -lvgagl $DL" >> $RULESFILE
- echo
- ;;
-
[xX])
echo "-> Using X11"
echo "VIDEO = -DUSE_X11" >> $RULESFILE
@@ -1085,9 +1049,6 @@ fi
#------------------------------------------------------------------------------
# architecture-dependent objects
-echo >> $RULESFILE
-echo "#ARCHOBJS=stdmman.\$(OE) svgalib.\$(OE) unix_lib.\$(OE) bitm_lnx.\$(OE)" >> $RULESFILE
-
# include flags
echo "IFLAGS= -I\$(TOPDIR)/src/include \$(XIFLAGS) -I\$(TOPDIR)/src/movie/vp31/include" >> $RULESFILE
diff --git a/src/include/stratagus.h b/src/include/stratagus.h
index d2f38bd9e..c70c525aa 100644
--- a/src/include/stratagus.h
+++ b/src/include/stratagus.h
@@ -45,7 +45,6 @@
#define noUSE_SDL /// Remove no for sdl support
#define noUSE_SDLA /// Remove no for sdl audio support
#define noUSE_X11 /// Remove no for x11 support
-#define noUSE_SVGALIB /// Remove no for svgalib support
#define noUSE_WINCE /// Remove no for win-ce video support
/**
diff --git a/src/stratagus/script.cpp b/src/stratagus/script.cpp
index 82d0c299b..7919e6b0f 100644
--- a/src/stratagus/script.cpp
+++ b/src/stratagus/script.cpp
@@ -919,9 +919,6 @@ global void InitCcl(void)
#ifdef USE_X11
gh_define("stratagus-feature-x11", SCM_BOOL_T);
#endif
-#ifdef USE_SVGALIB
- gh_define("stratagus-feature-svgalib", SCM_BOOL_T);
-#endif
#ifdef WITH_SOUND
gh_define("stratagus-feature-with-sound", SCM_BOOL_T);
#endif
diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp
index 5108676d2..bae64b5e6 100644
--- a/src/stratagus/stratagus.cpp
+++ b/src/stratagus/stratagus.cpp
@@ -1184,9 +1184,6 @@ local void PrintHeader(void)
#ifdef USE_ZZIPLIB
"ZZIPLIB "
#endif
-#ifdef USE_SVGALIB
- "SVGALIB "
-#endif
#ifdef USE_SDL
"SDL "
#endif
diff --git a/src/video/Module.make b/src/video/Module.make
index 3dd926be4..b04041dc2 100644
--- a/src/video/Module.make
+++ b/src/video/Module.make
@@ -1,4 +1,4 @@
-SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c src/video/graphic.c src/video/linedraw.c src/video/new_X11.c src/video/png.c src/video/sdl.c src/video/sprite.c src/video/svgalib.c src/video/sweepline.c src/video/video.c src/video/wince.c
+SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c src/video/graphic.c src/video/linedraw.c src/video/new_X11.c src/video/png.c src/video/sdl.c src/video/sprite.c src/video/sweepline.c src/video/video.c src/video/wince.c
HDRS += src/video/intern_video.h src/video/sweepline.h
-OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o src/video/$(OBJDIR)/new_X11.o src/video/$(OBJDIR)/png.o src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o src/video/$(OBJDIR)/svgalib.o src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o src/video/$(OBJDIR)/wince.o
+OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o src/video/$(OBJDIR)/new_X11.o src/video/$(OBJDIR)/png.o src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o src/video/$(OBJDIR)/wince.o
MISC += src/video/_clip_rectangle
diff --git a/src/video/svgalib.cpp b/src/video/svgalib.cpp
deleted file mode 100644
index 2fae575cb..000000000
--- a/src/video/svgalib.cpp
+++ /dev/null
@@ -1,1344 +0,0 @@
-// _________ __ __
-// / _____// |_____________ _/ |______ ____ __ __ ______
-// \_____ \\ __\_ __ \__ \\ __\__ \ / ___\| | \/ ___/
-// / \| | | | \// __ \| | / __ \_/ /_/ > | /\___ |
-// /_______ /|__| |__| (____ /__| (____ /\___ /|____//____ >
-// \/ \/ \//_____/ \/
-// ______________________ ______________________
-// T H E W A R B E G I N S
-// Stratagus - A free fantasy real time strategy game engine
-//
-/**@name svgalib.c - svgalib support. */
-//
-// (c) Copyright 1999-2003 by Jarek Sobieszek
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 dated June, 1991.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-//
-// $Id$
-
-//@{
-
-/*----------------------------------------------------------------------------
--- Includes
-----------------------------------------------------------------------------*/
-
-#include <stdio.h>
-
-#include "stratagus.h"
-
-#ifdef USE_SVGALIB
-
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <limits.h>
-
-#include <vga.h>
-#include <vgamouse.h>
-#include <vgakeyboard.h>
-
-#include "video.h"
-#include "tileset.h"
-#include "sound_id.h"
-#include "unittype.h"
-#include "player.h"
-#include "unit.h"
-#include "map.h"
-#include "minimap.h"
-#include "font.h"
-#include "sound_server.h"
-#include "missile.h"
-#include "sound.h"
-#include "cursor.h"
-#include "interface.h"
-#include "network.h"
-#include "ui.h"
-#include "video.h"
-
-/*----------------------------------------------------------------------------
--- Variables
-----------------------------------------------------------------------------*/
-
-local int old_button; /// Svgalib old button state
-local int mouse_x; /// Svgalib mouse x position
-local int mouse_y; /// Svgalib mouse y position
-
-local struct timeval SVGALibTicksStart; /// My counter start
-
-local const EventCallback* SVGALibCallbacks; /// My event call back
-
-/*----------------------------------------------------------------------------
--- Forwards
-----------------------------------------------------------------------------*/
-
- /// FIXME: docu?
-local void MouseEvent(int button,int dx,int dy,int dz,int drx,int dry,int drz);
- /// FIXME: docu?
-local void KeyboardEvent(int scancode,int press);
-
-/*----------------------------------------------------------------------------
--- Functions
-----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------
--- Sync
-----------------------------------------------------------------------------*/
-
-#define noUSE_ITIMER /// Use the old ITIMER code (obsolete)
-
-#ifdef USE_ITIMER
-
-/*
-** The timer resolution is 10ms, which make the timer useless for us.
-*/
-
-/**
-** Called from SIGALRM.
-*/
-local void VideoSyncHandler(int unused)
-{
- DebugLevel3Fn("Interrupt\n");
- ++VideoInterrupts;
-}
-
-/**
-** Initialise video sync.
-*/
-global void SetVideoSync(void)
-{
- struct sigaction sa;
- struct itimerval itv;
-
- if( !VideoSyncSpeed ) {
- return;
- }
-
- sa.sa_handler=VideoSyncHandler;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags=SA_RESTART;
- if( sigaction(SIGALRM,&sa,NULL) ) {
- fprintf(stderr,"Can't set signal\n");
- }
-
- itv.it_interval.tv_sec=itv.it_value.tv_sec=
- (100/CYCLES_PER_SECOND)/VideoSyncSpeed;
- itv.it_interval.tv_usec=itv.it_value.tv_usec=
- (100000000/CYCLES_PER_SECOND)/VideoSyncSpeed-
- itv.it_value.tv_sec*100000;
- if( setitimer(ITIMER_REAL,&itv,NULL) ) {
- fprintf(stderr,"Can't set itimer\n");
- }
-
- DebugLevel3Fn("Timer installed\n");
-}
-
-#else
-
-local int FrameTicks; /// Frame length in ms
-local int FrameRemainder; /// Frame remainder 0.1 ms
-local int FrameFraction; /// Frame fractional term
-local int SkipFrames; /// Skip this frames
-
-/**
-** Initialise video sync.
-** Calculate the length of video frame and any simulation skips.
-**
-** @see VideoSyncSpeed @see SkipFrames @see FrameTicks @see FrameRemainder
-*/
-global void SetVideoSync(void)
-{
- int ms;
-
- if( VideoSyncSpeed ) {
- ms = (1000 * 1000 / CYCLES_PER_SECOND) / VideoSyncSpeed;
- } else {
- ms = INT_MAX;
- }
- SkipFrames = ms / 400;
- while (SkipFrames && ms / SkipFrames < 200) {
- --SkipFrames;
- }
- ms /= SkipFrames + 1;
-
- FrameTicks = ms / 10;
- FrameRemainder = ms % 10;
- DebugLevel0Fn("frames %d - %d.%dms\n" _C_ SkipFrames _C_ ms / 10 _C_ ms % 10);
-}
-
-#endif
-
-/**
-** SVGALib get ticks in ms.
-**
-** @return Game ticks in ms.
-*/
-global unsigned long SVGAGetTicks(void)
-{
- struct timeval now;
- unsigned long ticks;
-
- gettimeofday(&now,NULL);
-
- ticks=(now.tv_sec-SVGALibTicksStart.tv_sec)*1000
- +(now.tv_usec-SVGALibTicksStart.tv_usec)/1000;
-
- return ticks;
-}
-
-/**
-** Close the display.
-*/
-local void CloseDisplay(void)
-{
- free(VideoMemory);
- vga_setmode(TEXT);
-}
-
-/**
-** Initialze the video part for SVGAlib.
-*/
-global void InitVideoSVGA(void)
-{
- int real_uid;
- int mode;
- vga_modeinfo *vga_info;
-
- gettimeofday(&SVGALibTicksStart,NULL);
-
- if( !VideoDepth ) {
- VideoDepth = 16;
- }
-
- if( !VideoWidth ) {
- VideoWidth = DEFAULT_VIDEO_WIDTH;
- VideoHeight = DEFAULT_VIDEO_HEIGHT;
- }
-
- real_uid = getuid();
- setuid(geteuid());
-
- if(vga_init() == -1) {
- fprintf(stderr, "Cannot initialize svgalib.\n"
- "(You are possibly not user 'root')\n" );
- ExitFatal(-1);
- }
- VideoMemory =malloc(VideoWidth * VideoHeight * ((VideoDepth+7) >> 3));
- if(VideoMemory == NULL) {
- fprintf(stderr, "Cannot allocate virtual screen.\n");
- ExitFatal(-1);
- }
- if(atexit(CloseDisplay) == -1) {
- fprintf(stderr, "Cannot register CloseDisplay.\n");
- free(VideoMemory);
- ExitFatal(-1);
- }
-
- mode=G640x480x64K;
- switch( VideoDepth ) {
- case 8:
- switch( VideoWidth ) {
- case 640:
- mode=G640x480x256;
- break;
- case 800:
- mode=G800x600x256;
- break;
- case 1024:
- mode=G1024x768x256;
- break;
- case 1600:
- mode=G1600x1200x256;
- break;
- }
- break;
- case 15:
- switch( VideoWidth ) {
- case 640:
- mode=G640x480x32K;
- break;
- case 800:
- mode=G800x600x32K;
- break;
- case 1024:
- mode=G1024x768x32K;
- break;
- case 1600:
- mode=G1600x1200x32K;
- break;
- }
- break;
- case 16:
- switch( VideoWidth ) {
- case 640:
- mode=G640x480x64K;
- break;
- case 800:
- mode=G800x600x64K;
- break;
- case 1024:
- mode=G1024x768x64K;
- break;
- case 1600:
- mode=G1600x1200x64K;
- break;
- }
- break;
- case 24:
- switch( VideoWidth ) {
- case 640:
- mode=G640x480x16M;
- break;
- case 800:
- mode=G800x600x16M;
- break;
- case 1024:
- mode=G1024x768x16M;
- break;
- case 1600:
- mode=G1600x1200x16M;
- break;
- }
- break;
- case 32:
- switch( VideoWidth ) {
- case 640:
- mode=G640x480x16M32;
- break;
- case 800:
- mode=G800x600x16M32;
- break;
- case 1024:
- mode=G1024x768x16M32;
- break;
- case 1600:
- mode=G1600x1200x16M32;
- break;
- }
- break;
- }
-
- if(vga_setmode(mode) == -1) {
- fprintf(stderr, "%dbpp %dx%d mode is not available.\n"
- ,VideoDepth,VideoWidth,VideoHeight);
- ExitFatal(-1);
- }
-
- vga_info =vga_getmodeinfo(mode);
- if(vga_info) {
- if(vga_info->flags && CAPABLE_LINEAR) {
- vga_setlinearaddressing();
- }
- VideoBpp=vga_info->bytesperpixel*8;
- } else {
- VideoBpp=((VideoDepth+7)/8)*8;
- }
-
- if(mouse_init("/dev/mouse", vga_getmousetype(),
- MOUSE_DEFAULTSAMPLERATE) == -1) {
- fprintf(stderr, "Cannot enable mouse.\n");
- ExitFatal(-1);
- }
- if(atexit(mouse_close) == -1) {
- fprintf(stderr, "Cannot register mouse_close.\n");
- ExitFatal(-1);
- }
- if(keyboard_init() == -1) {
- fprintf(stderr, "Cannot switch keyboard to raw mode.\n");
- ExitFatal(-1);
- }
- if(atexit(keyboard_close) == -1) {
- keyboard_close();
- fprintf(stderr, "Cannot register keyboard_close.\n");
- ExitFatal(-1);
- }
-
- setuid(real_uid);
-
- mouse_setposition(VideoWidth/2 , VideoHeight/2);
- mouse_seteventhandler(MouseEvent);
- mouse_setscale(TheUI.MouseScale);
- old_button = 0;
- mouse_x = VideoWidth/2;
- mouse_y = VideoHeight/2;
- HandleMouseMove(mouse_x, mouse_y);
- keyboard_seteventhandler(KeyboardEvent);
-}
-
-/**
-** Change video mode to new width.
-*/
-global int SetVideoMode(int width)
-{
- if (width == 640) return 1;
- return 0;
-}
-
-/**
-** Invalidate some area
-**
-** @param x screen pixel X position.
-** @param y screen pixel Y position.
-** @param w width of rectangle in pixels.
-** @param h height of rectangle in pixels.
-*/
-global void InvalidateArea(int x,int y,int w,int h)
-{
-}
-
-/**
-** Invalidate whole window
-*/
-global void Invalidate(void)
-{
-}
-
-/**
-** Handle interactive input events.
-*/
-local void MouseEvent(int button, int dx, int dy, int dz, int drx, int dry,
- int drz)
-{
- if (!old_button && button == MOUSE_LEFTBUTTON) {
- DebugLevel3Fn("first down\n");
- InputMouseButtonPress(SVGALibCallbacks, SVGAGetTicks(), 1);
- }
- if (!old_button && button == (MOUSE_LEFTBUTTON + MOUSE_RIGHTBUTTON)) {
- DebugLevel3Fn("second down\n");
- InputMouseButtonPress(SVGALibCallbacks, SVGAGetTicks(), 2);
- }
- if (!old_button && button == MOUSE_RIGHTBUTTON) {
- DebugLevel3Fn("third down\n");
- InputMouseButtonPress(SVGALibCallbacks, SVGAGetTicks(), 3);
- }
- if (old_button == MOUSE_LEFTBUTTON && !button) {
- DebugLevel3Fn("first up\n");
- InputMouseButtonRelease(SVGALibCallbacks, SVGAGetTicks(), 1);
- }
- if (old_button == (MOUSE_LEFTBUTTON + MOUSE_RIGHTBUTTON) && !button) {
- DebugLevel3Fn("second up\n");
- InputMouseButtonRelease(SVGALibCallbacks, SVGAGetTicks(), 2);
- }
- if (old_button == MOUSE_RIGHTBUTTON && !button) {
- DebugLevel3Fn("third up\n");
- InputMouseButtonRelease(SVGALibCallbacks, SVGAGetTicks(), 3);
- }
- old_button = button;
-
- if (dx || dy) {
- if (mouse_x + dx / TheUI.MouseAdjust >= 0
- && mouse_x + dx / TheUI.MouseAdjust <= VideoWidth)
- mouse_x += dx / TheUI.MouseAdjust;
- if (mouse_y + dy / TheUI.MouseAdjust >= 0
- && mouse_y + dy / TheUI.MouseAdjust <= VideoHeight)
- mouse_y += dy / TheUI.MouseAdjust;
- InputMouseMove(SVGALibCallbacks, SVGAGetTicks(), mouse_x, mouse_y);
- MustRedraw |= RedrawCursor;
- }
-}
-
-/**
-** Process keyboard event.
-**
-** @param scancode SVGAlib scancode
-** @param prees True if key was pressed
-**
-** @todo International scancode support.
-*/
-local void KeyboardEvent(int scancode, int press)
-{
- int icode;
- int keychar;
-
- IfDebug( icode = 0; ); // keeps the compiler happy
- keychar = 0;
-
- if (press == KEY_EVENTPRESS) {
- // FIXME: combine scancode -> internal keycode of press and release
- switch (scancode) {
- case SCANCODE_1:
- keychar = icode = '1';
- if (KeyModifiers & ModifierShift) {
- icode = '!';
- }
- break;
- case SCANCODE_2:
- keychar = icode = '2';
- if (KeyModifiers & ModifierShift) {
- icode = '@';
- }
- break;
- case SCANCODE_3:
- keychar = icode = '3';
- if (KeyModifiers & ModifierShift) {
- icode = '3';
- }
- break;
- case SCANCODE_4:
- keychar = icode = '4';
- if (KeyModifiers & ModifierShift) {
- icode = '$';
- }
- break;
- case SCANCODE_5:
- keychar = icode = '5';
- if (KeyModifiers & ModifierShift) {
- icode = '%';
- }
- break;
- case SCANCODE_6:
- keychar = icode = '6';
- if (KeyModifiers & ModifierShift) {
- icode = '^';
- }
- break;
- case SCANCODE_7:
- keychar = icode = '7';
- if (KeyModifiers & ModifierShift) {
- icode = '&';
- }
- break;
- case SCANCODE_8:
- keychar = icode = '8';
- if (KeyModifiers & ModifierShift) {
- icode = '*';
- }
- break;
- case SCANCODE_9:
- keychar = icode = '9';
- if (KeyModifiers & ModifierShift) {
- icode = '(';
- }
- break;
- case SCANCODE_0:
- keychar = icode = '0';
- if (KeyModifiers & ModifierShift) {
- icode = ')';
- }
- break;
- case SCANCODE_A:
- keychar = icode = 'a';
- break;
- case SCANCODE_B:
- keychar = icode = 'b';
- break;
- case SCANCODE_C:
- keychar = icode = 'c';
- break;
- case SCANCODE_D:
- keychar = icode = 'd';
- break;
- case SCANCODE_E:
- keychar = icode = 'e';
- break;
- case SCANCODE_F:
- keychar = icode = 'f';
- break;
- case SCANCODE_G:
- keychar = icode = 'g';
- break;
- case SCANCODE_H:
- keychar = icode = 'h';
- break;
- case SCANCODE_I:
- keychar = icode = 'i';
- break;
- case SCANCODE_J:
- keychar = icode = 'j';
- break;
- case SCANCODE_K:
- keychar = icode = 'k';
- break;
- case SCANCODE_L:
- keychar = icode = 'l';
- break;
- case SCANCODE_M:
- keychar = icode = 'm';
- break;
- case SCANCODE_N:
- keychar = icode = 'n';
- break;
- case SCANCODE_O:
- keychar = icode = 'o';
- break;
- case SCANCODE_P:
- keychar = icode = 'p';
- break;
- case SCANCODE_Q:
- keychar = icode = 'q';
- break;
- case SCANCODE_R:
- keychar = icode = 'r';
- break;
- case SCANCODE_S:
- keychar = icode = 's';
- break;
- case SCANCODE_T:
- keychar = icode = 't';
- break;
- case SCANCODE_U:
- keychar = icode = 'u';
- break;
- case SCANCODE_V:
- keychar = icode = 'v';
- break;
- case SCANCODE_W:
- keychar = icode = 'w';
- break;
- case SCANCODE_X:
- keychar = icode = 'x';
- break;
- case SCANCODE_Y:
- keychar = icode = 'y';
- break;
- case SCANCODE_Z:
- keychar = icode = 'z';
- break;
- case SCANCODE_SPACE:
- keychar = icode = ' ';
- break;
- case SCANCODE_MINUS:
- keychar = icode = '-';
- if (KeyModifiers & ModifierShift) {
- icode = '_';
- }
- break;
- case SCANCODE_EQUAL:
- keychar = icode = '=';
- if (KeyModifiers & ModifierShift) {
- icode = '+';
- }
- break;
- case SCANCODE_ESCAPE:
- keychar = icode = '\e';
- break;
- case SCANCODE_ENTER:
- case SCANCODE_KEYPADENTER:
- keychar = icode = '\r';
- break;
- case SCANCODE_BACKSPACE:
- keychar = icode = '\b';
- break;
- case SCANCODE_TAB:
- keychar = icode = '\t';
- break;
-
- case SCANCODE_COMMA:
- keychar = icode = ',';
- break;
- case SCANCODE_PERIOD:
- keychar = icode = '.';
- break;
- case SCANCODE_SLASH:
- keychar = icode = '/';
- break;
-
- case SCANCODE_CURSORBLOCKUP:
- icode = KeyCodeUp;
- break;
- case SCANCODE_CURSORBLOCKDOWN:
- icode = KeyCodeDown;
- break;
- case SCANCODE_CURSORBLOCKLEFT:
- icode = KeyCodeLeft;
- break;
- case SCANCODE_CURSORBLOCKRIGHT:
- icode = KeyCodeRight;
- break;
- case SCANCODE_F1:
- icode = KeyCodeF1;
- break;
- case SCANCODE_F2:
- icode = KeyCodeF2;
- break;
- case SCANCODE_F3:
- icode = KeyCodeF3;
- break;
- case SCANCODE_F4:
- icode = KeyCodeF4;
- break;
- case SCANCODE_F5:
- icode = KeyCodeF5;
- break;
- case SCANCODE_F6:
- icode = KeyCodeF6;
- break;
- case SCANCODE_F7:
- icode = KeyCodeF7;
- break;
- case SCANCODE_F8:
- icode = KeyCodeF8;
- break;
- case SCANCODE_F9:
- icode = KeyCodeF9;
- break;
- case SCANCODE_F10:
- icode = KeyCodeF10;
- break;
- case SCANCODE_F11:
- icode = KeyCodeF11;
- break;
- case SCANCODE_F12:
- icode = KeyCodeF12;
- break;
-
- case SCANCODE_KEYPAD0:
- icode = KeyCodeKP0;
- break;
- case SCANCODE_KEYPAD1:
- icode = KeyCodeKP1;
- break;
- case SCANCODE_KEYPAD2:
- icode = KeyCodeKP2;
- break;
- case SCANCODE_KEYPAD3:
- icode = KeyCodeKP3;
- break;
- case SCANCODE_KEYPAD4:
- icode = KeyCodeKP4;
- break;
- case SCANCODE_KEYPAD5:
- icode = KeyCodeKP5;
- break;
- case SCANCODE_KEYPAD6:
- icode = KeyCodeKP6;
- break;
- case SCANCODE_KEYPAD7:
- icode = KeyCodeKP7;
- break;
- case SCANCODE_KEYPAD8:
- icode = KeyCodeKP8;
- break;
- case SCANCODE_KEYPAD9:
- icode = KeyCodeKP9;
- break;
- case SCANCODE_KEYPADPLUS:
- icode = KeyCodeKPPlus;
- break;
- case SCANCODE_KEYPADMINUS:
- icode = KeyCodeKPMinus;
- break;
- case SCANCODE_KEYPADPERIOD:
- icode = KeyCodeKPPeriod;
- break;
- case SCANCODE_PRINTSCREEN:
- icode = KeyCodePrint;
- break;
- case SCANCODE_REMOVE:
- icode = KeyCodeDelete;
- break;
-
- // KeyCodePause
-
- case SCANCODE_LEFTSHIFT:
- case SCANCODE_RIGHTSHIFT:
- KeyModifiers |= ModifierShift;
- break;
- case SCANCODE_LEFTCONTROL:
- case SCANCODE_RIGHTCONTROL:
- KeyModifiers |= ModifierControl;
- break;
- case SCANCODE_LEFTALT:
- case SCANCODE_RIGHTALT:
- KeyModifiers |= ModifierAlt;
- // Super, Hyper
- }
- if (KeyModifiers & ModifierShift) {
- if (icode <= 'z' && icode >= 'a') {
- icode -= 32;
- }
- }
- InputKeyButtonPress(SVGALibCallbacks, SVGAGetTicks(), icode, keychar);
- } else if (press == KEY_EVENTRELEASE) {
- // FIXME: combine scancode -> internal keycode of press and release
- switch (scancode) {
- case SCANCODE_1:
- keychar = icode = '1';
- if (KeyModifiers & ModifierShift) {
- icode = '!';
- }
- break;
- case SCANCODE_2:
- keychar = icode = '2';
- if (KeyModifiers & ModifierShift) {
- icode = '@';
- }
- break;
- case SCANCODE_3:
- keychar = icode = '3';
- if (KeyModifiers & ModifierShift) {
- icode = '3';
- }
- break;
- case SCANCODE_4:
- keychar = icode = '4';
- if (KeyModifiers & ModifierShift) {
- icode = '$';
- }
- break;
- case SCANCODE_5:
- keychar = icode = '5';
- if (KeyModifiers & ModifierShift) {
- icode = '%';
- }
- break;
- case SCANCODE_6:
- keychar = icode = '6';
- if (KeyModifiers & ModifierShift) {
- icode = '^';
- }
- break;
- case SCANCODE_7:
- keychar = icode = '7';
- if (KeyModifiers & ModifierShift) {
- icode = '&';
- }
- break;
- case SCANCODE_8:
- keychar = icode = '8';
- if (KeyModifiers & ModifierShift) {
- icode = '*';
- }
- break;
- case SCANCODE_9:
- keychar = icode = '9';
- if (KeyModifiers & ModifierShift) {
- icode = '(';
- }
- break;
- case SCANCODE_0:
- keychar = icode = '0';
- if (KeyModifiers & ModifierShift) {
- icode = ')';
- }
- break;
- case SCANCODE_A:
- keychar = icode = 'a';
- break;
- case SCANCODE_B:
- keychar = icode = 'b';
- break;
- case SCANCODE_C:
- keychar = icode = 'c';
- break;
- case SCANCODE_D:
- keychar = icode = 'd';
- break;
- case SCANCODE_E:
- keychar = icode = 'e';
- break;
- case SCANCODE_F:
- keychar = icode = 'f';
- break;
- case SCANCODE_G:
- keychar = icode = 'g';
- break;
- case SCANCODE_H:
- keychar = icode = 'h';
- break;
- case SCANCODE_I:
- keychar = icode = 'i';
- break;
- case SCANCODE_J:
- keychar = icode = 'j';
- break;
- case SCANCODE_K:
- keychar = icode = 'k';
- break;
- case SCANCODE_L:
- keychar = icode = 'l';
- break;
- case SCANCODE_M:
- keychar = icode = 'm';
- break;
- case SCANCODE_N:
- keychar = icode = 'n';
- break;
- case SCANCODE_O:
- keychar = icode = 'o';
- break;
- case SCANCODE_P:
- keychar = icode = 'p';
- break;
- case SCANCODE_Q:
- keychar = icode = 'q';
- break;
- case SCANCODE_R:
- keychar = icode = 'r';
- break;
- case SCANCODE_S:
- keychar = icode = 's';
- break;
- case SCANCODE_T:
- keychar = icode = 't';
- break;
- case SCANCODE_U:
- keychar = icode = 'u';
- break;
- case SCANCODE_V:
- keychar = icode = 'v';
- break;
- case SCANCODE_W:
- keychar = icode = 'w';
- break;
- case SCANCODE_X:
- keychar = icode = 'x';
- break;
- case SCANCODE_Y:
- keychar = icode = 'y';
- break;
- case SCANCODE_Z:
- keychar = icode = 'z';
- break;
- case SCANCODE_SPACE:
- keychar = icode = ' ';
- break;
- case SCANCODE_MINUS:
- keychar = icode = '-';
- if (KeyModifiers & ModifierShift) {
- icode = '_';
- }
- break;
- case SCANCODE_EQUAL:
- keychar = icode = '=';
- if (KeyModifiers & ModifierShift) {
- icode = '+';
- }
- break;
- case SCANCODE_ESCAPE:
- keychar = icode = '\e';
- break;
- case SCANCODE_ENTER:
- keychar = icode = '\r';
- break;
- case SCANCODE_BACKSPACE:
- keychar = icode = '\b';
- break;
- case SCANCODE_TAB:
- keychar = icode = '\t';
- break;
-
- case SCANCODE_COMMA:
- keychar = icode = ',';
- break;
- case SCANCODE_PERIOD:
- keychar = icode = '.';
- break;
- case SCANCODE_SLASH:
- keychar = icode = '/';
- break;
-
- case SCANCODE_CURSORBLOCKUP:
- icode = KeyCodeUp;
- break;
- case SCANCODE_CURSORBLOCKDOWN:
- icode = KeyCodeDown;
- break;
- case SCANCODE_CURSORBLOCKLEFT:
- icode = KeyCodeLeft;
- break;
- case SCANCODE_CURSORBLOCKRIGHT:
- icode = KeyCodeRight;
- break;
- case SCANCODE_F1:
- icode = KeyCodeF1;
- break;
- case SCANCODE_F2:
- icode = KeyCodeF2;
- break;
- case SCANCODE_F3:
- icode = KeyCodeF3;
- break;
- case SCANCODE_F4:
- icode = KeyCodeF4;
- break;
- case SCANCODE_F5:
- icode = KeyCodeF5;
- break;
- case SCANCODE_F6:
- icode = KeyCodeF6;
- break;
- case SCANCODE_F7:
- icode = KeyCodeF7;
- break;
- case SCANCODE_F8:
- icode = KeyCodeF8;
- break;
- case SCANCODE_F9:
- icode = KeyCodeF9;
- break;
- case SCANCODE_F10:
- icode = KeyCodeF10;
- break;
- case SCANCODE_F11:
- icode = KeyCodeF11;
- break;
- case SCANCODE_F12:
- icode = KeyCodeF12;
- break;
-
- case SCANCODE_KEYPAD0:
- icode = KeyCodeKP0;
- break;
- case SCANCODE_KEYPAD1:
- icode = KeyCodeKP1;
- break;
- case SCANCODE_KEYPAD2:
- icode = KeyCodeKP2;
- break;
- case SCANCODE_KEYPAD3:
- icode = KeyCodeKP3;
- break;
- case SCANCODE_KEYPAD4:
- icode = KeyCodeKP4;
- break;
- case SCANCODE_KEYPAD5:
- icode = KeyCodeKP5;
- break;
- case SCANCODE_KEYPAD6:
- icode = KeyCodeKP6;
- break;
- case SCANCODE_KEYPAD7:
- icode = KeyCodeKP7;
- break;
- case SCANCODE_KEYPAD8:
- icode = KeyCodeKP8;
- break;
- case SCANCODE_KEYPAD9:
- icode = KeyCodeKP9;
- break;
-
- case SCANCODE_LEFTSHIFT:
- case SCANCODE_RIGHTSHIFT:
- KeyModifiers &= ~ModifierShift;
- icode = 0;
- break;
- case SCANCODE_LEFTCONTROL:
- case SCANCODE_RIGHTCONTROL:
- KeyModifiers &= ~ModifierControl;
- icode = 0;
- break;
- case SCANCODE_LEFTALT:
- case SCANCODE_RIGHTALT:
- KeyModifiers &= ~ModifierAlt;
- icode = 0;
- break;
- // Super ???
- }
- InputKeyButtonRelease(SVGALibCallbacks, SVGAGetTicks(), icode, keychar);
- }
-}
-
-/**
-** Wait for interactive input event for one frame.
-**
-** Handles system events, joystick, keyboard, mouse.
-** Handles the network messages.
-** Handles the sound queue.
-**
-** All events available are fetched. Sound and network only if available.
-** Returns if the time for one frame is over.
-**
-** @param callbacks Call backs that handle the events.
-**
-** @todo FIXME: the initialition could be moved out of the loop
-*/
-global void WaitEventsOneFrame(const EventCallback* callbacks)
-{
- struct timeval tv;
- fd_set rfds;
- fd_set wfds;
- int ret;
- unsigned long ticks;
-
- SVGALibCallbacks=callbacks;
-
-#ifdef WITH_SOUND
- // FIXME: ugly hack, move into sound part!!!
- if( SoundFildes==-1 ) {
- SoundOff=1;
- }
-#endif
- if( !++FrameCounter ) {
- // FIXME: tests with frame counter now fails :(
- // FIXME: Should happen in 68 years :)
- fprintf(stderr,"FIXME: *** round robin ***\n");
- fprintf(stderr,"FIXME: *** round robin ***\n");
- fprintf(stderr,"FIXME: *** round robin ***\n");
- fprintf(stderr,"FIXME: *** round robin ***\n");
- }
-
- ticks=SVGAGetTicks();
-#ifndef USE_ITIMER
- if( ticks>NextFrameTicks ) { // We are too slow :(
- IfDebug(
- if (InterfaceState == IfaceStateNormal) {
- VideoDrawText(TheUI.MapArea.X+10,TheUI.MapArea.Y+10,GameFont,
- "SLOW FRAME!!");
- }
- );
- ++SlowFrameCounter;
- }
-#endif
-
- InputMouseTimeout(callbacks, ticks);
- InputKeyTimeout(callbacks, ticks);
- CursorAnimate(ticks);
-
- for(;;) {
- //
- // Prepare select
- //
- tv.tv_sec = tv.tv_usec = 0;
-
- FD_ZERO(&rfds);
- FD_ZERO(&wfds);
-
-#ifndef USE_ITIMER
- //
- // Time of frame over? This makes the CPU happy. :(
- //
- ticks=SVGAGetTicks();
- if( !VideoInterrupts && ticks+11<NextFrameTicks ) {
- tv.tv_usec=(NextFrameTicks-ticks)*1000;
- }
- while( ticks>=NextFrameTicks ) {
- ++VideoInterrupts;
- FrameFraction+=FrameRemainder;
- if( FrameFraction>10 ) {
- FrameFraction-=10;
- ++NextFrameTicks;
- }
- NextFrameTicks+=FrameTicks;
- }
-#endif
- //
- // Sound
- //
-#ifndef WITH_ARTSC
- if( !SoundOff && !SoundThreadRunning ) {
- FD_SET(SoundFildes, &wfds);
- }
-#endif
-
- //
- // Network
- //
- if(NetworkFildes != -1) {
- FD_SET(NetworkFildes, &rfds);
- }
-
-#ifdef WITH_ARTSC
- if (ArtsGetSpace() >= 1024) {
- callbacks->SoundReady();
- }
-#endif
- ret = vga_waitevent(VGA_MOUSEEVENT | VGA_KEYEVENT, &rfds, &wfds, NULL,
- &tv);
-
- if(ret >= 0) {
- //
- // Sound
- //
-#ifndef WITH_ARTSC
- if(!SoundOff && !SoundThreadRunning
- && FD_ISSET(SoundFildes, &wfds)) {
- callbacks->SoundReady();
- }
-#endif
-
-#if 0
- // ARI: needs network packets!
- //
- // Network in sync and time for frame over: return
- //
- if(NetworkInSync && VideoInterrupts) {
- break;
- }
-#endif
-
- //
- // Network
- //
- if(NetworkFildes != -1 && FD_ISSET(NetworkFildes, &rfds)) {
- callbacks->NetworkEvent();
- }
- }
-
-#ifdef WITH_ARTSC
- if (ArtsGetSpace() >= 1024) {
- callbacks->SoundReady();
- }
-#endif
- //
- // Network in sync and time for frame over: return
- //
- if(VideoInterrupts) {
- break;
- }
- }
-
- //
- // Prepare return, time for one frame is over.
- //
- VideoInterrupts=0;
-
-#ifndef USE_ITIMER
- if( !SkipGameCycle-- ) {
- SkipGameCycle=SkipFrames;
- }
-#endif
-}
-
-/**
-** Create a new hardware dependend palette palette.
-**
-** @param palette Hardware independend palette.
-**
-** @return A hardware dependend pixel table.
-*/
-global VMemType* VideoCreateNewPalette(const Palette *palette)
-{
- int i;
- void* pixels;
-
- switch( VideoBpp ) {
- case 8:
- pixels=malloc(256*sizeof(VMemType8));
- break;
- case 15:
- case 16:
- pixels=malloc(256*sizeof(VMemType16));
- break;
- case 24:
- pixels=malloc(256*sizeof(VMemType24));
- break;
- case 32:
- pixels=malloc(256*sizeof(VMemType32));
- break;
- default:
- DebugLevel0Fn("Unknown depth\n");
- return NULL;
- }
-
- //
- // Convert each palette entry into hardware format.
- //
- for( i=0; i<256; ++i ) {
- int r;
- int g;
- int b;
- int v;
-
- r=(palette[i].r>>2)&0x3F;
- g=(palette[i].g>>2)&0x3F;
- b=(palette[i].b>>2)&0x3F;
- v=r+g+b;
-
- // Apply global saturation,contrast and brightness
- r= ((((r*3-v)*TheUI.Saturation + v*100)
- *TheUI.Contrast)
- +TheUI.Brightness*6400*3)/30000;
- g= ((((g*3-v)*TheUI.Saturation + v*100)
- *TheUI.Contrast)
- +TheUI.Brightness*6400*3)/30000;
- b= ((((b*3-v)*TheUI.Saturation + v*100)
- *TheUI.Contrast)
- +TheUI.Brightness*6400*3)/30000;
-
- // Boundings
- r= r<0 ? 0 : r>63 ? 63 : r;
- g= g<0 ? 0 : g>63 ? 63 : g;
- b= b<0 ? 0 : b>63 ? 63 : b;
-
- // -> Video
- switch( VideoDepth ) {
- case 15: // RGB=[5bit|5bit|5bit]
- ((VMemType16*)pixels)[i] = ((r >> 1) << 10)
- + ((g >>1) << 5)
- + (b >> 1);
- break;
- case 16: // RGB=[5bit|6bit|5bit]
- ((VMemType16*)pixels)[i] = ((r >> 1) << 11)
- + (g << 5)
- + (b >> 1);
- break;
- case 8:
- case 24:
- case 32:
- // FIXME: write this please
- default:
- DebugLevel0Fn("Depth not written\n");
- }
- }
-
- return pixels;
-}
-
-/**
-** Check video interrupt.
-**
-** Display and count too slow frames.
-*/
-global void CheckVideoInterrupts(void)
-{
-#ifdef USE_ITIMER
- if( VideoInterrupts ) {
- //DebugLevel1Fn("Slow frame\n");
- IfDebug(
- if (InterfaceState == IfaceStateNormal) {
- VideoDrawText(TheUI.MapX+10,TheUI.MapY+10,GameFont,"SLOW FRAME!!");
- }
- );
- ++SlowFrameCounter;
- }
-#endif
- // FIXME: Need to support this with gettimeofday code.
-}
-
-/**
-** Realize video memory.
-*/
-global void RealizeVideoMemory(void)
-{
- int i;
-
- vga_waitretrace();
- for(i = 0; i < 480; i++) {
- vga_drawscansegment((void*)&VideoMemory16[i * 640], 0, i, 1280);
- }
-}
-
-/**
-** Toggle grab mouse.
-**
-** @param mode Wanted mode, 1 grab, -1 not grab, 0 toggle.
-*/
-global void ToggleGrabMouse(int mode __attribute__((unused)))
-{
-}
-
-/**
-** Toggle full screen mode.
-*/
-global void ToggleFullScreen(void)
-{
-}
-
-#endif // USE_SVGALIB
-
-//@}
diff --git a/src/video/video.cpp b/src/video/video.cpp
index 85dffb421..6d68d2c67 100644
--- a/src/video/video.cpp
+++ b/src/video/video.cpp
@@ -129,28 +129,18 @@
#ifdef USE_X11
#define UseX11 1
#define UseSdl 0
-#define UseSVGALib 0
#define UseWin32 0
#endif
#ifdef USE_SDL
#define UseX11 0
#define UseSdl 1
-#define UseSVGALib 0
-#define UseWin32 0
-#endif
-
-#ifdef USE_SVGALIB
-#define UseX11 0
-#define UseSdl 0
-#define UseSVGALib 1
#define UseWin32 0
#endif
#ifdef noUSE_WIN32
#define UseX11 0
#define UseSdl 0
-#define UseSVGALib 0
#define UseWin32 1
#endif
@@ -1343,11 +1333,6 @@ global unsigned long GetTicks(void)
return X11GetTicks();
#endif
-#if UseSVGALib
- extern unsigned long SVGAGetTicks(void);
-
- return SVGAGetTicks();
-#endif
}
/**
@@ -1360,8 +1345,6 @@ global void InitVideo(void)
InitVideoSdl();
} else if (UseX11) {
InitVideoX11();
- } else if (UseSVGALib) {
- InitVideoSVGA();
} else if (UseWin32) {
InitVideoWin32();
} else {
@@ -1376,14 +1359,10 @@ global void InitVideo(void)
#if UseX11
InitVideoX11();
#else
- #if UseSVGALib
- InitVideoSVGA();
+ #if UseWin32
+ InitVideoWin32();
#else
- #if UseWin32
- InitVideoWin32();
- #else
- abort();
- #endif
+ abort();
#endif
#endif
#endif