Compare commits
No commits in common. "55984bc7ef0b6e1b5992019d3aa3d25de8d08159" and "aea9c334e0f4842d78f3b849079bfb318d4f6937" have entirely different histories.
55984bc7ef
...
aea9c334e0
2
LICENSE
2
LICENSE
@ -1,4 +1,4 @@
|
||||
Copyright (c) 2013, 2024 - 2025, Přemysl Eric Janouch <p@janouch.name>
|
||||
Copyright (c) 2013, 2024, Přemysl Eric Janouch <p@janouch.name>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted.
|
||||
|
||||
7
NEWS
7
NEWS
@ -1,10 +1,3 @@
|
||||
Unreleased
|
||||
|
||||
* eizoctl: added a --quiet option to suppress information and/or errors
|
||||
|
||||
* eizoctl: fixed input port reporting
|
||||
|
||||
|
||||
1.1.0 (2024-11-28)
|
||||
|
||||
* Ported eizoctltray to macOS as well
|
||||
|
||||
188
eizoctl.c
188
eizoctl.c
@ -4,7 +4,7 @@
|
||||
* This program stays independent of the liberty library
|
||||
* in order to build on Windows.
|
||||
*
|
||||
* Copyright (c) 2025, Přemysl Eric Janouch <p@janouch.name>
|
||||
* Copyright (c) 2024, Přemysl Eric Janouch <p@janouch.name>
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted.
|
||||
@ -18,14 +18,6 @@
|
||||
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
// On Windows, vswprintf() interprets %s in the width of the format string,
|
||||
// and %hs is not really compliant with any standard:
|
||||
// https://devblogs.microsoft.com/oldnewthing/20190830-00/?p=102823
|
||||
#ifdef _WIN32
|
||||
#define __USE_MINGW_ANSI_STDIO
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
@ -49,9 +41,7 @@
|
||||
#define hid_init hidapi_hid_init
|
||||
#endif
|
||||
|
||||
#if defined __MINGW_GNU_PRINTF
|
||||
#define ATTRIBUTE_PRINTF(x, y) __MINGW_GNU_PRINTF((x), (y))
|
||||
#elif defined __GNUC__
|
||||
#if defined __GNUC__
|
||||
#define ATTRIBUTE_PRINTF(x, y) __attribute__((format(printf, x, y)))
|
||||
#else
|
||||
#define ATTRIBUTE_PRINTF(x, y)
|
||||
@ -813,7 +803,7 @@ eizo_port_by_name(const char *name)
|
||||
return index;
|
||||
}
|
||||
|
||||
static const char *
|
||||
static char *
|
||||
eizo_port_to_name(uint16_t port)
|
||||
{
|
||||
const char *stem = NULL;
|
||||
@ -821,14 +811,14 @@ eizo_port_to_name(uint16_t port)
|
||||
if (group && group < sizeof g_port_names / sizeof g_port_names[0])
|
||||
stem = g_port_names[group][0];
|
||||
|
||||
static char buf[32] = "";
|
||||
static char buffer[32] = "";
|
||||
if (!stem)
|
||||
snprintf(buf, sizeof buf, "%x", port);
|
||||
snprintf(buffer, sizeof buffer, "%x", port);
|
||||
else if (!number)
|
||||
snprintf(buf, sizeof buf, "%s", stem);
|
||||
snprintf(buffer, sizeof buffer, "%s", stem);
|
||||
else
|
||||
snprintf(buf, sizeof buf, "%s %d", stem, (number + 1));
|
||||
return buf;
|
||||
snprintf(buffer, sizeof buffer, "%s %d", stem, number);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
@ -905,7 +895,7 @@ eizo_get_input_ports(struct eizo_monitor *m, uint16_t *ports, size_t size)
|
||||
}
|
||||
|
||||
static uint16_t
|
||||
eizo_resolve_port_by_name(struct eizo_monitor *m, const char *port)
|
||||
eizo_resolve_port(struct eizo_monitor *m, const char *port)
|
||||
{
|
||||
uint8_t usb_c_index = 0;
|
||||
if (eizo_port_by_name_in_group(port, g_port_names_usb_c, &usb_c_index)) {
|
||||
@ -917,26 +907,6 @@ eizo_resolve_port_by_name(struct eizo_monitor *m, const char *port)
|
||||
return eizo_port_by_name(port);
|
||||
}
|
||||
|
||||
static const char *
|
||||
eizo_resolve_port_to_name(struct eizo_monitor *m, uint16_t port)
|
||||
{
|
||||
// USB-C ports are a bit tricky, they only need to be /displayed/ as such.
|
||||
struct eizo_profile_item *item =
|
||||
&m->profile[EIZO_PROFILE_KEY_USB_C_INPUT_PORTS];
|
||||
for (uint8_t i = 0; i < item->len / 2; i++) {
|
||||
if (port != peek_u16le(item->data + i * 2))
|
||||
continue;
|
||||
|
||||
static char buf[32] = "";
|
||||
if (!i)
|
||||
snprintf(buf, sizeof buf, "%s", g_port_names_usb_c[0]);
|
||||
else
|
||||
snprintf(buf, sizeof buf, "%s %u", g_port_names_usb_c[0], (i + 1));
|
||||
return buf;
|
||||
}
|
||||
return eizo_port_to_name(port);
|
||||
}
|
||||
|
||||
static bool
|
||||
eizo_set_input_port(struct eizo_monitor *m, uint16_t port)
|
||||
{
|
||||
@ -964,40 +934,8 @@ eizo_restart(struct eizo_monitor *m)
|
||||
|
||||
// --- Main --------------------------------------------------------------------
|
||||
|
||||
struct catbuf {
|
||||
char buf[4096];
|
||||
size_t len;
|
||||
};
|
||||
|
||||
static const char *
|
||||
catf(struct catbuf *b, const char *format, ...) ATTRIBUTE_PRINTF(2, 3);
|
||||
|
||||
static const char *
|
||||
catf(struct catbuf *b, const char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
int result = vsnprintf(b->buf + b->len, sizeof b->buf - b->len, format, ap);
|
||||
va_end(ap);
|
||||
if (result >= 0) {
|
||||
b->len += result;
|
||||
if (b->len >= sizeof b->buf)
|
||||
b->len = sizeof b->buf - 1;
|
||||
}
|
||||
return b->buf;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
typedef void (*print_fn)(const char *format, ...) ATTRIBUTE_PRINTF(1, 2);
|
||||
|
||||
static void print_dummy(const char *format, ...)
|
||||
{
|
||||
(void) format;
|
||||
}
|
||||
|
||||
static bool
|
||||
eizo_watch(struct eizo_monitor *m, print_fn output, print_fn error)
|
||||
eizo_watch(struct eizo_monitor *m)
|
||||
{
|
||||
uint8_t buf[1024] = {};
|
||||
int res = 0;
|
||||
@ -1007,72 +945,57 @@ eizo_watch(struct eizo_monitor *m, print_fn output, print_fn error)
|
||||
|
||||
if (buf[0] != EIZO_REPORT_ID_GET &&
|
||||
buf[0] != EIZO_REPORT_ID_GET_LONG) {
|
||||
error("Unknown report ID: %02x\n", buf[0]);
|
||||
printf("Unknown report ID\n");
|
||||
continue;
|
||||
}
|
||||
|
||||
struct catbuf message = {{0}, 0};
|
||||
uint16_t page = peek_u16le(&buf[1]), id = peek_u16le(&buf[3]);
|
||||
uint32_t usage = page << 16 | id;
|
||||
catf(&message, "%08x", usage);
|
||||
printf("%08x", usage);
|
||||
|
||||
const struct parser_report *r = eizo_monitor_subreport(m, usage);
|
||||
if (!r) {
|
||||
output(catf(&message, " unknown usage\n"));
|
||||
printf(" unknown usage\n");
|
||||
continue;
|
||||
}
|
||||
size_t rlen = r->report_size / 8 * r->report_count;
|
||||
if ((size_t) res < 7 + rlen) {
|
||||
output(catf(&message, " received data too short\n"));
|
||||
printf(" received data too short\n");
|
||||
continue;
|
||||
}
|
||||
if (r->report_size == 16)
|
||||
for (size_t i = 0; i + 1 < rlen; i += 2)
|
||||
catf(&message, " %04x", peek_u16le(&buf[7 + i]));
|
||||
printf(" %04x", peek_u16le(&buf[7 + i]));
|
||||
else
|
||||
for (size_t i = 0; i < rlen; i++)
|
||||
catf(&message, " %02x", buf[7 + i]);
|
||||
output(catf(&message, "\n"));
|
||||
printf(" %02x", buf[7 + i]);
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
static const char *usage = "Usage: %s OPTION...\n\n"
|
||||
" -b, --brightness [+-]BRIGHTNESS\n"
|
||||
" Change monitor brightness; values go from 0 to 1 and may be relative.\n"
|
||||
" -i, --input NAME\n"
|
||||
" Change monitor input ports; use '?' to retrieve current values.\n"
|
||||
" -r, --restart\n"
|
||||
" Reboot monitors.\n"
|
||||
" -e, --events\n"
|
||||
" Watch for events reported by monitors.\n"
|
||||
" -q, --quiet\n"
|
||||
" Use once to suppress informative messages, twice to suppress errors.\n"
|
||||
" -h, --help\n"
|
||||
" Display this help and exit.\n"
|
||||
" -V, --version\n"
|
||||
" Output version information and exit.\n";
|
||||
typedef void (*print_fn)(const char *format, ...) ATTRIBUTE_PRINTF(1, 2);
|
||||
|
||||
static int
|
||||
run(int argc, char *argv[], print_fn output, print_fn error)
|
||||
run(int argc, char *argv[], print_fn output, print_fn error, bool verbose)
|
||||
{
|
||||
const char *name = argv[0];
|
||||
const char *usage = "Usage: %s [--brightness [+-]BRIGHTNESS] [--input NAME]"
|
||||
" [--restart] [--events]\n";
|
||||
static struct option opts[] = {
|
||||
{"brightness", required_argument, NULL, 'b'},
|
||||
{"input", required_argument, NULL, 'i'},
|
||||
{"brightness", required_argument, NULL, 'b'},
|
||||
{"restart", no_argument, NULL, 'r'},
|
||||
{"events", no_argument, NULL, 'e'},
|
||||
{"quiet", no_argument, NULL, 'q'},
|
||||
{"help", no_argument, NULL, 'h'},
|
||||
{"version", no_argument, NULL, 'V'},
|
||||
{}
|
||||
};
|
||||
|
||||
int quiet = 0;
|
||||
double brightness = NAN;
|
||||
bool relative = false, restart = false, events = false;
|
||||
const char *port = NULL;
|
||||
int c = 0;
|
||||
while ((c = getopt_long(argc, argv, "b:i:reqhV", opts, NULL)) != -1)
|
||||
while ((c = getopt_long(argc, argv, "b:i:h", opts, NULL)) != -1)
|
||||
switch (c) {
|
||||
case 'b':
|
||||
relative = *optarg == '+' || *optarg == '-';
|
||||
@ -1090,9 +1013,6 @@ run(int argc, char *argv[], print_fn output, print_fn error)
|
||||
case 'e':
|
||||
events = true;
|
||||
break;
|
||||
case 'q':
|
||||
quiet++;
|
||||
break;
|
||||
case 'h':
|
||||
output(usage, name);
|
||||
return 0;
|
||||
@ -1118,10 +1038,6 @@ run(int argc, char *argv[], print_fn output, print_fn error)
|
||||
error("%ls\n", hid_error(NULL));
|
||||
return 1;
|
||||
}
|
||||
if (quiet > 0)
|
||||
output = print_dummy;
|
||||
if (quiet > 1)
|
||||
error = print_dummy;
|
||||
|
||||
// It should be possible to choose a particular monitor,
|
||||
// but it is generally more useful to operate on all of them.
|
||||
@ -1141,25 +1057,25 @@ run(int argc, char *argv[], print_fn output, print_fn error)
|
||||
double next = relative ? brightness + prev : brightness;
|
||||
if (!eizo_set_brightness(&m, next))
|
||||
error("Failed to set brightness: %s\n", m.error);
|
||||
else
|
||||
else if (verbose)
|
||||
output("%s %s: brightness: %.2f -> %.2f\n",
|
||||
m.product, m.serial, prev, next);
|
||||
}
|
||||
}
|
||||
if (port) {
|
||||
uint16_t prev = 0;
|
||||
uint16_t next = eizo_resolve_port_by_name(&m, port);
|
||||
uint16_t next = eizo_resolve_port(&m, port);
|
||||
if (!eizo_get_input_port(&m, &prev)) {
|
||||
error("Failed to get input port: %s\n", m.error);
|
||||
} else if (!strcmp(port, "?")) {
|
||||
output("%s %s: input: %s\n",
|
||||
m.product, m.serial, eizo_resolve_port_to_name(&m, prev));
|
||||
m.product, m.serial, eizo_port_to_name(prev));
|
||||
} else if (!next) {
|
||||
error("Failed to resolve port name: %s\n", port);
|
||||
} else {
|
||||
if (!eizo_set_input_port(&m, next))
|
||||
error("Failed to set input port: %s\n", m.error);
|
||||
else
|
||||
else if (verbose)
|
||||
output("%s %s: input: %s -> %s\n",
|
||||
m.product, m.serial, eizo_port_to_name(prev), port);
|
||||
}
|
||||
@ -1167,13 +1083,13 @@ run(int argc, char *argv[], print_fn output, print_fn error)
|
||||
if (restart) {
|
||||
if (!eizo_restart(&m))
|
||||
error("Failed to restart: %s\n", m.error);
|
||||
else
|
||||
else if (verbose)
|
||||
output("%s %s: restart\n", m.product, m.serial);
|
||||
}
|
||||
if (events) {
|
||||
if (quiet)
|
||||
if (!verbose)
|
||||
error("Watching events is not possible in this mode\n");
|
||||
else if (!eizo_watch(&m, output, error))
|
||||
else if (!eizo_watch(&m))
|
||||
error("%s\n", m.error);
|
||||
}
|
||||
|
||||
@ -1208,7 +1124,7 @@ stdio_error(const char *format, ...)
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
return run(argc, argv, stdio_output, stdio_error);
|
||||
return run(argc, argv, stdio_output, stdio_error, true);
|
||||
}
|
||||
|
||||
// --- Windows -----------------------------------------------------------------
|
||||
@ -1251,8 +1167,8 @@ message_output(const char *format, ...)
|
||||
wchar_t *message = message_printf(format, ap);
|
||||
va_end(ap);
|
||||
if (message) {
|
||||
MessageBox(NULL, message,
|
||||
L"Message", MB_ICONINFORMATION | MB_OK | MB_APPLMODAL);
|
||||
MessageBox(
|
||||
NULL, message, NULL, MB_ICONINFORMATION | MB_OK | MB_APPLMODAL);
|
||||
free(message);
|
||||
}
|
||||
}
|
||||
@ -1312,9 +1228,21 @@ append_monitor(struct eizo_monitor *m, HMENU menu, UINT_PTR base)
|
||||
if (!ports[0])
|
||||
ports[0] = current;
|
||||
|
||||
// USB-C ports are a bit tricky, they only need to be /displayed/ as such.
|
||||
struct eizo_profile_item *item =
|
||||
&m->profile[EIZO_PROFILE_KEY_USB_C_INPUT_PORTS];
|
||||
for (size_t i = 0; ports[i]; i++) {
|
||||
snwprintf(buf, sizeof buf, L"%s",
|
||||
eizo_resolve_port_to_name(m, ports[i]));
|
||||
uint8_t usb_c = 0;
|
||||
for (size_t u = 0; u < item->len / 2; u++)
|
||||
if (ports[i] == peek_u16le(item->data + u * 2))
|
||||
usb_c = u + 1;
|
||||
|
||||
if (!usb_c)
|
||||
snwprintf(buf, sizeof buf, L"%s", eizo_port_to_name(ports[i]));
|
||||
else if (usb_c == 1)
|
||||
snwprintf(buf, sizeof buf, L"%s", g_port_names_usb_c[0]);
|
||||
else
|
||||
snwprintf(buf, sizeof buf, L"%s %u", g_port_names_usb_c[0], usb_c);
|
||||
|
||||
UINT flags = MF_STRING;
|
||||
if (ports[i] == current)
|
||||
@ -1467,7 +1395,7 @@ wWinMain(
|
||||
char *mb = mbargv[i + 1] = calloc(len, sizeof *mb);
|
||||
wcstombs(mb, argv[i], len);
|
||||
}
|
||||
return run(argc + 1, mbargv, message_output, message_error);
|
||||
return run(argc + 1, mbargv, message_output, message_error, false);
|
||||
}
|
||||
LocalFree(argv);
|
||||
|
||||
@ -1681,9 +1609,23 @@ message_error(const char *format, ...)
|
||||
if (!ports[0])
|
||||
ports[0] = current;
|
||||
|
||||
// USB-C ports are a bit tricky, they only need to be /displayed/ as such.
|
||||
struct eizo_profile_item *item =
|
||||
&m.monitor->profile[EIZO_PROFILE_KEY_USB_C_INPUT_PORTS];
|
||||
for (size_t i = 0; ports[i]; i++) {
|
||||
NSString *title = [NSString stringWithUTF8String:
|
||||
eizo_resolve_port_to_name(m.monitor, ports[i])];
|
||||
uint8_t usb_c = 0;
|
||||
for (size_t u = 0; u < item->len / 2; u++)
|
||||
if (ports[i] == peek_u16le(item->data + u * 2))
|
||||
usb_c = u + 1;
|
||||
|
||||
NSString *title = nil;
|
||||
if (!usb_c)
|
||||
title = [NSString stringWithUTF8String:eizo_port_to_name(ports[i])];
|
||||
else if (usb_c == 1)
|
||||
title = [NSString stringWithUTF8String:g_port_names_usb_c[0]];
|
||||
else
|
||||
title = [NSString stringWithFormat:@"%s %u",
|
||||
g_port_names_usb_c[0], usb_c];
|
||||
|
||||
NSMenuItem *inputPortItem = [[NSMenuItem alloc]
|
||||
initWithTitle:title action:@selector(setInputPort:)
|
||||
@ -1766,7 +1708,7 @@ main(int argc, char *argv[])
|
||||
{
|
||||
@autoreleasepool {
|
||||
if (argc > 1)
|
||||
return run(argc, argv, message_output, message_error);
|
||||
return run(argc, argv, message_output, message_error, true);
|
||||
|
||||
NSApplication *app = [NSApplication sharedApplication];
|
||||
ApplicationDelegate *delegate = [ApplicationDelegate new];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user