summaryrefslogtreecommitdiffstats
path: root/uisimulator/buttonmap
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-07-06 15:11:56 +0000
committerThomas Martitz <kugel@rockbox.org>2010-07-06 15:11:56 +0000
commit31b5c471aeec6040ca69e3bea59c0825e2a6fc9d (patch)
tree628d7638a50ab226d5164f495d14d56ed2b51a1f /uisimulator/buttonmap
parent9da707955dcdefa1b7a55348937eb706a08039b5 (diff)
downloadrockbox-31b5c471aeec6040ca69e3bea59c0825e2a6fc9d.tar.gz
rockbox-31b5c471aeec6040ca69e3bea59c0825e2a6fc9d.tar.bz2
rockbox-31b5c471aeec6040ca69e3bea59c0825e2a6fc9d.zip
Rockbox as an application: Add an 320x240 SDL application target.
It still works mostly like the simulator. There's also some minor left overs from the sim, but it does not define SIMULATOR. It installs into the current (build) dir, and you need to run it with '--root .' (because it looks for ./.rockbox and not ./simdisk/rockbox) as options. That's one of the few kludges left that should be resolved soon'ish. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27310 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/buttonmap')
-rw-r--r--uisimulator/buttonmap/SOURCES3
-rw-r--r--uisimulator/buttonmap/buttonmap.h42
-rw-r--r--uisimulator/buttonmap/touchscreen.c96
3 files changed, 0 insertions, 141 deletions
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index f5a409b156..0fc9d16097 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -1,8 +1,5 @@
#ifdef SIMULATOR
buttonmaps.c
-#ifdef HAVE_TOUCHSCREEN
-touchscreen.c
-#endif
#if CONFIG_KEYPAD == GIGABEAT_PAD
gigabeat.c
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
diff --git a/uisimulator/buttonmap/buttonmap.h b/uisimulator/buttonmap/buttonmap.h
deleted file mode 100644
index 2f14cea9c4..0000000000
--- a/uisimulator/buttonmap/buttonmap.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2010 by Fred Bauer
- *
- * 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 software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __BUTTONMAP_H__
-#define __BUTTONMAP_H__
-/* Button maps: simulated key, x, y, radius, name */
-/* Run sim with --mapping to get coordinates */
-/* or --debugbuttons to check */
-/* The First matching button is returned */
-struct button_map {
- int button, x, y, radius;
- char *description;
-};
-
-extern struct button_map bm[];
-
-int xy2button( int x, int y);
-
-int key_to_button(int keyboard_button);
-#ifdef HAVE_TOUCHSCREEN
-int key_to_touch(int keyboard_button, unsigned int mouse_coords);
-#endif
-
-#endif /* __BUTTONMAP_H__ */
diff --git a/uisimulator/buttonmap/touchscreen.c b/uisimulator/buttonmap/touchscreen.c
deleted file mode 100644
index 90518c7c7e..0000000000
--- a/uisimulator/buttonmap/touchscreen.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2008 Jonathan Gordon
- *
- * 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 software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-
-#include <stdio.h>
-#include <SDL.h>
-#include "button.h"
-#include "buttonmap.h"
-#include "touchscreen.h"
-
-int key_to_touch(int keyboard_button, unsigned int mouse_coords)
-{
- int new_btn = BUTTON_NONE;
- switch (keyboard_button)
- {
- case BUTTON_TOUCHSCREEN:
- switch (touchscreen_get_mode())
- {
- case TOUCHSCREEN_POINT:
- new_btn = BUTTON_TOUCHSCREEN;
- break;
- case TOUCHSCREEN_BUTTON:
- {
- static const int touchscreen_buttons[3][3] = {
- {BUTTON_TOPLEFT, BUTTON_TOPMIDDLE, BUTTON_TOPRIGHT},
- {BUTTON_MIDLEFT, BUTTON_CENTER, BUTTON_MIDRIGHT},
- {BUTTON_BOTTOMLEFT, BUTTON_BOTTOMMIDDLE, BUTTON_BOTTOMRIGHT},
- };
- int px_x = ((mouse_coords&0xffff0000)>>16);
- int px_y = ((mouse_coords&0x0000ffff));
- new_btn = touchscreen_buttons[px_y/(LCD_HEIGHT/3)][px_x/(LCD_WIDTH/3)];
- break;
- }
- }
- break;
- case SDLK_KP7:
- case SDLK_7:
- new_btn = BUTTON_TOPLEFT;
- break;
- case SDLK_KP8:
- case SDLK_8:
- case SDLK_UP:
- new_btn = BUTTON_TOPMIDDLE;
- break;
- case SDLK_KP9:
- case SDLK_9:
- new_btn = BUTTON_TOPRIGHT;
- break;
- case SDLK_KP4:
- case SDLK_u:
- case SDLK_LEFT:
- new_btn = BUTTON_MIDLEFT;
- break;
- case SDLK_KP5:
- case SDLK_i:
- new_btn = BUTTON_CENTER;
- break;
- case SDLK_KP6:
- case SDLK_o:
- case SDLK_RIGHT:
- new_btn = BUTTON_MIDRIGHT;
- break;
- case SDLK_KP1:
- case SDLK_j:
- new_btn = BUTTON_BOTTOMLEFT;
- break;
- case SDLK_KP2:
- case SDLK_k:
- case SDLK_DOWN:
- new_btn = BUTTON_BOTTOMMIDDLE;
- break;
- case SDLK_KP3:
- case SDLK_l:
- new_btn = BUTTON_BOTTOMRIGHT;
- break;
- }
- return new_btn;
-}