From 16e4e6d21192d6264382a9866ee3a613a450ff1a Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 28 Jan 2001 16:37:29 +0000 Subject: [PATCH] Duplicate file removal --- arch/linux/svgalib/Makefile.am | 4 - arch/linux/svgalib/event.c | 25 -- arch/linux/svgalib/gr.c | 309 -------------------- arch/linux/svgalib/include/Makefile.am | 2 - arch/linux/svgalib/include/event.h | 9 - arch/linux/svgalib/include/key.h | 271 ----------------- arch/linux/svgalib/include/mouse.h | 127 -------- arch/linux/svgalib/init.c | 9 - arch/linux/svgalib/key.c | 383 ------------------------- arch/linux/svgalib/mouse.c | 197 ------------- 10 files changed, 1336 deletions(-) delete mode 100644 arch/linux/svgalib/Makefile.am delete mode 100644 arch/linux/svgalib/event.c delete mode 100644 arch/linux/svgalib/gr.c delete mode 100644 arch/linux/svgalib/include/Makefile.am delete mode 100644 arch/linux/svgalib/include/event.h delete mode 100644 arch/linux/svgalib/include/key.h delete mode 100644 arch/linux/svgalib/include/mouse.h delete mode 100644 arch/linux/svgalib/init.c delete mode 100644 arch/linux/svgalib/key.c delete mode 100644 arch/linux/svgalib/mouse.c diff --git a/arch/linux/svgalib/Makefile.am b/arch/linux/svgalib/Makefile.am deleted file mode 100644 index 804a83b3..00000000 --- a/arch/linux/svgalib/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = include - -EXTRA_DIST = \ -event.c gr.c init.c key.c mouse.c diff --git a/arch/linux/svgalib/event.c b/arch/linux/svgalib/event.c deleted file mode 100644 index 21fa607b..00000000 --- a/arch/linux/svgalib/event.c +++ /dev/null @@ -1,25 +0,0 @@ -// SDL Event related stuff - -#include -#include - -#include -#include - -void key_handler(int scancode, int press); -//added on 10/17/98 by Hans de Goede for mouse functionality -//extern void mouse_button_handler(SDL_MouseButtonEvent *mbe); -//extern void mouse_motion_handler(SDL_MouseMotionEvent *mme); -//end this section addition - Hans - -void event_poll() -{ - keyboard_update(); - mouse_update(); -} - -/*int event_init() -{ - initialised = 1; - return 0; -}*/ diff --git a/arch/linux/svgalib/gr.c b/arch/linux/svgalib/gr.c deleted file mode 100644 index 2aee9776..00000000 --- a/arch/linux/svgalib/gr.c +++ /dev/null @@ -1,309 +0,0 @@ -#include -#include -#include -#include -#include -#include "gr.h" -#include "grdef.h" -#include "palette.h" -#include "u_mem.h" -#include "error.h" -#ifdef SVGALIB_INPUT -#include -#endif - -#include "gamefont.h" - -int gr_installed = 0; -int usebuffer; - -extern void mouse_handler (int button, int dx, int dy, int dz, int drx, int dry, int drz); - -GraphicsContext *physicalscreen, *screenbuffer; - -void gr_update() -{ - if (usebuffer) - gl_copyscreen(physicalscreen); -} - -int gr_set_mode(u_int32_t mode) -{ - unsigned int w, h; - char vgamode[16]; - vga_modeinfo *modeinfo; - int modenum, rowsize; - void *framebuffer; - -#ifdef NOGRAPH - return 0; -#endif - if (mode<=0) - return 0; - - w=SM_W(mode); - h=SM_H(mode); - - gr_palette_clear(); - - sprintf(vgamode, "G%dx%dx256", w, h); - modenum = vga_getmodenumber(vgamode); - vga_setmode(modenum); -#ifdef SVGALIB_INPUT - mouse_seteventhandler(mouse_handler); -#endif - modeinfo = vga_getmodeinfo(modenum); - - if (modeinfo->flags & CAPABLE_LINEAR) - { - usebuffer = 0; - - vga_setlinearaddressing(); - - // Set up physical screen only - gl_setcontextvga(modenum); - physicalscreen = gl_allocatecontext(); - gl_getcontext(physicalscreen); - screenbuffer = physicalscreen; - - framebuffer = physicalscreen->vbuf; - rowsize = physicalscreen->bytewidth; - } - else - { - usebuffer = 1; - - // Set up the physical screen - gl_setcontextvga(modenum); - physicalscreen = gl_allocatecontext(); - gl_getcontext(physicalscreen); - - // Set up the virtual screen - gl_setcontextvgavirtual(modenum); - screenbuffer = gl_allocatecontext(); - gl_getcontext(screenbuffer); - - framebuffer = screenbuffer->vbuf; - rowsize = screenbuffer->bytewidth; - } - - memset(grd_curscreen, 0, sizeof(grs_screen)); - grd_curscreen->sc_mode = mode; - grd_curscreen->sc_w = w; - grd_curscreen->sc_h = h; - grd_curscreen->sc_aspect = fixdiv(grd_curscreen->sc_w*3,grd_curscreen->sc_h*4); - grd_curscreen->sc_canvas.cv_bitmap.bm_x = 0; - grd_curscreen->sc_canvas.cv_bitmap.bm_y = 0; - grd_curscreen->sc_canvas.cv_bitmap.bm_w = w; - grd_curscreen->sc_canvas.cv_bitmap.bm_h = h; - grd_curscreen->sc_canvas.cv_bitmap.bm_rowsize = rowsize; - grd_curscreen->sc_canvas.cv_bitmap.bm_type = BM_LINEAR; - grd_curscreen->sc_canvas.cv_bitmap.bm_data = framebuffer; - gr_set_current_canvas(NULL); - - gamefont_choose_game_font(w,h); - - return 0; -} - -int gr_init(int mode) -{ - int retcode; - // Only do this function once! - if (gr_installed==1) - return -1; - MALLOC(grd_curscreen,grs_screen, 1); - memset(grd_curscreen, 0, sizeof(grs_screen)); - - vga_init(); - - if ((retcode=gr_set_mode(mode))) - return retcode; - - grd_curscreen->sc_canvas.cv_color = 0; - grd_curscreen->sc_canvas.cv_drawmode = 0; - grd_curscreen->sc_canvas.cv_font = NULL; - grd_curscreen->sc_canvas.cv_font_fg_color = 0; - grd_curscreen->sc_canvas.cv_font_bg_color = 0; - gr_set_current_canvas( &grd_curscreen->sc_canvas ); - - gr_installed = 1; - atexit(gr_close); - return 0; -} - -void gr_close () -{ - if (gr_installed==1) - { - gr_installed = 0; - free(grd_curscreen); - gl_freecontext(screenbuffer); - gl_freecontext(physicalscreen); - } -} - -// Palette functions follow. - -static int last_r=0, last_g=0, last_b=0; - -void gr_palette_clear () -{ - int colors[768]; - - memset (colors, 0, 768 * sizeof(int)); - vga_setpalvec (0, 256, colors); - - gr_palette_faded_out = 1; -} - - -void gr_palette_step_up (int r, int g, int b) -{ - int i = 0; - ubyte *p = gr_palette; - int temp; - - int colors[768]; - - if (gr_palette_faded_out) return; - - if ((r==last_r) && (g==last_g) && (b==last_b)) return; - - last_r = r; - last_g = g; - last_b = b; - - while (i < 768) - { - temp = (int)(*p++) + r + gr_palette_gamma; - if (temp<0) temp=0; - else if (temp>63) temp=63; - colors[i++] = temp; - temp = (int)(*p++) + g + gr_palette_gamma; - if (temp<0) temp=0; - else if (temp>63) temp=63; - colors[i++] = temp; - temp = (int)(*p++) + b + gr_palette_gamma; - if (temp<0) temp=0; - else if (temp>63) temp=63; - colors[i++] = temp; - } - vga_setpalvec (0, 256, colors); -} - -//added on 980913 by adb to fix palette problems -// need a min without side effects... -#undef min -static inline int min(int x, int y) { return x < y ? x : y; } -//end changes by adb - -void gr_palette_load (ubyte *pal) -{ - int i; - int colors[768]; - - for (i = 0; i < 768; i++) - { - gr_current_pal[i] = pal[i]; - if (gr_current_pal[i] > 63) gr_current_pal[i] = 63; - colors[i] = (min(gr_current_pal[i] + gr_palette_gamma, 63)); - } - - vga_setpalvec (0, 256, colors); - - gr_palette_faded_out = 0; - init_computed_colors(); -} - - - -int gr_palette_fade_out (ubyte *pal, int nsteps, int allow_keys) -{ - int i, j; - ubyte c; - fix fade_palette[768]; - fix fade_palette_delta[768]; - - int fade_colors[768]; - - if (gr_palette_faded_out) return 0; - - if (pal==NULL) pal=gr_current_pal; - - for (i=0; i<768; i++) - { - gr_current_pal[i] = pal[i]; - fade_palette[i] = i2f(pal[i]); - fade_palette_delta[i] = fade_palette[i] / nsteps; - } - - for (j=0; j i2f(pal[i] + gr_palette_gamma)) - fade_palette[i] = i2f(pal[i] + gr_palette_gamma); - c = f2i(fade_palette[i]); - if (c > 63) c = 63; - fade_colors[i] = c; - } - vga_setpalvec (0, 256, fade_colors); - } - - gr_palette_faded_out = 1; - return 0; -} - - - -int gr_palette_fade_in (ubyte *pal, int nsteps, int allow_keys) -{ - int i, j; - ubyte c; - fix fade_palette[768]; - fix fade_palette_delta[768]; - - int fade_colors[768]; - - if (!gr_palette_faded_out) return 0; - - for (i=0; i<768; i++) - { - gr_current_pal[i] = pal[i]; - fade_palette[i] = 0; - fade_palette_delta[i] = i2f(pal[i] + gr_palette_gamma) / nsteps; - } - - for (j=0; j i2f(pal[i] + gr_palette_gamma)) - fade_palette[i] = i2f(pal[i] + gr_palette_gamma); - c = f2i(fade_palette[i]); - if (c > 63) c = 63; - fade_colors[i] = c; - } - vga_setpalvec (0, 256, fade_colors); - } - - gr_palette_faded_out = 0; - return 0; -} - - - -void gr_palette_read (ubyte *pal) -{ - int colors[768]; - int i; - - vga_getpalvec (0, 256, colors); - - for (i = 0; i < 768; i++) - pal[i] = colors[i]; -} - diff --git a/arch/linux/svgalib/include/Makefile.am b/arch/linux/svgalib/include/Makefile.am deleted file mode 100644 index 1b9c30c0..00000000 --- a/arch/linux/svgalib/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -event.h key.h mouse.h diff --git a/arch/linux/svgalib/include/event.h b/arch/linux/svgalib/include/event.h deleted file mode 100644 index 1aeaedbd..00000000 --- a/arch/linux/svgalib/include/event.h +++ /dev/null @@ -1,9 +0,0 @@ -// Event header file - -#ifndef _EVENT_H -#define _EVENT_H - -int event_init(); -void event_poll(); - -#endif diff --git a/arch/linux/svgalib/include/key.h b/arch/linux/svgalib/include/key.h deleted file mode 100644 index f7d5514b..00000000 --- a/arch/linux/svgalib/include/key.h +++ /dev/null @@ -1,271 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ -/* - * $Source: /cvs/cvsroot/d2x/arch/linux/svgalib/include/key.h,v $ - * $Revision: 1.1.1.1 $ - * $Author: bradleyb $ - * $Date: 2001-01-19 03:30:15 $ - * - * Header for keyboard functions - * - * $Log: not supported by cvs2svn $ - * Revision 1.1.1.1 1999/06/14 22:01:46 donut - * Import of d1x 1.37 source. - * - * Revision 1.19 1994/10/24 13:58:12 john - * Hacked in support for pause key onto code 0x61. - * - * Revision 1.18 1994/10/21 15:17:10 john - * Added KEY_PRINT_SCREEN - * - * Revision 1.17 1994/08/31 12:22:13 john - * Added KEY_DEBUGGED - * - * Revision 1.16 1994/08/24 18:53:50 john - * Made Cyberman read like normal mouse; added dpmi module; moved - * mouse from assembly to c. Made mouse buttons return time_down. - * - * Revision 1.15 1994/08/18 14:56:16 john - * *** empty log message *** - * - * Revision 1.14 1994/08/08 10:43:24 john - * Recorded when a key was pressed for key_inkey_time. - * - * Revision 1.13 1994/06/17 17:17:28 john - * Added keyd_time_last_key_was_pressed or something like that. - * - * Revision 1.12 1994/04/29 12:14:19 john - * Locked all memory used during interrupts so that program - * won't hang when using virtual memory. - * - * Revision 1.11 1994/02/17 15:57:14 john - * Changed key libary to C. - * - * Revision 1.10 1994/01/31 08:34:09 john - * Fixed reversed lshift/rshift keys. - * - * Revision 1.9 1994/01/18 10:58:17 john - * *** empty log message *** - * - * Revision 1.8 1993/10/16 19:24:43 matt - * Added new function key_clear_times() & key_clear_counts() - * - * Revision 1.7 1993/10/15 10:17:09 john - * added keyd_last_key_pressed and released for use with recorder. - * - * Revision 1.6 1993/10/06 16:20:37 john - * fixed down arrow bug - * - * Revision 1.5 1993/10/04 13:26:42 john - * changed the #defines for scan codes. - * - * Revision 1.4 1993/09/28 11:35:20 john - * added key_peekkey - * - * Revision 1.3 1993/09/20 18:36:43 john - * *** empty log message *** - * - * Revision 1.1 1993/07/10 13:10:39 matt - * Initial revision - * - * - */ - -#ifndef _KEY_H -#define _KEY_H - -#include "fix.h" -#include "types.h" -#include // For 'toupper' - -//========================================================================== -// This installs the int9 vector and initializes the keyboard in buffered -// ASCII mode. key_close simply undoes that. -extern void key_init(); -extern void key_close(); - -//========================================================================== -// These are configuration parameters to setup how the buffer works. -// set keyd_buffer_type to 0 for no key buffering. -// set it to 1 and it will buffer scancodes. -extern unsigned char keyd_buffer_type; -extern unsigned char keyd_repeat; // 1=allow repeating, 0=dont allow repeat - -// keyd_editor_mode... 0=game mode, 1=editor mode. -// Editor mode makes key_down_time always return 0 if modifiers are down. -extern unsigned char keyd_editor_mode; - -// Time in seconds when last key was pressed... -extern volatile int keyd_time_when_last_pressed; - -//========================================================================== -// These are the "buffered" keypress routines. Use them by setting the -// "keyd_buffer_type" variable. - -extern void key_flush(); // Clears the 256 char buffer -extern int key_checkch(); // Returns 1 if a char is waiting -extern int key_getch(); // Gets key if one waiting other waits for one. -extern int key_inkey(); // Gets key if one, other returns 0. -extern int key_inkey_time(fix *time); // Same as inkey, but returns the time the key was pressed down. -extern int key_peekkey(); // Same as inkey, but doesn't remove key from buffer. - -extern unsigned char key_to_ascii(int keycode ); -extern char *key_name(int keycode); // Convert keycode to the name of the key - -extern void key_debug(); // Does an INT3 - -//========================================================================== -// These are the unbuffered routines. Index by the keyboard scancode. - -// Set to 1 if the key is currently down, else 0 -extern volatile unsigned char keyd_pressed[]; -extern volatile unsigned char keyd_last_pressed; -extern volatile unsigned char keyd_last_released; - -// Returns the seconds this key has been down since last call. -extern fix key_down_time(int scancode); - -// Returns number of times key has went from up to down since last call. -extern unsigned int key_down_count(int scancode); - -// Returns number of times key has went from down to up since last call. -extern unsigned int key_up_count(int scancode); - -// Clears the times & counts used by the above functions -// Took out... use key_flush(); -//void key_clear_times(); -//void key_clear_counts(); - -extern char * key_text[256]; - -#define KEY_SHIFTED 0x100 -#define KEY_ALTED 0x200 -#define KEY_CTRLED 0x400 -#define KEY_DEBUGGED 0x800 - -#define KEY_0 11 -#define KEY_1 2 -#define KEY_2 3 -#define KEY_3 4 -#define KEY_4 5 -#define KEY_5 6 -#define KEY_6 7 -#define KEY_7 8 -#define KEY_8 9 -#define KEY_9 10 - -#define KEY_A 30 -#define KEY_B 48 -#define KEY_C 46 -#define KEY_D 32 -#define KEY_E 18 -#define KEY_F 33 -#define KEY_G 34 -#define KEY_H 35 -#define KEY_I 23 -#define KEY_J 36 -#define KEY_K 37 -#define KEY_L 38 -#define KEY_M 50 -#define KEY_N 49 -#define KEY_O 24 -#define KEY_P 25 -#define KEY_Q 16 -#define KEY_R 19 -#define KEY_S 31 -#define KEY_T 20 -#define KEY_U 22 -#define KEY_V 47 -#define KEY_W 17 -#define KEY_X 45 -#define KEY_Y 21 -#define KEY_Z 44 - -#define KEY_MINUS 12 -#define KEY_EQUAL 13 -#define KEY_DIVIDE 43 -#define KEY_SLASH 28 -#define KEY_COMMA 51 -#define KEY_PERIOD 52 -#define KEY_SEMICOL 39 - -#define KEY_LBRACKET 26 -#define KEY_RBRACKET 27 - -#define KEY_RAPOSTRO 40 -#define KEY_LAPOSTRO 41 - -#define KEY_ESC 1 -#define KEY_ENTER 28 -#define KEY_BACKSP 14 -#define KEY_TAB 15 -#define KEY_SPACEBAR 57 - -#define KEY_NUMLOCK 69 -#define KEY_SCROLLOCK 70 -#define KEY_CAPSLOCK 58 - -#define KEY_LSHIFT 42 -#define KEY_RSHIFT 54 - -#define KEY_LALT 56 -#define KEY_RALT 100 - -#define KEY_LCTRL 29 -#define KEY_RCTRL 97 - -#define KEY_F1 59 -#define KEY_F2 60 -#define KEY_F3 61 -#define KEY_F4 62 -#define KEY_F5 63 -#define KEY_F6 64 -#define KEY_F7 65 -#define KEY_F8 66 -#define KEY_F9 67 -#define KEY_F10 68 -#define KEY_F11 87 -#define KEY_F12 88 - -#define KEY_PAD0 82 -#define KEY_PAD1 79 -#define KEY_PAD2 80 -#define KEY_PAD3 81 -#define KEY_PAD4 75 -#define KEY_PAD5 76 -#define KEY_PAD6 77 -#define KEY_PAD7 71 -#define KEY_PAD8 72 -#define KEY_PAD9 73 -#define KEY_PADMINUS 74 -#define KEY_PADPLUS 78 -#define KEY_PADPERIOD 83 -#define KEY_PADDIVIDE 98 -#define KEY_PADMULTIPLY 55 -#define KEY_PADENTER 96 - -#define KEY_INSERT 110 -#define KEY_HOME 102 -#define KEY_PAGEUP 104 -#define KEY_DELETE 111 -#define KEY_END 107 -#define KEY_PAGEDOWN 109 -#define KEY_UP 103 -#define KEY_DOWN 108 -#define KEY_LEFT 105 -#define KEY_RIGHT 106 - -#define KEY_PRINT_SCREEN 99 -#define KEY_PAUSE 119 - -#endif diff --git a/arch/linux/svgalib/include/mouse.h b/arch/linux/svgalib/include/mouse.h deleted file mode 100644 index 32f37bf9..00000000 --- a/arch/linux/svgalib/include/mouse.h +++ /dev/null @@ -1,127 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ -/* - * $Source: /cvs/cvsroot/d2x/arch/linux/svgalib/include/mouse.h,v $ - * $Revision: 1.1.1.1 $ - * $Author: bradleyb $ - * $Date: 2001-01-19 03:30:15 $ - * - * Header for mouse functions - * - * $Log: not supported by cvs2svn $ - * Revision 1.1.1.1 1999/06/14 22:01:46 donut - * Import of d1x 1.37 source. - * - * Revision 1.10 1995/02/02 10:22:29 john - * Added cyberman init parameter. - * - * Revision 1.9 1994/11/18 23:18:09 john - * Changed some shorts to ints. - * - * Revision 1.8 1994/09/13 12:33:49 john - * Added functions to get down count and state. - * - * Revision 1.7 1994/08/29 20:52:20 john - * Added better cyberman support; also, joystick calibration - * value return funcctiionn, - * - * Revision 1.6 1994/08/24 17:54:35 john - * *** empty log message *** - * - * Revision 1.5 1994/08/24 17:51:43 john - * Added transparent cyberman support - * - * Revision 1.4 1993/07/27 09:32:22 john - * *** empty log message *** - * - * Revision 1.3 1993/07/26 10:46:44 john - * added definition for mouse_set_pos - * - * Revision 1.2 1993/07/22 13:07:59 john - * added header for mousesetlimts - * - * Revision 1.1 1993/07/10 13:10:40 matt - * Initial revision - * - * - */ - -#ifndef MOUSE_H -#define MOUSE_H - -#include "types.h" -#include "fix.h" - -#define MOUSE_MAX_BUTTONS 8 - -#define MB_LEFT 0 -#define MB_RIGHT 1 -#define MB_MIDDLE 2 -#define MB_Z_UP 3 -#define MB_Z_DOWN 4 -#define MB_PITCH_BACKWARD 5 -#define MB_PITCH_FORWARD 6 -#define MB_BANK_LEFT 7 -#define MB_BANK_RIGHT 8 -#define MB_HEAD_LEFT 9 -#define MB_HEAD_RIGHT 10 - -#define MOUSE_LBTN 1 -#define MOUSE_RBTN 2 -#define MOUSE_MBTN 4 - -#undef NOMOUSE -#ifndef NOMOUSE - -//======================================================================== -// Check for mouse driver, reset driver if installed. returns number of -// buttons if driver is present. - -extern int mouse_set_limits( int x1, int y1, int x2, int y2 ); -extern void mouse_flush(); // clears all mice events... - -//======================================================================== -extern void mouse_get_pos( int *x, int *y); -extern void mouse_get_delta( int *dx, int *dy ); -extern int mouse_get_btns(); -extern void mouse_set_pos( int x, int y); -extern void mouse_get_cyberman_pos( int *x, int *y ); - -// Returns how long this button has been down since last call. -extern fix mouse_button_down_time(int button); - -// Returns how many times this button has went down since last call. -extern int mouse_button_down_count(int button); - -// Returns 1 if this button is currently down -extern int mouse_button_state(int button); - -#else -// 'Neutered' functions... :-) -#define mouse_init(a) -1 -#define mouse_set_limits(a,b,c,d) -1 -#define mouse_flush() -#define mouse_close() -#define mouse_get_pos(a,b) -#define mouse_get_delta(a,b) -#define mouse_get_btns() 0 -#define mouse_set_pos(a,b) -#define mouse_get_cyberman_pos(a,b) -#define mouse_button_down_time(a) 0 -#define mouse_button_down_count(a) 0 -#define mouse_button_state(a) 0 - -#endif - -#endif - diff --git a/arch/linux/svgalib/init.c b/arch/linux/svgalib/init.c deleted file mode 100644 index 3ad24423..00000000 --- a/arch/linux/svgalib/init.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "args.h" - -extern void d_mouse_init(); - -void arch_svgalib_init() -{ - if (!FindArg("-nomouse")) - d_mouse_init(); -} diff --git a/arch/linux/svgalib/key.c b/arch/linux/svgalib/key.c deleted file mode 100644 index 191eb3be..00000000 --- a/arch/linux/svgalib/key.c +++ /dev/null @@ -1,383 +0,0 @@ -/// SDL keyboard input support - -#include -#include - -#include - -#include "event.h" -#include "error.h" -#include "key.h" -#include "timer.h" - -//added on 9/3/98 by Matt Mueller to free some cpu instead of hogging during menus and such -#include "d_delay.h" -//end this section addition - Matt Mueller - -#define KEY_BUFFER_SIZE 16 - -static unsigned char Installed = 0; - -//-------- Variable accessed by outside functions --------- -unsigned char keyd_buffer_type; // 0=No buffer, 1=buffer ASCII, 2=buffer scans -unsigned char keyd_repeat; -unsigned char keyd_editor_mode; -volatile unsigned char keyd_last_pressed; -volatile unsigned char keyd_last_released; -volatile unsigned char keyd_pressed[256]; -volatile int keyd_time_when_last_pressed; - -typedef struct Key_info { - ubyte state; // state of key 1 == down, 0 == up - ubyte last_state; // previous state of key - int counter; // incremented each time key is down in handler - fix timewentdown; // simple counter incremented each time in interrupt and key is down - fix timehelddown; // counter to tell how long key is down -- gets reset to 0 by key routines - ubyte downcount; // number of key counts key was down - ubyte upcount; // number of times key was released -} Key_info; - -typedef struct keyboard { - unsigned short keybuffer[KEY_BUFFER_SIZE]; - Key_info keys[256]; - fix time_pressed[KEY_BUFFER_SIZE]; - unsigned int keyhead, keytail; -} keyboard; - -static /*volatile*/ keyboard key_data; - -char * key_text[256] = { -"","ESC","1","2","3","4","5","6","7","8","9","0","-", -"=","BSPC","TAB","Q","W","E","R","T","Y","U","I","O", -"P","[","]","ƒ","LCTRL","A","S","D","F", -"G","H","J","K","L",";","'","`", -"LSHFT","\\","Z","X","C","V","B","N","M",",", -".","/","RSHFT","PAD*","LALT","SPC", -"CPSLK","F1","F2","F3","F4","F5","F6","F7","F8","F9", -"F10","NMLCK","SCLK","PAD7","PAD8","PAD9","PAD-", -"PAD4","PAD5","PAD6","PAD+","PAD1","PAD2","PAD3","PAD0", -"PAD.","","","","F11","F12","","","","","","","","","", -"","","","","","","","","","","","","","","","","","","","", -"","","","","","","","","","","","","","","","","","","","", -"","","","","","","","","","","","","","","","","","", -"PADƒ","RCTRL","","","","","","","","","","","","","", -"","","","","","","","","","","PAD/","","","RALT","", -"","","","","","","","","","","","","","HOME","‚","PGUP", -"","","","","","END","€","PGDN","INS", -"DEL","","","","","","","","","","","","","","","","","", -"","","","","","","","","","","","","","","","","","","","", -"","","","","","","" }; - -unsigned char ascii_table[128] = -{ 255, 255, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',255,255, - 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', 255, 255, - 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', 39, '`', - 255, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 255,'*', - 255, ' ', 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,255,255, - 255, 255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255 }; - -unsigned char shifted_ascii_table[128] = -{ 255, 255, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',255,255, - 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', 255, 255, - 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '~', - 255, '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 255,255, - 255, ' ', 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,255,255, - 255, 255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255 }; - -//killed on 10/03/98 by Matt Mueller -//unsigned char key_to_ascii(int a) -//{ -// if (!isprint(a)) return 255; -// if (a & KEY_SHIFTED) { -// return (toupper((unsigned char) a)); -// } else { -// return ((unsigned char) a); -// } -//} -//end kill -MM - -//added on 10/03/98 by Matt Mueller to fix shifted keys (copied from dos/key.c) -unsigned char key_to_ascii(int keycode) -{ - int shifted; - - shifted = keycode & KEY_SHIFTED; - keycode &= 0xFF; - - if ( keycode>=127 ) - return 255; - - if (shifted) - return shifted_ascii_table[keycode]; - else - return ascii_table[keycode]; -} -//end addition -MM - -void key_handler(int scancode, int press) -{ - ubyte state, key_state; - int i, keycode, event_key; - Key_info *key; - unsigned char temp; - - if (press == KEY_EVENTPRESS) - key_state = 1; - else if (press == KEY_EVENTRELEASE) - key_state = 0; - else - return; - - event_key = scancode; - - //===================================================== - //Here a translation from win keycodes to mac keycodes! - //===================================================== - - for (i = 255; i >= 0; i--) { - - keycode = i; - key = &(key_data.keys[keycode]); - if (i == event_key) - state = key_state; - else - state = key->last_state; - - if ( key->last_state == state ) { - if (state) { - key->counter++; - keyd_last_pressed = keycode; - keyd_time_when_last_pressed = timer_get_fixed_seconds(); - } - } else { - if (state) { - keyd_last_pressed = keycode; - keyd_pressed[keycode] = 1; - key->downcount += state; - key->state = 1; - key->timewentdown = keyd_time_when_last_pressed = timer_get_fixed_seconds(); - key->counter++; - } else { - keyd_pressed[keycode] = 0; - keyd_last_released = keycode; - key->upcount += key->state; - key->state = 0; - key->counter = 0; - key->timehelddown += timer_get_fixed_seconds() - key->timewentdown; - } - } - if ( (state && !key->last_state) || (state && key->last_state && (key->counter > 30) && (key->counter & 0x01)) ) { - if ( keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT]) - keycode |= KEY_SHIFTED; - if ( keyd_pressed[KEY_LALT] || keyd_pressed[KEY_RALT]) - keycode |= KEY_ALTED; - if ( keyd_pressed[KEY_LCTRL] || keyd_pressed[KEY_RCTRL]) - keycode |= KEY_CTRLED; - if ( keyd_pressed[KEY_DELETE] ) - keycode |= KEY_DEBUGGED; - temp = key_data.keytail+1; - if ( temp >= KEY_BUFFER_SIZE ) temp=0; - if (temp!=key_data.keyhead) { - key_data.keybuffer[key_data.keytail] = keycode; - key_data.time_pressed[key_data.keytail] = keyd_time_when_last_pressed; - key_data.keytail = temp; - } - } - key->last_state = state; - } -} - -void key_close() -{ - Installed = 0; - keyboard_close(); -} - -void key_init() -{ - if (keyboard_init()) - Error ("SVGAlib Keyboard Init Failed"); - Installed=1; - - keyboard_seteventhandler (key_handler); - keyd_time_when_last_pressed = timer_get_fixed_seconds(); - keyd_buffer_type = 1; - keyd_repeat = 1; - -// Clear the keyboard array - key_flush(); - atexit(key_close); -} - -void key_flush() -{ - int i; - fix curtime; - - if (!Installed) - key_init(); - - key_data.keyhead = key_data.keytail = 0; - - //Clear the keyboard buffer - for (i=0; i= KEY_BUFFER_SIZE ) n=0; - return n; -} - -int key_checkch() -{ - int is_one_waiting = 0; - event_poll(); - if (key_data.keytail!=key_data.keyhead) - is_one_waiting = 1; - return is_one_waiting; -} - -int key_inkey() -{ - int key = 0; - if (!Installed) - key_init(); - event_poll(); - if (key_data.keytail!=key_data.keyhead) { - key = key_data.keybuffer[key_data.keyhead]; - key_data.keyhead = add_one(key_data.keyhead); - } -//added 9/3/98 by Matt Mueller to free cpu time instead of hogging during menus and such -// else d_delay(1); -//end addition - Matt Mueller - return key; -} - -int key_inkey_time(fix * time) -{ - int key = 0; - - if (!Installed) - key_init(); - event_poll(); - if (key_data.keytail!=key_data.keyhead) { - key = key_data.keybuffer[key_data.keyhead]; - *time = key_data.time_pressed[key_data.keyhead]; - key_data.keyhead = add_one(key_data.keyhead); - } - return key; -} - -int key_peekkey() -{ - int key = 0; - event_poll(); - if (key_data.keytail!=key_data.keyhead) - key = key_data.keybuffer[key_data.keyhead]; - - return key; -} - -int key_getch() -{ - int dummy=0; - - if (!Installed) - return 0; -// return getch(); - - while (!key_checkch()) - dummy++; - return key_inkey(); -} - -unsigned int key_get_shift_status() -{ - unsigned int shift_status = 0; - - if ( keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT] ) - shift_status |= KEY_SHIFTED; - - if ( keyd_pressed[KEY_LALT] || keyd_pressed[KEY_RALT] ) - shift_status |= KEY_ALTED; - - if ( keyd_pressed[KEY_LCTRL] || keyd_pressed[KEY_RCTRL] ) - shift_status |= KEY_CTRLED; - -#ifndef NDEBUG - if (keyd_pressed[KEY_DELETE]) - shift_status |=KEY_DEBUGGED; -#endif - - return shift_status; -} - -// Returns the number of seconds this key has been down since last call. -fix key_down_time(int scancode) -{ - fix time_down, time; - - event_poll(); - if ((scancode<0)|| (scancode>255)) return 0; - - if (!keyd_pressed[scancode]) { - time_down = key_data.keys[scancode].timehelddown; - key_data.keys[scancode].timehelddown = 0; - } else { - time = timer_get_fixed_seconds(); - time_down = time - key_data.keys[scancode].timewentdown; - key_data.keys[scancode].timewentdown = time; - } - - return time_down; -} - -unsigned int key_down_count(int scancode) -{ - int n; - event_poll(); - if ((scancode<0)|| (scancode>255)) return 0; - - n = key_data.keys[scancode].downcount; - key_data.keys[scancode].downcount = 0; - - return n; -} - -unsigned int key_up_count(int scancode) -{ - int n; - event_poll(); - if ((scancode<0)|| (scancode>255)) return 0; - - n = key_data.keys[scancode].upcount; - key_data.keys[scancode].upcount = 0; - - return n; -} - diff --git a/arch/linux/svgalib/mouse.c b/arch/linux/svgalib/mouse.c deleted file mode 100644 index 4e528c67..00000000 --- a/arch/linux/svgalib/mouse.c +++ /dev/null @@ -1,197 +0,0 @@ -#include -#include -#include -#include "fix.h" -#include "timer.h" -#include "event.h" -#include "mouse.h" - -ubyte installed = 0; - -struct mousebutton { - ubyte pressed; - fix time_went_down; - fix time_held_down; - uint num_downs; - uint num_ups; -}; - -static struct mouseinfo { - struct mousebutton buttons[MOUSE_MAX_BUTTONS]; -//added on 10/17/98 by Hans de Goede for mouse functionality - int min_x, min_y; - int max_x, max_y; - int delta_x, delta_y; - int x,y; -//end this section addition - Hans -} Mouse; - -void mouse_handler (int button, int dx, int dy, int dz, int drx, int dry, int drz) -{ - int i; - for (i = 0; i < 8; i++) - { - if (button & (1 << i)) - { - Mouse.buttons[i].pressed = 1; - Mouse.buttons[i].time_went_down = timer_get_fixed_seconds(); - Mouse.buttons[i].num_downs++; - } - else - { - Mouse.buttons[i].pressed = 0; - Mouse.buttons[i].time_held_down += timer_get_fixed_seconds() - Mouse.buttons[i].time_went_down; - Mouse.buttons[i].num_ups++; - } - } - Mouse.delta_x += dx; - Mouse.delta_y += dy; - Mouse.x += dx; - Mouse.y += dy; - if (Mouse.x > Mouse.max_x) Mouse.x = Mouse.max_x; - else if (Mouse.x < Mouse.min_x) Mouse.x = Mouse.min_x; - if (Mouse.y > Mouse.max_y) Mouse.y = Mouse.max_y; - else if (Mouse.y < Mouse.min_y) Mouse.y = Mouse.min_y; -} - -void d_mouse_close(void) -{ - if (installed) - vga_setmousesupport(0); - installed = 0; -} - -void d_mouse_init(void) -{ - memset(&Mouse,0,sizeof(Mouse)); - vga_setmousesupport(1); - if (!installed) - atexit(d_mouse_close); - installed = 1; -} - -int mouse_set_limits( int x1, int y1, int x2, int y2 ) -{ - event_poll(); - Mouse.min_x = x1; - Mouse.min_y = y1; - Mouse.max_x = x2; - Mouse.max_y = y2; - return 0; -} - -void mouse_flush() // clears all mice events... -{ - int i; - fix current_time; - - event_poll(); - - current_time = timer_get_fixed_seconds(); - for (i=0; i Mouse.max_x) Mouse.x = Mouse.max_x; - else if (Mouse.x < Mouse.min_x) Mouse.x = Mouse.min_x; - if (Mouse.y > Mouse.max_y) Mouse.y = Mouse.max_y; - else if (Mouse.y < Mouse.min_y) Mouse.y = Mouse.min_y; -//end this section change - Hans -} - -void mouse_get_cyberman_pos( int *x, int *y ) -{ - // Shrug... - event_poll(); -} - -// Returns how long this button has been down since last call. -fix mouse_button_down_time(int button) -{ - fix time_down, time; - - event_poll(); - - if (!Mouse.buttons[button].pressed) { - time_down = Mouse.buttons[button].time_held_down; - Mouse.buttons[button].time_held_down = 0; - } else { - time = timer_get_fixed_seconds(); - time_down = time - Mouse.buttons[button].time_held_down; - Mouse.buttons[button].time_held_down = time; - } - return time_down; -} - -// Returns how many times this button has went down since last call -int mouse_button_down_count(int button) -{ - int count; - - event_poll(); - - count = Mouse.buttons[button].num_downs; - Mouse.buttons[button].num_downs = 0; - - return count; -} - -// Returns 1 if this button is currently down -int mouse_button_state(int button) -{ - event_poll(); - return Mouse.buttons[button].pressed; -} - - -- 2.39.2