e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Thu Mar 23 22:02:20 PST 2000 

(Mandrake)

redoing libXinerama support.  If you use xinerama, try using the "xinerama"
command.  ALSO - you have to make sure you installed libXinerama.a in the
right place as well as Xinerama.h -- still lots more hacking to do (trying to
do a cleaner implementation than my last hack)


SVN revision: 2312
This commit is contained in:
Mandrake 2000-03-24 05:51:51 +00:00
parent d0cf3bbe94
commit 9aa6f39e2c
44 changed files with 890 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -4365,3 +4365,13 @@ Mon Mar 20 21:58:50 GMT 2000
You can now iconify windows with skip_winlists set.
-------------------------------------------------------------------------------
Thu Mar 23 22:02:20 PST 2000
(Mandrake)
redoing libXinerama support. If you use xinerama, try using the "xinerama"
command. ALSO - you have to make sure you installed libXinerama.a in the
right place as well as Xinerama.h -- still lots more hacking to do (trying to
do a cleaner implementation than my last hack)

9
src/E.h
View File

@ -37,6 +37,10 @@
#include <Imlib.h>
#include <Fnlib.h>
#ifdef HAS_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
/* dmalloc debugging */
/*#include <dmalloc.h> */
@ -3081,6 +3085,11 @@ extern char *badtheme;
extern char *badreason;
extern char *e_machine_name;
#ifdef HAS_XINERAMA
extern char xinerama_active;
#endif
/* This turns on E's internal stack tracking system for coarse debugging */
/* and being able to trace E for profiling/optimisation purposes (which */
/* believe it or not I'm actually doing) */

1
src/Makefile.am
View File

@ -102,6 +102,7 @@ LDADD = \
$(XVM_LIBS) \
$(GHTTP_LIBS) \
$(DL_LIBS) \
$(XINERAMA_LIBS) \
-lm
INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I../intl -I$(top_srcdir)/intl

103
src/actions.c
View File

@ -664,17 +664,17 @@ runApp(char *exe, char *params)
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file does not exist.\n"),
(char *)exe);
"This is because the file does not exist.\n"),
(char *)exe);
/* relative path */
else
DialogAlertOK(_
("There was an error running the program:\n"
"%s\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"
"path for your shell which is %s. I suggest "
"path for your shell which is %s. I suggest "
"you read " "the manual\n"
"page for that shell and read up how to "
"change or add " "to your\n"
@ -689,26 +689,26 @@ runApp(char *exe, char *params)
/* can execute it */
if (canexec((char *)path))
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"I am unsure as to why you could not "
"do this. " "The file exists,\n"
"is a file, and you are allowed to "
"execute it. I " "suggest you look\n"
"into this.\n"), (char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"I am unsure as to why you could not "
"do this. " "The file exists,\n"
"is a file, and you are allowed to "
"execute it. I " "suggest you look\n"
"into this.\n"), (char *)path);
/* not executable file */
else
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file exists, is a"
" file, but " "you are unable\n"
"to execute it because you do not "
"have execute "
"access to this file.\n"),
(char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file exists, is a"
" file, but " "you are unable\n"
"to execute it because you do not "
"have execute "
"access to this file.\n"),
(char *)path);
}
/* it's not a file */
else
@ -716,19 +716,19 @@ runApp(char *exe, char *params)
/* its a dir */
if (isdir((char *)path))
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is in fact "
"a directory.\n"), (char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is in fact "
"a directory.\n"), (char *)path);
/* its not a file or a dir */
else
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is not a "
"regular file.\n"), (char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is not a "
"regular file.\n"), (char *)path);
}
if (path)
Efree(path);
@ -1371,11 +1371,11 @@ doCleanup(void *params)
floating[j++].h = ((EWin *) lst[i])->h;
}
else if (
(
(((EWin *) lst[i])->desktop == desks.current) ||
(((EWin *) lst[i])->sticky)) &&
(((EWin *) lst[i])->layer != 4) &&
(((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu))
(
(((EWin *) lst[i])->desktop == desks.current) ||
(((EWin *) lst[i])->sticky)) &&
(((EWin *) lst[i])->layer != 4) &&
(((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu))
{
fixed = Erealloc(fixed, sizeof(RectBox) * (k + 1));
fixed[k].data = lst[i];
@ -2473,7 +2473,7 @@ doHideShowButton(void *params)
if (matchregexp(ss, lst[i]->name))
{
if ((strcmp(lst[i]->name,
"_DESKTOP_DESKRAY_DRAG_CONTROL") &&
"_DESKTOP_DESKRAY_DRAG_CONTROL") &&
(!lst[i]->used)))
{
if (!(lst[i]->visible))
@ -2503,7 +2503,7 @@ doHideShowButton(void *params)
if (!matchregexp(ss, lst[i]->name))
{
if ((strcmp(lst[i]->name,
"_DESKTOP_DESKRAY_DRAG_CONTROL") &&
"_DESKTOP_DESKRAY_DRAG_CONTROL") &&
(!lst[i]->used)))
{
if (!(lst[i]->visible))
@ -3468,7 +3468,7 @@ doConfigure(void *params)
{
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,
ACTION_ADD_TO_GROUP);
}
@ -3487,7 +3487,8 @@ struct _keyset
int
doInsertKeys(void *params)
{
const struct _keyset ks[] = {
const struct _keyset ks[] =
{
{"a", 0, "a"},
{"b", 0, "b"},
{"c", 0, "c"},
@ -3712,8 +3713,8 @@ doRaiseLower(void *params)
{
if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer &&
(desks.desk[ewin->desktop].list[i] == ewin ||
!FindEwinInList(desks.desk[ewin->desktop].list[i], gwins,
num)))
!FindEwinInList(desks.desk[ewin->desktop].list[i], gwins,
num)))
{
if (desks.desk[ewin->desktop].list[i] != ewin)
raise = 1;
@ -3819,10 +3820,10 @@ doAddToGroup(void *params)
ChooseGroupDialog(ewin,
_
("\n There's no current group at the moment. \n"
" The current group is the last one you created, \n"
" and it exists until you create a new one or break \n"
" The current group is the last one you created, \n"
" and it exists until you create a new one or break \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);
EDBUG_RETURN(0);
}
@ -3905,20 +3906,20 @@ doZoom(void *params)
{
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);
}
DIALOG_OK(_("Warning !!!"),
_
("This feature is heavily reliant on a feature of your\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"
"X Server called the Vid Mode Extension. This feature exists\n"
"in XFree86 Servers, but is not a heavily used part of the\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"
"display artefacts or perhaps simply refuse to work.\n" "\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"
"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"
"have to avoid using this feature.\n"));
EDBUG_RETURN(0);
}

2
src/alert.c
View File

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

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) ||
(lst[i]->sticky)) &&
(!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{
if (IN_BELOW
(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) ||
(lst[i]->sticky)) &&
(!(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,
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) ||
(lst[i]->sticky)) &&
(!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{
if (IN_BELOW
(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) ||
(lst[i]->sticky)) &&
(!(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,
mode.edge_snap_dist) &&

10
src/arrange.h
View File

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

7
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 k, spd, *x = NULL, *y =
NULL, min, tmpx, tmpy, tmpw, tmph, i;
NULL, min, tmpx, tmpy, tmpw, tmph, i;
struct timeval timev1, timev2;
int dsec, dusec;
double tm;
@ -1191,7 +1191,6 @@ CalcEwinWinpart(EWin * ewin, int i)
ewin->border->part[i].geom.bottomright.y.absolute +
ewin->bits[bottomright].y;
}
/*
* * calculate height before width, because we may need it in order to
* * determine the font size. But we might do it the other way around for
@ -1257,7 +1256,6 @@ CalcEwinWinpart(EWin * ewin, int i)
{
h = min;
}
/*
* * and now the width.
*/
@ -1649,7 +1647,6 @@ FreeEwin(EWin * ewin)
HideMenuMasker();
}
}
if (ewin == mode.focuswin)
FocusToNone();
@ -2588,7 +2585,7 @@ MinShadeSize(EWin * ewin, int *mw, int *mh)
leftborderwidth =
ewin->border->border.left - ewin->bits[i].x;
if ((ewin->bits[i].x + ewin->bits[i].w) -
(ewin->w - ewin->border->border.right) > rightborderwidth)
(ewin->w - ewin->border->border.right) > rightborderwidth)
rightborderwidth =
(ewin->bits[i].x + ewin->bits[i].w) - (ewin->w -
ewin->

16
src/comms.c
View File

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

10
src/desktops.c
View File

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

32
src/dialog.c
View File

@ -280,7 +280,7 @@ DialogQuit(int val, void *data)
}
void
DialogAlert(char *fmt, ...)
DialogAlert(char *fmt,...)
{
char text[10240];
va_list ap;
@ -293,7 +293,7 @@ DialogAlert(char *fmt, ...)
}
void
DialogAlertOK(char *fmt, ...)
DialogAlertOK(char *fmt,...)
{
char text[10240];
va_list ap;
@ -307,7 +307,7 @@ DialogAlertOK(char *fmt, ...)
}
void
DialogSetParamText(Dialog * d, char *fmt, ...)
DialogSetParamText(Dialog * d, char *fmt,...)
{
char text[10240];
va_list ap;
@ -1089,7 +1089,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
di->item.slider.border_orig_h = im->rgb_height;
Imlib_destroy_image(id, im);
di->item.slider.border_win = ECreateWindow(d->win, -20,
-20, 2, 2, 0);
-20, 2, 2, 0);
EMapWindow(disp, di->item.slider.border_win);
}
}
@ -1236,8 +1236,9 @@ DialogRealizeItem(Dialog * d, DItem * di)
rows = 1;
if ((cols > 0) && (rows > 0))
{
int i, *col_size, *row_size = NULL, r = 0, c =
0, x = 0, y = 0;
int i, *col_size, *row_size = NULL, r = 0,
c =
0, x = 0, y = 0;
col_size = Emalloc(sizeof(int) * cols);
row_size = Erealloc(row_size, sizeof(int));
@ -1353,7 +1354,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->w, dii->h);
if (dii->type == DITEM_CHECKBUTTON)
EMoveResizeWindow(disp,
dii->item.check_button.check_win,
dii->item.check_button.check_win,
dii->x, dii->y +
((dii->h -
dii->item.
@ -1365,7 +1366,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
check_button.check_orig_h);
if (dii->type == DITEM_RADIOBUTTON)
EMoveResizeWindow(disp,
dii->item.radio_button.radio_win,
dii->item.radio_button.radio_win,
dii->x, dii->y +
((dii->h -
dii->item.
@ -1414,7 +1415,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->item.slider.base_h);
if (dii->item.slider.border_win)
EMoveResizeWindow(disp,
dii->item.slider.border_win,
dii->item.slider.border_win,
dii->x +
dii->item.slider.border_x,
dii->y +
@ -1428,7 +1429,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->y +
dii->item.slider.numeric_y,
dii->item.slider.numeric_w,
dii->item.slider.numeric_h);
dii->item.slider.numeric_h);
}
}
x += sw;
@ -1640,11 +1641,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h)
if (di->item.check_button.onoff)
IclassApply(di->iclass, di->item.check_button.check_win,
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
IclassApply(di->iclass, di->item.check_button.check_win,
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);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.check_button.text,
@ -1681,11 +1682,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h)
if (di->item.radio_button.onoff)
IclassApply(di->iclass, di->item.radio_button.radio_win,
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
IclassApply(di->iclass, di->item.radio_button.radio_win,
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);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.radio_button.text,
@ -1884,7 +1885,8 @@ DialogItemAreaSetSize(DItem * di, int w, int h)
di->item.area.h = h;
}
Window DialogItemAreaGetWindow(DItem * di)
Window
DialogItemAreaGetWindow(DItem * di)
{
return di->item.area.area_win;
}

12
src/draw.c
View File

@ -98,7 +98,7 @@ HandleDrawQueue()
for (i = 0; i < num; i++)
{
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)
{
@ -200,7 +200,7 @@ HandleDrawQueue()
else if (lst[i]->iclass)
{
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); */
}
else if (lst[i]->pager)
@ -582,7 +582,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) +
(p1 & p2 &
((0x1 << 11) | (0x1 << 5) | (0x1) |
(0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
(0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
}
}
else
@ -604,7 +604,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) +
(p1 & p2 &
((0x1 << 11) | (0x1 << 5) | (0x1) |
(0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
(0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
}
{
unsigned short *pptr1, *pptr2, *pptr3;
@ -663,7 +663,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) +
(p1 & p2 &
((0x1 << 10) | (0x1 << 5) | (0x1) |
(0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
(0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
}
}
else
@ -685,7 +685,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
13))) +
(p1 & p2 &
((0x1 << 10) | (0x1 << 5) | (0x1) |
(0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
(0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
}
{
unsigned short *pptr1, *pptr2, *pptr3;

6
src/events.c
View File

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

50
src/evhandlers.c
View File

@ -43,11 +43,11 @@
static ToolTip *ttip = NULL;
struct _mdata
{
Menu *m;
MenuItem *mi;
EWin *ewin;
};
{
Menu *m;
MenuItem *mi;
EWin *ewin;
};
static void ToolTipTimeout(int val, void *data);
static void SubmenuShowTimeout(int val, void *dat);
@ -480,7 +480,7 @@ HandleMotion(XEvent * ev)
if ((ndx != dx) &&
(((gwins[i]->x == 0) &&
(!(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))
&&
(!(IN_RANGE
@ -494,7 +494,7 @@ HandleMotion(XEvent * ev)
(gwins
[i]->reqx,
gwins[i]->x,
mode.edge_snap_dist)))))))
mode.edge_snap_dist)))))))
{
jumpx = 1;
ndx = gwins[i]->reqx - gwins[i]->x + dx;
@ -503,7 +503,7 @@ HandleMotion(XEvent * ev)
if ((ndy != dy) &&
(((gwins[i]->y == 0) &&
(!(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))
&&
(!(IN_RANGE
@ -517,7 +517,7 @@ HandleMotion(XEvent * ev)
(gwins
[i]->reqy,
gwins[i]->y,
mode.edge_snap_dist)))))))
mode.edge_snap_dist)))))))
{
jumpy = 1;
ndy = gwins[i]->reqy - gwins[i]->y + dy;
@ -1641,9 +1641,9 @@ HandleMouseDown(XEvent * ev)
DoIn("TOOLTIP_TIMEOUT", mode.tiptime, ToolTipTimeout, 0, NULL);
if (
(((float)(ev->xbutton.time - last_time) / 1000) <
mode_double_click_time)
&& ((int)(ev->xbutton.button) == (int)(last_button)))
(((float)(ev->xbutton.time - last_time) / 1000) <
mode_double_click_time)
&& ((int)(ev->xbutton.button) == (int)(last_button)))
double_click = 1;
last_time = ev->xbutton.time;
last_button = ev->xbutton.button;
@ -1920,7 +1920,8 @@ HandleMouseDown(XEvent * ev)
if ((ewin) && (!ewin->pager))
{
Window dw;
int wx, wy, ww, wh, ax, ay, cx, cy, px, py;
int wx, wy, ww, wh, ax, ay, cx, cy,
px, py;
PagerHideHi(p);
pwin_px = ewin->x;
@ -2393,15 +2394,15 @@ HandleMouseUp(XEvent * ev)
((ew->desktop == desks.current) || (ew->sticky)))
{
if (
(ev->xbutton.x_root >=
(ew->x + ew->border->border.left))
&& (ev->xbutton.x_root <
(ew->x + ew->w - ew->border->border.right))
&& (ev->xbutton.y_root >=
(ew->y + ew->border->border.top))
&& (ev->xbutton.y_root <
(ew->y + ew->h -
ew->border->border.bottom)))
(ev->xbutton.x_root >=
(ew->x + ew->border->border.left))
&& (ev->xbutton.x_root <
(ew->x + ew->w - ew->border->border.right))
&& (ev->xbutton.y_root >=
(ew->y + ew->border->border.top))
&& (ev->xbutton.y_root <
(ew->y + ew->h -
ew->border->border.bottom)))
{
ewin = ew;
i = desks.desk[desks.current].num;
@ -2412,7 +2413,8 @@ HandleMouseUp(XEvent * ev)
if ((ewin) && (ewin->pager))
{
Pager *pp;
int w, h, x, y, ax, ay, cx, cy, px, py;
int w, h, x, y, ax, ay, cx, cy, px,
py;
int wx, wy, base_x = 0, base_y = 0;
Window dw;
@ -2525,7 +2527,7 @@ HandleMouseUp(XEvent * ev)
else
{
int ndesk, nx, ny, base_x = 0, base_y =
0, ax, ay;
0, ax, ay;
ndesk = desks.current;
nx = (int)ev->xbutton.x_root -

8
src/focus.c
View File

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

91
src/fx.c
View File

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

5
src/globals.c
View File

@ -68,3 +68,8 @@ char *dstr = NULL;
char *badtheme = NULL;
char *badreason = NULL;
char *e_machine_name = NULL;
#ifdef HAS_XINERAMA
char xinerama_active;
#endif

15
src/gnome.c
View File

@ -128,12 +128,12 @@
/* Preferences for behavior for app */
/* ONLY the client sets this */
#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_TASKBAR (1<<2) /* not on taskbar */
#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */
#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_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */
#define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */
#define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */
#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */
#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 XA_WIN_HINTS "_WIN_HINTS"
/* WIN_HINTS = CARD32 */
@ -720,7 +720,8 @@ GNOME_SetWMNameVer(void)
void
GNOME_DelHints(EWin * ewin)
{
static Atom atom_get[7] = { 0, 0, 0, 0, 0, 0, 0 };
static Atom atom_get[7] =
{0, 0, 0, 0, 0, 0, 0};
EDBUG(6, "GNOME_DelHints");
if (!atom_get[0])

8
src/groups.c
View File

@ -253,7 +253,7 @@ RemoveEwinFromGroup(EWin * ewin, Group * g)
root.h)
y = root.h - ewin->border->border.top - 1;
else if ((ewin->y + ewin->h -
ewin->border->border.bottom - 1) < 0)
ewin->border->border.bottom - 1) < 0)
y =
0 - ewin->h +
ewin->border->border.bottom + 1;
@ -602,9 +602,9 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
{
DIALOG_OK(_("Window Group Error"),
_
("\n This window currently does not belong to any 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"));
("\n This window currently does not belong to any 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"));
return;
}
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"
"\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"
"of CPU not 100%% identical or compatible with yours. Please\n"
"binary of Enlightenment that was compiled for a make or model\n"
"of CPU not 100%% identical or compatible with yours. Please\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"));
doExit("error");
EDBUG_RETURN_;
@ -86,13 +86,13 @@ HandleSigFpe(int num)
UngrabX();
DialogAlert(_("Enlightenment caused a Floating Point Exception.\n"
"\n"
"This means that Enlightenment or support library routines it calls\n"
"have performed an illegal mathematical operation (most likely\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"
"This means that Enlightenment or support library routines it calls\n"
"have performed an illegal mathematical operation (most likely\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"
"compile Enlightenment with debugging symbols in and run\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"
"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"
"dumps etc.\n"));
doExit("error");
EDBUG_RETURN_;
@ -111,12 +111,12 @@ HandleSigSegv(int num)
UngrabX();
DialogAlert(_("Enlightenment caused Segment Violation (Segfault)\n"
"\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"
"allowed access to. This is most likely a bug. It is recommended to\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"
"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"
"Enlightenment with debugging symbols in and run Enlightenment\n"
"under gdb so you can backtrace for where it died and send in a\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"
"useful bug report with backtrace information and variable\n"
"dumps etc.\n"));
abort();
@ -197,7 +197,7 @@ HandleSigBus(int num)
UngrabX();
DialogAlert(_("Enlightenment caused Bus Error.\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"
"hardware.\n"));
EDBUG_RETURN_;
@ -218,11 +218,11 @@ EHandleXError(Display * d, XErrorEvent * ev)
_("OK (edit file)"), "", _("Cancel (do NOT edit)"));
Alert(_("Another Window Manager is already running.\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"
"\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"
"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"
"quitting your current window manager, you will have\n"
"Enlightenment running.\n"
"\n"
@ -231,13 +231,13 @@ EHandleXError(Display * d, XErrorEvent * ev)
"\n"
"WARNING WARNING WARNING WARNING!\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?"),
_("YES (edit file)"), "", _("NO (do not edit)"));
Alert(_
("Are you absolutely sure you want to have Enlightenment\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"));
RESET_ALERT;
AddE();

1
src/icccm.c
View File

@ -912,7 +912,6 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
else
ewin->client.icon_name = NULL;
}
ok = 1;
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;
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;
XGCValues gcv;
@ -2113,9 +2113,9 @@ RedrawIconbox(Iconbox * ib)
EMoveResizeWindow(disp, ib->icon_win,
0, 0, ib->w - ib->scroll_thickness, ib->h);
if (
(ic =
FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
(ic =
FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{
EMoveResizeWindow(disp, ib->cover_win,
0, 0, ib->w - ib->scroll_thickness, ib->h);
@ -2135,9 +2135,9 @@ RedrawIconbox(Iconbox * ib)
ib->scroll_thickness, 0,
ib->w - ib->scroll_thickness, ib->h);
if (
(ic =
FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
(ic =
FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{
EMoveResizeWindow(disp, ib->cover_win,
ib->scroll_thickness, 0,
@ -2245,9 +2245,9 @@ RedrawIconbox(Iconbox * ib)
EMoveResizeWindow(disp, ib->icon_win,
0, 0, ib->w, ib->h - ib->scroll_thickness);
if (
(ic =
FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
(ic =
FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{
EMoveResizeWindow(disp, ib->cover_win,
0, 0, ib->w, ib->h - ib->scroll_thickness);
@ -2267,9 +2267,9 @@ RedrawIconbox(Iconbox * ib)
0, ib->scroll_thickness,
ib->w, ib->h - ib->scroll_thickness);
if (
(ic =
FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
(ic =
FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS)) && (!(ib->cover_hide)))
{
EMoveResizeWindow(disp, ib->cover_win,
0, ib->scroll_thickness,

866
src/ipc.c
View File

@ -81,12 +81,13 @@ void IPC_MemDebug(char *params, Client * c);
void IPC_Remember(char *params, Client * c);
void IPC_CurrentTheme(char *params, Client * c);
void IPC_Nop(char *params, Client * c);
void IPC_Xinerama(char *params, Client * c);
/* Changes By Asmodean_ <naru@caltech.edu> / #E@Efnet
*
* * * * IPC_ReloadMenus(...) / reload_menus - Reloads menus from menus.cfg
* * * *
* * * * */
* * * * * IPC_ReloadMenus(...) / reload_menus - Reloads menus from menus.cfg
* * * * *
* * * * * */
void IPC_ReloadMenus(char *params, Client * c);
@ -116,430 +117,495 @@ void IPC_Group(char *params, Client * c);
* --Mandrake
*/
IPCStruct IPCArray[] = {
IPCStruct IPCArray[] =
{
{
IPC_Help,
"help",
"gives you this help screen",
"Additional parameters will retrieve help on many topics - "
"\"help <command>\".\nuse \"help all\" for a list of commands."},
IPC_Help,
"help",
"gives you this help screen",
"Additional parameters will retrieve help on many topics - "
"\"help <command>\".\nuse \"help all\" for a list of commands."
},
{
IPC_Version,
"version",
"displays the current version of Enlightenment running",
NULL},
IPC_Version,
"version",
"displays the current version of Enlightenment running",
NULL
},
{
IPC_Nop,
"nop",
"IPC No-operation - returns nop",
NULL},
IPC_Nop,
"nop",
"IPC No-operation - returns nop",
NULL
},
{
IPC_Copyright,
"copyright",
"displays copyright information for Enlightenment",
NULL},
IPC_Copyright,
"copyright",
"displays copyright information for Enlightenment",
NULL
},
{
IPC_AutoSave,
"autosave",
"toggle the Automatic Saving Feature",
"Use \"autosave ?\" to list the current status\n"
"use \"autosave on\" or \"autosave off\" to toggle the status"},
IPC_AutoSave,
"autosave",
"toggle the Automatic Saving Feature",
"Use \"autosave ?\" to list the current status\n"
"use \"autosave on\" or \"autosave off\" to toggle the status"
},
{
IPC_DefaultTheme,
"default_theme",
"toggle the default theme",
"Use \"default_theme ?\" to get the current default theme\n"
"use \"default_theme /path/to/theme\"\n"
"you can retrieve a list of available themes from the "
"\"list_themes\" command"},
IPC_DefaultTheme,
"default_theme",
"toggle the default theme",
"Use \"default_theme ?\" to get the current default theme\n"
"use \"default_theme /path/to/theme\"\n"
"you can retrieve a list of available themes from the "
"\"list_themes\" command"
},
{
IPC_Restart,
"restart",
"Restart Enlightenment",
NULL},
IPC_Restart,
"restart",
"Restart Enlightenment",
NULL
},
{
IPC_RestartWM,
"restart_wm",
"Restart another window manager",
"Use \"restart_wm <wmname>\" to start another window manager.\n"
"Example: \"restart_wm fvwm\""},
IPC_RestartWM,
"restart_wm",
"Restart another window manager",
"Use \"restart_wm <wmname>\" to start another window manager.\n"
"Example: \"restart_wm fvwm\""
},
{
IPC_RestartTheme,
"restart_theme",
"Restart with another theme",
"Use \"restart_theme <themename>\" to restart enlightenment "
"with another theme\nExample: \"restart_theme icE\""},
IPC_RestartTheme,
"restart_theme",
"Restart with another theme",
"Use \"restart_theme <themename>\" to restart enlightenment "
"with another theme\nExample: \"restart_theme icE\""
},
{
IPC_Exit,
"exit",
"Exit Enlightenment",
NULL},
IPC_Exit,
"exit",
"Exit Enlightenment",
NULL
},
{
IPC_ForceSave,
"save_config",
"Force Enlightenment to save settings now",
NULL},
IPC_ForceSave,
"save_config",
"Force Enlightenment to save settings now",
NULL
},
{
IPC_SMFile,
"sm_file",
"Change the default prefix used for session saves",
"Average users are encouraged not to touch this setting.\n"
"Use \"sm_file ?\" to retrieve the current session management "
"file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" "
"to change."},
IPC_SMFile,
"sm_file",
"Change the default prefix used for session saves",
"Average users are encouraged not to touch this setting.\n"
"Use \"sm_file ?\" to retrieve the current session management "
"file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" "
"to change."
},
{
IPC_ListThemes,
"list_themes",
"List currently available themes",
NULL},
IPC_ListThemes,
"list_themes",
"List currently available themes",
NULL
},
{
IPC_GotoDesktop,
"goto_desktop",
"Change currently active destkop",
"Use \"goto_desktop num\" to go to a specific desktop.\n"
"Use \"goto_desktop next\" and \"goto_desktop prev\" to go to "
"the next and\n previous desktop\n"
"Use \"goto_desktop ?\" to find out what desktop you are " "currently on"},
IPC_GotoDesktop,
"goto_desktop",
"Change currently active destkop",
"Use \"goto_desktop num\" to go to a specific desktop.\n"
"Use \"goto_desktop next\" and \"goto_desktop prev\" to go to "
"the next and\n previous desktop\n"
"Use \"goto_desktop ?\" to find out what desktop you are "
"currently on"
},
{
IPC_GotoArea,
"goto_area",
"Change currently active area",
"Use \"goto_area <horiz> <vert>\" to go to a specific desktop.\n"
"Use \"goto_desktop next <vert/horiz>\" and \"goto_desktop "
"prev <vert/horiz>\" to go to the next and\n "
"previous areas\nUse \"goto_area ?\" to find out what area "
"you are currently on"},
IPC_GotoArea,
"goto_area",
"Change currently active area",
"Use \"goto_area <horiz> <vert>\" to go to a specific desktop.\n"
"Use \"goto_desktop next <vert/horiz>\" and \"goto_desktop "
"prev <vert/horiz>\" to go to the next and\n "
"previous areas\nUse \"goto_area ?\" to find out what area "
"you are currently on"
},
{
IPC_ShowIcons,
"show_icons",
"Toggle the display of icons on the desktop",
"Use \"show_icons on\" and \"show_icons off\" to change this setting\n"
"Use \"show_icons ?\" to retrieve the current setting"},
IPC_ShowIcons,
"show_icons",
"Toggle the display of icons on the desktop",
"Use \"show_icons on\" and \"show_icons off\" to change this setting\n"
"Use \"show_icons ?\" to retrieve the current setting"
},
{
IPC_FocusMode,
"focus_mode",
"Change the current focus mode setting",
"Use \"focus_mode <mode>\" to change the focus mode.\n"
"Use \"focus_mode ?\" to retrieve the current setting\n"
"Focus Types:\n"
"click: This is the traditional click-to-focus mode.\n"
"clicknograb: This is a similar focus mode, but without the "
"grabbing of the click\n "
"(you cannot click anywhere in a window to focus it)\n"
"pointer: The focus will follow the mouse pointer\n"
"sloppy: in sloppy-focus, the focus follows the mouse, "
"but when over\n "
"the desktop background the last window does not lose the focus"},
IPC_FocusMode,
"focus_mode",
"Change the current focus mode setting",
"Use \"focus_mode <mode>\" to change the focus mode.\n"
"Use \"focus_mode ?\" to retrieve the current setting\n"
"Focus Types:\n"
"click: This is the traditional click-to-focus mode.\n"
"clicknograb: This is a similar focus mode, but without the "
"grabbing of the click\n "
"(you cannot click anywhere in a window to focus it)\n"
"pointer: The focus will follow the mouse pointer\n"
"sloppy: in sloppy-focus, the focus follows the mouse, "
"but when over\n "
"the desktop background the last window does not lose the focus"
},
{
IPC_AdvancedFocus,
"advanced_focus",
"Toggle Advanced Focus Settings",
"use \"advanced_focus <option> <on/off/?>\" to change.\n"
"the options you may set are:\n"
"new_window_focus : all new windows get the keyboard focus\n"
"new_popup_window_focus : all new transient windows get focus\n"
"new_popup_of_owner_focus : transient windows from apps that have\n"
" focus already may receive focus\n"
"raise_on_keyboard_focus_switch: Raise windows when switching focus\n"
" with the keyboard\n"
"raise_after_keyboard_focus_switch: Raise windows after switching "
"focus\n"
" with the keyboard\n"
"pointer_to_keyboard_focus_window: Send the pointer to the focused\n"
" window when changing focus with the keyboard\n"
"pointer_after_keyboard_focus_window: Send the pointer to the "
"focused\n"
" window after changing focus with the keyboard\n"
"transients_follow_leader: popup windows appear together with the\n"
" window that created them.\n"
"switch_to_popup_location: switch to where a popup window appears\n"
"focus_list: display and use focus list (requires XKB)\n"
"manual_placement: place all new windows by hand"},
IPC_AdvancedFocus,
"advanced_focus",
"Toggle Advanced Focus Settings",
"use \"advanced_focus <option> <on/off/?>\" to change.\n"
"the options you may set are:\n"
"new_window_focus : all new windows get the keyboard focus\n"
"new_popup_window_focus : all new transient windows get focus\n"
"new_popup_of_owner_focus : transient windows from apps that have\n"
" focus already may receive focus\n"
"raise_on_keyboard_focus_switch: Raise windows when switching focus\n"
" with the keyboard\n"
"raise_after_keyboard_focus_switch: Raise windows after switching "
"focus\n"
" with the keyboard\n"
"pointer_to_keyboard_focus_window: Send the pointer to the focused\n"
" window when changing focus with the keyboard\n"
"pointer_after_keyboard_focus_window: Send the pointer to the "
"focused\n"
" window after changing focus with the keyboard\n"
"transients_follow_leader: popup windows appear together with the\n"
" window that created them.\n"
"switch_to_popup_location: switch to where a popup window appears\n"
"focus_list: display and use focus list (requires XKB)\n"
"manual_placement: place all new windows by hand"
},
{
IPC_NumDesks,
"num_desks",
"Change the number of available desktops",
"Use \"num_desks <num>\" to change the available number of desktops.\n"
"Use \"num_desks ?\" to retrieve the current setting"},
IPC_NumDesks,
"num_desks",
"Change the number of available desktops",
"Use \"num_desks <num>\" to change the available number of desktops.\n"
"Use \"num_desks ?\" to retrieve the current setting"
},
{
IPC_NumAreas,
"num_areas",
"Change the size of the virtual desktop",
"Use \"num_areas <width> <height>\" to change the size of the "
"virtual desktop.\nExample: \"num_areas 2 2\" makes 2x2 "
"virtual destkops\nUse \"num_areas ?\" to retrieve the " "current setting"},
IPC_NumAreas,
"num_areas",
"Change the size of the virtual desktop",
"Use \"num_areas <width> <height>\" to change the size of the "
"virtual desktop.\nExample: \"num_areas 2 2\" makes 2x2 "
"virtual destkops\nUse \"num_areas ?\" to retrieve the "
"current setting"
},
{
IPC_WinOps,
"win_op",
"Change a property of a specific window",
"Use \"win_op <windowid> <property> <value>\" to change the "
"property of a window\nYou can use the \"window_list\" "
"command to retrieve a list of available windows\n"
"You can use ? after most of these commands to receive the current\n"
"status of that flag\n"
"available win_op commands are:\n win_op <windowid> close\n "
"win_op <windowid> annihilate\n win_op <windowid> iconify\n "
"win_op <windowid> shade\n win_op <windowid> stick\n "
"win_op <windowid> toggle_<width/height/size> "
"<conservative/available>\n (or none for absolute)\n "
"win_op <windowid> border <BORDERNAME>\n win_op <windowid> "
"desk <desktochangeto/next/prev>\n win_op <windowid> "
"area <x> <y>\n win_op <windowid> <raise/lower>\n "
"win_op <windowid> <move/resize> <x> <y>\n "
"(you can use ? and ?? to retreive client and frame locations)\n "
"win_op <windowid> focus\n "
"win_op <windowid> title <title>\n "
"win_op <windowid> raise\n "
"win_op <windowid> lower\n "
"win_op <windowid> layer <0-100,4=normal>\n "
"<windowid> may be substituted with \"current\" to use the "
"current window"},
IPC_WinOps,
"win_op",
"Change a property of a specific window",
"Use \"win_op <windowid> <property> <value>\" to change the "
"property of a window\nYou can use the \"window_list\" "
"command to retrieve a list of available windows\n"
"You can use ? after most of these commands to receive the current\n"
"status of that flag\n"
"available win_op commands are:\n win_op <windowid> close\n "
"win_op <windowid> annihilate\n win_op <windowid> iconify\n "
"win_op <windowid> shade\n win_op <windowid> stick\n "
"win_op <windowid> toggle_<width/height/size> "
"<conservative/available>\n (or none for absolute)\n "
"win_op <windowid> border <BORDERNAME>\n win_op <windowid> "
"desk <desktochangeto/next/prev>\n win_op <windowid> "
"area <x> <y>\n win_op <windowid> <raise/lower>\n "
"win_op <windowid> <move/resize> <x> <y>\n "
"(you can use ? and ?? to retreive client and frame locations)\n "
"win_op <windowid> focus\n "
"win_op <windowid> title <title>\n "
"win_op <windowid> raise\n "
"win_op <windowid> lower\n "
"win_op <windowid> layer <0-100,4=normal>\n "
"<windowid> may be substituted with \"current\" to use the "
"current window"
},
{
IPC_WinList,
"window_list",
"Get a list of currently open windows",
"the list will be returned in the following "
"format - \"window_id : title\"\n"
"you can get an extended list using \"window_list extended\"\n"
"returns the following format:\n\"window_id : title :: "
"desktop : area_x area_y : x_coordinate y_coordinate\""},
IPC_WinList,
"window_list",
"Get a list of currently open windows",
"the list will be returned in the following "
"format - \"window_id : title\"\n"
"you can get an extended list using \"window_list extended\"\n"
"returns the following format:\n\"window_id : title :: "
"desktop : area_x area_y : x_coordinate y_coordinate\""
},
{
IPC_ButtonShow,
"button_show",
"Show or Hide buttons on desktop",
"use \"button_show <button/buttons/all_buttons_except/all> "
"<BUTTON_STRING>\"\nexamples: \"button_show buttons all\" "
"(removes all buttons and the dragbar)\n\"button_show\" "
"(removes all buttons)\n \"button_show buttons CONFIG*\" "
"(removes all buttons with CONFIG in the start)"},
IPC_ButtonShow,
"button_show",
"Show or Hide buttons on desktop",
"use \"button_show <button/buttons/all_buttons_except/all> "
"<BUTTON_STRING>\"\nexamples: \"button_show buttons all\" "
"(removes all buttons and the dragbar)\n\"button_show\" "
"(removes all buttons)\n \"button_show buttons CONFIG*\" "
"(removes all buttons with CONFIG in the start)"
},
{
IPC_ActiveNetwork,
"active_network",
"Enable or disable networking",
"use \"active_network <on/off>\" to toggle\n"
"use \"active_network ?\" to test status"},
IPC_ActiveNetwork,
"active_network",
"Enable or disable networking",
"use \"active_network <on/off>\" to toggle\n"
"use \"active_network ?\" to test status"
},
{
IPC_FX,
"fx",
"Toggle various effects on/off",
"Use \"fx <effect> <mode>\" to set the mode of a particular effect\n"
"Use \"fx <effect> ?\" to get the current mode\n"
"the following effects are available\n"
"ripples <on/off> (ripples that act as a water effect on the screen)\n"
"deskslide <on/off> (slide in desktops on desktop change)\n"
"mapslide <on/off> (slide in new windows)\n"
"raindrops <on/off> (raindrops will appear across your desktop)\n"
"menu_animate <on/off> (toggles the animation of menus "
"as they appear)\n"
"animate_win_shading <on/off> (toggles the animation of "
"window shading)\n"
"window_shade_speed <#> (number of pixels/sec to shade a window)\n"
"dragbar <on/off/left/right/top/bottom> (changes "
"location of dragbar)\n"
"tooltips <on/off/#> (changes state of tooltips and "
"seconds till popup)\n"
"autoraise <on/off/#> (changes state of autoraise and "
"seconds till raise)\n"
"edge_resistance <#/?/off> (changes the amount (in 1/100 seconds)\n"
" of time to push for resistance to give)\n"
"edge_snap_resistance <#/?> (changes the number of pixels that "
"a window will\n resist moving against another window\n"
"audio <on/off> (changes state of audio)\n"
"- seconds for tooltips and autoraise can have less than one second\n"
" (i.e. 0.5) or greater (1.3, 3.5, etc)"},
IPC_FX,
"fx",
"Toggle various effects on/off",
"Use \"fx <effect> <mode>\" to set the mode of a particular effect\n"
"Use \"fx <effect> ?\" to get the current mode\n"
"the following effects are available\n"
"ripples <on/off> (ripples that act as a water effect on the screen)\n"
"deskslide <on/off> (slide in desktops on desktop change)\n"
"mapslide <on/off> (slide in new windows)\n"
"raindrops <on/off> (raindrops will appear across your desktop)\n"
"menu_animate <on/off> (toggles the animation of menus "
"as they appear)\n"
"animate_win_shading <on/off> (toggles the animation of "
"window shading)\n"
"window_shade_speed <#> (number of pixels/sec to shade a window)\n"
"dragbar <on/off/left/right/top/bottom> (changes "
"location of dragbar)\n"
"tooltips <on/off/#> (changes state of tooltips and "
"seconds till popup)\n"
"autoraise <on/off/#> (changes state of autoraise and "
"seconds till raise)\n"
"edge_resistance <#/?/off> (changes the amount (in 1/100 seconds)\n"
" of time to push for resistance to give)\n"
"edge_snap_resistance <#/?> (changes the number of pixels that "
"a window will\n resist moving against another window\n"
"audio <on/off> (changes state of audio)\n"
"- seconds for tooltips and autoraise can have less than one second\n"
" (i.e. 0.5) or greater (1.3, 3.5, etc)"
},
{
IPC_DockPosition,
"dock",
"Change Data about the Dock Position and Direction",
"use \"dock direction <up/down/left/right/?>\" to set or "
"test direction\n"
"use \"dock start_pos ?\" to test the starting x y coords\n"
"use \"dock start_pos x y\" to set the starting x y coords"},
IPC_DockPosition,
"dock",
"Change Data about the Dock Position and Direction",
"use \"dock direction <up/down/left/right/?>\" to set or "
"test direction\n"
"use \"dock start_pos ?\" to test the starting x y coords\n"
"use \"dock start_pos x y\" to set the starting x y coords"
},
{
IPC_MoveMode,
"move_mode",
"Toggle the Window move mode",
"use \"move_mode <opaque/lined/box/shaded/semi-solid/translucent>\" "
"to set\nuse \"move_mode ?\" to get the current mode"},
IPC_MoveMode,
"move_mode",
"Toggle the Window move mode",
"use \"move_mode <opaque/lined/box/shaded/semi-solid/translucent>\" "
"to set\nuse \"move_mode ?\" to get the current mode"
},
{
IPC_ResizeMode,
"resize_mode",
"Toggle the Window resize mode",
"use \"resize_mode <opaque/lined/box/shaded/semi-solid>\" "
"to set\nuse \"resize_mode ?\" to get the current mode"},
IPC_ResizeMode,
"resize_mode",
"Toggle the Window resize mode",
"use \"resize_mode <opaque/lined/box/shaded/semi-solid>\" "
"to set\nuse \"resize_mode ?\" to get the current mode"
},
{
IPC_Pager,
"pager",
"Toggle the status of the Pager and various pager settings",
"use \"pager <on/off>\" to set the current mode\nuse \"pager ?\" "
"to get the current mode\n"
"use \"pager <#> <on/off/?>\" to toggle or test any desktop's pager\n"
"use \"pager hiq <on/off>\" to toggle high quality pager\n"
"use \"pager snap <on/off>\" to toggle snapshotting in the pager\n"
"use \"pager zoom <on/off>\" to toggle zooming in the pager\n"
"use \"pager title <on/off>\" to toggle title display in the pager\n"
"use \"pager scanrate <#>\" to toggle number of line update " "per second"},
IPC_Pager,
"pager",
"Toggle the status of the Pager and various pager settings",
"use \"pager <on/off>\" to set the current mode\nuse \"pager ?\" "
"to get the current mode\n"
"use \"pager <#> <on/off/?>\" to toggle or test any desktop's pager\n"
"use \"pager hiq <on/off>\" to toggle high quality pager\n"
"use \"pager snap <on/off>\" to toggle snapshotting in the pager\n"
"use \"pager zoom <on/off>\" to toggle zooming in the pager\n"
"use \"pager title <on/off>\" to toggle title display in the pager\n"
"use \"pager scanrate <#>\" to toggle number of line update "
"per second"
},
{
IPC_InternalList,
"internal_list",
"Retrieve a list of internal items",
"use \"internal_list <pagers/menus/dialogs/internal_ewin>\"\n"
"to retrieve a list of various internal window types.\n"
"(note that listing internal_ewin doesn't retrieve "
"dialogs currently)\n"},
IPC_InternalList,
"internal_list",
"Retrieve a list of internal items",
"use \"internal_list <pagers/menus/dialogs/internal_ewin>\"\n"
"to retrieve a list of various internal window types.\n"
"(note that listing internal_ewin doesn't retrieve "
"dialogs currently)\n"
},
{
IPC_SetFocus,
"set_focus",
"Set/Retrieve focused window",
"use \"set_focus <win_id>\" to focus a new window\n"
"use \"set_focus ?\" to retrieve the currently focused window"},
IPC_SetFocus,
"set_focus",
"Set/Retrieve focused window",
"use \"set_focus <win_id>\" to focus a new window\n"
"use \"set_focus ?\" to retrieve the currently focused window"
},
{
IPC_DialogOK,
"dialog_ok",
"Pop up a dialog box with an OK button",
"use \"dialog_ok <message>\" to pop up a dialog box."},
IPC_DialogOK,
"dialog_ok",
"Pop up a dialog box with an OK button",
"use \"dialog_ok <message>\" to pop up a dialog box."
},
{
IPC_ListClassMembers,
"list_class",
"List all members of a class",
"use \"list_class <classname>\" to get back a list of class members\n"
"available classes are:\n"
"sounds\n"
"actions\n"
"backgrounds\n" "borders\n" "text\n" "images\n" "cursors\n" "buttons"},
IPC_ListClassMembers,
"list_class",
"List all members of a class",
"use \"list_class <classname>\" to get back a list of class members\n"
"available classes are:\n"
"sounds\n"
"actions\n"
"backgrounds\n" "borders\n" "text\n" "images\n" "cursors\n" "buttons"
},
{
IPC_PlaySoundClass,
"play_sound",
"Plays a soundclass via E",
"use \"play_sound <soundclass>\" to play a sound.\n"
"use \"list_class sounds\" to get a list of available sounds"},
IPC_PlaySoundClass,
"play_sound",
"Plays a soundclass via E",
"use \"play_sound <soundclass>\" to play a sound.\n"
"use \"list_class sounds\" to get a list of available sounds"
},
{
IPC_SoundClass,
"soundclass",
"Create/Delete soundclasses",
"use \"soundclass create <classname> <filename>\" to create\n"
"use \"soundclass delete <classname>\" to delete"},
IPC_SoundClass,
"soundclass",
"Create/Delete soundclasses",
"use \"soundclass create <classname> <filename>\" to create\n"
"use \"soundclass delete <classname>\" to delete"
},
{
IPC_ImageClass,
"imageclass",
"Create/delete/modify/apply an ImageClass",
"This doesn't do anything yet."},
IPC_ImageClass,
"imageclass",
"Create/delete/modify/apply an ImageClass",
"This doesn't do anything yet."
},
{
IPC_ActionClass,
"actionclass",
"Create/Delete/Modify an ActionClass",
"This doesn't do anything yet."},
IPC_ActionClass,
"actionclass",
"Create/Delete/Modify an ActionClass",
"This doesn't do anything yet."
},
{
IPC_ColorModifierClass,
"colormod",
"Create/Delete/Modify a ColorModifierClass",
"This doesn't do anything yet."},
IPC_ColorModifierClass,
"colormod",
"Create/Delete/Modify a ColorModifierClass",
"This doesn't do anything yet."
},
{
IPC_TextClass,
"textclass",
"Create/Delete/Modify/apply a TextClass",
"This doesn't do anything yet."},
IPC_TextClass,
"textclass",
"Create/Delete/Modify/apply a TextClass",
"This doesn't do anything yet."
},
{
IPC_Background,
"background",
"Create/Delete/Modify a Background",
"use \"background\" to list all defined backgrounds.\n"
"use \"background <name>\" to delete a background.\n"
"use \"background <name> ?\" to show current values.\n"
"use \"background <name> <type> <value> to create / modify.\n"
"(get available types from \"background <name> ?\"."},
IPC_Background,
"background",
"Create/Delete/Modify a Background",
"use \"background\" to list all defined backgrounds.\n"
"use \"background <name>\" to delete a background.\n"
"use \"background <name> ?\" to show current values.\n"
"use \"background <name> <type> <value> to create / modify.\n"
"(get available types from \"background <name> ?\"."
},
{
IPC_Border,
"border",
"Create/Delete/Modify a Border",
"This doesn't do anything yet."},
IPC_Border,
"border",
"Create/Delete/Modify a Border",
"This doesn't do anything yet."
},
{
IPC_Cursor,
"cursor",
"Create/Delete/Modify a Cursor",
"This doesn't do anything yet."},
IPC_Cursor,
"cursor",
"Create/Delete/Modify a Cursor",
"This doesn't do anything yet."
},
{
IPC_Button,
"button",
"Create/Delete/Modify a Button",
"This doesn't do anything yet."},
IPC_Button,
"button",
"Create/Delete/Modify a Button",
"This doesn't do anything yet."
},
{
IPC_GeneralInfo,
"general_info",
"Retrieve some general information",
"use \"general_info <info>\" to retrieve information\n"
"available info is: screen_size"},
IPC_GeneralInfo,
"general_info",
"Retrieve some general information",
"use \"general_info <info>\" to retrieve information\n"
"available info is: screen_size"
},
{
IPC_Modules,
"module",
"Load/Unload/List Modules",
NULL},
IPC_Modules,
"module",
"Load/Unload/List Modules",
NULL
},
{
IPC_ReloadMenus,
"reload_menus",
"Reload menus.cfg without restarting (Asmodean_)",
NULL},
IPC_ReloadMenus,
"reload_menus",
"Reload menus.cfg without restarting (Asmodean_)",
NULL
},
{
IPC_GroupInfo,
"group_info",
"Retrieve some info on groups",
"use \"group_info [group_index]\""},
IPC_GroupInfo,
"group_info",
"Retrieve some info on groups",
"use \"group_info [group_index]\""
},
{
IPC_GroupOps,
"group_op",
"Group operations",
"use \"group_op <windowid> <property> [<value>]\" to perform "
"group operations on a window.\n"
"Available group_op commands are:\n"
" group_op <windowid> start\n"
" group_op <windowid> add [<group_index>]\n"
" group_op <windowid> remove [<group_index>]\n"
" group_op <windowid> break [<group_index>]\n"
" group_op <windowid> showhide\n"},
IPC_GroupOps,
"group_op",
"Group operations",
"use \"group_op <windowid> <property> [<value>]\" to perform "
"group operations on a window.\n"
"Available group_op commands are:\n"
" group_op <windowid> start\n"
" group_op <windowid> add [<group_index>]\n"
" group_op <windowid> remove [<group_index>]\n"
" group_op <windowid> break [<group_index>]\n"
" group_op <windowid> showhide\n"
},
{
IPC_Group,
"group",
"Group commands",
"use \"group <groupid> <property> <value>\" to set group properties.\n"
"Available group commands are:\n"
" group <groupid> num_members <on/off/?>\n"
" group <groupid> iconify <on/off/?>\n"
" group <groupid> kill <on/off/?>\n"
" group <groupid> move <on/off/?>\n"
" group <groupid> raise <on/off/?>\n"
" group <groupid> set_border <on/off/?>\n"
" group <groupid> stick <on/off/?>\n"
" group <groupid> shade <on/off/?>\n"
" group <groupid> mirror <on/off/?>\n"},
IPC_Group,
"group",
"Group commands",
"use \"group <groupid> <property> <value>\" to set group properties.\n"
"Available group commands are:\n"
" group <groupid> num_members <on/off/?>\n"
" group <groupid> iconify <on/off/?>\n"
" group <groupid> kill <on/off/?>\n"
" group <groupid> move <on/off/?>\n"
" group <groupid> raise <on/off/?>\n"
" group <groupid> set_border <on/off/?>\n"
" group <groupid> stick <on/off/?>\n"
" group <groupid> shade <on/off/?>\n"
" group <groupid> mirror <on/off/?>\n"
},
{
IPC_KDE,
"kde",
"Turns on and off KDE support",
"use \"kde on\" and \"kde off\" to enable/disable support"},
IPC_KDE,
"kde",
"Turns on and off KDE support",
"use \"kde on\" and \"kde off\" to enable/disable support"
},
{
IPC_MemDebug,
"dump_mem_debug",
"Dumps memory debugging information out to e.mem.out",
"Use this command to have E dump its current memory debugging table\n"
"to the e.mem.out file. NOTE: please read comments at the top of\n"
"memory.c to see how to enable this. This will let you hunt memory\n"
"leaks, over-allocations of memory, and other memory-related problems\n"
"very easily with all pointers allocated stamped with a time, call\n"
"tree that led to that allocation, file and line, and the chunk size.\n"},
IPC_MemDebug,
"dump_mem_debug",
"Dumps memory debugging information out to e.mem.out",
"Use this command to have E dump its current memory debugging table\n"
"to the e.mem.out file. NOTE: please read comments at the top of\n"
"memory.c to see how to enable this. This will let you hunt memory\n"
"leaks, over-allocations of memory, and other "
"memory-related problems\n"
"very easily with all pointers allocated stamped with a time, call\n"
"tree that led to that allocation, file and line, "
"and the chunk size.\n"
},
{
IPC_Remember,
"remember",
"Remembers parameters for client window ID x",
"usage:\n"
" remember <windowid> <parameter>...\n"
" where parameter is one of: all, none, border, desktop, size,\n"
" location, layer, sticky, icon, shade, group, dialog, command\n"
" Multiple parameters may be given."},
IPC_Remember,
"remember",
"Remembers parameters for client window ID x",
"usage:\n"
" remember <windowid> <parameter>...\n"
" where parameter is one of: all, none, border, desktop, size,\n"
" location, layer, sticky, icon, shade, group, dialog, command\n"
" Multiple parameters may be given."
},
{
IPC_CurrentTheme,
"current_theme",
"Returns the name of the currently used theme",
NULL}
IPC_CurrentTheme,
"current_theme",
"Returns the name of the currently used theme",
NULL
},
{
IPC_Xinerama,
"xinerama",
"return xinerama information about your current system",
NULL
}
};
/* the functions */
@ -551,6 +617,41 @@ IPCStruct IPCArray[] = {
* - Mandrake
*/
void
IPC_Xinerama(char *params, Client * c)
{
params = NULL;
#ifdef HAS_XINERAMA
if (xinerama_active)
{
XineramaScreenInfo *screens;
int num, i;
char stufftosend[4096];
screens = XineramaQueryScreens(disp, &num);
strcpy(stufftosend, "");
for (i = 0; i < num; i++)
{
char s[1024];
sprintf(s, "Head %d\nscreen # %d\nx origin: %d\ny origin: %d\n"
"width: %d\nheight: %d\n\n", i, screens[i].screen_number,
screens[i].x_org, screens[i].y_org, screens[i].width,
screens[i].height);
strcat(stufftosend, s);
}
CommsSend(c, stufftosend);
}
#else
CommsSend(c, "Xinerama is disabled on your system");
#endif
return;
}
void
IPC_Nop(char *params, Client * c)
{
@ -1012,13 +1113,13 @@ IPC_Background(char *params, Client * c)
" bg.solid\t %i %i %i \n"
" bg.file\t %s \ttop.file\t %s \n"
" bg.tile\t %i \n"
" bg.keep_aspect\t %i \ttop.keep_aspect\t %i \n"
" bg.keep_aspect\t %i \ttop.keep_aspect\t %i \n"
" bg.xjust\t %i \ttop.xjust\t %i \n"
" bg.yjust\t %i \ttop.yjust\t %i \n"
" bg.xperc\t %i \ttop.xperc\t %i \n"
" bg.yperc\t %i \ttop.yperc\t %i \n",
bg->name, bg->ref_count,
bg->bg.solid.r, bg->bg.solid.g, bg->bg.solid.b,
bg->bg.solid.r, bg->bg.solid.g, bg->bg.solid.b,
bg->bg.file, bg->top.file,
bg->bg.tile,
bg->bg.keep_aspect, bg->top.keep_aspect,
@ -1045,7 +1146,6 @@ IPC_Background(char *params, Client * c)
0, 0, 0, NULL, 0, 0, 0, 0, 0);
AddItem(bg, bg->name, 0, LIST_TYPE_BACKGROUND);
}
if (!bg)
Esnprintf(buf, sizeof(buf),
"Error: could not create background '%s'.",
@ -1128,7 +1228,7 @@ IPC_Background(char *params, Client * c)
else
{
Esnprintf(buf, sizeof(buf),
"Error: unknown background value type '%s'.",
"Error: unknown background value type '%s'.",
type);
}
}
@ -1509,7 +1609,7 @@ IPC_ColorModifierClass(char *params, Client * c)
cm = (ColorModifierClass *) FindItem(param1, 0,
LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
LIST_TYPE_COLORMODIFIER);
if (cm)
FreeCMClass(cm);
}
@ -1522,7 +1622,7 @@ IPC_ColorModifierClass(char *params, Client * c)
cm = (ColorModifierClass *) FindItem(param1, 0,
LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
LIST_TYPE_COLORMODIFIER);
if (cm)
Esnprintf(buf, sizeof(buf), "%u references remain.",
cm->ref_count);
@ -3376,7 +3476,7 @@ IPC_FX(char *params, Client * c)
if (!strcmp(word2, "?"))
{
Esnprintf(buf, sizeof(buf),
"edge_snap_distance: %d", mode.edge_snap_dist);
"edge_snap_distance: %d", mode.edge_snap_dist);
}
else
{
@ -4103,7 +4203,7 @@ IPC_WinOps(char *params, Client * c)
if (!strcmp(param1, "?"))
{
Esnprintf(buf, sizeof(buf),
"window size: %d %d", ewin->client.w,
"window size: %d %d", ewin->client.w,
ewin->client.h);
}
else if (!strcmp(param1, "??"))
@ -4763,7 +4863,7 @@ IPC_Copyright(char *params, Client * c)
"Kimball Thurston,\n"
"Michael Kellen, Frederic Devernay, Felix Bellaby, "
"Michael Jennings,\n"
"Christian Kreibich, Peter Kjellerstedt, Troy Pesola, Owen Taylor, "
"Christian Kreibich, Peter Kjellerstedt, Troy Pesola, Owen Taylor, "
"Stalyn,\n"
"Knut Neumann, Nathan Heagy, Simon Forman, "
"Brent Nelson,\n"

8
src/kde.c
View File

@ -88,12 +88,12 @@ static Atom KDE_WIN_TITLE = 0;
/* the modules I have to communicate to */
typedef struct KModuleList
{
{
Window win;
struct KModuleList *next;
Window win;
struct KModuleList *next;
}
}
KModuleList;
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])) ||
(!strcmp("-version", argv[j])) ||
(!strcmp("--version", argv[j])) || (!strcmp("-v", argv[j])))
(!strcmp("--version", argv[j])) || (!strcmp("-v", argv[j])))
{
printf(_
("Enlightenment Version: %s\nLast updated on: %s\n"),

32
src/memory.c
View File

@ -71,10 +71,10 @@ end: \
}
static struct _symtab
{
void *val;
char *symbol;
}
{
void *val;
char *symbol;
}
*sym = NULL;
static int sym_count = 0;
@ -197,15 +197,15 @@ __Emalloc(int size, const char *file, int line)
_("Restart Enlightenment"), _("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\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"
"Either this is a bug where ridiculous amounts of memory\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"
"If you have a low memory system it is suggested to either\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"
"The malloc requested was at %s, line %d\n "),
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)
UngrabX();
ASSIGN_ALERT(_
("Error in reallocating memory that hasn't been allocated"),
("Error in reallocating memory that hasn't been allocated"),
_("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment"));
_("Quit Enlightenment"));
Alert(_
("WARNING!!!!!!\n" "\n"
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n"
@ -283,7 +283,7 @@ _("Quit Enlightenment"));
"memory chunk that has not been allocated or has already been\n"
"freed.\n" "\n" "This is definitely a bug. Please report it.\n"
"\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;
EDBUG_RETURN(NULL);
}
@ -298,15 +298,15 @@ _("Quit Enlightenment"));
_("Restart Enlightenment"), _("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\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"
"Either this is a bug where ridiculous amounts of memory\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"
"If you have a low memory system it is suggested to either\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"
"The realloc requested was at %s, line %d\n "),
size, (float)size / 1024, (float)size / (1024 * 1024), file,
@ -376,11 +376,11 @@ __Efree(void *ptr, const char *file, int line)
ASSIGN_ALERT(_
("Error in freeing memory that hasn't been allocated"),
_("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment"));
_("Quit Enlightenment"));
Alert(_
("WARNING!!!!!!\n" "\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"
"\n" "The error occurred at %s, line %d.\n"), ptr, file, line);
RESET_ALERT;
@ -399,7 +399,7 @@ _("Quit Enlightenment"));
"Enlightenment attempted to free a NULL pointer.\n"
"\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"
"The pointer value was %x.\n"
"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 =
0, maxx1, maxx2, w, h, x, y, r, mmw, mmh;
0, maxx1, maxx2, w, h, x, y, r, mmw, mmh;
unsigned int iw, ih;
ImlibImage *im;
XSetWindowAttributes att;
@ -1016,10 +1016,10 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
struct stat st;
const char *chmap =
#ifndef __EMX__
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
#else
"0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_";
"0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_";
#endif
FILE *f;
@ -1100,8 +1100,9 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibColor icl;
char tile = 1, keep_asp = 0;
int width, height, scalex =
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
0, scaley = 0;
int scr_asp, im_asp, w2,
h2;
int maxw = 48, maxh = 48;
int justx = 512, justy = 512;
@ -1319,7 +1320,7 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
chmap[(cc >> 6) & 0x3f],
chmap[(cc >> 12) & 0x3f],
chmap[(cc >> 18) & 0x3f],
chmap[(cc >> 24) & 0x3f], chmap[(cc >> 28) & 0x3f]);
chmap[(cc >> 24) & 0x3f], chmap[(cc >> 28) & 0x3f]);
bg =
(Background *) FindItem(s3, 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND);
@ -1334,7 +1335,7 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibColor icl;
char tile = 1, keep_asp = 0;
int width, height, scalex =
0, scaley = 0;
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
int maxw = 48, maxh = 48;
@ -1703,7 +1704,7 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir)
if (f)
{
char *iname = NULL, *exec = NULL, *texec =
NULL, *tmp;
NULL, *tmp;
char *en_name = NULL;
while (fgets(s, sizeof(s), f))
@ -1715,8 +1716,7 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir)
else if (name_buf[0] &&
!strncmp(s, name_buf, 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=")]));
else if (!strncmp(s, "Exec=", strlen("Exec=")))
exec = duplicate(&(s[strlen("Exec=")]));

8
src/modules.c
View File

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

22
src/mwm.c
View File

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

13
src/network.c
View File

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

21
src/pager.c
View File

@ -450,7 +450,8 @@ PagerUpdateTimeout(int val, void *data)
double cur_time, in;
static int calls = 0;
int y, y2, phase, ax, ay, cx, cy, ww, hh, xx, yy;
static int offsets[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
static int offsets[8] =
{0, 4, 2, 6, 1, 5, 3, 7};
p = (Pager *) data;
Esnprintf(s, sizeof(s), "__.%x", p->win);
@ -527,11 +528,11 @@ CreatePager(void)
(_("Warning!"),
_("\n"
"You seem to have an X Server capable of Shared Memory\n"
"but it is incapable of doing ZPixmap Shared pixmaps\n"
"(The server does not claim to be able to do them).\n"
"but it is incapable of doing ZPixmap Shared pixmaps\n"
"(The server does not claim to be able to do them).\n"
"\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"
"\n"
"It is suggested you change the settings on your pager to\n"
@ -547,7 +548,7 @@ CreatePager(void)
"\n"
"Please enable Shared Pixmaps in your Imlib configuration\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
@ -556,15 +557,15 @@ CreatePager(void)
DIALOG_OK
(_("Warning!"),
_("\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"
"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"
"have disabled MIT-SHM Shared memory in your Imlib configuration.\n"
"This means the Enlightenment Pager will perform slowly and use\n"
"more system resources than it would when Shared Memory is\n"
"This means the Enlightenment Pager will perform slowly and use\n"
"more system resources than it would when Shared Memory is\n"
"available.\n"
"\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"));
}
did_dialog = 1;

3
src/scursor.c
View File

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

43
src/session.c
View File

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

8
src/setup.c
View File

@ -610,6 +610,14 @@ SetupX()
desks.hiqualitybg = 1;
SetAreaSize(2, 1);
#ifdef HAS_XINERAMA
{
xinerama_active = XineramaIsActive(disp);
}
#endif
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; task_menu[i++] = NULL);
EDBUG_RETURN_;

12
src/size.c
View File

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

3
src/snprintf.c
View File

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

8
src/startup.c
View File

@ -31,7 +31,8 @@ AddEToFile(char *file)
char *s1, *s2;
char hase = 0;
char foundwm = 0;
char *wms[] = {
char *wms[] =
{
"wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm",
"gwm",
"mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm",
@ -77,7 +78,7 @@ AddEToFile(char *file)
{
fprintf(f2, "#%s", s);
fprintf(f2,
"\n# Enlightenment inserted Execution string here\n");
"\n# Enlightenment inserted Execution string here\n");
fprintf(f2, "exec %s/enlightenment\n\n",
ENLIGHTENMENT_BIN);
foundwm = 1;
@ -235,7 +236,8 @@ CreateStartupDisplay(char start)
}
else
{
int k, spd, x, y, xOffset, yOffset, ty, fy, min, speed;
int k, spd, x, y, xOffset, yOffset, ty, fy, min,
speed;
/* we have this many so that we save on lines o code - eAndroid */
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);
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,
&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);
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));
}
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);
strcat(new_line, ". . . ");
strcat(new_line,
lines[i] + ((len - nuke_count) / 4) + nuke_count);
lines[i] + ((len - nuke_count) / 4) + nuke_count);
wid =
XTextWidth16(ts->xfont, (XChar2b *) new_line,
strlen(new_line) / 2);

8
src/theme.c
View File

@ -31,7 +31,7 @@ char *
append_merge_dir(char *dir, char ***list, int *count)
{
char s[FILEPATH_LEN_MAX], ss[FILEPATH_LEN_MAX], **str =
NULL, *def = NULL;
NULL, *def = NULL;
char already, *tmp, *tmp2, ok;
int i, j, num;
@ -109,7 +109,7 @@ ListThemes(int *number)
{
char s[FILEPATH_LEN_MAX], **list = NULL, *def = NULL, *def2 =
NULL;
NULL;
int count = 0;
Esnprintf(s, sizeof(s), "%s/themes", UserEDir());
@ -249,7 +249,7 @@ ExtractTheme(char *theme)
{
/*gzipped tarball */
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')
&& (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"
"Enlightenment has fallen back to using the DEFAULT theme.\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);
}

35
src/tooltips.c
View File

@ -135,12 +135,13 @@ 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 ww, hh, adx, ady, dist;
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;
char pq;
int *heights = NULL;
ImageClass *ic = NULL;
int cols[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int cols[10] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
EDBUG(5, "ShowToolTip");
if (!tt)
@ -663,7 +664,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ac->list[i]->event == EVENT_DOUBLE_DOWN)
{
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);
}
if (ac->list[i]->anybutton)
@ -682,7 +683,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
ic->norm.
normal->im),
Imlib_copy_mask(id,
ic->norm.normal->im),
ic->norm.normal->im),
x, y);
x += ic->norm.normal->im->rgb_width;
}
@ -699,7 +700,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -720,7 +721,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -741,7 +742,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -762,7 +763,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -783,7 +784,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -810,7 +811,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -834,7 +835,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -858,7 +859,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -882,7 +883,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -906,7 +907,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -930,7 +931,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -954,7 +955,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,
@ -978,7 +979,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (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);
PastePixmap(disp, tt->win,

16
src/ttfont.c
View File

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

4
src/warp.c
View File

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

2
src/windowmatch.c
View File

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

12
src/x.c
View File

@ -587,7 +587,8 @@ DelXID(Window win)
}
}
Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
Window
ECreateEventWindow(Window parent, int x, int y, int w, int h)
{
Window win;
XSetWindowAttributes attr;
@ -603,7 +604,8 @@ Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
* create a window which will accept the keyboard focus when no other
* windows have it
*/
Window ECreateFocusWindow(Window parent, int x, int y, int w, int h)
Window
ECreateFocusWindow(Window parent, int x, int y, int w, int h)
{
Window win;
XSetWindowAttributes attr;
@ -737,7 +739,8 @@ WinExists(Window win)
EDBUG_RETURN(0);
}
Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
Window
WindowAtXY_0(Window base, int bx, int by, int x, int y)
{
Window *list = NULL;
XWindowAttributes att;
@ -784,7 +787,8 @@ Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
EDBUG_RETURN(base);
}
Window WindowAtXY(int x, int y)
Window
WindowAtXY(int x, int y)
{
Window *list = NULL;
Window child = 0, parent_win = 0, root_win = 0;