[cadcdev-svn-commits] SF.net SVN: cadcdev: [386] tiki/sdl/src

[<c99...@us...>]

Revision: 386
          http://svn.sourceforge.net/cadcdev/?rev=386&view=rev
Author:   c99koder
Date:     2006-12-02 19:43:41 -0800 (Sat, 02 Dec 2006)

Log Message:
-----------
Tiki: SDL: Add F-key constants and fix a bug sending the modifier keys

Modified Paths:
--------------
    tiki/sdl/src/init_shutdown.cpp
    tiki/sdl/src/plathid.cpp

Modified: tiki/sdl/src/init_shutdown.cpp
===================================================================
--- tiki/sdl/src/init_shutdown.cpp	2006-11-26 01:59:05 UTC (rev 385)
+++ tiki/sdl/src/init_shutdown.cpp	2006-12-03 03:43:41 UTC (rev 386)
@@ -29,7 +29,7 @@
 		return false;
 	}
 
-	dev = alcOpenDevice((ALubyte *)"sdl");
+	dev = alcOpenDevice("sdl");
 	if(dev == NULL)
 	{
 		fprintf(stderr, "Unable to initialize OpenAL: %s\n", alGetError());
@@ -44,6 +44,7 @@
 		else
 		{
 			alcMakeContextCurrent(context);
+			alcProcessContext(context);
 			alutInit(&argc, argv);
 			Audio::Sound::initGlobal();
 			Audio::Stream::initGlobal();

Modified: tiki/sdl/src/plathid.cpp
===================================================================
--- tiki/sdl/src/plathid.cpp	2006-11-26 01:59:05 UTC (rev 385)
+++ tiki/sdl/src/plathid.cpp	2006-12-03 03:43:41 UTC (rev 386)
@@ -185,6 +185,30 @@
 			return Event::KeyPgdn;
 		case SDLK_ESCAPE:
 			return Event::KeyEsc;
+		case SDLK_F1:
+			return Event::KeyF1;
+		case SDLK_F2:
+			return Event::KeyF2;
+		case SDLK_F3:
+			return Event::KeyF3;
+		case SDLK_F4:
+			return Event::KeyF4;
+		case SDLK_F5:
+			return Event::KeyF5;
+		case SDLK_F6:
+			return Event::KeyF6;
+		case SDLK_F7:
+			return Event::KeyF7;
+		case SDLK_F8:
+			return Event::KeyF8;
+		case SDLK_F9:
+			return Event::KeyF9;
+		case SDLK_F10:
+			return Event::KeyF10;
+		case SDLK_F11:
+			return Event::KeyF11;
+		case SDLK_F12:
+			return Event::KeyF12;
 		default:
 			return key;
 	}
@@ -231,6 +255,7 @@
 				Event evtPress(Event::EvtKeypress);
 				evtPress.dev = SDLkb;
 				evtPress.key = translateSym(events[i].key.keysym.sym);
+				evtPress.mod = mod;
 				sendEvent(evtPress);
 				//Debug::printf("HID:KB: KEYDOWN: %d\n", evt.key);
 			} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.