diff options
author | taiyu <taiyu.len@gmail.com> | 2015-08-19 01:06:15 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-08-19 01:06:15 -0700 |
commit | c5a69828934bf07db9062bd5f24bb2ff94b45b4a (patch) | |
tree | 5d580fed19fa2aa25014fe234edc6db14cfaa652 /sway/workspace.c | |
parent | fixed focus key handler (diff) | |
download | sway-c5a69828934bf07db9062bd5f24bb2ff94b45b4a.tar.gz sway-c5a69828934bf07db9062bd5f24bb2ff94b45b4a.tar.zst sway-c5a69828934bf07db9062bd5f24bb2ff94b45b4a.zip |
fixed some more bugs, moved layout_log into log.ch, restored focus_parent
Diffstat (limited to 'sway/workspace.c')
-rw-r--r-- | sway/workspace.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/sway/workspace.c b/sway/workspace.c index 60108752..9b407c6a 100644 --- a/sway/workspace.c +++ b/sway/workspace.c | |||
@@ -182,60 +182,3 @@ void workspace_switch(swayc_t *workspace) { | |||
182 | set_focused_container(get_focused_view(workspace)); | 182 | set_focused_container(get_focused_view(workspace)); |
183 | arrange_windows(workspace, -1, -1); | 183 | arrange_windows(workspace, -1, -1); |
184 | } | 184 | } |
185 | |||
186 | /* XXX:DEBUG:XXX */ | ||
187 | static void container_log(const swayc_t *c) { | ||
188 | fprintf(stderr, "focus:%c|", | ||
189 | c->is_focused ? 'F' : //Focused | ||
190 | c == active_workspace ? 'W' : //active workspace | ||
191 | c == &root_container ? 'R' : //root | ||
192 | 'X');//not any others | ||
193 | fprintf(stderr,"(%p)",c); | ||
194 | fprintf(stderr,"(p:%p)",c->parent); | ||
195 | fprintf(stderr,"(f:%p)",c->focused); | ||
196 | fprintf(stderr,"(h:%ld)",c->handle); | ||
197 | fprintf(stderr,"Type:"); | ||
198 | fprintf(stderr, | ||
199 | c->type == C_ROOT ? "Root|" : | ||
200 | c->type == C_OUTPUT ? "Output|" : | ||
201 | c->type == C_WORKSPACE ? "Workspace|" : | ||
202 | c->type == C_CONTAINER ? "Container|" : | ||
203 | c->type == C_VIEW ? "View|" : "Unknown|"); | ||
204 | fprintf(stderr,"layout:"); | ||
205 | fprintf(stderr, | ||
206 | c->layout == L_NONE ? "NONE|" : | ||
207 | c->layout == L_HORIZ ? "Horiz|": | ||
208 | c->layout == L_VERT ? "Vert|": | ||
209 | c->layout == L_STACKED ? "Stacked|": | ||
210 | c->layout == L_FLOATING ? "Floating|": | ||
211 | "Unknown|"); | ||
212 | fprintf(stderr, "w:%d|h:%d|", c->width, c->height); | ||
213 | fprintf(stderr, "x:%d|y:%d|", c->x, c->y); | ||
214 | fprintf(stderr, "vis:%c|", c->visible?'t':'f'); | ||
215 | fprintf(stderr, "wgt:%d|", c->weight); | ||
216 | fprintf(stderr, "name:%.16s|", c->name); | ||
217 | fprintf(stderr, "children:%d\n",c->children?c->children->length:0); | ||
218 | } | ||
219 | void layout_log(const swayc_t *c, int depth) { | ||
220 | int i, d; | ||
221 | int e = c->children ? c->children->length : 0; | ||
222 | container_log(c); | ||
223 | if (e) { | ||
224 | for (i = 0; i < e; ++i) { | ||
225 | fputc('|',stderr); | ||
226 | for (d = 0; d < depth; ++d) fputc('-', stderr); | ||
227 | layout_log(c->children->items[i], depth + 1); | ||
228 | } | ||
229 | } | ||
230 | if (c->type == C_WORKSPACE) { | ||
231 | e = c->floating?c->floating->length:0; | ||
232 | if (e) { | ||
233 | for (i = 0; i < e; ++i) { | ||
234 | fputc('|',stderr); | ||
235 | for (d = 0; d < depth; ++d) fputc('-', stderr); | ||
236 | layout_log(c->floating->items[i], depth + 1); | ||
237 | } | ||
238 | } | ||
239 | } | ||
240 | } | ||
241 | /* XXX:DEBUG:XXX */ | ||