diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-10-08 11:05:54 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-08 11:05:54 -0400 |
commit | 6d83a59b461d07c4c9c5ee5809da658f5c56afc3 (patch) | |
tree | 6fd6b55d7f335a3fb4a2f06d81417464087f1dfc /include | |
parent | Remove destroyed views from scratchpad (diff) | |
parent | Add get_clipbard ipc errors; Adapt swaymsg (diff) | |
download | sway-6d83a59b461d07c4c9c5ee5809da658f5c56afc3.tar.gz sway-6d83a59b461d07c4c9c5ee5809da658f5c56afc3.tar.zst sway-6d83a59b461d07c4c9c5ee5809da658f5c56afc3.zip |
Merge pull request #1263 from nyorain/master
Implement get_clipboard ipc message
Diffstat (limited to 'include')
-rw-r--r-- | include/ipc.h | 1 | ||||
-rw-r--r-- | include/sway/config.h | 3 | ||||
-rw-r--r-- | include/util.h | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/ipc.h b/include/ipc.h index 98390335..2b16dc50 100644 --- a/include/ipc.h +++ b/include/ipc.h | |||
@@ -13,6 +13,7 @@ enum ipc_command_type { | |||
13 | IPC_GET_BAR_CONFIG = 6, | 13 | IPC_GET_BAR_CONFIG = 6, |
14 | IPC_GET_VERSION = 7, | 14 | IPC_GET_VERSION = 7, |
15 | IPC_GET_INPUTS = 8, | 15 | IPC_GET_INPUTS = 8, |
16 | IPC_GET_CLIPBOARD = 9, | ||
16 | // Events send from sway to clients. Events have the highest bits set. | 17 | // Events send from sway to clients. Events have the highest bits set. |
17 | IPC_EVENT_WORKSPACE = ((1<<31) | 0), | 18 | IPC_EVENT_WORKSPACE = ((1<<31) | 0), |
18 | IPC_EVENT_OUTPUT = ((1<<31) | 1), | 19 | IPC_EVENT_OUTPUT = ((1<<31) | 1), |
diff --git a/include/sway/config.h b/include/sway/config.h index 999a471a..a05d5ede 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -235,8 +235,9 @@ enum ipc_feature { | |||
235 | IPC_FEATURE_EVENT_WINDOW = 2048, | 235 | IPC_FEATURE_EVENT_WINDOW = 2048, |
236 | IPC_FEATURE_EVENT_BINDING = 4096, | 236 | IPC_FEATURE_EVENT_BINDING = 4096, |
237 | IPC_FEATURE_EVENT_INPUT = 8192, | 237 | IPC_FEATURE_EVENT_INPUT = 8192, |
238 | IPC_FEATURE_GET_CLIPBOARD = 16384, | ||
238 | 239 | ||
239 | IPC_FEATURE_ALL_COMMANDS = 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, | 240 | IPC_FEATURE_ALL_COMMANDS = 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384, |
240 | IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192, | 241 | IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192, |
241 | 242 | ||
242 | IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS, | 243 | IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS, |
diff --git a/include/util.h b/include/util.h index e5365458..f68deae8 100644 --- a/include/util.h +++ b/include/util.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <stdint.h> | 4 | #include <stdint.h> |
5 | #include <unistd.h> | 5 | #include <unistd.h> |
6 | #include <sys/types.h> | ||
6 | #include <xkbcommon/xkbcommon.h> | 7 | #include <xkbcommon/xkbcommon.h> |
7 | 8 | ||
8 | /** | 9 | /** |
@@ -57,4 +58,8 @@ uint32_t parse_color(const char *color); | |||
57 | * to a dangling symlink, NULL is returned. | 58 | * to a dangling symlink, NULL is returned. |
58 | */ | 59 | */ |
59 | char* resolve_path(const char* path); | 60 | char* resolve_path(const char* path); |
61 | |||
62 | char *b64_encode(const char* binaryData, size_t len, size_t *flen); | ||
63 | unsigned char *b64_decode(const char *ascii, size_t len, size_t *flen); | ||
64 | |||
60 | #endif | 65 | #endif |