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.

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

DisplayServer: Some fixes to X11, build system and Window class #37029

Merged
merged 2 commits into from
Mar 25, 2020

Conversation

kuruk-mm
Copy link
Contributor

@kuruk-mm kuruk-mm commented Mar 13, 2020

Includes and Fix #37002

CI repaired (Mac is failing, I'm not going to fix that)
X11 now is compiling, working (but with love), and no crashing your entire desktop gui

Known bugs:

  • Main Window size changed when you close a subwindow
  • Popups are broken (reduz is working on this)
  • When you open a dropdown menu it crash (with bad parameter at XCreateWindow)
  • Popups are working, but when you move a Window, and you open a Popup, the Popup appear in the last position
  • Dropdown menus appear a little above what they should (seems to be window top margin)

@reduz There are simple changes, if you want to merge, and continue working from this is welcome

There still have a work to do, just making this PR to sync our work

@kuruk-mm kuruk-mm changed the title [WIP] DisplayServer: Some fixes to X11, build system, Window class [WIP] DisplayServer: Some fixes to X11, build system and Window class Mar 13, 2020
@kuruk-mm kuruk-mm force-pushed the display-server branch 3 times, most recently from f52f524 to ca7e709 Compare March 13, 2020 21:00
@kuruk-mm kuruk-mm requested a review from neikeq as a code owner March 13, 2020 21:00
@aaronfranke aaronfranke added this to the 4.0 milestone Mar 14, 2020
@kuruk-mm
Copy link
Contributor Author

I make a new commit to make easier to review

Done, please before merge, let me know, because I want to squash the commits to have a clean git history

@kuruk-mm kuruk-mm force-pushed the display-server branch 2 times, most recently from fdc57d3 to 7b5e978 Compare March 15, 2020 14:09
@kuruk-mm
Copy link
Contributor Author

kuruk-mm commented Mar 15, 2020

Ready to merge as you requested on IRC @reduz

Know bug:

  • Popups are working, but when you move a Window, and you open a Popup, the Popup appear in the last position
  • Dropdown menus appear a little above what they should (seems to be window top margin)

Please take care from this:
https://github.com/kuruk-mm/godot/blob/7b5e9788a8d4872292bf8f1f776831e67d42936e/platform/linuxbsd/display_server_x11.cpp#L2240-L2248

If you delete a window and an event was pending, MainWindow will receive it instead of the deleted window. Anyway I think this can be Ok because is Thread Safe, so I just remark to have a knowledge

@kuruk-mm kuruk-mm changed the title [WIP] DisplayServer: Some fixes to X11, build system and Window class DisplayServer: Some fixes to X11, build system and Window class Mar 15, 2020
@kuruk-mm kuruk-mm requested a review from reduz March 15, 2020 14:28
@kuruk-mm kuruk-mm force-pushed the display-server branch 2 times, most recently from d55f5e8 to 4393360 Compare March 15, 2020 15:01
@@ -63,68 +63,5 @@ def make_app_icon(target, source, env):
g.write("};\n")
g.write("#endif")


def make_default_controller_mappings(target, source, env):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the reference if anyone wonders about this removal: this code was moved to core/input/.

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to merge if @reduz approves.

francisjsun and others added 2 commits March 20, 2020 18:55
Travis: Change x11 to linuxbsd
scons: Change x11 plataform to linuxbsd
scons: Delete make_default_controller_mappings from main_builder
Plugins: Remove ; to avoid fallthrough warning
DisplayServer: Fix some Window class issues and x11 resize to rect_changed
DisplayServerX11: Implement set_icon
DisplayServerX11: Fix X11 bug when a window was erased from windows map, all the changes from that erased windows are sending to the main window
DisplayServerX11: Reorder create_window commands, and add flags parameter
DisplayServerX11: Change every Size2 to Size2i and Rect2 to Rect2i where it belongs
DisplayServerX11: Implement screen_get_usable_rect
@kuruk-mm
Copy link
Contributor Author

Updated from @reduz last changes

Popups are working fine
Known bug:

  • When you make the Node Inspector floating, and close, sometimes will crash and sometimes stop working

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants