~vcs-imports/libsdl/trunk

Viewing changes to src/events/SDL_keyboard.c

Committer: slouken
Date: 2010-01-21 06:21:52 UTC
Revision ID: svn-v4:c70aab31-4412-0410-b14c-859654838e24:trunk/SDL:5525

Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.

files modified:
README.iphoneos

Xcode-iPhoneOS/Demos/src/accelerometer.c

Xcode-iPhoneOS/Demos/src/fireworks.c

Xcode-iPhoneOS/Demos/src/happy.c

Xcode-iPhoneOS/Demos/src/keyboard.c

Xcode-iPhoneOS/Demos/src/mixer.c

Xcode-iPhoneOS/Demos/src/rectangles.c

Xcode-iPhoneOS/Demos/src/touch.c

include/SDL_compat.h

include/SDL_events.h

include/SDL_mouse.h

include/SDL_syswm.h

include/SDL_video.h

src/SDL_assert.c

src/SDL_compat.c

src/events/SDL_keyboard.c

src/events/SDL_keyboard_c.h

src/events/SDL_mouse.c

src/events/SDL_mouse_c.h

src/events/SDL_windowevents.c

src/events/SDL_windowevents_c.h

src/video/SDL_gamma.c

src/video/SDL_renderer_gl.c

src/video/SDL_renderer_gles.c

src/video/SDL_renderer_sw.c

src/video/SDL_sysvideo.h

src/video/SDL_video.c

src/video/cocoa/SDL_cocoamouse.m

src/video/cocoa/SDL_cocoaopengl.m

src/video/cocoa/SDL_cocoawindow.h

src/video/cocoa/SDL_cocoawindow.m

src/video/directfb/SDL_DirectFB_WM.c

src/video/directfb/SDL_DirectFB_events.c

src/video/directfb/SDL_DirectFB_mouse.c

src/video/directfb/SDL_DirectFB_render.c

src/video/directfb/SDL_DirectFB_window.c

src/video/directfb/SDL_DirectFB_window.h

src/video/dummy/SDL_nullrender.c

src/video/nds/SDL_ndsrender.c

src/video/pandora/SDL_pandora.c

src/video/photon/SDL_photon.c

src/video/photon/SDL_photon_input.c

src/video/photon/SDL_photon_render.c

src/video/ps3/SDL_ps3render.c

src/video/qnxgf/SDL_gf_input.c

src/video/qnxgf/SDL_gf_render.c

src/video/qnxgf/SDL_qnxgf.c

src/video/uikit/SDL_uikitappdelegate.h

src/video/uikit/SDL_uikitappdelegate.m

src/video/uikit/SDL_uikitkeyboard.h

src/video/uikit/SDL_uikitview.m

src/video/uikit/SDL_uikitwindow.h

src/video/uikit/SDL_uikitwindow.m

src/video/win32/SDL_ceddrawrender.c

src/video/win32/SDL_d3drender.c

src/video/win32/SDL_gapirender.c

src/video/win32/SDL_gdirender.c

src/video/win32/SDL_win32events.c

src/video/win32/SDL_win32window.c

src/video/win32/SDL_win32window.h

src/video/x11/SDL_x11events.c

src/video/x11/SDL_x11opengl.c

src/video/x11/SDL_x11render.c

src/video/x11/SDL_x11window.c

src/video/x11/SDL_x11window.h

test/automated/render/render.c

test/common.c

test/common.h

test/testdraw2.c

test/testintersections.c

test/testnative.c

test/testsprite2.c

test/testspriteminimal.c

Show diffs side-by-side

added added

removed removed

src/events/SDL_keyboard.c

646

}

647

648

void

649

SDL_SetKeyboardFocus(int index, SDL_WindowID windowID)

649

SDL_SetKeyboardFocus(int index, SDL_Window * window)

650

{

651

SDL_Keyboard *keyboard = SDL_GetKeyboard(index);

652

int i;

657

}

658

659

/* See if the current window has lost focus */

660

if (keyboard->focus && keyboard->focus != windowID) {

660

if (keyboard->focus && keyboard->focus != window) {

661

focus = SDL_FALSE;

662

for (i = 0; i < SDL_num_keyboards; ++i) {

663

if (i != index) {

674

}

675

}

676

677

keyboard->focus = windowID;

677

keyboard->focus = window;

678

679

if (keyboard->focus) {

680

SDL_SendWindowEvent(keyboard->focus, SDL_WINDOWEVENT_FOCUS_GAINED,

809

event.key.keysym.sym = keyboard->keymap[scancode];

810

event.key.keysym.mod = modstate;

811

event.key.keysym.unicode = 0;

812

event.key.windowID = keyboard->focus;

812

event.key.windowID = keyboard->focus->id;

813

posted = (SDL_PushEvent(&event) > 0);

814

}

815

return (posted);

832

event.text.type = SDL_TEXTINPUT;

833

event.text.which = (Uint8) index;

834

SDL_strlcpy(event.text.text, text, SDL_arraysize(event.text.text));

835

event.text.windowID = keyboard->focus;

835

event.text.windowID = keyboard->focus->id;

836

posted = (SDL_PushEvent(&event) > 0);

837

}

838

return (posted);

Older »