diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-24 14:44:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-24 14:44:01 -0400 |
commit | 817d37c95032946a2e508fcc33cfa5c7ed65cc0d (patch) | |
tree | 69fb79348eaff481fabaee4c2bb25991487d438b /include | |
parent | Merge pull request #2346 from RyanDwyer/fix-crash-on-click (diff) | |
parent | Address @emersion's review comments (diff) | |
download | sway-817d37c95032946a2e508fcc33cfa5c7ed65cc0d.tar.gz sway-817d37c95032946a2e508fcc33cfa5c7ed65cc0d.tar.zst sway-817d37c95032946a2e508fcc33cfa5c7ed65cc0d.zip |
Merge pull request #2165 from swaywm/pid-workspaces
Implement pid->workspace tracking
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 11 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index bcd503a4..032f4196 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -1,6 +1,5 @@ | |||
1 | #ifndef _SWAY_CONFIG_H | 1 | #ifndef _SWAY_CONFIG_H |
2 | #define _SWAY_CONFIG_H | 2 | #define _SWAY_CONFIG_H |
3 | #define PID_WORKSPACE_TIMEOUT 60 | ||
4 | #include <libinput.h> | 3 | #include <libinput.h> |
5 | #include <stdint.h> | 4 | #include <stdint.h> |
6 | #include <string.h> | 5 | #include <string.h> |
@@ -161,12 +160,6 @@ struct workspace_output { | |||
161 | char *workspace; | 160 | char *workspace; |
162 | }; | 161 | }; |
163 | 162 | ||
164 | struct pid_workspace { | ||
165 | pid_t *pid; | ||
166 | char *workspace; | ||
167 | time_t *time_added; | ||
168 | }; | ||
169 | |||
170 | struct bar_config { | 163 | struct bar_config { |
171 | /** | 164 | /** |
172 | * One of "dock", "hide", "invisible" | 165 | * One of "dock", "hide", "invisible" |
@@ -317,7 +310,6 @@ struct sway_config { | |||
317 | list_t *bars; | 310 | list_t *bars; |
318 | list_t *cmd_queue; | 311 | list_t *cmd_queue; |
319 | list_t *workspace_outputs; | 312 | list_t *workspace_outputs; |
320 | list_t *pid_workspaces; | ||
321 | list_t *output_configs; | 313 | list_t *output_configs; |
322 | list_t *input_configs; | 314 | list_t *input_configs; |
323 | list_t *seat_configs; | 315 | list_t *seat_configs; |
@@ -403,9 +395,6 @@ struct sway_config { | |||
403 | } handler_context; | 395 | } handler_context; |
404 | }; | 396 | }; |
405 | 397 | ||
406 | void pid_workspace_add(struct pid_workspace *pw); | ||
407 | void free_pid_workspace(struct pid_workspace *pw); | ||
408 | |||
409 | /** | 398 | /** |
410 | * Loads the main config from the given path. is_active should be true when | 399 | * Loads the main config from the given path. is_active should be true when |
411 | * reloading the config. | 400 | * reloading the config. |
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index bc95317a..ff66da6b 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -44,6 +44,10 @@ void workspace_output_add_priority(struct sway_container *workspace, | |||
44 | struct sway_container *workspace_output_get_highest_available( | 44 | struct sway_container *workspace_output_get_highest_available( |
45 | struct sway_container *ws, struct sway_container *exclude); | 45 | struct sway_container *ws, struct sway_container *exclude); |
46 | 46 | ||
47 | struct sway_container *workspace_for_pid(pid_t pid); | ||
48 | |||
49 | void workspace_record_pid(pid_t pid); | ||
50 | |||
47 | void workspace_detect_urgent(struct sway_container *workspace); | 51 | void workspace_detect_urgent(struct sway_container *workspace); |
48 | 52 | ||
49 | #endif | 53 | #endif |