hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Trivial fixes (clang). 

SVN revision: 45718
This commit is contained in:
Kim Woelders 2010-01-29 19:45:04 +00:00
parent ca2201f7a4
commit a7e538be10
28 changed files with 131 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/aclass.c
View File

@ -303,10 +303,11 @@ AclassConfigLoad(FILE * fs)
key[0] = '\0';
break;
case CONFIG_CLOSE:
ac->tooltipstring =
(aclass_tooltipstring) ? Estrdup((aclass_tooltipstring[0]) ?
aclass_tooltipstring :
"?!?") : NULL;
if (ac)
ac->tooltipstring =
(aclass_tooltipstring) ? Estrdup((aclass_tooltipstring[0]) ?
aclass_tooltipstring :
"?!?") : NULL;
err = 0;
goto done;
@ -609,7 +610,7 @@ ActionEncode(Action * aa, char *buf, int len)
*p++ = '5';
if (p == mod)
*p++ = '-';
*p++ = '\0';
*p = '\0';
switch (aa->event)
{
@ -830,7 +831,7 @@ AclassConfigWrite(const ActionClass * ac, void (*prf) (const char *fmt, ...))
prf("Aclass %s %s\n", ac->name, (ac->global)? "global" : "normal");
if (ac->tooltipstring)
{
len = AclassEncodeTT(ac->tooltipstring, s, sizeof(s));
AclassEncodeTT(ac->tooltipstring, s, sizeof(s));
prf(s);
}
for (i = 0; i < ac->num; i++)
@ -842,7 +843,7 @@ AclassConfigWrite(const ActionClass * ac, void (*prf) (const char *fmt, ...))
prf(s);
if (aa->tooltipstring)
{
len = AclassEncodeTT(aa->tooltipstring, s, sizeof(s));
AclassEncodeTT(aa->tooltipstring, s, sizeof(s));
prf(s);
}
}
@ -854,10 +855,9 @@ static void
_ac_prf(const char *fmt, ...)
{
va_list args;
int len;
va_start(args, fmt);
len = vfprintf(_ac_fs, fmt, args);
vfprintf(_ac_fs, fmt, args);
va_end(args);
}

4
src/alert.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -351,8 +351,6 @@ ShowAlert(const char *title,
}
mh += 10;
w = (wid - ww) / 2;
h = (hih - hh) / 2;
if (str1 && sscanf(str1, "%s", line) > 0)
{
w = 5 + (((ww - 20 - mh) * 0) / 4);

6
src/arrange.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -724,7 +724,6 @@ ArrangeGetRectList(RectBox ** pfixed, int *nfixed, RectBox ** pfloating,
fixed = EMALLOC(RectBox, num);
if (!fixed)
goto done;
rb = fixed;
dsk = (ewin) ? EoGetDesk(ewin) : DesksGetCurrent();
@ -845,14 +844,13 @@ ArrangeGetRectList(RectBox ** pfixed, int *nfixed, RectBox ** pfloating,
void
ArrangeEwinXY(EWin * ewin, int *px, int *py)
{
EWin *const *lst;
int i, num;
RectBox *fixed, *ret, newrect;
fixed = NULL;
ret = NULL;
lst = EwinListGetAll(&num);
EwinListGetAll(&num);
if (num <= 1)
{
ArrangeEwinCenteredXY(ewin, px, py);

43
src/backgrounds.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1083,8 +1083,8 @@ BackgroundsConfigLoad(FILE * fs)
{
case CONFIG_CLOSE:
if (!ignore && !bg && name)
bg = BackgroundCreate(name, color, bg1, i1, i2, i3, i4, i5,
i6, bg2, j1, j2, j3, j4, j5);
BackgroundCreate(name, color, bg1, i1, i2, i3, i4, i5,
i6, bg2, j1, j2, j3, j4, j5);
goto done;
case CONFIG_COLORMOD:
@ -1137,7 +1137,7 @@ BackgroundsConfigLoad(FILE * fs)
r = g = b = 0;
sscanf(s, "%*s %d %d %d", &r, &g, &b);
COLOR32_FROM_RGB(color, r, g, b);
if (ignore)
if (bg && ignore)
bg->bg_solid = color;
break;
@ -1149,7 +1149,7 @@ BackgroundsConfigLoad(FILE * fs)
Efree(bg1);
bg1 = Estrdup(s2);
}
else
else if (bg)
{
Efree(bg->bg.file);
Efree(bg->top.file);
@ -1172,7 +1172,7 @@ BackgroundsConfigLoad(FILE * fs)
Efree(bg2);
bg2 = Estrdup(s2);
}
else
else if (bg)
{
bg->top.file = Estrdup(s2);
bg->top.keep_aspect = j1;
@ -2035,7 +2035,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
table3 = DialogAddItem(table2, DITEM_TABLE);
DialogItemTableSetOptions(table3, 3, 0, 0, 0);
di = DialogAddItem(table3, DITEM_NONE);
DialogAddItem(table3, DITEM_NONE);
di = tmp_w[6] = DialogAddItem(table3, DITEM_SLIDER);
DialogItemSliderSetMinLength(di, 10);
@ -2044,7 +2044,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
DialogItemSliderSetJump(di, 64);
DialogItemSliderSetValPtr(di, &tmp_bg_xjust);
di = DialogAddItem(table3, DITEM_NONE);
DialogAddItem(table3, DITEM_NONE);
di = tmp_w[7] = DialogAddItem(table3, DITEM_SLIDER);
DialogItemSliderSetMinLength(di, 10);
@ -2070,7 +2070,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
DialogItemSliderSetJump(di, 64);
DialogItemSliderSetValPtr(di, &tmp_bg_yperc);
di = DialogAddItem(table3, DITEM_NONE);
DialogAddItem(table3, DITEM_NONE);
di = tmp_w[9] = DialogAddItem(table3, DITEM_SLIDER);
DialogItemSliderSetMinLength(di, 10);
@ -2124,7 +2124,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
for (i = 0; i < 10; i++)
DialogItemSetCallback(tmp_w[i], CB_DesktopMiniDisplayRedraw, 0, area);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
table2 = DialogAddItem(table, DITEM_TABLE);
DialogItemTableSetOptions(table2, 3, 0, 0, 0);
@ -2182,7 +2182,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
DialogItemSliderSetValPtr(di, &tmp_bg_sel_sliderval);
DialogItemSetCallback(bg_sel_slider, CB_BGAreaSlide, 0, NULL);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetText(di, _("Use dithering in Hi-Colour"));
@ -2197,7 +2197,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
_("Enable background transparency compatibility mode"));
DialogItemCheckButtonSetPtr(di, &tmp_root_hint);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
di = label = DialogAddItem(table, DITEM_TEXT);
DialogItemSetAlign(di, 512, 512);
@ -2338,7 +2338,6 @@ BackgroundSet2(const char *name, const char *params)
{
Background *bg;
unsigned int color;
unsigned int i;
int r, g, b;
char bgf[FILEPATH_LEN_MAX], topf[FILEPATH_LEN_MAX];
int tile, keep_aspect, tkeep_aspect;
@ -2350,11 +2349,11 @@ BackgroundSet2(const char *name, const char *params)
bgf[0] = topf[0] = '\0';
r = g = b = 99;
i = sscanf(params,
"%i %i %i %4000s %i %i %i %i %i %i %4000s %i %i %i %i %i",
&r, &g, &b,
bgf, &tile, &keep_aspect, &xjust, &yjust, &xperc, &yperc,
topf, &tkeep_aspect, &txjust, &tyjust, &txperc, &typerc);
sscanf(params,
"%i %i %i %4000s %i %i %i %i %i %i %4000s %i %i %i %i %i",
&r, &g, &b,
bgf, &tile, &keep_aspect, &xjust, &yjust, &xperc, &yperc,
topf, &tkeep_aspect, &txjust, &tyjust, &txperc, &typerc);
COLOR32_FROM_RGB(color, r, g, b);
bg = BackgroundFind(name);
@ -2366,9 +2365,9 @@ BackgroundSet2(const char *name, const char *params)
}
else
{
bg = BackgroundCreate(name, color, bgf, tile, keep_aspect, xjust,
yjust, xperc, yperc, topf, tkeep_aspect,
txjust, tyjust, txperc, typerc);
BackgroundCreate(name, color, bgf, tile, keep_aspect, xjust,
yjust, xperc, yperc, topf, tkeep_aspect,
txjust, tyjust, txperc, typerc);
}
}
@ -2435,7 +2434,7 @@ BackgroundsIpc(const char *params)
}
else
{
bg = BrackgroundCreateFromImage(prm, p, NULL, 0);
BrackgroundCreateFromImage(prm, p, NULL, 0);
}
}
else if (!strncmp(cmd, "set", 2))

6
src/borders.c
View File

@ -178,11 +178,10 @@ static int
BorderWinpartDraw(EWin * ewin, int i)
{
EWinBit *ewb = &ewin->bits[i];
int move = 0, resize = 0, ret = 0;
int resize = 0, ret = 0;
if ((ewb->x != ewb->cx) || (ewb->y != ewb->cy))
{
move = 1;
ewb->cx = ewb->x;
ewb->cy = ewb->y;
ret = 1;
@ -1388,13 +1387,12 @@ BorderGetFallback(void)
* least E won't barf on us then.
*/
Border *b;
ActionClass *ac;
b = BorderFind("__fb_bd");
if (b)
return b;
ac = BorderGetFallbackAclass(); /* Creates the fallback ac */
BorderGetFallbackAclass(); /* Creates the fallback ac */
/* Create fallback border */
b = BorderCreate("__fb_bd");

4
src/buttons.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -214,8 +214,6 @@ ButtonCalc(Button * b)
int w, h, x, y, xo, yo;
EImage *im;
x = 0;
y = 0;
w = 32;
h = 32;
if (b->geom.size_from_image)

6
src/config.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -44,12 +44,12 @@ void
SkipTillEnd(FILE * fs)
{
char s[FILEPATH_LEN_MAX];
int i1, i2, fields;
int i1, i2;
while (GetLine(s, sizeof(s), fs))
{
i1 = i2 = 0;
fields = sscanf(s, "%i %i", &i1, &i2);
sscanf(s, "%i %i", &i1, &i2);
if (i1 == CONFIG_CLOSE)
return;
if (i2 == CONFIG_OPEN)

30
src/container.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -418,11 +418,12 @@ ContainerLayoutImageWin(Container * ct)
item_pad = 2;
}
pad = (ct->ic_box) ? ImageclassGetPadding(ct->ic_box) : NULL;
xo = 0;
yo = 0;
if (ct->ic_box)
if (pad)
{
pad = ImageclassGetPadding(ct->ic_box);
xo += pad->left;
yo += pad->top;
}
@ -484,9 +485,8 @@ ContainerLayoutImageWin(Container * ct)
xo += cto->wo + item_pad;
}
if (ct->ic_box)
if (pad)
{
pad = ImageclassGetPadding(ct->ic_box);
xo += pad->right;
yo += pad->bottom;
}
@ -499,7 +499,7 @@ ContainerLayoutImageWin(Container * ct)
if (ct->orientation)
{
ct->iwin_fixh = ct->iconsize;
if (ct->ic_box)
if (pad)
ct->iwin_fixh += pad->left + pad->right;
if (ct->draw_icon_base)
ct->iwin_fixh += padl + padr;
@ -508,7 +508,7 @@ ContainerLayoutImageWin(Container * ct)
else
{
ct->iwin_fixh = ct->iconsize;
if (ct->ic_box)
if (pad)
ct->iwin_fixh += pad->top + pad->bottom;
if (ct->draw_icon_base)
ct->iwin_fixh += padt + padb;
@ -1573,7 +1573,7 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemSliderSetJump(di, 8);
DialogItemSliderSetValPtr(di, &dd->autoresize_anchor);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
label = di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);
@ -1588,7 +1588,7 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemSliderSetValPtr(di, &dd->iconsize);
DialogItemSetCallback(di, CB_IconSizeSlider, 0, label);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
table2 = DialogAddItem(table, DITEM_TABLE);
DialogItemTableSetOptions(table2, 5, 0, 0, 0);
@ -1609,8 +1609,8 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio, &dd->vert);
di = DialogAddItem(table2, DITEM_NONE);
di = DialogAddItem(table2, DITEM_NONE);
DialogAddItem(table2, DITEM_NONE);
DialogAddItem(table2, DITEM_NONE);
di = DialogAddItem(table2, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);
@ -1628,8 +1628,8 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio, &dd->side);
di = DialogAddItem(table2, DITEM_NONE);
di = DialogAddItem(table2, DITEM_NONE);
DialogAddItem(table2, DITEM_NONE);
DialogAddItem(table2, DITEM_NONE);
di = DialogAddItem(table2, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);
@ -1657,7 +1657,7 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio, &dd->arrows);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
if (ct->type == IB_TYPE_ICONBOX)
{
@ -1700,7 +1700,7 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemSliderSetJump(di, 50);
DialogItemSliderSetValPtr(di, &dd->anim_speed);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);

3
src/cursors.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -398,7 +398,6 @@ CursorsIpc(const char *params)
{
len = 0;
sscanf(p, "%100s %4000s %n", cmd, prm, &len);
p += len;
}
if (!strncmp(cmd, "list", 2))

6
src/desktops.c
View File

@ -2530,7 +2530,7 @@ _DlgFillAreas(Dialog * d, DItem * table, void *data __UNUSED__)
table2 = DialogAddItem(table, DITEM_TABLE);
DialogItemTableSetOptions(table2, 2, 0, 0, 0);
di = DialogAddItem(table2, DITEM_NONE);
DialogAddItem(table2, DITEM_NONE);
di = slider = DialogAddItem(table2, DITEM_SLIDER);
DialogItemSliderSetMinLength(di, 10);
@ -2555,13 +2555,13 @@ _DlgFillAreas(Dialog * d, DItem * table, void *data __UNUSED__)
DialogItemSetCallback(slider, CB_AreaDisplayRedraw, 0, di);
DialogItemSetCallback(slider2, CB_AreaDisplayRedraw, 0, di);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetText(di, _("Wrap virtual desktops around"));
DialogItemCheckButtonSetPtr(di, &dd->area_wraparound);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogAddItem(table, DITEM_SEPARATOR);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetAlign(di, 0, 512);

16
src/dialog.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -670,39 +670,37 @@ DialogAddHeader(Dialog * d __UNUSED__, DItem * parent, const char *img,
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetText(di, txt);
di = DialogAddItem(parent, DITEM_SEPARATOR);
DialogAddItem(parent, DITEM_SEPARATOR);
}
static void
DialogAddFooter(Dialog * d, DItem * parent, int flags, DialogCallbackFunc * cb)
{
DItem *table, *di;
DItem *table;
int n_buttons;
if (!(flags & DLG_NO_SEPARATOR))
di = DialogAddItem(parent, DITEM_SEPARATOR);
DialogAddItem(parent, DITEM_SEPARATOR);
table = DialogAddItem(parent, DITEM_TABLE);
DialogItemSetAlign(table, 512, 0);
DialogItemSetFill(table, 0, 0);
/* FIXME - The "real" dialog buttons are slightly different */
n_buttons = 0;
if (flags & 1)
{
di = DialogItemAddButton(table, _("OK"), cb, 0, 1, DLG_BUTTON_OK);
DialogItemAddButton(table, _("OK"), cb, 0, 1, DLG_BUTTON_OK);
n_buttons++;
}
if (flags & 2)
{
di = DialogItemAddButton(table, _("Apply"), cb, 1, 0, DLG_BUTTON_APPLY);
DialogItemAddButton(table, _("Apply"), cb, 1, 0, DLG_BUTTON_APPLY);
DialogBindKey(d, "Return", cb, 1, NULL);
n_buttons++;
}
if (flags & 4)
{
di =
DialogItemAddButton(table, _("Close"), NULL, 0, 1, DLG_BUTTON_CLOSE);
DialogItemAddButton(table, _("Close"), NULL, 0, 1, DLG_BUTTON_CLOSE);
DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
n_buttons++;
}

2
src/e16-ecore_list.c
View File

@ -520,7 +520,7 @@ _ecore_list_first_remove(Ecore_List * list)
if (list->current == old)
list->current = list->first;
else
(list->index ? list->index-- : 0);
list->index--;
if (list->last == old)
list->last = list->first;

11
src/ewin-ops.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -814,25 +814,16 @@ EwinInstantUnShade(EWin * ewin)
x = EoGetX(ewin);
y = EoGetY(ewin);
w = EoGetW(ewin);
h = EoGetH(ewin);
switch (ewin->border->shadedir)
{
default:
case 0:
w = ewin->client.w + ewin->border->border.left +
ewin->border->border.right;
break;
case 1:
w = ewin->client.w + ewin->border->border.left +
ewin->border->border.right;
x = x + EoGetW(ewin) - w;
break;
case 2:
h = ewin->client.h + ewin->border->border.top +
ewin->border->border.bottom;
break;
case 3:
h = ewin->client.h + ewin->border->border.top +
ewin->border->border.bottom;

5
src/ewmh.c
View File

@ -863,12 +863,13 @@ int
EWMH_ProcessClientClientMessage(EWin * ewin, XClientMessageEvent * ev)
{
int source;
Time ts;
/* Time ts; */
if (ev->message_type == ECORE_X_ATOM_NET_ACTIVE_WINDOW)
{
source = OPSRC(ev->data.l[0]);
ts = ev->data.l[1];
/* ts = ev->data.l[1]; */
/* cwin = ev->data.l[2]; */
EwinOpActivate(ewin, source, 1);
return 1;

4
src/file.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2007 Kim Woelders
* Copyright (C) 2007-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -49,7 +49,7 @@ E_ls(const char *dir, int *num)
return NULL;
}
/* count # of entries in dir (worst case) */
for (dirlen = 0; (dp = readdir(dirp)) != NULL; dirlen++)
for (dirlen = 0; readdir(dirp); dirlen++)
;
if (!dirlen)
{

5
src/fonts.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -89,7 +89,6 @@ static int
_FontConfigLoad(FILE * fs)
{
int err = 0;
FontAlias *fa;
char s[FILEPATH_LEN_MAX];
char s1[128], *p2;
int i2;
@ -106,7 +105,7 @@ _FontConfigLoad(FILE * fs)
continue;
if (strncmp(s, "font-", 5))
continue;
fa = FontAliasCreate(s1, p2);
FontAliasCreate(s1, p2);
}
return err;

5
src/groups.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1030,7 +1030,6 @@ GroupsConfigure(const char *params)
l = 0;
s[0] = '\0';
sscanf(p, "%100s %n", s, &l);
p += l;
ewin = GetContextEwin();
@ -1104,7 +1103,7 @@ IPC_GroupInfo(const char *params)
static void
IPC_GroupOps(const char *params)
{
Group *group = Mode_groups.current;
Group *group;
char windowid[128];
char operation[128];
char groupid[128];

2
src/icons.c
View File

@ -36,7 +36,7 @@ NetwmIconFindBestSize(unsigned int *val, unsigned int len, int size)
int k = -1;
sz = (unsigned int)size;
sj = sbest = 0;
sbest = 0;
for (i = 0; i < len;)
{
j = i;

3
src/ipc.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1045,7 +1045,6 @@ IPC_Debug(const char *params)
{
l = 0;
sscanf(p, "%1000s %n", param, &l);
p += l;
if (!strncmp(param, "on", 2))
{
XSynchronize(disp, True);

8
src/menus-misc.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -502,8 +502,10 @@ MenuCreateFromBorders(const char *name, MenuStyle * ms)
MenuSetTitle(m, _("Border"));
lst = BordersGetList(&num);
if (lst)
Quicksort((void **)lst, 0, num - 1, BorderNameCompare);
if (!lst)
return m;
Quicksort((void **)lst, 0, num - 1, BorderNameCompare);
for (i = 0; i < num; i++)
{
/* if its not internal (ie doesnt start with _ ) */

12
src/menus.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1837,7 +1837,15 @@ MenuStyleConfigLoad(FILE * fs)
goto done;
case CONFIG_CLASSNAME:
ms = MenuStyleCreate(s2);
break;
continue;
}
/* ms needed */
if (!ms)
break;
switch (i1)
{
case CONFIG_TEXT:
ms->tclass = TextclassAlloc(s2, 1);
break;

4
src/mod-trans.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2004-2007 Jaron Omega
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -141,7 +141,7 @@ _DlgFillThemeTrans(Dialog * d, DItem * table, void *data __UNUSED__)
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 7);
di = DialogAddItem(table, DITEM_NONE);
DialogAddItem(table, DITEM_NONE);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetAlign(di, 0, 512);

2
src/piximg.c
View File

@ -368,7 +368,7 @@ PixImgBlend(PixImg * s1, PixImg * s2, PixImg * dst, Drawable draw, GC gc,
pptr3 = (unsigned short *)ptr3;
pp1 = *pptr1;
pp2 = *pptr2;
*pptr3++ =
*pptr3 =
((pp1 >> 1) &
((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)))
+

6
src/settings.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -145,7 +145,7 @@ _DlgFillMoveResize(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
DialogItemRadioButtonGroupSetVal(di, 5);
DialogItemRadioButtonGroupSetValPtr(radio1, &dd->move);
di = DialogAddItem(table, DITEM_NONE);
DialogAddItem(table, DITEM_NONE);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetColSpan(di, 2);
@ -395,7 +395,7 @@ _DlgFillPlacement(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
DialogItemRadioButtonGroupSetVal(di, 4);
DialogItemRadioButtonGroupSetValPtr(radio, &dd->slide_mode);
di = DialogAddItem(table, DITEM_NONE);
DialogAddItem(table, DITEM_NONE);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);

3
src/snaps.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -783,7 +783,6 @@ _DlgFillSnap(Dialog * d, DItem * table, void *data)
int i = 0, slice, last;
s[0] = 0;
slice = 64;
while ((i <= (int)strlen(ewin->icccm.wm_command))
&& (i < (int)(sizeof(s) / 4)))
{

5
src/sound.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -335,7 +335,6 @@ static int
_SoundConfigParse(FILE * fs)
{
int err = 0;
SoundClass *sc;
char s[FILEPATH_LEN_MAX];
char s1[FILEPATH_LEN_MAX];
char s2[FILEPATH_LEN_MAX];
@ -355,7 +354,7 @@ _SoundConfigParse(FILE * fs)
Eprintf("*** Ignoring line: %s\n", s);
continue;
}
sc = SclassCreate(s1, s2);
SclassCreate(s1, s2);
}
#if 0 /* Errors here are just ignored */
if (err)

3
src/text.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -886,7 +886,6 @@ TextstateTextDraw(TextState * ts, Win win, Drawable draw, const char *text,
textwidth_limit, textheight_limit, text);
#endif
xx = x;
yy = y;
if (ts->ops->FdcInit(ts, win, draw))

70
src/tooltips.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -327,29 +327,24 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
switch (ActionGetButton(aa))
{
case 1:
ic = TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_1",
"pix/mouse_1.png", &cols[1],
&temp_h);
TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_1",
"pix/mouse_1.png", &cols[1], &temp_h);
break;
case 2:
ic = TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_2",
"pix/mouse_2.png", &cols[1],
&temp_h);
TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_2",
"pix/mouse_2.png", &cols[1], &temp_h);
break;
case 3:
ic = TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_3",
"pix/mouse_3.png", &cols[1],
&temp_h);
TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_3",
"pix/mouse_3.png", &cols[1], &temp_h);
break;
case 4:
ic = TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_4",
"pix/mouse_4.png", &cols[1],
&temp_h);
TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_4",
"pix/mouse_4.png", &cols[1], &temp_h);
break;
case 5:
ic = TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_5",
"pix/mouse_5.png", &cols[1],
&temp_h);
TooltipCreateIclass("TOOLTIP_MOUSEBUTTON_5",
"pix/mouse_5.png", &cols[1], &temp_h);
break;
case 0:
default:
@ -360,37 +355,30 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
if (modifiers)
{
if (modifiers & ShiftMask)
ic = TooltipCreateIclass("TOOLTIP_KEY_SHIFT",
"pix/key_shift.png",
&cols[2], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_SHIFT",
"pix/key_shift.png",
&cols[2], &temp_h);
if (modifiers & LockMask)
ic = TooltipCreateIclass("TOOLTIP_KEY_LOCK",
"pix/key_lock.png",
&cols[3], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_LOCK",
"pix/key_lock.png", &cols[3], &temp_h);
if (modifiers & ControlMask)
ic = TooltipCreateIclass("TOOLTIP_KEY_CTRL",
"pix/key_ctrl.png",
&cols[4], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_CTRL",
"pix/key_ctrl.png", &cols[4], &temp_h);
if (modifiers & Mod1Mask)
ic = TooltipCreateIclass("TOOLTIP_KEY_MOD1",
"pix/key_mod1.png",
&cols[5], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_MOD1",
"pix/key_mod1.png", &cols[5], &temp_h);
if (modifiers & Mod2Mask)
ic = TooltipCreateIclass("TOOLTIP_KEY_MOD2",
"pix/key_mod2.png",
&cols[6], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_MOD2",
"pix/key_mod2.png", &cols[6], &temp_h);
if (modifiers & Mod3Mask)
ic = TooltipCreateIclass("TOOLTIP_KEY_MOD3",
"pix/key_mod3.png",
&cols[7], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_MOD3",
"pix/key_mod3.png", &cols[7], &temp_h);
if (modifiers & Mod4Mask)
ic = TooltipCreateIclass("TOOLTIP_KEY_MOD4",
"pix/key_mod4.png",
&cols[8], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_MOD4",
"pix/key_mod4.png", &cols[8], &temp_h);
if (modifiers & Mod5Mask)
ic = TooltipCreateIclass("TOOLTIP_KEY_MOD5",
"pix/key_mod5.png",
&cols[9], &temp_h);
TooltipCreateIclass("TOOLTIP_KEY_MOD5",
"pix/key_mod5.png", &cols[9], &temp_h);
}
temp_w = cols[0] + cols[1] + cols[2] + cols[3] + cols[4] +
@ -417,8 +405,6 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
if (tt->tooltippic)
{
im = ImageclassGetImage(tt->tooltippic, 0, 0, 0);
ix = 0;
iy = 0;
if (im)
{
EImageGetSize(im, &iw, &ih);