dimitri/ShaderTool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make inotify optional

Browse source 
If it fails, display a warning and allow manual reloading only. Also
add more logging for inotify-related stuff.
This commit is contained in:
Dimitri Lozeve 2021-02-26 20:16:17 +01:00
parent 2b683cb169
commit 5f5fe249f8
2 changed files with 45 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/renderer.c
View file

@ -194,14 +194,20 @@ void capture_screenshot() {
*/
void process_input(struct renderer_state *state) {
bool should_reload = false;
char buf[BUF_LEN] = {0};
int num_read = read(state->inotify_fd, buf, BUF_LEN);
if (num_read == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
// No event, do nothing
} else if (num_read <= 0) {
log_error("Could not read inotify state");
} else {
should_reload = true;
// Skip inotify checking if it's not available
if (state->inotify_fd != -1 &&
(state->screen_shader.wd != -1 || state->buffer_shader.wd != -1)) {
char buf[BUF_LEN] = {0};
int num_read = read(state->inotify_fd, buf, BUF_LEN);
if (num_read == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
// No event, do nothing
} else if (num_read <= 0) {
log_error("[inotify] Could not read inotify state");
} else {
log_debug("[inotify] File changed on disk, reloading shaders");
should_reload = true;
}
}
if (glfwGetKey(state->window, GLFW_KEY_ESCAPE) == GLFW_PRESS) {