diff options
| author | Scott Anderson <ascent12@hotmail.com> | 2017-06-06 11:17:32 +1200 |
|---|---|---|
| committer | Scott Anderson <ascent12@hotmail.com> | 2017-06-06 11:17:32 +1200 |
| commit | dbb8612d0cdb1bd6d82d8e0d2ee5fae05e7c6872 (patch) | |
| tree | 826a4ed29393f78b7c282b5dd08a02218ea46d47 /example | |
| parent | c97de93fe1a3fca3e881e1178a3be1b981268cd3 (diff) | |
Removed testing for wayland/xorg from examples
Diffstat (limited to 'example')
| -rw-r--r-- | example/main.c | 8 | ||||
| -rw-r--r-- | example/rotation.c | 11 |
2 files changed, 1 insertions, 18 deletions
diff --git a/example/main.c b/example/main.c index 27d598e6..1f92bbe7 100644 --- a/example/main.c +++ b/example/main.c @@ -107,14 +107,6 @@ int disable_outputs(void *data) { } int main() { - if (getenv("DISPLAY")) { - fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); - return 1; - } else if (getenv("WAYLAND_DISPLAY")) { - fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); - return 1; - } - struct state state = { .color = { 1.0, 0.0, 0.0 }, .dec = 0, diff --git a/example/rotation.c b/example/rotation.c index f4376c54..97b8785e 100644 --- a/example/rotation.c +++ b/example/rotation.c @@ -168,7 +168,7 @@ static void cleanup_gl(struct gl *gl) { glDeleteBuffers(1, &gl->vbo); } -void output_frame(struct wl_listener *listener, void *data) { +static void output_frame(struct wl_listener *listener, void *data) { struct output_state *ostate = wl_container_of(listener, ostate, frame); struct state *s = ostate->state; @@ -297,7 +297,6 @@ static void parse_args(int argc, char *argv[], struct wl_list *config) { if (oc->transform != WL_OUTPUT_TRANSFORM_NORMAL && oc->transform != WL_OUTPUT_TRANSFORM_FLIPPED) { - fprintf(stderr, "Rotation for %s already specified\n", oc->name); usage(argv[0], 1); } @@ -334,14 +333,6 @@ static void parse_args(int argc, char *argv[], struct wl_list *config) { } int main(int argc, char *argv[]) { - if (getenv("DISPLAY")) { - fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); - return 1; - } else if (getenv("WAYLAND_DISPLAY")) { - fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); - return 1; - } - struct state state = { .angle = 0.0, .output_add = { .notify = output_add }, |