Codebase list i3-gaps / 19a598a
Merge remote-tracking branch 'vanilla/next' into gaps-next Ingo Bürk 4 years ago
5 changed file(s) with 52 addition(s) and 18 deletion(s). Raw diff Collapse all Expand all
+4
-15
i3bar/src/xcb.c less more
682682 } else {
683683 cont_child();
684684 }
685 }
686
687 static int strcasecmp_nullable(const char *a, const char *b) {
688 if (a == b) {
689 return 0;
690 }
691 if (a == NULL) {
692 return -1;
693 }
694 if (b == NULL) {
695 return 1;
696 }
697 return strcasecmp(a, b);
698685 }
699686
700687 /*
18231810 bar_height);
18241811
18251812 /* Set the WM_CLASS and WM_NAME (we don't need UTF-8) atoms */
1813 char *class;
1814 int len = sasprintf(&class, "%s%ci3bar%c", config.bar_id, 0, 0);
18261815 xcb_void_cookie_t class_cookie;
18271816 class_cookie = xcb_change_property(xcb_connection,
18281817 XCB_PROP_MODE_REPLACE,
18301819 XCB_ATOM_WM_CLASS,
18311820 XCB_ATOM_STRING,
18321821 8,
1833 (strlen("i3bar") + 1) * 2,
1834 "i3bar\0i3bar\0");
1822 len,
1823 class);
18351824
18361825 char *name;
18371826 sasprintf(&name, "i3bar for output %s", walk->name);
+6
-0
include/libi3.h less more
181181 ssize_t swrite(int fd, const void *buf, size_t count);
182182
183183 /**
184 * Like strcasecmp but considers the case where either string is NULL.
185 *
186 */
187 int strcasecmp_nullable(const char *a, const char *b);
188
189 /**
184190 * Build an i3String from an UTF-8 encoded string.
185191 * Returns the newly-allocated i3String.
186192 *
+17
-0
libi3/safewrappers.c less more
109109 else
110110 return n;
111111 }
112
113 /*
114 * Like strcasecmp but considers the case where either string is NULL.
115 *
116 */
117 int strcasecmp_nullable(const char *a, const char *b) {
118 if (a == b) {
119 return 0;
120 }
121 if (a == NULL) {
122 return -1;
123 }
124 if (b == NULL) {
125 return 1;
126 }
127 return strcasecmp(a, b);
128 }
+24
-0
src/con.c less more
127127 else
128128 TAILQ_INSERT_TAIL(nodes_head, con, nodes);
129129 }
130 }
131 goto add_to_focus_head;
132 }
133
134 if (parent->type == CT_DOCKAREA) {
135 /* Insert dock client, sorting alphanumerically by class and then
136 * instance name. This makes dock client order deterministic. As a side
137 * effect, bars without a custom bar id will be sorted according to
138 * their declaration order in the config file. See #3491. */
139 current = NULL;
140 TAILQ_FOREACH (loop, nodes_head, nodes) {
141 int result = strcasecmp_nullable(con->window->class_class, loop->window->class_class);
142 if (result == 0) {
143 result = strcasecmp_nullable(con->window->class_instance, loop->window->class_instance);
144 }
145 if (result < 0) {
146 current = loop;
147 break;
148 }
149 }
150 if (current) {
151 TAILQ_INSERT_BEFORE(loop, con, nodes);
152 } else {
153 TAILQ_INSERT_TAIL(nodes_head, con, nodes);
130154 }
131155 goto add_to_focus_head;
132156 }
+1
-3
src/handlers.c less more
11471147
11481148 /* attach the dock to the dock area */
11491149 con_detach(con);
1150 con->parent = dockarea;
1151 TAILQ_INSERT_HEAD(&(dockarea->focus_head), con, focused);
1152 TAILQ_INSERT_HEAD(&(dockarea->nodes_head), con, nodes);
1150 con_attach(con, dockarea, true);
11531151
11541152 tree_render();
11551153