diff options
author | Luminarys <kizunanohikari@gmail.com> | 2015-08-21 09:24:26 -0500 |
---|---|---|
committer | Luminarys <kizunanohikari@gmail.com> | 2015-08-21 09:24:26 -0500 |
commit | de86c5f4ea20d005a1f5512406725fb44827e339 (patch) | |
tree | 5645390197992ea9f6feeea9d73d12dc2fe9708f | |
parent | Fix clang warnings (diff) | |
download | sway-de86c5f4ea20d005a1f5512406725fb44827e339.tar.gz sway-de86c5f4ea20d005a1f5512406725fb44827e339.tar.zst sway-de86c5f4ea20d005a1f5512406725fb44827e339.zip |
Cleanup and minor fixes
-rw-r--r-- | include/input_state.h | 1 | ||||
-rw-r--r-- | sway/handlers.c | 12 | ||||
-rw-r--r-- | sway/input_state.c | 2 | ||||
-rw-r--r-- | sway/type | 113 |
4 files changed, 8 insertions, 120 deletions
diff --git a/include/input_state.h b/include/input_state.h index 27dd6cff..528d5e12 100644 --- a/include/input_state.h +++ b/include/input_state.h | |||
@@ -37,6 +37,7 @@ extern struct pointer_state { | |||
37 | struct pointer_tiling { | 37 | struct pointer_tiling { |
38 | bool resize; | 38 | bool resize; |
39 | swayc_t *init_view; | 39 | swayc_t *init_view; |
40 | wlc_origin *lock_pos; | ||
40 | } tiling; | 41 | } tiling; |
41 | struct pointer_lock { | 42 | struct pointer_lock { |
42 | bool left; | 43 | bool left; |
diff --git a/sway/handlers.c b/sway/handlers.c index 53eae439..78f8927d 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -419,11 +419,11 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
419 | } | 419 | } |
420 | } | 420 | } |
421 | } | 421 | } |
422 | } | 422 | } |
423 | } else if (pointer_state.tiling.resize && view) { | 423 | } else if (pointer_state.tiling.resize && view) { |
424 | if (view != pointer_state.tiling.init_view) { | 424 | if (view != pointer_state.tiling.init_view) { |
425 | // Quit out of the resize | 425 | // Quit out of the resize |
426 | pointer_state.tiling.init_view = NULL; | 426 | //pointer_state.tiling.init_view = NULL; |
427 | } | 427 | } |
428 | if (!view->is_floating && view == pointer_state.tiling.init_view) { | 428 | if (!view->is_floating && view == pointer_state.tiling.init_view) { |
429 | // Handle layout resizes -- Find the biggest parent container then apply resizes to that | 429 | // Handle layout resizes -- Find the biggest parent container then apply resizes to that |
@@ -431,7 +431,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
431 | swayc_t *parent = view; | 431 | swayc_t *parent = view; |
432 | double dx = mouse_origin.x - prev_pos.x; | 432 | double dx = mouse_origin.x - prev_pos.x; |
433 | double dy = mouse_origin.y - prev_pos.y; | 433 | double dy = mouse_origin.y - prev_pos.y; |
434 | if (pointer_state.lock.top) { | 434 | if (!pointer_state.lock.bottom) { |
435 | while (parent->type != C_WORKSPACE) { | 435 | while (parent->type != C_WORKSPACE) { |
436 | // TODO: Absolute value is a bad hack here to compensate for rounding. Find a better | 436 | // TODO: Absolute value is a bad hack here to compensate for rounding. Find a better |
437 | // way of doing this. | 437 | // way of doing this. |
@@ -453,7 +453,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
453 | } | 453 | } |
454 | } | 454 | } |
455 | } | 455 | } |
456 | } else { | 456 | } else if (!pointer_state.lock.top) { |
457 | while (parent->type != C_WORKSPACE) { | 457 | while (parent->type != C_WORKSPACE) { |
458 | if (fabs(parent->parent->y - view->y) <= 1) { | 458 | if (fabs(parent->parent->y - view->y) <= 1) { |
459 | parent = parent->parent; | 459 | parent = parent->parent; |
@@ -476,7 +476,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
476 | } | 476 | } |
477 | 477 | ||
478 | parent = view; | 478 | parent = view; |
479 | if (pointer_state.lock.left) { | 479 | if (!pointer_state.lock.right) { |
480 | while (parent->type != C_WORKSPACE) { | 480 | while (parent->type != C_WORKSPACE) { |
481 | if (fabs(parent->parent->x + parent->parent->width - (view->x + view->width)) <= 1) { | 481 | if (fabs(parent->parent->x + parent->parent->width - (view->x + view->width)) <= 1) { |
482 | parent = parent->parent; | 482 | parent = parent->parent; |
@@ -497,7 +497,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
497 | } | 497 | } |
498 | } | 498 | } |
499 | } | 499 | } |
500 | } else { | 500 | } else if (!pointer_state.lock.left) { |
501 | while (parent->type != C_WORKSPACE) { | 501 | while (parent->type != C_WORKSPACE) { |
502 | if (fabs(parent->parent->x - view->x) <= 1 && parent->parent) { | 502 | if (fabs(parent->parent->x - view->x) <= 1 && parent->parent) { |
503 | parent = parent->parent; | 503 | parent = parent->parent; |
diff --git a/sway/input_state.c b/sway/input_state.c index ef5d6df0..28a8b2f0 100644 --- a/sway/input_state.c +++ b/sway/input_state.c | |||
@@ -48,7 +48,7 @@ void release_key(keycode key) { | |||
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | struct pointer_state pointer_state = {0, 0, {0, 0}, {0}, {0, 0, 0, 0}}; | 51 | struct pointer_state pointer_state = {0, 0, {0, 0}, {0, 0}, {0, 0, 0, 0}}; |
52 | 52 | ||
53 | static struct wlc_geometry saved_floating; | 53 | static struct wlc_geometry saved_floating; |
54 | 54 | ||
diff --git a/sway/type b/sway/type deleted file mode 100644 index c7bebe5e..00000000 --- a/sway/type +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | workspace.c:78:9: while (parent->type != C_OUTPUT) { | ||
2 | workspace.c:79:12: parent = parent->parent; | ||
3 | |||
4 | focus.c:16:6: if (parent->focused != c) { | ||
5 | focus.c:30:8: if (parent->focused) { | ||
6 | focus.c:31:19: swayc_t *ws = parent->focused; | ||
7 | focus.c:38:25: wlc_output_set_mask(parent->handle, 2); | ||
8 | focus.c:39:8: c->parent->focused = c; | ||
9 | focus.c:53:5: c->parent->focused = c; | ||
10 | focus.c:71:20: while (parent && !parent->is_focused) { | ||
11 | focus.c:72:12: parent = parent->focused; | ||
12 | focus.c:143:13: if (find->parent->focused != find) { | ||
13 | focus.c:167:19: while (parent && parent->type != C_VIEW) { | ||
14 | focus.c:168:7: if (parent->type == C_WORKSPACE && parent->focused == NULL) { | ||
15 | focus.c:171:12: parent = parent->focused; | ||
16 | |||
17 | handlers.c:24:9: while (parent->type != C_OUTPUT) { | ||
18 | handlers.c:25:12: parent = parent->parent; | ||
19 | handlers.c:436:18: while (parent->parent && parent->y + parent->height == view->y + view->height && parent->type != L_WORKSPACE) { | ||
20 | handlers.c:437:30: parent = parent->parent; | ||
21 | handlers.c:440:50: if (parent == &root_container || parent->children->length == 1) { | ||
22 | handlers.c:444:18: while (parent->parent && parent->y == view->y) { | ||
23 | handlers.c:445:30: parent = parent->parent; | ||
24 | handlers.c:448:50: if (parent == &root_container || parent->children->length == 1) { | ||
25 | handlers.c:454:18: while (parent->parent && parent->x + parent->width == view->x + view->width) { | ||
26 | handlers.c:455:30: parent = parent->parent; | ||
27 | handlers.c:458:50: if (parent == &root_container || parent->children->length == 1) { | ||
28 | handlers.c:462:18: while (parent->parent && parent->x + parent->width == view->x) { | ||
29 | handlers.c:463:30: parent = parent->parent; | ||
30 | handlers.c:466:50: if (parent == &root_container || parent->children->length == 1) { | ||
31 | handlers.c:528:29: for (i = 0; i < pointer->parent->floating->length; i++) { | ||
32 | handlers.c:529:18: if (pointer->parent->floating->items[i] == pointer) { | ||
33 | handlers.c:530:24: list_del(pointer->parent->floating, i); | ||
34 | handlers.c:531:24: list_add(pointer->parent->floating, pointer); | ||
35 | |||
36 | container.c:284:6: if (parent->type == C_CONTAINER) { | ||
37 | |||
38 | layout.c:23:18: for (i = 0; i < parent->children->length; ++i) { | ||
39 | layout.c:24:7: if (parent->children->items[i] == child) { | ||
40 | layout.c:33:40: child->width, child->height, parent, parent->type, parent->width, parent->height); | ||
41 | layout.c:34:11: list_add(parent->children, child); | ||
42 | layout.c:37:6: if (parent->children->length == 1) { | ||
43 | layout.c:56:11: if (i == parent->children->length) { | ||
44 | layout.c:59:14: list_insert(parent->children, i+1, child); | ||
45 | layout.c:70:2: parent->children->items[i] = new_child; | ||
46 | layout.c:73:13: if (child->parent->focused == child) { | ||
47 | layout.c:85:19: for (i = 0; i < parent->floating->length; ++i) { | ||
48 | layout.c:86:8: if (parent->floating->items[i] == child) { | ||
49 | layout.c:87:14: list_del(parent->floating, i); | ||
50 | layout.c:93:19: for (i = 0; i < parent->children->length; ++i) { | ||
51 | layout.c:94:8: if (parent->children->items[i] == child) { | ||
52 | layout.c:95:14: list_del(parent->children, i); | ||
53 | layout.c:101:6: if (parent->focused == child) { | ||
54 | layout.c:102:7: if (parent->children->length > 0) { | ||
55 | layout.c:103:38: set_focused_container_for(parent, parent->children->items[i?i-1:0]); | ||
56 | layout.c:105:4: parent->focused = NULL; | ||
57 | layout.c:165:12: while (parent->type != C_OUTPUT) { | ||
58 | layout.c:166:15: parent = parent->parent; | ||
59 | layout.c:170:23: geometry.size.w = parent->width; | ||
60 | layout.c:171:23: geometry.size.h = parent->height; | ||
61 | layout.c:267:13: while (parent->type != C_OUTPUT) { | ||
62 | layout.c:268:16: parent = parent->parent; | ||
63 | layout.c:272:24: geometry.size.w = parent->width; | ||
64 | layout.c:273:24: geometry.size.h = parent->height; | ||
65 | layout.c:294:6: if (parent->children == NULL) { | ||
66 | layout.c:300:6: if (parent->type == C_WORKSPACE) { | ||
67 | layout.c:301:19: for (i = 0; i < parent->floating->length; ++i) { | ||
68 | layout.c:302:21: swayc_t *child = parent->floating->items[i]; | ||
69 | layout.c:309:18: for (i = 0; i < parent->children->length; ++i) { | ||
70 | layout.c:310:20: swayc_t *child = parent->children->items[i]; | ||
71 | layout.c:327:7: if (parent->type == C_OUTPUT) { | ||
72 | layout.c:338:8: if (parent->layout == L_HORIZ || parent->type == C_ROOT) { | ||
73 | layout.c:343:8: if (parent->layout == L_VERT) { | ||
74 | layout.c:350:20: for (i = 0; i < parent->children->length; ++i) { | ||
75 | layout.c:351:22: swayc_t *child = parent->children->items[i]; | ||
76 | layout.c:357:34: if (desired < 0 || desired >= parent->children->length) { | ||
77 | layout.c:360:12: return parent->children->items[desired]; | ||
78 | layout.c:365:13: parent = parent->parent; | ||
79 | |||
80 | commands.c:394:9: while (parent->type == C_VIEW) { | ||
81 | commands.c:395:12: parent = parent->parent; | ||
82 | commands.c:399:3: parent->layout = L_HORIZ; | ||
83 | commands.c:401:3: parent->layout = L_VERT; | ||
84 | commands.c:403:7: if (parent->layout == L_VERT) { | ||
85 | commands.c:404:4: parent->layout = L_HORIZ; | ||
86 | commands.c:406:4: parent->layout = L_VERT; | ||
87 | commands.c:409:26: arrange_windows(parent, parent->width, parent->height); | ||
88 | commands.c:454:10: while (parent->parent) { | ||
89 | commands.c:455:8: if (parent->parent->layout == L_HORIZ) { | ||
90 | commands.c:456:21: for (i = 0; i < parent->parent->children->length; i++) { | ||
91 | commands.c:457:16: sibling = parent->parent->children->items[i]; | ||
92 | commands.c:459:24: if (sibling->x < parent->x) { | ||
93 | commands.c:461:31: } else if (sibling->x > parent->x) { | ||
94 | commands.c:470:13: parent = parent->parent; | ||
95 | commands.c:475:87: sway_log(L_DEBUG, "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, lnumber, rnumber); | ||
96 | commands.c:477:19: for (i = 0; i < parent->parent->children->length; i++) { | ||
97 | commands.c:478:14: sibling = parent->parent->children->items[i]; | ||
98 | commands.c:480:22: if (sibling->x < parent->x) { | ||
99 | commands.c:488:29: } else if (sibling->x > parent->x) { | ||
100 | commands.c:517:10: while (parent->parent) { | ||
101 | commands.c:518:8: if (parent->parent->layout == L_VERT) { | ||
102 | commands.c:519:21: for (i = 0; i < parent->parent->children->length; i++) { | ||
103 | commands.c:520:16: sibling = parent->parent->children->items[i]; | ||
104 | commands.c:522:24: if (sibling->y < parent->y) { | ||
105 | commands.c:524:31: } else if (sibling->y > parent->y) { | ||
106 | commands.c:533:13: parent = parent->parent; | ||
107 | commands.c:538:87: sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber); | ||
108 | commands.c:540:19: for (i = 0; i < parent->parent->children->length; i++) { | ||
109 | commands.c:541:14: sibling = parent->parent->children->items[i]; | ||
110 | commands.c:543:22: if (sibling->y < parent->y) { | ||
111 | commands.c:551:29: } else if (sibling->x > parent->x) { | ||
112 | commands.c:603:54: } else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) { | ||
113 | commands.c:606:12: focused->parent->layout = layout; | ||