alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix format warnings

Browse source
This commit is contained in:
Drew DeVault 2015-08-16 22:16:09 -04:00
parent cb504c8f7b
commit be2635daa6
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/container.c
View file

@ -48,7 +48,7 @@ static void add_output_widths(swayc_t *container, void *_width) {
swayc_t *new_output(wlc_handle handle) { swayc_t *new_output(wlc_handle handle) {
const struct wlc_size* size = wlc_output_get_resolution(handle); const struct wlc_size* size = wlc_output_get_resolution(handle);
const char *name = wlc_output_get_name(handle); const char *name = wlc_output_get_name(handle);
sway_log(L_DEBUG, "Added output %d %s", handle, name); sway_log(L_DEBUG, "Added output %u %s", (unsigned int)handle, name);
swayc_t *output = new_swayc(C_OUTPUT); swayc_t *output = new_swayc(C_OUTPUT);
output->width = size->w; output->width = size->w;
@ -73,7 +73,7 @@ swayc_t *new_output(wlc_handle handle) {
} }
swayc_t *new_workspace(swayc_t * output, const char *name) { swayc_t *new_workspace(swayc_t * output, const char *name) {
sway_log(L_DEBUG, "Added workspace %s for output %d", name, output->handle); sway_log(L_DEBUG, "Added workspace %s for output %u", name, (unsigned int)output->handle);
swayc_t *workspace = new_swayc(C_WORKSPACE); swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->layout = L_HORIZ; // TODO:default layout workspace->layout = L_HORIZ; // TODO:default layout
@ -127,8 +127,8 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
swayc_t *new_view(swayc_t *sibling, wlc_handle handle) { swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
const char *title = wlc_view_get_title(handle); const char *title = wlc_view_get_title(handle);
swayc_t *view = new_swayc(C_VIEW); swayc_t *view = new_swayc(C_VIEW);
sway_log(L_DEBUG, "Adding new view %d:%s to container %p %d", sway_log(L_DEBUG, "Adding new view %u:%s to container %p %d",
handle, title, sibling, sibling?sibling->type:0); (unsigned int)handle, title, sibling, sibling?sibling->type:0);
//Setup values //Setup values
view->handle = handle; view->handle = handle;
view->name = strdup(title); view->name = strdup(title);
@ -150,7 +150,7 @@ swayc_t *destroy_output(swayc_t *output) {
if (output->children->length == 0) { if (output->children->length == 0) {
//TODO move workspaces to other outputs //TODO move workspaces to other outputs
} }
sway_log(L_DEBUG, "OUTPUT: Destroying output '%d'", output->handle); sway_log(L_DEBUG, "OUTPUT: Destroying output '%u'", (unsigned int)output->handle);
free_swayc(output); free_swayc(output);
return &root_container; return &root_container;
} }

4
sway/handlers.c
View file

@ -68,7 +68,7 @@ static void handle_output_destroyed(wlc_handle output) {
} }
static void handle_output_resolution_change(wlc_handle output, const struct wlc_size *from, const struct wlc_size *to) { static void handle_output_resolution_change(wlc_handle output, const struct wlc_size *from, const struct wlc_size *to) {
sway_log(L_DEBUG, "Output %d resolution changed to %d x %d", output, to->w, to->h); sway_log(L_DEBUG, "Output %u resolution changed to %d x %d", (unsigned int)output, to->w, to->h);
swayc_t *c = get_swayc_for_handle(output, &root_container); swayc_t *c = get_swayc_for_handle(output, &root_container);
if (!c) return; if (!c) return;
c->width = to->w; c->width = to->w;
@ -117,7 +117,7 @@ static bool handle_view_created(wlc_handle handle) {
} }
static void handle_view_destroyed(wlc_handle handle) { static void handle_view_destroyed(wlc_handle handle) {
sway_log(L_DEBUG, "Destroying window %d", handle); sway_log(L_DEBUG, "Destroying window %u", (unsigned int)handle);
swayc_t *view = get_swayc_for_handle(handle, &root_container); swayc_t *view = get_swayc_for_handle(handle, &root_container);
swayc_t *parent; swayc_t *parent;
swayc_t *focused = get_focused_container(&root_container); swayc_t *focused = get_focused_container(&root_container);

2
sway/workspace.c
View file

@ -26,7 +26,7 @@ char *workspace_next_name(void) {
list_t *args = split_string(command, " "); list_t *args = split_string(command, " ");
if (strcmp("workspace", args->items[0]) == 0 && args->length > 1) { if (strcmp("workspace", args->items[0]) == 0 && args->length > 1) {
sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", args->items[1]); sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", (char *)args->items[1]);
char* target = malloc(strlen(args->items[1]) + 1); char* target = malloc(strlen(args->items[1]) + 1);
strcpy(target, args->items[1]); strcpy(target, args->items[1]);
while (*target == ' ' || *target == '\t') while (*target == ' ' || *target == '\t')