fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-21 13:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix return status for dmx examples and have dmxaddscreen print the attachment screen number.

Browse source
This commit is contained in:
David Reveman 2008-06-04 14:08:05 -04:00
parent d1a66517c4
commit 03a4b57a7f
5 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hw/dmx/examples/dmxaddinput.c
View file

@ -46,29 +46,25 @@ int main(int argc, char **argv)
int status; int status;
if (argc != 5) { if (argc != 5) {
printf("Usage: %s display c|b name|screen isCore\n", argv[0]); fprintf(stderr, "Usage: %s display c|b name|screen isCore\n", argv[0]);
return -1; return -1;
} }
if (!(display = XOpenDisplay(argv[1]))) { if (!(display = XOpenDisplay(argv[1]))) {
printf("Cannot open display %s\n", argv[1]); fprintf(stderr, "Cannot open display %s\n", argv[1]);
return -1; return -1;
} }
if (!DMXQueryExtension(display, &event_base, &error_base)) { if (!DMXQueryExtension(display, &event_base, &error_base)) {
printf("DMX extension not present\n"); fprintf(stderr, "DMX extension not present\n");
return -1; return -1;
} }
printf("DMX extension present: event_base = %d, error_base = %d\n",
event_base, error_base);
if (!DMXQueryVersion(display, if (!DMXQueryVersion(display,
&major_version, &minor_version, &patch_version)) { &major_version, &minor_version, &patch_version)) {
printf("Could not get extension version\n"); fprintf(stderr, "Could not get extension version\n");
return -1; return -1;
} }
printf("Extension version: %d.%d patch %d\n",
major_version, minor_version, patch_version);
if (argv[2][0] == 'c') { if (argv[2][0] == 'c') {
status = DMXAddConsoleInput(display, argv[3], atoi(argv[4]), &id); status = DMXAddConsoleInput(display, argv[3], atoi(argv[4]), &id);
@ -76,8 +72,8 @@ int main(int argc, char **argv)
status = DMXAddBackendInput(display, atoi(argv[3]), atoi(argv[4]),&id); status = DMXAddBackendInput(display, atoi(argv[3]), atoi(argv[4]),&id);
} }
printf("status = %d, id = %d\n", status, id); printf ("%d", id);
XCloseDisplay(display); XCloseDisplay(display);
return 0; return status ? 0 : -1;
} }

22
hw/dmx/examples/dmxaddscreen.c
View file

@ -48,12 +48,12 @@ int main(int argc, char **argv)
unsigned int mask = 0; unsigned int mask = 0;
if (argc != 4 && argc != 14) { if (argc != 4 && argc != 14) {
printf("Usage: %s display screenNum displayName [scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy]\n", argv[0]); fprintf(stderr, "Usage: %s display screenNum displayName [scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy]\n", argv[0]);
return -1; return -1;
} }
if (!(display = XOpenDisplay(argv[1]))) { if (!(display = XOpenDisplay(argv[1]))) {
printf("Cannot open display %s\n", argv[1]); fprintf(stderr, "Cannot open display %s\n", argv[1]);
return -1; return -1;
} }
@ -83,23 +83,25 @@ int main(int argc, char **argv)
} }
if (!DMXQueryExtension(display, &event_base, &error_base)) { if (!DMXQueryExtension(display, &event_base, &error_base)) {
printf("DMX extension not present\n"); fprintf(stderr, "DMX extension not present\n");
return -1; return -1;
} }
printf("DMX extension present: event_base = %d, error_base = %d\n",
event_base, error_base);
if (!DMXQueryVersion(display, if (!DMXQueryVersion(display,
&major_version, &minor_version, &patch_version)) { &major_version, &minor_version, &patch_version)) {
printf("Could not get extension version\n"); fprintf(stderr, "Could not get extension version\n");
return -1; return -1;
} }
printf("Extension version: %d.%d patch %d\n",
major_version, minor_version, patch_version);
if (!DMXAddScreen(display, argv[3], mask, &attr, &screenNum)) if (!DMXAddScreen(display, argv[3], mask, &attr, &screenNum))
printf("Failed to add %s as screen #%d\n", argv[2], screenNum); {
fprintf(stderr, "Failed to add %s as screen #%d\n", argv[3], screenNum);
XCloseDisplay(display);
return -1;
}
printf ("%d", screenNum);
XCloseDisplay(display); XCloseDisplay(display);
return 0; return 0;
} }

2
hw/dmx/examples/dmxresize.c
View file

@ -100,5 +100,5 @@ int main(int argc, char **argv)
} }
XCloseDisplay(display); XCloseDisplay(display);
return 0; return (status == Success) ? 0 : -1;
} }

2
hw/dmx/examples/dmxrminput.c
View file

@ -74,5 +74,5 @@ int main(int argc, char **argv)
printf("status = %d\n", status); printf("status = %d\n", status);
XCloseDisplay(display); XCloseDisplay(display);
return 0; return status ? 0 : -1;
} }

6
hw/dmx/examples/dmxrmscreen.c
View file

@ -73,8 +73,12 @@ int main(int argc, char **argv)
major_version, minor_version, patch_version); major_version, minor_version, patch_version);
if (!DMXRemoveScreen(display, screenNum)) if (!DMXRemoveScreen(display, screenNum))
{
printf("Failed to remove screen #%d\n", screenNum); printf("Failed to remove screen #%d\n", screenNum);
XCloseDisplay(display);
return -1;
}
XCloseDisplay(display); XCloseDisplay(display);
return 0; return 0;
} }