aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Eric Engestrom <eric.engestrom@intel.com>2018-07-30 16:24:46 +0100
committerLibravatar Eric Engestrom <eric.engestrom@intel.com>2018-07-30 16:24:46 +0100
commit52a27f1529973b7058427feddb5de32f23b1c64f (patch)
tree8b8ce3aa537ca0ca5ad2f9a77e45f151cc06ea52
parentMerge pull request #2385 from 1ace/fix/include (diff)
downloadsway-52a27f1529973b7058427feddb5de32f23b1c64f.tar.gz
sway-52a27f1529973b7058427feddb5de32f23b1c64f.tar.zst
sway-52a27f1529973b7058427feddb5de32f23b1c64f.zip
delete references to swaygrab
-rw-r--r--README.de.md2
-rw-r--r--README.el.md2
-rw-r--r--README.fr.md2
-rw-r--r--README.it.md2
-rw-r--r--README.ja.md2
-rw-r--r--README.md2
-rw-r--r--README.pt.md2
-rw-r--r--README.ru.md2
-rw-r--r--README.uk.md2
-rw-r--r--completions/zsh/_swaygrab23
-rw-r--r--include/swaygrab/json.h10
-rw-r--r--meson.build1
-rw-r--r--security.d/00-defaults.in6
-rw-r--r--sway/sway.1.scd2
-rw-r--r--swayidle/swayidle.1.scd2
15 files changed, 2 insertions, 60 deletions
diff --git a/README.de.md b/README.de.md
index 206a1040..a872e888 100644
--- a/README.de.md
+++ b/README.de.md
@@ -64,8 +64,6 @@ Abhängigkeiten:
64* cairo 64* cairo
65* gdk-pixbuf2 * 65* gdk-pixbuf2 *
66* pam ** 66* pam **
67* imagemagick (erforderlich für Bildaufnahme mit swaygrab)
68* ffmpeg (erforderlich für Videoaufnahme swaygrab)
69* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (erforderlich für man pages) 67* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (erforderlich für man pages)
70 68
71_\*Nur erforderlich für swaybar, swaybg, und swaylock_ 69_\*Nur erforderlich für swaybar, swaybg, und swaylock_
diff --git a/README.el.md b/README.el.md
index 5c70beff..6887fe8e 100644
--- a/README.el.md
+++ b/README.el.md
@@ -57,8 +57,6 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ
57* cairo 57* cairo
58* gdk-pixbuf2 * 58* gdk-pixbuf2 *
59* pam ** 59* pam **
60* imagemagick (αναγκαίο για καταγραφή εικόνας μέσω του swaygrab)
61* ffmpeg (αναγκαίο για καταγραφή video μέσω του swaygrab)
62* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages) 60* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages)
63 61
64_\*Απαιτείται μόνο για swaybar, swaybg, and swaylock_ 62_\*Απαιτείται μόνο για swaybar, swaybg, and swaylock_
diff --git a/README.fr.md b/README.fr.md
index 0d2573f9..6ea4d14c 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -59,8 +59,6 @@ Installez les dépendances :
59* cairo 59* cairo
60* gdk-pixbuf2 * 60* gdk-pixbuf2 *
61* pam ** 61* pam **
62* imagemagick (requis pour la capture d'image avec swaygrab)
63* ffmpeg (requis pour la capture vidéo avec swaygrab)
64* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (requis pour les pages man) 62* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (requis pour les pages man)
65 63
66_\*Uniquement requis pour swaybar, swaybg, and swaylock_ 64_\*Uniquement requis pour swaybar, swaybg, and swaylock_
diff --git a/README.it.md b/README.it.md
index 0d81ea54..3b1b1ebc 100644
--- a/README.it.md
+++ b/README.it.md
@@ -60,8 +60,6 @@ Installa queste dipendenze:
60* cairo 60* cairo
61* gdk-pixbuf2 * 61* gdk-pixbuf2 *
62* pam ** 62* pam **
63* imagemagick (richiesto per catturare immagini con swaygrab)
64* ffmpeg (rrichiesto per catturare video con swaygrab)
65* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (rrichiesto per man pages) 63* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (rrichiesto per man pages)
66 64
67_\*Richiesto solo per swaybar, swaybg, e swaylock_ 65_\*Richiesto solo per swaybar, swaybg, e swaylock_
diff --git a/README.ja.md b/README.ja.md
index 476d7472..7b437966 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -50,8 +50,6 @@ Swayは沢山のディストリビューションで提供されています。"
50* cairo 50* cairo
51* gdk-pixbuf2 * 51* gdk-pixbuf2 *
52* pam ** 52* pam **
53* imagemagick (swaygrabでスクリーンショットを撮るのに必要です)
54* ffmpeg (swaygrabで画面を録画するのに必要です)
55* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (manで必要です) 53* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (manで必要です)
56 54
57_\*swaybar,swaybg,swaylockでのみ必要です_ 55_\*swaybar,swaybg,swaylockでのみ必要です_
diff --git a/README.md b/README.md
index 49140fb8..ce753265 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,6 @@ Install dependencies:
58* gdk-pixbuf2 * 58* gdk-pixbuf2 *
59* pam ** 59* pam **
60* dbus >= 1.10 *** 60* dbus >= 1.10 ***
61* imagemagick (required for image capture with swaygrab)
62* ffmpeg (required for video capture with swaygrab)
63* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages) 61* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages)
64 62
65_\*Only required for swaybar, swaybg, and swaylock_ 63_\*Only required for swaybar, swaybg, and swaylock_
diff --git a/README.pt.md b/README.pt.md
index d1ef245f..9089c8c6 100644
--- a/README.pt.md
+++ b/README.pt.md
@@ -66,8 +66,6 @@ Antes de iniciar a compilação, instale as dependências:
66* cairo 66* cairo
67* gdk-pixbuf2 * 67* gdk-pixbuf2 *
68* pam ** 68* pam **
69* imagemagick (capturar imagem com o swaygrab)
70* ffmpeg (capturar vídeo com o swaygrab)
71* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (man pages) 69* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (man pages)
72 70
73_\*Dependência apenas de swaybar, swaybg, e swaylock_ 71_\*Dependência apenas de swaybar, swaybg, e swaylock_
diff --git a/README.ru.md b/README.ru.md
index 3b3de19a..68675db3 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -62,8 +62,6 @@ Sway доступен во многих дистрибутивах и наход
62* gdk-pixbuf2 * 62* gdk-pixbuf2 *
63* pam ** 63* pam **
64* dbus >= 1.10 *** 64* dbus >= 1.10 ***
65* imagemagick (требуется для захвата изображений через swaygrab)
66* ffmpeg (требуется для захвата видео через swaygrab)
67* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages) 65* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages)
68 66
69_\*Требуется только для swaybar, swaybg и swaylock_ 67_\*Требуется только для swaybar, swaybg и swaylock_
diff --git a/README.uk.md b/README.uk.md
index 55698487..c31a3ea9 100644
--- a/README.uk.md
+++ b/README.uk.md
@@ -66,8 +66,6 @@ Sway доступний у багатьох дистрибутивах Linux (а
66* cairo 66* cairo
67* gdk-pixbuf2 * 67* gdk-pixbuf2 *
68* pam ** 68* pam **
69* imagemagick (для захоплення зображень за допомогою swaygrab)
70* ffmpeg (для захоплення відео за допомогою swaygrab)
71* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages) 69* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (required for man pages)
72 70
73_\*Лише для swaybar, swaybg та swaylock_ 71_\*Лише для swaybar, swaybg та swaylock_
diff --git a/completions/zsh/_swaygrab b/completions/zsh/_swaygrab
deleted file mode 100644
index 0f9846f4..00000000
--- a/completions/zsh/_swaygrab
+++ /dev/null
@@ -1,23 +0,0 @@
1#compdef swaygrab
2#-----------------
3# Description
4# -----------
5#
6# Completion script for swaygrab in sway wm (http://swaywm.org)
7#
8# -----------------------------------------------------
9# Author
10# ------
11#
12# * Seth Barberee <seth.barberee@gmail.com>
13#
14# ------------------------------------------
15
16_arguments -s \
17 '(-h --help)'{-h,--help}'[Shows help message]' \
18 '(-c --capture)'{-c,--capture}'[Captures multiple frames as video and passes them to ffmpeg]' \
19 '(-o --output)'{-o,--output}'[Use the specified output. If not specified then current focused output will be used]' \
20 '(-v --version)'{-v,--version}'[Print the version (of swaymsg) and quit]' \
21 '(-s --socket)'{-s,--socket}'[Use the specified socket path.]:files:_files' \
22 '(-r --rate)'{-r,--rate}'[Specify a framerate (in fps). Used in combination with -c. Default is 30 and must be an integer]' \
23 '(--raw)--raw[Instead of ImageMagick or ffmpeg, dump raw rgba data to stdout]'
diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h
deleted file mode 100644
index c1093ef1..00000000
--- a/include/swaygrab/json.h
+++ /dev/null
@@ -1,10 +0,0 @@
1#include <json-c/json.h>
2#include "wlc/wlc.h"
3
4void init_json_tree(int socketfd);
5void free_json_tree();
6char *get_focused_output();
7char *create_payload(const char *output, struct wlc_geometry *g);
8struct wlc_geometry *get_container_geometry(json_object *container);
9json_object *get_focused_container();
10json_object *get_output_container(const char *output);
diff --git a/meson.build b/meson.build
index 1cb40ade..1131f1c9 100644
--- a/meson.build
+++ b/meson.build
@@ -183,7 +183,6 @@ endif
183if (get_option('zsh_completions')) 183if (get_option('zsh_completions'))
184 zsh_files = files( 184 zsh_files = files(
185 'completions/zsh/_sway', 185 'completions/zsh/_sway',
186 'completions/zsh/_swaygrab',
187 'completions/zsh/_swaylock', 186 'completions/zsh/_swaylock',
188 'completions/zsh/_swaymsg', 187 'completions/zsh/_swaymsg',
189 ) 188 )
diff --git a/security.d/00-defaults.in b/security.d/00-defaults.in
index e4626477..be7b9d06 100644
--- a/security.d/00-defaults.in
+++ b/security.d/00-defaults.in
@@ -12,7 +12,6 @@
12permit * fullscreen keyboard mouse 12permit * fullscreen keyboard mouse
13permit @prefix@/bin/swaylock lock 13permit @prefix@/bin/swaylock lock
14permit @prefix@/bin/swaybg background 14permit @prefix@/bin/swaybg background
15permit @prefix@/bin/swaygrab screenshot
16permit @prefix@/bin/swaybar panel 15permit @prefix@/bin/swaybar panel
17 16
18# Configures enabled IPC features for specific programs 17# Configures enabled IPC features for specific programs
@@ -36,11 +35,6 @@ ipc @prefix@/bin/swaybar {
36 } 35 }
37} 36}
38 37
39ipc @prefix@/bin/swaygrab {
40 outputs enabled
41 tree enabled
42}
43
44ipc @prefix@/bin/swaylock { 38ipc @prefix@/bin/swaylock {
45 outputs enabled 39 outputs enabled
46} 40}
diff --git a/sway/sway.1.scd b/sway/sway.1.scd
index 5b770cce..0c2ee974 100644
--- a/sway/sway.1.scd
+++ b/sway/sway.1.scd
@@ -92,4 +92,4 @@ source contributors. For more information about sway development, see
92 92
93# SEE ALSO 93# SEE ALSO
94 94
95*sway*(5) *swaymsg*(1) *swaygrab*(1) *sway-input*(5) *sway-bar*(5) 95*sway*(5) *swaymsg*(1) *sway-input*(5) *sway-bar*(5)
diff --git a/swayidle/swayidle.1.scd b/swayidle/swayidle.1.scd
index 5cd4a7fd..7c1b138a 100644
--- a/swayidle/swayidle.1.scd
+++ b/swayidle/swayidle.1.scd
@@ -58,4 +58,4 @@ https://github.com/swaywm/sway.
58 58
59# SEE ALSO 59# SEE ALSO
60 60
61*sway*(5) *swaymsg*(1) *swaygrab*(1) *sway-input*(5) *sway-bar*(5) 61*sway*(5) *swaymsg*(1) *sway-input*(5) *sway-bar*(5)