mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed handling of views with override_redirect (dmenu)

Browse Source
This commit is contained in:
taiyu 2015-08-17 11:24:45 -07:00
parent f832c02065
commit d2995d1eb2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sway/handlers.c
View File

@ -13,6 +13,8 @@
#include "container.h" #include "container.h"
static struct wlc_origin mouse_origin; static struct wlc_origin mouse_origin;
//Keyboard input is being overrided by window (dmenu)
static bool override_redirect = false;
static bool pointer_test(swayc_t *view, void *_origin) { static bool pointer_test(swayc_t *view, void *_origin) {
const struct wlc_origin *origin = _origin; const struct wlc_origin *origin = _origin;
@ -98,6 +100,7 @@ static bool handle_view_created(wlc_handle handle) {
} }
// For things like Dmenu // For things like Dmenu
if (type & WLC_BIT_OVERRIDE_REDIRECT) { if (type & WLC_BIT_OVERRIDE_REDIRECT) {
override_redirect = true;
wlc_view_focus(handle); wlc_view_focus(handle);
} }
@ -134,14 +137,14 @@ static void handle_view_destroyed(wlc_handle handle) {
wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true); wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true);
sway_log(L_DEBUG,"Unmanaged window of type %x was destroyed", type); sway_log(L_DEBUG,"Unmanaged window of type %x was destroyed", type);
if (type & WLC_BIT_UNMANAGED) { if (type & WLC_BIT_UNMANAGED) {
focus_view(focus_pointer()); focus_pointer();
arrange_windows(active_workspace, -1, -1); arrange_windows(active_workspace, -1, -1);
return; return;
} }
if (type & WLC_BIT_OVERRIDE_REDIRECT) { if (type & WLC_BIT_OVERRIDE_REDIRECT) {
focus_view(focus_pointer()); override_redirect = false;
arrange_windows(active_workspace, -1, -1); focus_pointer();
return; return;
} }
if (type & WLC_BIT_POPUP) { if (type & WLC_BIT_POPUP) {
@ -221,6 +224,9 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s
static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers
*modifiers, uint32_t key, uint32_t sym, enum wlc_key_state state) { *modifiers, uint32_t key, uint32_t sym, enum wlc_key_state state) {
enum { QSIZE = 32 }; enum { QSIZE = 32 };
if (override_redirect) {
return false;
}
static uint8_t head = 0; static uint8_t head = 0;
static uint32_t array[QSIZE]; static uint32_t array[QSIZE];
bool cmd_success = false; bool cmd_success = false;