Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a couple more xcb_flush()'s
[spectrwm.git]
/
spectrwm.c
diff --git
a/spectrwm.c
b/spectrwm.c
index
98fe656
..
292781e
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-1317,15
+1317,15
@@
socket_setnonblock(int fd)
void
bar_print(struct swm_region *r, const char *s)
{
void
bar_print(struct swm_region *r, const char *s)
{
- int x = 0;
size_t len;
xcb_rectangle_t rect;
uint32_t gcv[1];
size_t len;
xcb_rectangle_t rect;
uint32_t gcv[1];
- XRectangle ibox, lbox;
len = strlen(s);
/* FIXME fix bar font position calculations */
#if 0
len = strlen(s);
/* FIXME fix bar font position calculations */
#if 0
+ int x = 0;
+ XRectangle ibox, lbox;
XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
switch (bar_justify) {
XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
switch (bar_justify) {
@@
-1544,7
+1544,7
@@
void
bar_replace_pad(char *tmp, int *limit, size_t sz)
{
/* special case; no limit given, pad one space, instead */
bar_replace_pad(char *tmp, int *limit, size_t sz)
{
/* special case; no limit given, pad one space, instead */
- if (*limit == sz - 1)
+ if (*limit == (int)sz - 1)
*limit = 1;
snprintf(tmp, sz, "%*s", *limit, " ");
}
*limit = 1;
snprintf(tmp, sz, "%*s", *limit, " ");
}
@@
-1567,7
+1567,7
@@
bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep,
size = 0;
if (sscanf(fmt, "%d%n", &limit, &size) != 1)
limit = sizeof tmp - 1;
size = 0;
if (sscanf(fmt, "%d%n", &limit, &size) != 1)
limit = sizeof tmp - 1;
- if (limit <= 0 || limit >= sizeof tmp)
+ if (limit <= 0 || limit >= (int)sizeof tmp)
limit = sizeof tmp - 1;
/* there is nothing to replace (ie EOL) */
limit = sizeof tmp - 1;
/* there is nothing to replace (ie EOL) */
@@
-1623,7
+1623,7
@@
bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep,
len = strlen(tmp);
ptr = tmp;
len = strlen(tmp);
ptr = tmp;
- if (len < limit)
+ if ((int)len < limit)
limit = len;
while (limit-- > 0) {
if (*offrep >= sz - 1)
limit = len;
while (limit-- > 0) {
if (*offrep >= sz - 1)
@@
-7286,6
+7286,7
@@
screenchange(xcb_randr_screen_change_notify_event_t *e)
else
xcb_randr_set_screen_size(conn, e->root, e->width,
e->height, e->mwidth, e->mheight);
else
xcb_randr_set_screen_size(conn, e->root, e->width,
e->height, e->mwidth, e->mheight);
+ xcb_flush(conn);
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
/* silly event doesn't include the screen index */
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
/* silly event doesn't include the screen index */
@@
-7777,6
+7778,7
@@
done:
XFreeFontSet(display, bar_fs);
#endif
xcb_key_symbols_free(syms);
XFreeFontSet(display, bar_fs);
#endif
xcb_key_symbols_free(syms);
+ xcb_flush(conn);
xcb_disconnect(conn);
return (0);
xcb_disconnect(conn);
return (0);