qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-22 11:51:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

input.h is gone - was empty anyway. vid_x11.c now is responsible for init

Browse source 
of the input routines it can use.  All vid targets should do this for the
input method they should use.  While this is essentially hardcoding, it's
kinda necessary for now.  Once we have everything working and tested we
can work on an interdependency scheme so X input methods only work with X
output methods, etc...
This commit is contained in:
Joseph Carter 2000-02-13 11:31:00 +00:00
parent 1d7260195f
commit bb5623aa9e
6 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/cl_main.c
View file

@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <cmd.h>
#include <protocol.h>
#include <cvar.h>
#include <input.h>
#include <screen.h>
#include <zone.h>
#include <client.h>

6
common/host.c
View file

@ -44,7 +44,6 @@
#include <client.h>
#include <view.h>
#include <wad.h>
#include <input.h>
#include <sound.h>
#include <cdaudio.h>
#include <keys.h>
@ -579,8 +578,9 @@ Host_Init ( quakeparms_t *parms)
if (!host_colormap)
Sys_Error ("Couldn't load gfx/colormap.lmp");
plugin_load("./in_x11.so");
IN->Init();
// plugin_load("./in_x11.so");
// IN->Init();
// Not the best place to load the plugin...
VID_Init(host_basepal);
Draw_Init();
SCR_Init();

23
common/input.h
View file

@ -1,23 +0,0 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
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; either version 2
of the License, or (at your option) any later version.
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.
*/
// input.h -- external (non-keyboard) input devices

3
common/plugin.c
View file

@ -1,5 +1,5 @@
/*
host.c
plugin.c
(description)
@ -78,3 +78,4 @@ void plugin_unload(void *handle)
{
dlclose(handle);
}

3
common/plugin.h
View file

@ -1,4 +1,5 @@
/*
plugin.h
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -45,4 +46,4 @@ int plugin_load(char *filename);
void plugin_unload(void *handle);
#endif // __MODULES__:w
#endif // __MODULES__

3
common/vid_x11.c
View file

@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <draw.h>
#include <console.h>
#include <client.h>
#include <plugin.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
@ -471,6 +472,8 @@ void VID_Init (unsigned char *palette)
int num_visuals;
int template_mask;
plugin_load("./in_x11.so");
IN->Init();
S_Init(); // sound is initialized here
Cmd_AddCommand("gamma", VID_Gamma_f);