diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-09-18 06:30:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-18 06:30:55 +0900 |
| commit | a7eeb48aace8d88f9c809eee5df93d6cefbb372f (patch) | |
| tree | 8d64bd01413c08c5250085e8666cb4bef75efc97 | |
| parent | 75f82808e2e5e4950d436ff6d30a58ac9fabd599 (diff) | |
| parent | e18b7cdfa920d536e4911a7ccbc2d6da5ae759f4 (diff) | |
| download | sway-a7eeb48aace8d88f9c809eee5df93d6cefbb372f.zip sway-a7eeb48aace8d88f9c809eee5df93d6cefbb372f.tar.gz sway-a7eeb48aace8d88f9c809eee5df93d6cefbb372f.tar.bz2 | |
Merge pull request #906 from zandrmartin/global-focus-pointer
add global `current_focus` pointer
| -rw-r--r-- | include/sway/container.h | 21 | ||||
| -rw-r--r-- | sway/focus.c | 4 | ||||
| -rw-r--r-- | sway/layout.c | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/include/sway/container.h b/include/sway/container.h index 4dd7f3a..215c0b0 100644 --- a/include/sway/container.h +++ b/include/sway/container.h @@ -8,6 +8,7 @@ typedef struct sway_container swayc_t; extern swayc_t root_container; +extern swayc_t *current_focus; /** * Different kinds of containers. @@ -16,11 +17,11 @@ extern swayc_t root_container; * it on this list. */ enum swayc_types { - C_ROOT, /**< The root container. Only one of these ever exists. */ - C_OUTPUT, /**< An output (aka monitor, head, etc). */ - C_WORKSPACE, /**< A workspace. */ - C_CONTAINER, /**< A manually created container. */ - C_VIEW, /**< A view (aka window). */ + C_ROOT, /**< The root container. Only one of these ever exists. */ + C_OUTPUT, /**< An output (aka monitor, head, etc). */ + C_WORKSPACE, /**< A workspace. */ + C_CONTAINER, /**< A manually created container. */ + C_VIEW, /**< A view (aka window). */ // Keep last C_TYPES, }; @@ -29,20 +30,20 @@ enum swayc_types { * Different ways to arrange a container. */ enum swayc_layouts { - L_NONE, /**< Used for containers that have no layout (views, root) */ + L_NONE, /**< Used for containers that have no layout (views, root) */ L_HORIZ, L_VERT, L_STACKED, L_TABBED, - L_FLOATING, /**< A psuedo-container, removed from the tree, to hold floating windows */ + L_FLOATING, /**< A psuedo-container, removed from the tree, to hold floating windows */ // Keep last L_LAYOUTS, }; enum swayc_border_types { - B_NONE, /**< No border */ - B_PIXEL, /**< 1px border */ - B_NORMAL /**< Normal border with title bar */ + B_NONE, /**< No border */ + B_PIXEL, /**< 1px border */ + B_NORMAL /**< Normal border with title bar */ }; /** diff --git a/sway/focus.c b/sway/focus.c index 02e61ac..b94dcbc 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -120,6 +120,10 @@ bool set_focused_container(swayc_t *c) { // dispatch a window event ipc_event_window(c, "focus"); } + + // update the global pointer + current_focus = c; + // update container focus from here to root, making necessary changes along // the way swayc_t *p = c; diff --git a/sway/layout.c b/sway/layout.c index 2d29340..7802c41 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -15,6 +15,7 @@ #include "log.h" swayc_t root_container; +swayc_t *current_focus; list_t *scratchpad; int min_sane_h = 60; @@ -27,6 +28,7 @@ void init_layout(void) { root_container.children = create_list(); root_container.handle = -1; root_container.visible = true; + current_focus = &root_container; scratchpad = create_list(); } |