Mon Dec 6 21:32:16 PST 1999
(KainX) Make this sucker build again. SVN revision: 1524
This commit is contained in:
parent
74c88ccd12
commit
1f707abe13
|
@ -4013,3 +4013,10 @@ Mon Dec 6 14:57:42 PST 1999
|
|||
(Raster)
|
||||
|
||||
how DID border s get that in there?????????????
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Mon Dec 6 21:32:16 PST 1999
|
||||
(KainX)
|
||||
|
||||
Make this sucker build again.
|
||||
|
|
103
src/actions.c
103
src/actions.c
|
@ -664,7 +664,7 @@ 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"),
|
||||
"This is because the file does not exist.\n"),
|
||||
(char *)exe);
|
||||
/* relative path */
|
||||
else
|
||||
|
@ -672,9 +672,9 @@ runApp(char *exe, char *params)
|
|||
("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,25 +689,25 @@ runApp(char *exe, char *params)
|
|||
/* can execute it */
|
||||
if (canexec((char *)path))
|
||||
DialogAlertOK(gettext
|
||||
("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(gettext
|
||||
("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"),
|
||||
("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 */
|
||||
|
@ -716,19 +716,19 @@ runApp(char *exe, char *params)
|
|||
/* its a dir */
|
||||
if (isdir((char *)path))
|
||||
DialogAlertOK(gettext
|
||||
("There was an error running the program:\n"
|
||||
"%s\n"
|
||||
"This program could not be executed.\n"
|
||||
"This is because the file is infact "
|
||||
"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 infact "
|
||||
"a directory.\n"), (char *)path);
|
||||
/* its not a file or a dir */
|
||||
else
|
||||
DialogAlertOK(gettext
|
||||
("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);
|
||||
|
@ -1366,11 +1366,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];
|
||||
|
@ -2328,7 +2328,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))
|
||||
|
@ -2358,7 +2358,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))
|
||||
|
@ -3151,13 +3151,13 @@ doAbout(void *params)
|
|||
ENLIGHTENMENT_VERSION
|
||||
" version\n"
|
||||
"of the Enlightenment "
|
||||
"window manager.\n Enlightenment is still under "
|
||||
"window manager.\n Enlightenment is still under "
|
||||
"development, but\n"
|
||||
"we have tried to iron out all the bugs "
|
||||
"that\nwe can find. If "
|
||||
"you find a bug in the software,\n please do "
|
||||
"not hesitate to send "
|
||||
"in a bug report.\nSee \"Help\" for information "
|
||||
"in a bug report.\nSee \"Help\" for information "
|
||||
"on joining the\n"
|
||||
"mailing list.\n"
|
||||
"\n"
|
||||
|
@ -3323,7 +3323,7 @@ doConfigure(void *params)
|
|||
{
|
||||
ChooseGroupDialog(ewin,
|
||||
gettext
|
||||
(" 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);
|
||||
}
|
||||
|
@ -3342,7 +3342,8 @@ struct _keyset
|
|||
int
|
||||
doInsertKeys(void *params)
|
||||
{
|
||||
const struct _keyset ks[] = {
|
||||
const struct _keyset ks[] =
|
||||
{
|
||||
{"a", 0, "a"},
|
||||
{"b", 0, "b"},
|
||||
{"c", 0, "c"},
|
||||
|
@ -3567,8 +3568,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;
|
||||
|
@ -3674,10 +3675,10 @@ doAddToGroup(void *params)
|
|||
ChooseGroupDialog(ewin,
|
||||
gettext
|
||||
("\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);
|
||||
}
|
||||
|
@ -3760,20 +3761,20 @@ doZoom(void *params)
|
|||
{
|
||||
fprintf(f,
|
||||
gettext
|
||||
("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(gettext("Warning !!!"),
|
||||
gettext
|
||||
("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 artifacts 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);
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ int debug_level;
|
|||
char *call_stack[1024];
|
||||
|
||||
void
|
||||
Alert(char *fmt, ...)
|
||||
Alert(char *fmt,...)
|
||||
{
|
||||
char text[10240];
|
||||
va_list ap;
|
||||
|
|
10
src/areas.c
10
src/areas.c
|
@ -171,9 +171,9 @@ SlideWindowsBy(Window * win, int num, int dx, int dy, int speed)
|
|||
int dsec, dusec;
|
||||
double tm;
|
||||
struct _xy
|
||||
{
|
||||
int x, y;
|
||||
}
|
||||
{
|
||||
int x, y;
|
||||
}
|
||||
*xy;
|
||||
|
||||
EDBUG(5, "SlideWindowsBy");
|
||||
|
@ -449,12 +449,12 @@ SetCurrentArea(int ax, int ay)
|
|||
if (mode.movemode == 5)
|
||||
DrawEwinShape(lst[i], mode.movemode,
|
||||
x, y,
|
||||
lst[i]->client.w, lst[i]->client.h,
|
||||
lst[i]->client.w, lst[i]->client.h,
|
||||
4);
|
||||
else
|
||||
DrawEwinShape(lst[i], mode.movemode,
|
||||
x, y,
|
||||
lst[i]->client.w, lst[i]->client.h,
|
||||
lst[i]->client.w, lst[i]->client.h,
|
||||
0);
|
||||
if (mode.flipp)
|
||||
{
|
||||
|
|
|
@ -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) &&
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
tmph, i;
|
||||
struct timeval timev1, timev2;
|
||||
int dsec, dusec;
|
||||
double tm;
|
||||
|
@ -2532,7 +2532,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->border->
|
||||
|
|
|
@ -92,7 +92,7 @@ CreateButton(char *name, ImageClass * iclass, ActionClass * aclass,
|
|||
ECreateWindow(desks.desk[desk % ENLIGHTENMENT_CONF_NUM_DESKTOPS].win,
|
||||
-100, -100, 50, 50, 0);
|
||||
XSelectInput(disp, b->win,
|
||||
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask |
|
||||
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask |
|
||||
ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
|
||||
PointerMotionMask);
|
||||
b->x = -1;
|
||||
|
|
16
src/comms.c
16
src/comms.c
|
@ -382,7 +382,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;
|
||||
|
||||
|
@ -1096,8 +1097,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 =
|
||||
|
@ -1521,9 +1521,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();
|
||||
|
@ -1833,7 +1833,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,
|
||||
|
@ -1927,7 +1927,7 @@ HandleComms(XEvent * ev)
|
|||
{
|
||||
char buf[FILEPATH_LEN_MAX], *ret = NULL, none[] =
|
||||
|
||||
"-NONE-";
|
||||
"-NONE-";
|
||||
EWin **lst;
|
||||
int i, num;
|
||||
|
||||
|
|
61
src/config.c
61
src/config.c
|
@ -795,7 +795,7 @@ Config_Control(FILE * ConfigFile)
|
|||
default:
|
||||
RecoverUserConfig();
|
||||
Alert(gettext("Warning: unable to determine what to do with\n"
|
||||
"the following text in the middle of current Control "
|
||||
"the following text in the middle of current Control "
|
||||
"definition:\n"
|
||||
"%s\nWill ignore and continue...\n"), s);
|
||||
}
|
||||
|
@ -1170,7 +1170,7 @@ BorderPartLoad(FILE * ConfigFile, char type, Border * b)
|
|||
int flags = FLAG_BUTTON;
|
||||
char isregion = 0, keepshade = 1;
|
||||
int wmin = 0, wmax = 0, hmin = 0, hmax = 0, torigin = 0,
|
||||
txp = 0, txa = 0, typ = 0, tya = 0, borigin = 0;
|
||||
txp = 0, txa = 0, typ = 0, tya = 0, borigin = 0;
|
||||
int bxp = 0, bxa = 0, byp = 0, bya = 0;
|
||||
int fields;
|
||||
|
||||
|
@ -1400,8 +1400,7 @@ Config_Button(FILE * ConfigFile)
|
|||
int flags = 0, minw = 1, maxw = 99999, minh = 1;
|
||||
int maxh = 99999, xo = 0, yo = 0, xa = 0;
|
||||
int xr = 0, ya = 0, yr = 0, xsr = 0, xsa = 0, ysr = 0,
|
||||
|
||||
ysa = 0;
|
||||
ysa = 0;
|
||||
char simg = 0;
|
||||
int desk = 0;
|
||||
char sticky = 0;
|
||||
|
@ -1444,7 +1443,7 @@ Config_Button(FILE * ConfigFile)
|
|||
{
|
||||
bt = CreateButton(name, ic, ac, tc, label, ontop, flags,
|
||||
minw, maxw, minh, maxh, xo, yo, xa, xr, ya,
|
||||
yr, xsr, xsa, ysr, ysa, simg, desk, sticky);
|
||||
yr, xsr, xsa, ysr, ysa, simg, desk, sticky);
|
||||
bt->default_show = show;
|
||||
bt->internal = internal;
|
||||
AddItem(bt, bt->name, 0, LIST_TYPE_BUTTON);
|
||||
|
@ -2244,7 +2243,7 @@ Config_ActionClass(FILE * ConfigFile)
|
|||
{
|
||||
action_tooltipstring = Erealloc(action_tooltipstring,
|
||||
(strlen(action_tooltipstring)
|
||||
+ strlen(atword(s, 2)) + 2));
|
||||
+ strlen(atword(s, 2)) + 2));
|
||||
action_tooltipstring = strcat(action_tooltipstring, "\n");
|
||||
action_tooltipstring =
|
||||
strcat(action_tooltipstring, atword(s, 2));
|
||||
|
@ -2282,7 +2281,7 @@ Config_ActionClass(FILE * ConfigFile)
|
|||
RecoverUserConfig();
|
||||
Alert(gettext
|
||||
("Warning: Configuration appears to have ended before we were\n"
|
||||
"Done loading an Action Class block. Outcome is likely not good.\n"));
|
||||
"Done loading an Action Class block. Outcome is likely not good.\n"));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -2854,7 +2853,7 @@ Config_ToolTip(FILE * ConfigFile)
|
|||
}
|
||||
}
|
||||
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
|
||||
"Done loading an ToolTip block. Outcome is likely not good.\n"));
|
||||
"Done loading an ToolTip block. Outcome is likely not good.\n"));
|
||||
|
||||
}
|
||||
|
||||
|
@ -2936,7 +2935,7 @@ Config_Extras(FILE * ConfigFile)
|
|||
}
|
||||
RecoverUserConfig();
|
||||
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
|
||||
"Done loading an Extras block. Outcome is likely not good.\n"));
|
||||
"Done loading an Extras block. Outcome is likely not good.\n"));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -3034,7 +3033,7 @@ Config_Ibox(FILE * ConfigFile)
|
|||
}
|
||||
RecoverUserConfig();
|
||||
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
|
||||
"Done loading an Iconbox block. Outcome is likely not good.\n"));
|
||||
"Done loading an Iconbox block. Outcome is likely not good.\n"));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -3148,7 +3147,7 @@ Config_WindowMatch(FILE * ConfigFile)
|
|||
}
|
||||
}
|
||||
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
|
||||
"Done loading an WindowMatch block. Outcome is likely not good.\n"));
|
||||
"Done loading an WindowMatch block. Outcome is likely not good.\n"));
|
||||
}
|
||||
|
||||
int
|
||||
|
@ -3200,7 +3199,7 @@ OpenConfigFileForReading(char *path, char preprocess)
|
|||
"Enlightenment is looking for epp here:\n"
|
||||
"%s\n"
|
||||
"This is a FATAL ERROR.\n"
|
||||
"This is probably due to either the program not existing or\n"
|
||||
"This is probably due to either the program not existing or\n"
|
||||
"it not being able to be executed by you.\n"),
|
||||
epp_path);
|
||||
doExit(gettext("error"));
|
||||
|
@ -3297,8 +3296,7 @@ LoadConfigFile(char *f)
|
|||
{
|
||||
FILE *ConfigFile;
|
||||
char s[FILEPATH_LEN_MAX], s2[FILEPATH_LEN_MAX], *file,
|
||||
|
||||
*ppfile;
|
||||
*ppfile;
|
||||
int i;
|
||||
char notheme = 0;
|
||||
|
||||
|
@ -3411,15 +3409,15 @@ LoadOpenConfigFile(FILE * ConfigFile)
|
|||
"\n"
|
||||
"The configuration for the theme you are "
|
||||
"running is\n"
|
||||
"incompatible. It's config revision is %i. "
|
||||
"incompatible. It's config revision is %i. "
|
||||
"It needs to\n"
|
||||
"be marked as being revision %i\n"
|
||||
"\n"
|
||||
"Please contact the theme author or "
|
||||
"maintainer and\n"
|
||||
"inform them that in order for their theme "
|
||||
"inform them that in order for their theme "
|
||||
"to function\n"
|
||||
"with this version of Enlightenment, they "
|
||||
"with this version of Enlightenment, they "
|
||||
"have to\n"
|
||||
"update it to the current settings, and "
|
||||
"then match\n"
|
||||
|
@ -3429,8 +3427,8 @@ LoadOpenConfigFile(FILE * ConfigFile)
|
|||
"Enlightenment's\n"
|
||||
"it may be that you haven't upgraded "
|
||||
"Enlightenment for\n"
|
||||
"a while and this theme takes advantages of new\n"
|
||||
"features in Enlightenment in new versions.\n"),
|
||||
"a while and this theme takes advantages of new\n"
|
||||
"features in Enlightenment in new versions.\n"),
|
||||
e_cfg_ver, min_e_cfg_ver);
|
||||
RESET_ALERT;
|
||||
doExit("restart_theme DEFAULT");
|
||||
|
@ -3446,13 +3444,13 @@ LoadOpenConfigFile(FILE * ConfigFile)
|
|||
"The settings you are using are "
|
||||
"incompatible with\n"
|
||||
"this version of Enlightenment.\n"
|
||||
"It's revision is %i It needs to be revision "
|
||||
"It's revision is %i It needs to be revision "
|
||||
"%i to\n"
|
||||
"be compatible.\n"
|
||||
"\n"
|
||||
"If you just upgraded to a new version of E\n"
|
||||
"Restarting with Defaults will remove your current\n"
|
||||
"user preferences and start cleanly with system\n"
|
||||
"If you just upgraded to a new version of E\n"
|
||||
"Restarting with Defaults will remove your current\n"
|
||||
"user preferences and start cleanly with system\n"
|
||||
"defaults. You can then modify your "
|
||||
"configuration to\n"
|
||||
"your liking again safely.\n"),
|
||||
|
@ -3683,7 +3681,7 @@ LoadEConfig(char *themelocation)
|
|||
"permissions or lack of disk space. It also could be that the\n"
|
||||
"config directory has been inadvertently deleted since\n"
|
||||
"installation.\n"
|
||||
"This is a serious problem and should be rectified immediately\n"
|
||||
"This is a serious problem and should be rectified immediately\n"
|
||||
"Please contact your system administrator or package "
|
||||
"maintainer.\n"
|
||||
"If you are the administrator of your own system please\n"
|
||||
|
@ -3697,7 +3695,8 @@ LoadEConfig(char *themelocation)
|
|||
{
|
||||
Progressbar *p = NULL;
|
||||
int i;
|
||||
char *config_files[] = {
|
||||
char *config_files[] =
|
||||
{
|
||||
"init.cfg",
|
||||
"control.cfg",
|
||||
"textclasses.cfg",
|
||||
|
@ -4165,12 +4164,12 @@ RecoverUserConfig(void)
|
|||
gettext("Restart and try again"),
|
||||
gettext("Quit and give up"));
|
||||
Alert(gettext
|
||||
("Enlightenment has encountered parsing errors in your autosaved\n"
|
||||
"configuration.\n" "\n"
|
||||
"This may be due to filing system errors, Minor bugs or"
|
||||
" unforeseen\n" "system shutdowns.\n" "\n"
|
||||
"Do you wish Enlightenment to recover its original system\n"
|
||||
"configuration and try again?\n"));
|
||||
("Enlightenment has encountered parsing errors in your autosaved\n"
|
||||
"configuration.\n" "\n"
|
||||
"This may be due to filing system errors, Minor bugs or"
|
||||
" unforeseen\n" "system shutdowns.\n" "\n"
|
||||
"Do you wish Enlightenment to recover its original system\n"
|
||||
"configuration and try again?\n"));
|
||||
RESET_ALERT;
|
||||
mode.autosave = 0;
|
||||
MapUnmap(1);
|
||||
|
|
|
@ -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;
|
||||
|
|
29
src/dialog.c
29
src/dialog.c
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -1237,7 +1237,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
|||
if ((cols > 0) && (rows > 0))
|
||||
{
|
||||
int i, *col_size, *row_size = NULL, r = 0,
|
||||
c = 0, x = 0, y = 0;
|
||||
c = 0, x = 0, y = 0;
|
||||
|
||||
col_size = Emalloc(sizeof(int) * cols);
|
||||
row_size = Erealloc(row_size, sizeof(int));
|
||||
|
@ -1353,7 +1353,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.check_button.
|
||||
|
@ -1364,7 +1364,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
|||
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.radio_button.
|
||||
|
@ -1412,7 +1412,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 +
|
||||
|
@ -1426,7 +1426,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;
|
||||
|
@ -1638,11 +1638,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,
|
||||
|
@ -1679,11 +1679,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,
|
||||
|
@ -1882,7 +1882,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
12
src/draw.c
|
@ -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, int y,
|
|||
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, int y,
|
|||
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, int y,
|
|||
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, int y,
|
|||
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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
@ -495,7 +495,7 @@ HandleMotion(XEvent * ev)
|
|||
[i]->reqx,
|
||||
gwins[i]->x,
|
||||
mode.
|
||||
edge_snap_dist)))))))
|
||||
edge_snap_dist)))))))
|
||||
{
|
||||
jumpx = 1;
|
||||
ndx = gwins[i]->reqx - gwins[i]->x + dx;
|
||||
|
@ -504,7 +504,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
|
||||
|
@ -519,7 +519,7 @@ HandleMotion(XEvent * ev)
|
|||
[i]->reqy,
|
||||
gwins[i]->y,
|
||||
mode.
|
||||
edge_snap_dist)))))))
|
||||
edge_snap_dist)))))))
|
||||
{
|
||||
jumpy = 1;
|
||||
ndy = gwins[i]->reqy - gwins[i]->y + dy;
|
||||
|
@ -1908,19 +1908,20 @@ HandleMouseDown(XEvent * ev)
|
|||
ev->xbutton.x += hx;
|
||||
ev->xbutton.y += hy;
|
||||
}
|
||||
if (ev->xbutton.button == mode.pager_menu_button)
|
||||
if ((int)ev->xbutton.button == mode.pager_menu_button)
|
||||
{
|
||||
if ((ev->xbutton.x >= 0) && (ev->xbutton.y >= 0) &&
|
||||
(ev->xbutton.x < p->w) && (ev->xbutton.y < p->h))
|
||||
PagerShowMenu(p, ev->xbutton.x, ev->xbutton.y);
|
||||
}
|
||||
else if (ev->xbutton.button == mode.pager_win_button)
|
||||
else if ((int)ev->xbutton.button == mode.pager_win_button)
|
||||
{
|
||||
ewin = EwinInPagerAt(p, ev->xbutton.x, ev->xbutton.y);
|
||||
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;
|
||||
|
@ -2356,7 +2357,7 @@ HandleMouseUp(XEvent * ev)
|
|||
int pax, pay;
|
||||
|
||||
p = FindPager(ev->xbutton.window);
|
||||
if ((p) && (ev->xbutton.button == mode.pager_sel_button))
|
||||
if ((p) && ((int)ev->xbutton.button == mode.pager_sel_button))
|
||||
{
|
||||
PagerAreaAt(p, ev->xbutton.x, ev->xbutton.y, &pax, &pay);
|
||||
GotoDesktop(p->desktop);
|
||||
|
@ -2366,7 +2367,7 @@ HandleMouseUp(XEvent * ev)
|
|||
}
|
||||
SetCurrentArea(pax, pay);
|
||||
}
|
||||
else if ((p) && (ev->xbutton.button == mode.pager_win_button))
|
||||
else if ((p) && ((int)ev->xbutton.button == mode.pager_win_button))
|
||||
{
|
||||
if (ev->xbutton.window == p->hi_win)
|
||||
{
|
||||
|
@ -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;
|
||||
|
||||
|
@ -2523,7 +2525,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 -
|
||||
|
|
|
@ -54,7 +54,8 @@ Etmp(char *s)
|
|||
n_calls = (unsigned long)time(NULL) + (unsigned long)getpid();
|
||||
Esnprintf(s, 1024, "%s/TMP_%Xl", UserEDir(), n_calls);
|
||||
n_calls++;
|
||||
EDBUG_RETURN_}
|
||||
EDBUG_RETURN_
|
||||
}
|
||||
|
||||
void
|
||||
md(char *s)
|
||||
|
@ -262,7 +263,8 @@ cp(char *s, char *ss)
|
|||
EDBUG_RETURN_;
|
||||
}
|
||||
|
||||
time_t moddate(char *s)
|
||||
time_t
|
||||
moddate(char *s)
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
|
|
|
@ -75,8 +75,8 @@ GetNextFocusEwin(void)
|
|||
if (((ewin->sticky) || (ewin->desktop == desks.current)) &&
|
||||
((ewin->area_x == ax) && (ewin->area_y == ay)) &&
|
||||
(!ewin->skipfocus) && (!ewin->shaded) &&
|
||||
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
|
||||
* (ewin->client.mwm_decor_border) */
|
||||
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
|
||||
* (ewin->client.mwm_decor_border) */
|
||||
)
|
||||
{
|
||||
num++;
|
||||
|
@ -146,8 +146,8 @@ GetPrevFocusEwin(void)
|
|||
if (((ewin->sticky) || (ewin->desktop == desks.current)) &&
|
||||
((ewin->area_x == ax) && (ewin->area_y == ay)) &&
|
||||
(!ewin->skipfocus) && (!ewin->shaded) &&
|
||||
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
|
||||
* (ewin->client.mwm_decor_border) */
|
||||
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
|
||||
* (ewin->client.mwm_decor_border) */
|
||||
)
|
||||
{
|
||||
num++;
|
||||
|
|
97
src/fx.c
97
src/fx.c
|
@ -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,12 +56,13 @@ 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},
|
||||
{"raindrops",
|
||||
FX_Raindrops_Init, FX_Raindrops_Desk, FX_Raindrops_Quit, FX_Raindrops_Pause,
|
||||
FX_Raindrops_Init, FX_Raindrops_Desk, FX_Raindrops_Quit, FX_Raindrops_Pause,
|
||||
0, 0},
|
||||
{"waves",
|
||||
FX_Waves_Init, FX_Waves_Desk, FX_Waves_Quit, FX_Waves_Pause,
|
||||
|
@ -254,12 +255,12 @@ FX_ripple_timeout(int val, void *data)
|
|||
gettext("\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 (ie 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 (ie 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;
|
||||
}
|
||||
|
@ -357,11 +358,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];
|
||||
|
@ -385,17 +386,17 @@ FX_raindrops_timeout(int val, void *data)
|
|||
{
|
||||
DIALOG_OK(gettext("Unable to display raindrops"),
|
||||
gettext("\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"
|
||||
"having run out of SHM ID's on the system or Shared\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(gettext("Unable to display raindrops"),
|
||||
gettext("\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 implimenting\n"
|
||||
"shared pixmaps, or shared pixmaps being disabled in\n"
|
||||
"This may be due to either the X-Server not implimenting\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;
|
||||
|
@ -423,12 +424,12 @@ FX_raindrops_timeout(int val, void *data)
|
|||
gettext("\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 (ie 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 (ie 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)
|
||||
|
@ -514,7 +515,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)
|
||||
|
@ -529,7 +530,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 >=
|
||||
|
@ -718,12 +719,12 @@ FX_Wave_timeout(int val, void *data)
|
|||
gettext("\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 (ie 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 (ie 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;
|
||||
}
|
||||
|
@ -882,9 +883,9 @@ FX_imagespinner_timeout(int val, void *data)
|
|||
if (!before)
|
||||
DIALOG_OK(gettext("Starting up imagespinners FX..."),
|
||||
gettext("\n"
|
||||
"You have just started the imagespinners Effect.\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;
|
||||
}
|
||||
|
|
15
src/gnome.c
15
src/gnome.c
|
@ -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])
|
||||
|
|
|
@ -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(gettext("Window Group Error"),
|
||||
gettext
|
||||
("\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))
|
||||
|
|
|
@ -58,12 +58,12 @@ HandleSigIll(int num)
|
|||
UngrabX();
|
||||
DialogAlert(gettext("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"
|
||||
"either obtain the correct package for your system, or\n"
|
||||
"re-compile enlightenment and possibly any support libraries\n"
|
||||
"that you got in binary format to run Enlightenment.\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"
|
||||
"either obtain the correct package for your system, or\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(gettext("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"
|
||||
"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"
|
||||
"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"
|
||||
"dumps etc.\n"));
|
||||
doExit("error");
|
||||
EDBUG_RETURN_;
|
||||
|
@ -111,13 +111,13 @@ HandleSigSegv(int num)
|
|||
UngrabX();
|
||||
DialogAlert(gettext("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"
|
||||
"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"
|
||||
"useful bug report with backtrace information and variable\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"
|
||||
"useful bug report with backtrace information and variable\n"
|
||||
"dumps etc.\n"));
|
||||
abort();
|
||||
num = 0;
|
||||
|
@ -195,8 +195,8 @@ HandleSigBus(int num)
|
|||
UngrabX();
|
||||
DialogAlert(gettext("Enlightenment caused Bus Error.\n"
|
||||
"\n"
|
||||
"It is suggested you check your hardware and OS installation.\n"
|
||||
"It is highly unusual to cause Bus Errors on operational\n"
|
||||
"It is suggested you check your hardware and OS installation.\n"
|
||||
"It is highly unusual to cause Bus Errors on operational\n"
|
||||
"hardware.\n"));
|
||||
EDBUG_RETURN_;
|
||||
}
|
||||
|
@ -217,27 +217,27 @@ EHandleXError(Display * d, XErrorEvent * ev)
|
|||
"", gettext("Cancel (do NOT edit)"));
|
||||
Alert(gettext("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 startup 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"
|
||||
"If you haven't edited your user startup 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"
|
||||
"If you want to do this, click OK, otherwise hit cancel\n"
|
||||
"to abort this operation and edit the files by hand.\n"
|
||||
"If you want to do this, click OK, otherwise hit cancel\n"
|
||||
"to abort this operation and edit the files by hand.\n"
|
||||
"\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(gettext("Are you sure?"),
|
||||
gettext("YES (edit file)"),
|
||||
"", gettext("NO (do not edit)"));
|
||||
Alert(gettext
|
||||
("Are you absolutely sure you want to have Enlightenment\n"
|
||||
"edit your startup files for you?\n" "\n"
|
||||
"If your startup files are highly customised this may not\n"
|
||||
"If your startup files are highly customised this may not\n"
|
||||
"work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
|
||||
RESET_ALERT;
|
||||
AddE();
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
@ -2118,9 +2118,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);
|
||||
|
@ -2140,9 +2140,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,
|
||||
|
@ -2250,9 +2250,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);
|
||||
|
@ -2272,9 +2272,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,
|
||||
|
|
745
src/ipc.c
745
src/ipc.c
|
@ -116,424 +116,425 @@ 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 and their Titles",
|
||||
"the list will be returned in the following "
|
||||
"format - \"window_id : title\""},
|
||||
IPC_WinList,
|
||||
"window_list",
|
||||
"Get a list of currently open windows and their Titles",
|
||||
"the list will be returned in the following "
|
||||
"format - \"window_id : title\""},
|
||||
{
|
||||
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"
|
||||
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)"},
|
||||
"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"
|
||||
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"},
|
||||
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"},
|
||||
{
|
||||
IPC_CurrentTheme,
|
||||
"current_theme",
|
||||
"Returns the name of the currently used theme",
|
||||
""}
|
||||
IPC_CurrentTheme,
|
||||
"current_theme",
|
||||
"Returns the name of the currently used theme",
|
||||
""}
|
||||
};
|
||||
|
||||
/* the functions */
|
||||
|
@ -1000,13 +1001,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,
|
||||
|
@ -1091,7 +1092,7 @@ IPC_Background(char *params, Client * c)
|
|||
bg->top.yperc = atoi(valu);
|
||||
else
|
||||
Esnprintf(buf, sizeof(buf),
|
||||
"Error: unknown background value type '%s'.",
|
||||
"Error: unknown background value type '%s'.",
|
||||
type);
|
||||
}
|
||||
|
||||
|
@ -1473,7 +1474,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);
|
||||
}
|
||||
|
@ -1486,7 +1487,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);
|
||||
|
@ -3340,7 +3341,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
|
||||
{
|
||||
|
@ -4057,7 +4058,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, "??"))
|
||||
|
@ -4626,7 +4627,7 @@ IPC_Help(char *params, Client * c)
|
|||
strcat(buf, gettext("\ncommands currently available:\n"));
|
||||
strcat(buf,
|
||||
gettext("use \"help all\" for descriptions of each command\n"
|
||||
"use \"help <command>\" for an individual description\n\n"));
|
||||
"use \"help <command>\" for an individual description\n\n"));
|
||||
|
||||
commandname_list = Emalloc(numIPC * sizeof(char *));
|
||||
|
||||
|
@ -4717,7 +4718,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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -173,7 +173,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(gettext
|
||||
("Enlightenment Version: %s\nLast updated on: %s\n"),
|
||||
|
|
44
src/memory.c
44
src/memory.c
|
@ -71,10 +71,10 @@ end: \
|
|||
}
|
||||
|
||||
static struct _symtab
|
||||
{
|
||||
void *val;
|
||||
char *symbol;
|
||||
}
|
||||
{
|
||||
void *val;
|
||||
char *symbol;
|
||||
}
|
||||
*sym = NULL;
|
||||
|
||||
static int sym_count = 0;
|
||||
|
@ -198,15 +198,15 @@ __Emalloc(int size, const char *file, int line)
|
|||
gettext("Quit Enlightenment"));
|
||||
Alert(gettext("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"
|
||||
"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"
|
||||
"\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"
|
||||
"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"
|
||||
"\n"
|
||||
"The malloc requested was at %s, line %d\n "),
|
||||
size, (float)size / 1024, (float)size / (1024 * 1024), file,
|
||||
|
@ -274,7 +274,7 @@ __Erealloc(void *ptr, int size, const char *file, int line)
|
|||
if (disp)
|
||||
UngrabX();
|
||||
ASSIGN_ALERT(gettext
|
||||
("Error in reallocating memory that hasn't been allocated"),
|
||||
("Error in reallocating memory that hasn't been allocated"),
|
||||
gettext("Ignore this"), gettext("Restart Enlightenment"),
|
||||
gettext("Quit Enlightenment"));
|
||||
Alert(gettext
|
||||
|
@ -284,7 +284,7 @@ __Erealloc(void *ptr, int size, const char *file, int line)
|
|||
"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 occured 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);
|
||||
}
|
||||
|
@ -300,15 +300,15 @@ __Erealloc(void *ptr, int size, const char *file, int line)
|
|||
gettext("Quit Enlightenment"));
|
||||
Alert(gettext("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"
|
||||
"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"
|
||||
"\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"
|
||||
"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"
|
||||
"\n"
|
||||
"The realloc requested was at %s, line %d\n "),
|
||||
size, (float)size / 1024, (float)size / (1024 * 1024), file,
|
||||
|
@ -382,7 +382,7 @@ __Efree(void *ptr, const char *file, int line)
|
|||
Alert(gettext
|
||||
("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 occured at %s, line %d.\n"), ptr, file, line);
|
||||
RESET_ALERT;
|
||||
|
@ -402,7 +402,7 @@ __Efree(void *ptr, const char *file, int line)
|
|||
"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 occured at %s, line %d.\n"), ptr, file, line);
|
||||
|
|
21
src/menus.c
21
src/menus.c
|
@ -674,8 +674,7 @@ void
|
|||
RealizeMenu(Menu * m)
|
||||
{
|
||||
int i, maxh = 0, maxw = 0, maxx1, maxx2, w, h, x, y, r,
|
||||
|
||||
mmw, mmh;
|
||||
mmw, mmh;
|
||||
unsigned int iw, ih;
|
||||
ImlibImage *im;
|
||||
XSetWindowAttributes att;
|
||||
|
@ -1007,10 +1006,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;
|
||||
|
@ -1091,8 +1090,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;
|
||||
scaley = 0;
|
||||
int scr_asp, im_asp, w2,
|
||||
h2;
|
||||
int maxw = 48, maxh = 48;
|
||||
int justx = 512, justy = 512;
|
||||
|
||||
|
@ -1309,7 +1309,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);
|
||||
|
@ -1324,7 +1324,7 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
|
|||
ImlibColor icl;
|
||||
char tile = 1, keep_asp = 0;
|
||||
int width, height, scalex = 0,
|
||||
scaley = 0;
|
||||
scaley = 0;
|
||||
int scr_asp, im_asp, w2, h2;
|
||||
int maxw = 48, maxh = 48;
|
||||
|
||||
|
@ -1686,7 +1686,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))
|
||||
|
@ -1698,8 +1698,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=")]));
|
||||
|
|
39
src/misc.c
39
src/misc.c
|
@ -37,15 +37,16 @@ BlumFlimFrub(void)
|
|||
char s[1024];
|
||||
char *bins[3] =
|
||||
#ifndef __EMX__
|
||||
{ "dox", "eesh", "epp" };
|
||||
{"dox", "eesh", "epp"};
|
||||
|
||||
#else
|
||||
{ "dox.exe", "eesh.exe", "epp.exe" };
|
||||
{"dox.exe", "eesh.exe", "epp.exe"};
|
||||
|
||||
#endif
|
||||
char *docs[4] =
|
||||
{ "E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png" };
|
||||
char *thms[1] = { "themes/DEFAULT/epplets/epplets.cfg" };
|
||||
{"E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png"};
|
||||
char *thms[1] =
|
||||
{"themes/DEFAULT/epplets/epplets.cfg"};
|
||||
|
||||
for (i = 0; i < 3; i++)
|
||||
{
|
||||
|
@ -59,15 +60,15 @@ BlumFlimFrub(void)
|
|||
{
|
||||
Alert(gettext("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
|
||||
"\n"
|
||||
"Enlightenment's utility executable cannot be found at:\n"
|
||||
"Enlightenment's utility executable cannot be found at:\n"
|
||||
"\n"
|
||||
"%s\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure it is installed\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure it is installed\n"
|
||||
"correctly.\n"
|
||||
"\n"
|
||||
"The reason this could be missing is due to badly created\n"
|
||||
"packages, someone manually deleting that program or perhaps\n"
|
||||
"The reason this could be missing is due to badly created\n"
|
||||
"packages, someone manually deleting that program or perhaps\n"
|
||||
"an error in installing Enlightenment.\n"), s);
|
||||
EExit(NULL);
|
||||
}
|
||||
|
@ -75,11 +76,11 @@ BlumFlimFrub(void)
|
|||
{
|
||||
Alert(gettext("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
|
||||
"\n"
|
||||
"Enlightenment's dox executable is not able to be executed:\n"
|
||||
"Enlightenment's dox executable is not able to be executed:\n"
|
||||
"\n"
|
||||
"%s\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure dox is installed\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure dox is installed\n"
|
||||
"correctly.\n"), s);
|
||||
EExit(NULL);
|
||||
}
|
||||
|
@ -99,12 +100,12 @@ BlumFlimFrub(void)
|
|||
"\n"
|
||||
"Enlightenment's documentation is not present or correctly installed\n"
|
||||
"\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure it is installed\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure it is installed\n"
|
||||
"correctly.\n"
|
||||
"\n"
|
||||
"The reason this could be missing is due to badly created\n"
|
||||
"packages, someone manually deleting those files or perhaps\n"
|
||||
"The reason this could be missing is due to badly created\n"
|
||||
"packages, someone manually deleting those files or perhaps\n"
|
||||
"an error in installing Enlightenment.\n"));
|
||||
EExit(NULL);
|
||||
}
|
||||
|
@ -124,9 +125,9 @@ BlumFlimFrub(void)
|
|||
"Enlightenment's DEFAULT installed theme is missing or inadequately\n"
|
||||
"configured to be a useful DEFAULT theme.\n"
|
||||
"\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure it is installed\n"
|
||||
"correctly. The DEFAULT theme Enlightenment comes with normally\n"
|
||||
"This is a fatal error and Enlightenment will cease to run.\n"
|
||||
"Please rectify this situation and ensure it is installed\n"
|
||||
"correctly. The DEFAULT theme Enlightenment comes with normally\n"
|
||||
"is BrushedMetal-Tigert and this theme is adequate for a DEFAULT\n"
|
||||
"theme.\n"));
|
||||
EExit(NULL);
|
||||
|
|
|
@ -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
22
src/mwm.c
|
@ -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");
|
||||
|
|
|
@ -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
21
src/pager.c
|
@ -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,15 +528,15 @@ CreatePager(void)
|
|||
(gettext("Warning!"),
|
||||
gettext("\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"
|
||||
"disable snapshots to improve performance.\n"
|
||||
"disable snapshots to improve performance.\n"
|
||||
"\n"));
|
||||
}
|
||||
else
|
||||
|
@ -557,15 +558,15 @@ CreatePager(void)
|
|||
DIALOG_OK
|
||||
(gettext("Warning!"),
|
||||
gettext("\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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
@ -558,7 +559,7 @@ doSMExit(void *params)
|
|||
if (themepath[0] != 0)
|
||||
{
|
||||
Esnprintf(sss, sizeof(sss),
|
||||
"exec %s -single -ext_init_win %i -theme %s -display %s",
|
||||
"exec %s -single -ext_init_win %i -theme %s -display %s",
|
||||
command, w, themename, dstr);
|
||||
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
|
||||
}
|
||||
|
@ -580,7 +581,7 @@ doSMExit(void *params)
|
|||
disp = NULL;
|
||||
sscanf(params, "%*s %1000s", s);
|
||||
Esnprintf(sss, sizeof(sss),
|
||||
"exec %s -single -ext_init_win %i -theme %s -display %s",
|
||||
"exec %s -single -ext_init_win %i -theme %s -display %s",
|
||||
command, w, s, dstr);
|
||||
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
|
||||
}
|
||||
|
@ -682,14 +683,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},
|
||||
|
@ -701,8 +706,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;
|
||||
|
@ -1019,7 +1026,7 @@ ProcessICEMSGS(void)
|
|||
DialogAlert(gettext("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"
|
||||
|
@ -1160,7 +1167,7 @@ doSMExit(void *params)
|
|||
DialogSetText(d,
|
||||
gettext("\n"
|
||||
"\n"
|
||||
" Are you sure you wish to log out ? \n"
|
||||
" Are you sure you wish to log out ? \n"
|
||||
"\n" "\n"));
|
||||
DialogAddButton(d, gettext(" Yes, Log Out "), LogoutCB, 1);
|
||||
DialogAddButton(d, gettext(" No "), NULL, 1);
|
||||
|
|
|
@ -152,7 +152,7 @@ SettingsPager(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Smooth high quality snapshots in snapshot mode"));
|
||||
("Smooth high quality snapshots in snapshot mode"));
|
||||
DialogItemCheckButtonSetState(di, tmp_pager_hiq);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_pager_hiq);
|
||||
|
||||
|
@ -162,7 +162,7 @@ SettingsPager(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Zoom in on pager windows when mouse is over them"));
|
||||
("Zoom in on pager windows when mouse is over them"));
|
||||
DialogItemCheckButtonSetState(di, tmp_pager_zoom);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_pager_zoom);
|
||||
|
||||
|
@ -172,7 +172,7 @@ SettingsPager(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Pop up window title when mouse is over the window"));
|
||||
("Pop up window title when mouse is over the window"));
|
||||
DialogItemCheckButtonSetState(di, tmp_pager_title);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_pager_title);
|
||||
|
||||
|
@ -455,7 +455,7 @@ SettingsFocus(void)
|
|||
DialogItemSetFill(di, 1, 0);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext("All new windows first get the focus"));
|
||||
gettext("All new windows first get the focus"));
|
||||
DialogItemCheckButtonSetState(di, tmp_new_focus);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_new_focus);
|
||||
|
||||
|
@ -475,7 +475,7 @@ SettingsFocus(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Only new dialogs whose owner is focused get the focus"));
|
||||
("Only new dialogs whose owner is focused get the focus"));
|
||||
DialogItemCheckButtonSetState(di, tmp_owner_popup_focus);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_owner_popup_focus);
|
||||
|
||||
|
@ -493,7 +493,7 @@ SettingsFocus(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Send mouse pointer to window on focus switch"));
|
||||
("Send mouse pointer to window on focus switch"));
|
||||
DialogItemCheckButtonSetState(di, tmp_warp_focus);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_warp_focus);
|
||||
|
||||
|
@ -527,7 +527,7 @@ SettingsFocus(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Send mouse pointer to window after focus switch"));
|
||||
("Send mouse pointer to window after focus switch"));
|
||||
DialogItemCheckButtonSetState(di, tmp_warp_after_focus);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_warp_after_focus);
|
||||
#endif /* WITH_TARTY_WARP */
|
||||
|
@ -1180,7 +1180,7 @@ SettingsPlacement(void)
|
|||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext
|
||||
("Dialog windows appear together with their owner"));
|
||||
("Dialog windows appear together with their owner"));
|
||||
DialogItemCheckButtonSetState(di, tmp_with_leader);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_with_leader);
|
||||
|
||||
|
@ -1245,8 +1245,8 @@ SettingsAutoRaise(void)
|
|||
DItem *table, *di;
|
||||
|
||||
if (
|
||||
(d =
|
||||
FindItem("CONFIGURE_AUTORAISE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
|
||||
(d =
|
||||
FindItem("CONFIGURE_AUTORAISE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
|
||||
{
|
||||
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
|
||||
ShowDialog(d);
|
||||
|
@ -1343,8 +1343,8 @@ SettingsTooltips(void)
|
|||
DItem *table, *di;
|
||||
|
||||
if (
|
||||
(d =
|
||||
FindItem("CONFIGURE_TOOLTIPS", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
|
||||
(d =
|
||||
FindItem("CONFIGURE_TOOLTIPS", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
|
||||
{
|
||||
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
|
||||
ShowDialog(d);
|
||||
|
@ -1706,7 +1706,7 @@ SettingsSpecialFX(void)
|
|||
DialogItemSetFill(di, 1, 0);
|
||||
DialogItemSetColSpan(di, 3);
|
||||
DialogItemCheckButtonSetText(di,
|
||||
gettext("Slide desktops around when changing"));
|
||||
gettext("Slide desktops around when changing"));
|
||||
DialogItemCheckButtonSetState(di, tmp_desktop_slide);
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_desktop_slide);
|
||||
|
||||
|
@ -2604,7 +2604,7 @@ CB_BGAreaEvent(int val, void *data)
|
|||
stmp = duplicate(gettext("-NONE-"));
|
||||
Esnprintf(s, sizeof(s),
|
||||
gettext
|
||||
("Background definition information:\nName: %s\nFile: %s\n"),
|
||||
("Background definition information:\nName: %s\nFile: %s\n"),
|
||||
tmp_bg->name, stmp);
|
||||
Efree(stmp);
|
||||
DialogItemTextSetText(bg_filename, s);
|
||||
|
@ -3427,7 +3427,7 @@ SettingsIconbox(char *name)
|
|||
Iconbox *ib;
|
||||
|
||||
if (
|
||||
(d =
|
||||
(d =
|
||||
FindItem("CONFIGURE_ICONBOX", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
|
||||
{
|
||||
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
|
||||
|
@ -3541,7 +3541,7 @@ SettingsIconbox(char *name)
|
|||
DialogItemSetAlign(di, 0, 0);
|
||||
DialogItemTextSetText(di,
|
||||
gettext
|
||||
("Alignment of anchoring when automatically resizing:"));
|
||||
("Alignment of anchoring when automatically resizing:"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_SLIDER);
|
||||
DialogItemSetPadding(di, 2, 2, 2, 2);
|
||||
|
@ -3563,14 +3563,14 @@ SettingsIconbox(char *name)
|
|||
DialogItemSetAlign(di, 0, 0);
|
||||
DialogItemTextSetText(di,
|
||||
gettext
|
||||
("Icon image display policy (if one operation fails, try the next):"));
|
||||
("Icon image display policy (if one operation fails, try the next):"));
|
||||
|
||||
radio4 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetPadding(di, 2, 2, 2, 2);
|
||||
DialogItemSetFill(di, 1, 0);
|
||||
DialogItemRadioButtonSetText(di,
|
||||
gettext
|
||||
("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
|
||||
("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
|
||||
DialogItemRadioButtonSetFirst(di, radio4);
|
||||
DialogItemRadioButtonGroupSetVal(di, 0);
|
||||
|
||||
|
@ -3579,7 +3579,7 @@ SettingsIconbox(char *name)
|
|||
DialogItemSetFill(di, 1, 0);
|
||||
DialogItemRadioButtonSetText(di,
|
||||
gettext
|
||||
("Use application icon, Use Enlightenment Icon, Snapshot Window"));
|
||||
("Use application icon, Use Enlightenment Icon, Snapshot Window"));
|
||||
DialogItemRadioButtonSetFirst(di, radio4);
|
||||
DialogItemRadioButtonGroupSetVal(di, 1);
|
||||
|
||||
|
@ -3833,7 +3833,7 @@ SettingsGroups(EWin * ewin)
|
|||
{
|
||||
DIALOG_OK(gettext("Window Group Error"),
|
||||
gettext
|
||||
("\n This window currently does not belong to any groups. \n\n"));
|
||||
("\n This window currently does not belong to any groups. \n\n"));
|
||||
return;
|
||||
}
|
||||
if ((d = FindItem("CONFIGURE_GROUP", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
|
||||
|
|
20
src/setup.c
20
src/setup.c
|
@ -222,10 +222,10 @@ SetupX()
|
|||
("Enlightenment cannot connect to the display nominated by\n"
|
||||
"your shell's DISPLAY environment variable. You may set this\n"
|
||||
"variable to indicate which display name Enlightenment is to\n"
|
||||
"connect to. It may be that you do not have an Xserver already\n"
|
||||
"connect to. It may be that you do not have an Xserver already\n"
|
||||
"running to serve that Display connection, or that you do not\n"
|
||||
"have permission to connect to that display. Please make sure\n"
|
||||
"all is correct before trying again. Run an Xserver by running\n"
|
||||
"all is correct before trying again. Run an Xserver by running\n"
|
||||
"xdm or startx first, or contact your local system\n"
|
||||
"administrator, or Xserver vendor, or read the X, xdm and\n"
|
||||
"startx manual pages before proceeding.\n"));
|
||||
|
@ -405,10 +405,10 @@ SetupX()
|
|||
gettext("Ignore this error"),
|
||||
"", gettext("Quit Enlightenment"));
|
||||
Alert(gettext("WARNING:\n"
|
||||
"This is not an X11 Xserver. It infact talks the X%i protocol.\n"
|
||||
"This may mean Enlightenment will either not function, or\n"
|
||||
"function incorrectly. If it is later than X11, then your\n"
|
||||
"server is one the author of Enlightenment neither have\n"
|
||||
"This is not an X11 Xserver. It infact talks the X%i protocol.\n"
|
||||
"This may mean Enlightenment will either not function, or\n"
|
||||
"function incorrectly. If it is later than X11, then your\n"
|
||||
"server is one the author of Enlightenment neither have\n"
|
||||
"access to, nor have heard of.\n"),
|
||||
ProtocolVersion(disp));
|
||||
RESET_ALERT;
|
||||
|
@ -437,7 +437,8 @@ SetupX()
|
|||
XModifierKeymap *mod;
|
||||
KeyCode nl, sl;
|
||||
int i;
|
||||
int masks[8] = {
|
||||
int masks[8] =
|
||||
{
|
||||
ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask,
|
||||
Mod4Mask, Mod5Mask
|
||||
};
|
||||
|
@ -740,7 +741,8 @@ SetupEnv()
|
|||
return;
|
||||
}
|
||||
|
||||
Window MakeExtInitWin(void)
|
||||
Window
|
||||
MakeExtInitWin(void)
|
||||
{
|
||||
Display *d2;
|
||||
Window win;
|
||||
|
@ -809,7 +811,7 @@ Window MakeExtInitWin(void)
|
|||
attr.background_pixel = 0;
|
||||
attr.save_under = True;
|
||||
win = XCreateWindow(d2, root.win, 0, 0, root.w, root.h, 0, root.depth,
|
||||
InputOutput, root.vis, CWOverrideRedirect | CWSaveUnder |
|
||||
InputOutput, root.vis, CWOverrideRedirect | CWSaveUnder |
|
||||
CWBackingStore | CWColormap | CWBackPixel |
|
||||
CWBorderPixel, &attr);
|
||||
pmap = ECreatePixmap(d2, win, root.w, root.h, root.depth);
|
||||
|
|
12
src/size.c
12
src/size.c
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
@ -477,7 +477,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);
|
||||
XmbTextExtents(ts->xfontset, new_line, strlen(new_line),
|
||||
&ret1, &ret2);
|
||||
}
|
||||
|
@ -582,7 +582,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]);
|
||||
|
@ -684,7 +684,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);
|
||||
|
|
10
src/theme.c
10
src/theme.c
|
@ -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;
|
||||
*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')
|
||||
|
@ -347,8 +347,8 @@ BadThemeDialog(void)
|
|||
Esnprintf(s, sizeof(s),
|
||||
gettext("The theme:\n"
|
||||
"%s\n"
|
||||
"Is a badly formed theme package and is thus not being used.\n"
|
||||
"Enlightenment has fallen back to using the DEFAULT theme.\n"
|
||||
"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);
|
||||
|
|
|
@ -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,10 +700,10 @@ 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.normal->
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.normal->
|
||||
|
@ -719,10 +720,10 @@ 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.normal->
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.normal->
|
||||
|
@ -739,10 +740,10 @@ 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.normal->
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.normal->
|
||||
|
@ -759,10 +760,10 @@ 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.normal->
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.normal->
|
||||
|
@ -779,10 +780,10 @@ 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.normal->
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.normal->
|
||||
|
@ -805,7 +806,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,
|
||||
|
@ -828,7 +829,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,
|
||||
|
@ -851,7 +852,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,
|
||||
|
@ -874,7 +875,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,
|
||||
|
@ -897,7 +898,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,
|
||||
|
@ -920,7 +921,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,
|
||||
|
@ -943,7 +944,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,
|
||||
|
@ -966,7 +967,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
16
src/ttfont.c
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
15
src/x.c
15
src/x.c
|
@ -40,7 +40,8 @@ EFreePixmap(Display * display, Pixmap pixmap)
|
|||
XFreePixmap(display, pixmap);
|
||||
}
|
||||
|
||||
Window ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
|
||||
Window
|
||||
ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
|
||||
{
|
||||
EXID *xid;
|
||||
Window win;
|
||||
|
@ -586,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;
|
||||
|
@ -602,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;
|
||||
|
@ -736,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;
|
||||
|
@ -783,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;
|
||||
|
|
Loading…
Reference in New Issue