Differential D23589

Rename ShellClient to XdgShellClient
ClosedPublic
Actions

Authored by zzag on Aug 30 2019, 10:09 PM.

Details

Reviewers

None

Group Reviewers

KWin

Commits

R108:168ea98845a0: Rename ShellClient to XdgShellClient

Summary

Rename ShellClient to XdgShellClient in order to reflect that it
represents only xdg-shell clients.

Test Plan

Compiles, tests still pass.

Diff Detail

Repository

R108 KWin

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

zzag created this revision.Aug 30 2019, 10:09 PM

Restricted Application added a project: KWin. · View Herald TranscriptAug 30 2019, 10:09 PM

Restricted Application added a subscriber: kwin. · View Herald Transcript

zzag requested review of this revision.Aug 30 2019, 10:09 PM

Harbormaster completed remote builds in B15872: Diff 65020.Aug 30 2019, 10:09 PM

zzag added a dependency: D23573: [wayland] Drop xdg-shell v5 support.Aug 30 2019, 10:13 PM

I'm not sure what parent revision has to be. :|

My local branch looks like this at the moment

* fbb743f59 - (37 minutes ago) Rename ShellClient to XdgShellClient - Vlad Zagorodniy (HEAD -> drop-wl-shell, github/drop-wl-shell)                                                                                    
* 864a19944 - (27 hours ago) [wayland] Drop xdg-shell v5 support - Vlad Zagorodniy                                                                                                                                     
* 3e633bc12 - (33 hours ago) [tests] Drop wl-shell test client - Vlad Zagorodniy                                                                                                                                       
* 2f2c9b1f0 - (2 days ago) [effects/slidingpopups] Don't start animation if there is no slide edge - Vlad Zagorodniy
* 336154ca5 - (2 days ago) [platforms/wayland] Drop wl-shell support - Vlad Zagorodniy
* 522673b0e - (3 days ago) [wayland] Drop wl-shell support - Vlad Zagorodniy
* cd608fd07 - (3 days ago) [autotests] Don't test wl-shell clients - Vlad Zagorodniy
* 91d6d9dd7 - (5 days ago) Port QPA away from Wayland - Vlad Zagorodniy

I don't have a strong opinion about that but I feel we could leave the ShellClient name since it's shorter and there is no ambiguity anyway when there are only xdg-shell clients. One could add a comment to the class that these instances represent xdg-shell clients.

In D23589#536285, @romangg wrote:

I don't have a strong opinion about that but I feel we could leave the ShellClient name since it's shorter and there is no ambiguity anyway when there are only xdg-shell clients. One could add a comment to the class that these instances represent xdg-shell clients.

It seems like you want to leave a room for other protocols in ShellClient class, however as far as I can tell you keeping wl-shell and xdg-shell in one class (ShellClient) was a bad idea. "Fixing" xdg-shell could easily break wl-shell and complexity of the code was a bit high.

Given that you don't have a strong opinion on this one, I'll land this patch as is.

This revision was not accepted when it landed; it landed in state Needs Review.Sep 23 2019, 3:52 PM

Closed by commit R108:168ea98845a0: Rename ShellClient to XdgShellClient (authored by zzag). · Explain Why

This revision was automatically updated to reflect the committed changes.

Belated +1.

FWIW, at some point I wanted to split this out into

-> ShellClient (Abstract superclass)

-> XdgShellTopLevel
-> XdgShellPopup

I think it'll help clean up a lot.

In D23589#536490, @davidedmundson wrote:
FWIW, at some point I wanted to split this out into
-> ShellClient (Abstract superclass)
   -> XdgShellTopLevel
   -> XdgShellPopup

Does this mean you want to go back to using the ShellClient name or was it a typo and you did mean XdgShellClient for the abstract superclass?

Does this mean you want to go back to using the ShellClient name or was it a typo and you did mean XdgShellClient for the abstract superclass?

I mean there's going to be changes to be XdgBlahBlah on all the important code anyway. I don't care what the superclass name is.

Revision Contents
Changeset List

			Path	Packages
M			CMakeLists.txt (2 lines)
M			autotests/integration/CMakeLists.txt (4 lines)
M			autotests/integration/activation_test.cpp (60 lines)
M			autotests/integration/activities_test.cpp (4 lines)
M			autotests/integration/buffer_size_change_test.cpp (10 lines)
M			autotests/integration/dbus_interface_test.cpp (16 lines)
M			autotests/integration/debug_console_test.cpp (6 lines)
M			autotests/integration/decoration_input_test.cpp (4 lines)
M			autotests/integration/desktop_window_x11_test.cpp (4 lines)
M			autotests/integration/dont_crash_aurorae_destroy_deco.cpp (4 lines)
M			autotests/integration/dont_crash_cancel_animation.cpp (4 lines)
M			autotests/integration/dont_crash_cursor_physical_size_empty.cpp (4 lines)
M			autotests/integration/dont_crash_empty_deco.cpp (4 lines)
M			autotests/integration/dont_crash_no_border.cpp (4 lines)
M			autotests/integration/dont_crash_reinitialize_compositor.cpp (8 lines)
M			autotests/integration/dont_crash_useractions_menu.cpp (4 lines)
M			autotests/integration/effects/desktop_switching_animation_test.cpp (6 lines)
M			autotests/integration/effects/fade_test.cpp (4 lines)
M			autotests/integration/effects/maximize_animation_test.cpp (10 lines)
M			autotests/integration/effects/minimize_animation_test.cpp (8 lines)
M			autotests/integration/effects/popup_open_close_animation_test.cpp (14 lines)
M			autotests/integration/effects/scripted_effects_test.cpp (16 lines)
M			autotests/integration/effects/slidingpopups_test.cpp (4 lines)
M			autotests/integration/effects/toplevel_open_close_animation_test.cpp (14 lines)
M			autotests/integration/effects/translucency_test.cpp (4 lines)
M			autotests/integration/effects/windowgeometry_test.cpp (4 lines)
M			autotests/integration/effects/wobbly_shade_test.cpp (4 lines)
M			autotests/integration/generic_scene_opengl_test.cpp (4 lines)
M			autotests/integration/globalshortcuts_test.cpp (4 lines)
M			autotests/integration/idle_inhibition_test.cpp (8 lines)
M			autotests/integration/input_stacking_order.cpp (4 lines)
M			autotests/integration/internal_window.cpp (4 lines)
M			autotests/integration/keyboard_layout_test.cpp (4 lines)
M			autotests/integration/keymap_creation_failure_test.cpp (4 lines)
M			autotests/integration/kwin_wayland_test.h (10 lines)
M			autotests/integration/kwinbindings_test.cpp (4 lines)
M			autotests/integration/lockscreen.cpp (4 lines)
M			autotests/integration/maximize_test.cpp (12 lines)
M			autotests/integration/move_resize_window_test.cpp (30 lines)
M			autotests/integration/placement_test.cpp (20 lines)
M			autotests/integration/plasma_surface_test.cpp (6 lines)
M			autotests/integration/plasmawindow_test.cpp (12 lines)
M			autotests/integration/pointer_constraints_test.cpp (4 lines)
M			autotests/integration/pointer_input.cpp (14 lines)
M			autotests/integration/quick_tiling_test.cpp (4 lines)
M			autotests/integration/scene_opengl_shadow_test.cpp (4 lines)
M			autotests/integration/scene_qpainter_shadow_test.cpp (4 lines)
M			autotests/integration/scene_qpainter_test.cpp (4 lines)
M			autotests/integration/screenedge_client_show_test.cpp (4 lines)
M			autotests/integration/shade_test.cpp (4 lines)
V			autotests/integration/{shell_client_rules_test.cpp → xdgshellclient_rules_test.cpp}
V			autotests/integration/{shell_client_test.cpp → xdgshellclient_test.cpp}
M			autotests/integration/showing_desktop_test.cpp (4 lines)
M			autotests/integration/stacking_order_test.cpp (34 lines)
M			autotests/integration/struts_test.cpp (8 lines)
M			autotests/integration/tabbox_test.cpp (4 lines)
M			autotests/integration/test_helpers.cpp (10 lines)
M			autotests/integration/touch_input_test.cpp (4 lines)
M			autotests/integration/transient_placement.cpp (6 lines)
M			autotests/integration/virtual_desktop_test.cpp (10 lines)
M			autotests/integration/window_rules_test.cpp (4 lines)
M			autotests/integration/window_selection_test.cpp (4 lines)
M			autotests/integration/x11_client_test.cpp (4 lines)
V			autotests/integration/{xdgshellclient_rules_test.cpp ← shell_client_rules_test.cpp} (326 lines)
V			autotests/integration/{xdgshellclient_test.cpp ← shell_client_test.cpp} (146 lines)
M			autotests/integration/xwayland_input_test.cpp (4 lines)
M			autotests/integration/xwayland_selections_test.cpp (4 lines)
M			composite.cpp (10 lines)
M			debug_console.h (6 lines)
M			debug_console.cpp (12 lines)
M			deleted.cpp (4 lines)
M			effects.h (2 lines)
M			effects.cpp (24 lines)
M			geometry.cpp (4 lines)
M			idle_inhibition.h (4 lines)
M			idle_inhibition.cpp (16 lines)
M			input.cpp (2 lines)
M			layers.cpp (2 lines)
M			plugins/platforms/drm/egl_stream_backend.h (2 lines)
M			pointer_input.cpp (2 lines)
M			popup_input_filter.h (2 lines)
M			popup_input_filter.cpp (2 lines)
M			scripting/scripting_model.cpp (2 lines)
M			scripting/workspace_wrapper.cpp (2 lines)
V			{shell_client.h → xdgshellclient.h}
V			{shell_client.cpp → xdgshellclient.cpp}
M			thumbnailitem.cpp (2 lines)
M			useractions.cpp (2 lines)
M			virtualkeyboard.cpp (2 lines)
M			wayland_server.h (16 lines)
M			wayland_server.cpp (42 lines)
M			workspace.h (2 lines)
M			workspace.cpp (14 lines)
V			{xdgshellclient.h ← shell_client.h} (16 lines)
V			{xdgshellclient.cpp ← shell_client.cpp} (226 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	65020	864a199		Aug 30 2019, 10:09 PM	★	★
Diff 2	66678	665ec0a	R108:168ea98845a0f35d576a6ebbfaecb848df0420d3	Sep 23 2019, 2:28 PM	★	★

Status	Author	Revision
Closed	zzag	D23563 [platforms/wayland] Drop wl-shell support
Closed	zzag	D23589 Rename ShellClient to XdgShellClient
Closed	zzag	D23573 [wayland] Drop xdg-shell v5 support
Closed	zzag	D23562 [wayland] Drop wl-shell support
Closed	zzag	D23561 [autotests] Don't test wl-shell clients
Closed	zzag	D22810 Port QPA away from Wayland

Rename ShellClient to XdgShellClientClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 66678

CMakeLists.txt

autotests/integration/CMakeLists.txt

autotests/integration/activation_test.cpp

autotests/integration/activities_test.cpp

autotests/integration/buffer_size_change_test.cpp

autotests/integration/dbus_interface_test.cpp

autotests/integration/debug_console_test.cpp

autotests/integration/decoration_input_test.cpp

autotests/integration/desktop_window_x11_test.cpp

autotests/integration/dont_crash_aurorae_destroy_deco.cpp

autotests/integration/dont_crash_cancel_animation.cpp

autotests/integration/dont_crash_cursor_physical_size_empty.cpp

autotests/integration/dont_crash_empty_deco.cpp

autotests/integration/dont_crash_no_border.cpp

autotests/integration/dont_crash_reinitialize_compositor.cpp

autotests/integration/dont_crash_useractions_menu.cpp

autotests/integration/effects/desktop_switching_animation_test.cpp

autotests/integration/effects/fade_test.cpp

autotests/integration/effects/maximize_animation_test.cpp

autotests/integration/effects/minimize_animation_test.cpp

autotests/integration/effects/popup_open_close_animation_test.cpp

autotests/integration/effects/scripted_effects_test.cpp

autotests/integration/effects/slidingpopups_test.cpp

autotests/integration/effects/toplevel_open_close_animation_test.cpp

autotests/integration/effects/translucency_test.cpp

autotests/integration/effects/windowgeometry_test.cpp

autotests/integration/effects/wobbly_shade_test.cpp

autotests/integration/generic_scene_opengl_test.cpp

autotests/integration/globalshortcuts_test.cpp

autotests/integration/idle_inhibition_test.cpp

autotests/integration/input_stacking_order.cpp

autotests/integration/internal_window.cpp

autotests/integration/keyboard_layout_test.cpp

autotests/integration/keymap_creation_failure_test.cpp

autotests/integration/kwin_wayland_test.h

autotests/integration/kwinbindings_test.cpp

autotests/integration/lockscreen.cpp

autotests/integration/maximize_test.cpp

autotests/integration/move_resize_window_test.cpp

autotests/integration/placement_test.cpp

autotests/integration/plasma_surface_test.cpp

autotests/integration/plasmawindow_test.cpp

autotests/integration/pointer_constraints_test.cpp

autotests/integration/pointer_input.cpp

autotests/integration/quick_tiling_test.cpp

autotests/integration/scene_opengl_shadow_test.cpp

autotests/integration/scene_qpainter_shadow_test.cpp

autotests/integration/scene_qpainter_test.cpp

autotests/integration/screenedge_client_show_test.cpp

autotests/integration/shade_test.cpp

autotests/integration/shell_client_rules_test.cpp

autotests/integration/shell_client_test.cpp

autotests/integration/showing_desktop_test.cpp

autotests/integration/stacking_order_test.cpp

autotests/integration/struts_test.cpp

autotests/integration/tabbox_test.cpp

autotests/integration/test_helpers.cpp

autotests/integration/touch_input_test.cpp

autotests/integration/transient_placement.cpp

autotests/integration/virtual_desktop_test.cpp

autotests/integration/window_rules_test.cpp

autotests/integration/window_selection_test.cpp

autotests/integration/x11_client_test.cpp

autotests/integration/xdgshellclient_rules_test.cpp

autotests/integration/xdgshellclient_test.cpp

autotests/integration/xwayland_input_test.cpp

autotests/integration/xwayland_selections_test.cpp

composite.cpp

debug_console.h

debug_console.cpp

deleted.cpp

effects.h

effects.cpp

geometry.cpp

idle_inhibition.h

Rename ShellClient to XdgShellClient
ClosedPublic
Actions

Revision Contents
Changeset List