From 1b2d2224491ee92c06f51e46062ec0f489f09d35 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 5 Aug 2012 20:56:33 +0200 Subject: [PATCH] Properly report errors in 'focus parent' (Thanks eeemsi) Also, make X11 errors debug log level only. They are harmless usually. fixes #762 --- src/commands.c | 2 +- src/main.c | 2 +- src/tree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands.c b/src/commands.c index 964dfe29..b730bc44 100644 --- a/src/commands.c +++ b/src/commands.c @@ -1263,7 +1263,7 @@ void cmd_focus_level(I3_CMD, char *level) { if (con_fullscreen_permits_focusing(focused->parent)) success = level_up(); else - LOG("Currently in fullscreen, not going up\n"); + ELOG("'focus parent': Currently in fullscreen, not going up\n"); } } diff --git a/src/main.c b/src/main.c index aaa58171..2c3dc7e9 100644 --- a/src/main.c +++ b/src/main.c @@ -121,7 +121,7 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { DLOG("Expected X11 Error received for sequence %x\n", event->sequence); else { xcb_generic_error_t *error = (xcb_generic_error_t*)event; - ELOG("X11 Error received! sequence 0x%x, error_code = %d\n", + DLOG("X11 Error received (probably harmless)! sequence 0x%x, error_code = %d\n", error->sequence, error->error_code); } free(event); diff --git a/src/tree.c b/src/tree.c index 068b0570..650c9a54 100644 --- a/src/tree.c +++ b/src/tree.c @@ -389,7 +389,7 @@ bool level_up(void) { if ((focused->parent->type != CT_CON && focused->parent->type != CT_WORKSPACE) || focused->type == CT_WORKSPACE) { - LOG("Cannot go up any further\n"); + ELOG("'focus parent': Focus is already on the workspace, cannot go higher than that.\n"); return false; } con_focus(focused->parent);