X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_system.pas;h=5f1b7f32448eb2c866d9916a8369af29d5beee4e;hb=e9689e89adc11f1179ee991bffa4d2be54f6e068;hp=afc18999b4df54d9ac716742cb87eda0b9bc0df7;hpb=684f59b7bf1a5735fbd5169a0239f22794d94613;p=d2df-sdl.git diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas index afc1899..5f1b7f3 100644 --- a/src/game/sdl2/g_system.pas +++ b/src/game/sdl2/g_system.pas @@ -20,12 +20,11 @@ interface uses Utils; (* --- Utils --- *) - function sys_GetTicks (): Int64; procedure sys_Delay (ms: Integer); (* --- Graphics --- *) - function sys_GetDispalyModes (bpp: Integer): SSArray; - function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen: Boolean): Boolean; + function sys_GetDisplayModes (bpp: Integer): SSArray; + function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean; procedure sys_EnableVSync (yes: Boolean); procedure sys_Repaint; @@ -37,32 +36,35 @@ interface procedure sys_Init; procedure sys_Final; + var (* hooks *) + sys_CharPress: procedure (ch: AnsiChar) = nil; + sys_ScreenResize: procedure (w, h: Integer) = nil; + implementation uses - SysUtils, SDL2, GL, Math, - e_log, e_graphics, e_input, - g_touch, - g_options, g_window, g_console, g_game, g_menu, g_gui, g_main; + SysUtils, SDL2, Math, ctypes, + e_log, e_input, e_sound, + {$IFDEF ENABLE_HOLMES} + sdlcarcass, + {$ENDIF} + g_touch, g_options, g_console, g_game, g_basic + ; const - GameTitle = 'Doom 2D: Forever (SDL 2)'; + GameTitle = 'Doom 2D: Forever (SDL 2, %s)'; var window: PSDL_Window; context: TSDL_GLContext; - display: Integer; + display, wx, wy: Integer; + wc: Boolean; JoystickHandle: array [0..e_MaxJoys - 1] of PSDL_Joystick; JoystickHatState: array [0..e_MaxJoys - 1, 0..e_MaxJoyHats - 1, HAT_LEFT..HAT_DOWN] of Boolean; JoystickZeroAxes: array [0..e_MaxJoys - 1, 0..e_MaxJoyAxes - 1] of Integer; (* --------- Utils --------- *) - function sys_GetTicks (): Int64; - begin - result := SDL_GetTicks() - end; - procedure sys_Delay (ms: Integer); begin SDL_Delay(ms) @@ -70,28 +72,19 @@ implementation (* --------- Graphics --------- *) - procedure UpdateSize (w, h: Integer); + function GetTitle (): PChar; + var info: AnsiString; begin - gWinSizeX := w; - gWinSizeY := h; - gWinRealPosX := 0; - gWinRealPosY := 0; - gScreenWidth := w; - gScreenHeight := h; - {$IFDEF ENABLE_HOLMES} - fuiScrWdt := w; - fuiScrHgt := h; - {$ENDIF} - e_ResizeWindow(w, h); - e_InitGL; - g_Game_SetupScreenSize; - g_Menu_Reset; - g_Game_ClearLoading; + info := g_GetBuildHash(false); + if info = 'custom build' then + info := info + ' by ' + g_GetBuilderName() + ' ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME; + result := PChar(Format(GameTitle, [info])) end; - function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean; - var flags: UInt32; + function InitWindow (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean; + var flags: UInt32; x, y: cint; begin + // note: on window close make: if assigned(oglDeinitCB) then oglDeinitCB; e_LogWritefln('InitWindow %s %s %s %s', [w, h, bpp, fullScreen]); result := false; if window = nil then @@ -112,17 +105,39 @@ implementation {$ENDIF} flags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE; if fullScreen then flags := flags or SDL_WINDOW_FULLSCREEN; - window := SDL_CreateWindow(GameTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, flags); + if maximized then flags := flags or SDL_WINDOW_MAXIMIZED; + if wc then + begin + x := SDL_WINDOWPOS_CENTERED; + y := SDL_WINDOWPOS_CENTERED + end + else + begin + x := wx; + y := wy + end; + window := SDL_CreateWindow(GetTitle(), x, y, w, h, flags); if window <> nil then begin context := SDL_GL_CreateContext(window); if context <> nil then begin - UpdateSize(w, h); + if (fullscreen = false) and (maximized = false) and (wc = false) then + begin + SDL_GetWindowPosition(window, @x, @y); + wx := x; wy := y + end; + gFullScreen := fullscreen; + gWinMaximized := maximized; + gRC_FullScreen := fullscreen; + gRC_Maximized := maximized; + if @sys_ScreenResize <> nil then + sys_ScreenResize(w, h); result := true end else begin + // SDL_DestroyWindow(window); e_LogWritefln('SDL: unable to create OpenGL context: %s', [SDL_GetError]) end end @@ -134,9 +149,32 @@ implementation else begin if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0; - SDL_SetWindowSize(window, w, h); SDL_SetWindowFullscreen(window, flags); - UpdateSize(w, h); + SDL_SetWindowSize(window, w, h); + if maximized then SDL_MaximizeWindow(window); + // always reset to center when changing fullscreen->windowed for safety purposes + if wc or (gFullscreen and not fullscreen) or (gWinMaximized and not maximized) then + begin + x := SDL_WINDOWPOS_CENTERED; + y := SDL_WINDOWPOS_CENTERED + end + else + begin + x := wx; + y := wy + end; + SDL_SetWindowPosition(window, x, y); + if (fullscreen = false) and (maximized = false) and (wc = false) then + begin + SDL_GetWindowPosition(window, @x, @y); + wx := x; wy := y + end; + gFullScreen := fullscreen; + gWinMaximized := maximized; + gRC_FullScreen := fullscreen; + gRC_Maximized := maximized; + if @sys_ScreenResize <> nil then + sys_ScreenResize(w, h); result := true end end; @@ -154,7 +192,7 @@ implementation SDL_GL_SetSwapInterval(0) end; - function sys_GetDispalyModes (bpp: Integer): SSArray; + function sys_GetDisplayModes (bpp: Integer): SSArray; var i, count, num, pw, ph: Integer; m: TSDL_DisplayMode; begin result := nil; @@ -186,9 +224,9 @@ implementation end end; - function sys_SetDisplayMode (w, h, bpp: Integer; fullScreen: Boolean): Boolean; + function sys_SetDisplayMode (w, h, bpp: Integer; fullScreen, maximized: Boolean): Boolean; begin - result := InitWindow(w, h, bpp, fullScreen) + result := InitWindow(w, h, bpp, fullScreen, maximized) end; (* --------- Joystick --------- *) @@ -341,10 +379,45 @@ implementation function HandleWindow (var ev: TSDL_WindowEvent): Boolean; begin result := false; + if g_dbg_input then + e_LogWritefln('Window Event: event = %s, data1 = %s, data2 = %s', [ev.event, ev.data1, ev.data2]); case ev.event of - SDL_WINDOWEVENT_RESIZED: UpdateSize(ev.data1, ev.data2); + SDL_WINDOWEVENT_RESIZED: + if @sys_ScreenResize <> nil then + sys_ScreenResize(ev.data1, ev.data2); SDL_WINDOWEVENT_EXPOSED: sys_Repaint; SDL_WINDOWEVENT_CLOSE: result := true; + SDL_WINDOWEVENT_MOVED: + begin + wx := ev.data1; + wy := ev.data2 + end; + SDL_WINDOWEVENT_FOCUS_LOST, SDL_WINDOWEVENT_MINIMIZED: + begin + e_UnpressAllKeys; + if gMuteWhenInactive then + e_MuteChannels(true); + {$IFDEF ENABLE_HOLMES} + if assigned(winBlurCB) then winBlurCB; + {$ENDIF} + end; + SDL_WINDOWEVENT_FOCUS_GAINED, SDL_WINDOWEVENT_MAXIMIZED, SDL_WINDOWEVENT_RESTORED: + begin + if ev.event = SDL_WINDOWEVENT_MAXIMIZED then + begin + gWinMaximized := true; + gRC_Maximized := true + end + else if ev.event = SDL_WINDOWEVENT_RESTORED then + begin + gWinMaximized := false; + gRC_Maximized := false + end; + e_MuteChannels(false); + {$IFDEF ENABLE_HOLMES} + if assigned(winFocusCB) then winFocusCB; + {$ENDIF} + end; end end; @@ -355,6 +428,14 @@ implementation down := (ev.type_ = SDL_KEYDOWN); if key = SDL_SCANCODE_AC_BACK then key := SDL_SCANCODE_ESCAPE; + {$IFDEF ENABLE_HOLMES} + if fuiOnSDLEvent(PSDL_Event(@ev)^) then + begin + // event eaten, but... + if not down then e_KeyUpDown(key, false); + exit; + end; + {$ENDIF} if ev._repeat = 0 then begin if g_dbg_input then @@ -362,29 +443,31 @@ implementation e_KeyUpDown(key, down); g_Console_ProcessBind(key, down); end - else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then + else begin - KeyPress(key) // key repeat in menus and shit + if g_dbg_input then + e_LogWritefln('Input Debug: keyrep, scancode=%s', [key]); + g_Console_ProcessBindRepeat(key); end end; procedure HandleTextInput (var ev: TSDL_TextInputEvent); var ch: UnicodeChar; sch: AnsiChar; begin - if g_dbg_input then - e_LogWritefln('Input Debug: text, text=%s', [ev.text]); Utf8ToUnicode(@ch, PChar(ev.text), 1); - if IsValid1251(Word(ch)) then - begin - sch := AnsiChar(wchar2win(ch)); - CharPress(sch); - end; + sch := AnsiChar(wchar2win(ch)); + if g_dbg_input then + e_LogWritefln('Input Debug: text, text="%s", ch = %s, sch = %s', [ev.text, Ord(ch), Ord(sch)]); + if @sys_CharPress <> nil then + if IsValid1251(Word(ch)) and IsPrintable1251(ch) then + sys_CharPress(sch) end; function sys_HandleInput (): Boolean; var ev: TSDL_Event; begin result := false; + ZeroMemory(@ev, sizeof(ev)); while SDL_PollEvent(@ev) <> 0 do begin case ev.type_ of @@ -398,6 +481,9 @@ implementation SDL_JOYDEVICEREMOVED: HandleJoyRemove(ev.jdevice); SDL_TEXTINPUT: HandleTextInput(ev.text); SDL_FINGERMOTION, SDL_FINGERDOWN, SDL_FINGERUP: g_Touch_HandleEvent(ev.tfinger); + {$IFDEF ENABLE_HOLMES} + SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION: fuiOnSDLEvent(ev); + {$ENDIF} end end end; @@ -412,7 +498,7 @@ implementation (* --------- Init --------- *) procedure sys_Init; - var flags: UInt32; ok: Boolean; + var flags: UInt32; begin e_WriteLog('Init SDL2', TMsgType.Notify); {$IFDEF HEADLESS} @@ -422,28 +508,41 @@ implementation flags := SDL_INIT_TIMER or $00004000; {$ENDIF} {$ELSE} - flags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO; + flags := SDL_INIT_TIMER or SDL_INIT_VIDEO; {$ENDIF} SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0'); if SDL_Init(flags) <> 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError); - ok := InitWindow(gScreenWidth, gScreenHeight, gBPP, gFullscreen); - if not ok then - raise Exception.Create('SDL: Failed to set videomode: ' + SDL_GetError); + {$IFNDEF HEADLESS} + if SDL_InitSubSystem(SDL_INIT_JOYSTICK) <> 0 then + e_LogWritefln('SDL: Init subsystem failed: %s', [SDL_GetError()]); + {$ENDIF} + SDL_ShowCursor(SDL_DISABLE); end; procedure sys_Final; begin e_WriteLog('Releasing SDL2', TMsgType.Notify); if context <> nil then + begin SDL_GL_DeleteContext(context); + context := nil; + end; if window <> nil then + begin SDL_DestroyWindow(window); - window := nil; - context := nil; + window := nil; + end; SDL_Quit end; initialization conRegVar('sdl2_display_index', @display, 'use display index as base', ''); + conRegVar('sdl2_window_x', @wx, 'window position x', ''); + conRegVar('sdl2_window_y', @wy, 'window position y', ''); + conRegVar('sdl2_window_center', @wc, 'force window creation at center', ''); + display := 0; + wx := SDL_WINDOWPOS_CENTERED; + wy := SDL_WINDOWPOS_CENTERED; + wc := false end.