Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate DisplayServer from OS and add multiple windows support #37317

Merged
merged 18 commits into from
Mar 26, 2020
Merged

Separate DisplayServer from OS and add multiple windows support #37317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4396e98
Refactored Input, create DisplayServer and DisplayServerX11
reduz Mar 1, 2020
f8a79a9
Effective DisplayServer separation, rename X11 -> LinuxBSD
reduz Mar 3, 2020
9e08742
Added a Window node, and made it the scene root.
reduz Mar 4, 2020
8e6960a
Refactored input, goes all via windows now.
reduz Mar 4, 2020
f51fdc6
Support for transient windows
reduz Mar 4, 2020
4758057
Working multiple window support, including editor
reduz Mar 6, 2020
499e07f
Make DisplayServerX11 thread safe
reduz Mar 7, 2020
543fb1c
Separate DisplayServer from OS on Windows
reduz Mar 9, 2020
441f1a5
Popups are now windows also (broken!)
reduz Mar 12, 2020
c7b4dca
Open sub-windows as embedded if the OS does not support them
reduz Mar 14, 2020
09ba290
Fixes to window style flags
reduz Mar 14, 2020
b3080bc
Popups have also been converted to windows
reduz Mar 20, 2020
047e0b7
Reworked tooltips to use the popup system.
reduz Mar 20, 2020
9a5d15a
Implemented drag and drop across windows, both OS and embedded.
reduz Mar 24, 2020
f387b9b
Multiple changes to DisplayServerX11
kuruk-mm Mar 12, 2020
197cb4e
Fixes to X11, still pretty broken
reduz Mar 25, 2020
15a9f94
Add macOS DisplayServer implementation.
bruvzg Mar 7, 2020
be07f86
Travis: Disable HTML5 again until ported to DisplayServer
akien-mga Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
50 changes: 25 additions & 25 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ matrix:

- name: Linux editor (debug, GCC 9, with Mono)
stage: build
env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
env: PLATFORM=linuxbsd TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
os: linux
compiler: gcc-9
addons:
Expand All @@ -47,7 +47,7 @@ matrix:

- name: Linux export template (release, Clang 7)
stage: build
env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
env: PLATFORM=linuxbsd TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
os: linux
compiler: clang
addons:
Expand All @@ -67,17 +67,17 @@ matrix:
# packages:
# - openjdk-8-jdk

# - name: macOS editor (debug, Clang)
# stage: build
# env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes"
# os: osx
# osx_image: xcode11.3
# compiler: clang
# addons:
# homebrew:
# packages:
# - scons
# update: true
- name: macOS editor (debug, Clang)
stage: build
env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes"
os: osx
osx_image: xcode11.3
compiler: clang
addons:
homebrew:
packages:
- scons
update: true

# TODO: iOS MoltenVK support

Expand Down Expand Up @@ -109,23 +109,23 @@ matrix:

- name: Linux export template (release_debug, GCC 7, without 3D support)
stage: build
env: PLATFORM=x11 TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-7 EXTRA_ARGS="disable_3d=yes"
env: PLATFORM=linuxbsd TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-7 EXTRA_ARGS="disable_3d=yes"
os: linux
compiler: gcc
addons:
apt:
packages:
- *linux_deps

- name: Javascript export template (release, emscripten latest)
stage: build
env: PLATFORM=javascript TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-emcc-latest EXTRA_ARGS="use_closure_compiler=yes"
os: linux
compiler: clang
addons:
apt:
packages:
- *linux_deps
# - name: Javascript export template (release, emscripten latest)
# stage: build
# env: PLATFORM=javascript TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-emcc-latest EXTRA_ARGS="use_closure_compiler=yes"
# os: linux
# compiler: clang
# addons:
# apt:
# packages:
# - *linux_deps

before_install:
- eval "${MATRIX_EVAL}"
Expand Down Expand Up @@ -165,7 +165,7 @@ script:
scons -j2 CC=$CC CXX=$CXX platform=$PLATFORM tools=$TOOLS target=$TARGET $OPTIONS $EXTRA_ARGS &&
if [ "$TEST_PROJECT" = "yes" ]; then
git clone --depth 1 "https://github.com/godotengine/godot-tests.git";
sed -i "s:custom_template/release=\"\":custom_template/release=\"$(readlink -e bin/godot_server.x11.opt.tools.64)\":" godot-tests/tests/project_export/export_presets.cfg;
godot-tests/tests/project_export/test_project.sh "bin/godot_server.x11.opt.tools.64";
sed -i "s:custom_template/release=\"\":custom_template/release=\"$(readlink -e bin/godot_server.linuxbsd.opt.tools.64)\":" godot-tests/tests/project_export/export_presets.cfg;
godot-tests/tests/project_export/test_project.sh "bin/godot_server.linuxbsd.opt.tools.64";
fi
fi
2 changes: 1 addition & 1 deletion SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ elif env_base['p'] != "":
else:
# Missing `platform` argument, try to detect platform automatically
if sys.platform.startswith('linux'):
selected_platform = 'x11'
selected_platform = 'linuxbsd'
elif sys.platform == 'darwin':
selected_platform = 'osx'
elif sys.platform == 'win32':
Expand Down
1 change: 1 addition & 0 deletions core/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ SConscript('math/SCsub')
SConscript('crypto/SCsub')
SConscript('io/SCsub')
SConscript('debugger/SCsub')
SConscript('input/SCsub')
SConscript('bind/SCsub')


Expand Down
Loading