Merge pull request #1772 from Airblader/feature-fix-newline

Added missing newlines in log statements.
This commit is contained in:
Michael Stapelberg 2015-06-30 13:52:48 -07:00
commit 7c1abc9ab0
12 changed files with 22 additions and 22 deletions

View File

@ -344,7 +344,7 @@ static xcb_rectangle_t get_window_position(void) {
goto free_resources; goto free_resources;
} }
DLOG("Determined coordinates of window with input focus at x = %i / y = %i", coordinates->dst_x, coordinates->dst_y); DLOG("Determined coordinates of window with input focus at x = %i / y = %i.\n", coordinates->dst_x, coordinates->dst_y);
result.x += coordinates->dst_x; result.x += coordinates->dst_x;
result.y += coordinates->dst_y; result.y += coordinates->dst_y;

View File

@ -326,7 +326,7 @@ static xcb_rectangle_t get_window_position(void) {
if (crtc == NULL) if (crtc == NULL)
goto free_resources; goto free_resources;
DLOG("Found primary output on position x = %i / y = %i / w = %i / h = %i", DLOG("Found primary output on position x = %i / y = %i / w = %i / h = %i.\n",
crtc->x, crtc->y, crtc->width, crtc->height); crtc->x, crtc->y, crtc->width, crtc->height);
if (crtc->width == 0 || crtc->height == 0) { if (crtc->width == 0 || crtc->height == 0) {
DLOG("Primary output is not active, ignoring it.\n"); DLOG("Primary output is not active, ignoring it.\n");

View File

@ -1123,14 +1123,14 @@ void cmd_unmark(I3_CMD, char *mark) {
FREE(con->mark); FREE(con->mark);
con->mark_changed = true; con->mark_changed = true;
} }
DLOG("removed all window marks"); DLOG("Removed all window marks.\n");
} else { } else {
Con *con = con_by_mark(mark); Con *con = con_by_mark(mark);
if (con != NULL) { if (con != NULL) {
FREE(con->mark); FREE(con->mark);
con->mark_changed = true; con->mark_changed = true;
} }
DLOG("removed window mark %s\n", mark); DLOG("Removed window mark \"%s\".\n", mark);
} }
cmd_output->needs_tree_render = true; cmd_output->needs_tree_render = true;
@ -1934,7 +1934,7 @@ void cmd_title_format(I3_CMD, char *format) {
*/ */
void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) { void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
if (strncasecmp(new_name, "__", strlen("__")) == 0) { if (strncasecmp(new_name, "__", strlen("__")) == 0) {
LOG("Cannot rename workspace to \"%s\": names starting with __ are i3-internal.", new_name); LOG("Cannot rename workspace to \"%s\": names starting with __ are i3-internal.\n", new_name);
ysuccess(false); ysuccess(false);
return; return;
} }

View File

@ -729,12 +729,12 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
/* Prevent moving if this would violate the fullscreen focus restrictions. */ /* Prevent moving if this would violate the fullscreen focus restrictions. */
Con *target_ws = con_get_workspace(target); Con *target_ws = con_get_workspace(target);
if (!con_fullscreen_permits_focusing(target_ws)) { if (!con_fullscreen_permits_focusing(target_ws)) {
LOG("Cannot move out of a fullscreen container"); LOG("Cannot move out of a fullscreen container.\n");
return false; return false;
} }
if (con_is_floating(con)) { if (con_is_floating(con)) {
DLOG("Using FLOATINGCON instead\n"); DLOG("Container is floating, using parent instead.\n");
con = con->parent; con = con->parent;
} }

View File

@ -372,7 +372,7 @@ CFGFUN(focus_on_window_activation, const char *mode) {
return; return;
} }
DLOG("Set new focus_on_window_activation mode = %i", config.focus_on_window_activation); DLOG("Set new focus_on_window_activation mode = %i.\n", config.focus_on_window_activation);
} }
CFGFUN(show_marks, const char *value) { CFGFUN(show_marks, const char *value) {
@ -452,7 +452,7 @@ CFGFUN(assign, const char *workspace) {
ELOG("Match is empty, ignoring this assignment\n"); ELOG("Match is empty, ignoring this assignment\n");
return; return;
} }
DLOG("new assignment, using above criteria, to workspace %s\n", workspace); DLOG("New assignment, using above criteria, to workspace \"%s\".\n", workspace);
Assignment *assignment = scalloc(sizeof(Assignment)); Assignment *assignment = scalloc(sizeof(Assignment));
match_copy(&(assignment->match), current_match); match_copy(&(assignment->match), current_match);
assignment->type = A_TO_WORKSPACE; assignment->type = A_TO_WORKSPACE;
@ -466,7 +466,7 @@ CFGFUN(no_focus) {
return; return;
} }
DLOG("new assignment, using above criteria, to ignore focus on manage"); DLOG("New assignment, using above criteria, to ignore focus on manage.\n");
Assignment *assignment = scalloc(sizeof(Assignment)); Assignment *assignment = scalloc(sizeof(Assignment));
match_copy(&(assignment->match), current_match); match_copy(&(assignment->match), current_match);
assignment->type = A_NO_FOCUS; assignment->type = A_NO_FOCUS;

View File

@ -441,7 +441,7 @@ void floating_move_to_pointer(Con *con) {
Output *output = get_output_containing(reply->root_x, reply->root_y); Output *output = get_output_containing(reply->root_x, reply->root_y);
if (output == NULL) { if (output == NULL) {
ELOG("The pointer is not on any output, cannot move the container here."); ELOG("The pointer is not on any output, cannot move the container here.\n");
return; return;
} }
@ -663,7 +663,7 @@ static void xcb_drag_check_cb(EV_P_ ev_check *w, int revents) {
break; break;
case XCB_KEY_PRESS: case XCB_KEY_PRESS:
DLOG("A key was pressed during drag, reverting changes."); DLOG("A key was pressed during drag, reverting changes.\n");
dragloop->result = DRAG_REVERT; dragloop->result = DRAG_REVERT;
handle_event(type, event); handle_event(type, event);
break; break;

View File

@ -751,7 +751,7 @@ static void handle_client_message(xcb_client_message_event_t *event) {
DLOG("Marking con = %p urgent\n", con); DLOG("Marking con = %p urgent\n", con);
con_set_urgency(con, true); con_set_urgency(con, true);
} else } else
DLOG("Ignoring request for con = %p", con); DLOG("Ignoring request for con = %p.\n", con);
} }
tree_render(); tree_render();

View File

@ -450,7 +450,7 @@ int main(int argc, char *argv[]) {
memset(cwd, '\0', cwd_size); memset(cwd, '\0', cwd_size);
if (read(patternfd, cwd, cwd_size) > 0) if (read(patternfd, cwd, cwd_size) > 0)
/* a trailing newline is included in cwd */ /* a trailing newline is included in cwd */
LOG("CORE DUMPS: Your core_pattern is: %s", cwd); LOG("CORE DUMPS: Your core_pattern is: \"%s\".\n", cwd);
close(patternfd); close(patternfd);
} }
free(cwd); free(cwd);
@ -574,7 +574,7 @@ int main(int argc, char *argv[]) {
bool needs_tree_init = true; bool needs_tree_init = true;
if (layout_path) { if (layout_path) {
LOG("Trying to restore the layout from %s...", layout_path); LOG("Trying to restore the layout from \"%s\".\n", layout_path);
needs_tree_init = !tree_restore(layout_path, greply); needs_tree_init = !tree_restore(layout_path, greply);
if (delete_layout_path) { if (delete_layout_path) {
unlink(layout_path); unlink(layout_path);
@ -768,7 +768,7 @@ int main(int argc, char *argv[]) {
sigaction(SIGABRT, &action, NULL) == -1 || sigaction(SIGABRT, &action, NULL) == -1 ||
sigaction(SIGFPE, &action, NULL) == -1 || sigaction(SIGFPE, &action, NULL) == -1 ||
sigaction(SIGSEGV, &action, NULL) == -1) sigaction(SIGSEGV, &action, NULL) == -1)
ELOG("Could not setup signal handler"); ELOG("Could not setup signal handler.\n");
} }
/* Catch all signals with default action "Term", see signal(7) */ /* Catch all signals with default action "Term", see signal(7) */
@ -777,7 +777,7 @@ int main(int argc, char *argv[]) {
sigaction(SIGALRM, &action, NULL) == -1 || sigaction(SIGALRM, &action, NULL) == -1 ||
sigaction(SIGUSR1, &action, NULL) == -1 || sigaction(SIGUSR1, &action, NULL) == -1 ||
sigaction(SIGUSR2, &action, NULL) == -1) sigaction(SIGUSR2, &action, NULL) == -1)
ELOG("Could not setup signal handler"); ELOG("Could not setup signal handler.\n");
/* Ignore SIGPIPE to survive errors when an IPC client disconnects /* Ignore SIGPIPE to survive errors when an IPC client disconnects
* while we are sending them a message */ * while we are sending them a message */

View File

@ -88,7 +88,7 @@ bool resize_find_tiling_participants(Con **current, Con **other, direction_t dir
} }
} }
DLOG("Found participants: first=%p and second=%p.", first, second); DLOG("Found participants: first=%p and second=%p.\n", first, second);
*current = first; *current = first;
*other = second; *other = second;
if (first == NULL || second == NULL) { if (first == NULL || second == NULL) {

View File

@ -327,5 +327,5 @@ void setup_signal_handler(void) {
sigaction(SIGABRT, &action, NULL) == -1 || sigaction(SIGABRT, &action, NULL) == -1 ||
sigaction(SIGFPE, &action, NULL) == -1 || sigaction(SIGFPE, &action, NULL) == -1 ||
sigaction(SIGSEGV, &action, NULL) == -1) sigaction(SIGSEGV, &action, NULL) == -1)
ELOG("Could not setup signal handler"); ELOG("Could not setup signal handler.\n");
} }

View File

@ -241,7 +241,7 @@ void window_update_type(i3Window *window, xcb_get_property_reply_t *reply) {
} }
window->window_type = new_type; window->window_type = new_type;
LOG("_NET_WM_WINDOW_TYPE changed to %i", window->window_type); LOG("_NET_WM_WINDOW_TYPE changed to %i.\n", window->window_type);
run_assignments(window); run_assignments(window);
} }

View File

@ -729,7 +729,7 @@ workspace_prev_on_output_end:
*/ */
void workspace_back_and_forth(void) { void workspace_back_and_forth(void) {
if (!previous_workspace_name) { if (!previous_workspace_name) {
DLOG("No previous workspace name set. Not switching."); DLOG("No previous workspace name set. Not switching.\n");
return; return;
} }
@ -742,7 +742,7 @@ void workspace_back_and_forth(void) {
*/ */
Con *workspace_back_and_forth_get(void) { Con *workspace_back_and_forth_get(void) {
if (!previous_workspace_name) { if (!previous_workspace_name) {
DLOG("no previous workspace name set."); DLOG("No previous workspace name set.\n");
return NULL; return NULL;
} }