[Commits] [wesnoth/wesnoth] ff3588: Add the initial SDL_Window wrapper code.

GitHub noreply at github.com
Sun Mar 9 15:17:38 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ff3588c99b7c422614fa3c44fd1a0d51ee293177
      https://github.com/wesnoth/wesnoth/commit/ff3588c99b7c422614fa3c44fd1a0d51ee293177
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-08 (Sat, 08 Mar 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    A src/sdl/window.cpp
    A src/sdl/window.hpp
    M src/video.cpp

  Log Message:
  -----------
  Add the initial SDL_Window wrapper code.

With this wrapper in place, Wesnoth shows a main window, all black and a
lot of errors on the console.


  Commit: 26aad8b7abe45158eefa0a15270073d2a50b5207
      https://github.com/wesnoth/wesnoth/commit/26aad8b7abe45158eefa0a15270073d2a50b5207
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/video.cpp

  Log Message:
  -----------
  Implement rendering with SDL 2.

The game now starts and can be played. There are a lot of visual
glitches, but visual it is playable.

The text input is completely broken, due to the changes in the
SDL 2 API and the band-aid compile fixes.


  Commit: 632710bdadec31728ef675213c8e5405a3c944a0
      https://github.com/wesnoth/wesnoth/commit/632710bdadec31728ef675213c8e5405a3c944a0
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/game_controller.cpp

  Log Message:
  -----------
  Move window caption initialisation code.

The code is moved from game_controller::init_language to
game_controller::init_video. This makes porting the code to SDL 2
easier. In SDL 2 the caption must be set after the main window exists.
It could be set in the constructor of the Window, but that can be done
once we drop SDL 1.2 support.


  Commit: 7a0873f0aabd17601c93fd888835728b7944eba6
      https://github.com/wesnoth/wesnoth/commit/7a0873f0aabd17601c93fd888835728b7944eba6
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/video.cpp

  Log Message:
  -----------
  Show the window caption with SDL 2.


  Commit: 546ba048c2a7552fa745add77a6ec093018dd390
      https://github.com/wesnoth/wesnoth/commit/546ba048c2a7552fa745add77a6ec093018dd390
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/game_controller.cpp
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/video.cpp

  Log Message:
  -----------
  Show the window icon with SDL 2.


  Commit: 6817aa33b762e5bce635a8d3e12c37272acda32b
      https://github.com/wesnoth/wesnoth/commit/6817aa33b762e5bce635a8d3e12c37272acda32b
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Let CVideo::window_state use main_window.


  Commit: 385885fea0a09ecc7638c2e1345c36f73733639e
      https://github.com/wesnoth/wesnoth/commit/385885fea0a09ecc7638c2e1345c36f73733639e
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Rename main_window to window.

With the last commit the duplicate variable name window is gone, so
rename the main_window to the preferred name window.


  Commit: 9de59be3a7d58d366bfabeb161897cfd71fbb378
      https://github.com/wesnoth/wesnoth/commit/9de59be3a7d58d366bfabeb161897cfd71fbb378
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/video.hpp

  Log Message:
  -----------
  Update the Doxygen comments.


  Commit: eb27fcc489273424b1fe44f476b9e555750aacdb
      https://github.com/wesnoth/wesnoth/commit/eb27fcc489273424b1fe44f476b9e555750aacdb
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/game_controller.cpp
    A src/sdl/window.cpp
    A src/sdl/window.hpp
    M src/video.cpp
    M src/video.hpp

  Log Message:
  -----------
  Merge branch 'SDL_Window'

Add a wrapper for the SDL_Window. This merge makes Wesnoth 'playable'
with SDL2. It still has a lot of glitches and bugs to be solved.


Compare: https://github.com/wesnoth/wesnoth/compare/4c6cad1327c1...eb27fcc48927


More information about the Commits mailing list