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

Fri Mar 24 17:53:46 PST 2000 

(Mandrake)

working on xinerama (copying home)


SVN revision: 2321
This commit is contained in:
Mandrake 2000-03-25 01:57:02 +00:00
parent 3ed53b060f
commit 1f71e1e26e
47 changed files with 2089 additions and 2100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -4384,3 +4384,10 @@ Thu Mar 23 22:10:29 PST 2000
minor update to tell you that xinerama is not active on your box if it isn't minor update to tell you that xinerama is not active on your box if it isn't
turned on but you have xinerama support in your server. turned on but you have xinerama support in your server.
-------------------------------------------------------------------------------
Fri Mar 24 17:53:46 PST 2000
(Mandrake)
working on xinerama (copying home)

1948
src/E.h
View File

File diff suppressed because it is too large Load Diff

111
src/actions.c
View File

@ -664,17 +664,17 @@ runApp(char *exe, char *params)
("There was an error running the program:\n" ("There was an error running the program:\n"
"%s\n" "%s\n"
"This program could not be executed.\n" "This program could not be executed.\n"
"This is because the file does not exist.\n"), "This is because the file does not exist.\n"),
(char *)exe); (char *)exe);
/* relative path */ /* relative path */
else else
DialogAlertOK(_ DialogAlertOK(_
("There was an error running the program:\n" ("There was an error running the program:\n"
"%s\n" "%s\n"
"This program could not be executed.\n" "This program could not be executed.\n"
"This is most probably because this program " "This is most probably because this program "
"is not in the\n" "is not in the\n"
"path for your shell which is %s. I suggest " "path for your shell which is %s. I suggest "
"you read " "the manual\n" "you read " "the manual\n"
"page for that shell and read up how to " "page for that shell and read up how to "
"change or add " "to your\n" "change or add " "to your\n"
@ -689,26 +689,26 @@ runApp(char *exe, char *params)
/* can execute it */ /* can execute it */
if (canexec((char *)path)) if (canexec((char *)path))
DialogAlertOK(_ DialogAlertOK(_
("There was an error running the program:\n" ("There was an error running the program:\n"
"%s\n" "%s\n"
"This program could not be executed.\n" "This program could not be executed.\n"
"I am unsure as to why you could not " "I am unsure as to why you could not "
"do this. " "The file exists,\n" "do this. " "The file exists,\n"
"is a file, and you are allowed to " "is a file, and you are allowed to "
"execute it. I " "suggest you look\n" "execute it. I " "suggest you look\n"
"into this.\n"), (char *)path); "into this.\n"), (char *)path);
/* not executable file */ /* not executable file */
else else
DialogAlertOK(_ DialogAlertOK(_
("There was an error running the program:\n" ("There was an error running the program:\n"
"%s\n" "%s\n"
"This program could not be executed.\n" "This program could not be executed.\n"
"This is because the file exists, is a" "This is because the file exists, is a"
" file, but " "you are unable\n" " file, but " "you are unable\n"
"to execute it because you do not " "to execute it because you do not "
"have execute " "have execute "
"access to this file.\n"), "access to this file.\n"),
(char *)path); (char *)path);
} }
/* it's not a file */ /* it's not a file */
else else
@ -716,19 +716,19 @@ runApp(char *exe, char *params)
/* its a dir */ /* its a dir */
if (isdir((char *)path)) if (isdir((char *)path))
DialogAlertOK(_ DialogAlertOK(_
("There was an error running the program:\n" ("There was an error running the program:\n"
"%s\n" "%s\n"
"This program could not be executed.\n" "This program could not be executed.\n"
"This is because the file is in fact " "This is because the file is in fact "
"a directory.\n"), (char *)path); "a directory.\n"), (char *)path);
/* its not a file or a dir */ /* its not a file or a dir */
else else
DialogAlertOK(_ DialogAlertOK(_
("There was an error running the program:\n" ("There was an error running the program:\n"
"%s\n" "%s\n"
"This program could not be executed.\n" "This program could not be executed.\n"
"This is because the file is not a " "This is because the file is not a "
"regular file.\n"), (char *)path); "regular file.\n"), (char *)path);
} }
if (path) if (path)
Efree(path); Efree(path);
@ -1181,11 +1181,11 @@ doMoveEnd(void *params)
if (gwins[i]->floating) if (gwins[i]->floating)
MoveEwinToDesktopAt(gwins[i], d, MoveEwinToDesktopAt(gwins[i], d,
gwins[i]->x - (desks.desk[d].x - gwins[i]->x - (desks.desk[d].x -
desks. desks.desk[gwins[i]->
desk[gwins[i]->desktop].x), desktop].x),
gwins[i]->y - (desks.desk[d].y - gwins[i]->y - (desks.desk[d].y -
desks. desks.desk[gwins[i]->
desk[gwins[i]->desktop].y)); desktop].y));
else else
MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y); MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y);
gwins[i]->floating = 0; gwins[i]->floating = 0;
@ -1371,11 +1371,11 @@ doCleanup(void *params)
floating[j++].h = ((EWin *) lst[i])->h; floating[j++].h = ((EWin *) lst[i])->h;
} }
else if ( else if (
( (
(((EWin *) lst[i])->desktop == desks.current) || (((EWin *) lst[i])->desktop == desks.current) ||
(((EWin *) lst[i])->sticky)) && (((EWin *) lst[i])->sticky)) &&
(((EWin *) lst[i])->layer != 4) && (((EWin *) lst[i])->layer != 4) &&
(((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu)) (((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu))
{ {
fixed = Erealloc(fixed, sizeof(RectBox) * (k + 1)); fixed = Erealloc(fixed, sizeof(RectBox) * (k + 1));
fixed[k].data = lst[i]; fixed[k].data = lst[i];
@ -2473,7 +2473,7 @@ doHideShowButton(void *params)
if (matchregexp(ss, lst[i]->name)) if (matchregexp(ss, lst[i]->name))
{ {
if ((strcmp(lst[i]->name, if ((strcmp(lst[i]->name,
"_DESKTOP_DESKRAY_DRAG_CONTROL") && "_DESKTOP_DESKRAY_DRAG_CONTROL") &&
(!lst[i]->used))) (!lst[i]->used)))
{ {
if (!(lst[i]->visible)) if (!(lst[i]->visible))
@ -2503,7 +2503,7 @@ doHideShowButton(void *params)
if (!matchregexp(ss, lst[i]->name)) if (!matchregexp(ss, lst[i]->name))
{ {
if ((strcmp(lst[i]->name, if ((strcmp(lst[i]->name,
"_DESKTOP_DESKRAY_DRAG_CONTROL") && "_DESKTOP_DESKRAY_DRAG_CONTROL") &&
(!lst[i]->used))) (!lst[i]->used)))
{ {
if (!(lst[i]->visible)) if (!(lst[i]->visible))
@ -3468,7 +3468,7 @@ doConfigure(void *params)
{ {
ChooseGroupDialog(ewin, ChooseGroupDialog(ewin,
_ _
(" Pick the group the window will belong to: \n"), (" Pick the group the window will belong to: \n"),
GROUP_SELECT_ALL_EXCEPT_EWIN, GROUP_SELECT_ALL_EXCEPT_EWIN,
ACTION_ADD_TO_GROUP); ACTION_ADD_TO_GROUP);
} }
@ -3487,8 +3487,7 @@ struct _keyset
int int
doInsertKeys(void *params) doInsertKeys(void *params)
{ {
const struct _keyset ks[] = const struct _keyset ks[] = {
{
{"a", 0, "a"}, {"a", 0, "a"},
{"b", 0, "b"}, {"b", 0, "b"},
{"c", 0, "c"}, {"c", 0, "c"},
@ -3713,8 +3712,8 @@ doRaiseLower(void *params)
{ {
if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer && if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer &&
(desks.desk[ewin->desktop].list[i] == ewin || (desks.desk[ewin->desktop].list[i] == ewin ||
!FindEwinInList(desks.desk[ewin->desktop].list[i], gwins, !FindEwinInList(desks.desk[ewin->desktop].list[i], gwins,
num))) num)))
{ {
if (desks.desk[ewin->desktop].list[i] != ewin) if (desks.desk[ewin->desktop].list[i] != ewin)
raise = 1; raise = 1;
@ -3820,10 +3819,10 @@ doAddToGroup(void *params)
ChooseGroupDialog(ewin, ChooseGroupDialog(ewin,
_ _
("\n There's no current group at the moment. \n" ("\n There's no current group at the moment. \n"
" The current group is the last one you created, \n" " The current group is the last one you created, \n"
" and it exists until you create a new one or break \n" " and it exists until you create a new one or break \n"
" the latest one. \n\n" " the latest one. \n\n"
" Pick another group that the window will belong to here: \n\n"), " Pick another group that the window will belong to here: \n\n"),
GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP); GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP);
EDBUG_RETURN(0); EDBUG_RETURN(0);
} }
@ -3906,20 +3905,20 @@ doZoom(void *params)
{ {
fprintf(f, fprintf(f,
_ _
("You have been warned about the dangers of Zoom mode\n")); ("You have been warned about the dangers of Zoom mode\n"));
fclose(f); fclose(f);
} }
DIALOG_OK(_("Warning !!!"), DIALOG_OK(_("Warning !!!"),
_ _
("This feature is heavily reliant on a feature of your\n" ("This feature is heavily reliant on a feature of your\n"
"X Server called the Vid Mode Extension. This feature exists\n" "X Server called the Vid Mode Extension. This feature exists\n"
"in XFree86 Servers, but is not a heavily used part of the\n" "in XFree86 Servers, but is not a heavily used part of the\n"
"Server and thus isn't tested much.\n" "\n" "Server and thus isn't tested much.\n" "\n"
"It is possible your X Server does not deal well with being\n" "It is possible your X Server does not deal well with being\n"
"asked to switch modes quickly and it may hang, glitch,\n" "asked to switch modes quickly and it may hang, glitch,\n"
"display artefacts or perhaps simply refuse to work.\n" "\n" "display artefacts or perhaps simply refuse to work.\n" "\n"
"This is a warning and will only be displayed this one time.\n" "This is a warning and will only be displayed this one time.\n"
"If your Server does not behave well then you will probably\n" "If your Server does not behave well then you will probably\n"
"have to avoid using this feature.\n")); "have to avoid using this feature.\n"));
EDBUG_RETURN(0); EDBUG_RETURN(0);
} }

2
src/alert.c
View File

@ -42,7 +42,7 @@ int debug_level;
char *call_stack[1024]; char *call_stack[1024];
void void
Alert(char *fmt,...) Alert(char *fmt, ...)
{ {
char text[10240]; char text[10240];
va_list ap; va_list ap;

34
src/areas.c
View File

@ -191,9 +191,9 @@ SlideWindowsBy(Window * win, int num, int dx, int dy, int speed)
int dsec, dusec; int dsec, dusec;
double tm; double tm;
struct _xy struct _xy
{ {
int x, y; int x, y;
} }
*xy; *xy;
EDBUG(5, "SlideWindowsBy"); EDBUG(5, "SlideWindowsBy");
@ -357,13 +357,13 @@ SetCurrentArea(int ax, int ay)
lst[i]->x - lst[i]->x -
(root.w * (root.w *
(ax - (ax -
desks.desk[desks. desks.desk[desks.current].
current].current_area_x)), current_area_x)),
lst[i]->y - lst[i]->y -
(root.h * (root.h *
(ay - (ay -
desks.desk[desks. desks.desk[desks.current].
current].current_area_y))); current_area_y)));
if (setflip) if (setflip)
mode.flipp = 0; mode.flipp = 0;
lst[i]->area_x = a1; lst[i]->area_x = a1;
@ -394,13 +394,13 @@ SetCurrentArea(int ax, int ay)
x - x -
(root.w * (root.w *
(ax - (ax -
desks.desk[desks.current]. desks.desk[desks.
current_area_x)), current].current_area_x)),
y - y -
(root.h * (root.h *
(ay - (ay -
desks.desk[desks.current]. desks.desk[desks.
current_area_y))); current].current_area_y)));
} }
} }
/* if we're not moving it... move it across */ /* if we're not moving it... move it across */
@ -419,13 +419,13 @@ SetCurrentArea(int ax, int ay)
lst[i]->x - lst[i]->x -
(root.w * (root.w *
(ax - (ax -
desks.desk[desks. desks.desk[desks.current].
current].current_area_x)), current_area_x)),
lst[i]->y - lst[i]->y -
(root.h * (root.h *
(ay - (ay -
desks.desk[desks. desks.desk[desks.current].
current].current_area_y))); current_area_y)));
if (setflip) if (setflip)
mode.flipp = 0; mode.flipp = 0;
lst[i]->area_x = a1; lst[i]->area_x = a1;
@ -469,11 +469,11 @@ SetCurrentArea(int ax, int ay)
if (mode.movemode == 5) if (mode.movemode == 5)
DrawEwinShape(lst[i], mode.movemode, DrawEwinShape(lst[i], mode.movemode,
x, y, x, y,
lst[i]->client.w, lst[i]->client.h, lst[i]->client.w, lst[i]->client.h,
4); 4);
else else
DrawEwinShape(lst[i], mode.movemode, x, y, DrawEwinShape(lst[i], mode.movemode, x, y,
lst[i]->client.w, lst[i]->client.h, lst[i]->client.w, lst[i]->client.h,
0); 0);
if (mode.flipp) if (mode.flipp)
{ {

8
src/arrange.c
View File

@ -628,7 +628,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
if (((ewin->desktop == lst[i]->desktop) || if (((ewin->desktop == lst[i]->desktop) ||
(lst[i]->sticky)) && (lst[i]->sticky)) &&
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{ {
if (IN_BELOW if (IN_BELOW
(ewin->x + dx, lst[i]->x + lst[i]->w - 1, (ewin->x + dx, lst[i]->x + lst[i]->w - 1,
@ -661,7 +661,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
if (((ewin->desktop == lst[i]->desktop) || if (((ewin->desktop == lst[i]->desktop) ||
(lst[i]->sticky)) && (lst[i]->sticky)) &&
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{ {
if (IN_ABOVE(ewin->x + ewin->w + dx - 1, lst[i]->x, if (IN_ABOVE(ewin->x + ewin->w + dx - 1, lst[i]->x,
mode.edge_snap_dist) && mode.edge_snap_dist) &&
@ -692,7 +692,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
if (((ewin->desktop == lst[i]->desktop) || if (((ewin->desktop == lst[i]->desktop) ||
(lst[i]->sticky)) && (lst[i]->sticky)) &&
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{ {
if (IN_BELOW if (IN_BELOW
(ewin->y + dy, lst[i]->y + lst[i]->h - 1, (ewin->y + dy, lst[i]->y + lst[i]->h - 1,
@ -725,7 +725,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
if (((ewin->desktop == lst[i]->desktop) || if (((ewin->desktop == lst[i]->desktop) ||
(lst[i]->sticky)) && (lst[i]->sticky)) &&
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{ {
if (IN_ABOVE(ewin->y + ewin->h + dy - 1, lst[i]->y, if (IN_ABOVE(ewin->y + ewin->h + dy - 1, lst[i]->y,
mode.edge_snap_dist) && mode.edge_snap_dist) &&

10
src/arrange.h
View File

@ -29,11 +29,11 @@
#define ARRANGE_BY_POSITION 2 #define ARRANGE_BY_POSITION 2
typedef struct _rectbox typedef struct _rectbox
{ {
void *data; void *data;
int x, y, w, h; int x, y, w, h;
int p; int p;
} }
RectBox; RectBox;
void ArrangeRects(RectBox * fixed, int fixed_count, void ArrangeRects(RectBox * fixed, int fixed_count,

20
src/borders.c
View File

@ -269,7 +269,7 @@ SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty,
int num_wins, int speed) int num_wins, int speed)
{ {
int k, spd, *x = NULL, *y = int k, spd, *x = NULL, *y =
NULL, min, tmpx, tmpy, tmpw, tmph, i; NULL, min, tmpx, tmpy, tmpw, tmph, i;
struct timeval timev1, timev2; struct timeval timev1, timev2;
int dsec, dusec; int dsec, dusec;
double tm; double tm;
@ -476,10 +476,14 @@ AddToFamily(Window win)
} }
/* if it hasnt been planed on a desktop - assing it the current desktop */ /* if it hasnt been planed on a desktop - assing it the current desktop */
if (ewin->desktop < 0) if (ewin->desktop < 0)
ewin->desktop = desks.current; {
/* assign it the desktop it asked for (modulo the number of desks) */ ewin->desktop = desks.current;
}
else else
ewin->desktop = DESKTOPS_WRAP_NUM(ewin->desktop); {
/* assign it the desktop it asked for (modulo the number of desks) */
ewin->desktop = DESKTOPS_WRAP_NUM(ewin->desktop);
}
if ((!ewin->client.transient) && (mode.manual_placement) && if ((!ewin->client.transient) && (mode.manual_placement) &&
(!ewin->client.already_placed) && (!mode.startup) && (!mode.place)) (!ewin->client.already_placed) && (!mode.startup) && (!mode.place))
@ -1063,9 +1067,9 @@ ChangeEwinWinpart(EWin * ewin, int i)
state, ewin->bits[i].expose); state, ewin->bits[i].expose);
if (ewin->border->part[i].flags == FLAG_TITLE) if (ewin->border->part[i].flags == FLAG_TITLE)
TclassApply(ewin->border->part[i].iclass, ewin->bits[i].win, TclassApply(ewin->border->part[i].iclass, ewin->bits[i].win,
ewin->bits[i].w, ewin->bits[i].h, ewin->active, ewin->sticky, ewin->bits[i].w, ewin->bits[i].h, ewin->active,
state, ewin->bits[i].expose, ewin->border->part[i].tclass, ewin->sticky, state, ewin->bits[i].expose,
ewin->client.title); ewin->border->part[i].tclass, ewin->client.title);
if (ewin->bits[i].win) if (ewin->bits[i].win)
ChangeEwinWinpartContents(ewin, i); ChangeEwinWinpartContents(ewin, i);
if (!ewin->shapedone) if (!ewin->shapedone)
@ -2585,7 +2589,7 @@ MinShadeSize(EWin * ewin, int *mw, int *mh)
leftborderwidth = leftborderwidth =
ewin->border->border.left - ewin->bits[i].x; ewin->border->border.left - ewin->bits[i].x;
if ((ewin->bits[i].x + ewin->bits[i].w) - if ((ewin->bits[i].x + ewin->bits[i].w) -
(ewin->w - ewin->border->border.right) > rightborderwidth) (ewin->w - ewin->border->border.right) > rightborderwidth)
rightborderwidth = rightborderwidth =
(ewin->bits[i].x + ewin->bits[i].w) - (ewin->w - (ewin->bits[i].x + ewin->bits[i].w) - (ewin->w -
ewin-> ewin->

16
src/comms.c
View File

@ -383,8 +383,7 @@ void
HandleComms(XEvent * ev) HandleComms(XEvent * ev)
{ {
Client *c; Client *c;
char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1, char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1, *s2;
*s2;
char sunknown[] = "UNKNOWN"; char sunknown[] = "UNKNOWN";
int unknown; int unknown;
@ -1099,7 +1098,8 @@ HandleComms(XEvent * ev)
char *name = NULL, *bgf = NULL, *topf = NULL; char *name = NULL, *bgf = NULL, *topf = NULL;
int updated = 0, tile, keep_aspect, tkeep_aspect; int updated = 0, tile, keep_aspect, tkeep_aspect;
int xjust, yjust, xperc, yperc, txjust, tyjust, txperc, int xjust, yjust, xperc, yperc, txjust, tyjust, txperc,
typerc;
typerc;
sscanf(s, "%1000s %1000s", tmp, w); sscanf(s, "%1000s %1000s", tmp, w);
bg = bg =
@ -1523,9 +1523,9 @@ HandleComms(XEvent * ev)
Button *b; Button *b;
while ( while (
(b = (b =
RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME, RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME,
LIST_TYPE_BUTTON))) LIST_TYPE_BUTTON)))
DestroyButton(b); DestroyButton(b);
InitDesktopControls(); InitDesktopControls();
ShowDesktopControls(); ShowDesktopControls();
@ -1835,7 +1835,7 @@ HandleComms(XEvent * ev)
"MWM_MINIMIZE: %5i\n" "MWM_MINIMIZE: %5i\n"
"MWM_MAXIMIZE: %5i\n" "MWM_MAXIMIZE: %5i\n"
"APP_STATE: %5i\n", ewin->client.win, "APP_STATE: %5i\n", ewin->client.win,
ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none, ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none,
0, 0, 0, 0, ewin->desktop, ewin->num_groups, 0, 0, 0, 0, ewin->desktop, ewin->num_groups,
ewin->docked, ewin->sticky, ewin->visible, ewin->docked, ewin->sticky, ewin->visible,
ewin->iconified, ewin->shaded, ewin->active, ewin->iconified, ewin->shaded, ewin->active,
@ -1929,7 +1929,7 @@ HandleComms(XEvent * ev)
{ {
char buf[FILEPATH_LEN_MAX], *ret = NULL, none[] = char buf[FILEPATH_LEN_MAX], *ret = NULL, none[] =
"-NONE-"; "-NONE-";
EWin **lst; EWin **lst;
int i, num; int i, num;

35
src/config.c
View File

@ -1177,7 +1177,7 @@ BorderPartLoad(FILE * ConfigFile, char type, Border * b)
int flags = FLAG_BUTTON; int flags = FLAG_BUTTON;
char isregion = 0, keepshade = 1; char isregion = 0, keepshade = 1;
int wmin = 0, wmax = 0, hmin = 0, hmax = 0, torigin = 0, int wmin = 0, wmax = 0, hmin = 0, hmax = 0, torigin = 0,
txp = 0, txa = 0, typ = 0, tya = 0, borigin = 0; txp = 0, txa = 0, typ = 0, tya = 0, borigin = 0;
int bxp = 0, bxa = 0, byp = 0, bya = 0; int bxp = 0, bxa = 0, byp = 0, bya = 0;
int fields; int fields;
@ -1447,7 +1447,7 @@ Config_Button(FILE * ConfigFile)
{ {
bt = CreateButton(name, ic, ac, tc, label, ontop, flags, bt = CreateButton(name, ic, ac, tc, label, ontop, flags,
minw, maxw, minh, maxh, xo, yo, xa, xr, ya, minw, maxw, minh, maxh, xo, yo, xa, xr, ya,
yr, xsr, xsa, ysr, ysa, simg, desk, sticky); yr, xsr, xsa, ysr, ysa, simg, desk, sticky);
bt->default_show = show; bt->default_show = show;
bt->internal = internal; bt->internal = internal;
AddItem(bt, bt->name, 0, LIST_TYPE_BUTTON); AddItem(bt, bt->name, 0, LIST_TYPE_BUTTON);
@ -2243,7 +2243,7 @@ Config_ActionClass(FILE * ConfigFile)
{ {
action_tooltipstring = Erealloc(action_tooltipstring, action_tooltipstring = Erealloc(action_tooltipstring,
(strlen(action_tooltipstring) (strlen(action_tooltipstring)
+ strlen(atword(s, 2)) + 2)); + strlen(atword(s, 2)) + 2));
action_tooltipstring = strcat(action_tooltipstring, "\n"); action_tooltipstring = strcat(action_tooltipstring, "\n");
action_tooltipstring = action_tooltipstring =
strcat(action_tooltipstring, atword(s, 2)); strcat(action_tooltipstring, atword(s, 2));
@ -2281,7 +2281,7 @@ Config_ActionClass(FILE * ConfigFile)
RecoverUserConfig(); RecoverUserConfig();
Alert(_ Alert(_
("Warning: Configuration appears to have ended before we were\n" ("Warning: Configuration appears to have ended before we were\n"
"Done loading an Action Class block. Outcome is likely not good.\n")); "Done loading an Action Class block. Outcome is likely not good.\n"));
} }
void void
@ -3143,7 +3143,7 @@ Config_WindowMatch(FILE * ConfigFile)
} }
} }
Alert(_("Warning: Configuration appears to have ended before we were\n" Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an WindowMatch block. Outcome is likely not good.\n")); "Done loading an WindowMatch block. Outcome is likely not good.\n"));
} }
int int
@ -3195,7 +3195,7 @@ OpenConfigFileForReading(char *path, char preprocess)
"Enlightenment is looking for epp here:\n" "Enlightenment is looking for epp here:\n"
"%s\n" "%s\n"
"This is a FATAL ERROR.\n" "This is a FATAL ERROR.\n"
"This is probably due to either the program not existing or\n" "This is probably due to either the program not existing or\n"
"it not being able to be executed by you.\n"), epp_path); "it not being able to be executed by you.\n"), epp_path);
doExit(_("error")); doExit(_("error"));
} }
@ -3423,7 +3423,7 @@ LoadOpenConfigFile(FILE * ConfigFile)
"Enlightenment's\n" "Enlightenment's\n"
"it may be that you haven't upgraded " "it may be that you haven't upgraded "
"Enlightenment for\n" "Enlightenment for\n"
"a while and this theme takes advantages of new\n" "a while and this theme takes advantages of new\n"
"features in Enlightenment in new versions.\n"), "features in Enlightenment in new versions.\n"),
e_cfg_ver, min_e_cfg_ver); e_cfg_ver, min_e_cfg_ver);
RESET_ALERT; RESET_ALERT;
@ -3445,8 +3445,8 @@ LoadOpenConfigFile(FILE * ConfigFile)
"be compatible.\n" "be compatible.\n"
"\n" "\n"
"If you just upgraded to a new version of E\n" "If you just upgraded to a new version of E\n"
"Restarting with Defaults will remove your current\n" "Restarting with Defaults will remove your current\n"
"user preferences and start cleanly with system\n" "user preferences and start cleanly with system\n"
"defaults. You can then modify your " "defaults. You can then modify your "
"configuration to\n" "configuration to\n"
"your liking again safely.\n"), "your liking again safely.\n"),
@ -3689,7 +3689,7 @@ LoadEConfig(char *themelocation)
"permissions or lack of disk space. It also could be that the\n" "permissions or lack of disk space. It also could be that the\n"
"config directory has been inadvertently deleted since\n" "config directory has been inadvertently deleted since\n"
"installation.\n" "installation.\n"
"This is a serious problem and should be rectified immediately\n" "This is a serious problem and should be rectified immediately\n"
"Please contact your system administrator or package " "Please contact your system administrator or package "
"maintainer.\n" "maintainer.\n"
"If you are the administrator of your own system please\n" "If you are the administrator of your own system please\n"
@ -3703,8 +3703,7 @@ LoadEConfig(char *themelocation)
{ {
Progressbar *p = NULL; Progressbar *p = NULL;
int i; int i;
char *config_files[] = char *config_files[] = {
{
"init.cfg", "init.cfg",
"control.cfg", "control.cfg",
"textclasses.cfg", "textclasses.cfg",
@ -4174,12 +4173,12 @@ RecoverUserConfig(void)
_("Yes, Attempt recovery"), _("Yes, Attempt recovery"),
_("Restart and try again"), _("Quit and give up")); _("Restart and try again"), _("Quit and give up"));
Alert(_ Alert(_
("Enlightenment has encountered parsing errors in your autosaved\n" ("Enlightenment has encountered parsing errors in your autosaved\n"
"configuration.\n" "\n" "configuration.\n" "\n"
"This may be due to filing system errors, Minor bugs or" "This may be due to filing system errors, Minor bugs or"
" unforeseen\n" "system shutdowns.\n" "\n" " unforeseen\n" "system shutdowns.\n" "\n"
"Do you wish Enlightenment to recover its original system\n" "Do you wish Enlightenment to recover its original system\n"
"configuration and try again?\n")); "configuration and try again?\n"));
RESET_ALERT; RESET_ALERT;
mode.autosave = 0; mode.autosave = 0;
MapUnmap(1); MapUnmap(1);

10
src/desktops.c
View File

@ -28,10 +28,10 @@ GetUniqueBGString(Background * bg)
char s[256]; char s[256];
const char *chmap = const char *chmap =
#ifndef __EMX__ #ifndef __EMX__
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"; "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
#else #else
"0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_"; "0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_";
/* cyrillic symbols from 866 page correctly handled instead of eng. capitals */ /* cyrillic symbols from 866 page correctly handled instead of eng. capitals */
#endif #endif
@ -1310,17 +1310,17 @@ InitDesktopControls()
else if (desks.dragdir == 2) else if (desks.dragdir == 2)
{ {
b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac, b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac,
NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1,
99999, 0, 0, desks.desk[i].x, 0, 99999, 0, 0, desks.desk[i].x, 0,
desks.desk[i].y, 0, 0, 0, 0, 0, 1, 0, 1); desks.desk[i].y, 0, 0, 0, 0, 0, 1, 0, 1);
} }
else else
{ {
b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac, b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac,
NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1,
99999, 0, 0, desks.desk[i].x, 0, 99999, 0, 0, desks.desk[i].x, 0,
desks.desk[i].y + root.h - desks.desk[i].y + root.h -
desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1); desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1);
} }
AddItem(b, b->name, 2, LIST_TYPE_BUTTON); AddItem(b, b->name, 2, LIST_TYPE_BUTTON);
desks.desk[i].tag = b; desks.desk[i].tag = b;

60
src/dialog.c
View File

@ -280,7 +280,7 @@ DialogQuit(int val, void *data)
} }
void void
DialogAlert(char *fmt,...) DialogAlert(char *fmt, ...)
{ {
char text[10240]; char text[10240];
va_list ap; va_list ap;
@ -293,7 +293,7 @@ DialogAlert(char *fmt,...)
} }
void void
DialogAlertOK(char *fmt,...) DialogAlertOK(char *fmt, ...)
{ {
char text[10240]; char text[10240];
va_list ap; va_list ap;
@ -307,7 +307,7 @@ DialogAlertOK(char *fmt,...)
} }
void void
DialogSetParamText(Dialog * d, char *fmt,...) DialogSetParamText(Dialog * d, char *fmt, ...)
{ {
char text[10240]; char text[10240];
va_list ap; va_list ap;
@ -1081,15 +1081,15 @@ DialogRealizeItem(Dialog * d, DItem * di)
ImlibImage *im; ImlibImage *im;
im = im =
ELoadImage(di->item.slider.ic_border->norm. ELoadImage(di->item.slider.ic_border->norm.normal->
normal->im_file); im_file);
if (im) if (im)
{ {
di->item.slider.border_orig_w = im->rgb_width; di->item.slider.border_orig_w = im->rgb_width;
di->item.slider.border_orig_h = im->rgb_height; di->item.slider.border_orig_h = im->rgb_height;
Imlib_destroy_image(id, im); Imlib_destroy_image(id, im);
di->item.slider.border_win = ECreateWindow(d->win, -20, di->item.slider.border_win = ECreateWindow(d->win, -20,
-20, 2, 2, 0); -20, 2, 2, 0);
EMapWindow(disp, di->item.slider.border_win); EMapWindow(disp, di->item.slider.border_win);
} }
} }
@ -1237,8 +1237,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
if ((cols > 0) && (rows > 0)) if ((cols > 0) && (rows > 0))
{ {
int i, *col_size, *row_size = NULL, r = 0, int i, *col_size, *row_size = NULL, r = 0,
c = c = 0, x = 0, y = 0;
0, x = 0, y = 0;
col_size = Emalloc(sizeof(int) * cols); col_size = Emalloc(sizeof(int) * cols);
row_size = Erealloc(row_size, sizeof(int)); row_size = Erealloc(row_size, sizeof(int));
@ -1354,28 +1353,26 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->w, dii->h); dii->w, dii->h);
if (dii->type == DITEM_CHECKBUTTON) if (dii->type == DITEM_CHECKBUTTON)
EMoveResizeWindow(disp, EMoveResizeWindow(disp,
dii->item.check_button.check_win, dii->item.check_button.check_win,
dii->x, dii->y + dii->x, dii->y +
((dii->h - ((dii->h -
dii->item. dii->item.check_button.
check_button.check_orig_h) / check_orig_h) / 2),
2), dii->item.check_button.
dii->item. check_orig_w,
check_button.check_orig_w, dii->item.check_button.
dii->item. check_orig_h);
check_button.check_orig_h);
if (dii->type == DITEM_RADIOBUTTON) if (dii->type == DITEM_RADIOBUTTON)
EMoveResizeWindow(disp, EMoveResizeWindow(disp,
dii->item.radio_button.radio_win, dii->item.radio_button.radio_win,
dii->x, dii->y + dii->x, dii->y +
((dii->h - ((dii->h -
dii->item. dii->item.radio_button.
radio_button.radio_orig_h) / radio_orig_h) / 2),
2), dii->item.radio_button.
dii->item. radio_orig_w,
radio_button.radio_orig_w, dii->item.radio_button.
dii->item. radio_orig_h);
radio_button.radio_orig_h);
if (dii->type == DITEM_AREA) if (dii->type == DITEM_AREA)
{ {
dii->item.area.w = dii->w - dii->item.area.w = dii->w -
@ -1415,7 +1412,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->item.slider.base_h); dii->item.slider.base_h);
if (dii->item.slider.border_win) if (dii->item.slider.border_win)
EMoveResizeWindow(disp, EMoveResizeWindow(disp,
dii->item.slider.border_win, dii->item.slider.border_win,
dii->x + dii->x +
dii->item.slider.border_x, dii->item.slider.border_x,
dii->y + dii->y +
@ -1429,7 +1426,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->y + dii->y +
dii->item.slider.numeric_y, dii->item.slider.numeric_y,
dii->item.slider.numeric_w, dii->item.slider.numeric_w,
dii->item.slider.numeric_h); dii->item.slider.numeric_h);
} }
} }
x += sw; x += sw;
@ -1641,11 +1638,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h)
if (di->item.check_button.onoff) if (di->item.check_button.onoff)
IclassApply(di->iclass, di->item.check_button.check_win, IclassApply(di->iclass, di->item.check_button.check_win,
di->item.check_button.check_orig_w, di->item.check_button.check_orig_w,
di->item.check_button.check_orig_h, 1, 0, state, 0); di->item.check_button.check_orig_h, 1, 0, state, 0);
else else
IclassApply(di->iclass, di->item.check_button.check_win, IclassApply(di->iclass, di->item.check_button.check_win,
di->item.check_button.check_orig_w, di->item.check_button.check_orig_w,
di->item.check_button.check_orig_h, 0, 0, state, 0); di->item.check_button.check_orig_h, 0, 0, state, 0);
XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False); XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.check_button.text, di->item.check_button.text,
@ -1682,11 +1679,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h)
if (di->item.radio_button.onoff) if (di->item.radio_button.onoff)
IclassApply(di->iclass, di->item.radio_button.radio_win, IclassApply(di->iclass, di->item.radio_button.radio_win,
di->item.radio_button.radio_orig_w, di->item.radio_button.radio_orig_w,
di->item.radio_button.radio_orig_h, 1, 0, state, 0); di->item.radio_button.radio_orig_h, 1, 0, state, 0);
else else
IclassApply(di->iclass, di->item.radio_button.radio_win, IclassApply(di->iclass, di->item.radio_button.radio_win,
di->item.radio_button.radio_orig_w, di->item.radio_button.radio_orig_w,
di->item.radio_button.radio_orig_w, 0, 0, state, 0); di->item.radio_button.radio_orig_w, 0, 0, state, 0);
XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False); XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.radio_button.text, di->item.radio_button.text,
@ -1885,8 +1882,7 @@ DialogItemAreaSetSize(DItem * di, int w, int h)
di->item.area.h = h; di->item.area.h = h;
} }
Window Window DialogItemAreaGetWindow(DItem * di)
DialogItemAreaGetWindow(DItem * di)
{ {
return di->item.area.area_win; return di->item.area.area_win;
} }

12
src/draw.c
View File

@ -98,7 +98,7 @@ HandleDrawQueue()
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
{ {
if ((lst[i]->d == dq->d) && (dq->d->item) && if ((lst[i]->d == dq->d) && (dq->d->item) &&
/*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di)) /*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di))
{ {
if (dq->x < lst[i]->x) if (dq->x < lst[i]->x)
{ {
@ -200,7 +200,7 @@ HandleDrawQueue()
else if (lst[i]->iclass) else if (lst[i]->iclass)
{ {
IclassApply(lst[i]->iclass, lst[i]->win, lst[i]->w, lst[i]->h, IclassApply(lst[i]->iclass, lst[i]->win, lst[i]->w, lst[i]->h,
lst[i]->active, lst[i]->sticky, lst[i]->state, 0); lst[i]->active, lst[i]->sticky, lst[i]->state, 0);
/* printf("I %x\n", lst[i]->win); */ /* printf("I %x\n", lst[i]->win); */
} }
else if (lst[i]->pager) else if (lst[i]->pager)
@ -582,7 +582,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) + 13))) +
(p1 & p2 & (p1 & p2 &
((0x1 << 11) | (0x1 << 5) | (0x1) | ((0x1 << 11) | (0x1 << 5) | (0x1) |
(0x1 << 27) | (0x1 << 21) | (0x1 << 16))); (0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
} }
} }
else else
@ -604,7 +604,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) + 13))) +
(p1 & p2 & (p1 & p2 &
((0x1 << 11) | (0x1 << 5) | (0x1) | ((0x1 << 11) | (0x1 << 5) | (0x1) |
(0x1 << 27) | (0x1 << 21) | (0x1 << 16))); (0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
} }
{ {
unsigned short *pptr1, *pptr2, *pptr3; unsigned short *pptr1, *pptr2, *pptr3;
@ -663,7 +663,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) + 13))) +
(p1 & p2 & (p1 & p2 &
((0x1 << 10) | (0x1 << 5) | (0x1) | ((0x1 << 10) | (0x1 << 5) | (0x1) |
(0x1 << 26) | (0x1 << 20) | (0x1 << 16))); (0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
} }
} }
else else
@ -685,7 +685,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) + 13))) +
(p1 & p2 & (p1 & p2 &
((0x1 << 10) | (0x1 << 5) | (0x1) | ((0x1 << 10) | (0x1 << 5) | (0x1) |
(0x1 << 26) | (0x1 << 20) | (0x1 << 16))); (0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
} }
{ {
unsigned short *pptr1, *pptr2, *pptr3; unsigned short *pptr1, *pptr2, *pptr3;

6
src/events.c
View File

@ -29,8 +29,7 @@
char throw_move_events_away = 0; char throw_move_events_away = 0;
void DeskAccountTimeout(int val, void *data); void DeskAccountTimeout(int val, void *data);
HandleStruct HArray[] = HandleStruct HArray[] = {
{
{DefaultFunc}, {DefaultFunc},
{DefaultFunc}, {DefaultFunc},
{HKeyPress}, {HKeyPress},
@ -347,8 +346,7 @@ WaitEvent()
/* XEvent ev; */ /* XEvent ev; */
fd_set fdset; fd_set fdset;
struct timeval tval; struct timeval tval;
static struct timeval tval_last = static struct timeval tval_last = { 0, 0 };
{0, 0};
double time1, time2; double time1, time2;
Qentry *qe; Qentry *qe;
int count, pcount; int count, pcount;

66
src/evhandlers.c
View File

@ -43,11 +43,11 @@
static ToolTip *ttip = NULL; static ToolTip *ttip = NULL;
struct _mdata struct _mdata
{ {
Menu *m; Menu *m;
MenuItem *mi; MenuItem *mi;
EWin *ewin; EWin *ewin;
}; };
static void ToolTipTimeout(int val, void *data); static void ToolTipTimeout(int val, void *data);
static void SubmenuShowTimeout(int val, void *dat); static void SubmenuShowTimeout(int val, void *dat);
@ -480,7 +480,7 @@ HandleMotion(XEvent * ev)
if ((ndx != dx) && if ((ndx != dx) &&
(((gwins[i]->x == 0) && (((gwins[i]->x == 0) &&
(!(IN_RANGE (!(IN_RANGE
(gwins[i]->reqx, gwins[i]->x, screen_snap_dist)))) (gwins[i]->reqx, gwins[i]->x, screen_snap_dist))))
|| ((gwins[i]->x == (root.w - gwins[i]->w)) || ((gwins[i]->x == (root.w - gwins[i]->w))
&& &&
(!(IN_RANGE (!(IN_RANGE
@ -494,7 +494,8 @@ HandleMotion(XEvent * ev)
(gwins (gwins
[i]->reqx, [i]->reqx,
gwins[i]->x, gwins[i]->x,
mode.edge_snap_dist))))))) mode.
edge_snap_dist)))))))
{ {
jumpx = 1; jumpx = 1;
ndx = gwins[i]->reqx - gwins[i]->x + dx; ndx = gwins[i]->reqx - gwins[i]->x + dx;
@ -503,7 +504,7 @@ HandleMotion(XEvent * ev)
if ((ndy != dy) && if ((ndy != dy) &&
(((gwins[i]->y == 0) && (((gwins[i]->y == 0) &&
(!(IN_RANGE (!(IN_RANGE
(gwins[i]->reqy, gwins[i]->y, screen_snap_dist)))) (gwins[i]->reqy, gwins[i]->y, screen_snap_dist))))
|| ((gwins[i]->y == (root.h - gwins[i]->h)) || ((gwins[i]->y == (root.h - gwins[i]->h))
&& &&
(!(IN_RANGE (!(IN_RANGE
@ -517,7 +518,8 @@ HandleMotion(XEvent * ev)
(gwins (gwins
[i]->reqy, [i]->reqy,
gwins[i]->y, gwins[i]->y,
mode.edge_snap_dist))))))) mode.
edge_snap_dist)))))))
{ {
jumpy = 1; jumpy = 1;
ndy = gwins[i]->reqy - gwins[i]->y + dy; ndy = gwins[i]->reqy - gwins[i]->y + dy;
@ -980,8 +982,8 @@ HandleMotion(XEvent * ev)
{ {
di->item.slider.wanted_val += dy; di->item.slider.wanted_val += dy;
di->item.slider.val = di->item.slider.lower + di->item.slider.val = di->item.slider.lower +
((((di->item. ((((di->
slider.base_h - di->item.slider.knob_h - item.slider.base_h - di->item.slider.knob_h -
di->item.slider.wanted_val) * di->item.slider.wanted_val) *
(di->item.slider.upper - (di->item.slider.upper -
di->item.slider.lower)) / di->item.slider.lower)) /
@ -1641,9 +1643,9 @@ HandleMouseDown(XEvent * ev)
DoIn("TOOLTIP_TIMEOUT", mode.tiptime, ToolTipTimeout, 0, NULL); DoIn("TOOLTIP_TIMEOUT", mode.tiptime, ToolTipTimeout, 0, NULL);
if ( if (
(((float)(ev->xbutton.time - last_time) / 1000) < (((float)(ev->xbutton.time - last_time) / 1000) <
mode_double_click_time) mode_double_click_time)
&& ((int)(ev->xbutton.button) == (int)(last_button))) && ((int)(ev->xbutton.button) == (int)(last_button)))
double_click = 1; double_click = 1;
last_time = ev->xbutton.time; last_time = ev->xbutton.time;
last_button = ev->xbutton.button; last_button = ev->xbutton.button;
@ -1920,8 +1922,7 @@ HandleMouseDown(XEvent * ev)
if ((ewin) && (!ewin->pager)) if ((ewin) && (!ewin->pager))
{ {
Window dw; Window dw;
int wx, wy, ww, wh, ax, ay, cx, cy, int wx, wy, ww, wh, ax, ay, cx, cy, px, py;
px, py;
PagerHideHi(p); PagerHideHi(p);
pwin_px = ewin->x; pwin_px = ewin->x;
@ -2394,15 +2395,15 @@ HandleMouseUp(XEvent * ev)
((ew->desktop == desks.current) || (ew->sticky))) ((ew->desktop == desks.current) || (ew->sticky)))
{ {
if ( if (
(ev->xbutton.x_root >= (ev->xbutton.x_root >=
(ew->x + ew->border->border.left)) (ew->x + ew->border->border.left))
&& (ev->xbutton.x_root < && (ev->xbutton.x_root <
(ew->x + ew->w - ew->border->border.right)) (ew->x + ew->w - ew->border->border.right))
&& (ev->xbutton.y_root >= && (ev->xbutton.y_root >=
(ew->y + ew->border->border.top)) (ew->y + ew->border->border.top))
&& (ev->xbutton.y_root < && (ev->xbutton.y_root <
(ew->y + ew->h - (ew->y + ew->h -
ew->border->border.bottom))) ew->border->border.bottom)))
{ {
ewin = ew; ewin = ew;
i = desks.desk[desks.current].num; i = desks.desk[desks.current].num;
@ -2413,8 +2414,7 @@ HandleMouseUp(XEvent * ev)
if ((ewin) && (ewin->pager)) if ((ewin) && (ewin->pager))
{ {
Pager *pp; Pager *pp;
int w, h, x, y, ax, ay, cx, cy, px, int w, h, x, y, ax, ay, cx, cy, px, py;
py;
int wx, wy, base_x = 0, base_y = 0; int wx, wy, base_x = 0, base_y = 0;
Window dw; Window dw;
@ -2509,13 +2509,13 @@ HandleMouseUp(XEvent * ev)
HideEwin(gwins[i]); HideEwin(gwins[i]);
MoveEwin(gwins[i], gwin_px[i] + MoveEwin(gwins[i], gwin_px[i] +
((desks.desk ((desks.desk
[gwins[i]-> [gwins[i]->desktop].
desktop].current_area_x) - current_area_x) -
p->hi_ewin->area_x) * root.w, p->hi_ewin->area_x) * root.w,
gwin_py[i] + gwin_py[i] +
((desks.desk ((desks.
[gwins[i]-> desk[gwins[i]->desktop].
desktop].current_area_y) - current_area_y) -
p->hi_ewin->area_y) * root.h); p->hi_ewin->area_y) * root.h);
if (was_shaded != gwins[i]->shaded) if (was_shaded != gwins[i]->shaded)
InstantShadeEwin(gwins[i]); InstantShadeEwin(gwins[i]);
@ -2527,7 +2527,7 @@ HandleMouseUp(XEvent * ev)
else else
{ {
int ndesk, nx, ny, base_x = 0, base_y = int ndesk, nx, ny, base_x = 0, base_y =
0, ax, ay; 0, ax, ay;
ndesk = desks.current; ndesk = desks.current;
nx = (int)ev->xbutton.x_root - nx = (int)ev->xbutton.x_root -

3
src/file.c
View File

@ -263,8 +263,7 @@ cp(char *s, char *ss)
EDBUG_RETURN_; EDBUG_RETURN_;
} }
time_t time_t moddate(char *s)
moddate(char *s)
{ {
struct stat st; struct stat st;

8
src/focus.c
View File

@ -74,7 +74,7 @@ GetNextFocusEwin(void)
ewin = lst0[i]; ewin = lst0[i];
if (((ewin->sticky) || (ewin->desktop == desks.current)) && if (((ewin->sticky) || (ewin->desktop == desks.current)) &&
((ewin->area_x == ax) && (ewin->area_y == ay)) && ((ewin->area_x == ax) && (ewin->area_y == ay)) &&
(!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->iconified) (!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->iconified)
&& (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && && (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
* (ewin->client.mwm_decor_border) */ * (ewin->client.mwm_decor_border) */
) )
@ -145,9 +145,9 @@ GetPrevFocusEwin(void)
DetermineEwinArea(ewin); DetermineEwinArea(ewin);
if (((ewin->sticky) || (ewin->desktop == desks.current)) && if (((ewin->sticky) || (ewin->desktop == desks.current)) &&
((ewin->area_x == ax) && (ewin->area_y == ay)) && ((ewin->area_x == ax) && (ewin->area_y == ay)) &&
(!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->shaded) && (!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->shaded) &&
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
* * (ewin->client.mwm_decor_border) */ * * (ewin->client.mwm_decor_border) */
) )
{ {
num++; num++;

91
src/fx.c
View File

@ -27,15 +27,15 @@
#endif #endif
typedef struct _fxhandler typedef struct _fxhandler
{ {
char *name; char *name;
void (*init_func) (char *name); void (*init_func) (char *name);
void (*desk_func) (void); void (*desk_func) (void);
void (*quit_func) (void); void (*quit_func) (void);
void (*pause_func) (void); void (*pause_func) (void);
char in_use; char in_use;
char paused; char paused;
} }
FXHandler; FXHandler;
void FX_Ripple_Init(char *name); void FX_Ripple_Init(char *name);
@ -56,8 +56,7 @@ void FX_ImageSpinner_Quit(void);
void FX_ImageSpinner_Pause(void); void FX_ImageSpinner_Pause(void);
static int num_fx_handlers = 4; static int num_fx_handlers = 4;
static FXHandler fx_handlers[] = static FXHandler fx_handlers[] = {
{
{"ripples", {"ripples",
FX_Ripple_Init, FX_Ripple_Desk, FX_Ripple_Quit, FX_Ripple_Pause, FX_Ripple_Init, FX_Ripple_Desk, FX_Ripple_Quit, FX_Ripple_Pause,
0, 0}, 0, 0},
@ -256,12 +255,12 @@ FX_ripple_timeout(int val, void *data)
_("\n" _("\n"
"You have just started the Ripples Effect.\n" "You have just started the Ripples Effect.\n"
"\n" "\n"
"If you look closely on your desktop background, and if it\n" "If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (i.e. has a background texture or\n" "doesn't have a solid colour (i.e. has a background texture or\n"
"image), you will see a pool of water at the bottom of your\n" "image), you will see a pool of water at the bottom of your\n"
"screen that reflects everything above it and \"ripples\".\n" "screen that reflects everything above it and \"ripples\".\n"
"\n" "\n"
"To disable this effect just select this option again to toggle\n" "To disable this effect just select this option again to toggle\n"
"it off.\n")); "it off.\n"));
before = 1; before = 1;
} }
@ -359,11 +358,11 @@ static PixImg *fx_raindrops_draw = NULL;
void FX_raindrops_timeout(int val, void *data); void FX_raindrops_timeout(int val, void *data);
typedef struct _drop_context typedef struct _drop_context
{ {
int x, y; int x, y;
int count; int count;
PixImg *buf; PixImg *buf;
} }
DropContext; DropContext;
static DropContext fx_raindrops[4]; static DropContext fx_raindrops[4];
@ -387,17 +386,17 @@ FX_raindrops_timeout(int val, void *data)
{ {
DIALOG_OK(_("Unable to display raindrops"), DIALOG_OK(_("Unable to display raindrops"),
_("\n" _("\n"
"Enlightenment is unable to display raindrops on this\n" "Enlightenment is unable to display raindrops on this\n"
"display because Shared memory is not available on this\n" "display because Shared memory is not available on this\n"
"X-Server.\n" "X-Server.\n"
"\n" "\n"
"This may be due to Enlightenment being a remote client\n" "This may be due to Enlightenment being a remote client\n"
"running over the network, a MIT-SHM incapable X-server,\n" "running over the network, a MIT-SHM incapable X-server,\n"
"having run out of SHM ID's on the system or Shared\n" "having run out of SHM ID's on the system or Shared\n"
"Memory support being turned off in Imlib\n" "Memory support being turned off in Imlib\n"
"\n" "\n"
"You may correct this by either running `imlib_config'\n" "You may correct this by either running `imlib_config'\n"
"or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
"and editing it, enabling shared memory.\n" "\n")); "and editing it, enabling shared memory.\n" "\n"));
return; return;
} }
@ -405,16 +404,16 @@ FX_raindrops_timeout(int val, void *data)
{ {
DIALOG_OK(_("Unable to display raindrops"), DIALOG_OK(_("Unable to display raindrops"),
_("\n" _("\n"
"Enlightenment is unable to display raindrops on this\n" "Enlightenment is unable to display raindrops on this\n"
"display because shared pixmaps are not available on this\n" "display because shared pixmaps are not available on this\n"
"X-Server.\n" "X-Server.\n"
"\n" "\n"
"This may be due to either the X-Server not implementing\n" "This may be due to either the X-Server not implementing\n"
"shared pixmaps, or shared pixmaps being disabled in\n" "shared pixmaps, or shared pixmaps being disabled in\n"
"Imlib's configuration.\n" "Imlib's configuration.\n"
"\n" "\n"
"You may correct this by either running `imlib_config'\n" "You may correct this by either running `imlib_config'\n"
"or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
"and editing it, enabling shared pixmaps.\n" "\n")); "and editing it, enabling shared pixmaps.\n" "\n"));
return; return;
} }
@ -423,12 +422,12 @@ FX_raindrops_timeout(int val, void *data)
_("\n" _("\n"
"You have just started the Raindrops Effect.\n" "You have just started the Raindrops Effect.\n"
"\n" "\n"
"If you look closely on your desktop background, and if it\n" "If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (i.e. has a background texture or\n" "doesn't have a solid colour (i.e. has a background texture or\n"
"image), you will see \"raindrops\" hit the background and\n" "image), you will see \"raindrops\" hit the background and\n"
"make little splashes. This Effect can be VERY CPU intensive.\n" "make little splashes. This Effect can be VERY CPU intensive.\n"
"\n" "\n"
"To disable this effect just select this option again to toggle\n" "To disable this effect just select this option again to toggle\n"
"it off.\n")); "it off.\n"));
before = 1; before = 1;
if (first) if (first)
@ -514,7 +513,7 @@ FX_raindrops_timeout(int val, void *data)
fx_raindrops[j].y + fx_raindrop_size)) fx_raindrops[j].y + fx_raindrop_size))
|| ||
((fx_raindrops ((fx_raindrops
[i].x + fx_raindrop_size >= fx_raindrops[j].x) [i].x + fx_raindrop_size >= fx_raindrops[j].x)
&& (fx_raindrops[i].x + fx_raindrop_size < && (fx_raindrops[i].x + fx_raindrop_size <
fx_raindrops[j].x + fx_raindrop_size) fx_raindrops[j].x + fx_raindrop_size)
&& (fx_raindrops[i].y >= fx_raindrops[j].y) && (fx_raindrops[i].y >= fx_raindrops[j].y)
@ -529,7 +528,7 @@ FX_raindrops_timeout(int val, void *data)
fx_raindrops[j].y + fx_raindrop_size)) fx_raindrops[j].y + fx_raindrop_size))
|| ||
((fx_raindrops ((fx_raindrops
[i].x + fx_raindrop_size >= fx_raindrops[j].x) [i].x + fx_raindrop_size >= fx_raindrops[j].x)
&& (fx_raindrops[i].x + fx_raindrop_size < && (fx_raindrops[i].x + fx_raindrop_size <
fx_raindrops[j].x + fx_raindrop_size) fx_raindrops[j].x + fx_raindrop_size)
&& (fx_raindrops[i].y + fx_raindrop_size >= && (fx_raindrops[i].y + fx_raindrop_size >=
@ -718,12 +717,12 @@ FX_Wave_timeout(int val, void *data)
_("\n" _("\n"
"You have just started the Waves Effect.\n" "You have just started the Waves Effect.\n"
"\n" "\n"
"If you look closely on your desktop background, and if it\n" "If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (i.e. has a background texture or\n" "doesn't have a solid colour (i.e. has a background texture or\n"
"image), you will see a pool of water at the bottom of your\n" "image), you will see a pool of water at the bottom of your\n"
"screen that reflects everything above it and \"waves\".\n" "screen that reflects everything above it and \"waves\".\n"
"\n" "\n"
"To disable this effect just select this option again to toggle\n" "To disable this effect just select this option again to toggle\n"
"it off.\n")); "it off.\n"));
before = 1; before = 1;
} }
@ -884,7 +883,7 @@ FX_imagespinner_timeout(int val, void *data)
_("\n" _("\n"
"You have just started the imagespinners Effect.\n" "You have just started the imagespinners Effect.\n"
"\n" "\n"
"To disable this effect just select this option again to toggle\n" "To disable this effect just select this option again to toggle\n"
"it off.\n")); "it off.\n"));
before = 1; before = 1;
} }

15
src/gnome.c
View File

@ -128,12 +128,12 @@
/* Preferences for behavior for app */ /* Preferences for behavior for app */
/* ONLY the client sets this */ /* ONLY the client sets this */
#define WIN_HINTS_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */ #define WIN_HINTS_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */
#define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */ #define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */
#define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */ #define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */
#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */ #define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */
#define WIN_HINTS_FOCUS_ON_CLICK (1<<4) /* app only accepts focus when clicked */ #define WIN_HINTS_FOCUS_ON_CLICK (1<<4) /* app only accepts focus when clicked */
#define WIN_HINTS_DO_NOT_COVER (1<<5) /* attempt to not cover this window */ #define WIN_HINTS_DO_NOT_COVER (1<<5) /* attempt to not cover this window */
#define XA_WIN_HINTS "_WIN_HINTS" #define XA_WIN_HINTS "_WIN_HINTS"
/* WIN_HINTS = CARD32 */ /* WIN_HINTS = CARD32 */
@ -720,8 +720,7 @@ GNOME_SetWMNameVer(void)
void void
GNOME_DelHints(EWin * ewin) GNOME_DelHints(EWin * ewin)
{ {
static Atom atom_get[7] = static Atom atom_get[7] = { 0, 0, 0, 0, 0, 0, 0 };
{0, 0, 0, 0, 0, 0, 0};
EDBUG(6, "GNOME_DelHints"); EDBUG(6, "GNOME_DelHints");
if (!atom_get[0]) if (!atom_get[0])

8
src/groups.c
View File

@ -253,7 +253,7 @@ RemoveEwinFromGroup(EWin * ewin, Group * g)
root.h) root.h)
y = root.h - ewin->border->border.top - 1; y = root.h - ewin->border->border.top - 1;
else if ((ewin->y + ewin->h - else if ((ewin->y + ewin->h -
ewin->border->border.bottom - 1) < 0) ewin->border->border.bottom - 1) < 0)
y = y =
0 - ewin->h + 0 - ewin->h +
ewin->border->border.bottom + 1; ewin->border->border.bottom + 1;
@ -602,9 +602,9 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
{ {
DIALOG_OK(_("Window Group Error"), DIALOG_OK(_("Window Group Error"),
_ _
("\n This window currently does not belong to any groups. \n" ("\n This window currently does not belong to any groups. \n"
" You can only destroy groups or remove windows from groups \n" " You can only destroy groups or remove windows from groups \n"
" through a window that actually belongs to at least one group.\n\n")); " through a window that actually belongs to at least one group.\n\n"));
return; return;
} }
if ((num_groups == 0) && (group_select == GROUP_SELECT_ALL_EXCEPT_EWIN)) if ((num_groups == 0) && (group_select == GROUP_SELECT_ALL_EXCEPT_EWIN))

40
src/handlers.c
View File

@ -59,10 +59,10 @@ HandleSigIll(int num)
DialogAlert(_("Enlightenment performed an Illegal Instruction.\n" DialogAlert(_("Enlightenment performed an Illegal Instruction.\n"
"\n" "\n"
"This most likely is due to you having installed an run a\n" "This most likely is due to you having installed an run a\n"
"binary of Enlightenment that was compiled for a make or model\n" "binary of Enlightenment that was compiled for a make or model\n"
"of CPU not 100%% identical or compatible with yours. Please\n" "of CPU not 100%% identical or compatible with yours. Please\n"
"either obtain the correct package for your system, or\n" "either obtain the correct package for your system, or\n"
"re-compile Enlightenment and possibly any support libraries\n" "re-compile Enlightenment and possibly any support libraries\n"
"that you got in binary format to run Enlightenment.\n")); "that you got in binary format to run Enlightenment.\n"));
doExit("error"); doExit("error");
EDBUG_RETURN_; EDBUG_RETURN_;
@ -86,13 +86,13 @@ HandleSigFpe(int num)
UngrabX(); UngrabX();
DialogAlert(_("Enlightenment caused a Floating Point Exception.\n" DialogAlert(_("Enlightenment caused a Floating Point Exception.\n"
"\n" "\n"
"This means that Enlightenment or support library routines it calls\n" "This means that Enlightenment or support library routines it calls\n"
"have performed an illegal mathematical operation (most likely\n" "have performed an illegal mathematical operation (most likely\n"
"dividing a number by zero). This is most likely a bug. It is\n" "dividing a number by zero). This is most likely a bug. It is\n"
"recommended to restart now. If you wish to help fix this please\n" "recommended to restart now. If you wish to help fix this please\n"
"compile Enlightenment with debugging symbols in and run\n" "compile Enlightenment with debugging symbols in and run\n"
"Enlightenment under gdb so you can backtrace for where it died and\n" "Enlightenment under gdb so you can backtrace for where it died and\n"
"send in a useful bug report with backtrace information and variable\n" "send in a useful bug report with backtrace information and variable\n"
"dumps etc.\n")); "dumps etc.\n"));
doExit("error"); doExit("error");
EDBUG_RETURN_; EDBUG_RETURN_;
@ -111,12 +111,12 @@ HandleSigSegv(int num)
UngrabX(); UngrabX();
DialogAlert(_("Enlightenment caused Segment Violation (Segfault)\n" DialogAlert(_("Enlightenment caused Segment Violation (Segfault)\n"
"\n" "\n"
"This means that Enlightenment or support library routines it calls\n" "This means that Enlightenment or support library routines it calls\n"
"have accessed areas of your system's memory that they are not\n" "have accessed areas of your system's memory that they are not\n"
"allowed access to. This is most likely a bug. It is recommended to\n" "allowed access to. This is most likely a bug. It is recommended to\n"
"restart now. If you wish to help fix this please compile\n" "restart now. If you wish to help fix this please compile\n"
"Enlightenment with debugging symbols in and run Enlightenment\n" "Enlightenment with debugging symbols in and run Enlightenment\n"
"under gdb so you can backtrace for where it died and send in a\n" "under gdb so you can backtrace for where it died and send in a\n"
"useful bug report with backtrace information and variable\n" "useful bug report with backtrace information and variable\n"
"dumps etc.\n")); "dumps etc.\n"));
abort(); abort();
@ -197,7 +197,7 @@ HandleSigBus(int num)
UngrabX(); UngrabX();
DialogAlert(_("Enlightenment caused Bus Error.\n" DialogAlert(_("Enlightenment caused Bus Error.\n"
"\n" "\n"
"It is suggested you check your hardware and OS installation.\n" "It is suggested you check your hardware and OS installation.\n"
"It is highly unusual to cause Bus Errors on operational\n" "It is highly unusual to cause Bus Errors on operational\n"
"hardware.\n")); "hardware.\n"));
EDBUG_RETURN_; EDBUG_RETURN_;
@ -218,11 +218,11 @@ EHandleXError(Display * d, XErrorEvent * ev)
_("OK (edit file)"), "", _("Cancel (do NOT edit)")); _("OK (edit file)"), "", _("Cancel (do NOT edit)"));
Alert(_("Another Window Manager is already running.\n" Alert(_("Another Window Manager is already running.\n"
"\n" "\n"
"You will have to quit your current Window Manager first before\n" "You will have to quit your current Window Manager first before\n"
"you can successfully run Enlightenment.\n" "you can successfully run Enlightenment.\n"
"\n" "\n"
"If you haven't edited your user start-up files, Enlightenment\n" "If you haven't edited your user start-up files, Enlightenment\n"
"can do that now for you, so when you log in again after\n" "can do that now for you, so when you log in again after\n"
"quitting your current window manager, you will have\n" "quitting your current window manager, you will have\n"
"Enlightenment running.\n" "Enlightenment running.\n"
"\n" "\n"
@ -231,13 +231,13 @@ EHandleXError(Display * d, XErrorEvent * ev)
"\n" "\n"
"WARNING WARNING WARNING WARNING!\n" "WARNING WARNING WARNING WARNING!\n"
"\n" "\n"
"It is possible that this MAY not properly edit your files.\n")); "It is possible that this MAY not properly edit your files.\n"));
ASSIGN_ALERT(_("Are you sure?"), ASSIGN_ALERT(_("Are you sure?"),
_("YES (edit file)"), "", _("NO (do not edit)")); _("YES (edit file)"), "", _("NO (do not edit)"));
Alert(_ Alert(_
("Are you absolutely sure you want to have Enlightenment\n" ("Are you absolutely sure you want to have Enlightenment\n"
"edit your start-up files for you?\n" "\n" "edit your start-up files for you?\n" "\n"
"If your start-up files are highly customised this may not\n" "If your start-up files are highly customised this may not\n"
"work.\n" "\n" "Are you ABSOLUTELY sure?\n")); "work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
RESET_ALERT; RESET_ALERT;
AddE(); AddE();

168
src/icccm.c
View File

@ -54,14 +54,20 @@ ICCCM_GetTitle(EWin * ewin, Atom atom_change)
XFreeStringList(list); XFreeStringList(list);
} }
else else
ewin->client.title = duplicate((char *)xtp.value); {
ewin->client.title = duplicate((char *)xtp.value);
}
} }
else else
ewin->client.title = duplicate((char *)xtp.value); {
ewin->client.title = duplicate((char *)xtp.value);
}
XFree(xtp.value); XFree(xtp.value);
} }
else if (!ewin->internal) else if (!ewin->internal)
ewin->client.title = duplicate("No Title"); {
ewin->client.title = duplicate("No Title");
}
EDBUG_RETURN_; EDBUG_RETURN_;
} }
@ -88,12 +94,18 @@ ICCCM_GetColormap(EWin * ewin)
if (XGetWindowAttributes(disp, ewin->client.win, &xwa)) if (XGetWindowAttributes(disp, ewin->client.win, &xwa))
{ {
if (xwa.colormap) if (xwa.colormap)
ewin->client.cmap = xwa.colormap; {
ewin->client.cmap = xwa.colormap;
}
else else
ewin->client.cmap = 0; {
ewin->client.cmap = 0;
}
} }
else else
ewin->client.cmap = 0; {
ewin->client.cmap = 0;
}
EDBUG_RETURN_; EDBUG_RETURN_;
} }
@ -161,7 +173,9 @@ ICCCM_Delete(EWin * ewin)
XSendEvent(disp, ewin->client.win, False, 0, (XEvent *) & ev); XSendEvent(disp, ewin->client.win, False, 0, (XEvent *) & ev);
} }
else else
XKillClient(disp, (XID) ewin->client.win); {
XKillClient(disp, (XID) ewin->client.win);
}
EDBUG_RETURN_; EDBUG_RETURN_;
} }
@ -375,9 +389,13 @@ ICCCM_Adopt(EWin * ewin, Window win)
if (!a) if (!a)
a = XInternAtom(disp, "WM_STATE", False); a = XInternAtom(disp, "WM_STATE", False);
if (ewin->client.start_iconified) if (ewin->client.start_iconified)
c[0] = IconicState; {
c[0] = IconicState;
}
else else
c[0] = NormalState; {
c[0] = NormalState;
}
c[1] = 0; c[1] = 0;
XChangeProperty(disp, win, a, a, 32, PropModeReplace, (unsigned char *)c, 2); XChangeProperty(disp, win, a, a, 32, PropModeReplace, (unsigned char *)c, 2);
ewin->x = ewin->client.x; ewin->x = ewin->client.x;
@ -558,9 +576,13 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change)
if ((hint.flags & USPosition) || ((hint.flags & PPosition))) if ((hint.flags & USPosition) || ((hint.flags & PPosition)))
{ {
if (hint.flags & PWinGravity) if (hint.flags & PWinGravity)
ewin->client.grav = hint.win_gravity; {
ewin->client.grav = hint.win_gravity;
}
else else
ewin->client.grav = NorthWestGravity; {
ewin->client.grav = NorthWestGravity;
}
ewin->client.x = x; ewin->client.x = x;
ewin->client.y = y; ewin->client.y = y;
if ((hint.flags & PPosition) && (!ewin->sticky)) if ((hint.flags & PPosition) && (!ewin->sticky))
@ -573,13 +595,21 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change)
ewin->client.x -= desks.desk[dsk].x; ewin->client.x -= desks.desk[dsk].x;
ewin->client.y -= desks.desk[dsk].y; ewin->client.y -= desks.desk[dsk].y;
if (ewin->client.x + ewin->client.w >= root.w) if (ewin->client.x + ewin->client.w >= root.w)
ewin->client.x += desks.desk[dsk].x; {
ewin->client.x += desks.desk[dsk].x;
}
else if (ewin->client.x < 0) else if (ewin->client.x < 0)
ewin->client.x += desks.desk[dsk].x; {
ewin->client.x += desks.desk[dsk].x;
}
if (ewin->client.y + ewin->client.h >= root.h) if (ewin->client.y + ewin->client.h >= root.h)
ewin->client.y += desks.desk[dsk].y; {
ewin->client.y += desks.desk[dsk].y;
}
else if (ewin->client.y < 0) else if (ewin->client.y < 0)
ewin->client.y += desks.desk[dsk].y; {
ewin->client.y += desks.desk[dsk].y;
}
} }
ewin->client.already_placed = 1; ewin->client.already_placed = 1;
} }
@ -636,14 +666,18 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change)
((double)hint.min_aspect.y); ((double)hint.min_aspect.y);
} }
else else
ewin->client.aspect_min = 0.0; {
ewin->client.aspect_min = 0.0;
}
if ((hint.max_aspect.y > 0.0) && (hint.max_aspect.x > 0.0)) if ((hint.max_aspect.y > 0.0) && (hint.max_aspect.x > 0.0))
{ {
ewin->client.aspect_max = ((double)hint.max_aspect.x) / ewin->client.aspect_max = ((double)hint.max_aspect.x) /
((double)hint.max_aspect.y); ((double)hint.max_aspect.y);
} }
else else
ewin->client.aspect_max = 65535.0; {
ewin->client.aspect_max = 65535.0;
}
} }
else else
{ {
@ -773,7 +807,9 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
ewin->client.command = s; ewin->client.command = s;
} }
else else
ewin->client.command = NULL; {
ewin->client.command = NULL;
}
} }
else if (XGetCommand(disp, ewin->client.group, &cargv, &cargc)) else if (XGetCommand(disp, ewin->client.group, &cargv, &cargc))
{ {
@ -813,14 +849,20 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
ewin->client.command = s; ewin->client.command = s;
} }
else else
ewin->client.command = NULL; {
ewin->client.command = NULL;
}
XFreeStringList(cargv); XFreeStringList(cargv);
} }
else else
ewin->client.command = NULL; {
ewin->client.command = NULL;
}
} }
else else
ewin->client.command = NULL; {
ewin->client.command = NULL;
}
} }
ok = 1; ok = 1;
if (atom_change) if (atom_change)
@ -849,7 +891,9 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
XFree(xtp.value); XFree(xtp.value);
} }
else else
ewin->client.machine = NULL; {
ewin->client.machine = NULL;
}
} }
ok = 1; ok = 1;
if (atom_change) if (atom_change)
@ -868,7 +912,9 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
if (ewin->client.icon_name) if (ewin->client.icon_name)
Efree(ewin->client.icon_name); Efree(ewin->client.icon_name);
if (xtp.encoding == XA_STRING) if (xtp.encoding == XA_STRING)
ewin->client.icon_name = duplicate((char *)xtp.value); {
ewin->client.icon_name = duplicate((char *)xtp.value);
}
else else
{ {
char **cl; char **cl;
@ -891,7 +937,9 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
if (ewin->client.icon_name) if (ewin->client.icon_name)
Efree(ewin->client.icon_name); Efree(ewin->client.icon_name);
if (xtp.encoding == XA_STRING) if (xtp.encoding == XA_STRING)
ewin->client.icon_name = duplicate((char *)xtp.value); {
ewin->client.icon_name = duplicate((char *)xtp.value);
}
else else
{ {
char **cl; char **cl;
@ -910,7 +958,9 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
XFree(xtp.value); XFree(xtp.value);
} }
else else
ewin->client.icon_name = NULL; {
ewin->client.icon_name = NULL;
}
} }
ok = 1; ok = 1;
if (atom_change) if (atom_change)
@ -990,37 +1040,65 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change)
if (hint->flags & InputHint) if (hint->flags & InputHint)
{ {
if (hint->input) if (hint->input)
ewin->client.need_input = 1; {
ewin->client.need_input = 1;
}
else else
ewin->client.need_input = 0; {
ewin->client.need_input = 0;
}
} }
else else
ewin->client.need_input = 1; {
ewin->client.need_input = 1;
}
if (hint->flags & StateHint) if (hint->flags & StateHint)
{ {
if (hint->initial_state == IconicState) if (hint->initial_state == IconicState)
ewin->client.start_iconified = 1; {
ewin->client.start_iconified = 1;
}
else else
ewin->client.start_iconified = 0; {
ewin->client.start_iconified = 0;
}
} }
else else
ewin->client.start_iconified = 0; {
ewin->client.start_iconified = 0;
}
if (hint->flags & IconPixmapHint) if (hint->flags & IconPixmapHint)
ewin->client.icon_pmap = hint->icon_pixmap; {
ewin->client.icon_pmap = hint->icon_pixmap;
}
else else
ewin->client.icon_pmap = 0; {
ewin->client.icon_pmap = 0;
}
if (hint->flags & IconMaskHint) if (hint->flags & IconMaskHint)
ewin->client.icon_mask = hint->icon_mask; {
ewin->client.icon_mask = hint->icon_mask;
}
else else
ewin->client.icon_mask = 0; {
ewin->client.icon_mask = 0;
}
if (hint->flags & IconWindowHint) if (hint->flags & IconWindowHint)
ewin->client.icon_win = hint->icon_window; {
ewin->client.icon_win = hint->icon_window;
}
else else
ewin->client.icon_win = 0; {
ewin->client.icon_win = 0;
}
if (hint->flags & WindowGroupHint) if (hint->flags & WindowGroupHint)
ewin->client.group = hint->window_group; {
ewin->client.group = hint->window_group;
}
else else
ewin->client.group = 0; {
ewin->client.group = 0;
}
XFree(hint); XFree(hint);
} }
ok = 1; ok = 1;
@ -1058,11 +1136,17 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change)
ewin->client.transient_for = w; ewin->client.transient_for = w;
} }
else else
ewin->client.transient = 0; {
ewin->client.transient = 0;
}
if (ewin->client.group == ewin->client.win) if (ewin->client.group == ewin->client.win)
ewin->client.is_group_leader = 1; {
ewin->client.is_group_leader = 1;
}
else else
ewin->client.is_group_leader = 0; {
ewin->client.is_group_leader = 0;
}
ok = 1; ok = 1;
if (atom_change) if (atom_change)
{ {

26
src/iconify.c
View File

@ -32,7 +32,7 @@ IB_Animate(char iconify, EWin * from, EWin * to)
{ {
double t1, t2, t, i, spd, ii; double t1, t2, t, i, spd, ii;
int x, y, x1, y1, x2, y2, x3, y3, x4, y4, w, h, fx, fy, int x, y, x1, y1, x2, y2, x3, y3, x4, y4, w, h, fx, fy,
fw, fh, dx, dy, dw, dh; fw, fh, dx, dy, dw, dh;
GC gc; GC gc;
XGCValues gcv; XGCValues gcv;
@ -2113,9 +2113,9 @@ RedrawIconbox(Iconbox * ib)
EMoveResizeWindow(disp, ib->icon_win, EMoveResizeWindow(disp, ib->icon_win,
0, 0, ib->w - ib->scroll_thickness, ib->h); 0, 0, ib->w - ib->scroll_thickness, ib->h);
if ( if (
(ic = (ic =
FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{ {
EMoveResizeWindow(disp, ib->cover_win, EMoveResizeWindow(disp, ib->cover_win,
0, 0, ib->w - ib->scroll_thickness, ib->h); 0, 0, ib->w - ib->scroll_thickness, ib->h);
@ -2135,9 +2135,9 @@ RedrawIconbox(Iconbox * ib)
ib->scroll_thickness, 0, ib->scroll_thickness, 0,
ib->w - ib->scroll_thickness, ib->h); ib->w - ib->scroll_thickness, ib->h);
if ( if (
(ic = (ic =
FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{ {
EMoveResizeWindow(disp, ib->cover_win, EMoveResizeWindow(disp, ib->cover_win,
ib->scroll_thickness, 0, ib->scroll_thickness, 0,
@ -2245,9 +2245,9 @@ RedrawIconbox(Iconbox * ib)
EMoveResizeWindow(disp, ib->icon_win, EMoveResizeWindow(disp, ib->icon_win,
0, 0, ib->w, ib->h - ib->scroll_thickness); 0, 0, ib->w, ib->h - ib->scroll_thickness);
if ( if (
(ic = (ic =
FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{ {
EMoveResizeWindow(disp, ib->cover_win, EMoveResizeWindow(disp, ib->cover_win,
0, 0, ib->w, ib->h - ib->scroll_thickness); 0, 0, ib->w, ib->h - ib->scroll_thickness);
@ -2267,9 +2267,9 @@ RedrawIconbox(Iconbox * ib)
0, ib->scroll_thickness, 0, ib->scroll_thickness,
ib->w, ib->h - ib->scroll_thickness); ib->w, ib->h - ib->scroll_thickness);
if ( if (
(ic = (ic =
FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{ {
EMoveResizeWindow(disp, ib->cover_win, EMoveResizeWindow(disp, ib->cover_win,
0, ib->scroll_thickness, 0, ib->scroll_thickness,

944
src/ipc.c
View File

File diff suppressed because it is too large Load Diff

8
src/kde.c
View File

@ -88,12 +88,12 @@ static Atom KDE_WIN_TITLE = 0;
/* the modules I have to communicate to */ /* the modules I have to communicate to */
typedef struct KModuleList typedef struct KModuleList
{ {
Window win; Window win;
struct KModuleList *next; struct KModuleList *next;
} }
KModuleList; KModuleList;
static KModuleList *KModules = NULL; static KModuleList *KModules = NULL;

2
src/main.c
View File

@ -174,7 +174,7 @@ main(int argc, char **argv)
} }
else if ((!strcmp("-v", argv[j])) || else if ((!strcmp("-v", argv[j])) ||
(!strcmp("-version", argv[j])) || (!strcmp("-version", argv[j])) ||
(!strcmp("--version", argv[j])) || (!strcmp("-v", argv[j]))) (!strcmp("--version", argv[j])) || (!strcmp("-v", argv[j])))
{ {
printf(_ printf(_
("Enlightenment Version: %s\nLast updated on: %s\n"), ("Enlightenment Version: %s\nLast updated on: %s\n"),

32
src/memory.c
View File

@ -71,10 +71,10 @@ end: \
} }
static struct _symtab static struct _symtab
{ {
void *val; void *val;
char *symbol; char *symbol;
} }
*sym = NULL; *sym = NULL;
static int sym_count = 0; static int sym_count = 0;
@ -197,15 +197,15 @@ __Emalloc(int size, const char *file, int line)
_("Restart Enlightenment"), _("Quit Enlightenment")); _("Restart Enlightenment"), _("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\n" Alert(_("WARNING!!!!!!\n"
"\n" "\n"
"Allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n" "Allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
"\n" "\n"
"Either this is a bug where ridiculous amounts of memory\n" "Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n" "are being allocated, or your system has run out of both\n"
"real and virtual memory and is unable to satisfy the request.\n" "real and virtual memory and is unable to satisfy the request.\n"
"\n" "\n"
"If you have a low memory system it is suggested to either\n" "If you have a low memory system it is suggested to either\n"
"purchase more memory, increase SWAP space, or reconfigure\n" "purchase more memory, increase SWAP space, or reconfigure\n"
"Enlightenment to use less resources by turning features off.\n" "Enlightenment to use less resources by turning features off.\n"
"\n" "\n"
"The malloc requested was at %s, line %d\n "), "The malloc requested was at %s, line %d\n "),
size, (float)size / 1024, (float)size / (1024 * 1024), file, size, (float)size / 1024, (float)size / (1024 * 1024), file,
@ -273,9 +273,9 @@ __Erealloc(void *ptr, int size, const char *file, int line)
if (disp) if (disp)
UngrabX(); UngrabX();
ASSIGN_ALERT(_ ASSIGN_ALERT(_
("Error in reallocating memory that hasn't been allocated"), ("Error in reallocating memory that hasn't been allocated"),
_("Ignore this"), _("Restart Enlightenment"), _("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment")); _("Quit Enlightenment"));
Alert(_ Alert(_
("WARNING!!!!!!\n" "\n" ("WARNING!!!!!!\n" "\n"
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n" "Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n"
@ -283,7 +283,7 @@ __Erealloc(void *ptr, int size, const char *file, int line)
"memory chunk that has not been allocated or has already been\n" "memory chunk that has not been allocated or has already been\n"
"freed.\n" "\n" "This is definitely a bug. Please report it.\n" "freed.\n" "\n" "This is definitely a bug. Please report it.\n"
"\n" "The error occurred at %s, line %d.\n"), size, "\n" "The error occurred at %s, line %d.\n"), size,
(float)size / 1024, (float)size / (1024 * 1024), ptr, file, line); (float)size / 1024, (float)size / (1024 * 1024), ptr, file, line);
RESET_ALERT; RESET_ALERT;
EDBUG_RETURN(NULL); EDBUG_RETURN(NULL);
} }
@ -298,15 +298,15 @@ __Erealloc(void *ptr, int size, const char *file, int line)
_("Restart Enlightenment"), _("Quit Enlightenment")); _("Restart Enlightenment"), _("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\n" Alert(_("WARNING!!!!!!\n"
"\n" "\n"
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n" "Re-allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
"\n" "\n"
"Either this is a bug where ridiculous amounts of memory\n" "Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n" "are being allocated, or your system has run out of both\n"
"real and virtual memory and is unable to satisfy the request.\n" "real and virtual memory and is unable to satisfy the request.\n"
"\n" "\n"
"If you have a low memory system it is suggested to either\n" "If you have a low memory system it is suggested to either\n"
"purchase more memory, increase SWAP space, or reconfigure\n" "purchase more memory, increase SWAP space, or reconfigure\n"
"Enlightenment to use less resources by turning features off.\n" "Enlightenment to use less resources by turning features off.\n"
"\n" "\n"
"The realloc requested was at %s, line %d\n "), "The realloc requested was at %s, line %d\n "),
size, (float)size / 1024, (float)size / (1024 * 1024), file, size, (float)size / 1024, (float)size / (1024 * 1024), file,
@ -376,11 +376,11 @@ __Efree(void *ptr, const char *file, int line)
ASSIGN_ALERT(_ ASSIGN_ALERT(_
("Error in freeing memory that hasn't been allocated"), ("Error in freeing memory that hasn't been allocated"),
_("Ignore this"), _("Restart Enlightenment"), _("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment")); _("Quit Enlightenment"));
Alert(_ Alert(_
("WARNING!!!!!!\n" "\n" ("WARNING!!!!!!\n" "\n"
"freeing for pointer %x is attempting to free memory for a\n" "freeing for pointer %x is attempting to free memory for a\n"
"memory chunk that has not been allocated, or has already been\n" "memory chunk that has not been allocated, or has already been\n"
"freed.\n" "\n" "This is definitely a bug. Please report it.\n" "freed.\n" "\n" "This is definitely a bug. Please report it.\n"
"\n" "The error occurred at %s, line %d.\n"), ptr, file, line); "\n" "The error occurred at %s, line %d.\n"), ptr, file, line);
RESET_ALERT; RESET_ALERT;
@ -399,7 +399,7 @@ __Efree(void *ptr, const char *file, int line)
"Enlightenment attempted to free a NULL pointer.\n" "Enlightenment attempted to free a NULL pointer.\n"
"\n" "\n"
"This is definitely a bug. Please report it.\n" "This is definitely a bug. Please report it.\n"
"It is safe to ignore this error and continue running Enlightenment.\n" "It is safe to ignore this error and continue running Enlightenment.\n"
"\n" "\n"
"The pointer value was %x.\n" "The pointer value was %x.\n"
"The error occurred at %s, line %d.\n"), ptr, file, line); "The error occurred at %s, line %d.\n"), ptr, file, line);

20
src/menus.c
View File

@ -684,7 +684,7 @@ RealizeMenu(Menu * m)
{ {
int i, maxh = 0, maxw = int i, maxh = 0, maxw =
0, maxx1, maxx2, w, h, x, y, r, mmw, mmh; 0, maxx1, maxx2, w, h, x, y, r, mmw, mmh;
unsigned int iw, ih; unsigned int iw, ih;
ImlibImage *im; ImlibImage *im;
XSetWindowAttributes att; XSetWindowAttributes att;
@ -1016,10 +1016,10 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
struct stat st; struct stat st;
const char *chmap = const char *chmap =
#ifndef __EMX__ #ifndef __EMX__
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"; "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
#else #else
"0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_"; "0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_";
#endif #endif
FILE *f; FILE *f;
@ -1100,9 +1100,8 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibColor icl; ImlibColor icl;
char tile = 1, keep_asp = 0; char tile = 1, keep_asp = 0;
int width, height, scalex = int width, height, scalex =
0, scaley = 0; 0, scaley = 0;
int scr_asp, im_asp, w2, int scr_asp, im_asp, w2, h2;
h2;
int maxw = 48, maxh = 48; int maxw = 48, maxh = 48;
int justx = 512, justy = 512; int justx = 512, justy = 512;
@ -1320,7 +1319,7 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
chmap[(cc >> 6) & 0x3f], chmap[(cc >> 6) & 0x3f],
chmap[(cc >> 12) & 0x3f], chmap[(cc >> 12) & 0x3f],
chmap[(cc >> 18) & 0x3f], chmap[(cc >> 18) & 0x3f],
chmap[(cc >> 24) & 0x3f], chmap[(cc >> 28) & 0x3f]); chmap[(cc >> 24) & 0x3f], chmap[(cc >> 28) & 0x3f]);
bg = bg =
(Background *) FindItem(s3, 0, LIST_FINDBY_NAME, (Background *) FindItem(s3, 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND); LIST_TYPE_BACKGROUND);
@ -1335,7 +1334,7 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibColor icl; ImlibColor icl;
char tile = 1, keep_asp = 0; char tile = 1, keep_asp = 0;
int width, height, scalex = int width, height, scalex =
0, scaley = 0; 0, scaley = 0;
int scr_asp, im_asp, w2, h2; int scr_asp, im_asp, w2, h2;
int maxw = 48, maxh = 48; int maxw = 48, maxh = 48;
@ -1704,7 +1703,7 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir)
if (f) if (f)
{ {
char *iname = NULL, *exec = NULL, *texec = char *iname = NULL, *exec = NULL, *texec =
NULL, *tmp; NULL, *tmp;
char *en_name = NULL; char *en_name = NULL;
while (fgets(s, sizeof(s), f)) while (fgets(s, sizeof(s), f))
@ -1716,7 +1715,8 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir)
else if (name_buf[0] && else if (name_buf[0] &&
!strncmp(s, name_buf, strlen(name_buf))) !strncmp(s, name_buf, strlen(name_buf)))
iname = duplicate(&(s[strlen(name_buf)])); iname = duplicate(&(s[strlen(name_buf)]));
else if (!strncmp(s, "TryExec=", strlen("TryExec="))) else
if (!strncmp(s, "TryExec=", strlen("TryExec=")))
texec = duplicate(&(s[strlen("TryExec=")])); texec = duplicate(&(s[strlen("TryExec=")]));
else if (!strncmp(s, "Exec=", strlen("Exec="))) else if (!strncmp(s, "Exec=", strlen("Exec=")))
exec = duplicate(&(s[strlen("Exec=")])); exec = duplicate(&(s[strlen("Exec=")]));

37
src/misc.c
View File

@ -38,16 +38,15 @@ BlumFlimFrub(void)
char s[1024]; char s[1024];
char *bins[3] = char *bins[3] =
#ifndef __EMX__ #ifndef __EMX__
{"dox", "eesh", "epp"}; { "dox", "eesh", "epp" };
#else #else
{"dox.exe", "eesh.exe", "epp.exe"}; { "dox.exe", "eesh.exe", "epp.exe" };
#endif #endif
char *docs[4] = char *docs[4] =
{"E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png"}; { "E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png" };
char *thms[1] = char *thms[1] = { "themes/DEFAULT/epplets/epplets.cfg" };
{"themes/DEFAULT/epplets/epplets.cfg"};
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@ -64,12 +63,12 @@ BlumFlimFrub(void)
"Enlightenment's utility executable cannot be found at:\n" "Enlightenment's utility executable cannot be found at:\n"
"\n" "\n"
"%s\n" "%s\n"
"This is a fatal error and Enlightenment will cease to run.\n" "This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure it is installed\n" "Please rectify this situation and ensure it is installed\n"
"correctly.\n" "correctly.\n"
"\n" "\n"
"The reason this could be missing is due to badly created\n" "The reason this could be missing is due to badly created\n"
"packages, someone manually deleting that program or perhaps\n" "packages, someone manually deleting that program or perhaps\n"
"an error in installing Enlightenment.\n"), s); "an error in installing Enlightenment.\n"), s);
EExit(NULL); EExit(NULL);
} }
@ -77,11 +76,11 @@ BlumFlimFrub(void)
{ {
Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n" "\n"
"Enlightenment's dox executable is not able to be executed:\n" "Enlightenment's dox executable is not able to be executed:\n"
"\n" "\n"
"%s\n" "%s\n"
"This is a fatal error and Enlightenment will cease to run.\n" "This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure dox is installed\n" "Please rectify this situation and ensure dox is installed\n"
"correctly.\n"), s); "correctly.\n"), s);
EExit(NULL); EExit(NULL);
} }
@ -101,12 +100,12 @@ BlumFlimFrub(void)
"\n" "\n"
"Enlightenment's documentation is not present or correctly installed\n" "Enlightenment's documentation is not present or correctly installed\n"
"\n" "\n"
"This is a fatal error and Enlightenment will cease to run.\n" "This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure it is installed\n" "Please rectify this situation and ensure it is installed\n"
"correctly.\n" "correctly.\n"
"\n" "\n"
"The reason this could be missing is due to badly created\n" "The reason this could be missing is due to badly created\n"
"packages, someone manually deleting those files or perhaps\n" "packages, someone manually deleting those files or perhaps\n"
"an error in installing Enlightenment.\n")); "an error in installing Enlightenment.\n"));
EExit(NULL); EExit(NULL);
} }
@ -126,9 +125,9 @@ BlumFlimFrub(void)
"Enlightenment's DEFAULT installed theme is missing or inadequately\n" "Enlightenment's DEFAULT installed theme is missing or inadequately\n"
"configured to be a useful DEFAULT theme.\n" "configured to be a useful DEFAULT theme.\n"
"\n" "\n"
"This is a fatal error and Enlightenment will cease to run.\n" "This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure it is installed\n" "Please rectify this situation and ensure it is installed\n"
"correctly. The DEFAULT theme Enlightenment comes with normally\n" "correctly. The DEFAULT theme Enlightenment comes with normally\n"
"is BrushedMetal-Tigert and this theme is adequate for a DEFAULT\n" "is BrushedMetal-Tigert and this theme is adequate for a DEFAULT\n"
"theme.\n")); "theme.\n"));
EExit(NULL); EExit(NULL);

8
src/modules.c
View File

@ -35,12 +35,12 @@
/* This is the Modules List that we maintain */ /* This is the Modules List that we maintain */
typedef struct _ModuleMember typedef struct _ModuleMember
{ {
char *ModuleName; char *ModuleName;
void *handle; void *handle;
} }
ModuleMember; ModuleMember;
int ListLength = 0; int ListLength = 0;

22
src/mwm.c
View File

@ -55,13 +55,13 @@
/* Motif window hints */ /* Motif window hints */
typedef struct _mwmhints typedef struct _mwmhints
{ {
CARD32 flags; CARD32 flags;
CARD32 functions; CARD32 functions;
CARD32 decorations; CARD32 decorations;
INT32 inputMode; INT32 inputMode;
CARD32 status; CARD32 status;
} }
MWMHints; MWMHints;
void void
@ -172,10 +172,10 @@ MWM_SetInfo()
{ {
Atom a1; Atom a1;
struct _mwminfo struct _mwminfo
{ {
long flags; long flags;
Window win; Window win;
} }
mwminfo; mwminfo;
EDBUG(6, "MWM_SetInfo"); EDBUG(6, "MWM_SetInfo");

13
src/network.c
View File

@ -30,11 +30,11 @@
*/ */
typedef struct conn_data_tag typedef struct conn_data_tag
{ {
int read_sock; int read_sock;
int write_sock; int write_sock;
ghttp_request *req; ghttp_request *req;
} }
conn_data; conn_data;
#endif #endif
@ -126,8 +126,7 @@ GetNetText(char *URL)
} }
time_t time_t GetNetFileDate(char *URL)
GetNetFileDate(char *URL)
{ {
#ifdef AUTOUPGRADE #ifdef AUTOUPGRADE

21
src/pager.c
View File

@ -450,8 +450,7 @@ PagerUpdateTimeout(int val, void *data)
double cur_time, in; double cur_time, in;
static int calls = 0; static int calls = 0;
int y, y2, phase, ax, ay, cx, cy, ww, hh, xx, yy; int y, y2, phase, ax, ay, cx, cy, ww, hh, xx, yy;
static int offsets[8] = static int offsets[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
{0, 4, 2, 6, 1, 5, 3, 7};
p = (Pager *) data; p = (Pager *) data;
Esnprintf(s, sizeof(s), "__.%x", p->win); Esnprintf(s, sizeof(s), "__.%x", p->win);
@ -528,11 +527,11 @@ CreatePager(void)
(_("Warning!"), (_("Warning!"),
_("\n" _("\n"
"You seem to have an X Server capable of Shared Memory\n" "You seem to have an X Server capable of Shared Memory\n"
"but it is incapable of doing ZPixmap Shared pixmaps\n" "but it is incapable of doing ZPixmap Shared pixmaps\n"
"(The server does not claim to be able to do them).\n" "(The server does not claim to be able to do them).\n"
"\n" "\n"
"The pager in Enlightenment will run slowly in snapshot\n" "The pager in Enlightenment will run slowly in snapshot\n"
"mode if you continue to use that mode of the pager\n" "mode if you continue to use that mode of the pager\n"
"under these conditions.\n" "under these conditions.\n"
"\n" "\n"
"It is suggested you change the settings on your pager to\n" "It is suggested you change the settings on your pager to\n"
@ -548,7 +547,7 @@ CreatePager(void)
"\n" "\n"
"Please enable Shared Pixmaps in your Imlib configuration\n" "Please enable Shared Pixmaps in your Imlib configuration\n"
"then restart Enlightenment to gain better performance for\n" "then restart Enlightenment to gain better performance for\n"
"the pagers when snapshot mode is enabled.\n" "\n")); "the pagers when snapshot mode is enabled.\n" "\n"));
} }
} }
else else
@ -557,15 +556,15 @@ CreatePager(void)
DIALOG_OK DIALOG_OK
(_("Warning!"), (_("Warning!"),
_("\n" _("\n"
"You seem to be running Enlightenment over a network Connection\n" "You seem to be running Enlightenment over a network Connection\n"
"or on an X Server that does not support Shared Memory, or you\n" "or on an X Server that does not support Shared Memory, or you\n"
"have disabled MIT-SHM Shared memory in your Imlib configuration.\n" "have disabled MIT-SHM Shared memory in your Imlib configuration.\n"
"This means the Enlightenment Pager will perform slowly and use\n" "This means the Enlightenment Pager will perform slowly and use\n"
"more system resources than it would when Shared Memory is\n" "more system resources than it would when Shared Memory is\n"
"available.\n" "available.\n"
"\n" "\n"
"To improve performance please either enable MIT-SHM Shared Memory\n" "To improve performance please either enable MIT-SHM Shared Memory\n"
"in your Imlib config, if you disabled it, or disable Pager\n" "in your Imlib config, if you disabled it, or disable Pager\n"
"snapshots.\n" "\n")); "snapshots.\n" "\n"));
} }
did_dialog = 1; did_dialog = 1;

3
src/scursor.c
View File

@ -37,8 +37,7 @@ static Window sc_window = 0;
static Atom sc_atom = 0; static Atom sc_atom = 0;
static ImlibData *imd = NULL; static ImlibData *imd = NULL;
Window Window SC_GetDestWin(void)
SC_GetDestWin(void)
{ {
return 0; return 0;
} }

43
src/session.c
View File

@ -47,10 +47,10 @@ Emkstemp(char *template)
{ {
static const char letters[] static const char letters[]
#ifndef __EMX__ #ifndef __EMX__
= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
#else #else
= "abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>Ž‘’“”•–—˜™0123456789"; = "abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>Ž‘’“”•–—˜™0123456789";
#endif #endif
@ -140,16 +140,15 @@ static char *userthemepath;
/* The saved window details */ /* The saved window details */
static int num_match = 0; static int num_match = 0;
typedef struct _match typedef struct _match
{ {
char *session_id; char *session_id;
char *name; char *name;
char *class; char *class;
char *role; char *role;
char *command; char *command;
char used; char used;
int x, y, w, h, desktop, iconified, shaded, sticky, int x, y, w, h, desktop, iconified, shaded, sticky, layer;
layer; }
}
Match; Match;
Match *matches = NULL; Match *matches = NULL;
@ -693,18 +692,14 @@ set_save_props(SmcConn smc_conn, int master_flag)
char priority = 10; char priority = 10;
char style; char style;
int n = 0; int n = 0;
SmPropValue programVal = SmPropValue programVal = { 0, NULL };
{0, NULL}; SmPropValue userIDVal = { 0, NULL };
SmPropValue userIDVal = SmPropValue discardVal[] = {
{0, NULL};
SmPropValue discardVal[] =
{
{0, NULL}, {0, NULL},
{0, NULL}, {0, NULL},
{0, NULL} {0, NULL}
}; };
SmPropValue restartVal[] = SmPropValue restartVal[] = {
{
{0, NULL}, {0, NULL},
{0, NULL}, {0, NULL},
{0, NULL}, {0, NULL},
@ -716,10 +711,8 @@ set_save_props(SmcConn smc_conn, int master_flag)
{0, NULL}, {0, NULL},
{0, NULL} {0, NULL}
}; };
SmPropValue styleVal = SmPropValue styleVal = { 0, NULL };
{0, NULL}; SmPropValue priorityVal = { 0, NULL };
SmPropValue priorityVal =
{0, NULL};
SmProp programProp; SmProp programProp;
SmProp userIDProp; SmProp userIDProp;
SmProp discardProp; SmProp discardProp;
@ -1046,7 +1039,7 @@ ProcessICEMSGS(void)
DialogAlert(_("ERROR!\n" DialogAlert(_("ERROR!\n"
"\n" "\n"
"Lost the Session Manager that was there?\n" "Lost the Session Manager that was there?\n"
"Here here session manager... come here... want a bone?\n" "Here here session manager... come here... want a bone?\n"
"Oh come now! Stop sulking! Bugger. Oh well. " "Oh come now! Stop sulking! Bugger. Oh well. "
"Will continue without\n" "Will continue without\n"
"a session manager.\n" "a session manager.\n"

40
src/settings.c
View File

@ -151,7 +151,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Smooth high quality snapshots in snapshot mode")); ("Smooth high quality snapshots in snapshot mode"));
DialogItemCheckButtonSetState(di, tmp_pager_hiq); DialogItemCheckButtonSetState(di, tmp_pager_hiq);
DialogItemCheckButtonSetPtr(di, &tmp_pager_hiq); DialogItemCheckButtonSetPtr(di, &tmp_pager_hiq);
@ -161,7 +161,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Zoom in on pager windows when mouse is over them")); ("Zoom in on pager windows when mouse is over them"));
DialogItemCheckButtonSetState(di, tmp_pager_zoom); DialogItemCheckButtonSetState(di, tmp_pager_zoom);
DialogItemCheckButtonSetPtr(di, &tmp_pager_zoom); DialogItemCheckButtonSetPtr(di, &tmp_pager_zoom);
@ -171,7 +171,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Pop up window title when mouse is over the window")); ("Pop up window title when mouse is over the window"));
DialogItemCheckButtonSetState(di, tmp_pager_title); DialogItemCheckButtonSetState(di, tmp_pager_title);
DialogItemCheckButtonSetPtr(di, &tmp_pager_title); DialogItemCheckButtonSetPtr(di, &tmp_pager_title);
@ -474,7 +474,7 @@ SettingsFocus(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Only new dialogs whose owner is focused get the focus")); ("Only new dialogs whose owner is focused get the focus"));
DialogItemCheckButtonSetState(di, tmp_owner_popup_focus); DialogItemCheckButtonSetState(di, tmp_owner_popup_focus);
DialogItemCheckButtonSetPtr(di, &tmp_owner_popup_focus); DialogItemCheckButtonSetPtr(di, &tmp_owner_popup_focus);
@ -492,7 +492,7 @@ SettingsFocus(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Send mouse pointer to window on focus switch")); ("Send mouse pointer to window on focus switch"));
DialogItemCheckButtonSetState(di, tmp_warp_focus); DialogItemCheckButtonSetState(di, tmp_warp_focus);
DialogItemCheckButtonSetPtr(di, &tmp_warp_focus); DialogItemCheckButtonSetPtr(di, &tmp_warp_focus);
@ -550,7 +550,7 @@ SettingsFocus(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Send mouse pointer to window after focus switch")); ("Send mouse pointer to window after focus switch"));
DialogItemCheckButtonSetState(di, tmp_warp_after_focus); DialogItemCheckButtonSetState(di, tmp_warp_after_focus);
DialogItemCheckButtonSetPtr(di, &tmp_warp_after_focus); DialogItemCheckButtonSetPtr(di, &tmp_warp_after_focus);
#endif /* WITH_TARTY_WARP */ #endif /* WITH_TARTY_WARP */
@ -1213,7 +1213,7 @@ SettingsPlacement(void)
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_ _
("Dialog windows appear together with their owner")); ("Dialog windows appear together with their owner"));
DialogItemCheckButtonSetState(di, tmp_with_leader); DialogItemCheckButtonSetState(di, tmp_with_leader);
DialogItemCheckButtonSetPtr(di, &tmp_with_leader); DialogItemCheckButtonSetPtr(di, &tmp_with_leader);
@ -1277,8 +1277,8 @@ SettingsAutoRaise(void)
DItem *table, *di; DItem *table, *di;
if ( if (
(d = (d =
FindItem("CONFIGURE_AUTORAISE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG))) FindItem("CONFIGURE_AUTORAISE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
{ {
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE"); AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
ShowDialog(d); ShowDialog(d);
@ -1375,8 +1375,8 @@ SettingsTooltips(void)
DItem *table, *di; DItem *table, *di;
if ( if (
(d = (d =
FindItem("CONFIGURE_TOOLTIPS", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG))) FindItem("CONFIGURE_TOOLTIPS", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
{ {
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE"); AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
ShowDialog(d); ShowDialog(d);
@ -1709,7 +1709,7 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2); DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0); DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, DialogItemTextSetText(di,
"Enlightenment Special Effects\n" "Settings Dialog\n"); "Enlightenment Special Effects\n" "Settings Dialog\n");
di = DialogAddItem(table, DITEM_NONE); di = DialogAddItem(table, DITEM_NONE);
@ -1821,7 +1821,7 @@ SettingsSpecialFX(void)
DialogItemSetFill(di, 1, 0); DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 4); DialogItemSetColSpan(di, 4);
DialogItemCheckButtonSetText(di, DialogItemCheckButtonSetText(di,
_("Use saveunders to reduce window exposures")); _("Use saveunders to reduce window exposures"));
DialogItemCheckButtonSetState(di, tmp_saveunders); DialogItemCheckButtonSetState(di, tmp_saveunders);
DialogItemCheckButtonSetPtr(di, &tmp_saveunders); DialogItemCheckButtonSetPtr(di, &tmp_saveunders);
@ -2637,7 +2637,7 @@ CB_BGAreaEvent(int val, void *data)
stmp = duplicate(_("-NONE-")); stmp = duplicate(_("-NONE-"));
Esnprintf(s, sizeof(s), Esnprintf(s, sizeof(s),
_ _
("Background definition information:\nName: %s\nFile: %s\n"), ("Background definition information:\nName: %s\nFile: %s\n"),
tmp_bg->name, stmp); tmp_bg->name, stmp);
Efree(stmp); Efree(stmp);
DialogItemTextSetText(bg_filename, s); DialogItemTextSetText(bg_filename, s);
@ -3460,7 +3460,7 @@ SettingsIconbox(char *name)
Iconbox *ib; Iconbox *ib;
if ( if (
(d = (d =
FindItem("CONFIGURE_ICONBOX", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG))) FindItem("CONFIGURE_ICONBOX", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
{ {
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE"); AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
@ -3569,7 +3569,7 @@ SettingsIconbox(char *name)
DialogItemSetAlign(di, 0, 0); DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di, DialogItemTextSetText(di,
_ _
("Alignment of anchoring when automatically resizing:")); ("Alignment of anchoring when automatically resizing:"));
di = DialogAddItem(table, DITEM_SLIDER); di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2); DialogItemSetPadding(di, 2, 2, 2, 2);
@ -3591,14 +3591,14 @@ SettingsIconbox(char *name)
DialogItemSetAlign(di, 0, 0); DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di, DialogItemTextSetText(di,
_ _
("Icon image display policy (if one operation fails, try the next):")); ("Icon image display policy (if one operation fails, try the next):"));
radio4 = di = DialogAddItem(table, DITEM_RADIOBUTTON); radio4 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2); DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0); DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, DialogItemRadioButtonSetText(di,
_ _
("Snapshot Windows, Use application icon, Use Enlightenment Icon")); ("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
DialogItemRadioButtonSetFirst(di, radio4); DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 0); DialogItemRadioButtonGroupSetVal(di, 0);
@ -3607,7 +3607,7 @@ SettingsIconbox(char *name)
DialogItemSetFill(di, 1, 0); DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, DialogItemRadioButtonSetText(di,
_ _
("Use application icon, Use Enlightenment Icon, Snapshot Window")); ("Use application icon, Use Enlightenment Icon, Snapshot Window"));
DialogItemRadioButtonSetFirst(di, radio4); DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 1); DialogItemRadioButtonGroupSetVal(di, 1);
@ -3860,7 +3860,7 @@ SettingsGroups(EWin * ewin)
{ {
DIALOG_OK(_("Window Group Error"), DIALOG_OK(_("Window Group Error"),
_ _
("\n This window currently does not belong to any groups. \n\n")); ("\n This window currently does not belong to any groups. \n\n"));
return; return;
} }
if ((d = FindItem("CONFIGURE_GROUP", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG))) if ((d = FindItem("CONFIGURE_GROUP", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))

14
src/setup.c
View File

@ -222,10 +222,10 @@ SetupX()
("Enlightenment cannot connect to the display nominated by\n" ("Enlightenment cannot connect to the display nominated by\n"
"your shell's DISPLAY environment variable. You may set this\n" "your shell's DISPLAY environment variable. You may set this\n"
"variable to indicate which display name Enlightenment is to\n" "variable to indicate which display name Enlightenment is to\n"
"connect to. It may be that you do not have an Xserver already\n" "connect to. It may be that you do not have an Xserver already\n"
"running to serve that Display connection, or that you do not\n" "running to serve that Display connection, or that you do not\n"
"have permission to connect to that display. Please make sure\n" "have permission to connect to that display. Please make sure\n"
"all is correct before trying again. Run an Xserver by running\n" "all is correct before trying again. Run an Xserver by running\n"
"xdm or startx first, or contact your local system\n" "xdm or startx first, or contact your local system\n"
"administrator, or Xserver vendor, or read the X, xdm and\n" "administrator, or Xserver vendor, or read the X, xdm and\n"
"startx manual pages before proceeding.\n")); "startx manual pages before proceeding.\n"));
@ -402,7 +402,7 @@ SetupX()
ASSIGN_ALERT(_("X server version error"), ASSIGN_ALERT(_("X server version error"),
_("Ignore this error"), "", _("Quit Enlightenment")); _("Ignore this error"), "", _("Quit Enlightenment"));
Alert(_("WARNING:\n" Alert(_("WARNING:\n"
"This is not an X11 Xserver. It in fact talks the X%i protocol.\n" "This is not an X11 Xserver. It in fact talks the X%i protocol.\n"
"This may mean Enlightenment will either not function, or\n" "This may mean Enlightenment will either not function, or\n"
"function incorrectly. If it is later than X11, then your\n" "function incorrectly. If it is later than X11, then your\n"
"server is one the author of Enlightenment neither have\n" "server is one the author of Enlightenment neither have\n"
@ -433,8 +433,7 @@ SetupX()
XModifierKeymap *mod; XModifierKeymap *mod;
KeyCode nl, sl; KeyCode nl, sl;
int i; int i;
int masks[8] = int masks[8] = {
{
ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask, ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask,
Mod4Mask, Mod5Mask Mod4Mask, Mod5Mask
}; };
@ -631,7 +630,7 @@ ChkDir(char *d)
if (!isdir(d)) if (!isdir(d))
{ {
Alert(_("The directory %s is apparently not a directory\n" Alert(_("The directory %s is apparently not a directory\n"
"This is a fatal condition.\n" "Please remove this file\n"), d); "This is a fatal condition.\n" "Please remove this file\n"), d);
EExit((void *)1); EExit((void *)1);
} }
if (!canexec(d)) if (!canexec(d))
@ -751,8 +750,7 @@ SetupEnv()
return; return;
} }
Window Window MakeExtInitWin(void)
MakeExtInitWin(void)
{ {
Display *d2; Display *d2;
Window win; Window win;

12
src/size.c
View File

@ -64,7 +64,7 @@ MaxHeight(EWin * ewin, char *resize_type)
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(lst[i] != ewin) && (lst[i] != ewin) &&
(!(lst[i]->ignorearrange)) && (!(lst[i]->ignorearrange)) &&
SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w)) SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w))
{ {
if (((lst[i]->y + lst[i]->h) <= y) && if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1)) ((lst[i]->y + lst[i]->h) >= y1))
@ -107,7 +107,7 @@ MaxHeight(EWin * ewin, char *resize_type)
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(lst[i] != ewin) && (lst[i] != ewin) &&
(lst[i]->never_use_area) && (lst[i]->never_use_area) &&
SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w)) SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w))
{ {
if (((lst[i]->y + lst[i]->h) <= y) && if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1)) ((lst[i]->y + lst[i]->h) >= y1))
@ -185,7 +185,7 @@ MaxWidth(EWin * ewin, char *resize_type)
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(lst[i] != ewin) && (lst[i] != ewin) &&
(!(lst[i]->ignorearrange)) && (!(lst[i]->ignorearrange)) &&
SPANS_COMMON(ewin->y, ewin->h, lst[i]->y, lst[i]->h)) SPANS_COMMON(ewin->y, ewin->h, lst[i]->y, lst[i]->h))
{ {
if (((lst[i]->x + lst[i]->w) <= x) && if (((lst[i]->x + lst[i]->w) <= x) &&
((lst[i]->x + lst[i]->w) >= x1)) ((lst[i]->x + lst[i]->w) >= x1))
@ -228,7 +228,7 @@ MaxWidth(EWin * ewin, char *resize_type)
(((ewin->desktop == lst[i]->desktop) && (((ewin->desktop == lst[i]->desktop) &&
(lst[i]->fixedpos)) || (lst[i]->fixedpos)) ||
(lst[i]->sticky)) && (lst[i]->sticky)) &&
SPANS_COMMON(ewin->y, ewin->h, lst[i]->y, lst[i]->h)) SPANS_COMMON(ewin->y, ewin->h, lst[i]->y, lst[i]->h))
{ {
if (((lst[i]->x + lst[i]->w) <= x) && if (((lst[i]->x + lst[i]->w) <= x) &&
((lst[i]->x + lst[i]->w) >= x1)) ((lst[i]->x + lst[i]->w) >= x1))
@ -312,7 +312,7 @@ MaxSize(EWin * ewin, char *resize_type)
(!(lst[i]->floating)) && (!(lst[i]->floating)) &&
(lst[i] != ewin) && (lst[i] != ewin) &&
(!(lst[i]->ignorearrange)) && (!(lst[i]->ignorearrange)) &&
SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w)) SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w))
{ {
if (((lst[i]->y + lst[i]->h) <= y) && if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1)) ((lst[i]->y + lst[i]->h) >= y1))
@ -381,7 +381,7 @@ MaxSize(EWin * ewin, char *resize_type)
(((ewin->desktop == lst[i]->desktop) && (((ewin->desktop == lst[i]->desktop) &&
(lst[i]->fixedpos)) || (lst[i]->fixedpos)) ||
(lst[i]->sticky)) && (lst[i]->sticky)) &&
SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w)) SPANS_COMMON(ewin->x, ewin->w, lst[i]->x, lst[i]->w))
{ {
if (((lst[i]->y + lst[i]->h) <= y) && if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1)) ((lst[i]->y + lst[i]->h) >= y1))

3
src/snprintf.c
View File

@ -84,12 +84,11 @@ Evsnprintf(char *str, size_t count, const char *fmt, va_list args)
#ifdef HAVE_STDARGS #ifdef HAVE_STDARGS
int int
Esnprintf(char *str, size_t count, const char *fmt,...) Esnprintf(char *str, size_t count, const char *fmt, ...)
#else #else
int int
Esnprintf(va_alist) Esnprintf(va_alist)
va_dcl va_dcl
#endif #endif
{ {
#ifndef HAVE_STDARGS #ifndef HAVE_STDARGS

8
src/startup.c
View File

@ -31,8 +31,7 @@ AddEToFile(char *file)
char *s1, *s2; char *s1, *s2;
char hase = 0; char hase = 0;
char foundwm = 0; char foundwm = 0;
char *wms[] = char *wms[] = {
{
"wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm", "wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm",
"gwm", "gwm",
"mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm", "mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm",
@ -78,7 +77,7 @@ AddEToFile(char *file)
{ {
fprintf(f2, "#%s", s); fprintf(f2, "#%s", s);
fprintf(f2, fprintf(f2,
"\n# Enlightenment inserted Execution string here\n"); "\n# Enlightenment inserted Execution string here\n");
fprintf(f2, "exec %s/enlightenment\n\n", fprintf(f2, "exec %s/enlightenment\n\n",
ENLIGHTENMENT_BIN); ENLIGHTENMENT_BIN);
foundwm = 1; foundwm = 1;
@ -236,8 +235,7 @@ CreateStartupDisplay(char start)
} }
else else
{ {
int k, spd, x, y, xOffset, yOffset, ty, fy, min, int k, spd, x, y, xOffset, yOffset, ty, fy, min, speed;
speed;
/* we have this many so that we save on lines o code - eAndroid */ /* we have this many so that we save on lines o code - eAndroid */
struct timeval timev1, timev2; struct timeval timev1, timev2;

6
src/text.c
View File

@ -370,7 +370,7 @@ TextDraw(TextClass * tclass, Window win, int active, int sticky, int state,
strncat(new_line, lines[i], (len - nuke_count) / 2); strncat(new_line, lines[i], (len - nuke_count) / 2);
strcat(new_line, "..."); strcat(new_line, "...");
strcat(new_line, strcat(new_line,
lines[i] + ((len - nuke_count) / 2) + nuke_count); lines[i] + ((len - nuke_count) / 2) + nuke_count);
Efont_extents(ts->efont, new_line, &ascent, &descent, Efont_extents(ts->efont, new_line, &ascent, &descent,
&wid, NULL, NULL, NULL, NULL); &wid, NULL, NULL, NULL, NULL);
} }
@ -631,7 +631,7 @@ TextDraw(TextClass * tclass, Window win, int active, int sticky, int state,
strncat(new_line, lines[i], (len - nuke_count) / 2); strncat(new_line, lines[i], (len - nuke_count) / 2);
strcat(new_line, "..."); strcat(new_line, "...");
strcat(new_line, strcat(new_line,
lines[i] + ((len - nuke_count) / 2) + nuke_count); lines[i] + ((len - nuke_count) / 2) + nuke_count);
wid = XTextWidth(ts->xfont, new_line, strlen(new_line)); wid = XTextWidth(ts->xfont, new_line, strlen(new_line));
} }
Efree(lines[i]); Efree(lines[i]);
@ -733,7 +733,7 @@ TextDraw(TextClass * tclass, Window win, int active, int sticky, int state,
strncat(new_line, lines[i], (len - nuke_count) / 4); strncat(new_line, lines[i], (len - nuke_count) / 4);
strcat(new_line, ". . . "); strcat(new_line, ". . . ");
strcat(new_line, strcat(new_line,
lines[i] + ((len - nuke_count) / 4) + nuke_count); lines[i] + ((len - nuke_count) / 4) + nuke_count);
wid = wid =
XTextWidth16(ts->xfont, (XChar2b *) new_line, XTextWidth16(ts->xfont, (XChar2b *) new_line,
strlen(new_line) / 2); strlen(new_line) / 2);

8
src/theme.c
View File

@ -31,7 +31,7 @@ char *
append_merge_dir(char *dir, char ***list, int *count) append_merge_dir(char *dir, char ***list, int *count)
{ {
char s[FILEPATH_LEN_MAX], ss[FILEPATH_LEN_MAX], **str = char s[FILEPATH_LEN_MAX], ss[FILEPATH_LEN_MAX], **str =
NULL, *def = NULL; NULL, *def = NULL;
char already, *tmp, *tmp2, ok; char already, *tmp, *tmp2, ok;
int i, j, num; int i, j, num;
@ -109,7 +109,7 @@ ListThemes(int *number)
{ {
char s[FILEPATH_LEN_MAX], **list = NULL, *def = NULL, *def2 = char s[FILEPATH_LEN_MAX], **list = NULL, *def = NULL, *def2 =
NULL; NULL;
int count = 0; int count = 0;
Esnprintf(s, sizeof(s), "%s/themes", UserEDir()); Esnprintf(s, sizeof(s), "%s/themes", UserEDir());
@ -249,7 +249,7 @@ ExtractTheme(char *theme)
{ {
/*gzipped tarball */ /*gzipped tarball */
Esnprintf(s, sizeof(s), Esnprintf(s, sizeof(s),
"gzip -d -c < %s | (cd %s ; tar -xf -)", theme, th); "gzip -d -c < %s | (cd %s ; tar -xf -)", theme, th);
} }
else if ((buf[257] == 'u') && (buf[258] == 's') else if ((buf[257] == 'u') && (buf[258] == 's')
&& (buf[259] == 't') && (buf[260] == 'a') && (buf[259] == 't') && (buf[260] == 'a')
@ -350,6 +350,6 @@ BadThemeDialog(void)
"Is a badly formed theme package and is thus not being used.\n" "Is a badly formed theme package and is thus not being used.\n"
"Enlightenment has fallen back to using the DEFAULT theme.\n" "Enlightenment has fallen back to using the DEFAULT theme.\n"
"\n" "\n"
"The reason this theme is bad is:\n" "%s"), badtheme, badreason); "The reason this theme is bad is:\n" "%s"), badtheme, badreason);
DIALOG_OK(_("Bad Theme"), s); DIALOG_OK(_("Bad Theme"), s);
} }

204
src/tooltips.c
View File

@ -135,13 +135,12 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
int i, w = 0, h = 0, ix, iy, iw, ih, dx, dy, xx, yy; int i, w = 0, h = 0, ix, iy, iw, ih, dx, dy, xx, yy;
int ww, hh, adx, ady, dist; int ww, hh, adx, ady, dist;
int headline_h = 0, headline_w = 0, icons_width = int headline_h = 0, headline_w = 0, icons_width =
0, labels_width = 0, double_w = 0, temp_w, temp_h; 0, labels_width = 0, double_w = 0, temp_w, temp_h;
ImlibImage *im; ImlibImage *im;
char pq; char pq;
int *heights = NULL; int *heights = NULL;
ImageClass *ic = NULL; ImageClass *ic = NULL;
int cols[10] = int cols[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
EDBUG(5, "ShowToolTip"); EDBUG(5, "ShowToolTip");
if (!tt) if (!tt)
@ -664,7 +663,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ac->list[i]->event == EVENT_DOUBLE_DOWN) if (ac->list[i]->event == EVENT_DOUBLE_DOWN)
{ {
TextDraw(tt->tclass, tt->win, 0, 0, STATE_NORMAL, "2x", TextDraw(tt->tclass, tt->win, 0, 0, STATE_NORMAL, "2x",
xx + iw - double_w, y, double_w, heights[i], 17, xx + iw - double_w, y, double_w, heights[i], 17,
0); 0);
} }
if (ac->list[i]->anybutton) if (ac->list[i]->anybutton)
@ -680,10 +679,10 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
ic->norm.normal->im->rgb_height); ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic->norm. ic->norm.normal->
normal->im), im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic->norm.normal->im), ic->norm.normal->im),
x, y); x, y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
@ -700,15 +699,14 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height); ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic->norm. ic->norm.normal->
normal->im), im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic->norm. ic->norm.normal->
normal->im), x, im), x, y);
y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
break; break;
@ -721,15 +719,14 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height); ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic->norm. ic->norm.normal->
normal->im), im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic->norm. ic->norm.normal->
normal->im), x, im), x, y);
y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
break; break;
@ -742,15 +739,14 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height); ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic->norm. ic->norm.normal->
normal->im), im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic->norm. ic->norm.normal->
normal->im), x, im), x, y);
y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
break; break;
@ -763,15 +759,14 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height); ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic->norm. ic->norm.normal->
normal->im), im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic->norm. ic->norm.normal->
normal->im), x, im), x, y);
y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
break; break;
@ -784,15 +779,14 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height); ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic->norm. ic->norm.normal->
normal->im), im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic->norm. ic->norm.normal->
normal->im), x, im), x, y);
y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
break; break;
@ -811,18 +805,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -835,18 +828,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -859,18 +851,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -883,18 +874,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -907,18 +897,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -931,18 +920,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -955,18 +943,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }
@ -979,18 +966,17 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im) if (ic->norm.normal->im)
{ {
Imlib_render(id, ic->norm.normal->im, Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width, ic->norm.normal->im->rgb_width,
ic->norm.normal-> ic->norm.normal->im->
im->rgb_height); rgb_height);
PastePixmap(disp, tt->win, PastePixmap(disp, tt->win,
Imlib_copy_image(id, Imlib_copy_image(id,
ic-> ic->norm.
norm.normal-> normal->im),
im),
Imlib_copy_mask(id, Imlib_copy_mask(id,
ic-> ic->norm.
norm.normal-> normal->im), x,
im), x, y); y);
x += ic->norm.normal->im->rgb_width; x += ic->norm.normal->im->rgb_width;
} }
} }

16
src/ttfont.c
View File

@ -25,18 +25,16 @@
typedef struct _efont_color_tab EfontColorTable; typedef struct _efont_color_tab EfontColorTable;
struct _efont_color_tab struct _efont_color_tab
{ {
Colormap cmap; Colormap cmap;
XColor list[256]; XColor list[256];
unsigned char match[8][8][8]; unsigned char match[8][8][8];
}; };
/*static EfontColorTable *color_tab = NULL; */ /*static EfontColorTable *color_tab = NULL; */
static unsigned char alpha_lut[5] = static unsigned char alpha_lut[5] = { 0, 64, 128, 192, 255 };
{0, 64, 128, 192, 255}; static unsigned char bounded_palette[9] = { 0, 1, 2, 3, 4, 4, 4, 4, 4 };
static unsigned char bounded_palette[9] =
{0, 1, 2, 3, 4, 4, 4, 4, 4};
static TT_Raster_Map * static TT_Raster_Map *
create_font_raster(int width, int height) create_font_raster(int width, int height)

4
src/warp.c
View File

@ -146,8 +146,8 @@ WarpFocus(int delta)
!mode.warpsticky) !mode.warpsticky)
&& (!ewin->ibox) && !(ewin->iconified && (!ewin->ibox) && !(ewin->iconified
&& !mode.warpiconified) && !mode.warpiconified)
/*&& (ewin->client.mwm_decor_title) && /*&& (ewin->client.mwm_decor_title) &&
* (ewin->client.mwm_decor_border) */ * (ewin->client.mwm_decor_border) */
) )
AddItem(ewin, "", 0, LIST_TYPE_WARP_RING); AddItem(ewin, "", 0, LIST_TYPE_WARP_RING);
} }

2
src/windowmatch.c
View File

@ -143,7 +143,7 @@ MatchEwinDesktop(EWin * ewin, WindowMatch * b)
void * void *
MatchEwinByFunction(EWin * ewin, MatchEwinByFunction(EWin * ewin,
void * (*FunctionToTest) (EWin *, WindowMatch *)) void *(*FunctionToTest) (EWin *, WindowMatch *))
{ {
WindowMatch **lst; WindowMatch **lst;
int i, num; int i, num;

15
src/x.c
View File

@ -40,8 +40,7 @@ EFreePixmap(Display * display, Pixmap pixmap)
XFreePixmap(display, pixmap); XFreePixmap(display, pixmap);
} }
Window Window ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
{ {
EXID *xid; EXID *xid;
Window win; Window win;
@ -587,8 +586,7 @@ DelXID(Window win)
} }
} }
Window Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
ECreateEventWindow(Window parent, int x, int y, int w, int h)
{ {
Window win; Window win;
XSetWindowAttributes attr; XSetWindowAttributes attr;
@ -604,8 +602,7 @@ ECreateEventWindow(Window parent, int x, int y, int w, int h)
* create a window which will accept the keyboard focus when no other * create a window which will accept the keyboard focus when no other
* windows have it * windows have it
*/ */
Window Window ECreateFocusWindow(Window parent, int x, int y, int w, int h)
ECreateFocusWindow(Window parent, int x, int y, int w, int h)
{ {
Window win; Window win;
XSetWindowAttributes attr; XSetWindowAttributes attr;
@ -739,8 +736,7 @@ WinExists(Window win)
EDBUG_RETURN(0); EDBUG_RETURN(0);
} }
Window Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
WindowAtXY_0(Window base, int bx, int by, int x, int y)
{ {
Window *list = NULL; Window *list = NULL;
XWindowAttributes att; XWindowAttributes att;
@ -787,8 +783,7 @@ WindowAtXY_0(Window base, int bx, int by, int x, int y)
EDBUG_RETURN(base); EDBUG_RETURN(base);
} }
Window Window WindowAtXY(int x, int y)
WindowAtXY(int x, int y)
{ {
Window *list = NULL; Window *list = NULL;
Window child = 0, parent_win = 0, root_win = 0; Window child = 0, parent_win = 0, root_win = 0;