nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed testing for wayland/xorg from examples

Browse Source
This commit is contained in:
Scott Anderson 2017-06-06 11:17:32 +12:00
parent c97de93fe1
commit dbb8612d0c
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/main.c
View File

@ -107,14 +107,6 @@ int disable_outputs(void *data) {
} }
int main() { 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 = { struct state state = {
.color = { 1.0, 0.0, 0.0 }, .color = { 1.0, 0.0, 0.0 },
.dec = 0, .dec = 0,

11
example/rotation.c
View File

@ -168,7 +168,7 @@ static void cleanup_gl(struct gl *gl) {
glDeleteBuffers(1, &gl->vbo); 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 output_state *ostate = wl_container_of(listener, ostate, frame);
struct state *s = ostate->state; 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 if (oc->transform != WL_OUTPUT_TRANSFORM_NORMAL
&& oc->transform != WL_OUTPUT_TRANSFORM_FLIPPED) { && oc->transform != WL_OUTPUT_TRANSFORM_FLIPPED) {
fprintf(stderr, "Rotation for %s already specified\n", oc->name); fprintf(stderr, "Rotation for %s already specified\n", oc->name);
usage(argv[0], 1); 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[]) { 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 = { struct state state = {
.angle = 0.0, .angle = 0.0,
.output_add = { .notify = output_add }, .output_add = { .notify = output_add },