diff options
author | 2016-08-01 22:25:08 -0400 | |
---|---|---|
committer | 2016-08-01 22:25:08 -0400 | |
commit | 2f65100bee904493cb90863d6dc54d774b6a39c3 (patch) | |
tree | bd25bf981361c7e518d66df7ededf23d38cc165f /sway/handlers.c | |
parent | Merge pull request #811 from acrisci/feature/focus-container (diff) | |
download | sway-2f65100bee904493cb90863d6dc54d774b6a39c3.tar.gz sway-2f65100bee904493cb90863d6dc54d774b6a39c3.tar.zst sway-2f65100bee904493cb90863d6dc54d774b6a39c3.zip |
Remove dead global locked_view_focus
The value of `locked_view_focus` is always false. Remove dead code associated
with this variable to simplify things.
Diffstat (limited to 'sway/handlers.c')
-rw-r--r-- | sway/handlers.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 684e45ba..80692371 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -343,7 +343,6 @@ static bool handle_view_created(wlc_handle handle) { | |||
343 | // Dmenu keeps viewfocus, but others with this flag don't, for now simulate | 343 | // Dmenu keeps viewfocus, but others with this flag don't, for now simulate |
344 | // dmenu | 344 | // dmenu |
345 | case WLC_BIT_OVERRIDE_REDIRECT: | 345 | case WLC_BIT_OVERRIDE_REDIRECT: |
346 | // locked_view_focus = true; | ||
347 | wlc_view_focus(handle); | 346 | wlc_view_focus(handle); |
348 | wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true); | 347 | wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true); |
349 | wlc_view_bring_to_front(handle); | 348 | wlc_view_bring_to_front(handle); |
@@ -437,7 +436,6 @@ static void handle_view_destroyed(wlc_handle handle) { | |||
437 | // DMENU has this flag, and takes view_focus, but other things with this | 436 | // DMENU has this flag, and takes view_focus, but other things with this |
438 | // flag don't | 437 | // flag don't |
439 | case WLC_BIT_OVERRIDE_REDIRECT: | 438 | case WLC_BIT_OVERRIDE_REDIRECT: |
440 | // locked_view_focus = false; | ||
441 | break; | 439 | break; |
442 | case WLC_BIT_OVERRIDE_REDIRECT|WLC_BIT_UNMANAGED: | 440 | case WLC_BIT_OVERRIDE_REDIRECT|WLC_BIT_UNMANAGED: |
443 | locked_container_focus = false; | 441 | locked_container_focus = false; |
@@ -646,10 +644,6 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier | |||
646 | return EVENT_PASSTHROUGH; | 644 | return EVENT_PASSTHROUGH; |
647 | } | 645 | } |
648 | 646 | ||
649 | if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) { | ||
650 | return EVENT_PASSTHROUGH; | ||
651 | } | ||
652 | |||
653 | // reset pointer mode on keypress | 647 | // reset pointer mode on keypress |
654 | if (state == WLC_KEY_STATE_PRESSED && pointer_state.mode) { | 648 | if (state == WLC_KEY_STATE_PRESSED && pointer_state.mode) { |
655 | pointer_mode_reset(); | 649 | pointer_mode_reset(); |