Fix for 64bit archs again.

This commit is contained in:
Kris Maglione 2007-06-26 14:16:22 -04:00
parent 5b3cabdd00
commit 2529508122
4 changed files with 9 additions and 9 deletions

View File

@ -268,7 +268,7 @@ frame_hints(Frame *f, Rectangle r, Align sticky) {
static void static void
set_client_state(Client * c, int state) { set_client_state(Client * c, int state) {
Atom data[] = { state, None }; long data[] = { state, None };
changeprop(&c->w, "WM_STATE", "WM_STATE", data, nelem(data)); changeprop(&c->w, "WM_STATE", "WM_STATE", data, nelem(data));
} }
@ -866,7 +866,7 @@ apply_tags(Client *c, const char *tags) {
cur = nil; cur = nil;
if(!strcmp(buf+n, "~")) if(!strcmp(buf+n, "~"))
c->floating = add; c->floating = add;
else if(!strcmp(buf+n, "!")) else if(!strcmp(buf+n, "!") || strcmp(buf+n, "sel"))
cur = screen->sel->name; cur = screen->sel->name;
else if(!Mbsearch(buf+n, badtags, bsstrcmp)) else if(!Mbsearch(buf+n, badtags, bsstrcmp))
cur = buf+n; cur = buf+n;

View File

@ -113,5 +113,6 @@ XRectangle XRect(Rectangle r);
#define Pt(x, y) ((Point){(x), (y)}) #define Pt(x, y) ((Point){(x), (y)})
#define Rpt(p, q) ((Rectangle){p, q}) #define Rpt(p, q) ((Rectangle){p, q})
#define Rect(x0, y0, x1, y1) ((Rectangle){Pt(x0, y0), Pt(x1, y1)}) #define Rect(x0, y0, x1, y1) ((Rectangle){Pt(x0, y0), Pt(x1, y1)})
#define changeprop(w, prop, type, data, n) changeproperty(w, prop, type, (sizeof(*(data))*8), \ #define changeprop(w, prop, type, data, n) changeproperty(w, prop, type, ((sizeof(*(data)) == 8 ? 4 : sizeof(*(data))) \
(uchar*)(data), n) * 8), \
(uchar*)(data), n)

2
debian/rules vendored
View File

@ -12,7 +12,7 @@ UNPATCH=debian/unpatch.ed
CFLAGS = -g -O0 CFLAGS = -g -O0
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
# wmii is IO, not CPU bound. Please do not use -O2 here. # wmii is IO, not CPU, bound. Please do not use -O2 here.
CFLAGS += -O CFLAGS += -O
endif endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))

View File

@ -209,9 +209,7 @@ fn proglist {
} }
fn getfuns { fn getfuns {
ls -p /env | grep '^fn-' ^ $1 ^ '-' | getlines { ls -p /env | sed -n 's/^fn-' ^ $1 ^ '-//p'
echo ${re s '^fn-[^-]+-' '' $line}
}
} }
fn actionlist { fn actionlist {
@ -254,7 +252,7 @@ progs_file=/tmp/proglist.${pid}
Action rehash & Action rehash &
# Tag Bar Setup # Tag Bar Setup
{ifs:="{echo}; seltag=`{sed 1q /tag/sel/ctl}} seltag=${lines sed 1q /tag/sel/ctl}
comm -13 ${pipe from {read_tags}} ${pipe from {ls -p /lbar/*}} | comm -13 ${pipe from {read_tags}} ${pipe from {ls -p /lbar/*}} |
getlines { rm /lbar/$line } getlines { rm /lbar/$line }
read_tags | getlines { read_tags | getlines {
@ -281,3 +279,4 @@ getlines {
} </dev/null } </dev/null
dprint loop dprint loop
} </event } </event