#define DEFAULT_MON_NAME "MONITOR"
-monitor_t *make_monitor(xcb_rectangle_t *rect);
-void update_root(monitor_t *m, xcb_rectangle_t *r);
+monitor_t *make_monitor(xcb_rectangle_t *rect, uint32_t id);
+void update_root(monitor_t *m, xcb_rectangle_t *rect);
void rename_monitor(monitor_t *m, const char *name);
monitor_t *find_monitor(char *name);
-monitor_t *get_monitor_by_id(xcb_randr_output_t id);
+monitor_t *get_monitor_by_randr_id(xcb_randr_output_t id);
void embrace_client(monitor_t *m, client_t *c);
void adapt_geometry(xcb_rectangle_t *rs, xcb_rectangle_t *rd, node_t *n);
void focus_monitor(monitor_t *m);
void add_monitor(monitor_t *m);
void remove_monitor(monitor_t *m);
void merge_monitors(monitor_t *ms, monitor_t *md);
-void swap_monitors(monitor_t *m1, monitor_t *m2);
+bool swap_monitors(monitor_t *m1, monitor_t *m2);
monitor_t *closest_monitor(monitor_t *m, cycle_dir_t dir, monitor_select_t sel);
bool is_inside_monitor(monitor_t *m, xcb_point_t pt);
monitor_t *monitor_from_point(xcb_point_t pt);